From 2eca64bf9327e3ab4ac02bb417871ffd27b405ba Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 5 Sep 2024 19:27:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=AE=BE=E5=A4=87=E6=98=BE=E7=A4=BA=E8=AE=BE?=
 =?UTF-8?q?=E5=88=AB=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                    | 6 ++++++
 src/views/wpm_gx/mlog_form.vue | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 6155ef5d..545c4771 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -308,5 +308,11 @@ export default {
     left: 50%;
     color: #cccccc;
 }
+.el-select-dropdown__item{
+	height:auto!important;
+}
+.el-select-dropdown__item div{
+	margin-left:15px!important;
+}
 //排放系统
 </style>
diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index af70a6ed..6bcb02e6 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -97,7 +97,7 @@
 									<el-option
 										v-for="item in options"
 										:key="item.id"
-										:label="item.name"
+										:label="item.label"
 										:value="item.id"
 									>
 									<span style="float:left">{{item.name}}</span>
@@ -314,7 +314,12 @@ export default {
 		getEquipment() {
 			let that = this;
 			this.$API.em.equipment.list.req({ page: 0, type: 10,mgroup:that.mgroup}).then((res) => {
-				this.options = res;
+				res.forEach((item) => {
+					let obj = {};
+					Object.assign(obj, item);
+					obj.label = item.name+'-'+item.number;
+					that.options.push(obj);
+				});
 			});
 		},
 		getSupplier() {