From 59c1fcb8b25cd0ba03d8c3b6c38050385982e6e0 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 26 Aug 2022 15:09:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/worklog/workLog.vue      | 31 +++++++++++++++++--
 .../communityService/worklog/workLogForm.vue  | 10 ++++--
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 347ef2ca3..397e07ce3 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -70,6 +70,18 @@
                       placeholder="请输入内容">
             </el-input>
           </el-form-item>
+          <el-form-item label="服务时间"
+                        prop="wantServiceStartTime">
+            <el-date-picker v-model="serviceTimeArea"
+                            type="daterange"
+                            format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                            clearable>
+            </el-date-picker>
+          </el-form-item>
           <el-button style="margin-left:10px"
                      class="diy-button--search"
                      size="small"
@@ -265,6 +277,7 @@ export default {
   data () {
     return {
       loading: false,
+      serviceTimeArea: '',
       total: 0,
       pageSize: 20,
       pageNo: 0,
@@ -277,7 +290,9 @@ export default {
         applicantName: '',
         applicantAddress: '',
         applicantMobile: '',
-        serviceContent: ''
+        serviceContent: '',
+        serviceTimeStart: '',
+        serviceTimeEnd: ''
       },
       tableData: [],
 
@@ -301,7 +316,9 @@ export default {
         applicantName: '',
         applicantAddress: '',
         applicantMobile: '',
-        serviceContent: ''
+        serviceContent: '',
+        serviceTimeStart: '',
+        serviceTimeEnd: ''
       },
       serviceTypeList: [],
 
@@ -405,6 +422,11 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
+      if (Array.isArray(this.serviceTimeArea) && this.serviceTimeArea.length > 0) {
+        this.workLog.serviceTimeStart = this.serviceTimeArea[0];
+        this.workLog.serviceTimeEnd = this.serviceTimeArea[1];
+      }
+
       const url = "/heart/workdiaryService/record/page"
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/page"
       let params = {
@@ -522,8 +544,11 @@ export default {
         applicantName: '',
         applicantAddress: '',
         applicantMobile: '',
-        serviceContent: ''
+        serviceContent: '',
+        serviceTimeStart: '',
+        serviceTimeEnd: ''
       }
+      this.serviceTimeArea = ''
       this.pageSize = 10
       this.pageNo = 0
       this.loadTable()
diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
index 9566bd64d..0920d3e60 100644
--- a/src/views/modules/communityService/worklog/workLogForm.vue
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -97,9 +97,13 @@
                       style="display: block"
                       label-width="150px"
                       prop="serviceTime">
-          <el-input v-model="formData.serviceTime"
-                    class="item_width_1"
-                    placeholder="请输入服务时间"></el-input>
+          <el-date-picker v-model="formData.serviceTime"
+                          type="date"
+                          class="input-width"
+                          clearable
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
+          </el-date-picker>
         </el-form-item>
 
         <el-form-item label="备注"