From 617a3df003a0a2d964f4dc06ed09ffdd0c816832 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 15 Jan 2024 16:06:04 +0800
Subject: [PATCH] =?UTF-8?q?2024-1-15-1=20=E8=B4=A8=E9=87=8F=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E7=94=9F=E4=BA=A7=E8=BF=87=E7=A8=8B=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C-=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality/qcIncome/checkProjectType.vue     | 33 +++++++++++++------
 src/views/quality/qcProduce/index.vue         | 17 +++++-----
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue
index 3f46044..45d9074 100644
--- a/src/views/quality/qcIncome/checkProjectType.vue
+++ b/src/views/quality/qcIncome/checkProjectType.vue
@@ -24,13 +24,13 @@
             />
           </template>
         </el-table-column>
-          <el-table-column label="检验方式"  align="left" prop="checkMode" " />
+          <el-table-column label="检验方式"  align="left" prop="checkMode" />
           <el-table-column label="检验工具"  align="left" prop="checkTool"  />
           <el-table-column label="检验标准"  align="left" prop="checkStandard"  />
           <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">
+          <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"
@@ -40,8 +40,10 @@
               ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="测量值"  align="left"  prop="actualValue"  width="120" v-if="checkStatus == '0' "/>
-          <el-table-column label="不良项目"  align="left"  prop="defectCode"  width="120" v-if="checkStatus == '0' ">
+          <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">
@@ -49,7 +51,7 @@
               </el-select>
             </template>
           </el-table-column>
-           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="checkStatus == '0' ">
+           <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"
@@ -72,7 +74,7 @@
       </el-col>
     </el-row>
     <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitBomForm"  v-if="checkStatus == '0' ">确 定</el-button>
+              <el-button type="primary" @click="submitBomForm"  v-if="this.viewStatus != '1' ">确 定</el-button>
               <el-button @click="cancelForm" >取 消</el-button>
        </div>
   </el-dialog>
@@ -108,7 +110,8 @@ export default {
   dicts: ["check_result","qc_rule_prop"],
   data() {
     return {
-      showFlag:false,
+      viewStatus : '0',
+      showFlag : false,
       // 选中数组
       selectedRows: {},
       // 非单个禁用
@@ -153,9 +156,6 @@ export default {
   created() {
     this.getDefect();
   },
-  props: {
-    checkStatus : undefined,
-  },
   methods: {
 
     getDefect(){
@@ -170,6 +170,19 @@ export default {
       this.typeCode = typeCode;
       this.checkType = this.data.checkType;
       this.orderNo = this.data.orderNo;
+      this.viewStatus = this.data.checkStatus;
+      this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 10;
+      this.getList();
+    },
+
+    view(rowdata,typeCode){
+      this.data=rowdata;
+      this.queryParams.belongTo = this.data.recordId;
+      this.typeCode = typeCode;
+      this.checkType = this.data.checkType;
+      this.orderNo = this.data.orderNo;
+      this.viewStatus = "1";
       this.queryParams.pageNum = 1;
       this.queryParams.pageSize = 10;
       this.getList();
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index 8974b43..fb2cdb6 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -227,12 +227,6 @@
 						@click="handleCheckProject(scope.row)"
 						v-hasPermi="['quality:qcProduce:edit']"
 					>检验</el-button>
-			    <!--检验项目弹窗-->
-			    <ItemSelectProject
-				    ref="itemSelectProject"
-				    @saveCheck="saveCheck"
-				    :checkStatus = "scope.row.checkStatus"
-			    ></ItemSelectProject>
 					<!--
 					<el-button
 						size="mini"
@@ -409,6 +403,11 @@
 				ref="itemSelectUser"
 				@onSelected="onSelectUser"
 			></ItemSelectUser>
+			<!--检验项目弹窗-->
+			<ItemSelectProject
+				ref="itemSelectProject"
+				@saveCheck="saveCheck"
+			></ItemSelectProject>
 	</div>
 </template>
 
@@ -428,7 +427,7 @@ export default {
 	dicts: ["unit","check_status","check_result"],
 	data() {
 		return {
-			showFlag:false,
+		  showFlag:false,
 			// 遮罩层
 			loading: true,
 			// 选中数组
@@ -699,7 +698,7 @@ export default {
 		},
 		//工单选择确认
 		onSelectWorkOrder(obj) {
-           this.form.orderNo = obj.workorderCode;
+           this.form.orderNo = obj.orderNo;
 		   this.form.materialName = obj.materialName;
 		   this.form.materialCode = obj.materialCode;
            this.form.quality = obj.quality;
@@ -742,7 +741,7 @@ export default {
 		//查看检验项目弹窗
 		handleView(row){
 			this.$refs.itemSelectProject.showFlag = true;
-			this.$refs.itemSelectProject.init(row,'produce');
+			this.$refs.itemSelectProject.view(row,'produce');
 		},
 		//提交检测结果
 		saveCheck(){