From a33d5d06ffa7c4962df4da94b6aeef70556f83fb Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 3 Apr 2025 11:25:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=89=E5=AD=90=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qm/behavior.vue      |  2 +-
 src/views/qm/behavior_form.vue |  9 ++++++-
 src/views/qm/product_form.vue  | 46 ++++++++++++++--------------------
 3 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/views/qm/behavior.vue b/src/views/qm/behavior.vue
index a523a449..a0f26bfd 100644
--- a/src/views/qm/behavior.vue
+++ b/src/views/qm/behavior.vue
@@ -228,7 +228,7 @@ export default {
 			},
 			state_xj: {
 				S: "析晶",
-				K: "不析晶",
+				R: "不析晶",
 				θ: "未化",
 			},
 			form: {
diff --git a/src/views/qm/behavior_form.vue b/src/views/qm/behavior_form.vue
index e1e06d22..15891082 100644
--- a/src/views/qm/behavior_form.vue
+++ b/src/views/qm/behavior_form.vue
@@ -262,6 +262,13 @@ export default {
 						trigger: "blur",
 					},
 				],
+				sample_number:[
+					{
+						required: true, 
+						message: "请输入样品编号", 
+						trigger: "blur"
+					},
+				],
 				test_user: [
 					{
 						required: true,
@@ -297,7 +304,7 @@ export default {
 			],
 			xjOptios: [
 				{ id: "S", name: "析晶" },
-				{ id: "K", name: "不析晶" },
+				{ id: "R", name: "不析晶" },
 				{ id: "θ", name: "未化" },
 			],
 			visible: false,
diff --git a/src/views/qm/product_form.vue b/src/views/qm/product_form.vue
index af85cf43..e91d91e4 100644
--- a/src/views/qm/product_form.vue
+++ b/src/views/qm/product_form.vue
@@ -17,23 +17,18 @@
 					<el-row>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="物料批次" prop="batch">
-								<el-select
-									v-model="form.batch"
-									placeholder="物料批次"
-									clearable
-									filterable
-									style="width: 100%"
-									@change="handleChange"
-									:disabled="mode != 'add'"
-								>
-									<el-option
-										v-for="item in options"
-										:key="item.id"
-										:label="item.batch"
-										:value="item.id"
-									>
-									</el-option>
-								</el-select>
+								<xtSelect
+                                    :apiObj="apiObjBatch"
+                                    v-model="form.batch"
+									v-model:obj="selectBatch"
+									:valueField="'batch'"
+									:labelField="'batch'"
+                                    style="width:100%"
+									@change="handleBatchChange"
+                                >
+									<el-table-column label="物料批次" prop="batch"></el-table-column>
+									<el-table-column label="数量" prop="count"></el-table-column>
+                                </xtSelect>
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
@@ -104,6 +99,7 @@ export default {
 	emits: ["success", "closed"],
 	data() {
 		return {
+			apiObjBatch:this.$API.inm.warehouse.batch,
 			apiUserObj: this.$API.system.user.list,
 			loading: false,
 			form: {
@@ -126,6 +122,7 @@ export default {
 					},
 				],
 			},
+			selectBatch:null,
 			visible: false,
 			isSaveing: false,
 			options: [],
@@ -170,17 +167,12 @@ export default {
 					that.options = res;
 				});
 		},
-		handleChange(val) {
+		handleBatchChange() {
 			let that = this;
-			console.log(val);
-			that.options.forEach((item) => {
-				if (item.id == val) {
-					that.form.count = item.count;
-					that.form.batch = item.batch;
-					that.form.material = item.material;
-					that.form.mb = item.id;
-				}
-			});
+			that.form.count = that.selectBatch.count;
+			that.form.batch = that.selectBatch.batch;
+			that.form.material = that.selectBatch.material;
+			that.form.mb = that.selectBatch.id;
 		},
 		//提交
 		submit() {