From 9135e24cb86fbb73152e8eb31346b42b7244a11f Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Thu, 20 Mar 2025 17:07:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=B5=8B?=
 =?UTF-8?q?=E7=82=B9=E8=B6=8B=E5=8A=BF=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/route.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/config/route.js b/src/config/route.js
index e984b6db..c4b1e90a 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -2955,6 +2955,16 @@ const routes = [
 					perms: ["fac_cal"],
 				},
 				children: [
+					{
+						path: "/fac_cal/mpointstat_point",
+						meta: {
+							title: "测点信息",
+							// icon: "el-icon-postcard",
+							type: "menu",
+							perms: ["mpointstat_point"],
+						},
+						component: "fac_cal/mpointstat_point",
+					},
 					{
 						path: "/fac_cal/mpointstat",
 						meta: {

From 24d1e78a00bc5be7ae5235731f40e65caf56801a Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 21 Mar 2025 17:44:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E8=BD=A6=E9=97=B4=E9=A2=86?=
 =?UTF-8?q?=E6=96=99=E5=BA=93=E5=AD=98=E5=BF=85=E4=BC=A0id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/inm_record_form.vue | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/views/wpm_gx/inm_record_form.vue b/src/views/wpm_gx/inm_record_form.vue
index 8b2236e0..e2a9b655 100644
--- a/src/views/wpm_gx/inm_record_form.vue
+++ b/src/views/wpm_gx/inm_record_form.vue
@@ -44,12 +44,14 @@
 				<el-select
 					v-model="form.batch"
 					filterable
+					value-key="id"
 					@change="selectwmChange"
 				>
 					<el-option
 						v-for="item in wbatchOptions"
 						:key="item.id"
-						:value="item.batch"
+						:label="item.batch"
+						:value="item"
 					>
 						<span style="display:inline-block;float: left;">{{item.material_.name}}|{{ item.batch }}</span>
 						<span
@@ -242,15 +244,12 @@ export default {
 		selectBatchChange(item) {
 			this.form.batch = item.batch;
 			this.form.warehouse = item.warehouse;
+			this.form.mb = item.id;
 		},
 		//选择车间库存物料后的处理
-		selectwmChange(val){
+		selectwmChange(item){
 			let that = this;
-			that.wbatchOptions.forEach((item) => {
-				if (item.batch == val) {
-					that.form.material = item.material;
-				}
-			})
+			that.form.wm = item.id;
 		},
 		selectBatchClear() {
 			this.form.batch = "";