From 9a2012db7587b5df27b709e7fb1aa9f6d949eee4 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Wed, 17 Jan 2024 16:40:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=A3=80=E9=AA=8C=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E8=89=AF=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/qcInventory/index.vue | 26 +++++++++++++++++++------
 src/views/quality/qcProduce/index.vue   |  5 ++++-
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/views/quality/qcInventory/index.vue b/src/views/quality/qcInventory/index.vue
index fd67e60..97013cd 100644
--- a/src/views/quality/qcInventory/index.vue
+++ b/src/views/quality/qcInventory/index.vue
@@ -255,9 +255,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-row>
@@ -321,11 +321,12 @@
 <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 ItemSelectWorkOrder from "./selectLLWorkOrder";
+import ItemSelectSupplier from "./selectSupplier";
 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: "Inventory",
 	components: { ItemSelectWorkOrder,ItemSelectSupplier,ItemSelectUser,ItemSelectProject},
@@ -346,6 +347,7 @@ export default {
 			total: 0,
 			// 库存检验表格数据
 			incomeList: [],
+			defectTypeList: [],
 			// 弹出层标题
 			title: "",
 			// 是否显示弹出层
@@ -421,6 +423,7 @@ export default {
 		this.getDate();
 		this.getList();
 		this.getCheckTypes();
+		this.handleDefectType();
 	},
 	methods: {
 		/****/
@@ -500,7 +503,8 @@ export default {
 				updateBy: null,
 				updateTime: null,
 				factoryCode: null,
-				delFlag: null
+				delFlag: null,
+				defects: []
 			};
 			this.resetForm("form");
 		},
@@ -523,6 +527,7 @@ export default {
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.reset();
+			this.form.defects = this.defectTypeList;
 			this.open = true;
 			this.title = "添加库存检验";
 		},
@@ -532,6 +537,9 @@ export default {
 			const recordId = row.recordId || this.ids
 			getQcInventory(recordId).then(response => {
 				this.form = response.data;
+				if (this.form.defects == null) {
+					this.form.defects = this.defectTypeList;
+				}
 				this.open = true;
 				this.title = "修改库存检验";
 			});
@@ -634,6 +642,12 @@ export default {
 		//提交检测结果
 		saveCheck(){
             this.getList();
+		},
+		handleDefectType() {
+			const defectType = "inventory"
+			getDefectTypeListByDefectType(defectType).then(response => {
+				this.defectTypeList = response.rows;
+			});
 		}
 	}
 };
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index a72535b..d1a8d3e 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -419,7 +419,7 @@ import { listQcProduce, getQcProduce, delQcProduce, addQcProduce, updateQcProduc
 } from "@/api/quality/qcProduce";
 import moment from 'moment';
 import ItemSelectWorkOrder from "./selectWorkOrder.vue";
-import ItemSelectWorkCenter from "./selectWorkCenter.vue";
+import ItemSelectWorkCenter from "./selectWorkCenter";
 import ItemSelectUser from "../qcIncome/selectUser.vue";
 import ItemSelectProject from "../qcIncome/checkProjectType.vue";
 import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js";
@@ -644,6 +644,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 = "修改生产过程检验任务";