bug

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

@@ -96,6 +96,7 @@
             class="item_width_1"
             ref="myCascader"
             v-model="scopeIdArray"
+            collapse-tags
             :key="iscascaderShow"
             :options="casOptions"
             :props="optionProps"

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

@@ -92,9 +92,9 @@
                            size="small"
                            clearable>
                   <el-option v-for="item in serviceOptiondList"
-                             :key="item.value"
+                             :key="item.id"
-                             :label="item.label"
+                             :label="item.name"
-                             :value="item.value">
+                             :value="item.id">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -375,21 +375,24 @@
     components: { addForm, detailForm, feedBackForm, personList, editForm },
 
     data () {
-      let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let endDisabledDate = (time) => {
-        let nowData = Date.now()
+      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-
+      let nowData = Date.now();
       if (this.formData.serviceTimeStart) {
-          let serviceTimeStart = new Date(this.formData.serviceTimeStart)
+        let serviceTimeStart = new Date(this.formData.serviceTimeStart);
-          return time.getTime() > nowData || time.getTime() < serviceTimeStart || time.getTime() === serviceTimeStart
+        return (
+          time.getTime() < serviceTimeStart- 24 * 60 * 60 * 1000 ||
+          time.getTime() === serviceTimeStart- 24 * 60 * 60 * 1000
+        );
       } else {
-          return time.getTime() > nowData
+        return (time.getTime() > nowData || time.getTime() === nowData) ;
-        }
-
-      }
-      let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-        let nowData = Date.now()
-        return time.getTime() > nowData
       }
+    };
+    // let startDisabledDate = (time) => {
+    //   //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+    //   let nowData = Date.now() - 24 * 60 * 60 * 1000;
+    //   return time.getTime() < nowData;
+    // };
 
       return {
         // 公共服务分类
@@ -446,7 +449,7 @@
           disabledDate: endDisabledDate
         },
         startPickerOptions: {
-          disabledDate: startDisabledDate
+          // disabledDate: startDisabledDate
         },
         serviceRecordId: '',
         serviceName: '',
@@ -559,26 +562,45 @@
         }
       },
 
-      async getServiceuserList (serviceType, query) {
+      // async getServiceuserList (serviceType, query) {
-        if (!serviceType) return false;
+      //   if (!serviceType) return false;
-
+
-        const params = {
+      //   const params = {
-          serviceName: "",
+      //     serviceName: "",
-          serviceType: serviceType,
+      //     serviceType: serviceType,
-          queryPurpose: query,
+      //     queryPurpose: query,
+      //   };
+      //   await this.$http
+      //     .post("/governance/userdemand/servicelist", params)
+      //     .then(({ data: res }) => {
+      //       if (res.code !== 0) {
+      //         return this.$message.error(res.msg);
+      //       } else {
+      //         this.serviceOptiondList = res.data
+      //       }
+      //     })
+      //     .catch(() => {
+      //       return this.$message.error("网络错误");
+      //     });
+      // },
+      async getServiceuserList(serverOrgType) {
+      if (!serverOrgType) return false;
+      if (this.formData.serviceTypeLevel2Id == "") {
+        this.$message.error("请先选择服务类别!");
+        return;
+      }
+      const url = "/actual/base/serviceitem/listServerOrg";
+      let params = {
+        serviceTypeId: this.formData.serviceTypeLevel2Id,
+        serverOrgType: serverOrgType,
+        businessType: "common_service",
       };
-        await this.$http
+      let { data, code, msg } = await requestPost(url, params);
-          .post("/governance/userdemand/servicelist", 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 handlePersonList (row) {