Merge branch 'dev_zxc_work_log' into dev

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"
@@ -144,6 +156,7 @@
         </el-table-column>
         <el-table-column prop="applicantAddress"
                          header-align="center"
+                         show-overflow-tooltip
                          align="center"
                          label="住址"
                          width="80">
@@ -264,6 +277,7 @@ export default {
   data () {
     return {
       loading: false,
+      serviceTimeArea: '',
       total: 0,
       pageSize: 20,
       pageNo: 0,
@@ -276,7 +290,9 @@ export default {
         applicantName: '',
         applicantAddress: '',
         applicantMobile: '',
-        serviceContent: ''
+        serviceContent: '',
+        serviceTimeStart: '',
+        serviceTimeEnd: ''
       },
       tableData: [],
 
@@ -300,7 +316,9 @@ export default {
         applicantName: '',
         applicantAddress: '',
         applicantMobile: '',
-        serviceContent: ''
+        serviceContent: '',
+        serviceTimeStart: '',
+        serviceTimeEnd: ''
       },
       serviceTypeList: [],
 
@@ -404,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 = {
@@ -521,11 +544,14 @@ export default {
         applicantName: '',
         applicantAddress: '',
         applicantMobile: '',
-        serviceContent: ''
+        serviceContent: '',
+        serviceTimeStart: '',
+        serviceTimeEnd: ''
       }
+      this.serviceTimeArea = ''
       this.pageSize = 10
       this.pageNo = 0
-      // this.loadTable()
+      this.loadTable()
     },
 
     //导出表格

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>
@@ -97,9 +97,13 @@
                       style="display: block"
                       label-width="150px"
                       prop="serviceTime">
-          <el-input v-model="formData.serviceTime"
+          <el-date-picker v-model="formData.serviceTime"
-                    class="item_width_1"
+                          type="date"
-                    placeholder="请输入服务时间"></el-input>
+                          class="input-width"
+                          clearable
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
+          </el-date-picker>
         </el-form-item>
 
         <el-form-item label="备注"