diff --git a/src/api/allDict.js b/src/api/allDict.js index 5db6a1d..e73eeb4 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -65,3 +65,11 @@ params }) } +// 上报请示处理方式 +export function getcheckStatus(params) { + return request({ + url: '/dict/code/checkStatus', + method: 'get', + params + }) +} diff --git a/src/api/allDict.js b/src/api/allDict.js index 5db6a1d..e73eeb4 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -65,3 +65,11 @@ params }) } +// 上报请示处理方式 +export function getcheckStatus(params) { + return request({ + url: '/dict/code/checkStatus', + method: 'get', + params + }) +} diff --git a/src/api/caseSupervise.js b/src/api/caseSupervise.js index 5b4d75b..555721a 100644 --- a/src/api/caseSupervise.js +++ b/src/api/caseSupervise.js @@ -10,17 +10,16 @@ params }) } - -// 申请监察 -export function cancelSupervise(params) { +// 督办审核 +export function superviseCheck(params) { return request({ - url: '/supervise/add', + url: '/urge/check', method: 'post', params }) } -// 督办列表 +// 待办督办列表 export function getSuperviseList(params) { return request({ url: '/urge/toToListPage', @@ -29,6 +28,24 @@ }) } +// 审核督办列表 +export function getCheckSuperviseList(params) { + return request({ + url: '/urge/checkListPage', + method: 'get', + params + }) +} + +// 查询督办 +export function getAllSuperviseList(params) { + return request({ + url: '/urge/checkListPage', + method: 'get', + params + }) +} + // 督办记录 export function urgeRecords(caseId) { return request({ diff --git a/src/api/allDict.js b/src/api/allDict.js index 5db6a1d..e73eeb4 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -65,3 +65,11 @@ params }) } +// 上报请示处理方式 +export function getcheckStatus(params) { + return request({ + url: '/dict/code/checkStatus', + method: 'get', + params + }) +} diff --git a/src/api/caseSupervise.js b/src/api/caseSupervise.js index 5b4d75b..555721a 100644 --- a/src/api/caseSupervise.js +++ b/src/api/caseSupervise.js @@ -10,17 +10,16 @@ params }) } - -// 申请监察 -export function cancelSupervise(params) { +// 督办审核 +export function superviseCheck(params) { return request({ - url: '/supervise/add', + url: '/urge/check', method: 'post', params }) } -// 督办列表 +// 待办督办列表 export function getSuperviseList(params) { return request({ url: '/urge/toToListPage', @@ -29,6 +28,24 @@ }) } +// 审核督办列表 +export function getCheckSuperviseList(params) { + return request({ + url: '/urge/checkListPage', + method: 'get', + params + }) +} + +// 查询督办 +export function getAllSuperviseList(params) { + return request({ + url: '/urge/checkListPage', + method: 'get', + params + }) +} + // 督办记录 export function urgeRecords(caseId) { return request({ diff --git a/src/router/modules/case.js b/src/router/modules/case.js index c4854ca..2959665 100644 --- a/src/router/modules/case.js +++ b/src/router/modules/case.js @@ -147,7 +147,7 @@ { path: '/searchSuperviseList', name: 'SearchSuperviseList', - component: () => import('@/views/caseManage/caseReportManage/searchReportList'), + component: () => import('@/views/superviseManage/searchSupervise'), meta: { title: '查询督办', icon: '', permission: '/searchSuperviseList' } } ] diff --git a/src/api/allDict.js b/src/api/allDict.js index 5db6a1d..e73eeb4 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -65,3 +65,11 @@ params }) } +// 上报请示处理方式 +export function getcheckStatus(params) { + return request({ + url: '/dict/code/checkStatus', + method: 'get', + params + }) +} diff --git a/src/api/caseSupervise.js b/src/api/caseSupervise.js index 5b4d75b..555721a 100644 --- a/src/api/caseSupervise.js +++ b/src/api/caseSupervise.js @@ -10,17 +10,16 @@ params }) } - -// 申请监察 -export function cancelSupervise(params) { +// 督办审核 +export function superviseCheck(params) { return request({ - url: '/supervise/add', + url: '/urge/check', method: 'post', params }) } -// 督办列表 +// 待办督办列表 export function getSuperviseList(params) { return request({ url: '/urge/toToListPage', @@ -29,6 +28,24 @@ }) } +// 审核督办列表 +export function getCheckSuperviseList(params) { + return request({ + url: '/urge/checkListPage', + method: 'get', + params + }) +} + +// 查询督办 +export function getAllSuperviseList(params) { + return request({ + url: '/urge/checkListPage', + method: 'get', + params + }) +} + // 督办记录 export function urgeRecords(caseId) { return request({ diff --git a/src/router/modules/case.js b/src/router/modules/case.js index c4854ca..2959665 100644 --- a/src/router/modules/case.js +++ b/src/router/modules/case.js @@ -147,7 +147,7 @@ { path: '/searchSuperviseList', name: 'SearchSuperviseList', - component: () => import('@/views/caseManage/caseReportManage/searchReportList'), + component: () => import('@/views/superviseManage/searchSupervise'), meta: { title: '查询督办', icon: '', permission: '/searchSuperviseList' } } ] diff --git a/src/views/superviseManage/searchSupervise.vue b/src/views/superviseManage/searchSupervise.vue new file mode 100644 index 0000000..ae75d5f --- /dev/null +++ b/src/views/superviseManage/searchSupervise.vue @@ -0,0 +1,186 @@ + + + + diff --git a/src/api/allDict.js b/src/api/allDict.js index 5db6a1d..e73eeb4 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -65,3 +65,11 @@ params }) } +// 上报请示处理方式 +export function getcheckStatus(params) { + return request({ + url: '/dict/code/checkStatus', + method: 'get', + params + }) +} diff --git a/src/api/caseSupervise.js b/src/api/caseSupervise.js index 5b4d75b..555721a 100644 --- a/src/api/caseSupervise.js +++ b/src/api/caseSupervise.js @@ -10,17 +10,16 @@ params }) } - -// 申请监察 -export function cancelSupervise(params) { +// 督办审核 +export function superviseCheck(params) { return request({ - url: '/supervise/add', + url: '/urge/check', method: 'post', params }) } -// 督办列表 +// 待办督办列表 export function getSuperviseList(params) { return request({ url: '/urge/toToListPage', @@ -29,6 +28,24 @@ }) } +// 审核督办列表 +export function getCheckSuperviseList(params) { + return request({ + url: '/urge/checkListPage', + method: 'get', + params + }) +} + +// 查询督办 +export function getAllSuperviseList(params) { + return request({ + url: '/urge/checkListPage', + method: 'get', + params + }) +} + // 督办记录 export function urgeRecords(caseId) { return request({ diff --git a/src/router/modules/case.js b/src/router/modules/case.js index c4854ca..2959665 100644 --- a/src/router/modules/case.js +++ b/src/router/modules/case.js @@ -147,7 +147,7 @@ { path: '/searchSuperviseList', name: 'SearchSuperviseList', - component: () => import('@/views/caseManage/caseReportManage/searchReportList'), + component: () => import('@/views/superviseManage/searchSupervise'), meta: { title: '查询督办', icon: '', permission: '/searchSuperviseList' } } ] diff --git a/src/views/superviseManage/searchSupervise.vue b/src/views/superviseManage/searchSupervise.vue new file mode 100644 index 0000000..ae75d5f --- /dev/null +++ b/src/views/superviseManage/searchSupervise.vue @@ -0,0 +1,186 @@ + + + + diff --git a/src/views/superviseManage/waitCheckSupervise.vue b/src/views/superviseManage/waitCheckSupervise.vue index 21c0cbb..e6c07c0 100644 --- a/src/views/superviseManage/waitCheckSupervise.vue +++ b/src/views/superviseManage/waitCheckSupervise.vue @@ -28,17 +28,6 @@ - - - - - - -
- 取消 - 确定 -
- @@ -47,9 +36,8 @@ 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 { supervise, getSuperviseList } from '@/api/caseSupervise' -import { addMonitor } from '@/api/caseMonitor' +// import { getCheckSuperviseList } from '@/api/callCase' +import { superviseCheck, getCheckSuperviseList } from '@/api/caseSupervise' export default { name: 'WaitCheckSupervise', @@ -150,7 +138,7 @@ this.listQuery.startTime = '' this.listQuery.endTime = '' } - getSuperviseList(this.listQuery).then(response => { + getCheckSuperviseList(this.listQuery).then(response => { if (response.code === 200) { response.data.rows = [ { @@ -186,21 +174,60 @@ } }) }, - // 同意 + // 督办审核同意 allow(row) { - const params = { - id: row.id, - urgeStatus: '2' - } - supervise(params).then(response => { - if (response.code === 200) { - this.$message.success('取消成功') + this.$confirm( + '确定通过吗？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' } + ).then(() => { + const params = { + id: row.id, + checkStatus: '1' + } + superviseCheck(params).then(response => { + if (response.code === 200) { + this.$message.success('督办审核成功') + } + }) }) }, // 不同意 refuse(row) { - + this.$prompt('', '驳回理由', { + confirmButtonText: '确定', + cancelButtonText: '取消', + inputErrorMessage: '输入不能为空', + inputValidator: (value) => { + if (value) { + if (value.trim().length < 1) { + return '输入不能为空' + } else if (value.trim().length > 100) { + return '输入字数不能超过100' + } + } else { + return '输入不能为空' + } + } + }).then(({ value }) => { + if (value) { + const params = { + id: row.id, + checkStatus: '2', + checkRejectReason: value.trim() + } + superviseCheck(params).then(response => { + if (response.code === 200) { + this.$message.success('督办驳回成功') + } + }) + } + }).catch(() => { + }) }, // 更换页码等 changePage(listQuery) {