Jelajahi Sumber

fix(inspectionProjectReport): 调整样品合格数和不合格数的字段名称及格式化逻辑

xieyong 1 Minggu lalu
induk
melakukan
00086aa7ad

+ 13 - 13
src/views/inspectionWork/components/inspectionProjectReport.vue

@@ -425,34 +425,34 @@
             showOverflowTooltip: true
           },
           {
-            minWidth: 180,
-            prop: 'sampleNoQualifiedNumber',
-            slot: 'sampleNoQualifiedNumber',
+            minWidth: 140,
+            prop: 'sampleQualifiedNumber',
+            headerSlot: 'isRequired',
+            slot: 'sampleQualifiedNumber',
             align: 'center',
-            label: '样品不合格数',
             formatter: (row) => {
-              if (row.sampleNoQualifiedNumber) {
+              if (row.sampleQualifiedNumber) {
                 return (
-                  row.sampleNoQualifiedNumber + (this.form.measureUnit || '')
+                  row.sampleQualifiedNumber + (this.form.measureUnit || '')
                 );
               }
             },
+            label: '样品合格数',
             showOverflowTooltip: true
           },
           {
-            minWidth: 140,
-            prop: 'sampleQualifiedNumber',
-            headerSlot: 'isRequired',
-            slot: 'sampleQualifiedNumber',
+            minWidth: 180,
+            prop: 'sampleNoQualifiedNumber',
+            slot: 'sampleNoQualifiedNumber',
             align: 'center',
+            label: '样品不合格数',
             formatter: (row) => {
-              if (row.sampleQualifiedNumber) {
+              if (row.sampleNoQualifiedNumber) {
                 return (
-                  row.sampleQualifiedNumber + (this.form.measureUnit || '')
+                  row.sampleNoQualifiedNumber + (this.form.measureUnit || '')
                 );
               }
             },
-            label: '样品合格数',
             showOverflowTooltip: true
           },
           {