diff --git a/src/views/monitorManage/searchMonitor.vue b/src/views/monitorManage/searchMonitor.vue index 57f9a05..6e35d9b 100644 --- a/src/views/monitorManage/searchMonitor.vue +++ b/src/views/monitorManage/searchMonitor.vue @@ -18,7 +18,7 @@ - + @@ -84,8 +84,8 @@ checkStatus: '', // 审核情况 offset: 1, limit: 20, - sort: 'createTime', - order: 'desc' + sort: '', + order: '' }, // 筛选条件 columns: [ { @@ -179,28 +179,28 @@ this.handleTimeRanges() getAllMonitorList(this.listQuery).then(response => { if (response.code === 200) { - response.data.rows = [ - { - 'id': '1', - 'applyPersonName': '张三', - 'reporterPhone': '15652360420', - 'caseStatus': '处理中', - 'superviseContent': '监察内容', - 'title': '申请监察', - 'eorcName': '咨询', - 'caseTypeName': '咨询', - 'caseDetailTypeName': '垃圾处理', - 'checkPersonName': '王', - 'applyTime': '2020-04-12 00:00:00', - 'checkTime': '2020-03-12 00:00:00', - 'superviseTime': '2020-03-12 00:00:00', - 'checkStatus': '审核通过', - 'checkRejectReason': '-', - 'supervisePersonName': '张三', - 'superviseStatus': '未监察', - 'superviseResult': '已监督完成' - } - ] + // response.data.rows = [ + // { + // 'id': '1', + // 'applyPersonName': '张三', + // 'reporterPhone': '15652360420', + // 'caseStatus': '处理中', + // 'superviseContent': '监察内容', + // 'title': '申请监察', + // 'eorcName': '咨询', + // 'caseTypeName': '咨询', + // 'caseDetailTypeName': '垃圾处理', + // 'checkPersonName': '王', + // 'applyTime': '2020-04-12 00:00:00', + // 'checkTime': '2020-03-12 00:00:00', + // 'superviseTime': '2020-03-12 00:00:00', + // 'checkStatus': '审核通过', + // 'checkRejectReason': '-', + // 'supervisePersonName': '张三', + // 'superviseStatus': '未监察', + // 'superviseResult': '已监督完成' + // } + // ] this.list = response.data.rows this.total = response.data.total this.listLoading = false @@ -210,7 +210,7 @@ // 任务办理 goDetail(row) { this.$router.push({ - path: '/caseDetail/' + row.id, + path: '/caseDetail/' + row.caseId, query: { showProcess: false } @@ -225,7 +225,7 @@ // 处理时间问题 handleTimeRanges() { // 处理申请时间 - if (this.timeRange && this.timeRange.length > 2) { + if (this.timeRange && this.timeRange.length === 2) { this.listQuery.applyStartTime = this.timeRange[0] this.listQuery.applyEndTime = this.timeRange[1] } else { @@ -233,7 +233,7 @@ this.listQuery.applyEndTime = '' } // 处理申请时间 - if (this.timeRange1 && this.timeRange1.length > 2) { + if (this.timeRange1 && this.timeRange1.length === 2) { this.listQuery.checkStartTime = this.timeRange1[0] this.listQuery.checkEndTime = this.timeRange1[1] } else { @@ -241,7 +241,7 @@ this.listQuery.checkEndTime = '' } // 监察申请时间 - if (this.timeRange2 && this.timeRange2.length > 2) { + if (this.timeRange2 && this.timeRange2.length === 2) { this.listQuery.superviseStartTime = this.timeRange2[0] this.listQuery.superviseEndTime = this.timeRange2[1] } else { diff --git a/src/views/monitorManage/searchMonitor.vue b/src/views/monitorManage/searchMonitor.vue index 57f9a05..6e35d9b 100644 --- a/src/views/monitorManage/searchMonitor.vue +++ b/src/views/monitorManage/searchMonitor.vue @@ -18,7 +18,7 @@ - + @@ -84,8 +84,8 @@ checkStatus: '', // 审核情况 offset: 1, limit: 20, - sort: 'createTime', - order: 'desc' + sort: '', + order: '' }, // 筛选条件 columns: [ { @@ -179,28 +179,28 @@ this.handleTimeRanges() getAllMonitorList(this.listQuery).then(response => { if (response.code === 200) { - response.data.rows = [ - { - 'id': '1', - 'applyPersonName': '张三', - 'reporterPhone': '15652360420', - 'caseStatus': '处理中', - 'superviseContent': '监察内容', - 'title': '申请监察', - 'eorcName': '咨询', - 'caseTypeName': '咨询', - 'caseDetailTypeName': '垃圾处理', - 'checkPersonName': '王', - 'applyTime': '2020-04-12 00:00:00', - 'checkTime': '2020-03-12 00:00:00', - 'superviseTime': '2020-03-12 00:00:00', - 'checkStatus': '审核通过', - 'checkRejectReason': '-', - 'supervisePersonName': '张三', - 'superviseStatus': '未监察', - 'superviseResult': '已监督完成' - } - ] + // response.data.rows = [ + // { + // 'id': '1', + // 'applyPersonName': '张三', + // 'reporterPhone': '15652360420', + // 'caseStatus': '处理中', + // 'superviseContent': '监察内容', + // 'title': '申请监察', + // 'eorcName': '咨询', + // 'caseTypeName': '咨询', + // 'caseDetailTypeName': '垃圾处理', + // 'checkPersonName': '王', + // 'applyTime': '2020-04-12 00:00:00', + // 'checkTime': '2020-03-12 00:00:00', + // 'superviseTime': '2020-03-12 00:00:00', + // 'checkStatus': '审核通过', + // 'checkRejectReason': '-', + // 'supervisePersonName': '张三', + // 'superviseStatus': '未监察', + // 'superviseResult': '已监督完成' + // } + // ] this.list = response.data.rows this.total = response.data.total this.listLoading = false @@ -210,7 +210,7 @@ // 任务办理 goDetail(row) { this.$router.push({ - path: '/caseDetail/' + row.id, + path: '/caseDetail/' + row.caseId, query: { showProcess: false } @@ -225,7 +225,7 @@ // 处理时间问题 handleTimeRanges() { // 处理申请时间 - if (this.timeRange && this.timeRange.length > 2) { + if (this.timeRange && this.timeRange.length === 2) { this.listQuery.applyStartTime = this.timeRange[0] this.listQuery.applyEndTime = this.timeRange[1] } else { @@ -233,7 +233,7 @@ this.listQuery.applyEndTime = '' } // 处理申请时间 - if (this.timeRange1 && this.timeRange1.length > 2) { + if (this.timeRange1 && this.timeRange1.length === 2) { this.listQuery.checkStartTime = this.timeRange1[0] this.listQuery.checkEndTime = this.timeRange1[1] } else { @@ -241,7 +241,7 @@ this.listQuery.checkEndTime = '' } // 监察申请时间 - if (this.timeRange2 && this.timeRange2.length > 2) { + if (this.timeRange2 && this.timeRange2.length === 2) { this.listQuery.superviseStartTime = this.timeRange2[0] this.listQuery.superviseEndTime = this.timeRange2[1] } else { diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue index 1963690..9a401db 100644 --- a/src/views/monitorManage/waitCheckMonitor.vue +++ b/src/views/monitorManage/waitCheckMonitor.vue @@ -16,16 +16,16 @@ start-placeholder="申请开始时间" end-placeholder="申请结束时间"/> - - - + + + + + + + + + +