diff --git a/jero-web/src/store/modules/user.js b/jero-web/src/store/modules/user.js index c59903a89..2b9b58549 100644 --- a/jero-web/src/store/modules/user.js +++ b/jero-web/src/store/modules/user.js @@ -142,14 +142,14 @@ const user = { //Vue.ls.set(USER_AUTH,authData); sessionStorage.setItem(USER_AUTH, JSON.stringify(authData)) sessionStorage.setItem(SYS_BUTTON_AUTH, JSON.stringify(allAuthData)) - let gData = localStorage.getItem('gData') - if (!gData) { - getAction('sys/user/queryUserTreeList', {}).then((res) => { - if (res.success) { - localStorage.setItem('gData', JSON.stringify(res.result)) - } - }) - } + // let gData = localStorage.getItem('gData') + // if (!gData) { + // getAction('sys/user/queryUserTreeList', {}).then((res) => { + // if (res.success) { + // localStorage.setItem('gData', JSON.stringify(res.result)) + // } + // }) + // } if (menuData && menuData.length > 0) { //update--begin--autor:qinfeng-----date:20200109------for:JEECG-63 一级菜单的子菜单全部是隐藏路由,则一级菜单不显示------ menuData.forEach((item, index) => { diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index c19d1eb3c..a9d2d721e 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -28,7 +28,7 @@ "/> {{$t('view')}} - + + + {{text}} + + + {{text}} +
import { getAction, postAction, deleteAction } from '@/api/manage' + export default { name: 'SentList', - data(){ - return{ - dataSource:[], - loading:false, - columns:[ + data() { + return { + dataSource: [], + loading: false, + columns: [ { title: this.$t('RelatedItems'), align: 'center', dataIndex: 'projectName', + scopedSlots: { customRender: 'RelatedItems' }, ellipsis: true, width: 170 }, @@ -51,6 +59,7 @@ title: this.$t('standardInformation'), align: 'center', dataIndex: 'serialNumber', + scopedSlots: { customRender: 'standardInformation' }, ellipsis: true, width: 170 }, @@ -75,13 +84,13 @@ ellipsis: true, width: 170 }, - { - title: this.$t('TaskCutOffTime'), - align: 'center', - dataIndex: 'endTime', - ellipsis: true, - width: 170 - }, + // { + // title: this.$t('TaskCutOffTime'), + // align: 'center', + // dataIndex: 'endTime', + // ellipsis: true, + // width: 170 + // }, { title: this.$t('taskStatus'), align: 'center', @@ -97,22 +106,71 @@ scopedSlots: { customRender: 'operation' } } ], - selectedRowKeys:[], - pageSize:10, - pageNo:1, - total:0, - url:{ - list:'/todoCenter/projectProcess/issuedProcess', + selectedRowKeys: [], + pageSize: 10, + pageNo: 1, + total: 0, + url: { + list: '/todoCenter/projectProcess/issuedProcess' }, - queryParam:{}, + queryParam: {} } }, mounted() { this.getList() }, - methods:{ - viewClick(val){ - + methods: { + RelatedItemsClick(item) { + let newUrl = this.$router.resolve({ + path: '/ProjectDetails', + query: { + id: item.projectLibraryId, + projectName: item.projectName, + projectNameId: item.projectNameId, + targetMarket: item.targetMarket, + studioEngineer: item.studioEngineer, + } + }) + window.open(newUrl.href, '_blank') + }, + standardInformationClick(item) { + let newUrl = this.$router.resolve({ + path: '/docManage/library/detail', + query: { + id: item.projectLawsInventoryId + } + }) + window.open(newUrl.href, '_blank') + }, + viewClick(row) { + let query = {} + if (row.flowType == '1') { + query = { + taskDefinitionKey:row.taskDefinitionKey, + taskIds:row.actiProcInstId, + prcType:row.flowType, + prcNum:row.prcNum, + isTrue:false, + } + let newUrl = this.$router.resolve({ + path: '/handshakeProcess', + query: query + }) + window.open(newUrl.href, '_blank') + }else if(row.flowType == '10'){ + let newUrl = this.$router.resolve({ + path: '/ProjectDetails', + query: { + id: row.projectLibraryId, + projectName: row.projectName, + projectNameId: row.projectNameId, + targetMarket: row.targetMarket, + studioEngineer:row.studioEngineer, + type:'102', + } + }) + window.open(newUrl.href, '_blank') + } }, searchQuery(value) { this.queryParam = value @@ -133,7 +191,7 @@ this.pageSize = pageSize this.getList() }, - getList(){ + getList() { let queryParam = JSON.parse(JSON.stringify(this.queryParam)) Object.keys(queryParam).forEach(val => { if (queryParam[val] instanceof Array) { @@ -160,7 +218,7 @@ this.loading = false } }) - }, + } } } diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 7edbe9926..e394f8ab1 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -14,7 +14,13 @@ {{$t('Processing')}} - + + + {{text}} + + + {{text}} +
{{$t('view')}} + + {{text}} + + + {{text}} +
import { getAction, postAction, deleteAction } from '@/api/manage' + export default { name: 'doneList', - data(){ - return{ - dataSource:[], - loading:false, - url:{ - list:'/todoCenter/projectProcess/doneProcess', + data() { + return { + dataSource: [], + loading: false, + url: { + list: '/todoCenter/projectProcess/doneProcess' }, - queryParam:{}, - columns:[ + queryParam: {}, + columns: [ { title: this.$t('RelatedItems'), align: 'center', dataIndex: 'projectName', ellipsis: true, + scopedSlots: { customRender: 'RelatedItems' }, width: 170 }, { @@ -56,6 +64,7 @@ align: 'center', dataIndex: 'serialNumber', ellipsis: true, + scopedSlots: { customRender: 'standardInformation' }, width: 170 }, { @@ -68,7 +77,7 @@ { title: this.$t('Sponsor'), align: 'center', - dataIndex: 'assigneeName', + dataIndex: 'createBy', ellipsis: true, width: 170 }, @@ -79,13 +88,13 @@ ellipsis: true, width: 170 }, - { - title: this.$t('TaskCutOffTime'), - align: 'center', - dataIndex: 'endTime', - ellipsis: true, - width: 170 - }, + // { + // title: this.$t('TaskCutOffTime'), + // align: 'center', + // dataIndex: 'endTime', + // ellipsis: true, + // width: 170 + // }, { title: this.$t('taskStatus'), align: 'center', @@ -101,18 +110,67 @@ scopedSlots: { customRender: 'operation' } } ], - selectedRowKeys:[], - pageSize:10, - pageNo:1, - total:0, + selectedRowKeys: [], + pageSize: 10, + pageNo: 1, + total: 0 } }, mounted() { this.getList() }, - methods:{ - viewClick(val){ - + methods: { + RelatedItemsClick(item) { + let newUrl = this.$router.resolve({ + path: '/ProjectDetails', + query: { + id: item.projectLibraryId, + projectName: item.projectName, + projectNameId: item.projectNameId, + targetMarket: item.targetMarket, + studioEngineer:item.studioEngineer, + } + }) + window.open(newUrl.href, '_blank') + }, + standardInformationClick(item){ + let newUrl = this.$router.resolve({ + path: '/docManage/library/detail', + query: { + id: item.projectLawsInventoryId, + } + }) + window.open(newUrl.href, '_blank') + }, + viewClick(row) { + let query = {} + if (row.flowType == '1') { + query = { + taskDefinitionKey:row.taskDefinitionKey, + taskIds:row.actiProcInstId, + prcType:row.flowType, + prcNum:row.prcNum, + isTrue:false, + } + let newUrl = this.$router.resolve({ + path: '/handshakeProcess', + query: query + }) + window.open(newUrl.href, '_blank') + }else if(row.flowType == '10'){ + let newUrl = this.$router.resolve({ + path: '/ProjectDetails', + query: { + id: row.projectLibraryId, + projectName: row.projectName, + projectNameId: row.projectNameId, + targetMarket: row.targetMarket, + studioEngineer:row.studioEngineer, + type:'102', + } + }) + window.open(newUrl.href, '_blank') + } }, searchQuery(value) { this.queryParam = value @@ -133,7 +191,7 @@ this.pageSize = pageSize this.getList() }, - getList(){ + getList() { let queryParam = JSON.parse(JSON.stringify(this.queryParam)) Object.keys(queryParam).forEach(val => { if (queryParam[val] instanceof Array) { @@ -160,7 +218,7 @@ this.loading = false } }) - }, + } } } diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index 81c855eae..d267539e6 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -14,7 +14,10 @@ {{$t('view')}} - + + + {{text}} +
{{$t('Processing')}} - + + + {{text}} +
{{$t('view')}} - + + + {{text}} +
{{$t('Processing')}} + + {{text}} + + + {{text}} +
0) { let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let content = [] @@ -181,8 +211,22 @@ this.queryParam = {} this.getList() }, - ProcessingClick(val){ - + ProcessingClick(row) { + let query = {} + if (row.flowType == '1') { + query = { + taskDefinitionKey: row.taskDefinitionKey, + taskIds: row.actiProcInstId, + prcType: row.flowType, + prcNum: row.prcNum, + isTrue: true + } + let newUrl = this.$router.resolve({ + path: '/handshakeProcess', + query: query + }) + window.open(newUrl.href, '_blank') + } }, onSelectChange(value) { this.selectedRowKeys = [] @@ -206,7 +250,7 @@ this.pageSize = pageSize this.getList() }, - getList(){ + getList() { let queryParam = JSON.parse(JSON.stringify(this.queryParam)) Object.keys(queryParam).forEach(val => { if (queryParam[val] instanceof Array) { @@ -216,7 +260,7 @@ let query = { pageNo: this.pageNo, pageSize: this.pageSize, - flowType:'1', + flowType: '1', ...queryParam } this.loading = true @@ -234,7 +278,7 @@ this.loading = false } }) - }, + } } } @@ -299,6 +343,7 @@ ::v-deep .ant-table-body { background: transparent !important; } + .page { text-align: right; margin-top: 20px;