Merge branch 'dev-shuju' into test

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

@@ -663,7 +663,8 @@ export default {
       
     },
     handleDemandChange(val) {
-      console.log('val', 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
@@ -727,7 +728,7 @@ export default {
         this.disabled = disabled
       }
       if (addType == 'look') {
-        this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime]
+        this.finishServiceTime = row.serviceStartTime && [row.serviceStartTime, row.serviceEndTime] || ''
       }
       if (addType == 'appoint' && row.serviceType) {
         await this.getServiceuserList(row.serviceType)
@@ -738,7 +739,7 @@ export default {
         if (item.value === row.categoryCode) this.form.categoryCode = [row.categoryCode]
       })
         this.demandUserList.forEach(item => {
-          if (item.demandUserId == row.demandUserId) this.selectDemandUser = item
+          if (item.demandUserId == row.demandUserId) this.selectDemandUser = item.label
         })
       }
       

src/views/modules/visual/communityParty/community.vue

@@ -199,11 +199,11 @@ export default {
       this.visibleLoading = false
     },
     async loadUnit () {
-      const url = "/heart/icpartyunit/option"
+      const url = "/heart/icresidemanddict/subcodelist"
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/option"
 
       let params = {
-        agencyId: this.agencyId
+        parentCategoryCode: ''
       }
 
       const { data, code, msg } = await requestPost(url, params)