update:修改检测项目显示

src/views/mes/qc/ipqc/index.vue

@@ -144,7 +144,7 @@
           <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="150" fixed="right" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -369,7 +369,7 @@
       </el-form>
       <el-divider v-if="form.ipqcId !=null" content-position="center">检测项</el-divider>
       <el-card shadow="always" v-if="form.ipqcId !=null" class="box-card">
-          <Ipqcline ref=line :ipqcId="form.ipqcId" :optType="optType"></Ipqcline>
+          <Ipqcline ref="lineRef" :ipqcId="form.ipqcId" :optType="optType"></Ipqcline>
       </el-card>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
@@ -605,7 +605,23 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.ipqcId != null) {
-            updateIpqc(this.form).then(response => {
+            const data = Object.assign({}, this.form)
+            const qcLines = this.$refs.lineRef.ipqclineList
+            const qcIpqclineList = qcLines.map(item => {
+              let selectValues = item.selectValues
+              let qualityCheckResults = item.qualityCheckResults
+              if (item.inputType == 2) {
+                selectValues = JSON.stringify(item.selectValues)
+                qualityCheckResults = JSON.stringify(item.qualityCheckResults)
+              }
+              return {
+                ...item,
+                selectValues,
+                qualityCheckResults
+              }
+            })
+            data.qcIpqclineList = qcIpqclineList
+            updateIpqc(data).then(response => {
               this.$modal.msgSuccess("修改成功");
               //this.open = false;
               this.getList();

src/views/mes/qc/ipqc/line.vue

@@ -2,22 +2,19 @@
   <div class="app-container">
     <el-table v-loading="loading" :data="ipqclineList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="检测项名称" width="120px" align="center" prop="indexName" />
-      <el-table-column label="检测项类型" width="100px" align="center" prop="indexType">
+      <el-table-column label="质检项目" width="120" align="center" prop="indexName" />
+      <el-table-column label="检验要求" align="center" prop="checkMethod" />
+      <el-table-column label="检验结果" width="300" align="center" prop="qualityCheckResults">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
+          <div>
+            <el-checkbox-group v-if="scope.row.inputType == 2" v-model="scope.row.qualityCheckResults">
+              <el-checkbox v-for="(item, index) in scope.row.selectValues" :key="index" :label="item.name"></el-checkbox>
+            </el-checkbox-group>
+            <el-input v-else v-model="scope.row.qualityCheckResults" placeholder="请输入检验结果"></el-input>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column label="检测工具" align="center" prop="qcTool" />
-      <el-table-column label="检测要求" align="center" prop="checkMethod" />
-      <el-table-column label="标准值" align="center" prop="standerVal" />
-      <el-table-column label="单位" align="center" prop="unitOfMeasure" />
-      <el-table-column label="误差上限" align="center" prop="thresholdMax" />
-      <el-table-column label="误差下限" align="center" prop="thresholdMin" />
-      <el-table-column label="致命缺陷数量" align="center" prop="crQuantity" />
-      <el-table-column label="严重缺陷数量" align="center" prop="majQuantity" />
-      <el-table-column label="轻微缺陷数量" align="center" prop="minQuantity" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作"  align="center" width="120">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -26,11 +23,11 @@
             @click="handleDefect(scope.row)"
             v-hasPermi="['mes:qc:ipqc:edit']"
             v-if="optType !='view'"
-          >缺陷记录</el-button>        
+          >缺陷记录</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -107,7 +104,7 @@ export default {
         ],
       }
     };
-  },  
+  },
   created() {
     this.getList();
   },
@@ -116,7 +113,26 @@ export default {
     getList() {
       this.loading = true;
       listIpqcline(this.queryParams).then(response => {
-        this.ipqclineList = response.rows;
+        // console.log(response, 'response88')
+        this.ipqclineList = response.rows.map(item => {
+          let selectValues = item.selectValues
+          let qualityCheckResults = item.qualityCheckResults
+          if (item.inputType == 2) {
+            // selectValues = selectValues? JSON.parse(item.selectValues) : []
+            if (selectValues) {
+              selectValues = JSON.parse(item.selectValues)
+            } else {
+              selectValues = []
+            }
+            qualityCheckResults = qualityCheckResults? JSON.parse(item.qualityCheckResults) : []
+          }
+          return {
+            ...item,
+            selectValues,
+            qualityCheckResults
+          }
+        })
+        // console.log(this.ipqclineList, 'this.ipqclineList')
         this.total = response.total;
         this.loading = false;
       });
@@ -174,7 +190,7 @@ export default {
     },
     //缺陷记录
     handleDefect(row){
-      this.defect_qcid = row.ipqcId;      
+      this.defect_qcid = row.ipqcId;
       this.defect_qclineid = row.lineId;
       this.$nextTick(() => {
         this.$refs.defectDialog.showFlag = true;