ysy 1 год назад
Родитель
Сommit
6eac3b9716
2 измененных файлов с 25 добавлено и 3 удалено
  1. 4 1
      src/views/inspectionWork/components/edit.vue
  2. 21 2
      src/views/inspectionWork/index.vue

+ 4 - 1
src/views/inspectionWork/components/edit.vue

@@ -120,7 +120,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="不合格数:">
+          <el-form-item label="不合格数:" prop="noQualifiedNumber">
             <el-input
               v-model="form.noQualifiedNumber"
               @input="inputValue"
@@ -322,6 +322,9 @@
           qualifiedNumber: [
             { required: true, message: '请输入', trigger: 'blur' }
           ],
+          noQualifiedNumber: [
+          { required: true, message: '请输入', trigger: 'blur' }
+          ],
           qualityTime: [{ required: true, message: '请输入', trigger: 'blur' }],
           groupId: [{ required: true, message: '请输入', trigger: 'change' }],
           qualityId: [{ required: true, message: '请输入', trigger: 'change' }]

+ 21 - 2
src/views/inspectionWork/index.vue

@@ -26,6 +26,16 @@
           </el-link>
         </template>
 
+        <template v-slot:qualityPlanName="{ row }">
+            
+             <div v-if="row.qualityPlanId"> {{  row.qualityPlanName }}</div>
+             <div v-else><el-tag size="mini">自建</el-tag></div>
+        </template>
+
+
+        
+
+
         <template v-slot:files="scope">
           <el-link
             v-for="link in scope.row.files"
@@ -130,18 +140,27 @@
             showOverflowTooltip: true,
             align: 'center'
           },
+          {
+            prop: 'qualityPlanName',
+            slot: 'qualityPlanName',
+            width: 120,
+            showOverflowTooltip: true,
+            label: '质检计划名称',
+            align: 'center'
+          },
+
           {
             prop: 'productName',
             width: 120,
             showOverflowTooltip: true,
-            label: '产品名称',
+            label: '名称',
             align: 'center'
           },
           {
             prop: 'productCode',
             width: 120,
             showOverflowTooltip: true,
-            label: '产品编码',
+            label: '编码',
             align: 'center'
           },
           {