From 5b9a1d6cb3a7d59c8f2de83c495bba1a069b2723 Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期五, 19 一月 2024 00:23:15 +0800
Subject: [PATCH] update

---
 src/container/machineList/Manage-add-update.vue |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/container/machineList/Manage-add-update.vue b/src/container/machineList/Manage-add-update.vue
index d9ec566..30e6efa 100644
--- a/src/container/machineList/Manage-add-update.vue
+++ b/src/container/machineList/Manage-add-update.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<el-dialog :title="!dataForm.id ? '鏂板缓' : '缂栬緫'" :close-on-click-modal="false" width="80%" :visible.sync="addVisible">
+		<el-dialog :title="!dataForm.id ? '鏂板缓' : '缂栬緫'" :close-on-click-modal="false" width="80%" :visible.sync="addVisible" @close="cancel">
 			<!-- 娣诲姞鍐呭-->
 			<el-form :model="dataForm" label-width="100px" ref="dataForm">
 				<el-row :gutter="20">
@@ -24,38 +24,39 @@
 						<el-form-item label="绔彛" prop="port">
 							<el-input v-model="dataForm.port" placeholder="绔彛" clearable></el-input>
 						</el-form-item>
-						<el-form-item label="杞﹂棿" prop="workshopId">
-							<el-select class="value" v-model="dataForm.workshopId" @change="changewsl" placeholder="璇烽�夋嫨">
-								<el-option v-for="item in workshopList" :key="item.id" :label="item.name" :value="item.id">
-								</el-option>
-							</el-select>
-						</el-form-item>
 						<el-form-item label="绋嬪簭浼犺緭妯″紡" prop="transMode">
-							<el-select class="value" v-model="dataForm.transMode" placeholder="璇烽�夋嫨">
+							<el-select class="value" v-model="dataForm.transMode" placeholder="璇烽�夋嫨" clearable>
 								<el-option v-for="item in transModeList" :key="item.value" :label="item.label" :value="item.value">
 								</el-option>
 							</el-select>
 						</el-form-item>
+						<el-form-item label="杞﹂棿" prop="workshopId">
+							<el-select class="value" v-model="dataForm.workshopId" @change="changewsl" placeholder="璇烽�夋嫨" clearable>
+								<el-option v-for="item in workshopList" :key="item.id" :label="item.name" :value="item.id">
+								</el-option>
+							</el-select>
+						</el-form-item>
+						
 						<el-form-item label="宸ユ" prop="sectionId">
-							<el-select class="value" v-model="dataForm.sectionId" placeholder="璇烽�夋嫨">
+							<el-select class="value" v-model="dataForm.sectionId" placeholder="璇烽�夋嫨" clearable>
 								<el-option v-for="item in sectionIds" :key="item.id" :label="item.name" :value="item.id">
 								</el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item label="鍗忚" prop="protocolId">
-							<el-select class="value" v-model="dataForm.protocolId" placeholder="璇烽�夋嫨">
+							<el-select class="value" v-model="dataForm.protocolId" placeholder="璇烽�夋嫨" clearable>
 								<el-option v-for="item in protocolList" :key="item.id" :label="item.name" :value="item.id">
 								</el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item label="鏄惁閲囬泦" prop="isCollect">
-							<el-radio-group class="value" v-model="dataForm.isCollect">
+							<el-radio-group class="value" v-model="dataForm.isCollect" clearable>
 								<el-radio :label="0">鍚�</el-radio>
 								<el-radio :label="1">鏄�</el-radio>
 							</el-radio-group>
 						</el-form-item>
 						<el-form-item label="鐝埗" prop="shiftType">
-							<el-select class="value" v-model="dataForm.shiftType" placeholder="璇烽�夋嫨">
+							<el-select class="value" v-model="dataForm.shiftType" placeholder="璇烽�夋嫨" clearable>
 								<el-option v-for="item in shiftTypes" :key="item.value" :label="item.label"
 									:value="item.value">
 								</el-option>
@@ -100,7 +101,6 @@
 			workshopList: [],
 			accountList: [],
 			dataForm: {
-				machineName: '',
 				id: '',
 				ip: '',
 				port: '',
@@ -154,7 +154,10 @@
 		// }
 		row: {
 			handler (val)  {
-				this.dataForm.id = val.id
+				Object.keys(this.dataForm).forEach(item => {
+					this.dataForm[item] = val[item]
+				})
+				
 			},
 			immediate: true,
 			deep: true,

--
Gitblit v1.9.3