diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 3ca6b23e4..6c4dbcc6e 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -70,6 +70,18 @@
placeholder="请输入内容">
+
+
+
+
@@ -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()
},
//导出表格
diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
index 4bc20acf8..0920d3e60 100644
--- a/src/views/modules/communityService/worklog/workLogForm.vue
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -51,7 +51,7 @@
clearable>
@@ -97,9 +97,13 @@
style="display: block"
label-width="150px"
prop="serviceTime">
-
+
+