From a4f0900cbea59912e60925ecb6cc5eb81b8ef06f Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 19 May 2025 13:54:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=89=ABA=E3=80=81=E6=89=ABB=E3=80=81?=
 =?UTF-8?q?=E6=88=90=E5=93=81=E6=8A=9B=E3=80=81=E4=B8=80=E6=AC=A1=E3=80=81?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E3=80=81=E4=B8=89=E6=AC=A1=E8=B6=85=E6=B4=97?=
 =?UTF-8?q?=E5=A1=AB=E6=97=A5=E5=BF=97=E4=B8=AD=E6=93=8D=E4=BD=9C=E4=BA=BA?=
 =?UTF-8?q?=E5=8F=AF=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/f_mlogs_form.vue | 65 +++++++++++++++++--------------
 src/views/wpm_gx/mlog_form.vue    | 30 +++++++++++++-
 2 files changed, 64 insertions(+), 31 deletions(-)

diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue
index c1a9ddd0..3ee22b4f 100644
--- a/src/views/wpm_gx/f_mlogs_form.vue
+++ b/src/views/wpm_gx/f_mlogs_form.vue
@@ -59,7 +59,6 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						
 						<el-col :md="12" :sm="24">
 							<el-form-item label="生产设备">
 								<el-select
@@ -81,7 +80,28 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
+						<!-- 操作员多选 -->
+						<el-col :md="12" :sm="24" v-if="route_code=='saobian'||route_code=='saobianb'||route_code=='chengpinpao'">
+							<el-form-item label="操作员">
+								<el-select
+									v-model="form.handle_users"
+									placeholder="操作员"
+									clearable
+									filterable
+									multiple
+									class="width100"
+									@change="handleUsersChange"
+								>
+									<el-option
+										v-for="item in userList"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24" v-else>
 							<el-form-item label="操作员">
 								<el-select
 									v-model="form.handle_user"
@@ -99,25 +119,6 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<!-- <el-col :md="12" :sm="24">
-							<el-form-item label="班次">
-								<el-select
-									v-model="form.shift"
-									placeholder="班次"
-									clearable
-									filterable
-									class="width100"
-								>
-									<el-option
-										v-for="item in shiftOtions"
-										:key="item.id"
-										:label="item.name"
-										:value="item.id"
-									>
-									</el-option>
-								</el-select>
-							</el-form-item>
-						</el-col> -->
 						<el-col :md="12" :sm="12" :xs="24" v-for="item in testitems" :key="item.id">
 							<el-form-item :label="item.name">
 								<el-input-number
@@ -308,12 +309,10 @@
 const defaultForm = {
 	batch: null,
 	equipment: null,
-	// mtaskb: null,
 	shift: null,
 	wm_in: null,
 	fmlog:null,
-	// work_start_time:null,
-	// work_end_time:null,
+	handle_users:null,
 	material_out:'',
 	count_pn_jgqbl:0,
 	count_use:0,
@@ -379,6 +378,7 @@ export default {
 			qct:'',
 			codeText:'',
 			codeBatch:'',
+			route_code:'',
 			mgroupName:'',
 			materialCount:1,//领料批次现有库存数
 			material_in:'',
@@ -403,12 +403,14 @@ export default {
 		};
 	},
 	mounted() {
-		this.getShift();
-		this.getMgroup();
-		this.getRoute();
-		this.gettestitem();
-		this.form.fmlog = this.fmlog;
-		this.form.handle_date =  this.$TOOL.dateFormat2(new Date());;
+		let that = this;
+		that.route_code = that.$route.path.split("/")[2];
+		that.getShift();
+		that.getMgroup();
+		that.getRoute();
+		that.gettestitem();
+		that.form.fmlog = that.fmlog;
+		that.form.handle_date =  that.$TOOL.dateFormat2(new Date());;
 	},
 	methods: {
 		getTeam() {
@@ -612,6 +614,9 @@ export default {
 		setData(data) {
 			Object.assign(this.form, data);
 		},
+		handleUsersChange(){
+			console.log('handleUsersChange',this.form.handle_users)
+		},
 		countUseChange(){
 			let that = this;
 			that.form.count_real = that.form.count_use - that.form.count_pn_jgqbl;
diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index 273a1642..85d2c4d1 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -131,7 +131,28 @@
 								/>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
+						<el-col :md="12" :sm="24" v-if="route_code=='chaoxi'||route_code=='chaoxi2'||route_code=='chaoxi3'">
+							<el-form-item label="操作人">
+								<el-select
+									v-model="form.handle_users"
+									placeholder="操作人"
+									clearable
+									filterable
+									multiple
+									:disabled="mode == 'edit'"
+									style="width: 100%"
+									@change="handleUsersChange"
+								>
+									<el-option
+										v-for="item in userOptions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24" v-else>
 							<el-form-item label="操作人">
 								<el-select
 									v-model="form.handle_user"
@@ -274,6 +295,7 @@ const defaultForm = {
 	route: "",
 	equipment: "",
 	handle_user: null,
+	handle_users:null,
 	work_start_time: "",
 	work_end_time:null,
 	note:'',
@@ -321,6 +343,7 @@ export default {
 				edit: "编辑日志",
 				show: "查看日志",
 			},
+			route_code:"",
 			test_file:'',
 			fileList:[],
 			testitems:[],
@@ -382,6 +405,8 @@ export default {
 		};
 	},
 	mounted() {
+		let that = this;
+		that.route_code = that.$route.path.split("/")[2];
 		this.getUser();
 		this.getRoute();
 		this.getTeam();
@@ -503,6 +528,9 @@ export default {
 			console.log('res',res);
 			this.test_file = res.path;
 		},
+		handleUsersChange(){
+			console.log('handleUsersChange',this.form.handle_users)
+		},
 		//表单提交方法
 		submit() {
 			let that = this;