Jelajahi Sumber

修改合格证表格列配置,新增生成类型和加工类型格式化显示

yusheng 3 bulan lalu
induk
melakukan
17215fba61
1 mengubah file dengan 23 tambahan dan 2 penghapusan
  1. 23 2
      src/views/batchRecord/components/tables/certificate.vue

+ 23 - 2
src/views/batchRecord/components/tables/certificate.vue

@@ -241,7 +241,7 @@
           // },
 
           {
-            prop: 'executeUserName',
+            prop: 'measureUnit',
             minWidth: 110,
             label: '计量单位',
             align: 'center',
@@ -253,6 +253,13 @@
             minWidth: 110,
             label: '加工类型',
             align: 'center',
+            formatter: (row) => {
+              return row.processingType == 2
+                ? '加工'
+                : row.processingType == 3
+                ? '装配'
+                : '';
+            },
             showOverflowTooltip: true
           },
           {
@@ -304,6 +311,20 @@
             },
             showOverflowTooltip: true
           },
+          {
+            prop: 'generateType',
+            minWidth: 110,
+            label: '生成类型',
+            align: 'center',
+            formatter: (row) => {
+              return row.generateType == 1
+                ? '自动生成'
+                : row.generateType == 2
+                ? '手动新增'
+                : '';
+            },
+            showOverflowTooltip: true
+          },
           {
             prop: 'createUserName',
             minWidth: 110,
@@ -382,7 +403,7 @@
         this.QRvisible = true;
         if (!row.reportTemplateJson.template) {
           this.$nextTick(() => {
-            console.log(this.$refs,'this.$refs')
+            console.log(this.$refs, 'this.$refs');
             this.$refs.template.init(row);
           });
         }