From 367c23c758b5980b476525430cb560e847b180d6 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 15 Jan 2024 16:32:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=963?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality/qcIncome/checkProjectType.vue     | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue
index 1c81222..381bcc0 100644
--- a/src/views/quality/qcIncome/checkProjectType.vue
+++ b/src/views/quality/qcIncome/checkProjectType.vue
@@ -30,28 +30,15 @@
           <el-table-column label="上差值"  align="left" prop="upperDiff"  />
           <el-table-column label="下差值"  align="left" prop="downDiff"  />
           <el-table-column label="单位"  align="left"  prop="unitCode" width="80"/>
-          <el-table-column label="检测结果" key="status" align="center" prop="status" width="90" v-if="this.viewStatus != '1' ">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.status"
-                active-value="Y"
-                inactive-value="N"
-                @change="handleStatusChange(scope.row)"
-              ></el-switch>
-            </template>
-          </el-table-column>
           <el-table-column label="检测结果" key="status" align="center" prop="status" width="90" v-if="this.viewStatus == '1' ">
           </el-table-column>
           <el-table-column label="测量值"  align="left"  prop="actualValue"  width="120" v-if="this.viewStatus != '1' "/>
-          <el-table-column label="不良项目"  align="left"  prop="defectCode"  width="120" v-if="this.viewStatus != '1' ">
-            <template scope="scope">
-              <el-select v-model="scope.row.defectCode">
-                <el-option v-for="item in defectList" :key="item.defectCode" :label="item.defectSubclass" :value="item.defectCode">
-                </el-option>
-              </el-select>
+          <el-table-column label="不良描述"  align="left"  prop="remark"  width="120">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark" placeholder="请输入不良描述" />
             </template>
           </el-table-column>
-           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="this.viewStatus != '1' ">
+           <el-table-column label="检测值" align="center" class-name="small-padding fixed-width" v-if="this.viewStatus != '1' ">
             <template slot-scope="scope">
               <el-button
                 size="mini"
@@ -62,6 +49,16 @@
               >检测值</el-button>
             </template>
           </el-table-column>
+          <el-table-column label="检测结果" key="status" align="center" prop="status" width="90" v-if="this.viewStatus != '1' ">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="scope.row.status"
+                active-value="Y"
+                inactive-value="N"
+                @change="handleStatusChange(scope.row)"
+              ></el-switch>
+            </template>
+          </el-table-column>
         </el-table>
 
         <pagination
@@ -229,7 +226,7 @@ export default {
 		handleStatusChange(row) {
 			let text = row.status === "N" ? "不合格" : "合格";
 			this.$modal.confirm('确认' + '"' + row.projectNo + '"'+text+'吗？').then(function() {
-				return changeCheckDetailStatus(row.recordId, row.status, row.defectCode);
+				return changeCheckDetailStatus(row.recordId, row.status, row.defectCode,row.remark);
 			}).then(() => {
 				this.$modal.msgSuccess(text + "操作成功");
 			}).catch(function() {