diff --git a/src/views/superviseManage/searchSupervise.vue b/src/views/superviseManage/searchSupervise.vue index 83167f0..8a6534c 100644 --- a/src/views/superviseManage/searchSupervise.vue +++ b/src/views/superviseManage/searchSupervise.vue @@ -13,11 +13,11 @@ type="datetimerange" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" - start-placeholder="创建开始时间" - end-placeholder="创建结束时间"/> + start-placeholder="督办开始时间" + end-placeholder="督办结束时间"/> - + @@ -53,12 +53,13 @@ listLoading: true, // 列表加载动画 listQuery: { urgeContent: '', // 事件标题 + checkStatus:'', startTime: '', endTime: '', offset: 1, limit: 20, - sort: 'createTime', - order: 'desc' + sort: '', + order: '' }, // 筛选条件 columns: [ { @@ -154,7 +155,7 @@ this.listQuery.offset = 1 } this.listLoading = true - if (this.timeRange && this.timeRange.length > 2) { + if (this.timeRange && this.timeRange.length >= 2) { this.listQuery.startTime = this.timeRange[0] this.listQuery.endTime = this.timeRange[1] } else { @@ -163,24 +164,24 @@ } getAllSuperviseList(this.listQuery).then(response => { if (response.code === 200) { - response.data.rows = [ - { - 'id': '1', - 'applyPersonName': '张三', - 'title': '事件1', - 'caseStatus': '处理中', - 'urgeContent': '督办内容', - 'applyTime': '2020-01-01 00:00:00', - 'urgeType': '申请督办', - 'checkPersonName': '王', - 'checkStatus': '未督办', - 'checkTime': '-', - 'checkRejectReason': '-', - 'urgeStatus': '未督办', - 'urgeTime': '-', - 'urgeResult': '-' - } - ] + // response.data.rows = [ + // { + // 'id': '1', + // 'applyPersonName': '张三', + // 'title': '事件1', + // 'caseStatus': '处理中', + // 'urgeContent': '督办内容', + // 'applyTime': '2020-01-01 00:00:00', + // 'urgeType': '申请督办', + // 'checkPersonName': '王', + // 'checkStatus': '未督办', + // 'checkTime': '-', + // 'checkRejectReason': '-', + // 'urgeStatus': '未督办', + // 'urgeTime': '-', + // 'urgeResult': '-' + // } + // ] this.list = response.data.rows this.total = response.data.total this.listLoading = false @@ -190,7 +191,7 @@ // 任务办理 goDetail(row) { this.$router.push({ - path: '/caseDetail/' + row.id, + path: '/caseDetail/' + row.caseId, query: { showProcess: false } diff --git a/src/views/superviseManage/searchSupervise.vue b/src/views/superviseManage/searchSupervise.vue index 83167f0..8a6534c 100644 --- a/src/views/superviseManage/searchSupervise.vue +++ b/src/views/superviseManage/searchSupervise.vue @@ -13,11 +13,11 @@ type="datetimerange" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" - start-placeholder="创建开始时间" - end-placeholder="创建结束时间"/> + start-placeholder="督办开始时间" + end-placeholder="督办结束时间"/> - + @@ -53,12 +53,13 @@ listLoading: true, // 列表加载动画 listQuery: { urgeContent: '', // 事件标题 + checkStatus:'', startTime: '', endTime: '', offset: 1, limit: 20, - sort: 'createTime', - order: 'desc' + sort: '', + order: '' }, // 筛选条件 columns: [ { @@ -154,7 +155,7 @@ this.listQuery.offset = 1 } this.listLoading = true - if (this.timeRange && this.timeRange.length > 2) { + if (this.timeRange && this.timeRange.length >= 2) { this.listQuery.startTime = this.timeRange[0] this.listQuery.endTime = this.timeRange[1] } else { @@ -163,24 +164,24 @@ } getAllSuperviseList(this.listQuery).then(response => { if (response.code === 200) { - response.data.rows = [ - { - 'id': '1', - 'applyPersonName': '张三', - 'title': '事件1', - 'caseStatus': '处理中', - 'urgeContent': '督办内容', - 'applyTime': '2020-01-01 00:00:00', - 'urgeType': '申请督办', - 'checkPersonName': '王', - 'checkStatus': '未督办', - 'checkTime': '-', - 'checkRejectReason': '-', - 'urgeStatus': '未督办', - 'urgeTime': '-', - 'urgeResult': '-' - } - ] + // response.data.rows = [ + // { + // 'id': '1', + // 'applyPersonName': '张三', + // 'title': '事件1', + // 'caseStatus': '处理中', + // 'urgeContent': '督办内容', + // 'applyTime': '2020-01-01 00:00:00', + // 'urgeType': '申请督办', + // 'checkPersonName': '王', + // 'checkStatus': '未督办', + // 'checkTime': '-', + // 'checkRejectReason': '-', + // 'urgeStatus': '未督办', + // 'urgeTime': '-', + // 'urgeResult': '-' + // } + // ] this.list = response.data.rows this.total = response.data.total this.listLoading = false @@ -190,7 +191,7 @@ // 任务办理 goDetail(row) { this.$router.push({ - path: '/caseDetail/' + row.id, + path: '/caseDetail/' + row.caseId, query: { showProcess: false } diff --git a/src/views/superviseManage/waitCheckSupervise.vue b/src/views/superviseManage/waitCheckSupervise.vue index 8c8e23c..3489a6b 100644 --- a/src/views/superviseManage/waitCheckSupervise.vue +++ b/src/views/superviseManage/waitCheckSupervise.vue @@ -13,8 +13,8 @@ type="datetimerange" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" - start-placeholder="创建开始时间" - end-placeholder="创建结束时间"/> + start-placeholder="申请开始时间" + end-placeholder="申请结束时间"/> @@ -36,8 +36,7 @@ import SearchArea from '@/components/SearchArea/SearchArea' import SearchItem from '@/components/SearchArea/SearchItem' import CaseListTable from '@/views/caseManage/caseCommon/caseListTable' -// import { getSuperviseList } from '@/api/callCase' -import { superviseCheck, getSuperviseList } from '@/api/caseSupervise' +import { superviseCheck, getCheckSuperviseList } from '@/api/caseSupervise' export default { name: 'WaitCheckSupervise', @@ -54,8 +53,8 @@ endTime: '', offset: 1, limit: 20, - sort: 'createTime', - order: 'desc' + sort: '', + order: '' }, // 筛选条件 columns: [ { @@ -89,27 +88,27 @@ width: 90, 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' + // } ], // 显示列 superviseDialogVisible: false, superviseForm: { @@ -137,30 +136,30 @@ this.listQuery.offset = 1 } this.listLoading = true - if (this.timeRange && this.timeRange.length > 2) { + if (this.timeRange && this.timeRange.length >= 2) { this.listQuery.startTime = this.timeRange[0] this.listQuery.endTime = this.timeRange[1] } else { this.listQuery.startTime = '' this.listQuery.endTime = '' } - getSuperviseList(this.listQuery).then(response => { + getCheckSuperviseList(this.listQuery).then(response => { if (response.code === 200) { - response.data.rows = [ - { - 'id': '1', - 'applyPersonName': '张三', - 'title': '事件1', - 'caseStatus': '处理中', - 'urgeContent': '督办内容', - 'applyTime': '2020-01-01 00:00:00', - 'urgeType': '申请督办', - 'checkPersonName': '王', - 'checkStatus': '未督办', - 'checkTime': '-', - 'checkRejectReason': '-' - } - ] + // response.data.rows = [ + // { + // 'id': '1', + // 'applyPersonName': '张三', + // 'title': '事件1', + // 'caseStatus': '处理中', + // 'urgeContent': '督办内容', + // 'applyTime': '2020-01-01 00:00:00', + // 'urgeType': '申请督办', + // 'checkPersonName': '王', + // 'checkStatus': '未督办', + // 'checkTime': '-', + // 'checkRejectReason': '-' + // } + // ] this.list = response.data.rows this.total = response.data.total this.listLoading = false @@ -170,7 +169,7 @@ // 任务办理 goDetail(row) { this.$router.push({ - path: '/caseDetail/' + row.id, + path: '/caseDetail/' + row.caseId, query: { showProcess: false } @@ -194,6 +193,7 @@ superviseCheck(params).then(response => { if (response.code === 200) { this.$message.success('督办审核成功') + this.fetchData() } }) }) @@ -225,6 +225,7 @@ superviseCheck(params).then(response => { if (response.code === 200) { this.$message.success('督办驳回成功') + this.fetchData() } }) } diff --git a/src/views/superviseManage/searchSupervise.vue b/src/views/superviseManage/searchSupervise.vue index 83167f0..8a6534c 100644 --- a/src/views/superviseManage/searchSupervise.vue +++ b/src/views/superviseManage/searchSupervise.vue @@ -13,11 +13,11 @@ type="datetimerange" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" - start-placeholder="创建开始时间" - end-placeholder="创建结束时间"/> + start-placeholder="督办开始时间" + end-placeholder="督办结束时间"/> - + @@ -53,12 +53,13 @@ listLoading: true, // 列表加载动画 listQuery: { urgeContent: '', // 事件标题 + checkStatus:'', startTime: '', endTime: '', offset: 1, limit: 20, - sort: 'createTime', - order: 'desc' + sort: '', + order: '' }, // 筛选条件 columns: [ { @@ -154,7 +155,7 @@ this.listQuery.offset = 1 } this.listLoading = true - if (this.timeRange && this.timeRange.length > 2) { + if (this.timeRange && this.timeRange.length >= 2) { this.listQuery.startTime = this.timeRange[0] this.listQuery.endTime = this.timeRange[1] } else { @@ -163,24 +164,24 @@ } getAllSuperviseList(this.listQuery).then(response => { if (response.code === 200) { - response.data.rows = [ - { - 'id': '1', - 'applyPersonName': '张三', - 'title': '事件1', - 'caseStatus': '处理中', - 'urgeContent': '督办内容', - 'applyTime': '2020-01-01 00:00:00', - 'urgeType': '申请督办', - 'checkPersonName': '王', - 'checkStatus': '未督办', - 'checkTime': '-', - 'checkRejectReason': '-', - 'urgeStatus': '未督办', - 'urgeTime': '-', - 'urgeResult': '-' - } - ] + // response.data.rows = [ + // { + // 'id': '1', + // 'applyPersonName': '张三', + // 'title': '事件1', + // 'caseStatus': '处理中', + // 'urgeContent': '督办内容', + // 'applyTime': '2020-01-01 00:00:00', + // 'urgeType': '申请督办', + // 'checkPersonName': '王', + // 'checkStatus': '未督办', + // 'checkTime': '-', + // 'checkRejectReason': '-', + // 'urgeStatus': '未督办', + // 'urgeTime': '-', + // 'urgeResult': '-' + // } + // ] this.list = response.data.rows this.total = response.data.total this.listLoading = false @@ -190,7 +191,7 @@ // 任务办理 goDetail(row) { this.$router.push({ - path: '/caseDetail/' + row.id, + path: '/caseDetail/' + row.caseId, query: { showProcess: false } diff --git a/src/views/superviseManage/waitCheckSupervise.vue b/src/views/superviseManage/waitCheckSupervise.vue index 8c8e23c..3489a6b 100644 --- a/src/views/superviseManage/waitCheckSupervise.vue +++ b/src/views/superviseManage/waitCheckSupervise.vue @@ -13,8 +13,8 @@ type="datetimerange" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" - start-placeholder="创建开始时间" - end-placeholder="创建结束时间"/> + start-placeholder="申请开始时间" + end-placeholder="申请结束时间"/> @@ -36,8 +36,7 @@ import SearchArea from '@/components/SearchArea/SearchArea' import SearchItem from '@/components/SearchArea/SearchItem' import CaseListTable from '@/views/caseManage/caseCommon/caseListTable' -// import { getSuperviseList } from '@/api/callCase' -import { superviseCheck, getSuperviseList } from '@/api/caseSupervise' +import { superviseCheck, getCheckSuperviseList } from '@/api/caseSupervise' export default { name: 'WaitCheckSupervise', @@ -54,8 +53,8 @@ endTime: '', offset: 1, limit: 20, - sort: 'createTime', - order: 'desc' + sort: '', + order: '' }, // 筛选条件 columns: [ { @@ -89,27 +88,27 @@ width: 90, 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' + // } ], // 显示列 superviseDialogVisible: false, superviseForm: { @@ -137,30 +136,30 @@ this.listQuery.offset = 1 } this.listLoading = true - if (this.timeRange && this.timeRange.length > 2) { + if (this.timeRange && this.timeRange.length >= 2) { this.listQuery.startTime = this.timeRange[0] this.listQuery.endTime = this.timeRange[1] } else { this.listQuery.startTime = '' this.listQuery.endTime = '' } - getSuperviseList(this.listQuery).then(response => { + getCheckSuperviseList(this.listQuery).then(response => { if (response.code === 200) { - response.data.rows = [ - { - 'id': '1', - 'applyPersonName': '张三', - 'title': '事件1', - 'caseStatus': '处理中', - 'urgeContent': '督办内容', - 'applyTime': '2020-01-01 00:00:00', - 'urgeType': '申请督办', - 'checkPersonName': '王', - 'checkStatus': '未督办', - 'checkTime': '-', - 'checkRejectReason': '-' - } - ] + // response.data.rows = [ + // { + // 'id': '1', + // 'applyPersonName': '张三', + // 'title': '事件1', + // 'caseStatus': '处理中', + // 'urgeContent': '督办内容', + // 'applyTime': '2020-01-01 00:00:00', + // 'urgeType': '申请督办', + // 'checkPersonName': '王', + // 'checkStatus': '未督办', + // 'checkTime': '-', + // 'checkRejectReason': '-' + // } + // ] this.list = response.data.rows this.total = response.data.total this.listLoading = false @@ -170,7 +169,7 @@ // 任务办理 goDetail(row) { this.$router.push({ - path: '/caseDetail/' + row.id, + path: '/caseDetail/' + row.caseId, query: { showProcess: false } @@ -194,6 +193,7 @@ superviseCheck(params).then(response => { if (response.code === 200) { this.$message.success('督办审核成功') + this.fetchData() } }) }) @@ -225,6 +225,7 @@ superviseCheck(params).then(response => { if (response.code === 200) { this.$message.success('督办驳回成功') + this.fetchData() } }) } diff --git a/src/views/superviseManage/waitForSupervise.vue b/src/views/superviseManage/waitForSupervise.vue index ed47c9e..a453e2a 100644 --- a/src/views/superviseManage/waitForSupervise.vue +++ b/src/views/superviseManage/waitForSupervise.vue @@ -54,8 +54,8 @@ title: '', // 事件标题 offset: 1, limit: 20, - sort: 'createTime', - order: 'desc' + sort: '', + order: '' }, // 筛选条件 columns: [ { @@ -107,7 +107,7 @@ ], // 显示列 superviseDialogVisible: false, superviseForm: { - caseId: '', + id: '', urgeStatus: '1', urgeResult: '' }, @@ -133,25 +133,25 @@ this.listLoading = true getSuperviseList(this.listQuery).then(response => { if (response.code === 200) { - response.data.rows = [ - { - 'title': '事件1', - 'reporterName': '张三', - 'reporterPhone': '15652360420', - 'caseStatus': '处理中', - 'urgeContent': '督办内容', - 'urgeType': '申请督办', - 'eorcName': '咨询', - 'caseTypeName': '咨询', - 'caseDetailTypeName': '垃圾处理', - 'createUserName': '王', - 'limitedTime': '2020-04-12 00:00:00', - 'createTime': '2020-03-12 00:00:00', - 'urgeStatus': '未督办', - 'urgeTime': '-', - 'urgeResult': '-' - } - ] + // response.data.rows = [ + // { + // 'title': '事件1', + // 'reporterName': '张三', + // 'reporterPhone': '15652360420', + // 'caseStatus': '处理中', + // 'urgeContent': '督办内容', + // 'urgeType': '申请督办', + // 'eorcName': '咨询', + // 'caseTypeName': '咨询', + // 'caseDetailTypeName': '垃圾处理', + // 'createUserName': '王', + // 'limitedTime': '2020-04-12 00:00:00', + // 'createTime': '2020-03-12 00:00:00', + // 'urgeStatus': '未督办', + // 'urgeTime': '-', + // 'urgeResult': '-' + // } + // ] this.list = response.data.rows this.total = response.data.total this.listLoading = false @@ -161,7 +161,7 @@ // 任务办理 goDetail(row) { this.$router.push({ - path: '/caseDetail/' + row.id, + path: '/caseDetail/' + row.caseId, query: { showProcess: false } @@ -169,7 +169,7 @@ }, // 督办 supervise(row) { - this.superviseForm.caseId = row.id + this.superviseForm.id = row.id this.superviseDialogVisible = true }, // 监察 @@ -192,8 +192,8 @@ }).then(({ value }) => { if (value) { const params = { - caseId: row.id, - urgeResult: value.trim() + caseId: row.caseId, + superviseContent: value.trim() } addMonitor(params).then(response => { if (response.code === 200) { @@ -201,6 +201,7 @@ type: 'success', message: '申请监察成功!' }) + this.fetchData() } }) } @@ -230,6 +231,7 @@ if (valid) { supervise(this.superviseForm).then(res => { this.$message.success('督办成功') + this.fetchData() this.cancelDialog() }).catch((res) => { this.cancelDialog() @@ -246,7 +248,7 @@ resetSuperviseForm() { this.$refs['superviseForm'].resetFields() this.superviseForm = { - caseId: '', + id: '', urgeStatus: '1', urgeResult: '' }