From f67405d77f7b27359266489b90ecae7ea154836d Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 29 Apr 2024 16:47:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=A3=80=E9=AA=8C=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checkTypeProject/selectProject.vue        |  2 +-
 src/views/quality/qcProjectType/data.vue      | 28 +++++++++++++++++++
 src/views/quality/qcWarehousing/index.vue     |  4 +--
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/views/quality/checkTypeProject/selectProject.vue b/src/views/quality/checkTypeProject/selectProject.vue
index d24b451..8f99aea 100644
--- a/src/views/quality/checkTypeProject/selectProject.vue
+++ b/src/views/quality/checkTypeProject/selectProject.vue
@@ -66,7 +66,7 @@
           </el-table-column>
           <el-table-column label="测量单位"  align="left" prop="unitCode" width="90"/>
           <el-table-column label="抽样方案"  align="left" prop="samplePlan" width="100" :show-overflow-tooltip="true"/>
-          <el-table-column label="合格判定"  align="left" prop="judge" width="100" />
+          <el-table-column label="合格判定"  align="left" prop="judge" width="100" :show-overflow-tooltip="true"/>
           <el-table-column label="缺陷等级"  align="left" prop="defectLevel" width="90"/>
           <el-table-column label="检验方式"  align="left" prop="checkMode" width="90" :show-overflow-tooltip="true"/>
           <el-table-column label="检验工具"  align="left" prop="checkTool" width="90"/>
diff --git a/src/views/quality/qcProjectType/data.vue b/src/views/quality/qcProjectType/data.vue
index 00abfa8..fde9384 100644
--- a/src/views/quality/qcProjectType/data.vue
+++ b/src/views/quality/qcProjectType/data.vue
@@ -120,6 +120,8 @@
 			</el-table-column>
 			<el-table-column label="抽样方案" align="center" prop="samplePlan" :show-overflow-tooltip="true" width="200"/>
 			<el-table-column label="合格判定" align="center" prop="judge" :show-overflow-tooltip="true" width="200"/>
+			<el-table-column label="检测项分类" align="center" prop="itemType" width="100" :formatter="itemTypeFormat" />
+			<el-table-column label="合格判定比例" align="center" prop="judgeRate"  width="150"/>
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
 				<template slot-scope="scope">
 					<el-button
@@ -244,6 +246,21 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
+				<el-row>
+					<el-col>
+						<el-form-item label="检测项分类" prop="itemType">
+							<el-radio v-model="form.itemType" label="1">包装</el-radio>
+  							<el-radio v-model="form.itemType" label="0">内容物</el-radio>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col>
+						<el-form-item label="合格判定比例" prop="judgeRate">
+							<el-input type='number' v-model="form.judgeRate" placeholder="合格判定比例" />
+						</el-form-item>
+					</el-col>
+				</el-row>
 
 			</el-form>
 			<div slot="footer" class="dialog-footer">
@@ -365,6 +382,17 @@ export default {
 		this.getProjectTypeList();
 	},
 	methods: {
+        //检测项类型格式化
+		itemTypeFormat(row, column, cellValue) {
+			if (cellValue != null) {
+				if(cellValue=='1'){
+                   return '包装';
+				}else if(cellValue=='0'){
+					return '内容物';
+				}
+			}
+		},
+
 		/** 查询检验项目维护列表 */
 		getList() {
 			this.loading = true;
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index 2abe4b3..cf5dbb9 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -166,8 +166,8 @@
           }}</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="incomeBatchNo" width="200" :show-overflow-tooltip="true"/>-->
+			<el-table-column label="订单号" align="center" prop="orderNo" width="130"/>
 			<el-table-column label="物料号" align="center" prop="materialCode" width="170" />
 			<el-table-column label="物料名称" align="center" prop="materialName" width="250" :show-overflow-tooltip="true"/>
 			<el-table-column label="数量" align="center" prop="quality" />