bug

src/views/quality/feedback/components/show.vue

@@ -31,8 +31,12 @@
                 <tbody>
                   <tr>
                     <td class="titlesmall">产品名称以及型号</td>
-                    <td class="titleVal">{{ tableData.materialName }}</td>
-                    <td class="titlesmall">检验批号或生产批号</td>
+                    <td class="titleVal">
+                      {{ tableData.materialName }}&nbsp;{{
+                        tableData.materialModel
+                      }}
+                    </td>
+                    <td class="titlesmall">工单号</td>
                     <td class="titleVal">{{ tableData.orderNo }}</td>
                     <td class="titlesmall">数量</td>
                     <td class="titleVal">
@@ -40,7 +44,7 @@
                     </td>
                   </tr>
                   <tr>
-                    <td class="titlesmall">编号</td>
+                    <td class="titlesmall">流转卡号</td>
                     <td colspan="5">
                       {{ tableData.code ? tableData.code : "/" }}
                     </td>

src/views/quality/feedback/index.vue

@@ -81,8 +81,14 @@ option.value = Object.assign(option.value, {
   viewBtn: false,
   column: [
     {
-      label: "物料名称",
+      label: "产品名称",
       prop: "materialName",
+      search: true,
+    },
+    {
+      label: "产品型号",
+      prop: "materialModel",
+      search: true,
     },
     {
       label: "阶段",
@@ -97,24 +103,30 @@ option.value = Object.assign(option.value, {
       prop: "remark",
     },
     {
+      label: "生产批号",
+      prop: "code",
+    },
+    {
       label: "状态",
       prop: "state",
+      search: true,
+      type: "select",
       dicData: [
         {
           label: "待处理",
-          value: 0,
+          value: "0",
         },
         {
           label: "审核中",
-          value: 1,
+          value: "1",
         },
         {
           label: "审核驳回",
-          value: 2,
+          value: "2",
         },
         {
           label: "审核完成",
-          value: 3,
+          value: "3",
         },
       ],
     },

src/views/quality/reject/components/show.vue

@@ -31,8 +31,12 @@
                 <tbody>
                   <tr>
                     <td class="titlesmall">产品名称以及型号</td>
-                    <td class="titleVal">{{ tableData.materialName }}</td>
-                    <td class="titlesmall">检验批号或生产批号</td>
+                    <td class="titleVal">
+                      {{ tableData.materialName }}&nbsp;{{
+                        tableData.materialModel
+                      }}
+                    </td>
+                    <td class="titlesmall">工单号</td>
                     <td class="titleVal">{{ tableData.orderNo }}</td>
                     <td class="titlesmall">数量</td>
                     <td class="titleVal">
@@ -40,7 +44,7 @@
                     </td>
                   </tr>
                   <tr>
-                    <td class="titlesmall">编号</td>
+                    <td class="titlesmall">流转卡号</td>
                     <td colspan="5">
                       {{ tableData.code ? tableData.code : "/" }}
                     </td>

src/views/quality/reject/index.vue

@@ -81,8 +81,14 @@ option.value = Object.assign(option.value, {
   viewBtn: false,
   column: [
     {
-      label: "物料名称",
+      label: "产品名称",
       prop: "materialName",
+      search: true,
+    },
+    {
+      label: "产品型号",
+      prop: "materialModel",
+      search: true,
     },
     {
       label: "阶段",
@@ -97,28 +103,30 @@ option.value = Object.assign(option.value, {
       prop: "remark",
     },
     {
-      label: "单号",
+      label: "生产批号",
       prop: "code",
     },
     {
       label: "状态",
       prop: "state",
+      search: true,
+      type: "select",
       dicData: [
         {
           label: "待处理",
-          value: 0,
+          value: "0",
         },
         {
           label: "审核中",
-          value: 1,
+          value: "1",
         },
         {
           label: "审核驳回",
-          value: 2,
+          value: "2",
         },
         {
           label: "审核完成",
-          value: 3,
+          value: "3",
         },
       ],
     },