From b94b30a099fff01692c7ef62053f34be2285ada8 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 15 Jan 2024 16:16: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-=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C=E3=80=81?=
 =?UTF-8?q?=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality/qcIncome/checkProjectType.vue     |  4 +-
 src/views/quality/qcIncome/index.vue          | 39 ++++++++++++-------
 src/views/quality/qcWarehousing/index.vue     | 35 +++++++++++------
 3 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue
index 45d9074..1c81222 100644
--- a/src/views/quality/qcIncome/checkProjectType.vue
+++ b/src/views/quality/qcIncome/checkProjectType.vue
@@ -24,9 +24,9 @@
             />
           </template>
         </el-table-column>
-          <el-table-column label="检验方式"  align="left" prop="checkMode" />
+          <el-table-column label="检验方式"  align="left" prop="checkMode" width="150" :show-overflow-tooltip="true"/>
           <el-table-column label="检验工具"  align="left" prop="checkTool"  />
-          <el-table-column label="检验标准"  align="left" prop="checkStandard"  />
+          <el-table-column label="检验标准"  align="left" prop="checkStandard"  width="150" :show-overflow-tooltip="true"/>
           <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"/>
diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue
index d7fa5e5..6d74e87 100644
--- a/src/views/quality/qcIncome/index.vue
+++ b/src/views/quality/qcIncome/index.vue
@@ -132,7 +132,13 @@
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
 			<el-table-column label="checkType" align="center" prop="checkType" v-if="false"/>
-			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
+			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120">
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleView(scope.row)">{{
+            scope.row.checkNo
+          }}</el-button>
+        </template>
+      </el-table-column>
 			<el-table-column label="来料批次号" align="center" prop="incomeBatchNo" width="120"/>
 			<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
 			<el-table-column label="物料号" align="center" prop="materialCode" width="170"/>
@@ -196,7 +202,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -246,24 +252,24 @@
 							<el-input v-model="form.materialCode" placeholder="请输入物料号" disabled/>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">	
+					<el-col :span="8">
 						<el-form-item label="来料批次号" prop="incomeBatchNo">
 							<el-input v-model="form.incomeBatchNo" placeholder="请输入来料批次号" />
 						</el-form-item>
 					</el-col>
-				</el-row>	
+				</el-row>
 				<el-row>
-					<el-col :span="6">	
+					<el-col :span="6">
 						<el-form-item label="收货数量" prop="quality">
 							<el-input type="number" v-model="form.quality" placeholder="请输入收货数量" />
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">	
+					<el-col :span="6">
 						<el-form-item label="抽样数量" prop="sampleQuality">
 							<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量" />
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">	
+					<el-col :span="6">
 						<el-form-item label="不合格数量" prop="noOkQuality">
 							<el-input type="number" v-model="form.noOkQuality" placeholder="请输入不合格数量" />
 						</el-form-item>
@@ -289,11 +295,11 @@
 							</el-input>
 						</el-form-item>
 					</el-col>
-				   <el-col :span="8">	
+				   <el-col :span="8">
 						<el-form-item label="供应商编码" prop="supplierCode">
 							<el-input v-model="form.supplierCode" placeholder="请输入供应商编码" disabled/>
 						</el-form-item>
-					</el-col>	
+					</el-col>
 					<el-col :span="8">
 						<el-form-item label="来料时间" prop="incomeTime">
 							<el-date-picker clearable
@@ -304,7 +310,7 @@
 							</el-date-picker>
 						</el-form-item>
 					</el-col>
-				</el-row>	
+				</el-row>
 				<el-row>
 					<el-col :span="8">
 						<el-form-item label="检测人姓名" prop="checkManName">
@@ -318,12 +324,12 @@
 							<el-input v-model="form.checkManCode" placeholder="请输入检测人工号" disabled/>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">	
+					<el-col :span="8">
 						<el-form-item label="检测地点" prop="checkLoc">
 							<el-input v-model="form.checkLoc" placeholder="请输入检测地点" />
 						</el-form-item>
 					</el-col>
-				</el-row>	
+				</el-row>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -420,7 +426,7 @@ export default {
 			// 表单校验
 			rules: {
 				checkType:[
-                  { required: true, message: "检验类型不能为空", trigger: "blur" } 
+                  { required: true, message: "检验类型不能为空", trigger: "blur" }
 				],
 				incomeBatchNo: [
 					{ required: true, message: "来料批次号不能为空", trigger: "blur" }
@@ -645,7 +651,7 @@ export default {
            this.form.supplierCode = obj.code;
 		   this.form.supplierName = obj.name;
 		},
-		
+
 		/**人员选择弹出框**/
 		handleSelectUser() {
 		  this.$refs.itemSelectUser.showFlag = true;
@@ -666,6 +672,11 @@ export default {
 			this.$refs.itemSelectProject.showFlag = true;
 			this.$refs.itemSelectProject.init(row,'material');
 		},
+		//查看检验项目弹窗
+		handleView(row){
+			this.$refs.itemSelectProject.showFlag = true;
+			this.$refs.itemSelectProject.view(row,'produce');
+		},
 		//提交检测结果
 		saveCheck(){
             this.getList();
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index 69cea58..889c580 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -9,7 +9,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			
+
 			<el-form-item label="批次号" prop="incomeBatchNo">
 				<el-input
 					v-model="queryParams.incomeBatchNo"
@@ -160,7 +160,13 @@
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="id" align="center" prop="recordId" v-if="false"/>
 			<el-table-column label="checkType" align="center" prop="checkType" v-if="false"/>
-			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
+			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120">
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleView(scope.row)">{{
+            scope.row.checkNo
+          }}</el-button>
+        </template>
+      </el-table-column>
 			<el-table-column label="批次号" align="center" prop="incomeBatchNo" width="200" :show-overflow-tooltip="true"/>
 			<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
 			<el-table-column label="物料号" align="center" prop="materialCode" width="170" />
@@ -221,7 +227,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -273,12 +279,12 @@
 							<el-input v-model="form.materialCode" placeholder="请输入物料号" disabled/>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">	
+					<el-col :span="8">
 						<el-form-item label="入库数量" prop="quality">
 							<el-input type="number" v-model="form.quality" placeholder="请输入收货数量" />
 						</el-form-item>
 					</el-col>
-				</el-row>	
+				</el-row>
 				<el-row>
                     <el-col :span="6">
 						<el-form-item label="入库时间" prop="incomeTime">
@@ -290,12 +296,12 @@
 							</el-date-picker>
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">	
+					<el-col :span="6">
 						<el-form-item label="抽样数量" prop="sampleQuality">
 							<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量" />
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">	
+					<el-col :span="6">
 						<el-form-item label="不合格数量" prop="noOkQuality">
 							<el-input type="number" v-model="form.noOkQuality" placeholder="请输入不合格数量" />
 						</el-form-item>
@@ -333,13 +339,13 @@
 							</el-input>
 						</el-form-item>
 					</el-col>
-				   <el-col :span="8">	
+				   <el-col :span="8">
 						<el-form-item label="仓库编码" prop="supplierCode">
 							<el-input v-model="form.supplierCode" placeholder="请输入仓库编码" disabled/>
 						</el-form-item>
-					</el-col>	
+					</el-col>
 
-				</el-row>	
+				</el-row>
 				<el-row>
 					<el-col :span="8">
 						<el-form-item label="检测人姓名" prop="checkManName">
@@ -353,12 +359,12 @@
 							<el-input v-model="form.checkManCode" placeholder="请输入检测人工号" disabled/>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">	
+					<el-col :span="8">
 						<el-form-item label="检测地点" prop="checkLoc">
 							<el-input v-model="form.checkLoc" placeholder="请输入检测地点" />
 						</el-form-item>
 					</el-col>
-				</el-row>	
+				</el-row>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -715,6 +721,11 @@ export default {
 			this.$refs.itemSelectProject.showFlag = true;
 			this.$refs.itemSelectProject.init(row,'product');
 		},
+		//查看检验项目弹窗
+		handleView(row){
+			this.$refs.itemSelectProject.showFlag = true;
+			this.$refs.itemSelectProject.view(row,'produce');
+		},
 		//提交检测结果
 		saveCheck(){
             this.getList();