Merge branch 'dev' of http://120.46.222.128:10021/elink-star/epmet-work-pc into dev

src/views/modules/communityService/measure/index.vue

@@ -433,19 +433,21 @@
           ></el-input>
           <el-select
             v-else
-            v-model="selectDemandUser"
+            v-model="form.demandUserId"
             class="u-item-width-normal"
             filterable
             :disabled="disabled"
             placeholder="请选择"
             clearable
             @change="handleDemandChange"
+            remote
+            :remote-method="getDemandUserList"
           >
             <el-option
               v-for="item in demandUserList"
-              :key="item.demandUserId"
+              :key="item.demanderId"
               :label="item.label"
-              :value="item"
+              :value="item.demanderId"
             >
             </el-option>
           </el-select>
@@ -990,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);
@@ -1310,22 +1312,21 @@ 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);
           } else {
             console.log("获取查询详情成功", res.data);
+            res.data.map(e=>{
+                e.label = e.demanderName + "(" + e.demanderMobile + ")";
+            })
             this.demandUserList = res.data;
           }
         })