diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue index 3b9722099..b41d9eb10 100644 --- a/jero-web/src/views/processCenter/components/feedbackInformation.vue +++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue @@ -12,11 +12,11 @@ {{$t('feedbackPoint')+(index+1)}} @@ -163,7 +163,9 @@ } this.formInline = { ...this.formInline } }) - + if (this.$route.query.isDisabled) { + this.disabled = JSON.parse(this.$route.query.isDisabled) + } }, methods: { clickButtonToUpload(item, index) { diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index 1695db0be..dfb95253c 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -19,7 +19,7 @@ :title="$t('feedbackInformation')" /> { this.lawsOpinionAssessmentResult() }) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 4b1f311a7..60815ffed 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -128,7 +128,7 @@ projectName: item.projectName, projectNameId: item.projectNameId, targetMarket: item.targetMarket, - studioEngineer: item.studioEngineer, + studioEngineer: item.studioEngineer } }) window.open(newUrl.href, '_blank') @@ -146,18 +146,18 @@ let query = {} if (row.flowType == '1') { query = { - taskDefinitionKey:row.taskDefinitionKey, - taskIds:row.actiProcInstId, - prcType:row.flowType, - prcNum:row.prcNum, - isTrue:false, + taskDefinitionKey: row.taskDefinitionKey, + taskIds: row.taskIds, + 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'){ + } else if (row.flowType == '10') { let newUrl = this.$router.resolve({ path: '/ProjectDetails', query: { @@ -165,11 +165,98 @@ projectName: row.projectName, projectNameId: row.projectNameId, targetMarket: row.targetMarket, - studioEngineer:row.studioEngineer, - type:'102', + studioEngineer: row.studioEngineer, + type: '102' } }) window.open(newUrl.href, '_blank') + } else if (row.flowType == '2') { + query = { + taskIds: row.taskIds, + actiProcInstId: row.actiProcInstId, + projectTaskInventoryId: row.projectLawsInventoryId, + projectLibraryId: row.projectLibraryId, + id: row.projectLibraryId, + studioEngineer: row.studioEngineer, + serialNumber: row.serialNumber, + TaskKey: row.designTaskDefinitionKey, + isDisplay: false, + flowType: 2, + Sponsor: 'designInitiatorName', + personLiable: 'designDutyName', + typeOfDeliverables: 'designDeliverableTypeName', + deliverableTemplate: 'designDeliverableTemplate', + DueDate: 'designDueDate', + remarks: 'designRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.designTaskDetailId, + PersonChargeFeedback: row.designPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') + } else if (row.flowType == '3') { + query = { + taskIds: row.taskIds, + actiProcInstId: row.actiProcInstId, + projectTaskInventoryId: row.projectLawsInventoryId, + studioEngineer: row.studioEngineer, + projectLibraryId: row.projectLibraryId, + serialNumber: row.serialNumber, + TaskKey: row.prehomoTaskDefinitionKey, + flowType: 3, + isDisplay: false, + id: row.projectLibraryId, + Sponsor: 'prehomoInitiatorName', + personLiable: 'prehomoDutyName', + typeOfDeliverables: 'prehomoDeliverableTypeName', + deliverableTemplate: 'prehomoDeliverableTemplate', + DueDate: 'prehomoDueDate', + remarks: 'prehomoRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.prehomoTaskDetailId, + PersonChargeFeedback: row.prehomoPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') + } else if (row.flowType == '4') { + query = { + taskIds: row.taskIds, + actiProcInstId: row.actiProcInstId, + id: row.projectLibraryId, + projectLibraryId: row.projectLibraryId, + studioEngineer: row.studioEngineer, + serialNumber: row.serialNumber, + projectTaskInventoryId: row.projectLawsInventoryId, + TaskKey: row.verifyTaskDefinitionKey, + flowType: 4, + isDisplay: false, + Sponsor: 'verifyInitiatorName', + personLiable: 'verifyDutyName', + typeOfDeliverables: 'verifyDeliverableTypeName', + deliverableTemplate: 'verifyDeliverableTemplate', + DueDate: 'verifyDueDate', + remarks: 'verifyRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.verifyTaskDetailId, + PersonChargeFeedback: row.verifyPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') } }, searchQuery(value) { diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index e394f8ab1..f2612c647 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -140,7 +140,7 @@ if (row.flowType == '1') { query = { taskDefinitionKey:row.taskDefinitionKey, - taskIds:row.actiProcInstId, + taskIds:row.taskIds, prcType:row.flowType, prcNum:row.prcNum, isTrue:true, @@ -163,6 +163,93 @@ } }) window.open(newUrl.href, '_blank') + }else if(row.flowType == '2'){ + query = { + taskIds:row.taskIds, + actiProcInstId: row.actiProcInstId, + projectTaskInventoryId: row.projectLawsInventoryId, + projectLibraryId:row.projectLibraryId, + id: row.projectLibraryId, + studioEngineer: row.studioEngineer, + serialNumber: row.serialNumber, + TaskKey: row.designTaskDefinitionKey, + isDisplay: true, + flowType: 2, + Sponsor: 'designInitiatorName', + personLiable: 'designDutyName', + typeOfDeliverables: 'designDeliverableTypeName', + deliverableTemplate: 'designDeliverableTemplate', + DueDate: 'designDueDate', + remarks: 'designRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.designTaskDetailId, + PersonChargeFeedback: row.designPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') + }else if(row.flowType == '3'){ + query = { + taskIds:row.taskIds, + actiProcInstId: row.actiProcInstId, + projectTaskInventoryId: row.projectLawsInventoryId, + studioEngineer: row.studioEngineer, + projectLibraryId:row.projectLibraryId, + serialNumber: row.serialNumber, + TaskKey: row.prehomoTaskDefinitionKey, + flowType: 3, + isDisplay: true, + id: row.projectLibraryId, + Sponsor: 'prehomoInitiatorName', + personLiable: 'prehomoDutyName', + typeOfDeliverables: 'prehomoDeliverableTypeName', + deliverableTemplate: 'prehomoDeliverableTemplate', + DueDate: 'prehomoDueDate', + remarks: 'prehomoRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.prehomoTaskDetailId, + PersonChargeFeedback: row.prehomoPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') + }else if(row.flowType == '4'){ + query = { + taskIds: row.taskIds, + actiProcInstId: row.actiProcInstId, + id: row.projectLibraryId, + projectLibraryId: row.projectLibraryId, + studioEngineer: row.studioEngineer, + serialNumber: row.serialNumber, + projectTaskInventoryId: row.projectLawsInventoryId, + TaskKey: row.verifyTaskDefinitionKey, + flowType: 4, + isDisplay: true, + Sponsor: 'verifyInitiatorName', + personLiable: 'verifyDutyName', + typeOfDeliverables: 'verifyDeliverableTypeName', + deliverableTemplate: 'verifyDeliverableTemplate', + DueDate: 'verifyDueDate', + remarks: 'verifyRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.verifyTaskDetailId, + PersonChargeFeedback: row.verifyPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') } }, searchQuery(value) { diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index a96826a35..e59b17add 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -147,7 +147,7 @@ if (row.flowType == '1') { query = { taskDefinitionKey:row.taskDefinitionKey, - taskIds:row.actiProcInstId, + taskIds:row.taskIds, prcType:row.flowType, prcNum:row.prcNum, isTrue:false, @@ -170,6 +170,93 @@ } }) window.open(newUrl.href, '_blank') + }else if(row.flowType == '2'){ + query = { + taskIds:row.taskIds, + actiProcInstId: row.actiProcInstId, + projectTaskInventoryId: row.projectLawsInventoryId, + projectLibraryId:row.projectLibraryId, + id: row.projectLibraryId, + studioEngineer: row.studioEngineer, + serialNumber: row.serialNumber, + TaskKey: row.designTaskDefinitionKey, + isDisplay: false, + flowType: 2, + Sponsor: 'designInitiatorName', + personLiable: 'designDutyName', + typeOfDeliverables: 'designDeliverableTypeName', + deliverableTemplate: 'designDeliverableTemplate', + DueDate: 'designDueDate', + remarks: 'designRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.designTaskDetailId, + PersonChargeFeedback: row.designPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') + }else if(row.flowType == '3'){ + query = { + taskIds:row.taskIds, + actiProcInstId: row.actiProcInstId, + projectTaskInventoryId: row.projectLawsInventoryId, + studioEngineer: row.studioEngineer, + projectLibraryId:row.projectLibraryId, + serialNumber: row.serialNumber, + TaskKey: row.prehomoTaskDefinitionKey, + flowType: 3, + isDisplay: false, + id: row.projectLibraryId, + Sponsor: 'prehomoInitiatorName', + personLiable: 'prehomoDutyName', + typeOfDeliverables: 'prehomoDeliverableTypeName', + deliverableTemplate: 'prehomoDeliverableTemplate', + DueDate: 'prehomoDueDate', + remarks: 'prehomoRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.prehomoTaskDetailId, + PersonChargeFeedback: row.prehomoPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') + }else if(row.flowType == '4'){ + query = { + taskIds: row.taskIds, + actiProcInstId: row.actiProcInstId, + id: row.projectLibraryId, + projectLibraryId: row.projectLibraryId, + studioEngineer: row.studioEngineer, + serialNumber: row.serialNumber, + projectTaskInventoryId: row.projectLawsInventoryId, + TaskKey: row.verifyTaskDefinitionKey, + flowType: 4, + isDisplay: false, + Sponsor: 'verifyInitiatorName', + personLiable: 'verifyDutyName', + typeOfDeliverables: 'verifyDeliverableTypeName', + deliverableTemplate: 'verifyDeliverableTemplate', + DueDate: 'verifyDueDate', + remarks: 'verifyRemark', + projectName: row.projectName, + targetMarket: row.targetMarket, + projectNameId: row.projectNameId, + primaryKeyId: row.verifyTaskDetailId, + PersonChargeFeedback: row.verifyPersonChargeFeedback + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') } }, searchQuery(value) { diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index d267539e6..b6cb4b7f2 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -36,20 +36,21 @@ diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index e4897b8da..d94f03ff6 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -47,7 +47,7 @@ { title: this.$t('standardInformation'), align: 'center', - dataIndex: 'standardInformation', + dataIndex: 'serialNumber', scopedSlots: { customRender: 'standardInformation' }, ellipsis: true, width: 170 @@ -55,28 +55,28 @@ { title: this.$t('taskType'), align: 'center', - dataIndex: 'taskType', + dataIndex: 'flowTypeShow', ellipsis: true, width: 170 }, { title: this.$t('Sponsor'), align: 'center', - dataIndex: 'Sponsor', + dataIndex: 'createBy', ellipsis: true, width: 170 }, { title: this.$t('TaskCutOffTime'), align: 'center', - dataIndex: 'TaskCutOffTime', + dataIndex: 'endTime', ellipsis: true, width: 170 }, { title: this.$t('taskStatus'), align: 'center', - dataIndex: 'taskStatus', + dataIndex: 'statusShow', ellipsis: true, width: 170 }, @@ -91,19 +91,19 @@ selectedRowKeys: [], pageSize: 10, pageNo: 1, - url:{ - list:'', + url: { + list: '' }, total: 0, queryParam: {} } }, methods: { - standardInformationClick(item){ + standardInformationClick(item) { let newUrl = this.$router.resolve({ path: '/docManage/library/detail', query: { - id: item.projectLawsInventoryId, + id: item.projectLawsInventoryId } }) window.open(newUrl.href, '_blank') @@ -118,8 +118,38 @@ this.pageNo = 1 this.getList() }, - ProcessingClick(val) { - + ProcessingClick(row){ + row.router = this.$route.path + let query = {} + if (row.flowType == '5') { + query = { + prcId:row.actiProcInstId, + taskIds:row.taskIds, + prcType:row.flowType, + router:row.router, + taskDefinitionKey:row.taskDefinitionKey, + isDisabled:false + } + let newUrl = this.$router.resolve({ + path: '/regulatoryProcessReview', + query: query + }) + window.open(newUrl.href, '_blank') + } else if (row.flowType == '6') { + query = { + taskDefinitionKey:row.taskDefinitionKey, + taskIds:row.taskIds, + prcType:row.flowType, + prcId:row.actiProcInstId, + router:row.router, + isDisabled:false, + } + let newUrl = this.$router.resolve({ + path: '/evaluationProcess', + query: query + }) + window.open(newUrl.href, '_blank') + } }, pageOnChange(page) { this.pageNo = page diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue index 48ee20e1d..cfd23fd79 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -46,7 +46,7 @@ { title: this.$t('standardInformation'), align: 'center', - dataIndex: 'standardInformation', + dataIndex: 'serialNumber', ellipsis: true, scopedSlots: { customRender: 'standardInformation' }, width: 170 @@ -54,35 +54,35 @@ { title: this.$t('taskType'), align: 'center', - dataIndex: 'taskType', + dataIndex: 'flowTypeShow', ellipsis: true, width: 170 }, { title: this.$t('Sponsor'), align: 'center', - dataIndex: 'Sponsor', + dataIndex: 'createBy', ellipsis: true, width: 170 }, { title: this.$t('CurrentProcessor'), align: 'center', - dataIndex: 'CurrentProcessor', - ellipsis: true, - width: 170 - }, - { - title: this.$t('TaskCutOffTime'), - align: 'center', - dataIndex: 'TaskCutOffTime', + dataIndex: 'assigneeName', ellipsis: true, width: 170 }, + // { + // title: this.$t('TaskCutOffTime'), + // align: 'center', + // dataIndex: 'TaskCutOffTime', + // ellipsis: true, + // width: 170 + // }, { title: this.$t('taskStatus'), align: 'center', - dataIndex: 'taskStatus', + dataIndex: 'statusShow', ellipsis: true, width: 170 },