diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 47da7883..e1104966 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -58,7 +58,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="服务类型" prop="serviceType">
-              <el-select v-model="searchForm.serviceType" filterable placeholder="请选择" clearable @change="handleServiceChange">
+              <el-select v-model="searchForm.serviceType" filterable placeholder="请选择" clearable @change="handleServiceChange('query', $event)">
                 <el-option
                   v-for="item in serviceOptions"
                   :key="item.value"
@@ -68,7 +68,8 @@
               </el-select>
             </el-form-item>
             <el-form-item prop="serverId">
-              <el-select v-model="searchForm.serverId" filterable placeholder="请选择" clearable>
+              <el-select v-model="searchForm.serverId" filterable
+              :disabled="searchForm.serviceType ? false : true" placeholder="请选择" clearable>
                 <el-option
                   v-for="item in serviceOptiondList"
                   :key="item.value"
@@ -249,7 +250,7 @@
         </el-form-item>
         <el-form-item label="上报人手机号" prop="reportUserMobile">
           <el-input v-model="form.reportUserMobile" :disabled="disabled"  
-          placeholder="请输入" class="input-width" clearable></el-input>
+          placeholder="请输入" class="input-width" maxlength="11" clearable></el-input>
         </el-form-item>
         <el-form-item label="上报时间" prop="reportTime">
           <el-date-picker
@@ -310,7 +311,7 @@
               placeholder="请选择" 
               clearable 
               :disabled="disabled && addType !== 'appoint'" 
-              @change="handleServiceChange">
+              @change="handleServiceChange('add', $event)">
               <el-option
                 v-for="item in serviceOptions"
                 :key="item.value"
@@ -670,13 +671,13 @@ export default {
     handleSearch(val) {
       console.log('searchhh--', val)
       this.currentPage = 1
-      if (this.reportTime.length > 0) {
+      if (Array.isArray(this.reportTime) && this.reportTime.length > 0) {
         this.searchForm.reportStartTime = this.reportTime[0]
         this.searchForm.reportEndTime = this.reportTime[1]
       }
-      if (this.serviceTime.length > 0) {
+      if (Array.isArray(this.serviceTime) && this.serviceTime.length > 0) {
         this.searchForm.wantServiceStartTime = this.serviceTime[0]
-        this.searchForm.wantServiceTime = this.serviceTime[1]
+        this.searchForm.wantServiceEndTime = this.serviceTime[1]
       }
       this.getTableData()
     },
@@ -688,8 +689,12 @@ export default {
       }
       
     },
-    handleServiceChange(val) {
-      this.getServiceuserList(val)
+    handleServiceChange(type, val) {
+      if (val === 'social_org') {
+        if (type === 'add') this.getServiceuserList(val, 'add_demand')
+        else this.getServiceuserList(val, 'query_demand')
+      } else this.getServiceuserList(val, '')
+      
     },
     handleGridChange(val) {
       this.getDemandUserList()
@@ -969,12 +974,12 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    async getServiceuserList(serviceType) {
-      if (!serviceType) return this.$message.error('服务方不能为空')
+    async getServiceuserList(serviceType, query) {
+      if (!serviceType) return false
       const params = {
         serviceName: '',
         serviceType: serviceType,
-        queryPurpose: ''
+        queryPurpose: query
       }
       await this.$http
         .post('/heart/userdemand/servicelist', params)