表头修改

src/views/batchRecord/components/editModal.vue

@@ -1063,28 +1063,30 @@
             minWidth: 120
           },
           {
-            label: '工序名称',
-            prop: 'produceTaskName',
-            minWidth: 120
+            prop: 'modelType',
+            label: '型号',
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
-            label: '领料数量',
-            prop: 'pickQuantity',
-            minWidth: 120,
-            formatter: (row) => {
-              return (row.pickQuantity || 0) + (row.pickUnit || '');
-            }
+            prop: 'specification',
+            label: '规格',
+            align: 'center',
+            width: 160,
+            showOverflowTooltip: true
           },
           {
-            label: '出库数量',
-            prop: 'outStorageQuantity',
-            minWidth: 120,
-            formatter: (row) => {
-              return (row.outStorageQuantity || 0) + (row.outStorageUnit || '');
-            }
+            prop: 'brandNum',
+            label: '牌号',
+            align: 'center'
+          },
+          {
+            label: '工序名称',
+            prop: 'produceTaskName',
+            minWidth: 120
           },
           {
-            label: '投料数量',
+            label: '数量',
             prop: 'feedQuantity',
             minWidth: 120,
             formatter: (row) => {

src/views/produce/components/prenatalExamination/materialModal.vue

@@ -86,32 +86,34 @@
           },
           {
             label: '名称',
-            prop: 'categoryName',
+            prop: ' ',
             minWidth: 120
           },
           {
-            label: '工序名称',
-            prop: 'produceTaskName',
-            minWidth: 120
+            prop: 'modelType',
+            label: '型号',
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
-            label: '领料数量',
-            prop: 'pickQuantity',
-            minWidth: 120,
-            formatter: (row) => {
-              return (row.pickQuantity || 0) + (row.pickUnit || '');
-            }
+            prop: 'specification',
+            label: '规格',
+            align: 'center',
+            width: 160,
+            showOverflowTooltip: true
           },
           {
-            label: '出库数量',
-            prop: 'outStorageQuantity',
-            minWidth: 120,
-            formatter: (row) => {
-              return (row.outStorageQuantity || 0) + (row.outStorageUnit || '');
-            }
+            prop: 'brandNum',
+            label: '牌号',
+            align: 'center'
+          },
+          {
+            label: '工序名称',
+            prop: 'produceTaskName',
+            minWidth: 120
           },
           {
-            label: '投料数量',
+            label: '数量',
             prop: 'feedQuantity',
             minWidth: 120,
             formatter: (row) => {

src/views/produce/components/prenatalExamination/releaseRulesDialog.vue

@@ -632,31 +632,50 @@
             prop: 'categoryName',
             minWidth: 120
           },
+          ,
           {
-            label: '工序名称',
-            prop: 'produceTaskName',
-            minWidth: 120
+            prop: 'modelType',
+            label: '型号',
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
-            label: '领料数量',
-            prop: 'pickQuantity',
-            minWidth: 120,
-            formatter: (row) => {
-              return (row.pickQuantity || '') + (row.pickUnit || '');
-            }
+            prop: 'specification',
+            label: '规格',
+            align: 'center',
+            width: 160,
+            showOverflowTooltip: true
           },
           {
-            label: '出库数量',
-            prop: 'outStorageQuantity',
-            minWidth: 120,
-            formatter: (row) => {
-              return (
-                (row.outStorageQuantity || '') + (row.outStorageUnit || '')
-              );
-            }
+            prop: 'brandNum',
+            label: '牌号',
+            align: 'center'
+          },
+          {
+            prop: 'modelType',
+            label: '型号',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'specification',
+            label: '规格',
+            align: 'center',
+            width: 160,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'brandNum',
+            label: '牌号',
+            align: 'center'
+          },
+          {
+            label: '工序名称',
+            prop: 'produceTaskName',
+            minWidth: 120
           },
           {
-            label: '投料数量',
+            label: '数量',
             prop: 'feedQuantity',
             minWidth: 120,
             formatter: (row) => {