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="申请结束时间"/>
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -89,7 +89,6 @@
{
text: '申请时间',
value: 'applyTime',
- width: 90,
align: 'center'
},
{
@@ -97,27 +96,27 @@
value: 'caseStatus',
align: 'center'
},
- {
- text: '审核人',
- value: 'checkPersonName',
- align: 'center'
- },
- {
- text: '审核时间',
- value: 'checkTime',
- width: 90,
- align: 'center'
- },
+ // {
+ // text: '审核人',
+ // value: 'checkPersonName',
+ // align: 'center'
+ // },
+ // {
+ // text: '审核时间',
+ // value: 'checkTime',
+ // width: 90,
+ // align: 'center'
+ // },
{
text: '审核情况',
value: 'checkStatus',
align: 'center'
},
- {
- text: '审核驳回原因',
- value: 'checkRejectReason',
- align: 'center'
- }
+ // {
+ // text: '审核驳回原因',
+ // value: 'checkRejectReason',
+ // align: 'center'
+ // }
], // 显示列
monitorDialogVisible: false,
monitorForm: {
@@ -146,7 +145,7 @@
}
this.listLoading = true
// 处理申请时间
- 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 {
@@ -154,7 +153,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 {
@@ -163,25 +162,25 @@
}
getCheckMonitorList(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',
- 'checkStatus': '未审核',
- 'superviseTime': '-',
- 'checkRejectReason': '-'
- }
- ]
+ // 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',
+ // 'checkStatus': '未审核',
+ // 'superviseTime': '-',
+ // 'checkRejectReason': '-'
+ // }
+ // ]
this.list = response.data.rows
this.total = response.data.total
this.listLoading = false
@@ -191,7 +190,7 @@
// 任务办理
goDetail(row) {
this.$router.push({
- path: '/caseDetail/' + row.id,
+ path: '/caseDetail/' + row.caseId,
query: {
showProcess: false
}
@@ -215,6 +214,7 @@
monitorCheck(params).then(response => {
if (response.code === 200) {
this.$message.success('监察审核成功')
+ this.fetchData()
}
})
})
@@ -246,6 +246,7 @@
monitorCheck(params).then(response => {
if (response.code === 200) {
this.$message.success('监察驳回成功')
+ this.fetchData()
}
})
}
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="申请结束时间"/>
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -89,7 +89,6 @@
{
text: '申请时间',
value: 'applyTime',
- width: 90,
align: 'center'
},
{
@@ -97,27 +96,27 @@
value: 'caseStatus',
align: 'center'
},
- {
- text: '审核人',
- value: 'checkPersonName',
- align: 'center'
- },
- {
- text: '审核时间',
- value: 'checkTime',
- width: 90,
- align: 'center'
- },
+ // {
+ // text: '审核人',
+ // value: 'checkPersonName',
+ // align: 'center'
+ // },
+ // {
+ // text: '审核时间',
+ // value: 'checkTime',
+ // width: 90,
+ // align: 'center'
+ // },
{
text: '审核情况',
value: 'checkStatus',
align: 'center'
},
- {
- text: '审核驳回原因',
- value: 'checkRejectReason',
- align: 'center'
- }
+ // {
+ // text: '审核驳回原因',
+ // value: 'checkRejectReason',
+ // align: 'center'
+ // }
], // 显示列
monitorDialogVisible: false,
monitorForm: {
@@ -146,7 +145,7 @@
}
this.listLoading = true
// 处理申请时间
- 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 {
@@ -154,7 +153,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 {
@@ -163,25 +162,25 @@
}
getCheckMonitorList(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',
- 'checkStatus': '未审核',
- 'superviseTime': '-',
- 'checkRejectReason': '-'
- }
- ]
+ // 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',
+ // 'checkStatus': '未审核',
+ // 'superviseTime': '-',
+ // 'checkRejectReason': '-'
+ // }
+ // ]
this.list = response.data.rows
this.total = response.data.total
this.listLoading = false
@@ -191,7 +190,7 @@
// 任务办理
goDetail(row) {
this.$router.push({
- path: '/caseDetail/' + row.id,
+ path: '/caseDetail/' + row.caseId,
query: {
showProcess: false
}
@@ -215,6 +214,7 @@
monitorCheck(params).then(response => {
if (response.code === 200) {
this.$message.success('监察审核成功')
+ this.fetchData()
}
})
})
@@ -246,6 +246,7 @@
monitorCheck(params).then(response => {
if (response.code === 200) {
this.$message.success('监察驳回成功')
+ this.fetchData()
}
})
}
diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue
index 5e937f2..56518e6 100644
--- a/src/views/monitorManage/waitForMonitor.vue
+++ b/src/views/monitorManage/waitForMonitor.vue
@@ -50,8 +50,8 @@
title: '', // 事件标题
offset: 1,
limit: 20,
- sort: 'createTime',
- order: 'desc'
+ sort: '',
+ order: ''
}, // 筛选条件
columns: [
{
@@ -98,7 +98,7 @@
], // 显示列
monitorDialogVisible: false,
monitorForm: {
- caseId: '',
+ id: '',
superviseStatus: '1',
superviseResult: ''
},
@@ -123,25 +123,25 @@
}
getMonitorList(this.listQuery).then(response => {
if (response.code === 200) {
- response.data.rows = [
- {
- 'title': '事件1',
- 'reporterName': '张三',
- 'reporterPhone': '15652360420',
- 'caseStatus': '处理中',
- 'superviseContent': '监察内容',
- 'superviseType': '申请监察',
- 'eorcName': '咨询',
- 'caseTypeName': '咨询',
- 'caseDetailTypeName': '垃圾处理',
- 'createUserName': '王',
- 'limitedTime': '2020-04-12 00:00:00',
- 'createTime': '2020-03-12 00:00:00',
- 'superviseStatus': '未监察',
- 'superviseTime': '-',
- 'superviseResult': '-'
- }
- ]
+ // response.data.rows = [
+ // {
+ // 'title': '事件1',
+ // 'reporterName': '张三',
+ // 'reporterPhone': '15652360420',
+ // 'caseStatus': '处理中',
+ // 'superviseContent': '监察内容',
+ // 'superviseType': '申请监察',
+ // 'eorcName': '咨询',
+ // 'caseTypeName': '咨询',
+ // 'caseDetailTypeName': '垃圾处理',
+ // 'createUserName': '王',
+ // 'limitedTime': '2020-04-12 00:00:00',
+ // 'createTime': '2020-03-12 00:00:00',
+ // 'superviseStatus': '未监察',
+ // 'superviseTime': '-',
+ // 'superviseResult': '-'
+ // }
+ // ]
this.list = response.data.rows
this.total = response.data.total
this.listLoading = false
@@ -151,7 +151,7 @@
// 任务办理
goDetail(row) {
this.$router.push({
- path: '/caseDetail/' + row.id,
+ path: '/caseDetail/' + row.caseId,
query: {
showProcess: false
}
@@ -159,7 +159,7 @@
},
// 监察
monitor(row) {
- this.monitorForm.caseId = row.id
+ this.monitorForm.id = row.id
this.monitorDialogVisible = true
},
// 更换页码等
@@ -173,6 +173,7 @@
if (valid) {
doMonitor(this.monitorForm).then(res => {
this.$message.success('监察成功')
+ this.fetchData()
this.cancelDialog()
}).catch((res) => {
this.cancelDialog()
@@ -189,7 +190,7 @@
resetSuperviseForm() {
this.$refs['monitorForm'].resetFields()
this.monitorForm = {
- caseId: '',
+ id: '',
superviseStatus: '1',
superviseResult: ''
}