From 3cda314ad41d580889c3efac8fb89cc77b85277b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 20 Aug 2024 14:46:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=88=90=E5=93=81=E6=A3=80=E9=AA=8Ccoding#?=
 =?UTF-8?q?465?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qm/productCheck.vue |  5 +++++
 src/views/qm/product_form.vue | 36 +++++++++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/views/qm/productCheck.vue b/src/views/qm/productCheck.vue
index 1888a5ce..e1c4a13b 100644
--- a/src/views/qm/productCheck.vue
+++ b/src/views/qm/productCheck.vue
@@ -31,6 +31,11 @@
 						<el-descriptions-item label="抽检数">{{
 							workObj.count_sampling
 						}}</el-descriptions-item>
+						<el-descriptions-item label="配帮管批次号">
+							<div v-if=" workObj.mb_&&workObj.mb_.assemb">
+								<span v-for="item in workObj.mb_.assemb">{{item.batch}}、</span>
+							</div>
+						</el-descriptions-item>
 					</el-descriptions>
 					<el-button 
 					 type="primary" @click="table_edit(workObj)">编辑</el-button>
diff --git a/src/views/qm/product_form.vue b/src/views/qm/product_form.vue
index b988d466..183dae18 100644
--- a/src/views/qm/product_form.vue
+++ b/src/views/qm/product_form.vue
@@ -81,7 +81,24 @@
 								></el-input-number>
 							</el-form-item>
 						</el-col>
-						
+						<el-col :md="12" :sm="24">
+							<el-form-item label="检验人" prop="test_user">
+								<el-select
+									v-model="form.test_user"
+									placeholder="检验人"
+									clearable
+									filterable
+									style="width: 100%"
+								>
+									<el-option
+										v-for="item in userList"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
 					</el-row>
 				</el-form>
 			</el-main>
@@ -100,7 +117,10 @@ export default {
 	data() {
 		return {
 			loading: false,
-			form: {},
+			form: {
+				type:'prod',
+				type2:10
+			},
 			rules: {
 				test_date: [
 					{
@@ -120,11 +140,13 @@ export default {
 			visible: false,
 			isSaveing: false,
 			options: [],
+			userList:[],
 			selectionFilters: [],
 			setFiltersVisible: false,
 		};
 	},
 	mounted() {
+		this.getUsers();
 		this.getMaterialBatch();
 	},
 	methods: {
@@ -141,6 +163,15 @@ export default {
 				this.form.count_ok = this.form.count - this.form.count_notok
 			}
 		},
+		getUsers(){
+			let that = this;
+			let userList = [];
+			that.$API.system.user.list
+			.req({ page: 0, posts__code__contains: "check" })
+			.then((res) => {
+				that.userList = res;
+			});
+		},
 		//获取物料批次
 		getMaterialBatch() {
 			let that = this;
@@ -158,6 +189,7 @@ export default {
 					that.form.count = item.count;
 					that.form.batch = item.batch;
 					that.form.material = item.material;
+					that.form.mb = item.id;
 				}
 			});
 		},