Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

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: {

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 = "";