From f5d73eb46cf2afdc03b7e971da76e538eead9cba Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 4 Aug 2026 14:29:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E5=A4=96=E5=8D=8F?=
 =?UTF-8?q?=E5=B7=A5=E6=AE=B5=E6=97=A5=E5=BF=97=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=8D=95=E4=BD=8D=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/mlog_form.vue  |  5 +++--
 src/views/wpm_bx/mlog_form2.vue | 34 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/views/wpm_bx/mlog_form.vue b/src/views/wpm_bx/mlog_form.vue
index 17a41913..822a6c3d 100644
--- a/src/views/wpm_bx/mlog_form.vue
+++ b/src/views/wpm_bx/mlog_form.vue
@@ -22,7 +22,6 @@
 							<el-form-item
 								label="外协单位"
 								prop="supplier"
-								v-if="form.mtype == 20"
 							>
 								<el-select
 									v-model="form.supplier"
@@ -332,7 +331,6 @@ export default {
 			})
 		}
 		this.getRoute();
-		this.getSupplier();
 		this.getEquipment();
 		this.getMtask();
 		this.gettestitem();
@@ -411,6 +409,9 @@ export default {
 				this.form.handle_user = userInfo.id;
 				this.form.handle_user_name = userInfo.name;
 			}
+			if(that.mgroupMtype == 20 ){
+				that.getSupplier();
+			}
 			this.visible = true;
 			if(type!==''&&type!==undefined&&type!==null){
 				this.mlogtype = type;
diff --git a/src/views/wpm_bx/mlog_form2.vue b/src/views/wpm_bx/mlog_form2.vue
index dd9a6119..0a0e10bc 100644
--- a/src/views/wpm_bx/mlog_form2.vue
+++ b/src/views/wpm_bx/mlog_form2.vue
@@ -18,6 +18,27 @@
 					style="padding: 0 10px"
 				>
 					<el-row>
+						<el-col  :md="12" :sm="12" :xs="24" v-if="mgroupMtype == 20">
+							<el-form-item
+								label="外协单位"
+								prop="supplier"
+							>
+								<el-select
+									v-model="form.supplier"
+									placeholder="外协单位"
+									clearable
+									:disabled="mode == 'edit'"
+									style="width: 100%"
+								>
+									<el-option
+										v-for="item in supplierOptions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
 						<el-col :span="scanColSpan">
 							<el-form-item label="扫码：">
 								<el-input
@@ -291,6 +312,7 @@ export default {
 			bwItemForms: [],
 			routeOptions: [],
 			materialOptions: [],
+			supplierOptions: [],
 			routeOriginOptions: [],
 			base_code: this.$TOOL.data.get('BASE_INFO').base.base_code,
 		};
@@ -354,6 +376,15 @@ export default {
 				});
 			});
 		},
+		getSupplier() {
+			let that = this;
+			let obj = {};
+			obj.page = 0;
+			obj.can_outsource = true;
+			that.$API.pum.supplier.list.req(obj).then((res) => {
+				that.supplierOptions = res;
+			});
+		},
 		gettestitem(){
 			let that = this;
 			that.$API.qm.testitem.list.req({ process: that.process,type:20 }).then((res) => {
@@ -401,6 +432,9 @@ export default {
 				this.form.handle_user = userInfo.id;
 				this.form.handle_user_name = userInfo.name;
 			}
+			if(that.mgroupMtype == 20 ){
+				that.getSupplier();
+			}
 			this.visible = true;
 			return this;
 		},