Merge branch '1121筛选' into dev

src/views/modules/communityService/gxxq/addForm.vue

@@ -161,9 +161,10 @@
           label-width="150px"
           prop="serviceTimeEnd"
         >
+            
+        <!-- :picker-options="startPickerOptions" -->
           <el-date-picker
             v-model="newFormData.serviceTimeStart"
-            :picker-options="startPickerOptions"
             class="item_width_2"
             style="width: 220px"
             type="datetime"
@@ -173,9 +174,9 @@
           >
           </el-date-picker>
           <span class="u-data-tag">至</span>
+          <!--  :picker-options="endPickerOptions"-->
           <el-date-picker
             v-model="newFormData.serviceTimeEnd"
-            :picker-options="endPickerOptions"
             class="item_width_2 u-data-tag"
             style="width: 220px"
             type="datetime"

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

@@ -521,7 +521,7 @@
               <el-option
                 v-for="item in serviceOptiondList"
                 :key="item.id"
-                :label="item.name"
+                :label="item.label"
                 :value="item.id"
               >
               </el-option>
@@ -641,6 +641,7 @@
 import { mapGetters } from "vuex";
 import info from "./info";
 import detail from "./detail";
+import { requestPost } from "@/js/dai/request";
 
 export default {
   components: { info, detail },
@@ -1327,25 +1328,18 @@ export default {
     },
     //这是回填包括点击时调的接口真乱啊
     async getServiceuserList(serviceType, query) {
-      const { demandUserId } = this.form;
+      const url = "/actual/base/serviceitem/listServerOrgNewTask";
-      const url = "/actual/base/serviceitem/listServerOrg";
       let params = {
-        serviceTypeId: this.form.categoryCode[1],//上级ID
+        serverOrgCategoryCode: this.form.categoryCode[1],
-        serverOrgType: serviceType,//选的类型
+        serverParentOrgCategoryCode:this.form.categoryCode[0],
-        businessType: "resi_service",
+        serverOrgType: serviceType,
       };
-      await this.$http
+      let { data, code, msg } = await requestPost(url, params);
-        .post(url, params)
+      if (code == 0) {
-        .then(({ data: res }) => {
+        this.serviceOptiondList = data;
-          if (res.code !== 0) {
+      } else if (code >= 8000) {
-            return this.$message.error(res.msg);
+        this.$message.error(msg);
-          } else {
+      }
-            this.serviceOptiondList = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
     },
     async getDictOptions() {
       this.$http