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/caseMonitor.js b/src/api/caseMonitor.js index 17fdbd8..7532f64 100644 --- a/src/api/caseMonitor.js +++ b/src/api/caseMonitor.js @@ -11,23 +11,48 @@ params }) } - -// 督办列表 -export function getSuperviseList(params) { +// 监察 +export function doMonitor(params) { return request({ - url: '/urge/toToListPage', + url: '/supervise/confirmSupervise', + method: 'post', + params + }) +} + +// 监察审核 +export function monitorCheck(params) { + return request({ + url: '/supervise/check', + method: 'post', + params + }) +} + +// 待办监察列表 +export function getMonitorList(params) { + return request({ + url: '/supervise/toToListPage', method: 'get', params }) } -// 督办记录 -export function urgeRecords(caseId) { +// 审核监察列表 +export function getCheckMonitorList(params) { return request({ - url: 'callCaseSupervise/records', + url: '/supervise/checkListPage', method: 'get', - params: { - caseId: caseId - } + params }) } + +// 查询监察 +export function getAllMonitorList(params) { + return request({ + url: '/supervise/listPage', + 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/caseMonitor.js b/src/api/caseMonitor.js index 17fdbd8..7532f64 100644 --- a/src/api/caseMonitor.js +++ b/src/api/caseMonitor.js @@ -11,23 +11,48 @@ params }) } - -// 督办列表 -export function getSuperviseList(params) { +// 监察 +export function doMonitor(params) { return request({ - url: '/urge/toToListPage', + url: '/supervise/confirmSupervise', + method: 'post', + params + }) +} + +// 监察审核 +export function monitorCheck(params) { + return request({ + url: '/supervise/check', + method: 'post', + params + }) +} + +// 待办监察列表 +export function getMonitorList(params) { + return request({ + url: '/supervise/toToListPage', method: 'get', params }) } -// 督办记录 -export function urgeRecords(caseId) { +// 审核监察列表 +export function getCheckMonitorList(params) { return request({ - url: 'callCaseSupervise/records', + url: '/supervise/checkListPage', method: 'get', - params: { - caseId: caseId - } + params }) } + +// 查询监察 +export function getAllMonitorList(params) { + return request({ + url: '/supervise/listPage', + 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/caseMonitor.js b/src/api/caseMonitor.js index 17fdbd8..7532f64 100644 --- a/src/api/caseMonitor.js +++ b/src/api/caseMonitor.js @@ -11,23 +11,48 @@ params }) } - -// 督办列表 -export function getSuperviseList(params) { +// 监察 +export function doMonitor(params) { return request({ - url: '/urge/toToListPage', + url: '/supervise/confirmSupervise', + method: 'post', + params + }) +} + +// 监察审核 +export function monitorCheck(params) { + return request({ + url: '/supervise/check', + method: 'post', + params + }) +} + +// 待办监察列表 +export function getMonitorList(params) { + return request({ + url: '/supervise/toToListPage', method: 'get', params }) } -// 督办记录 -export function urgeRecords(caseId) { +// 审核监察列表 +export function getCheckMonitorList(params) { return request({ - url: 'callCaseSupervise/records', + url: '/supervise/checkListPage', method: 'get', - params: { - caseId: caseId - } + params }) } + +// 查询监察 +export function getAllMonitorList(params) { + return request({ + url: '/supervise/listPage', + 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 f9ee252..bfbcc7a 100644 --- a/src/router/modules/case.js +++ b/src/router/modules/case.js @@ -147,8 +147,40 @@ { path: '/searchSuperviseList', name: 'SearchSuperviseList', - component: () => import('@/views/caseManage/caseReportManage/searchReportList'), + component: () => import('@/views/superviseManage/searchSupervise'), meta: { title: '查询督办', icon: '', permission: '/searchSuperviseList' } } ] +}, +{ + path: 'caseMonitor', + component: Layout, + redirect: '/workMonitorList', + name: 'CaseMonitor', + alwaysShow: true, + meta: { + title: '监察管理', + icon: 'icon-config', // 图标 + permission: '/caseMonitor' + }, + children: [ + { + path: '/workMonitorList', + name: 'WorkMonitorList', + component: () => import('@/views/monitorManage/waitForMonitor'), + meta: { title: '待办监察', icon: '', permission: '/workMonitorList' } + }, + { + path: '/checkMonitorList', + name: 'CheckMonitorList', + component: () => import('@/views/monitorManage/waitCheckMonitor'), + meta: { title: '审核监察', icon: '', permission: '/checkMonitorList' } + }, + { + path: '/searchMonitorList', + name: 'SearchMonitorList', + component: () => import('@/views/monitorManage/searchMonitor'), + meta: { title: '查询监察', icon: '', permission: '/searchMonitorList' } + } + ] }] 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/caseMonitor.js b/src/api/caseMonitor.js index 17fdbd8..7532f64 100644 --- a/src/api/caseMonitor.js +++ b/src/api/caseMonitor.js @@ -11,23 +11,48 @@ params }) } - -// 督办列表 -export function getSuperviseList(params) { +// 监察 +export function doMonitor(params) { return request({ - url: '/urge/toToListPage', + url: '/supervise/confirmSupervise', + method: 'post', + params + }) +} + +// 监察审核 +export function monitorCheck(params) { + return request({ + url: '/supervise/check', + method: 'post', + params + }) +} + +// 待办监察列表 +export function getMonitorList(params) { + return request({ + url: '/supervise/toToListPage', method: 'get', params }) } -// 督办记录 -export function urgeRecords(caseId) { +// 审核监察列表 +export function getCheckMonitorList(params) { return request({ - url: 'callCaseSupervise/records', + url: '/supervise/checkListPage', method: 'get', - params: { - caseId: caseId - } + params }) } + +// 查询监察 +export function getAllMonitorList(params) { + return request({ + url: '/supervise/listPage', + 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 f9ee252..bfbcc7a 100644 --- a/src/router/modules/case.js +++ b/src/router/modules/case.js @@ -147,8 +147,40 @@ { path: '/searchSuperviseList', name: 'SearchSuperviseList', - component: () => import('@/views/caseManage/caseReportManage/searchReportList'), + component: () => import('@/views/superviseManage/searchSupervise'), meta: { title: '查询督办', icon: '', permission: '/searchSuperviseList' } } ] +}, +{ + path: 'caseMonitor', + component: Layout, + redirect: '/workMonitorList', + name: 'CaseMonitor', + alwaysShow: true, + meta: { + title: '监察管理', + icon: 'icon-config', // 图标 + permission: '/caseMonitor' + }, + children: [ + { + path: '/workMonitorList', + name: 'WorkMonitorList', + component: () => import('@/views/monitorManage/waitForMonitor'), + meta: { title: '待办监察', icon: '', permission: '/workMonitorList' } + }, + { + path: '/checkMonitorList', + name: 'CheckMonitorList', + component: () => import('@/views/monitorManage/waitCheckMonitor'), + meta: { title: '审核监察', icon: '', permission: '/checkMonitorList' } + }, + { + path: '/searchMonitorList', + name: 'SearchMonitorList', + component: () => import('@/views/monitorManage/searchMonitor'), + meta: { title: '查询监察', icon: '', permission: '/searchMonitorList' } + } + ] }] diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 8d5e9cb..40254f4 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -5,6 +5,8 @@ const user = { state: { token: getToken(), + id: '', // 用户id + account: '', // 用户账户 name: '', // 姓名 deptId: '', // 部门编号 deptName: '', // 部门名称 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/caseMonitor.js b/src/api/caseMonitor.js index 17fdbd8..7532f64 100644 --- a/src/api/caseMonitor.js +++ b/src/api/caseMonitor.js @@ -11,23 +11,48 @@ params }) } - -// 督办列表 -export function getSuperviseList(params) { +// 监察 +export function doMonitor(params) { return request({ - url: '/urge/toToListPage', + url: '/supervise/confirmSupervise', + method: 'post', + params + }) +} + +// 监察审核 +export function monitorCheck(params) { + return request({ + url: '/supervise/check', + method: 'post', + params + }) +} + +// 待办监察列表 +export function getMonitorList(params) { + return request({ + url: '/supervise/toToListPage', method: 'get', params }) } -// 督办记录 -export function urgeRecords(caseId) { +// 审核监察列表 +export function getCheckMonitorList(params) { return request({ - url: 'callCaseSupervise/records', + url: '/supervise/checkListPage', method: 'get', - params: { - caseId: caseId - } + params }) } + +// 查询监察 +export function getAllMonitorList(params) { + return request({ + url: '/supervise/listPage', + 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 f9ee252..bfbcc7a 100644 --- a/src/router/modules/case.js +++ b/src/router/modules/case.js @@ -147,8 +147,40 @@ { path: '/searchSuperviseList', name: 'SearchSuperviseList', - component: () => import('@/views/caseManage/caseReportManage/searchReportList'), + component: () => import('@/views/superviseManage/searchSupervise'), meta: { title: '查询督办', icon: '', permission: '/searchSuperviseList' } } ] +}, +{ + path: 'caseMonitor', + component: Layout, + redirect: '/workMonitorList', + name: 'CaseMonitor', + alwaysShow: true, + meta: { + title: '监察管理', + icon: 'icon-config', // 图标 + permission: '/caseMonitor' + }, + children: [ + { + path: '/workMonitorList', + name: 'WorkMonitorList', + component: () => import('@/views/monitorManage/waitForMonitor'), + meta: { title: '待办监察', icon: '', permission: '/workMonitorList' } + }, + { + path: '/checkMonitorList', + name: 'CheckMonitorList', + component: () => import('@/views/monitorManage/waitCheckMonitor'), + meta: { title: '审核监察', icon: '', permission: '/checkMonitorList' } + }, + { + path: '/searchMonitorList', + name: 'SearchMonitorList', + component: () => import('@/views/monitorManage/searchMonitor'), + meta: { title: '查询监察', icon: '', permission: '/searchMonitorList' } + } + ] }] diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 8d5e9cb..40254f4 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -5,6 +5,8 @@ const user = { state: { token: getToken(), + id: '', // 用户id + account: '', // 用户账户 name: '', // 姓名 deptId: '', // 部门编号 deptName: '', // 部门名称 diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 72c5b20..f1aad50 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,17 +1,17 @@