From 960c6524e19e194ef2010189b42334074ea0c912 Mon Sep 17 00:00:00 2001
From: wxz <wxz@test.com>
Date: Tue, 26 Sep 2023 10:29:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=B1=85=E6=B0=91=E9=9C=80=E6=B1=82-?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BA=BA=E4=B8=8B=E6=8B=89=E6=A1=86=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E8=80=81=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/measure/index.vue | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 2e11ec813..45a4ed990 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -440,11 +440,13 @@
             placeholder="请选择"
             clearable
             @change="handleDemandChange"
+            remote
+            :remote-method="getDemandUserList"
           >
             <el-option
               v-for="item in demandUserList"
-              :key="item.demandUserId"
-              :label="item.label"
+              :key="item.demanderId"
+              :label="item.demanderName"
               :value="item"
             >
             </el-option>
@@ -1310,17 +1312,13 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    async getDemandUserList() {
+
+    async getDemandUserList(demanderName) {
       const { user } = await this.$store.state;
-      console.log("user---ppp", user);
-      const params = {
-        agencyId: user.agencyId,
-        gridId: this.form.gridId,
-        name: "",
-      };
+      console.log("demanderName:", demanderName);
       // addorupdate
       await this.$http
-        .post("/epmetuser/icresiuser/demandusers", params)
+        .get(`/actual/base/resiDemand/listDemander2Serve?gridId=${this.form.gridId}&demanderName=${demanderName ? demanderName : ''}`)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);

From ee18945cadce3cef0668bd07ff1a4c86119f7af9 Mon Sep 17 00:00:00 2001
From: wxz <wxz@test.com>
Date: Tue, 26 Sep 2023 13:27:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/measure/index.vue        | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 45a4ed990..a5873952f 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -433,7 +433,7 @@
           ></el-input>
           <el-select
             v-else
-            v-model="selectDemandUser"
+            v-model="form.demandUserId"
             class="u-item-width-normal"
             filterable
             :disabled="disabled"
@@ -446,8 +446,8 @@
             <el-option
               v-for="item in demandUserList"
               :key="item.demanderId"
-              :label="item.demanderName"
-              :value="item"
+              :label="item.label"
+              :value="item.demanderId"
             >
             </el-option>
           </el-select>
@@ -992,11 +992,11 @@ export default {
       }
     },
     handleDemandChange(val) {
-      console.log("val", val, this.selectDemandUser);
-      this.selectDemandUser = val.label;
-      this.form.demandUserName = val.demandUserName;
-      this.form.demandUserMobile = val.demandUserMobile;
-      this.form.demandUserId = val.demandUserId;
+    //   console.log("val", val, this.selectDemandUser);
+    //   this.selectDemandUser = val.label;
+      this.form.demandUserName = val.demanderName;
+      this.form.demandUserMobile = val.demanderMobile;
+    //   this.form.demandUserId = val.demanderId;
     },
     handleSearch(val) {
       console.log("searchhh--", val);
@@ -1324,6 +1324,9 @@ export default {
             return this.$message.error(res.msg);
           } else {
             console.log("获取查询详情成功", res.data);
+            res.data.map(e=>{
+                e.label = e.demanderName + "(" + e.demanderMobile + ")";
+            })
             this.demandUserList = res.data;
           }
         })