From c32d0af4cd5c7004819eb4025cd476c9f1715862 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 14 Jun 2023 16:47:20 +0800
Subject: [PATCH] bugs

---
 .../communityService/commonDemand/addForm.vue | 37 +++++++++--------
 .../commonDemand/detailForm.vue               |  2 +-
 .../commonDemand/editForm.vue                 | 35 ++++++++--------
 .../communityService/commonDemand/index.vue   | 40 +++++++++++++------
 .../modules/communityService/gxxq/index.vue   |  4 +-
 5 files changed, 67 insertions(+), 51 deletions(-)

diff --git a/src/views/modules/communityService/commonDemand/addForm.vue b/src/views/modules/communityService/commonDemand/addForm.vue
index 59763bc9b..e7029c4a0 100644
--- a/src/views/modules/communityService/commonDemand/addForm.vue
+++ b/src/views/modules/communityService/commonDemand/addForm.vue
@@ -53,7 +53,7 @@
         </el-form-item>
 
         <el-form-item
-          label="服务事项"
+          label="服务名称"
           prop="serviceName"
           label-width="150px"
           :class="{ 'form-item': source === 'visiual' }"
@@ -61,7 +61,7 @@
         >
           <el-input
             class="item_width_1"
-            placeholder="请输入服务事项"
+            placeholder="请输入服务名称"
             v-model="formData.serviceName"
           >
           </el-input>
@@ -80,7 +80,7 @@
             maxlength="1000"
             show-word-limit
             :rows="3"
-            placeholder="请输入备注，不超过1000字"
+            placeholder="请输入服务内容，不超过1000字"
             v-model="formData.remark"
           ></el-input>
         </el-form-item>
@@ -377,7 +377,7 @@
             </el-select>
           </el-form-item>
           <el-form-item
-            label="备注"
+            label="服务内容"
             prop="serviceGoal"
             :class="{ 'form-item': source === 'visiual' }"
             label-width="150px"
@@ -393,13 +393,13 @@
             ></el-input>
            
           </el-form-item>
-          <el-form-item label="详细位置" label-width="150px">
+          <!-- <el-form-item label="详细位置" label-width="150px">
              <el-input
               class="item_width_1"
               v-model="feedbackFormData.address"
             ></el-input>
-          </el-form-item>
-          <el-form-item
+          </el-form-item> -->
+          <!-- <el-form-item
             label="地图位置"
             label-width="150px"
             :class="{ 'form-item': source === 'visiual' }"
@@ -425,7 +425,7 @@
                 </div>
               </div>
             </div>
-          </el-form-item>
+          </el-form-item> -->
 
           <!-- <el-form-item
             class="block"
@@ -573,21 +573,20 @@ export default {
       if (this.formData.serviceTimeStart) {
         let serviceTimeStart = new Date(this.formData.serviceTimeStart);
         return (
-          time.getTime() > nowData ||
-          time.getTime() < serviceTimeStart ||
-          time.getTime() === serviceTimeStart
+          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 nowData = Date.now() - 24 * 60 * 60 * 1000;
+      return time.getTime() < nowData;
     };
 
+
     return {
       // 公共服务分类
       serviceTypesLevel1: [],
@@ -640,10 +639,10 @@ export default {
       },
 
       endPickerOptions: {
-        // disabledDate: endDisabledDate,
+        disabledDate: endDisabledDate,
       },
       startPickerOptions: {
-        // disabledDate: startDisabledDate,
+        disabledDate: startDisabledDate,
       },
 
       showFeedback: false,
@@ -757,8 +756,8 @@ export default {
     this.getDictOptions();
     this.getPolicyList();
     if (this.formType === "feedback" || this.showFeedback) {
-      this.initMap();
-      this.$refs.ref_form_feedback.resetFields();
+      // this.initMap();
+      // this.$refs.ref_form_feedback.resetFields();
     }
 
     if (this.formType === "add") {
diff --git a/src/views/modules/communityService/commonDemand/detailForm.vue b/src/views/modules/communityService/commonDemand/detailForm.vue
index 033ec19e5..10405f417 100644
--- a/src/views/modules/communityService/commonDemand/detailForm.vue
+++ b/src/views/modules/communityService/commonDemand/detailForm.vue
@@ -50,7 +50,7 @@
             </div>
 
             <div class="info-prop">
-              <span class="info-title-2">备注：</span>
+              <span class="info-title-2">服务内容：</span>
               <span>{{ formData.remark || "--" }}</span>
             </div>
 
diff --git a/src/views/modules/communityService/commonDemand/editForm.vue b/src/views/modules/communityService/commonDemand/editForm.vue
index eb196dd72..6e2c7b97f 100644
--- a/src/views/modules/communityService/commonDemand/editForm.vue
+++ b/src/views/modules/communityService/commonDemand/editForm.vue
@@ -153,7 +153,7 @@
             </el-date-picker>
           </el-form-item>
 
-          <el-form-item label="备注"
+          <el-form-item label="服务内容"
                         prop="remark"
                         label-width="150px"
                         style="display: block">
@@ -163,7 +163,7 @@
                       maxlength="500"
                       show-word-limit
                       :rows="3"
-                      placeholder="请输入备注，不超过500字"
+                      placeholder="请输入服务内容，不超过500字"
                       v-model="formData.remark"></el-input>
           </el-form-item>
 
@@ -379,20 +379,24 @@ import { nextTick } from 'vue';
   let loading // 加载动画
   export default {
     data () {
-      let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-        let nowData = Date.now()
-        if (this.formData.serviceTimeStart) {
-          let serviceTimeStart = new Date(this.formData.serviceTimeStart)
-          return time.getTime() > nowData || time.getTime() < serviceTimeStart || time.getTime() === serviceTimeStart
-        } else {
-          return time.getTime() > nowData
-        }
-
-      }
-      let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-        let nowData = Date.now()
-        return time.getTime() > nowData
+      let endDisabledDate = (time) => {
+      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now();
+      if (this.formData.serviceTimeStart) {
+        let serviceTimeStart = new Date(this.formData.serviceTimeStart);
+        return (
+          time.getTime() < serviceTimeStart- 24 * 60 * 60 * 1000 ||
+          time.getTime() === serviceTimeStart- 24 * 60 * 60 * 1000
+        );
+      } else {
+        return (time.getTime() > nowData || time.getTime() === nowData) ;
       }
+    };
+    let startDisabledDate = (time) => {
+      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now() - 24 * 60 * 60 * 1000;
+      return time.getTime() < nowData;
+    };
 
       return {
         btnDisable: false,
@@ -439,7 +443,6 @@ import { nextTick } from 'vue';
       this.getPolicyList()
       if (this.serviceRecordId) {//详情
         this.loadInfo()
-
       }
       // this.initMap()
 
diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue
index 2a0137af8..911f0f457 100644
--- a/src/views/modules/communityService/commonDemand/index.vue
+++ b/src/views/modules/communityService/commonDemand/index.vue
@@ -61,7 +61,7 @@
               </el-form-item>
 
 
-              <el-form-item label="服务事项"
+              <el-form-item label="服务名称"
                             prop="serviceName">
                 <el-input v-model="formData.serviceName"
                           class="u-item-width-normal"
@@ -155,7 +155,7 @@
                        size="small"
                        @click="handleAdd"
                        type="primary"
-                       >发起服务</el-button>
+                       >新增</el-button>
             </div>
             <!-- <el-button @click="handleExport"
                        class="diy-button--reset"
@@ -174,23 +174,23 @@
                              align="center"
                              width="50" />
 
+            <el-table-column prop="serviceTypeName"
+                            align="center"
+                            min-width="150"
+                            label="服务类型"
+                            :show-overflow-tooltip="true">
+
+            </el-table-column>
             <el-table-column prop="serviceName"
                              label="服务名称"
-                             align="center"
-                             :show-overflow-tooltip="true">
-            </el-table-column>
-
-            <el-table-column prop="serviceOrgName"
                              align="center"
                              min-width="150"
-                             label="服务组织名称"
                              :show-overflow-tooltip="true">
-
             </el-table-column>
 
             <el-table-column prop="serviceTimeStart"
                              align="center"
-                             width="300"
+                             width="200"
                              :show-overflow-tooltip="true"
                              label="服务时间">
               <template slot-scope="scope">
@@ -198,6 +198,22 @@
               </template>
             </el-table-column>
 
+            <el-table-column prop="serviceOrgName"
+                             align="center"
+                             min-width="150"
+                             label="服务方"
+                             :show-overflow-tooltip="true">
+
+            </el-table-column>
+
+            <el-table-column prop="serviceTimeCreate"
+                             align="center"
+                             min-width="150"
+                             label="服务发起时间"
+                             :show-overflow-tooltip="true">
+
+            </el-table-column>
+
             <el-table-column prop="serviceStatus"
                              align="center"
                              width="100"
@@ -207,13 +223,13 @@
                 <span>{{scope.row.serviceStatus==='in_service'?'进行中':'已完成'}}</span>
               </template>
             </el-table-column>
-
+<!-- 
             <el-table-column prop="servicePeopleNumber"
                              align="center"
                              width="110"
                              label="服务人数"
                              :show-overflow-tooltip="true">
-            </el-table-column>
+            </el-table-column> -->
 
             <el-table-column fixed="right"
                              label="操作"
diff --git a/src/views/modules/communityService/gxxq/index.vue b/src/views/modules/communityService/gxxq/index.vue
index fe7561fb2..0061395bf 100644
--- a/src/views/modules/communityService/gxxq/index.vue
+++ b/src/views/modules/communityService/gxxq/index.vue
@@ -128,7 +128,7 @@
           type="primary"
           icon="el-icon-plus"
         >
-          添加需求</el-button
+          新增</el-button
         >
         <el-button
           @click="handleChu"
@@ -592,7 +592,5 @@ export default {
 @import "@/assets/scss/modules/management/list-main.scss";
 .div_btn {
   margin-bottom: 12px;
-  display: flex;
-  justify-content: space-between;
 }
 </style>