From 2b51da702866f58054ce6d74d01555cfc20f23fa Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 14 May 2024 18:05:26 +0800
Subject: [PATCH] =?UTF-8?q?bug#1159=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=AE=8C?=
 =?UTF-8?q?=E6=95=B4=E6=94=B9=E4=B8=BA=E5=BE=85=E5=AE=8C=E5=96=84,?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD=E6=97=A0=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=82=B9=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resourceManagement/enterprise/addForm.vue | 11 ++++---
 .../resourceManagement/enterprise/index.vue   | 31 +++++++++++++++----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
index 93cebadbd..322899b2b 100644
--- a/src/views/modules/resourceManagement/enterprise/addForm.vue
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -539,7 +539,9 @@ export default {
 				console.log('详情数据', data);
 				this.formData = { ...data };
 				this.initMap();
-			
+				if(!data.latitude){
+					this.remoteMethod(data.address,true)
+				}
 			} else {
 				this.$message.error(msg);
 			}
@@ -685,8 +687,7 @@ export default {
 				this.searchOptions = [];
 			}
 		},
-		async remoteMethod(query) {
-			console.log("query",query)
+		async remoteMethod(query,flag) {
 			if (query !== '') {
 				this.loading = true;
 				const { msg, data } = await map.searchNearby(query);
@@ -699,7 +700,9 @@ export default {
 						this.searchOptions = this.resultList.map(item => {
 							return { value: `${item.id}`, label: `${item.address + item.name}` };
 						});
-						console.log("this.searchOptions",this.searchOptions )
+						if(flag){
+							this.handleClickKey(0)
+						}
 					}
 				} else {
 					this.searchOptions = [
diff --git a/src/views/modules/resourceManagement/enterprise/index.vue b/src/views/modules/resourceManagement/enterprise/index.vue
index f61de4f14..89c537643 100644
--- a/src/views/modules/resourceManagement/enterprise/index.vue
+++ b/src/views/modules/resourceManagement/enterprise/index.vue
@@ -9,16 +9,19 @@
                                 clearable placeholder="请输入"></el-input>
                         </el-form-item>
                         <el-form-item label="规模" prop="scale">
-                            <el-input v-model.trim="formData.scale" class="u-item-width-normal" size="small"
-                                clearable placeholder="请输入"></el-input>
+                            <el-select v-model.trim="formData.scale" placeholder="请选择" class="u-item-width-normal"
+                                size="small" clearable>
+                                <el-option v-for="item in scaleList" :key="item.value" :label="item.label"
+                                    :value="item.value"></el-option>
+                            </el-select>
                         </el-form-item>
 
                         <el-form-item label="负责人" prop="chargePerson">
                             <el-input v-model.trim="formData.chargePerson" class="u-item-width-normal" size="small"
                                 clearable placeholder="请输入"></el-input>
                         </el-form-item>
-                        <el-form-item label="联系人" prop="linkPerson">
-                            <el-input v-model.trim="formData.linkPerson" class="u-item-width-normal" size="small"
+                        <el-form-item label="联系电话" prop="linkPerson">
+                            <el-input v-model.trim="formData.mobile" class="u-item-width-normal" size="small"
                                 clearable placeholder="请输入"></el-input>
                         </el-form-item>
                         <el-form-item label="九小场所" prop="nineSmallPlacesFlag">
@@ -107,7 +110,7 @@
                             <el-button 
                                 style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small"
                                 type="text">
-                                编辑
+                                {{scope.row.latitude?'编辑':'待完善'}}
                             </el-button>
                             <el-button style="margin-right: 10px" @click="handleAdd(scope.row, 'patrol')" size="small"
                                 type="text">
@@ -173,7 +176,8 @@ export default {
             pageSize:20,
             total: 1,
             detailId: '',
-            checkResultFlag:false
+            checkResultFlag:false,
+            scaleList:[]
         };
     },
     components: { addForm },
@@ -192,6 +196,7 @@ export default {
         this.loadplaceType();
         this.loadCategory();
         this.getTableData();
+        this.loadScale()
     },
     methods: {
         handleSearch(val) {
@@ -211,6 +216,20 @@ export default {
             } else {
                 this.$message.error(msg);
             }
+        },
+         //获取规模
+        async loadScale () {
+            const url = "/sys/dict/data/dictlist"
+            let params = {
+                dictType: 'scale'
+            }
+            const { data, code, msg } = await requestPost(url, params)
+            if (code === 0) {
+                this.scaleList = data
+
+            } else {
+                this.$message.error(msg)
+            }
         },
         //场所类型
         async loadplaceType() {