From 15e772360c418fd4eb3c7d2cd52199c0242c894c Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Thu, 18 Jan 2024 13:47:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=96=99=E3=80=81=E6=88=90=E5=93=81?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=A3=80=E9=AA=8C=EF=BC=8C=E4=B8=8D=E8=89=AF?=
 =?UTF-8?q?=E5=93=81=E5=8A=A8=E6=80=81=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/qcIncome/index.vue      | 24 +++++++++++++++-----
 src/views/quality/qcWarehousing/index.vue | 27 +++++++++++++++++------
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue
index 6d74e87..d690793 100644
--- a/src/views/quality/qcIncome/index.vue
+++ b/src/views/quality/qcIncome/index.vue
@@ -269,9 +269,9 @@
 							<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-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-col :span="6">
@@ -367,6 +367,7 @@ import ItemSelectSupplier from "./selectSupplier.vue";
 import ItemSelectUser from "./selectUser.vue";
 import ItemSelectProject from "./checkProjectType.vue";
 import moment from 'moment';
+import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js";
 export default {
 	name: "Income",
 	components: { ItemSelectWorkOrder,ItemSelectSupplier,ItemSelectUser,ItemSelectProject},
@@ -387,6 +388,7 @@ export default {
 			total: 0,
 			// 来料检验表格数据
 			incomeList: [],
+			defectTypeList: [],
 			// 弹出层标题
 			title: "",
 			// 是否显示弹出层
@@ -462,6 +464,7 @@ export default {
 		this.getDate();
 		this.getList();
 		this.getCheckTypes();
+		this.handleDefectType();
 	},
 	methods: {
 		/****/
@@ -541,7 +544,8 @@ export default {
 				updateBy: null,
 				updateTime: null,
 				factoryCode: null,
-				delFlag: null
+				delFlag: null,
+				defects: []
 			};
 			this.resetForm("form");
 		},
@@ -564,6 +568,7 @@ export default {
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.reset();
+			this.form.defects = this.defectTypeList;
 			this.open = true;
 			this.title = "添加来料检验";
 		},
@@ -573,6 +578,9 @@ export default {
 			const recordId = row.recordId || this.ids
 			getIncome(recordId).then(response => {
 				this.form = response.data;
+				if (this.form.defects == null) {
+					this.form.defects = this.defectTypeList;
+				}
 				this.open = true;
 				this.title = "修改来料检验";
 			});
@@ -675,11 +683,17 @@ export default {
 		//查看检验项目弹窗
 		handleView(row){
 			this.$refs.itemSelectProject.showFlag = true;
-			this.$refs.itemSelectProject.view(row,'produce');
+			this.$refs.itemSelectProject.view(row,'material');
 		},
 		//提交检测结果
 		saveCheck(){
             this.getList();
+		},
+		handleDefectType() {
+			const defectType = "material";
+			getDefectTypeListByDefectType(defectType).then(response => {
+				this.defectTypeList = response.rows;
+			});
 		}
 	}
 };
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index 889c580..4b494f1 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -120,7 +120,6 @@
 					v-hasPermi="['quality:qcWarehousing:add']"
 				>新增</el-button>
 			</el-col>
-			<!--
 			<el-col :span="1.5">
 				<el-button
 					type="success"
@@ -132,7 +131,7 @@
 					v-hasPermi="['quality:qcWarehousing:edit']"
 				>修改</el-button>
 			</el-col>
-			<el-col :span="1.5">
+			<!-- <el-col :span="1.5">
 				<el-button
 					type="danger"
 					plain
@@ -301,9 +300,9 @@
 							<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-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-col :span="6">
@@ -409,6 +408,7 @@ import ItemSelectLoc from "./selectLoc.vue";
 import ItemSelectUser from "../qcIncome/selectUser.vue";
 import ItemSelectProject from "../qcIncome/checkProjectType.vue";
 import moment from 'moment';
+import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js";
 export default {
 	name: "Warehousing",
 	components: { ItemSelectMaterial,ItemSelectLoc,ItemSelectUser,ItemSelectProject,ItemSelectWorkOrder},
@@ -430,6 +430,7 @@ export default {
 			// 成品入库检验任务表格数据
 			warehousingList: [],
 			batchList:[],
+			defectTypeList: [],
 			// 弹出层标题
 			title: "",
 			// 是否显示弹出层
@@ -502,6 +503,7 @@ export default {
 		this.getDate();
 		this.getList();
 		this.getCheckTypes();
+		this.handleDefectType();
 	},
 	methods: {
 		/****/
@@ -582,7 +584,8 @@ export default {
 				updateBy: null,
 				updateTime: null,
 				factoryCode: null,
-				delFlag: null
+				delFlag: null,
+				defects: []
 			};
 			this.resetForm("form");
 		},
@@ -605,6 +608,7 @@ export default {
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.reset();
+			this.form.defects = this.defectTypeList;
 			this.open = true;
 			this.title = "添加成品入库检验任务";
 		},
@@ -614,6 +618,9 @@ export default {
 			const recordId = row.recordId || this.ids
 			getWarehousing(recordId).then(response => {
 				this.form = response.data;
+				if (this.form.defects == null) {
+					this.form.defects = this.defectTypeList;
+				}
 				this.open = true;
 				this.title = "修改成品入库检验任务";
 			});
@@ -724,11 +731,17 @@ export default {
 		//查看检验项目弹窗
 		handleView(row){
 			this.$refs.itemSelectProject.showFlag = true;
-			this.$refs.itemSelectProject.view(row,'produce');
+			this.$refs.itemSelectProject.view(row,'product');
 		},
 		//提交检测结果
 		saveCheck(){
             this.getList();
+		},
+		handleDefectType() {
+			const defectType = "product";
+			getDefectTypeListByDefectType(defectType).then(response => {
+				this.defectTypeList = response.rows;
+			});
 		}
 	}
 };