全检不显示质检结果；计划新增创建时间；工单样品质检如果质检项只有一条，同步质检里面的状态；

src/views/inspectionPlan/components/baseInfo.vue

@@ -344,7 +344,7 @@ export default {
     this.getDictListIqoCode('iqo_code');
   },
   methods: {
-    toggleExpand() {
+    toggleExpand(val) {
       this.isExpanded = !this.isExpanded;
     },
     // 获取检验标准

src/views/inspectionPlan/index.vue

@@ -180,6 +180,13 @@ export default {
           width: 120,
           showOverflowTooltip: true
         },
+        {
+          label: '创建时间',
+          prop: 'createTime',
+          align: 'center',
+          width: 120,
+          showOverflowTooltip: true
+        },
         {
           label: '开始时间',
           prop: 'planStartTime',

src/views/inspectionWork/components/QualityContentTabs.vue

@@ -199,7 +199,12 @@ export default {
       {
         value: 2,
         label: '不合格'
-      }],
+      },
+      {
+        value: 3,
+        label: '让步接收'
+      },
+      ],
       tableColumns: [
         {
           label: '样品编码',

src/views/inspectionWork/components/baseInfo.vue

@@ -184,7 +184,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="质检结果:" prop="qualityResults">
+          <el-form-item label="质检结果:" prop="qualityResults" v-if="form.qualityMode == 2">
             <el-select v-model="form.qualityResults" placeholder="请选择" style="width: 100%"
               :disabled="btnType == 'issued'" clearable>
               <el-option label="合格" :value=1 />
@@ -299,8 +299,11 @@ export default {
   methods: {
     toggleExpand() {
       this.isExpanded = !this.isExpanded;
+    },
+    toggleExpand2() {
+      this.isExpanded = true;
       this.$nextTick(() => {
-        this.$refs.form1.clearValidate();
+        this.$refs.form1.validateField('qualityResults');
       });
     },
     async getDictListIqoCode(code) {

src/views/inspectionWork/components/sampleListDialog.vue

@@ -141,7 +141,17 @@ export default {
             this.tableData = [];
             this.rowIndex = index
             this.type = type;
-            console.log(list, 'lklllllllllllllllllkkkkkkkkkkkkkkkkkkkkk');
+            console.log(list, 'lklllllllllllllllllkkkkkkkkkkkkkkkkkkkkk', list[0].qualityResults);
+
+            //如果质检项qualitySampleTemplateList只有一条数据且质检结果是让步接收
+            if (list[0].qualitySampleTemplateList.length == 1) {
+                for (let i = 0; i < list[0].qualitySampleTemplateList.length; i++) {
+                    list[0].qualitySampleTemplateList[i].qualityResults = list[0].qualityResults
+
+                }
+            }
+
+
             this.tableData = list;
 
             this.visible = true;

src/views/inspectionWork/edit.vue

@@ -527,10 +527,14 @@ export default {
     },
     // 报工
     handleReporting(index, row) {
+      if (this.form.qualityMode == 2 && !this.form.qualityResults) {
+        this.$refs.baseInfoRefs.toggleExpand2();
+        this.$message.error('请选择质检结果');
+        return;
+      }
+
       this.$refs.baseInfoRefs.$refs.form1.validate((valid) => {
-        if (!this.form.qualityResults) return this.$message.error('请选择质检结果')
         if (!valid) return false;
-
         this.loading = true;
 
         if (this.qualityType == 2 && this.isReportProcessProduce) {
@@ -539,6 +543,7 @@ export default {
 
             if (disposalStatus == null) {
               this.loading = false;
+              this.$refs.tabsRef.tabsChange('2')
               this.$message.error('请完成以下样品处置！')
               return;
             }
@@ -550,6 +555,7 @@ export default {
 
           if (qualityStatus == '2') {
             this.loading = false;
+            this.$refs.tabsRef.tabsChange('2')
             this.$message.error('请完成以下样品质检！');
             return;
           }
@@ -558,6 +564,10 @@ export default {
         this.form.qualityTimeEnd = new Date(this.getNowTime())
         this.form.qualityTimeStart = new Date(this.qualityTimeStart)
 
+        if (this.form.qualityMode == 1) {
+          this.form.qualityResults = ''
+        }
+
         let params = {
           ...this.form,
           sampleList: this.sampleList,