From 2d016d166d26403a5501422e6d680027e0ce6202 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 17 Mar 2025 09:51:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E6=97=A5=E5=BF=97mlog?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E8=AE=BE=E5=A4=87=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=96=B0=E5=A2=9E=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlog_form.vue | 14 +++++++++-----
 src/views/wpm_gx/mlogs.vue     | 15 +++++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index df2754f0..3bba92a5 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -197,9 +197,7 @@
 				</el-form>
 			</el-main>
 			<el-footer>
-				<el-button type="primary" :loading="isSaveing" @click="submit"
-					>保存</el-button
-				>
+				<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
 				<el-button @click="visible = false">取消</el-button>
 			</el-footer>
 		</el-container>
@@ -217,6 +215,7 @@ const defaultForm = {
 	work_end_time:null,
 	note:'',
 	mgroup:'',
+	handle_user_name:"",
 	reminder_interval_list: [0,0],
 };
 
@@ -294,6 +293,7 @@ export default {
 				{ id: 10, name: "自产" },
 				{ id: 20, name: "外协" },
 			],
+			codeText:"",
 			visible: false,
 			isSaveing: false,
 			options: [],
@@ -305,7 +305,7 @@ export default {
 	},
 	mounted() {
 		this.getRoute();
-		this.getUser();
+		// this.getUser();
 		this.getSupplier();
 		this.getEquipment();
 		
@@ -336,6 +336,9 @@ export default {
 			let that = this;
 			this.$API.em.equipment.list.req({ page: 0, type: 10,mgroup:that.mgroup}).then((res) => {
 				res.forEach((item) => {
+					if(that.codeText = item.number){
+						this.form.equipment = item.id;
+					}
 					let obj = {};
 					Object.assign(obj, item);
 					obj.label = item.name+'-'+item.number;
@@ -361,8 +364,9 @@ export default {
 				});
 		},
 		//显示
-		open(mode = "add") {
+		open(mode = "add",text) {
 			this.mode = mode;
+			this.codeText = text;
 			this.visible = true;
 			return this;
 		},
diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue
index 1d606a60..6c4f8fc1 100644
--- a/src/views/wpm_gx/mlogs.vue
+++ b/src/views/wpm_gx/mlogs.vue
@@ -9,6 +9,14 @@
 					v-auth="'mlog.create'"
 					>新增</el-button
 				>
+				<el-input 
+					ref="codeInput"
+					v-model="codeText"
+					clearable
+					placeholder="设备编号"
+					style="width:150px"
+					@keyup.enter="codeTextChange"
+				></el-input>
 			</div>
 			<div class="right-panel">
 				<el-input
@@ -206,6 +214,7 @@ export default {
 			selection: [],
 			mtask: "",
 			mlogId: "",
+			codeText: "",
 		};
 	},
 	mounted() {
@@ -346,6 +355,12 @@ export default {
 				
 			}
 		},
+		codeTextChange(text){
+			this.dialog.save = true;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open("add",text);
+			});
+		},
 		//表格选择后回调事件
 		selectionChange(selection) {
 			this.selection = selection;