Переглянути джерело

逆向追朔模糊查询加个物料名称,
图纸资料文件名称字段,
辅料管理的物料名称、物料编码、物料规格,
工装管理的工装规格
物料管理的物料规格
报故处理的产品编码、产品名称
不合格品产品编码、产品名称
委外管理计划名称、物料名称
计划管理产品规格
生产排产产线名称、工序名称

jiaxiaoqiang 6 місяців тому
батько
коміт
e067433f0a

+ 1 - 1
.env.development

@@ -10,7 +10,7 @@ VITE_APP_BASE_API = '/dev-api'
 # 上传文件接口地址
 VITE_APP_UPLOAD_URL = 'http://192.168.101.4:9000'
 # 开发接口地址
- VITE_APP_API_URL = 'http://192.168.101.4:7104'
+ VITE_APP_API_URL = 'http://localhost:7104'
 
 
 # 是否启用 Mock 服务

+ 28 - 20
src/views/base/accessories/index.vue

@@ -105,27 +105,10 @@ option.value = Object.assign(option.value, {
   searchLabelWidth: 110,
   column: [
     {
-      label: "辅料类型",
-      prop: "accessoriesType",
-      search: true,
-      type: "select",
-      dicData: dicts.accessories_type,
-      props: {
-        label: "dictLabel",
-        value: "dictValue",
-      },
-      rules: [
-        {
-          required: true,
-          message: "辅料类型不能为空",
-          trigger: "blur",
-        },
-      ],
-    },
-    {
       label: "物料编码",
       prop: "materialCode",
       clearable: false,
+      search: true,
       rules: [
         {
           required: true,
@@ -138,7 +121,7 @@ option.value = Object.assign(option.value, {
         startCreat();
       },
       change: ({ value, column }) => {
-        if (value != form.value.materialCode) {
+        if (value && value != form.value.materialCode) {
           repeatObj.value.showCreate = true;
           startCreat();
         }
@@ -149,8 +132,33 @@ option.value = Object.assign(option.value, {
       prop: "materialName",
       addDisplay: false,
       editDisplay: false,
+      search: true,
+    },
+    {
+      label: "物料规格",
+      prop: "spec",
+      addDisplay: false,
+      editDisplay: false,
+      search: true,
+    },
+    {
+      label: "辅料类型",
+      prop: "accessoriesType",
+      search: true,
+      type: "select",
+      dicData: dicts.accessories_type,
+      props: {
+        label: "dictLabel",
+        value: "dictValue",
+      },
+      rules: [
+        {
+          required: true,
+          message: "辅料类型不能为空",
+          trigger: "blur",
+        },
+      ],
     },
-    { label: "物料规格", prop: "spec", addDisplay: false, editDisplay: false },
   ],
 });
 onMounted(() => {

+ 1 - 0
src/views/base/frock/index.vue

@@ -190,6 +190,7 @@ option.value = Object.assign(option.value, {
       prop: "spec",
       width: 100,
       overHidden: true,
+      search: true,
       rules: [
         {
           required: true,

+ 10 - 8
src/views/base/information/index.vue

@@ -172,6 +172,15 @@ option.value = Object.assign(option.value, {
       ],
     },
     {
+      label: "文件名称",
+      prop: "fileName",
+      span: 24,
+      width: 120,
+      overHidden: true,
+      search: true,
+      display: false,
+    },
+    {
       label: "图纸名称",
       prop: "drawingTitle",
       width: 150,
@@ -269,14 +278,7 @@ option.value = Object.assign(option.value, {
         },
       ],
     },
-    {
-      label: "文件名称",
-      prop: "fileName",
-      span: 24,
-      width: 120,
-      overHidden: true,
-      display: false,
-    },
+
     {
       label: "文件数组",
       prop: "drawingPathList",

+ 1 - 0
src/views/plan/order/index.vue

@@ -464,6 +464,7 @@ option.value = {
       label: "产品规格",
       width: 130,
       overHidden: true,
+      search: true,
       disabled: true,
       prop: "materialModel",
     },

+ 2 - 0
src/views/plan/schedule/index.vue

@@ -210,6 +210,7 @@ option.value = Object.assign(option.value, {
     {
       label: "产线名称",
       prop: "productLineName",
+      search: true,
       editDisabled: true,
     },
     {
@@ -233,6 +234,7 @@ option.value = Object.assign(option.value, {
     {
       label: "工序名称",
       prop: "operationName",
+      search: true,
       editDisabled: true,
     },
     {

+ 4 - 2
src/views/quality/faultHandle/index.vue

@@ -143,11 +143,11 @@ const dialog3 = ref({
 });
 
 const closeFaultDetail = () => {
-  dialog1.visible = false;
+  dialog1.value.visible = false;
   dataList();
 };
 const closeFaultHandel = () => {
-  dialog2.visible = false;
+  dialog2.value.visible = false;
   dataList();
 };
 const fault = ref({});
@@ -247,12 +247,14 @@ option.value = Object.assign(option.value, {
     {
       label: "产品编码",
       prop: "materialCode",
+      search: true,
       overHidden: true,
     },
     {
       label: "产品名称",
       prop: "materialName",
       overHidden: true,
+      search: true,
       width: 100,
     },
 

+ 2 - 0
src/views/quality/outsource/index.vue

@@ -255,6 +255,7 @@ option.value = Object.assign(option.value, {
       label: "计划名称",
       prop: "orderName",
       width: 150,
+      search: true,
       overHidden: true,
     },
     {
@@ -268,6 +269,7 @@ option.value = Object.assign(option.value, {
       label: "物料名称",
       width: 150,
       overHidden: true,
+      search: true,
       prop: "materialName",
     },
     {

+ 6 - 4
src/views/quality/reverseTraceability/index.vue

@@ -58,6 +58,11 @@ option.value = Object.assign(option.value, {
       hide: true,
     },
     {
+      label: "物料名称",
+      prop: "itemName",
+      search: true,
+    },
+    {
       label: "物料编码",
       prop: "itemCode",
       search: true,
@@ -67,10 +72,7 @@ option.value = Object.assign(option.value, {
       prop: "itemModel",
       search: true,
     },
-    {
-      label: "物料名称",
-      prop: "itemName",
-    },
+
     {
       label: "物料序列号",
       prop: "itemSeq",

+ 2 - 0
src/views/quality/unqualified/columns.ts

@@ -38,12 +38,14 @@ export const columns = [
     label: "产品编码",
     prop: "materialCode",
     overHidden: true,
+    search: true,
     width: 120,
   },
   {
     label: "产品名称",
     prop: "materialName",
     overHidden: true,
+    search: true,
     width: 100,
   },
   {