diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index c49fbbc..d10e320 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -309,26 +309,29 @@ export default { name: 'CaseDetail', components: { ArcGisMap }, - props: { - id: { - type: String, - default: '' - }, - row: { - type: Object, - default: null - }, - showProcess: { - type: Boolean, - default: true - }, - showNeedVisit: { - type: Boolean, - default: false - } - }, + // props: { + // id: { + // type: String, + // default: '' + // }, + // row: { + // type: Object, + // default: null + // }, + // showProcess: { + // type: Boolean, + // default: true + // }, + // showNeedVisit: { + // type: Boolean, + // default: false + // } + // }, data() { return { + id: '', + showProcess: true, + showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key fileIdVerify: [], // 核实照片id @@ -357,12 +360,16 @@ } }, mounted() { + console.log('case dtial') + this.id = this.$route.query.id + this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true + this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false this.initData() }, methods: { async initData() { // 查询案件详情接口 - const resDetail = await getCaseDetail(this.row.id) + const resDetail = await getCaseDetail(this.id) console.log('detail', resDetail) this.caseDetail = resDetail.data[0] @@ -541,7 +548,7 @@ console.log('buildForm', this.operationKey) // 通用参数 // processId,remarks已有 - this.processForm.bizId = this.row.id + this.processForm.bizId = this.id this.processForm.currState = this.caseDetail.caseState if (!this.operationKey) { this.$message.error('请选择案卷处理操作类型') @@ -645,7 +652,9 @@ completeCaseTask(this.processForm).then(response => { if (response.code === 200) { this.$message.success('提交成功') - this.$emit('submitProcess', this.caseDetail.caseid) + // this.$emit('submitProcess', this.caseDetail.caseid) + this.showProcess = false + this.initData() } else { this.$message.error('提交失败') } diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index c49fbbc..d10e320 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -309,26 +309,29 @@ export default { name: 'CaseDetail', components: { ArcGisMap }, - props: { - id: { - type: String, - default: '' - }, - row: { - type: Object, - default: null - }, - showProcess: { - type: Boolean, - default: true - }, - showNeedVisit: { - type: Boolean, - default: false - } - }, + // props: { + // id: { + // type: String, + // default: '' + // }, + // row: { + // type: Object, + // default: null + // }, + // showProcess: { + // type: Boolean, + // default: true + // }, + // showNeedVisit: { + // type: Boolean, + // default: false + // } + // }, data() { return { + id: '', + showProcess: true, + showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key fileIdVerify: [], // 核实照片id @@ -357,12 +360,16 @@ } }, mounted() { + console.log('case dtial') + this.id = this.$route.query.id + this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true + this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false this.initData() }, methods: { async initData() { // 查询案件详情接口 - const resDetail = await getCaseDetail(this.row.id) + const resDetail = await getCaseDetail(this.id) console.log('detail', resDetail) this.caseDetail = resDetail.data[0] @@ -541,7 +548,7 @@ console.log('buildForm', this.operationKey) // 通用参数 // processId,remarks已有 - this.processForm.bizId = this.row.id + this.processForm.bizId = this.id this.processForm.currState = this.caseDetail.caseState if (!this.operationKey) { this.$message.error('请选择案卷处理操作类型') @@ -645,7 +652,9 @@ completeCaseTask(this.processForm).then(response => { if (response.code === 200) { this.$message.success('提交成功') - this.$emit('submitProcess', this.caseDetail.caseid) + // this.$emit('submitProcess', this.caseDetail.caseid) + this.showProcess = false + this.initData() } else { this.$message.error('提交失败') } diff --git a/src/router/index.js b/src/router/index.js index edd798a..b265a48 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -10,7 +10,7 @@ import Layout from '../views/layout/Layout' import { systemRouters } from './modules/system' import { cooRouters } from './modules/coo' -import { bmsRouters } from './modules/bms' +import { commenetRouters } from './modules/comment' import { commonRouters } from './modules/common' /** @@ -90,7 +90,7 @@ export const asyncRouterMap = [ ...commonRouters, ...cooRouters, - ...bmsRouters, ...systemRouters, + ...commenetRouters, { path: '*', redirect: '/404', hidden: true, meta: {}} ] diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index c49fbbc..d10e320 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -309,26 +309,29 @@ export default { name: 'CaseDetail', components: { ArcGisMap }, - props: { - id: { - type: String, - default: '' - }, - row: { - type: Object, - default: null - }, - showProcess: { - type: Boolean, - default: true - }, - showNeedVisit: { - type: Boolean, - default: false - } - }, + // props: { + // id: { + // type: String, + // default: '' + // }, + // row: { + // type: Object, + // default: null + // }, + // showProcess: { + // type: Boolean, + // default: true + // }, + // showNeedVisit: { + // type: Boolean, + // default: false + // } + // }, data() { return { + id: '', + showProcess: true, + showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key fileIdVerify: [], // 核实照片id @@ -357,12 +360,16 @@ } }, mounted() { + console.log('case dtial') + this.id = this.$route.query.id + this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true + this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false this.initData() }, methods: { async initData() { // 查询案件详情接口 - const resDetail = await getCaseDetail(this.row.id) + const resDetail = await getCaseDetail(this.id) console.log('detail', resDetail) this.caseDetail = resDetail.data[0] @@ -541,7 +548,7 @@ console.log('buildForm', this.operationKey) // 通用参数 // processId,remarks已有 - this.processForm.bizId = this.row.id + this.processForm.bizId = this.id this.processForm.currState = this.caseDetail.caseState if (!this.operationKey) { this.$message.error('请选择案卷处理操作类型') @@ -645,7 +652,9 @@ completeCaseTask(this.processForm).then(response => { if (response.code === 200) { this.$message.success('提交成功') - this.$emit('submitProcess', this.caseDetail.caseid) + // this.$emit('submitProcess', this.caseDetail.caseid) + this.showProcess = false + this.initData() } else { this.$message.error('提交失败') } diff --git a/src/router/index.js b/src/router/index.js index edd798a..b265a48 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -10,7 +10,7 @@ import Layout from '../views/layout/Layout' import { systemRouters } from './modules/system' import { cooRouters } from './modules/coo' -import { bmsRouters } from './modules/bms' +import { commenetRouters } from './modules/comment' import { commonRouters } from './modules/common' /** @@ -90,7 +90,7 @@ export const asyncRouterMap = [ ...commonRouters, ...cooRouters, - ...bmsRouters, ...systemRouters, + ...commenetRouters, { path: '*', redirect: '/404', hidden: true, meta: {}} ] diff --git a/src/router/modules/bms.js b/src/router/modules/bms.js deleted file mode 100644 index cfa69f1..0000000 --- a/src/router/modules/bms.js +++ /dev/null @@ -1,48 +0,0 @@ -/* Layout */ -import Layout from '../../views/layout/Layout' -export const bmsRouters = [ - { - path: 'busAdmin', - component: Layout, - name: 'BusAdmin', - redirect: '/timeLimit', - alwaysShow: true, - meta: { - title: '业务管理', - icon: 'icon-setting', // 图标 - permission: ['/busAdmin']// 权限名称 - }, - children: [ - { - path: '/timeLimit', - component: () => import('@/views/busAdmin/TimeLimit/listTimeLimit.vue'), - name: 'TimeLimit', - meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] } - }, - { - path: '/caseList', - component: () => import('@/views/busAdmin/CaseQuery/caseList.vue'), - name: 'CaseList', - meta: { title: '综合查询', icon: '', permission: ['/caseList'] } - }, - { - path: '/dictList', - component: () => import('@/views/busAdmin/DictAdmin/dictList.vue'), - name: 'DictList', - meta: { title: '字典管理', icon: '', permission: ['/dictList'] } - }, - { - path: '/caseType', - component: () => import('@/views/busAdmin/caseType/listCaseType.vue'), - name: 'CaseType', - meta: { title: '事部件管理', icon: '', permission: ['/caseType'] } - }, - { - path: '/areaAdmin', - component: () => import('@/views/busAdmin/areaAdmin/areaAdminList.vue'), - name: 'AreaAdmin', - meta: { title: '区域管理', icon: '', permission: ['/areaAdmin'] } - } - ] - } -] diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index c49fbbc..d10e320 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -309,26 +309,29 @@ export default { name: 'CaseDetail', components: { ArcGisMap }, - props: { - id: { - type: String, - default: '' - }, - row: { - type: Object, - default: null - }, - showProcess: { - type: Boolean, - default: true - }, - showNeedVisit: { - type: Boolean, - default: false - } - }, + // props: { + // id: { + // type: String, + // default: '' + // }, + // row: { + // type: Object, + // default: null + // }, + // showProcess: { + // type: Boolean, + // default: true + // }, + // showNeedVisit: { + // type: Boolean, + // default: false + // } + // }, data() { return { + id: '', + showProcess: true, + showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key fileIdVerify: [], // 核实照片id @@ -357,12 +360,16 @@ } }, mounted() { + console.log('case dtial') + this.id = this.$route.query.id + this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true + this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false this.initData() }, methods: { async initData() { // 查询案件详情接口 - const resDetail = await getCaseDetail(this.row.id) + const resDetail = await getCaseDetail(this.id) console.log('detail', resDetail) this.caseDetail = resDetail.data[0] @@ -541,7 +548,7 @@ console.log('buildForm', this.operationKey) // 通用参数 // processId,remarks已有 - this.processForm.bizId = this.row.id + this.processForm.bizId = this.id this.processForm.currState = this.caseDetail.caseState if (!this.operationKey) { this.$message.error('请选择案卷处理操作类型') @@ -645,7 +652,9 @@ completeCaseTask(this.processForm).then(response => { if (response.code === 200) { this.$message.success('提交成功') - this.$emit('submitProcess', this.caseDetail.caseid) + // this.$emit('submitProcess', this.caseDetail.caseid) + this.showProcess = false + this.initData() } else { this.$message.error('提交失败') } diff --git a/src/router/index.js b/src/router/index.js index edd798a..b265a48 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -10,7 +10,7 @@ import Layout from '../views/layout/Layout' import { systemRouters } from './modules/system' import { cooRouters } from './modules/coo' -import { bmsRouters } from './modules/bms' +import { commenetRouters } from './modules/comment' import { commonRouters } from './modules/common' /** @@ -90,7 +90,7 @@ export const asyncRouterMap = [ ...commonRouters, ...cooRouters, - ...bmsRouters, ...systemRouters, + ...commenetRouters, { path: '*', redirect: '/404', hidden: true, meta: {}} ] diff --git a/src/router/modules/bms.js b/src/router/modules/bms.js deleted file mode 100644 index cfa69f1..0000000 --- a/src/router/modules/bms.js +++ /dev/null @@ -1,48 +0,0 @@ -/* Layout */ -import Layout from '../../views/layout/Layout' -export const bmsRouters = [ - { - path: 'busAdmin', - component: Layout, - name: 'BusAdmin', - redirect: '/timeLimit', - alwaysShow: true, - meta: { - title: '业务管理', - icon: 'icon-setting', // 图标 - permission: ['/busAdmin']// 权限名称 - }, - children: [ - { - path: '/timeLimit', - component: () => import('@/views/busAdmin/TimeLimit/listTimeLimit.vue'), - name: 'TimeLimit', - meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] } - }, - { - path: '/caseList', - component: () => import('@/views/busAdmin/CaseQuery/caseList.vue'), - name: 'CaseList', - meta: { title: '综合查询', icon: '', permission: ['/caseList'] } - }, - { - path: '/dictList', - component: () => import('@/views/busAdmin/DictAdmin/dictList.vue'), - name: 'DictList', - meta: { title: '字典管理', icon: '', permission: ['/dictList'] } - }, - { - path: '/caseType', - component: () => import('@/views/busAdmin/caseType/listCaseType.vue'), - name: 'CaseType', - meta: { title: '事部件管理', icon: '', permission: ['/caseType'] } - }, - { - path: '/areaAdmin', - component: () => import('@/views/busAdmin/areaAdmin/areaAdminList.vue'), - name: 'AreaAdmin', - meta: { title: '区域管理', icon: '', permission: ['/areaAdmin'] } - } - ] - } -] diff --git a/src/router/modules/comment.js b/src/router/modules/comment.js new file mode 100644 index 0000000..c3c10ac --- /dev/null +++ b/src/router/modules/comment.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const commenetRouters = [ + { + path: '/comment', + name: 'comment', + redirect: '/accessDept', + hidden: true, + meta: { + title: '综合评价子系统', + permission: ['/comment'], + isSys: true + } + }, + { + path: '/accessDept', + component: Layout, + redirect: '/accessFuncDept', + name: 'AccessDept', + alwaysShow: true, + meta: { + title: '部门考核', + permission: ['/accessDept'], + sys: '/comment' + }, + children: [ + { + path: '/accessFuncDept', + component: () => import('@/views/deptAccess/deptAccess'), + name: 'AccessFuncDept', + meta: { title: '职能单位评价', icon: '', belongSys: '', permission: '/accessFuncDept' } + } + ] + } +] diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index c49fbbc..d10e320 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -309,26 +309,29 @@ export default { name: 'CaseDetail', components: { ArcGisMap }, - props: { - id: { - type: String, - default: '' - }, - row: { - type: Object, - default: null - }, - showProcess: { - type: Boolean, - default: true - }, - showNeedVisit: { - type: Boolean, - default: false - } - }, + // props: { + // id: { + // type: String, + // default: '' + // }, + // row: { + // type: Object, + // default: null + // }, + // showProcess: { + // type: Boolean, + // default: true + // }, + // showNeedVisit: { + // type: Boolean, + // default: false + // } + // }, data() { return { + id: '', + showProcess: true, + showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key fileIdVerify: [], // 核实照片id @@ -357,12 +360,16 @@ } }, mounted() { + console.log('case dtial') + this.id = this.$route.query.id + this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true + this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false this.initData() }, methods: { async initData() { // 查询案件详情接口 - const resDetail = await getCaseDetail(this.row.id) + const resDetail = await getCaseDetail(this.id) console.log('detail', resDetail) this.caseDetail = resDetail.data[0] @@ -541,7 +548,7 @@ console.log('buildForm', this.operationKey) // 通用参数 // processId,remarks已有 - this.processForm.bizId = this.row.id + this.processForm.bizId = this.id this.processForm.currState = this.caseDetail.caseState if (!this.operationKey) { this.$message.error('请选择案卷处理操作类型') @@ -645,7 +652,9 @@ completeCaseTask(this.processForm).then(response => { if (response.code === 200) { this.$message.success('提交成功') - this.$emit('submitProcess', this.caseDetail.caseid) + // this.$emit('submitProcess', this.caseDetail.caseid) + this.showProcess = false + this.initData() } else { this.$message.error('提交失败') } diff --git a/src/router/index.js b/src/router/index.js index edd798a..b265a48 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -10,7 +10,7 @@ import Layout from '../views/layout/Layout' import { systemRouters } from './modules/system' import { cooRouters } from './modules/coo' -import { bmsRouters } from './modules/bms' +import { commenetRouters } from './modules/comment' import { commonRouters } from './modules/common' /** @@ -90,7 +90,7 @@ export const asyncRouterMap = [ ...commonRouters, ...cooRouters, - ...bmsRouters, ...systemRouters, + ...commenetRouters, { path: '*', redirect: '/404', hidden: true, meta: {}} ] diff --git a/src/router/modules/bms.js b/src/router/modules/bms.js deleted file mode 100644 index cfa69f1..0000000 --- a/src/router/modules/bms.js +++ /dev/null @@ -1,48 +0,0 @@ -/* Layout */ -import Layout from '../../views/layout/Layout' -export const bmsRouters = [ - { - path: 'busAdmin', - component: Layout, - name: 'BusAdmin', - redirect: '/timeLimit', - alwaysShow: true, - meta: { - title: '业务管理', - icon: 'icon-setting', // 图标 - permission: ['/busAdmin']// 权限名称 - }, - children: [ - { - path: '/timeLimit', - component: () => import('@/views/busAdmin/TimeLimit/listTimeLimit.vue'), - name: 'TimeLimit', - meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] } - }, - { - path: '/caseList', - component: () => import('@/views/busAdmin/CaseQuery/caseList.vue'), - name: 'CaseList', - meta: { title: '综合查询', icon: '', permission: ['/caseList'] } - }, - { - path: '/dictList', - component: () => import('@/views/busAdmin/DictAdmin/dictList.vue'), - name: 'DictList', - meta: { title: '字典管理', icon: '', permission: ['/dictList'] } - }, - { - path: '/caseType', - component: () => import('@/views/busAdmin/caseType/listCaseType.vue'), - name: 'CaseType', - meta: { title: '事部件管理', icon: '', permission: ['/caseType'] } - }, - { - path: '/areaAdmin', - component: () => import('@/views/busAdmin/areaAdmin/areaAdminList.vue'), - name: 'AreaAdmin', - meta: { title: '区域管理', icon: '', permission: ['/areaAdmin'] } - } - ] - } -] diff --git a/src/router/modules/comment.js b/src/router/modules/comment.js new file mode 100644 index 0000000..c3c10ac --- /dev/null +++ b/src/router/modules/comment.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const commenetRouters = [ + { + path: '/comment', + name: 'comment', + redirect: '/accessDept', + hidden: true, + meta: { + title: '综合评价子系统', + permission: ['/comment'], + isSys: true + } + }, + { + path: '/accessDept', + component: Layout, + redirect: '/accessFuncDept', + name: 'AccessDept', + alwaysShow: true, + meta: { + title: '部门考核', + permission: ['/accessDept'], + sys: '/comment' + }, + children: [ + { + path: '/accessFuncDept', + component: () => import('@/views/deptAccess/deptAccess'), + name: 'AccessFuncDept', + meta: { title: '职能单位评价', icon: '', belongSys: '', permission: '/accessFuncDept' } + } + ] + } +] diff --git a/src/router/modules/common.js b/src/router/modules/common.js index 814027b..02b5f7b 100644 --- a/src/router/modules/common.js +++ b/src/router/modules/common.js @@ -24,6 +24,13 @@ component: () => import('@/views/caseCommon/caseDetailSupervise'), hidden: true, meta: { title: '案卷详情', icon: 'icon-config', permission: ['/caseDetail'] } + }, + { + path: '/caseDetaliProcess', + name: 'CaseDetailProcess', + component: () => import('@/components/CaseCommon/caseDetail'), + hidden: true, + meta: { title: '案卷详情', icon: 'icon-config', permission: ['/caseDetail'] } } ] } diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index c49fbbc..d10e320 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -309,26 +309,29 @@ export default { name: 'CaseDetail', components: { ArcGisMap }, - props: { - id: { - type: String, - default: '' - }, - row: { - type: Object, - default: null - }, - showProcess: { - type: Boolean, - default: true - }, - showNeedVisit: { - type: Boolean, - default: false - } - }, + // props: { + // id: { + // type: String, + // default: '' + // }, + // row: { + // type: Object, + // default: null + // }, + // showProcess: { + // type: Boolean, + // default: true + // }, + // showNeedVisit: { + // type: Boolean, + // default: false + // } + // }, data() { return { + id: '', + showProcess: true, + showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key fileIdVerify: [], // 核实照片id @@ -357,12 +360,16 @@ } }, mounted() { + console.log('case dtial') + this.id = this.$route.query.id + this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true + this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false this.initData() }, methods: { async initData() { // 查询案件详情接口 - const resDetail = await getCaseDetail(this.row.id) + const resDetail = await getCaseDetail(this.id) console.log('detail', resDetail) this.caseDetail = resDetail.data[0] @@ -541,7 +548,7 @@ console.log('buildForm', this.operationKey) // 通用参数 // processId,remarks已有 - this.processForm.bizId = this.row.id + this.processForm.bizId = this.id this.processForm.currState = this.caseDetail.caseState if (!this.operationKey) { this.$message.error('请选择案卷处理操作类型') @@ -645,7 +652,9 @@ completeCaseTask(this.processForm).then(response => { if (response.code === 200) { this.$message.success('提交成功') - this.$emit('submitProcess', this.caseDetail.caseid) + // this.$emit('submitProcess', this.caseDetail.caseid) + this.showProcess = false + this.initData() } else { this.$message.error('提交失败') } diff --git a/src/router/index.js b/src/router/index.js index edd798a..b265a48 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -10,7 +10,7 @@ import Layout from '../views/layout/Layout' import { systemRouters } from './modules/system' import { cooRouters } from './modules/coo' -import { bmsRouters } from './modules/bms' +import { commenetRouters } from './modules/comment' import { commonRouters } from './modules/common' /** @@ -90,7 +90,7 @@ export const asyncRouterMap = [ ...commonRouters, ...cooRouters, - ...bmsRouters, ...systemRouters, + ...commenetRouters, { path: '*', redirect: '/404', hidden: true, meta: {}} ] diff --git a/src/router/modules/bms.js b/src/router/modules/bms.js deleted file mode 100644 index cfa69f1..0000000 --- a/src/router/modules/bms.js +++ /dev/null @@ -1,48 +0,0 @@ -/* Layout */ -import Layout from '../../views/layout/Layout' -export const bmsRouters = [ - { - path: 'busAdmin', - component: Layout, - name: 'BusAdmin', - redirect: '/timeLimit', - alwaysShow: true, - meta: { - title: '业务管理', - icon: 'icon-setting', // 图标 - permission: ['/busAdmin']// 权限名称 - }, - children: [ - { - path: '/timeLimit', - component: () => import('@/views/busAdmin/TimeLimit/listTimeLimit.vue'), - name: 'TimeLimit', - meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] } - }, - { - path: '/caseList', - component: () => import('@/views/busAdmin/CaseQuery/caseList.vue'), - name: 'CaseList', - meta: { title: '综合查询', icon: '', permission: ['/caseList'] } - }, - { - path: '/dictList', - component: () => import('@/views/busAdmin/DictAdmin/dictList.vue'), - name: 'DictList', - meta: { title: '字典管理', icon: '', permission: ['/dictList'] } - }, - { - path: '/caseType', - component: () => import('@/views/busAdmin/caseType/listCaseType.vue'), - name: 'CaseType', - meta: { title: '事部件管理', icon: '', permission: ['/caseType'] } - }, - { - path: '/areaAdmin', - component: () => import('@/views/busAdmin/areaAdmin/areaAdminList.vue'), - name: 'AreaAdmin', - meta: { title: '区域管理', icon: '', permission: ['/areaAdmin'] } - } - ] - } -] diff --git a/src/router/modules/comment.js b/src/router/modules/comment.js new file mode 100644 index 0000000..c3c10ac --- /dev/null +++ b/src/router/modules/comment.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const commenetRouters = [ + { + path: '/comment', + name: 'comment', + redirect: '/accessDept', + hidden: true, + meta: { + title: '综合评价子系统', + permission: ['/comment'], + isSys: true + } + }, + { + path: '/accessDept', + component: Layout, + redirect: '/accessFuncDept', + name: 'AccessDept', + alwaysShow: true, + meta: { + title: '部门考核', + permission: ['/accessDept'], + sys: '/comment' + }, + children: [ + { + path: '/accessFuncDept', + component: () => import('@/views/deptAccess/deptAccess'), + name: 'AccessFuncDept', + meta: { title: '职能单位评价', icon: '', belongSys: '', permission: '/accessFuncDept' } + } + ] + } +] diff --git a/src/router/modules/common.js b/src/router/modules/common.js index 814027b..02b5f7b 100644 --- a/src/router/modules/common.js +++ b/src/router/modules/common.js @@ -24,6 +24,13 @@ component: () => import('@/views/caseCommon/caseDetailSupervise'), hidden: true, meta: { title: '案卷详情', icon: 'icon-config', permission: ['/caseDetail'] } + }, + { + path: '/caseDetaliProcess', + name: 'CaseDetailProcess', + component: () => import('@/components/CaseCommon/caseDetail'), + hidden: true, + meta: { title: '案卷详情', icon: 'icon-config', permission: ['/caseDetail'] } } ] } diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 5504ce9..7198b1b 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -4,7 +4,7 @@ { path: '/sys', name: 'sys', - redirect: '/system', + redirect: '/busAdmin', hidden: true, meta: { title: '应用维护子系统', @@ -13,6 +13,51 @@ } }, { + path: '/busAdmin', + component: Layout, + name: 'BusAdmin', + redirect: '/timeLimit', + alwaysShow: true, + meta: { + title: '业务管理', + icon: 'icon-setting', // 图标 + permission: ['/busAdmin'], // 权限名称 + sys: '/sys' + }, + children: [ + { + path: '/timeLimit', + component: () => import('@/views/busAdmin/TimeLimit/listTimeLimit.vue'), + name: 'TimeLimit', + meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] } + }, + { + path: '/caseList', + component: () => import('@/views/busAdmin/CaseQuery/caseList.vue'), + name: 'CaseList', + meta: { title: '综合查询', icon: '', permission: ['/caseList'] } + }, + { + path: '/dictList', + component: () => import('@/views/busAdmin/DictAdmin/dictList.vue'), + name: 'DictList', + meta: { title: '字典管理', icon: '', permission: ['/dictList'] } + }, + { + path: '/caseType', + component: () => import('@/views/busAdmin/caseType/listCaseType.vue'), + name: 'CaseType', + meta: { title: '事部件管理', icon: '', permission: ['/caseType'] } + }, + { + path: '/areaAdmin', + component: () => import('@/views/busAdmin/areaAdmin/areaAdminList.vue'), + name: 'AreaAdmin', + meta: { title: '区域管理', icon: '', permission: ['/areaAdmin'] } + } + ] + }, + { path: '/system', component: Layout, redirect: '/resource', diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index c49fbbc..d10e320 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -309,26 +309,29 @@ export default { name: 'CaseDetail', components: { ArcGisMap }, - props: { - id: { - type: String, - default: '' - }, - row: { - type: Object, - default: null - }, - showProcess: { - type: Boolean, - default: true - }, - showNeedVisit: { - type: Boolean, - default: false - } - }, + // props: { + // id: { + // type: String, + // default: '' + // }, + // row: { + // type: Object, + // default: null + // }, + // showProcess: { + // type: Boolean, + // default: true + // }, + // showNeedVisit: { + // type: Boolean, + // default: false + // } + // }, data() { return { + id: '', + showProcess: true, + showNeedVisit: false, caseDetail: {}, operationKey: '', // 案件处理按钮key fileIdVerify: [], // 核实照片id @@ -357,12 +360,16 @@ } }, mounted() { + console.log('case dtial') + this.id = this.$route.query.id + this.showProcess = (this.$route.query.showProcess || this.$route.query.showProcess === false) ? this.$route.query.showProcess : true + this.showNeedVisit = this.$route.query.showNeedVisit ? this.$route.query.showNeedVisit : false this.initData() }, methods: { async initData() { // 查询案件详情接口 - const resDetail = await getCaseDetail(this.row.id) + const resDetail = await getCaseDetail(this.id) console.log('detail', resDetail) this.caseDetail = resDetail.data[0] @@ -541,7 +548,7 @@ console.log('buildForm', this.operationKey) // 通用参数 // processId,remarks已有 - this.processForm.bizId = this.row.id + this.processForm.bizId = this.id this.processForm.currState = this.caseDetail.caseState if (!this.operationKey) { this.$message.error('请选择案卷处理操作类型') @@ -645,7 +652,9 @@ completeCaseTask(this.processForm).then(response => { if (response.code === 200) { this.$message.success('提交成功') - this.$emit('submitProcess', this.caseDetail.caseid) + // this.$emit('submitProcess', this.caseDetail.caseid) + this.showProcess = false + this.initData() } else { this.$message.error('提交失败') } diff --git a/src/router/index.js b/src/router/index.js index edd798a..b265a48 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -10,7 +10,7 @@ import Layout from '../views/layout/Layout' import { systemRouters } from './modules/system' import { cooRouters } from './modules/coo' -import { bmsRouters } from './modules/bms' +import { commenetRouters } from './modules/comment' import { commonRouters } from './modules/common' /** @@ -90,7 +90,7 @@ export const asyncRouterMap = [ ...commonRouters, ...cooRouters, - ...bmsRouters, ...systemRouters, + ...commenetRouters, { path: '*', redirect: '/404', hidden: true, meta: {}} ] diff --git a/src/router/modules/bms.js b/src/router/modules/bms.js deleted file mode 100644 index cfa69f1..0000000 --- a/src/router/modules/bms.js +++ /dev/null @@ -1,48 +0,0 @@ -/* Layout */ -import Layout from '../../views/layout/Layout' -export const bmsRouters = [ - { - path: 'busAdmin', - component: Layout, - name: 'BusAdmin', - redirect: '/timeLimit', - alwaysShow: true, - meta: { - title: '业务管理', - icon: 'icon-setting', // 图标 - permission: ['/busAdmin']// 权限名称 - }, - children: [ - { - path: '/timeLimit', - component: () => import('@/views/busAdmin/TimeLimit/listTimeLimit.vue'), - name: 'TimeLimit', - meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] } - }, - { - path: '/caseList', - component: () => import('@/views/busAdmin/CaseQuery/caseList.vue'), - name: 'CaseList', - meta: { title: '综合查询', icon: '', permission: ['/caseList'] } - }, - { - path: '/dictList', - component: () => import('@/views/busAdmin/DictAdmin/dictList.vue'), - name: 'DictList', - meta: { title: '字典管理', icon: '', permission: ['/dictList'] } - }, - { - path: '/caseType', - component: () => import('@/views/busAdmin/caseType/listCaseType.vue'), - name: 'CaseType', - meta: { title: '事部件管理', icon: '', permission: ['/caseType'] } - }, - { - path: '/areaAdmin', - component: () => import('@/views/busAdmin/areaAdmin/areaAdminList.vue'), - name: 'AreaAdmin', - meta: { title: '区域管理', icon: '', permission: ['/areaAdmin'] } - } - ] - } -] diff --git a/src/router/modules/comment.js b/src/router/modules/comment.js new file mode 100644 index 0000000..c3c10ac --- /dev/null +++ b/src/router/modules/comment.js @@ -0,0 +1,35 @@ +/* Layout */ +import Layout from '../../views/layout/Layout' +export const commenetRouters = [ + { + path: '/comment', + name: 'comment', + redirect: '/accessDept', + hidden: true, + meta: { + title: '综合评价子系统', + permission: ['/comment'], + isSys: true + } + }, + { + path: '/accessDept', + component: Layout, + redirect: '/accessFuncDept', + name: 'AccessDept', + alwaysShow: true, + meta: { + title: '部门考核', + permission: ['/accessDept'], + sys: '/comment' + }, + children: [ + { + path: '/accessFuncDept', + component: () => import('@/views/deptAccess/deptAccess'), + name: 'AccessFuncDept', + meta: { title: '职能单位评价', icon: '', belongSys: '', permission: '/accessFuncDept' } + } + ] + } +] diff --git a/src/router/modules/common.js b/src/router/modules/common.js index 814027b..02b5f7b 100644 --- a/src/router/modules/common.js +++ b/src/router/modules/common.js @@ -24,6 +24,13 @@ component: () => import('@/views/caseCommon/caseDetailSupervise'), hidden: true, meta: { title: '案卷详情', icon: 'icon-config', permission: ['/caseDetail'] } + }, + { + path: '/caseDetaliProcess', + name: 'CaseDetailProcess', + component: () => import('@/components/CaseCommon/caseDetail'), + hidden: true, + meta: { title: '案卷详情', icon: 'icon-config', permission: ['/caseDetail'] } } ] } diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 5504ce9..7198b1b 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -4,7 +4,7 @@ { path: '/sys', name: 'sys', - redirect: '/system', + redirect: '/busAdmin', hidden: true, meta: { title: '应用维护子系统', @@ -13,6 +13,51 @@ } }, { + path: '/busAdmin', + component: Layout, + name: 'BusAdmin', + redirect: '/timeLimit', + alwaysShow: true, + meta: { + title: '业务管理', + icon: 'icon-setting', // 图标 + permission: ['/busAdmin'], // 权限名称 + sys: '/sys' + }, + children: [ + { + path: '/timeLimit', + component: () => import('@/views/busAdmin/TimeLimit/listTimeLimit.vue'), + name: 'TimeLimit', + meta: { title: '阶段时限', icon: '', permission: ['/timeLimit'] } + }, + { + path: '/caseList', + component: () => import('@/views/busAdmin/CaseQuery/caseList.vue'), + name: 'CaseList', + meta: { title: '综合查询', icon: '', permission: ['/caseList'] } + }, + { + path: '/dictList', + component: () => import('@/views/busAdmin/DictAdmin/dictList.vue'), + name: 'DictList', + meta: { title: '字典管理', icon: '', permission: ['/dictList'] } + }, + { + path: '/caseType', + component: () => import('@/views/busAdmin/caseType/listCaseType.vue'), + name: 'CaseType', + meta: { title: '事部件管理', icon: '', permission: ['/caseType'] } + }, + { + path: '/areaAdmin', + component: () => import('@/views/busAdmin/areaAdmin/areaAdminList.vue'), + name: 'AreaAdmin', + meta: { title: '区域管理', icon: '', permission: ['/areaAdmin'] } + } + ] + }, + { path: '/system', component: Layout, redirect: '/resource', diff --git a/src/views/busAdmin/TimeLimit/listTimeLimit.vue b/src/views/busAdmin/TimeLimit/listTimeLimit.vue index 27fdb68..d395884 100644 --- a/src/views/busAdmin/TimeLimit/listTimeLimit.vue +++ b/src/views/busAdmin/TimeLimit/listTimeLimit.vue @@ -1,5 +1,5 @@