代码合并

src/views/inspectionTemplate/AddorUpdate.vue

@@ -23,7 +23,7 @@
       label-width="80px"
     >
       <el-row style="margin-bottom: 10px">
-        <el-col :span="6"
+        <el-col :span="4"
           ><el-form-item label="类型 " prop="type">
             <el-select
               clearable
@@ -39,7 +39,7 @@
               />
             </el-select> </el-form-item
         ></el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="名称" prop="qualitySchemeTemplateName">
             <el-input
               v-model="dataForm.qualitySchemeTemplateName"
@@ -47,7 +47,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="编码" prop="qualitySchemeTemplateCode">
             <el-input
               v-model="dataForm.qualitySchemeTemplateCode"
@@ -56,7 +56,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6"
+        <el-col :span="4"
           ><el-form-item label="状态 " prop="status">
             <el-select
               clearable

src/views/sample/samplemanagement/detailList.vue

@@ -43,7 +43,7 @@
           <el-popconfirm
             class="ele-action"
             title="确定要删除吗？"
-            v-if="row.disposalStatus == null"
+            v-if="row.disposalStatus !== 2"
             @confirm="remove(row)"
           >
             <template v-slot:reference>
@@ -57,7 +57,7 @@
             type="primary"
             :underline="false"
             icon="el-icon-edit"
-            v-if="row.disposalStatus == null"
+            v-if="row.disposalStatus !== 2"
             @click="disposeList(2, row)"
           >
             处置
@@ -377,7 +377,7 @@
           // },
           {
             prop: 'disposalStatus',
-            label: '处置结果',
+            label: '处置状态',
             align: 'center',
             width: '120',
             showOverflowTooltip: true,

src/views/sample/samplemanagement/index.vue

@@ -183,6 +183,8 @@
             align: 'center',
             width: 80,
             formatter: (row, column, cellValue) => {
+              console.log(this.getDictName('处置状态', cellValue));
+              
               return this.getDictName('处置状态', cellValue);
             }
           },

src/views/unqualifiedProduct/unqualifiedList/detailList.vue

@@ -38,7 +38,7 @@
           <el-popconfirm
             class="ele-action"
             title="确定要删除吗？"
-            v-if="row.disposalStatus == null"
+            v-if="row.disposalStatus !== 2"
             @confirm="remove(row)"
           >
             <template v-slot:reference>
@@ -52,7 +52,7 @@
             type="primary"
             :underline="false"
             icon="el-icon-edit"
-            v-if="row.disposalStatus == null"
+            v-if="row.disposalStatus !== 2"
             @click="disposeFn(2, row)"
           >
             处置
@@ -457,7 +457,7 @@
           },
           {
             prop: 'disposalStatus',
-            label: '处置结果',
+            label: '处置状态',
             align: 'center',
             width: '120',
             showOverflowTooltip: true,
@@ -471,8 +471,10 @@
             align: 'center',
             width: '120',
             showOverflowTooltip: true,
-            formatter: (row, column, cellValue) => {
-              return this.allList.filter((item) => item.val == cellValue).value;
+            formatter: (row, column, cellValue) => {   
+              console.log(this.allList.find((item) => item.value == cellValue));
+              
+              return this.allList.find((item) => item.value == cellValue)?.label;
             }
           },
 

src/views/unqualifiedProduct/unqualifiedList/index.vue

@@ -218,6 +218,8 @@
             align: 'center',
             width: 80,
             formatter: (row, column, cellValue) => {
+              console.log(this.getDictName('处置状态', cellValue));
+
               return this.getDictName('处置状态', cellValue);
             }
           },
@@ -234,7 +236,9 @@
         ];
       }
     },
-    created() {},
+    created() {
+      this.requestDict('处置状态');
+    },
     filters: {},
     methods: {
       //处置