From e7265af6f85fb7601145a15abf39025d49007743 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 26 Aug 2022 09:18:20 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E7=94=B5=E8=AF=9D=E6=94=B9=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/worklog/workLogForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
index 4bc20acf8..9566bd64d 100644
--- a/src/views/modules/communityService/worklog/workLogForm.vue
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -51,7 +51,7 @@
                      clearable>
             <el-option v-for="item in demandUserList"
                        :key="item.demandUserId"
-                       :label="item.label"
+                       :label="item.demandUserName + '（' +item.idCard + '）'"
                        :value="item.demandUserId">
             </el-option>
           </el-select>

From 8aef831a443d5f9fcb1f984e9d1f76f50542db7e Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 26 Aug 2022 10:09:17 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=82=AC=E6=B5=AE=E4=B8=8B=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/worklog/workLog.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index b95f7d8a7..1a25382ae 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -144,6 +144,7 @@
         </el-table-column>
         <el-table-column prop="applicantAddress"
                          header-align="center"
+                         show-overflow-tooltip
                          align="center"
                          label="住址"
                          width="80">

From 9c8d6d4bb1cb32087b46d44876efa46698a514a0 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 26 Aug 2022 10:40:31 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/worklog/workLog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 1a25382ae..94b2f0445 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -526,7 +526,7 @@ export default {
       }
       this.pageSize = 10
       this.pageNo = 0
-      // this.loadTable()
+      this.loadTable()
     },
 
     //导出表格

From e12aac98a949fc35c9d3aa15c70198135ab8aa28 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 26 Aug 2022 14:44:22 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/worklog/workLog.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 94b2f0445..347ef2ca3 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -611,8 +611,8 @@ export default {
       //清空上传列表
       this.$refs['upload'].clearFiles()
 
-      // var url = '/heart/workdiaryService/record/import'
-      var url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/import'
+      var url = '/heart/workdiaryService/record/import'
+      // var url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/import'
       let fileFormData = new FormData();
       fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
 

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 5/5] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=97=B6=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="备注"