From 8a8c2b9887043c901503abebe41640ce8e28e006 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 21 Nov 2023 16:26:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B1=E6=80=A7=E9=9C=80=E6=B1=82=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E6=97=B6=E9=97=B4=E5=8E=BB=E6=8E=89=E9=99=90=E5=88=B6?=
 =?UTF-8?q?,=E4=B8=AA=E6=80=A7=E6=9C=8D=E5=8A=A1=E6=8C=87=E6=B4=BE?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=BB=84=E7=BB=87=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/gxxq/addForm.vue |  5 ++--
 .../communityService/measure/index.vue        | 30 ++++++++-----------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/views/modules/communityService/gxxq/addForm.vue b/src/views/modules/communityService/gxxq/addForm.vue
index 4221e221b..8345566c2 100644
--- a/src/views/modules/communityService/gxxq/addForm.vue
+++ b/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"
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 3c043d6de..c10b10ac9 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/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/listServerOrg";
+      const url = "/actual/base/serviceitem/listServerOrgNewTask";
       let params = {
-        serviceTypeId: this.form.categoryCode[1],//上级ID
-        serverOrgType: serviceType,//选的类型
-        businessType: "resi_service",
+        serverOrgCategoryCode: this.form.categoryCode[1],
+        serverParentOrgCategoryCode:this.form.categoryCode[0],
+        serverOrgType: serviceType,
       };
-      await this.$http
-        .post(url, params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.serviceOptiondList = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
+      let { data, code, msg } = await requestPost(url, params);
+      if (code == 0) {
+        this.serviceOptiondList = data;
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
     },
     async getDictOptions() {
       this.$http