优化合格证列表显示，调整表格列配置并新增生成类型和状态查询条件

src/views/certificateManagement/components/listCoom.vue

@@ -169,7 +169,7 @@
         ],
         processSubmitDialogFlag: false,
         // 表格列配置
-        reportTemplateList:[],
+        reportTemplateList: [],
         columns: []
       };
     },
@@ -295,7 +295,7 @@
           // },
 
           {
-            prop: 'executeUserName',
+            prop: 'measureUnit',
             minWidth: 110,
             label: '计量单位',
             align: 'center',
@@ -307,6 +307,13 @@
             minWidth: 110,
             label: '加工类型',
             align: 'center',
+            formatter: (row) => {
+              return row.processingType == 2
+                ? '加工'
+                : row.processingType == 3
+                ? '装配'
+                : '';
+            },
             showOverflowTooltip: true
           },
           {
@@ -358,6 +365,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,

src/views/certificateManagement/components/listCoomModal.vue

@@ -259,27 +259,34 @@
             align: 'center',
             showOverflowTooltip: true
           },
-          {
-            prop: 'executeDeptName',
-            label: '下发数量',
-            showOverflowTooltip: true,
-            align: 'center',
-            minWidth: 110
-          },
+          // {
+          //   prop: 'executeDeptName',
+          //   label: '下发数量',
+          //   showOverflowTooltip: true,
+          //   align: 'center',
+          //   minWidth: 110
+          // },
 
           {
-            prop: 'executeUserName',
+            prop: 'measureUnit',
             minWidth: 110,
             label: '计量单位',
             align: 'center',
             showOverflowTooltip: true
           },
 
-          {
+             {
             prop: 'processingType',
             minWidth: 110,
             label: '加工类型',
             align: 'center',
+            formatter: (row) => {
+              return row.processingType == 2
+                ? '加工'
+                : row.processingType == 3
+                ? '装配'
+                : '';
+            },
             showOverflowTooltip: true
           },
           {

src/views/certificateManagement/components/search.vue

@@ -25,10 +25,54 @@
           },
 
           {
-            label: '编号:',
+            label: '编码:',
             value: 'productCode',
             type: 'input',
             placeholder: '请输入'
+          },
+          {
+            label: '工序编号:',
+            value: 'produceTaskCode',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '状态:',
+            value: 'status',
+            type: 'select',
+            planList: [
+              {
+                label: '待提交',
+                value: 0
+              },
+              {
+                label: '审核中',
+                value: 1
+              },
+              {
+                label: '已审核',
+                value: 2
+              },
+              {
+                label: '已作废',
+                value: 3
+              },
+              {
+                label: '已驳回',
+                value: 4
+              },
+              {
+                label: '已撤回',
+                value: 5
+              }
+            ],
+            placeholder: '请选择'
+          },
+          {
+            label: '合格证号:',
+            value: 'code',
+            type: 'input',
+            placeholder: '请输入'
           }
         ];
       }

src/views/inspectionTemplate/AddorUpdate.vue

@@ -221,11 +221,11 @@
               </el-form-item>
             </div>
           </template>
-          <template v-slot:sort="{ row }">
+          <template v-slot:sort="{ row, $index }">
             <el-input
               v-model="row.sort"
               type="number"
-              @blur="handleSortBlur"
+              @blur="handleSortBlur(row, $index)"
               placeholder="输入排序"
             ></el-input>
           </template>
@@ -733,7 +733,10 @@
         }
       },
       //失去焦点自动排序
-      handleSortBlur() {
+      handleSortBlur(row, index) {
+        if (row.sort < 0) {
+          this.$set(this.dataForm.inspectionItemVOList[index], 'sort', 0);
+        }
         this.dataForm.inspectionItemVOList =
           this.dataForm.inspectionItemVOList.map((item) => ({
             ...item,