Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-qms

src/views/inspectionWork/details.vue

@@ -60,12 +60,12 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item label="质检人">
-                  <el-input :value="form.qualityName" disabled />
+                  <el-input :value="qualityName" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="质检时间">
-                  <el-input :value="form.qualityTime" disabled />
+                  <el-input :value="qualityTime" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -314,6 +314,14 @@
         return (type) => {
           return this.disposeTypeMap[type] || '';
         };
+      },
+      qualityName() {
+        const list = this.form.qualityWorkOrderDetailVO
+        return list.qualityName || '';
+      },
+      qualityTime() {
+        const list = this.form.qualityWorkOrderDetailVO
+        return list.qualityTime || '';
       }
     },
     created() {
@@ -356,6 +364,7 @@
           console.log(result, 'result');
           await this.getUserList({ groupId: result.data.groupId });
           const res = result.data;
+          console.log('res~~~~', res.qualityWorkOrderDetailVO);
           const qualityName = [];
           if (res.qualityId && this.executorList.length != 0) {
             res.qualityId.split(',').forEach((item) => {
@@ -375,6 +384,7 @@
           });
           this.form = obj;
           this.form.status = res.status;
+          this.form.qualityWorkOrderDetailVO = res.qualityWorkOrderDetailVO;
           this.accessory = res.accessory;
           console.log(result, 'result');
           if (name == '计划') {
@@ -382,6 +392,7 @@
           }
           this.fieldAssign(res, obj);
           this.sampleInfo(res);
+          console.log('this.form~~~~', this.form);
         } catch (err) {
           console.log(err, 'err');
         }
@@ -411,7 +422,7 @@
         this.$set(this.form, 'sampleQuantity', res.sampleQuantity);
         this.$set(this.form, 'sampleWeight', res.sampleWeight);
         this.$set(this.form, 'qualifiedNumber', res.qualifiedNumber);
-        this.$set(this.form, 'noQualifiedNumber', res.noQualifiedNumber);
+        this.$set(this.form, 'noQualifiedNumber', res.sampleNoQualifiedNumber);
         this.$set(this.form, 'remark', res.remark);
         this.sourceData3 = res.templateList || [];
         this.sourceData1 = res.qualityInventoryList || [];