From 024ff7533b003db04882f54b0f30bc53c4f40f23 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Fri, 12 Jan 2024 15:29:25 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=BF=87=E7=A8=8B?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8CABC=E4=B8=8D=E8=89=AF=E5=93=81=E7=9A=84?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96,=E6=8A=BD=E6=A0=B7?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E4=BC=98=E5=8C=96,=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E7=BB=84=E6=88=90=E5=91=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/defectType.js                 |  6 ++++
 .../checkTypeProject/MaterialGroupAdd.vue     |  7 +++-
 src/views/quality/qcProduce/index.vue         | 32 ++++++++++---------
 src/views/quality/qcSampleRule/index.vue      |  9 ++----
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/api/quality/defectType.js b/src/api/quality/defectType.js
index 934f147..79146fe 100644
--- a/src/api/quality/defectType.js
+++ b/src/api/quality/defectType.js
@@ -42,3 +42,9 @@ export function delDefectType(faultId) {
 		method: 'delete'
 	});
 }
+export function getDefectTypeListByDefectType(defectType) {
+	return request({
+		url: '/quality/defectType/getDefectTypeListByDefectType/' + defectType,
+		method: 'get',
+	});
+}
diff --git a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
index 87873d3..4e5364d 100644
--- a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
+++ b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
@@ -313,7 +313,12 @@ export default {
        console.log(this.form.groupId);
        if(this.form.materialCode != null) {
         addMaterialGroupDetail(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
+              let message = response.code
+              if(message == 200) {
+                this.$modal.msgSuccess("新增成功");
+              }else {
+                this.$modal.msgError("新增失败");
+              }
               this.open = false;
               this.getMaterialTree();
             });
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index a16f56f..5a275f7 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -196,7 +196,7 @@
 				</template>
 			</el-table-column>
 			<el-table-column label="检验节点" align="center" prop="checkName" />
-			<el-table-column label="创建时间" align="center" prop="createTime" width="180">
+<el-table-column label="创建时间" align="center" prop="createTime" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
 				</template>
@@ -332,19 +332,9 @@
 							<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量" />
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
-						<el-form-item label="A类不良数量" prop="aNoOkquality">
-							<el-input type="number" v-model="form.aNoOkquality" placeholder="请输入不良数量" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="B类不良数量" prop="bNoOkquality">
-							<el-input type="number" v-model="form.bNoOkquality" placeholder="请输入不良数量" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-                        <el-form-item label="C类不良数量" prop="cNoOkquality">
-							<el-input type="number" v-model="form.cNoOkquality" placeholder="请输入不良数量" />
+					<el-col :span="6" v-for="(item,index) in form.defects" :key="index">
+						<el-form-item :label="item.defectSubclass" prop="">
+							<el-input type="number" v-model="item.noOkQuality" placeholder="请输入不合格数量" />
 						</el-form-item>
 					</el-col>
 				</el-row>
@@ -424,6 +414,7 @@ import ItemSelectWorkOrder from "./selectWorkOrder.vue";
 import ItemSelectWorkCenter from "./selectWorkCenter.vue";
 import ItemSelectUser from "../qcIncome/selectUser.vue";
 import ItemSelectProject from "../qcIncome/checkProjectType.vue";
+import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js";
 export default {
 	name: "QcProduce",
 	components: { ItemSelectWorkCenter,ItemSelectUser,ItemSelectProject,ItemSelectWorkOrder},
@@ -445,6 +436,7 @@ export default {
 			// 生产过程检验任务表格数据
 			qcProduceList: [],
 			checkTypeList:[],
+			defectTypeList: [],
 			// 弹出层标题
 			title: "",
 			// 是否显示弹出层
@@ -522,6 +514,7 @@ export default {
 		this.getDate();
 		this.getList();
 		this.getCheckTypes();
+		this.handleDefectType();
 	},
 	methods: {
         /****/
@@ -602,7 +595,8 @@ export default {
 				updateBy: null,
 				updateTime: null,
 				factoryCode: null,
-				delFlag: null
+				delFlag: null,
+				defects: []
 			};
 			this.resetForm("form");
 		},
@@ -625,8 +619,10 @@ export default {
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.reset();
+			this.form.defects = this.defectTypeList;
 			this.open = true;
 			this.title = "添加生产过程检验任务";
+			
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -735,6 +731,12 @@ export default {
 		//提交检测结果
 		saveCheck(){
             this.getList();
+		},
+		handleDefectType() {
+			const defectType = "produce"
+			getDefectTypeListByDefectType(defectType).then(response => {
+				this.defectTypeList = response.rows;
+			});
 		}
 	}
 };
diff --git a/src/views/quality/qcSampleRule/index.vue b/src/views/quality/qcSampleRule/index.vue
index f6c71fe..3a9b95c 100644
--- a/src/views/quality/qcSampleRule/index.vue
+++ b/src/views/quality/qcSampleRule/index.vue
@@ -133,13 +133,13 @@
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
 				<el-form-item label="开始值" prop="startValue">
-					<el-input v-model="form.startValue" placeholder="请输入数字" />
+					<el-input type="number" v-model="form.startValue" placeholder="请输入数字" />
 				</el-form-item>
 				<el-form-item label="结束值" prop="endValue">
-					<el-input v-model="form.endValue" placeholder="请输入数字" />
+					<el-input type="number" v-model="form.endValue" placeholder="请输入数字" />
 				</el-form-item>
 				<el-form-item label="抽样数量" prop="sampleQuality">
-					<el-input v-model="form.sampleQuality" placeholder="请输入抽样数量" />
+					<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量" />
 				</el-form-item>
 				<el-form-item label="检验类型" prop="typeCode">
 					<el-select v-model="form.typeCode" placeholder="请选择检验类型" 
@@ -217,15 +217,12 @@ export default {
 			rules: {
 				startValue: [
 					{ required: true, message: "开始值不能为空", trigger: "blur" },
-					{ pattern: /^[1-9]\d*$/, message: "请输入正整数,且开头不能为0", trigger: "blur"}
 				],
 				endValue: [
 					{ required: true, message: "结束值不能为空", trigger: "blur" },
-					{ pattern: /^[1-9]\d*$/, message: "请输入正整数,且开头不能为0", trigger: "blur"}
 				],
 				sampleQuality: [
 					{ required: true, message: "抽样数量不能为空", trigger: "blur" },
-					{ pattern: /^[1-9]\d*$/, message: "请输入正整数,且开头不能为0", trigger: "blur"}
 				],
 				typeCode: [
 					{ required: true, message: "检验类型不能为空", trigger: "blur" }

From 9bb461cd0f8284e922d7d234f882dcdba89e39b8 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Fri, 12 Jan 2024 15:41:44 +0800
Subject: [PATCH 2/9] =?UTF-8?q?2024-1-12-1=20=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF-bom-=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/bom/index.vue | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/views/wms/bom/index.vue b/src/views/wms/bom/index.vue
index fa514a8..86f0ffe 100644
--- a/src/views/wms/bom/index.vue
+++ b/src/views/wms/bom/index.vue
@@ -16,6 +16,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="产品号" prop="productCode">
+        <el-input
+          v-model="queryParams.productCode"
+          placeholder="请输入产品号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产品名称" prop="productDescZh">
+        <el-input
+          v-model="queryParams.productDescZh"
+          placeholder="请输入产品名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"

From 9ca802bd4c1426b3e7b1735d2620ca0b8aa7b3d9 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 12 Jan 2024 15:50:25 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/produceReport/index.vue | 49 ++++++++++++-----------
 src/views/quality/qcProduce/index.vue     | 10 +++--
 src/views/quality/unqualified/index.vue   |  4 +-
 3 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 3487d87..f46cd73 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -1,13 +1,15 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-		    <el-form-item label="订单编码" prop="orderNo">
-				<el-input
-					v-model="queryParams.orderNo"
-					placeholder="请输入物料编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
+			<el-form-item label="检验节点" prop="checkType">
+				<el-select v-model="queryParams.checkType" clearable placeholder="请选择检验节点">
+					<el-option
+						v-for="dict in checkTypes"
+						:key="dict.id"
+						:label="dict.checkName"
+						:value="dict.id"
+					></el-option>
+				</el-select>
 			</el-form-item>
 			<el-form-item label="物料编码" prop="materialCode">
 				<el-input
@@ -102,7 +104,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -115,7 +117,7 @@
 		<el-dialog :title="title" :visible.sync="open" width="1370px" append-to-body>
 			<el-row>
 				<el-col :span="20">
-					<el-button 
+					<el-button
 						    class="print-btn"
 							size="mini"
 							type="primary"
@@ -189,11 +191,11 @@
 					<el-row class="my-print-foot">
 						<el-col :offset="1" :span="3">检查人:</el-col>
 						<el-col :offset="2" :span="3">品质主管:</el-col>
-	
+
 					</el-row>
 					</el-form>
 			</div>
-			
+
 			<div slot="footer" class="dialog-footer">
 				<el-button @click="cancel">取 消</el-button>
 			</div>
@@ -203,7 +205,7 @@
 		<el-dialog :title="title" :visible.sync="firstReportOpen" width="1000px" append-to-body>
 			<el-row>
 				<el-col :span="20">
-					<el-button 
+					<el-button
 						    class="print-btn"
 							size="mini"
 							type="primary"
@@ -252,14 +254,14 @@
 								</el-input>
 							</el-form-item>
 						</el-col>
-						<el-col :span="16">	
+						<el-col :span="16">
 							<el-form-item label="首检原因" >
 								<el-input   disabled/>
 							</el-form-item>
 						</el-col>
-					</el-row>	
+					</el-row>
 					<el-row>
-						<el-col :span="24">	
+						<el-col :span="24">
 							<!-- 检验项目明细 -->
 							<el-table v-loading="loading" :data="checkProjectList" >
 								<el-table-column type="selection" width="55" align="center" />
@@ -278,7 +280,7 @@
 								    <template slot-scope="scope">
 										<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
 									</template>
-								</el-table-column>	
+								</el-table-column>
 							</el-table>
 						</el-col>
 					</el-row>
@@ -312,7 +314,7 @@
 					</el-row>
 				</el-form>
 			</div>
-			
+
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="handleDone">确 定</el-button>
 			</div>
@@ -427,8 +429,9 @@ export default {
 			return index + 1;
 		},
 		/****/
+		//获取检验节点
 		getCheckTypes() {
-           	getCheckTypes('material').then(response => {
+           	getCheckTypes('produce').then(response => {
 				this.checkTypes = response;
 			});
 		},
@@ -499,7 +502,7 @@ export default {
 				updateTime: null,
 				factoryCode: null,
 				delFlag: null,
-				
+
 			};
 			this.resetForm("form");
 		},
@@ -529,7 +532,7 @@ export default {
 		handleLook(row) {
 			this.reset();
 			const recordId = row.recordId || this.ids
-			
+
 			if(row.checkType =='checkTypeSC') {
 				getProduce(recordId).then(response => {
 					this.form = response.data;
@@ -555,7 +558,7 @@ export default {
 					this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
 				})
 			}
-			
+
 		},
 		/** 提交按钮 */
 		submitForm() {
@@ -630,11 +633,11 @@ export default {
 	margin-bottom: 15px;
 	margin-left: 10px;
 }
-.center-text {  
+.center-text {
   text-align: center;
 }
 .my-print-nav {
   margin-top: 15px;
   margin-bottom: 15px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index 5a275f7..8bedf17 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -122,7 +122,7 @@
 					v-hasPermi="['quality:qcProduce:add']"
 				>新增</el-button>
 			</el-col>
-			
+
 			<el-col :span="1.5">
 				<el-button
 					type="success"
@@ -327,7 +327,7 @@
 					</el-col>
 				</el-row>
 				<el-row>
-					<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>
@@ -622,7 +622,7 @@ export default {
 			this.form.defects = this.defectTypeList;
 			this.open = true;
 			this.title = "添加生产过程检验任务";
-			
+
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -632,6 +632,10 @@ export default {
 				this.form = response.data;
 				this.open = true;
 				this.title = "修改生产过程检验任务";
+
+				getBatchList(response.data.orderNo).then(response => {
+					this.batchList = response;
+				});
 			});
 		},
 		/** 提交按钮 */
diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue
index f2a6792..b6bcc7c 100644
--- a/src/views/quality/unqualified/index.vue
+++ b/src/views/quality/unqualified/index.vue
@@ -128,8 +128,8 @@
 					/>
 				</template>
 			</el-table-column>
-			<el-table-column label="下一节点编码" align="center" prop="nextNodeCode" width="120"/>
-			<el-table-column label="下一节点名称" align="center" prop="nextNodeName" width="120"/>
+			<el-table-column label="抽样数量" align="center" prop="sampleQuality" width="100"/>
+			<el-table-column label="不合格数量" align="center" prop="noOkQuality" width="100"/>
 			<el-table-column label="流程发起时间" align="center" prop="createTime" width="150">
 			  <template slot-scope="scope">
 					<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>

From 8af645d8c1abe2c6b7fad50e1798b3131fe3cca2 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Fri, 12 Jan 2024 15:55:08 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/checkType/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/quality/checkType/index.vue b/src/views/quality/checkType/index.vue
index 8551442..9814280 100644
--- a/src/views/quality/checkType/index.vue
+++ b/src/views/quality/checkType/index.vue
@@ -107,7 +107,7 @@
 				<el-row>
 					<el-col :span="15">
 						<el-form-item label="节点编码" prop="orderCode">
-							<el-input v-model="form.orderCode" placeholder="请输入检验节点编码" />
+							<el-input v-model="form.orderCode" placeholder="请输入检验节点编码" :disabled="form.id"/>
 						</el-form-item>
 					</el-col>
 				</el-row>

From 5d415c7c78bd60629ff4ab04f9b197df10ca9789 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 12 Jan 2024 16:08:06 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BC=98=E5=8C=961?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/produceReport/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index f46cd73..1be751f 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -173,13 +173,13 @@
 							<el-table-column prop="column110120" label="11:00-12:00" width="95" align="center"/>
 						</el-table-column>
 						<el-table-column label="下午" align="center" >
-							<el-table-column prop="column123133" label="13:30-14:30" width="95" align="center"/>
-							<el-table-column prop="column133143" label="14:30-15:30" width="95" align="center"/>
-							<el-table-column prop="column143153" label="15:30-16:30" width="95" align="center"/>
-							<el-table-column prop="column153163" label="16:30-17:30" width="95" align="center"/>
+							<el-table-column prop="column133143" label="13:30-14:30" width="95" align="center"/>
+							<el-table-column prop="column143153" label="14:30-15:30" width="95" align="center"/>
+							<el-table-column prop="column153163" label="15:30-16:30" width="95" align="center"/>
+							<el-table-column prop="column163173" label="16:30-17:30" width="95" align="center"/>
 						</el-table-column>
 						<el-table-column label="加班" align="center" >
-							<el-table-column prop="column163173" label="12:30-13:30" width="95" align="center"/>
+							<el-table-column prop="column123133" label="12:30-13:30" width="95" align="center"/>
 							<el-table-column prop="column180190" label="18:00-19:00" width="95" align="center"/>
 							<el-table-column prop="column190200" label="19:00-20:00" width="95" align="center"/>
 							<el-table-column prop="column200210" label="20:00-21:00" width="95" align="center"/>

From 2de12aabc739792d44d5391078e30858820644fc Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Fri, 12 Jan 2024 17:20:12 +0800
Subject: [PATCH 6/9] =?UTF-8?q?2024-1-12-3=20=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=B1=87=E6=80=BB=E6=8A=A5=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=961?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/equipment/index.vue | 124 +++++++++++++++++++-----------
 1 file changed, 81 insertions(+), 43 deletions(-)

diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 19ee090..d17c429 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -169,7 +169,12 @@
         :index="indexMethod"
         label="序号"
       />
-      <el-table-column label="设备编码" align="center" prop="equipmentCode" width="150">
+      <el-table-column
+        label="设备编码"
+        align="center"
+        prop="equipmentCode"
+        width="150"
+      >
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -200,7 +205,12 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column prop="equipmentStatus" label="设备状态" width="100" align="center">
+      <el-table-column
+        prop="equipmentStatus"
+        label="设备状态"
+        width="100"
+        align="center"
+      >
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.equipment_status"
@@ -221,12 +231,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column
-        label="备注"
-        align="center"
-        prop="remark"
-        width="100"
-      >
+      <el-table-column label="备注" align="center" prop="remark" width="100">
       </el-table-column>
       <el-table-column
         label="设备类型编码"
@@ -394,7 +399,10 @@
             <el-step title="设备使用状况"></el-step>
             <el-step title="设备资产信息"></el-step>
             <el-step title="设备绑定备件"></el-step>
-            <el-step title="设备绑定辅助设备" v-if="this.form.equipmentCategory == '1' "></el-step>
+            <el-step
+              title="设备绑定辅助设备"
+              v-if="this.form.equipmentCategory == '1'"
+            ></el-step>
           </el-steps>
         </div>
         <!-- 维修基本信息 -->
@@ -742,7 +750,7 @@
           </el-row>
         </div>
         <!-- 设备绑定备件 -->
-        <div v-if="this.repairRecordSteps == 3 " class="step-body">
+        <div v-if="this.repairRecordSteps == 3" class="step-body">
           <template>
             <el-transfer
               filterable
@@ -757,7 +765,12 @@
         </div>
 
         <!-- 设备绑定辅助设备 -->
-        <div v-if="this.repairRecordSteps == 4 && this.form.equipmentCategory == '1'  " class="step-body">
+        <div
+          v-if="
+            this.repairRecordSteps == 4 && this.form.equipmentCategory == '1'
+          "
+          class="step-body"
+        >
           <template>
             <el-transfer
               filterable
@@ -775,21 +788,39 @@
         <el-button v-if="this.repairRecordSteps > 0" @click="stepLast"
           >上一步</el-button
         >
-        <el-button v-if="this.repairRecordSteps < 4 && this.form.equipmentCategory == '1' " @click="stepNext"
-          >下一步</el-button
-        >
-        <el-button v-if="this.repairRecordSteps < 3 && this.form.equipmentCategory == '0' " @click="stepNext"
-          >下一步</el-button
-        >
-        <el-button v-if="this.repairRecordSteps < 3 && this.form.equipmentCategory == null " disabled>下一步</el-button>
         <el-button
-          v-if=" this.repairRecordSteps == 4 && this.form.equipmentCategory == '1' "
+          v-if="
+            this.repairRecordSteps < 4 && this.form.equipmentCategory == '1'
+          "
+          @click="stepNext"
+          >下一步</el-button
+        >
+        <el-button
+          v-if="
+            this.repairRecordSteps < 3 && this.form.equipmentCategory == '0'
+          "
+          @click="stepNext"
+          >下一步</el-button
+        >
+        <el-button
+          v-if="
+            this.repairRecordSteps < 3 && this.form.equipmentCategory == null
+          "
+          disabled
+          >下一步</el-button
+        >
+        <el-button
+          v-if="
+            this.repairRecordSteps == 4 && this.form.equipmentCategory == '1'
+          "
           type="primary"
           @click="submitForm"
           >提 交</el-button
         >
         <el-button
-          v-if=" this.repairRecordSteps == 3 && this.form.equipmentCategory == '0' "
+          v-if="
+            this.repairRecordSteps == 3 && this.form.equipmentCategory == '0'
+          "
           type="primary"
           @click="submitForm"
           >提 交</el-button
@@ -909,19 +940,19 @@
               }}</el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
-          <el-tab-pane label="辅助设备" >
+          <el-tab-pane label="辅助设备">
             <ItemEquipment
               :optType="optType"
               :equipmentCode="form.equipmentCode"
             ></ItemEquipment>
           </el-tab-pane>
-          <el-tab-pane label="维修记录" >
+          <el-tab-pane label="维修记录">
             <ItemWXRecords
               :optType="optType"
               :equipmentCode="form.equipmentCode"
             ></ItemWXRecords>
           </el-tab-pane>
-          <el-tab-pane label="保养记录" >
+          <el-tab-pane label="保养记录">
             <ItemBYRecords
               :optType="optType"
               :equipmentCode="form.equipmentCode"
@@ -1068,7 +1099,7 @@ export default {
     "equipment_status",
     "equipment_category",
   ],
-  components: { ItemSelectPerson, ItemEquipment , ItemWXRecords , ItemBYRecords},
+  components: { ItemSelectPerson, ItemEquipment, ItemWXRecords, ItemBYRecords },
   data() {
     return {
       CS: {
@@ -1198,7 +1229,7 @@ export default {
         workshopSection: null,
         equipmentLocation: null,
         hourlyUnitPrice: null,
-        equipmentCategory : null,
+        equipmentCategory: null,
       },
       queryEquipmentHeadParams: {
         pageNum: 1,
@@ -1207,7 +1238,7 @@ export default {
       queryAuxiliaryEquipmentParams: {
         pageNum: 1,
         pageSize: 1000,
-        equipmentCategory : null,
+        equipmentCategory: null,
       },
       options: [
         {
@@ -1310,10 +1341,11 @@ export default {
           // 将返回的列表赋值于穿梭框左边列表
           this.leftList.push({
             key: response.rows[i].materialCode,
-            label: response.rows[i].materialCode + response.rows[i].materialDesc,
+            label:
+              response.rows[i].materialCode + response.rows[i].materialDesc,
           });
         }
-        console.log(this.auxiliaryEquipmentRightList)
+        console.log(this.auxiliaryEquipmentRightList);
         for (let i in response.selected) {
           this.rightList.push(response.selected[i].key);
           this.form.rightData = this.rightList;
@@ -1380,12 +1412,12 @@ export default {
         equipmentLocation: null,
         hourlyUnitPrice: null,
         equipmentHead: null,
-        equipmentCategory : null,
-			  assetClassificationName : null,
-			  assetDescription : null,
-			  equipmentNumber : null,
-			  inventoryNumber : null ,
-			  unitMeasurement : null
+        equipmentCategory: null,
+        assetClassificationName: null,
+        assetDescription: null,
+        equipmentNumber: null,
+        inventoryNumber: null,
+        unitMeasurement: null,
       };
       this.resetForm("form");
     },
@@ -1443,13 +1475,16 @@ export default {
       this.rightList = [];
       this.auxiliaryEquipmentLeftList = [];
       this.auxiliaryEquipmentRightList = [];
-      this.queryAuxiliaryEquipmentParams.equipmentCategory = '0';
+      this.queryAuxiliaryEquipmentParams.equipmentCategory = "0";
       listEquipment(this.queryAuxiliaryEquipmentParams).then((response) => {
         for (let i in response.rows) {
           // 将返回的列表赋值于穿梭框左边列表
           this.auxiliaryEquipmentLeftList.push({
             key: response.rows[i].equipmentCode,
-            label: response.rows[i].equipmentCode + response.rows[i].equipmentName + response.rows[i].remark,
+            label:
+              response.rows[i].equipmentCode +
+              response.rows[i].equipmentName +
+              response.rows[i].remark,
           });
         }
       });
@@ -1466,22 +1501,25 @@ export default {
         this.options1 = response.rows;
       });
 
-      this.queryAuxiliaryEquipmentParams.equipmentCategory = '0';
+      this.queryAuxiliaryEquipmentParams.equipmentCategory = "0";
       listEquipment(this.queryAuxiliaryEquipmentParams).then((response) => {
-        console.log("listEquipment")
+        console.log("listEquipment");
         this.auxiliaryEquipmentLeftList = [];
         for (let i in response.rows) {
           // 将返回的列表赋值于穿梭框左边列表
           this.auxiliaryEquipmentLeftList.push({
             key: response.rows[i].equipmentCode,
-            label: response.rows[i].equipmentCode + response.rows[i].equipmentName + response.rows[i].remark,
+            label:
+              response.rows[i].equipmentCode +
+              response.rows[i].equipmentName +
+              response.rows[i].remark,
           });
         }
-        console.log(this.auxiliaryEquipmentRightList)
+        console.log(this.auxiliaryEquipmentRightList);
       });
 
       getEquipment(equipmentId).then((response) => {
-        console.log("getEquipment")
+        console.log("getEquipment");
         this.form = response.data;
         this.rightList = [];
         for (let i in response.data.selectedData) {
@@ -1489,14 +1527,14 @@ export default {
           this.rightList.push(response.data.selectedData[i].spareCode);
         }
         this.auxiliaryEquipmentRightList = [];
-        console.log(this.auxiliaryEquipmentRightList)
+        console.log(this.auxiliaryEquipmentRightList);
         for (let i in response.data.selectedEquipmentData) {
           // 将返回的辅助设备列表赋值于穿梭框右边列表
           this.auxiliaryEquipmentRightList.push(
             response.data.selectedEquipmentData[i].auxiliaryEquipmentCode
           );
         }
-        console.log(this.auxiliaryEquipmentRightList)
+        console.log(this.auxiliaryEquipmentRightList);
 
         if (response.data.imageFiles != null) {
           var newFiles = [];

From a5a692b0e24680becde0d3ecce2d0c2c840de3b3 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Fri, 12 Jan 2024 17:28:10 +0800
Subject: [PATCH 7/9] =?UTF-8?q?2024-1-12-3=20=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=B1=87=E6=80=BB=E6=8A=A5=E8=A1=A8=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/summaryReport/index.vue | 443 +++++++++++++++--------
 1 file changed, 286 insertions(+), 157 deletions(-)

diff --git a/src/views/device/summaryReport/index.vue b/src/views/device/summaryReport/index.vue
index 30bb251..5d516f5 100644
--- a/src/views/device/summaryReport/index.vue
+++ b/src/views/device/summaryReport/index.vue
@@ -64,8 +64,22 @@
       </el-form-item>
     </el-form>
 
-    <el-table :data="checkList" border :span-method="objectSpanMethod">
-      <el-table-column prop="itemTypeName" label="维护类型" width="100" fixed>
+    <!-- :span-method="objectSpanMethod" -->
+    <el-table
+      :data="checkList"
+      border
+      height="520"
+    >
+      <!-- 序号 -->
+      <el-table-column
+        type="index"
+        width="90"
+        align="center"
+        :index="indexMethod"
+        label="序号"
+        fixed
+      />
+      <el-table-column prop="itemTypeName" label="维护类型" width="100">
       </el-table-column>
       <el-table-column prop="itemName" label="检查项名称" width="150">
       </el-table-column>
@@ -81,157 +95,259 @@
       <el-table-column prop="head" label="责任人" width="70"> </el-table-column>
       <el-table-column prop="one" label="1" width="40">
         <template slot-scope="scope">
-          {{ scope.row.one == "1" ? "√" : scope.row.one == "0" ? "X" : ""}}
+          {{ scope.row.one == "1" ? "√" : scope.row.one == "0" ? "X" : "" }}
         </template>
       </el-table-column>
       <el-table-column prop="two" label="2" width="40">
         <template slot-scope="scope">
-          {{ scope.row.two == "1" ? "√" : scope.row.two == "0" ? "X" : ""}}
+          {{ scope.row.two == "1" ? "√" : scope.row.two == "0" ? "X" : "" }}
         </template>
       </el-table-column>
       <el-table-column prop="three" label="3" width="40">
         <template slot-scope="scope">
-          {{ scope.row.three == "1" ? "√" : scope.row.three == "0" ? "X" : ""}}
+          {{ scope.row.three == "1" ? "√" : scope.row.three == "0" ? "X" : "" }}
         </template>
       </el-table-column>
       <el-table-column prop="four" label="4" width="40">
         <template slot-scope="scope">
-          {{ scope.row.four == "1" ? "√" : scope.row.four == "0" ? "X" : ""}}
+          {{ scope.row.four == "1" ? "√" : scope.row.four == "0" ? "X" : "" }}
         </template>
       </el-table-column>
       <el-table-column prop="five" label="5" width="40">
         <template slot-scope="scope">
-          {{ scope.row.five == "1" ? "√" : scope.row.five == "0" ? "X" : ""}}
+          {{ scope.row.five == "1" ? "√" : scope.row.five == "0" ? "X" : "" }}
         </template>
       </el-table-column>
       <el-table-column prop="six" label="6" width="40">
         <template slot-scope="scope">
-          {{ scope.row.six == "1" ? "√" : scope.row.six == "0" ? "X" : ""}}
+          {{ scope.row.six == "1" ? "√" : scope.row.six == "0" ? "X" : "" }}
         </template>
       </el-table-column>
       <el-table-column prop="seven" label="7" width="40">
         <template slot-scope="scope">
-          {{ scope.row.seven == "1" ? "√" : scope.row.seven == "0" ? "X" : ""}}
+          {{ scope.row.seven == "1" ? "√" : scope.row.seven == "0" ? "X" : "" }}
         </template>
       </el-table-column>
       <el-table-column prop="eight" label="8" width="40">
         <template slot-scope="scope">
-          {{ scope.row.eight == "1" ? "√" : scope.row.eight == "0" ? "X" : ""}}
+          {{ scope.row.eight == "1" ? "√" : scope.row.eight == "0" ? "X" : "" }}
         </template>
       </el-table-column>
       <el-table-column prop="nine" label="9" width="40">
         <template slot-scope="scope">
-          {{ scope.row.nine == "1" ? "√" : scope.row.nine == "0" ? "X" : ""}}
+          {{ scope.row.nine == "1" ? "√" : scope.row.nine == "0" ? "X" : "" }}
         </template>
       </el-table-column>
       <el-table-column prop="ten" label="10" width="40">
         <template slot-scope="scope">
-          {{ scope.row.ten == "1" ? "√" : scope.row.ten == "0" ? "X" : ""}}
+          {{ scope.row.ten == "1" ? "√" : scope.row.ten == "0" ? "X" : "" }}
         </template>
       </el-table-column>
       <el-table-column prop="eleven" label="11" width="40">
         <template slot-scope="scope">
-          {{ scope.row.eleven == "1" ? "√" : scope.row.eleven == "0" ? "X" : ""}}
+          {{
+            scope.row.eleven == "1" ? "√" : scope.row.eleven == "0" ? "X" : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="twelve" label="12" width="40">
         <template slot-scope="scope">
-          {{ scope.row.twelve == "1" ? "√" : scope.row.twelve == "0" ? "X" : ""}}
+          {{
+            scope.row.twelve == "1" ? "√" : scope.row.twelve == "0" ? "X" : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="thirteen" label="13" width="40">
         <template slot-scope="scope">
-          {{ scope.row.thirteen == "1" ? "√" : scope.row.thirteen == "0" ? "X" : ""}}
+          {{
+            scope.row.thirteen == "1"
+              ? "√"
+              : scope.row.thirteen == "0"
+              ? "X"
+              : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="fourteen" label="14" width="40">
         <template slot-scope="scope">
-          {{ scope.row.fourteen == "1" ? "√" : scope.row.fourteen == "0" ? "X" : ""}}
+          {{
+            scope.row.fourteen == "1"
+              ? "√"
+              : scope.row.fourteen == "0"
+              ? "X"
+              : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="fifteen" label="15" width="40">
         <template slot-scope="scope">
-          {{ scope.row.fifteen == "1" ? "√" : scope.row.fifteen == "0" ? "X" : ""}}
+          {{
+            scope.row.fifteen == "1" ? "√" : scope.row.fifteen == "0" ? "X" : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="sixteen" label="16" width="40">
         <template slot-scope="scope">
-          {{ scope.row.sixteen == "1" ? "√" : scope.row.sixteen == "0" ? "X" : ""}}
+          {{
+            scope.row.sixteen == "1" ? "√" : scope.row.sixteen == "0" ? "X" : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="seventeen" label="17" width="40">
         <template slot-scope="scope">
-          {{ scope.row.seventeen == "1" ? "√" : scope.row.seventeen == "0" ? "X" : ""}}
+          {{
+            scope.row.seventeen == "1"
+              ? "√"
+              : scope.row.seventeen == "0"
+              ? "X"
+              : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="eighteen" label="18" width="40">
         <template slot-scope="scope">
-          {{ scope.row.eighteen == "1" ? "√" : scope.row.eighteen == "0" ? "X" : ""}}
+          {{
+            scope.row.eighteen == "1"
+              ? "√"
+              : scope.row.eighteen == "0"
+              ? "X"
+              : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="nineteen" label="19" width="40">
         <template slot-scope="scope">
-          {{ scope.row.nineteen == "1" ? "√" : scope.row.nineteen == "0" ? "X" : ""}}
+          {{
+            scope.row.nineteen == "1"
+              ? "√"
+              : scope.row.nineteen == "0"
+              ? "X"
+              : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="twenty" label="20" width="40">
         <template slot-scope="scope">
-          {{ scope.row.twenty == "1" ? "√" : scope.row.twenty == "0" ? "X" : ""}}
+          {{
+            scope.row.twenty == "1" ? "√" : scope.row.twenty == "0" ? "X" : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="twentyOne" label="21" width="40">
         <template slot-scope="scope">
-          {{ scope.row.twentyOne == "1" ? "√" : scope.row.twentyOne == "0" ? "X" : ""}}
+          {{
+            scope.row.twentyOne == "1"
+              ? "√"
+              : scope.row.twentyOne == "0"
+              ? "X"
+              : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="twentyTwo" label="22" width="40">
         <template slot-scope="scope">
-          {{ scope.row.twentyTwo == "1" ? "√" : scope.row.twentyTwo == "0" ? "X" : ""}}
+          {{
+            scope.row.twentyTwo == "1"
+              ? "√"
+              : scope.row.twentyTwo == "0"
+              ? "X"
+              : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="twentyThree" label="23" width="40">
         <template slot-scope="scope">
-          {{ scope.row.twentyThree == "1" ? "√" : scope.row.twentyThree == "0" ? "X" : ""}}
+          {{
+            scope.row.twentyThree == "1"
+              ? "√"
+              : scope.row.twentyThree == "0"
+              ? "X"
+              : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="twentyFour" label="24" width="40">
         <template slot-scope="scope">
-          {{ scope.row.twentyFour == "1" ? "√" : scope.row.twentyFour == "0" ? "X" : ""}}
+          {{
+            scope.row.twentyFour == "1"
+              ? "√"
+              : scope.row.twentyFour == "0"
+              ? "X"
+              : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="twentyFive" label="30" width="40">
         <template slot-scope="scope">
-          {{ scope.row.twentyFive == "1" ? "√" : scope.row.twentyFive == "0" ? "X" : ""}}
+          {{
+            scope.row.twentyFive == "1"
+              ? "√"
+              : scope.row.twentyFive == "0"
+              ? "X"
+              : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="twentySix" label="26" width="40">
         <template slot-scope="scope">
-          {{ scope.row.twentySix == "1" ? "√" : scope.row.twentySix == "0" ? "X" : ""}}
+          {{
+            scope.row.twentySix == "1"
+              ? "√"
+              : scope.row.twentySix == "0"
+              ? "X"
+              : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="twentySeven" label="27" width="40">
         <template slot-scope="scope">
-          {{ scope.row.twentySeven == "1" ? "√" : scope.row.twentySeven == "0" ? "X" : ""}}
+          {{
+            scope.row.twentySeven == "1"
+              ? "√"
+              : scope.row.twentySeven == "0"
+              ? "X"
+              : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="twentyEight" label="28" width="40">
         <template slot-scope="scope">
-          {{ scope.row.twentyEight == "1" ? "√" : scope.row.twentyEight == "0" ? "X" : ""}}
+          {{
+            scope.row.twentyEight == "1"
+              ? "√"
+              : scope.row.twentyEight == "0"
+              ? "X"
+              : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="twentyNine" label="29" width="40">
         <template slot-scope="scope">
-          {{ scope.row.twentyNine == "1" ? "√" : scope.row.twentyNine == "0" ? "X" : ""}}
+          {{
+            scope.row.twentyNine == "1"
+              ? "√"
+              : scope.row.twentyNine == "0"
+              ? "X"
+              : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="thirty" label="30" width="40">
         <template slot-scope="scope">
-          {{ scope.row.thirty == "1" ? "√" : scope.row.thirty == "0" ? "X" : ""}}
+          {{
+            scope.row.thirty == "1" ? "√" : scope.row.thirty == "0" ? "X" : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column prop="thirtyOne" label="31" width="40">
         <template slot-scope="scope">
-          {{ scope.row.thirtyOne == "1" ? "√" : scope.row.thirtyOne == "0" ? "X" : ""}}
+          {{
+            scope.row.thirtyOne == "1"
+              ? "√"
+              : scope.row.thirtyOne == "0"
+              ? "X"
+              : ""
+          }}
         </template>
       </el-table-column>
     </el-table>
@@ -350,189 +466,201 @@ export default {
               ) {
                 var str = this.matchList[j].orderEnd.substr(8);
                 if (str == "01") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].one = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].one = this.matchList[j].detailReach;
                   }
                 } else if (str == "02") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].two = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].two = this.matchList[j].detailReach;
                   }
                 } else if (str == "03") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].three = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].three = this.matchList[j].detailReach;
                   }
                 } else if (str == "04") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].four = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].four = this.matchList[j].detailReach;
                   }
                 } else if (str == "05") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].five = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].five = this.matchList[j].detailReach;
                   }
                 } else if (str == "06") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].six = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].six = this.matchList[j].detailReach;
                   }
                 } else if (str == "07") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].seven = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].seven = this.matchList[j].detailReach;
                   }
                 } else if (str == "08") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].eight = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].eight = this.matchList[j].detailReach;
                   }
                 } else if (str == "09") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].nine = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].nine = this.matchList[j].detailReach;
                   }
                 } else if (str == "10") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].ten = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].ten = this.matchList[j].detailReach;
                   }
                 } else if (str == "11") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].eleven = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].eleven = this.matchList[j].detailReach;
                   }
                 } else if (str == "12") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].twelve = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].twelve = this.matchList[j].detailReach;
                   }
                 } else if (str == "13") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].thirteen = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].thirteen = this.matchList[j].detailReach;
                   }
                 } else if (str == "14") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].fourteen = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].fourteen = this.matchList[j].detailReach;
                   }
                 } else if (str == "15") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].fifteen = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].fifteen = this.matchList[j].detailReach;
                   }
                 } else if (str == "16") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].sixteen = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].sixteen = this.matchList[j].detailReach;
                   }
                 } else if (str == "17") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].seventeen = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].seventeen = this.matchList[j].detailReach;
                   }
                 } else if (str == "18") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].eighteen = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].eighteen = this.matchList[j].detailReach;
                   }
                 } else if (str == "19") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].nineteen = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].nineteen = this.matchList[j].detailReach;
                   }
                 } else if (str == "20") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].twenty = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].twenty = this.matchList[j].detailReach;
                   }
                 } else if (str == "21") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].twentyOne = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].twentyOne = this.matchList[j].detailReach;
                   }
                 } else if (str == "22") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].twentyTwo = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].twentyTwo = this.matchList[j].detailReach;
                   }
                 } else if (str == "23") {
-                  if(this.matchList[j].repairReach == 1){
-                    this.checkList[i].twentyThree = this.matchList[j].repairReach;
-                  }else{
-                    this.checkList[i].twentyThree = this.matchList[j].detailReach;
+                  if (this.matchList[j].repairReach == 1) {
+                    this.checkList[i].twentyThree =
+                      this.matchList[j].repairReach;
+                  } else {
+                    this.checkList[i].twentyThree =
+                      this.matchList[j].detailReach;
                   }
                 } else if (str == "24") {
-                  if(this.matchList[j].repairReach == 1){
-                    this.checkList[i].twentyFour = this.matchList[j].repairReach;
-                  }else{
-                    this.checkList[i].twentyFour = this.matchList[j].detailReach;
+                  if (this.matchList[j].repairReach == 1) {
+                    this.checkList[i].twentyFour =
+                      this.matchList[j].repairReach;
+                  } else {
+                    this.checkList[i].twentyFour =
+                      this.matchList[j].detailReach;
                   }
                 } else if (str == "25") {
-                  if(this.matchList[j].repairReach == 1){
-                    this.checkList[i].twentyFive = this.matchList[j].repairReach;
-                  }else{
-                    this.checkList[i].twentyFive = this.matchList[j].detailReach;
+                  if (this.matchList[j].repairReach == 1) {
+                    this.checkList[i].twentyFive =
+                      this.matchList[j].repairReach;
+                  } else {
+                    this.checkList[i].twentyFive =
+                      this.matchList[j].detailReach;
                   }
                 } else if (str == "26") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].twentySix = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].twentySix = this.matchList[j].detailReach;
                   }
                 } else if (str == "27") {
-                  if(this.matchList[j].repairReach == 1){
-                    this.checkList[i].twentySeven = this.matchList[j].repairReach;
-                  }else{
-                    this.checkList[i].twentySeven = this.matchList[j].detailReach;
+                  if (this.matchList[j].repairReach == 1) {
+                    this.checkList[i].twentySeven =
+                      this.matchList[j].repairReach;
+                  } else {
+                    this.checkList[i].twentySeven =
+                      this.matchList[j].detailReach;
                   }
                 } else if (str == "28") {
-                  if(this.matchList[j].repairReach == 1){
-                    this.checkList[i].twentyEight = this.matchList[j].repairReach;
-                  }else{
-                    this.checkList[i].twentyEight = this.matchList[j].detailReach;
+                  if (this.matchList[j].repairReach == 1) {
+                    this.checkList[i].twentyEight =
+                      this.matchList[j].repairReach;
+                  } else {
+                    this.checkList[i].twentyEight =
+                      this.matchList[j].detailReach;
                   }
                 } else if (str == "29") {
-                  if(this.matchList[j].repairReach == 1){
-                    this.checkList[i].twentyNine = this.matchList[j].repairReach;
-                  }else{
-                    this.checkList[i].twentyNine = this.matchList[j].detailReach;
+                  if (this.matchList[j].repairReach == 1) {
+                    this.checkList[i].twentyNine =
+                      this.matchList[j].repairReach;
+                  } else {
+                    this.checkList[i].twentyNine =
+                      this.matchList[j].detailReach;
                   }
                 } else if (str == "30") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].thirty = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].thirty = this.matchList[j].detailReach;
                   }
                 } else if (str == "31") {
-                  if(this.matchList[j].repairReach == 1){
+                  if (this.matchList[j].repairReach == 1) {
                     this.checkList[i].thirtyOne = this.matchList[j].repairReach;
-                  }else{
+                  } else {
                     this.checkList[i].thirtyOne = this.matchList[j].detailReach;
                   }
                 }
@@ -601,57 +729,57 @@ export default {
       this.$refs.itemSelect.showFlag = true;
     },
 
-    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 0) {
-        // 获取当前单元格的值
-        const currentValue = row[column.property];
-        // 获取上一行相同列的值
-        const preRow = this.checkList[rowIndex - 1];
-        const preValue = preRow ? preRow[column.property] : null;
-        // 如果当前值和上一行的值相同，则将当前单元格隐藏
-        if (currentValue === preValue) {
-          return { rowspan: 0, colspan: 0 };
-        } else {
-          // 否则计算当前单元格应该跨越多少行
-          let rowspan = 1;
-          for (let i = rowIndex + 1; i < this.checkList.length; i++) {
-            const nextRow = this.checkList[i];
-            const nextValue = nextRow[column.property];
-            if (nextValue === currentValue) {
-              rowspan++;
-            } else {
-              break;
-            }
-          }
-          return { rowspan, colspan: 1 };
-        }
-      }
+    // objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+    //   if (columnIndex === 0) {
+    //     // 获取当前单元格的值
+    //     const currentValue = row[column.property];
+    //     // 获取上一行相同列的值
+    //     const preRow = this.checkList[rowIndex - 1];
+    //     const preValue = preRow ? preRow[column.property] : null;
+    //     // 如果当前值和上一行的值相同，则将当前单元格隐藏
+    //     if (currentValue === preValue) {
+    //       return { rowspan: 0, colspan: 0 };
+    //     } else {
+    //       // 否则计算当前单元格应该跨越多少行
+    //       let rowspan = 1;
+    //       for (let i = rowIndex + 1; i < this.checkList.length; i++) {
+    //         const nextRow = this.checkList[i];
+    //         const nextValue = nextRow[column.property];
+    //         if (nextValue === currentValue) {
+    //           rowspan++;
+    //         } else {
+    //           break;
+    //         }
+    //       }
+    //       return { rowspan, colspan: 1 };
+    //     }
+    //   }
 
-      if (columnIndex === 1) {
-        // 获取当前单元格的值
-        const currentValue = row[column.property];
-        // 获取上一行相同列的值
-        const preRow = this.checkList[rowIndex - 1];
-        const preValue = preRow ? preRow[column.property] : null;
-        // 如果当前值和上一行的值相同，则将当前单元格隐藏
-        if (currentValue === preValue) {
-          return { rowspan: 0, colspan: 0 };
-        } else {
-          // 否则计算当前单元格应该跨越多少行
-          let rowspan = 1;
-          for (let i = rowIndex + 1; i < this.checkList.length; i++) {
-            const nextRow = this.checkList[i];
-            const nextValue = nextRow[column.property];
-            if (nextValue === currentValue) {
-              rowspan++;
-            } else {
-              break;
-            }
-          }
-          return { rowspan, colspan: 1 };
-        }
-      }
-    },
+    //   if (columnIndex === 1) {
+    //     // 获取当前单元格的值
+    //     const currentValue = row[column.property];
+    //     // 获取上一行相同列的值
+    //     const preRow = this.checkList[rowIndex - 1];
+    //     const preValue = preRow ? preRow[column.property] : null;
+    //     // 如果当前值和上一行的值相同，则将当前单元格隐藏
+    //     if (currentValue === preValue) {
+    //       return { rowspan: 0, colspan: 0 };
+    //     } else {
+    //       // 否则计算当前单元格应该跨越多少行
+    //       let rowspan = 1;
+    //       for (let i = rowIndex + 1; i < this.checkList.length; i++) {
+    //         const nextRow = this.checkList[i];
+    //         const nextValue = nextRow[column.property];
+    //         if (nextValue === currentValue) {
+    //           rowspan++;
+    //         } else {
+    //           break;
+    //         }
+    //       }
+    //       return { rowspan, colspan: 1 };
+    //     }
+    //   }
+    // },
   },
 };
 </script>
@@ -663,3 +791,4 @@ export default {
 }
 </style>
 
+

From 42dcc5ee70625ef6e06d5487bc04e8b80962bfdb Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Sat, 13 Jan 2024 17:21:08 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=BF=87=E7=A8=8B?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/qcProduce/index.vue | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index 8bedf17..b5f40c8 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -196,7 +196,7 @@
 				</template>
 			</el-table-column>
 			<el-table-column label="检验节点" align="center" prop="checkName" />
-<el-table-column label="创建时间" align="center" prop="createTime" width="180">
+			<el-table-column label="创建时间" align="center" prop="createTime" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
 				</template>
@@ -332,9 +332,19 @@
 							<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量" />
 						</el-form-item>
 					</el-col>
-					<el-col :span="6" v-for="(item,index) in form.defects" :key="index">
-						<el-form-item :label="item.defectSubclass" prop="">
-							<el-input type="number" v-model="item.noOkQuality" placeholder="请输入不合格数量" />
+					<el-col :span="6">
+						<el-form-item label="A类不良数量" prop="aNoOkquality">
+							<el-input type="number" v-model="form.aNoOkquality" placeholder="请输入不良数量" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="B类不良数量" prop="bNoOkquality">
+							<el-input type="number" v-model="form.bNoOkquality" placeholder="请输入不良数量" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+                        <el-form-item label="C类不良数量" prop="cNoOkquality">
+							<el-input type="number" v-model="form.cNoOkquality" placeholder="请输入不良数量" />
 						</el-form-item>
 					</el-col>
 				</el-row>
@@ -435,8 +445,6 @@ export default {
 			total: 0,
 			// 生产过程检验任务表格数据
 			qcProduceList: [],
-			checkTypeList:[],
-			defectTypeList: [],
 			// 弹出层标题
 			title: "",
 			// 是否显示弹出层
@@ -622,7 +630,7 @@ export default {
 			this.form.defects = this.defectTypeList;
 			this.open = true;
 			this.title = "添加生产过程检验任务";
-
+			
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -630,6 +638,9 @@ export default {
 			const recordId = row.recordId || this.ids
 			getQcProduce(recordId).then(response => {
 				this.form = response.data;
+				if (this.form.defects == null) {
+					this.form.defects = this.defectTypeList;
+				}
 				this.open = true;
 				this.title = "修改生产过程检验任务";
 

From 24e44ea2746c125d4e5a56ad9d7592cb62eb9b7f Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Mon, 15 Jan 2024 10:05:49 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=BF=87=E7=A8=8B?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/qcInventory.js                |  44 ++
 .../quality/qcInventory/checkProjectType.vue  | 258 +++++++
 src/views/quality/qcInventory/index.vue       | 675 ++++++++++++++++++
 .../quality/qcInventory/selectLLWorkOrder.vue | 138 ++++
 .../quality/qcInventory/selectMaterial.vue    | 156 ++++
 .../quality/qcInventory/selectSupplier.vue    | 152 ++++
 src/views/quality/qcInventory/selectUser.vue  | 150 ++++
 src/views/quality/qcProduce/index.vue         |  18 +-
 8 files changed, 1578 insertions(+), 13 deletions(-)
 create mode 100644 src/api/quality/qcInventory.js
 create mode 100644 src/views/quality/qcInventory/checkProjectType.vue
 create mode 100644 src/views/quality/qcInventory/index.vue
 create mode 100644 src/views/quality/qcInventory/selectLLWorkOrder.vue
 create mode 100644 src/views/quality/qcInventory/selectMaterial.vue
 create mode 100644 src/views/quality/qcInventory/selectSupplier.vue
 create mode 100644 src/views/quality/qcInventory/selectUser.vue

diff --git a/src/api/quality/qcInventory.js b/src/api/quality/qcInventory.js
new file mode 100644
index 0000000..b5799b3
--- /dev/null
+++ b/src/api/quality/qcInventory.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询库存检验任务列表
+export function listQcInventory(query) {
+	return request({
+		url: '/quality/qcInventory/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询库存检验任务详细
+export function getQcInventory(recordId) {
+	return request({
+		url: '/quality/qcInventory/' + recordId,
+		method: 'get'
+		});
+}
+
+// 新增库存检验任务
+export function addQcInventory(data) {
+	return request({
+		url: '/quality/qcInventory',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改库存检验任务
+export function updateQcInventory(data) {
+	return request({
+		url: '/quality/qcInventory',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除库存检验任务
+export function delQcInventory(recordId) {
+	return request({
+		url: '/quality/qcInventory/' + recordId,
+		method: 'delete'
+	});
+}
diff --git a/src/views/quality/qcInventory/checkProjectType.vue b/src/views/quality/qcInventory/checkProjectType.vue
new file mode 100644
index 0000000..a93c201
--- /dev/null
+++ b/src/views/quality/qcInventory/checkProjectType.vue
@@ -0,0 +1,258 @@
+<template>
+  <div>
+  <el-dialog title="检验项目"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="1000px"
+  >
+    <el-row :gutter="20">
+
+      <el-col :span="24" :xs="24">
+        <el-table v-loading="loading" :data="itemList" ref="myTable" >
+          <el-table-column width="50" align="center" type="selection">
+          </el-table-column>
+          <!-- 序号 -->
+          <el-table-column label="检测规则Id"  align="left" prop="recordId" :show-overflow-tooltip="true" v-if="false"/>
+          <el-table-column label="检测规则编码"  align="left" prop="projectNo" :show-overflow-tooltip="true" width="120"/>
+          <el-table-column label="检验规则名称"  align="left" prop="ruleName" :show-overflow-tooltip="true" width="120"/>
+          <el-table-column label="检验规则属性"  align="left" prop="propertyCode" :show-overflow-tooltip="true" width="120">
+            <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.qc_rule_prop"
+              :value="scope.row.propertyCode"
+            />
+          </template>
+        </el-table-column>
+          <el-table-column label="检验方式"  align="left" prop="checkMode" :show-overflow-tooltip="true" /> 
+          <el-table-column label="检验工具"  align="left" prop="checkTool" :show-overflow-tooltip="true" /> 
+          <el-table-column label="检验标准"  align="left" prop="checkStandard" :show-overflow-tooltip="true" /> 
+          <el-table-column label="上差值"  align="left" prop="upperDiff" :show-overflow-tooltip="true" /> 
+          <el-table-column label="下差值"  align="left" prop="downDiff" :show-overflow-tooltip="true" /> 
+          <el-table-column label="单位"  align="left"  prop="unitCode" :show-overflow-tooltip="true" width="80"/>
+          <el-table-column label="检测结果" key="status" align="center" prop="status" width="90">
+            <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="测量值"  align="left"  prop="actualValue" :show-overflow-tooltip="true" width="120"/>
+          <el-table-column label="不良项目"  align="left"  prop="defectCode" :show-overflow-tooltip="true" width="120">
+            <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>
+            </template>
+          </el-table-column>
+           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleShowValue(scope.row)"
+                v-hasPermi="['quality:qcIncome:edit']"
+              >检测值</el-button>
+            </template>
+          </el-table-column>    
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitBomForm">确 定</el-button>
+              <el-button @click="showFlag=false">取 消</el-button>
+       </div>
+  </el-dialog>
+  <!--测量值弹窗-->
+	<el-dialog title="测量值" :visible.sync="valueOpen" width="600px" append-to-body>
+      <el-form :model="dynamicValidateForm" ref="dynamicValidateForm" label-width="100px" class="demo-dynamic">
+          <el-form-item
+            v-for="(domain, index) in dynamicValidateForm.domains"
+            :label="'测量值' + index"
+            :key="domain.key"
+            :prop="'domains.' + index + '.value'"
+            :rules="{
+              required: true, message: '测量值不能为空', trigger: 'blur'
+            }"
+          >
+            <el-input v-model="domain.value" style="width: 70%;"></el-input>
+            <el-button @click.prevent="removeDomain(domain)" style="margin-left:30px">删除</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="submitForm('dynamicValidateForm')">提交</el-button>
+            <el-button @click="addDomain">新增测量值</el-button>
+            <el-button @click="resetForm('dynamicValidateForm')">重置</el-button>
+          </el-form-item>
+        </el-form>
+		</el-dialog>	
+    </div>
+</template>
+<script>
+
+import { getCkeckProjectList,changeCheckDetailStatus,commitActualValue,commitCheckResult,getDefectList } from "@/api/quality/income";
+export default {
+  name: "itemSelectUser",
+  dicts: ["check_result","qc_rule_prop"],
+  data() {
+    return {
+      showFlag:false,
+      // 选中数组
+      selectedRows: {},
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // BOM产品表格数据
+      itemList: null,
+
+      //树名称
+      bomCode: undefined,
+      defaultProps: {
+        id: "id",
+        label: "label"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        belongTo:''
+        //,userCode: '',
+        //userName : ''
+      },
+      data:{},
+      dynamicValidateForm: {
+          domains: [{
+            value: ''
+          }]
+      },
+      // 是否显示弹出层
+			valueOpen: false, 
+      //检测详情的id
+      recordId:'',
+      typeCode:'',//检测类型
+      defectList:[]//不良名称
+    };
+  },
+  created() {
+    this.getDefect();
+  },
+
+  methods: {
+
+    getDefect(){
+      getDefectList('defect_in').then(response => {
+          this.defectList = response;
+      });
+    },
+
+    init(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.getList();
+    },
+
+    /** 查询表格列表*/
+    getList() {
+      this.loading = true;
+      getCkeckProjectList(this.queryParams).then(response => {
+          this.itemList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+    //提交整体检测结果
+    submitBomForm() {
+      commitCheckResult(this.queryParams.belongTo,this.typeCode,this.checkType,this.orderNo).then(response => {
+          this.$modal.msgSuccess("检测完成");
+          this.$emit('saveCheck');
+          this.showFlag = false;
+      });
+    },
+
+    // 数据状态修改/Y合格N不合格
+		handleStatusChange(row) {
+			let text = row.status === "N" ? "不合格" : "合格";
+			this.$modal.confirm('确认' + '"' + row.projectNo + '"'+text+'吗？').then(function() {
+				return changeCheckDetailStatus(row.recordId, row.status, row.defectCode);
+			}).then(() => {
+				this.$modal.msgSuccess(text + "操作成功");
+			}).catch(function() {
+				row.status = row.status === "N" ? "Y" : "N";
+			});
+		},
+
+    //动态测量值
+    /** 检测结果钮操作 */
+		handleShowValue(row) {
+			this.valueOpen = true;
+      this.recordId = row.recordId;
+		},
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          let values = this.dynamicValidateForm.domains;
+          var actualValues = values.map(item => item.value);
+          commitActualValue(this.recordId, actualValues).then(response => {
+              this.dynamicValidateForm.domains = [{ value: ''}];
+							this.$modal.msgSuccess("提交成功");
+							this.valueOpen = false;
+              this.getList();
+						});
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+    },
+    removeDomain(item) {
+      var index = this.dynamicValidateForm.domains.indexOf(item)
+      if (index !== -1) {
+        this.dynamicValidateForm.domains.splice(index, 1)
+      }
+    },
+    addDomain() {
+      this.dynamicValidateForm.domains.push({
+        value: '',
+        key: Date.now()
+      });
+    }
+  }
+};
+</script>
diff --git a/src/views/quality/qcInventory/index.vue b/src/views/quality/qcInventory/index.vue
new file mode 100644
index 0000000..b5b7864
--- /dev/null
+++ b/src/views/quality/qcInventory/index.vue
@@ -0,0 +1,675 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+		    <el-form-item label="任务编号" prop="checkNo">
+				<el-input
+					v-model="queryParams.checkNo"
+					placeholder="请输入检验任务编号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="批次号" prop="incomeBatchNo">
+				<el-input
+					v-model="queryParams.incomeBatchNo"
+					placeholder="请输入来料批次号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="物料号" prop="materialCode">
+				<el-input
+					v-model="queryParams.materialCode"
+					placeholder="请输入物料号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="物料名称" prop="materialName">
+				<el-input
+					v-model="queryParams.materialName"
+					placeholder="请输入物料名称"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="检验结果" prop="checkResult">
+				<el-select
+				v-model="queryParams.checkResult"
+				placeholder="检验结果"
+				clearable
+				>
+				<el-option
+					v-for="dict in dict.type.check_result"
+					:key="dict.value"
+					:label="dict.label"
+					:value="dict.value"
+				/>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="来料时间" prop="incomeTimeArray">
+                <el-date-picker
+				v-model="queryParams.incomeTimeArray"
+				format="yyyy-MM-dd HH:mm:ss"
+				type="datetimerange"
+				range-separator="至"
+				start-placeholder="开始日期"
+				end-placeholder="结束日期">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item label="检测地点" prop="checkLoc">
+				<el-input
+					v-model="queryParams.checkLoc"
+					placeholder="请输入检测地点"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="检验时间" prop="checkTimeArray">
+                <el-date-picker
+				v-model="queryParams.checkTimeArray"
+				format="yyyy-MM-dd HH:mm:ss"
+				type="datetimerange"
+				range-separator="至"
+				start-placeholder="开始日期"
+				end-placeholder="结束日期">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item>
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button
+					type="primary"
+					plain
+					icon="el-icon-plus"
+					size="mini"
+					@click="handleAdd"
+					v-hasPermi="['quality:qcIncome:add']"
+				>新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="success"
+					plain
+					icon="el-icon-edit"
+					size="mini"
+					:disabled="single"
+					@click="handleUpdate"
+					v-hasPermi="['quality:qcIncome:edit']"
+				>修改</el-button>
+			</el-col>
+			<!--
+			<el-col :span="1.5">
+				<el-button
+					type="danger"
+					plain
+					icon="el-icon-delete"
+					size="mini"
+					:disabled="multiple"
+					@click="handleDelete"
+					v-hasPermi="['quality:qcIncome:remove']"
+				>删除</el-button>
+			</el-col>-->
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['quality:qcIncome:export']"
+				>导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange">
+			<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="incomeBatchNo" width="120"/>
+			<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
+			<el-table-column label="物料号" align="center" prop="materialCode" width="170"/>
+			<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
+			<el-table-column label="收货数量" align="center" prop="quality" />
+			<el-table-column label="不合格数量" align="center" prop="noOkQuality" width="120"/>
+			<el-table-column label="单位" align="center" prop="unit" />
+			<el-table-column label="供应商编码" align="center" prop="supplierCode" width="120"/>
+			<el-table-column label="供应商名称" align="center" prop="supplierName" width="240"/>
+			<el-table-column label="来料时间" align="center" prop="incomeTime" width="180">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="检测地点" align="center" prop="checkLoc" width="120"/>
+			<el-table-column label="检测状态" align="center" prop="checkStatus" >
+				<template slot-scope="scope">
+					<dict-tag
+						:options="dict.type.check_status"
+						:value="scope.row.checkStatus"
+					/>
+				</template>
+			</el-table-column>
+			<el-table-column label="检测人工号" align="center" prop="checkManCode" width="100"/>
+			<el-table-column label="检测人姓名" align="center" prop="checkManName" width="100"/>
+			<el-table-column label="检验时间" align="center" prop="checkTime" width="180">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="检验结果" align="center" prop="checkResult" />
+			<el-table-column label="是否启用" align="center" width="100">
+				<template slot-scope="scope">
+					<el-switch
+						v-model="scope.row.status"
+						active-value="1"
+						inactive-value="0"
+						@change="handleStatusChange(scope.row)"
+					></el-switch>
+				</template>
+			</el-table-column>
+
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleCheckProject(scope.row)"
+						v-hasPermi="['quality:qcIncome:edit']"
+					>检验</el-button>
+					<!--
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['quality:qcIncome:remove']"
+					>删除</el-button>
+					-->
+				</template>
+			</el-table-column>
+		</el-table>
+		
+		<pagination
+			v-show="total>0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
+
+		<!-- 添加或修改来料检验对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
+				<el-row>
+				   <el-col :span="8">
+						<el-form-item label="检验任务编号" prop="checkNo">
+							<el-input v-model="form.checkNo" placeholder="请输入检验任务编号" disabled/>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="检验类型" prop="checkType" >
+							<el-select v-model="form.checkType" placeholder="请选择检验类型" style="width: 100%;">
+								<el-option
+									v-for="dict in checkTypes"
+									:key="dict.id"
+									:label="dict.checkName"
+									:value="dict.id"
+								></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+                    <el-col :span="8">
+						<el-form-item label="订单号" prop="orderNo">
+							<el-input v-model="form.orderNo" placeholder="请输入订单号">
+									<el-button slot="append" @click="handleSelectWorkOrder" icon="el-icon-search"></el-button>
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+			        <el-col :span="8">
+				   		<el-form-item label="物料名称" prop="materialName">
+							<el-input v-model="form.materialName" placeholder="请选择物料名称"/>
+						</el-form-item>
+					</el-col>
+
+					<el-col :span="8">
+						<el-form-item label="物料号" prop="materialCode">
+							<el-input v-model="form.materialCode" placeholder="请输入物料号" disabled/>
+						</el-form-item>
+					</el-col>
+					<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-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-form-item label="抽样数量" prop="sampleQuality">
+							<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">	
+						<el-form-item label="不合格数量" prop="noOkQuality">
+							<el-input type="number" v-model="form.noOkQuality" placeholder="请输入不合格数量" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="单位" prop="unit" >
+							<el-select v-model="form.unit" placeholder="请选择单位" style="width: 100%;">
+								<el-option
+									v-for="dict in dict.type.unit"
+									:key="dict.value"
+									:label="dict.label"
+									:value="dict.value"
+								></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="8">
+						<el-form-item label="供应商名称" prop="supplierName">
+							<el-input v-model="form.supplierName" placeholder="请选择供应商名称">
+							<el-button slot="append" @click="handleSelectSupplier" icon="el-icon-search"></el-button>
+							</el-input>
+						</el-form-item>
+					</el-col>
+				   <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 :span="8">
+						<el-form-item label="来料时间" prop="incomeTime">
+							<el-date-picker clearable
+								v-model="form.incomeTime"
+								type="datetime"
+								value-format="yyyy-MM-dd HH:mm:ss"
+								placeholder="请选择来料时间">
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+				</el-row>	
+				<el-row>
+					<el-col :span="8">
+						<el-form-item label="检测人姓名" prop="checkManName">
+							<el-input v-model="form.checkManName" placeholder="请选择检测人姓名">
+							<el-button slot="append" @click="handleSelectUser" icon="el-icon-search"></el-button>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="检测人工号" prop="checkManCode" >
+							<el-input v-model="form.checkManCode" placeholder="请输入检测人工号" disabled/>
+						</el-form-item>
+					</el-col>
+					<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-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+			<!--订单选择弹窗-->
+			<ItemSelectWorkOrder
+				ref="itemSelectWorkOrder"
+				@onSelected="onSelectWorkOrder"
+			></ItemSelectWorkOrder>
+			<!--供应商选择弹窗-->
+			<ItemSelectSupplier
+				ref="itemSelectSupplier"
+				@onSelected="onSelectSupplier"
+			></ItemSelectSupplier>
+			<!--人员选择弹窗-->
+			<ItemSelectUser
+				ref="itemSelectUser"
+				@onSelected="onSelectUser"
+			></ItemSelectUser>
+			<!--检验项目弹窗-->
+			<ItemSelectProject
+				ref="itemSelectProject"
+				@saveCheck="saveCheck"
+			></ItemSelectProject>
+	</div>
+</template>
+
+<script>
+import { listQcInventory, getQcInventory, addQcInventory, updateQcInventory, delQcInventory } from "@/api/quality/qcInventory.js";
+import { getCheckTypes } from "@/api/quality/qcProduce";
+import ItemSelectWorkOrder from "./selectLLWorkOrder.vue";
+import ItemSelectSupplier from "./selectSupplier.vue";
+import ItemSelectUser from "./selectUser.vue";
+import ItemSelectProject from "./checkProjectType.vue";
+import moment from 'moment';
+export default {
+	name: "Income",
+	components: { ItemSelectWorkOrder,ItemSelectSupplier,ItemSelectUser,ItemSelectProject},
+	dicts: ["unit","check_status","check_result"],
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 来料检验表格数据
+			incomeList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				incomeTimeArray: [],
+				checkTimeArray: [],
+				pageNum: 1,
+				pageSize: 10,
+				checkNo: null,
+				incomeBatchNo: null,
+				orderNo: null,
+				materialCode: null,
+				materialName: null,
+				quality: null,
+				unit: null,
+				supplierCode: null,
+				supplierName: null,
+				incomeTime: null,
+				checkLoc: null,
+				checkStatus: null,
+				checkManCode: null,
+				checkManName: null,
+				checkTime: null,
+				checkResult: null,
+				status: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				attr4: null,
+				factoryCode: null,
+			},
+			// 表单参数
+			form: {},
+			checkTypes:[],
+			// 表单校验
+			rules: {
+				checkType:[
+                  { required: true, message: "检验类型不能为空", trigger: "blur" } 
+				],
+				incomeBatchNo: [
+					{ required: true, message: "来料批次号不能为空", trigger: "blur" }
+				],
+				orderNo: [
+					{ required: true, message: "订单号不能为空", trigger: "blur" }
+				],
+				materialName: [
+					{ required: true, message: "物料号不能为空", trigger: "blur" }
+				],
+				quality: [
+					{ required: true, message: "数量不能为空", trigger: "blur" }
+				],
+				unit: [
+					{ required: true, message: "单位不能为空", trigger: "blur" }
+				],
+				supplierName: [
+					{ required: true, message: "供应商不能为空", trigger: "blur" }
+				],
+				incomeTime: [
+					{ required: true, message: "来料时间不能为空", trigger: "blur" }
+				],
+				checkManName: [
+					{ required: true, message: "检测人不能为空", trigger: "blur" }
+				],
+				checkLoc: [
+					{ required: true, message: "检测地点不能为空", trigger: "blur" }
+				],
+			}
+		};
+	},
+	created() {
+		this.getDate();
+		this.getList();
+		this.getCheckTypes();
+	},
+	methods: {
+		/****/
+		getCheckTypes() {
+           	getCheckTypes('material').then(response => {
+				this.checkTypes = response;
+			});
+		},
+        /**获取默认查询时间段**/
+		getDate() {
+			let start = this.Fungetdate (0)
+			let end = this.Fungetdate (1)
+			this.queryParams.incomeTimeArray.push(start,end)
+			//this.queryParams.checkTimeArray.push(start,end)
+		},
+		Fungetdate (num) {
+			var dd = new Date();
+			dd.setDate(dd.getDate() + num);
+			var y = dd.getFullYear();
+			var m = dd.getMonth() + 1;//获取当前月份的日期
+			var d = dd.getDate();
+			return y + "-" + m + "-" + d+" 00:00:00";
+		},
+
+		/** 查询来料检验列表 */
+		getList() {
+			this.loading = true;
+
+			if(this.queryParams.incomeTimeArray.length>0){
+				this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
+				this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
+			}
+
+			if(this.queryParams.checkTimeArray.length>0){
+				this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
+				this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
+			}
+
+			listQcInventory(this.queryParams).then(response => {
+				this.incomeList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				recordId: null,
+				checkNo: null,
+				incomeBatchNo: null,
+				orderNo: null,
+				materialCode: null,
+				materialName: null,
+				quality: null,
+				unit: null,
+				supplierCode: null,
+				supplierName: null,
+				incomeTime: null,
+				checkLoc: null,
+				checkStatus: null,
+				checkManCode: null,
+				checkManName: null,
+				checkTime: null,
+				checkResult: null,
+				status: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				attr4: null,
+				createBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null,
+				factoryCode: null,
+				delFlag: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.recordId)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加来料检验";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const recordId = row.recordId || this.ids
+			getQcInventory(recordId).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改来料检验";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.recordId != null) {
+						updateQcInventory(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addQcInventory(this.form).then(response => {
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const recordIds = row.recordId || this.ids;
+			this.$modal.confirm('是否确认删除来料检验编号为"' + recordIds + '"的数据项？').then(function() {
+				return delQcInventory(recordIds);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('quality/qcIncome/export', {
+				...this.queryParams
+			}, `income_${new Date().getTime()}.xlsx`)
+		},
+
+		// 数据状态修改
+		handleStatusChange(row) {
+			let text = row.status === "0" ? "停用" : "启用";
+			this.$modal.confirm('确认要"' + text + '""' + row.checkNo + '"吗？').then(function() {
+				return changeIncomeStatus(row.recordId, row.status);
+			}).then(() => {
+				this.$modal.msgSuccess(text + "成功");
+			}).catch(function() {
+				row.status = row.status === "0" ? "1" : "0";
+			});
+		},
+
+        /**工单选择弹出框**/
+		handleSelectWorkOrder() {
+		  this.$refs.itemSelectWorkOrder.showFlag = true;
+		},
+		//工单选择确认
+		onSelectWorkOrder(obj) {
+           this.form.orderNo = obj.orderNo;
+		   this.form.materialName = obj.materialName;
+		   this.form.materialCode = obj.materialCode;
+           this.form.quality = obj.quality;
+		   this.form.incomeBatchNo = obj.incomeBatchNo;
+		   this.form.unit = obj.unit;
+		   this.form.supplierCode = obj.supplierCode;
+		   this.form.supplierName = obj.supplierName;
+		   this.form.incomeTime = obj.incomeTime;
+		},
+
+		/**供应商选择弹出框**/
+		handleSelectSupplier() {
+		  this.$refs.itemSelectSupplier.showFlag = true;
+		},
+		//供应商选择确认
+		onSelectSupplier(obj) {
+           this.form.supplierCode = obj.code;
+		   this.form.supplierName = obj.name;
+		},
+		
+		/**人员选择弹出框**/
+		handleSelectUser() {
+		  this.$refs.itemSelectUser.showFlag = true;
+		},
+		//人员选择确认
+		onSelectUser(obj) {
+           this.form.checkManCode = obj.code;
+		   this.form.checkManName = obj.name;
+		},
+		//检验项目弹窗
+		handleCheckProject(row){
+
+            if(row.checkStatus != '0'){
+                 this.$modal.msgSuccess("已经完成检验");
+				 return
+			}
+
+			this.$refs.itemSelectProject.showFlag = true;
+			this.$refs.itemSelectProject.init(row,'material');
+		},
+		//提交检测结果
+		saveCheck(){
+            this.getList();
+		}
+	}
+};
+</script>
diff --git a/src/views/quality/qcInventory/selectLLWorkOrder.vue b/src/views/quality/qcInventory/selectLLWorkOrder.vue
new file mode 100644
index 0000000..cf11382
--- /dev/null
+++ b/src/views/quality/qcInventory/selectLLWorkOrder.vue
@@ -0,0 +1,138 @@
+<template>
+  <el-dialog title="来料DN单号选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="1000px"
+  >
+    <el-row :gutter="20">
+
+      <el-col :span="24" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="left">
+          <el-form-item label="入库单号">
+            <el-input
+              v-model="queryParams.orderNo"
+              placeholder="入库单号"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
+          <el-table-column width="50" align="center" type="selection"/>
+          <el-table-column label="id"  align="left"  prop="recordId" width="100" v-if="false"/>
+          <el-table-column label="入库单号"  align="left"  prop="orderNo" width="180"/>
+          <el-table-column label="质检状态"  align="left"  prop="qualityStatus" width="100"/>
+          <el-table-column label="批次号"  align="left" prop="incomeBatchNo" width="120"/>
+          <el-table-column label="产品编码"  align="left" prop="materialCode" width="180" />
+          <el-table-column label="产品名称"  align="left" prop="materialName" width="180"/>
+          <el-table-column label="供应商编码"  align="left" prop="supplierCode" :show-overflow-tooltip="true" />
+          <el-table-column label="供应商名称"  align="left" prop="supplierName" :show-overflow-tooltip="true" />
+          <el-table-column label="排产数量"  align="left" prop="quality" width="100" />
+          <el-table-column label="单位"  align="left" prop="unit" :show-overflow-tooltip="true" />
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitLLOrderForm">确 定</el-button>
+              <el-button @click="showFlag=false">取 消</el-button>
+       </div>
+  </el-dialog>
+</template>
+<script>
+
+import { getLLWorkOrder } from "@/api/quality/income";
+export default {
+  name: "itemSelectWorkOrder",
+  data() {
+    return {
+      showFlag:false,
+      // 选中数组
+      selectedRows: {},
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // BOM产品表格数据
+      itemList: null,
+
+      //树名称
+      bomCode: undefined,
+      defaultProps: {
+        id: "id",
+        label: "label"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        workorderCode: ''
+      },
+      selectionRow:{}
+    };
+  },
+  created() {
+    this.getList();
+  },
+
+  methods: {
+
+    /** 查询表格列表*/
+    getList() {
+      this.loading = true;
+      getLLWorkOrder(this.queryParams).then(response => {
+          this.itemList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+    
+    // 多选框选中数据
+		handleBomSelectionChange(selection) {
+
+      if(selection.length>1){
+        this.$modal.msgSuccess("只能选一个");
+      }
+
+			this.selectionRow = selection[0]
+		},
+
+
+    submitLLOrderForm() {
+      this.$emit('onSelected', this.selectionRow);
+      this.showFlag = false;
+    }
+  }
+};
+</script>
diff --git a/src/views/quality/qcInventory/selectMaterial.vue b/src/views/quality/qcInventory/selectMaterial.vue
new file mode 100644
index 0000000..07aab87
--- /dev/null
+++ b/src/views/quality/qcInventory/selectMaterial.vue
@@ -0,0 +1,156 @@
+<template>
+  <el-dialog title="BOM物料选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="1000px"
+  >
+    <el-row :gutter="20">
+      <!--BOM数据-->
+      <el-col :span="24" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="center">
+          <el-form-item label="物料编码" prop="itemCode">
+            <el-input
+              v-model="queryParams.component"
+              placeholder="请输入物料编码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="物料名称" prop="itemName">
+            <el-input
+              v-model="queryParams.componentName"
+              placeholder="请输入物料名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
+          <el-table-column width="50" align="center" type="selection">
+          </el-table-column>
+          <!-- 序号 -->
+          <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
+          <el-table-column label="BOM物料组件编码"  align="left" key="component" prop="component" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="BOM物料组件名称"  align="left" key="componentName" prop="componentName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitBomForm">确 定</el-button>
+              <el-button @click="showFlag=false">取 消</el-button>
+       </div>
+  </el-dialog>
+</template>
+<script>
+
+import {getQcListBom } from "@/api/quality/income";
+export default {
+  name: "itemSelectMaterial",
+  data() {
+    return {
+      showFlag:false,
+      // 选中数组
+      selectedRows: {},
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // BOM产品表格数据
+      itemList: null,
+      //树名称
+      bomCode: undefined,
+      defaultProps: {
+        id: "id",
+        label: "label"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        component: '',
+        componentName : ''
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: `BOM物料编码`, visible: true },
+        { key: 1, label: `产品名称`, visible: true },
+        { key: 2, label: `BOM物料组件编码`, visible: true },
+        { key: 3, label: `BOM物料组件名称`, visible: true }
+      ]
+    };
+  },
+  created() {
+    this.getList();
+  },
+
+  methods: {
+    handleEquipmentSelectionChange (val) {
+       this.itemList = val
+    },
+
+    /** 查询BOM列表*/
+    getList() {
+      this.loading = true;
+      this.queryParams.bomCode = this.queryParams.itemCode;
+      this.queryParams.productDescZh = this.queryParams.itemName;
+      getQcListBom(this.queryParams).then(response => {
+          this.itemList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+    
+    // 多选框选中数据
+		handleBomSelectionChange(selection) {
+      if(selection.length>1){
+        this.$modal.msgSuccess("只能选一个");
+      }
+
+			this.ids = selection[0].component;
+      this.idsName = selection[0].componentName;
+
+		},
+
+
+    submitBomForm() {
+      this.selectedRows.code = this.ids;
+      this.selectedRows.name = this.idsName;
+      this.$emit('onSelected', this.selectedRows);
+      this.showFlag = false;
+    }
+  }
+};
+</script>
diff --git a/src/views/quality/qcInventory/selectSupplier.vue b/src/views/quality/qcInventory/selectSupplier.vue
new file mode 100644
index 0000000..4903f44
--- /dev/null
+++ b/src/views/quality/qcInventory/selectSupplier.vue
@@ -0,0 +1,152 @@
+<template>
+  <el-dialog title="供应商选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="1000px"
+  >
+    <el-row :gutter="20">
+      <!--BOM数据-->
+      <el-col :span="24" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="center">
+          <el-form-item label="供应商编码" prop="itemCode">
+            <el-input
+              v-model="queryParams.supplierCode"
+              placeholder="供应商编码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="供应商名称" prop="itemName">
+            <el-input
+              v-model="queryParams.supplierName"
+              placeholder="供应商名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
+          <el-table-column width="50" align="center" type="selection">
+          </el-table-column>
+          <!-- 序号 -->
+          <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
+          <el-table-column label="供应商编码"  align="left" key="supplierCode" prop="supplierCode" :show-overflow-tooltip="true" />
+          <el-table-column label="供应商名称"  align="left" key="supplierName" prop="supplierName" :show-overflow-tooltip="true" />
+          <el-table-column label="地址"  align="left" key="address" prop="address" :show-overflow-tooltip="true" />
+          <el-table-column label="联系方式"  align="left" key="contactPhone" prop="contactPhone" :show-overflow-tooltip="true" />
+
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitBomForm">确 定</el-button>
+              <el-button @click="showFlag=false">取 消</el-button>
+       </div>
+  </el-dialog>
+</template>
+<script>
+
+import { getQcListSupplier } from "@/api/quality/income";
+export default {
+  name: "itemSelectSupplier",
+  data() {
+    return {
+      showFlag:false,
+      // 选中数组
+      selectedRows: {},
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // BOM产品表格数据
+      itemList: null,
+      // 树选项
+      itemTypeOptions: undefined,
+      //树名称
+      supplierCode: undefined,
+      defaultProps: {
+        id: "id",
+        label: "label"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        supplierCode: '',
+        supplierName : ''
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+
+  methods: {
+
+    /** 查询表格列表*/
+    getList() {
+      this.loading = true;
+      getQcListSupplier(this.queryParams).then(response => {
+          this.itemList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+    
+    // 多选框选中数据
+		handleBomSelectionChange(selection) {
+
+      if(selection.length>1){
+        this.$modal.msgSuccess("只能选一个");
+      }
+
+			//this.ids = selection.map(item => item.supplierCode);
+      //this.idsName = selection.map(item => item.supplierName);
+      this.ids = selection[0].supplierCode;
+      this.idsName = selection[0].supplierName;
+		},
+
+
+    submitBomForm() {
+      this.selectedRows.code = this.ids;
+      this.selectedRows.name = this.idsName;
+      this.$emit('onSelected', this.selectedRows);
+      this.showFlag = false;
+      this.queryParams.itemCodeGet = "";
+    }
+  }
+};
+</script>
diff --git a/src/views/quality/qcInventory/selectUser.vue b/src/views/quality/qcInventory/selectUser.vue
new file mode 100644
index 0000000..a7e9c5e
--- /dev/null
+++ b/src/views/quality/qcInventory/selectUser.vue
@@ -0,0 +1,150 @@
+<template>
+  <el-dialog title="人员选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="1000px"
+  >
+    <el-row :gutter="20">
+
+      <el-col :span="24" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="center">
+          <el-form-item label="员工工号">
+            <el-input
+              v-model="queryParams.userCode"
+              placeholder="员工工号"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="员工姓名">
+            <el-input
+              v-model="queryParams.userName"
+              placeholder="员工姓名"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
+          <el-table-column width="50" align="center" type="selection">
+          </el-table-column>
+          <!-- 序号 -->
+          <el-table-column label="员工ID"  align="left" key="userId" prop="userId" :show-overflow-tooltip="true" />
+          <el-table-column label="员工工号"  align="left" key="userCode" prop="userCode" :show-overflow-tooltip="true" />
+          <el-table-column label="员工姓名"  align="left" key="userName" prop="userName" :show-overflow-tooltip="true" />
+          <el-table-column label="手机号"  align="left" key="phonenumber" prop="phonenumber" :show-overflow-tooltip="true" />     
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitBomForm">确 定</el-button>
+              <el-button @click="showFlag=false">取 消</el-button>
+       </div>
+  </el-dialog>
+</template>
+<script>
+
+import { getQcListUser } from "@/api/quality/income";
+export default {
+  name: "itemSelectUser",
+  data() {
+    return {
+      showFlag:false,
+      // 选中数组
+      selectedRows: {},
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // BOM产品表格数据
+      itemList: null,
+
+      //树名称
+      bomCode: undefined,
+      defaultProps: {
+        id: "id",
+        label: "label"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userCode: '',
+        userName : ''
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+
+  methods: {
+
+    /** 查询表格列表*/
+    getList() {
+      this.loading = true;
+      getQcListUser(this.queryParams).then(response => {
+          this.itemList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+    
+    // 多选框选中数据
+		handleBomSelectionChange(selection) {
+
+      /* if(selection.length>1){
+        this.$modal.msgSuccess("只能选一个");
+      } */
+      
+
+			/* this.ids = selection[0].userCode;
+      this.idsName = selection[0].userName; */
+      this.ids = selection.map(item => item.userCode).join(',');
+      this.idsName = selection.map(item => item.userName).join(',');
+		},
+
+
+    submitBomForm() {
+      this.selectedRows.code = this.ids;
+      this.selectedRows.name = this.idsName;
+      this.$emit('onSelected', this.selectedRows);
+      this.showFlag = false;
+      this.queryParams.itemCodeGet = "";
+    }
+  }
+};
+</script>
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index b5f40c8..63d331d 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -332,19 +332,9 @@
 							<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量" />
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
-						<el-form-item label="A类不良数量" prop="aNoOkquality">
-							<el-input type="number" v-model="form.aNoOkquality" placeholder="请输入不良数量" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="B类不良数量" prop="bNoOkquality">
-							<el-input type="number" v-model="form.bNoOkquality" placeholder="请输入不良数量" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-                        <el-form-item label="C类不良数量" prop="cNoOkquality">
-							<el-input type="number" v-model="form.cNoOkquality" placeholder="请输入不良数量" />
+					<el-col :span="6" v-for="(item,index) in form.defects" :key="index">
+						<el-form-item :label="item.defectSubclass" prop="">
+							<el-input type="number" v-model="item.noOkQuality" placeholder="请输入不合格数量" />
 						</el-form-item>
 					</el-col>
 				</el-row>
@@ -445,6 +435,8 @@ export default {
 			total: 0,
 			// 生产过程检验任务表格数据
 			qcProduceList: [],
+			checkTypeList:[],
+			defectTypeList: [],
 			// 弹出层标题
 			title: "",
 			// 是否显示弹出层