diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 4de6a34dd..327c809ed 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1324,4 +1324,7 @@ module.exports = { filledBy:'Filled by', parameterToBeInitiated:'Parameter to be initiated', listTaskConfirmation:'List task confirmation', + completednum: 'Quantity to be filled', + filledBynum:'Filled by', + parameterToBeInitiatednum:'Parameter to be initiated', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index c2a087f24..8ee9717a9 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1425,4 +1425,7 @@ module.exports = { filledBy:'待分配填写人', parameterToBeInitiated:'参数待发起', listTaskConfirmation:'清单任务确认', + completednum: '待填写数量', + filledBynum:'待分配填写人数量', + parameterToBeInitiatednum:'参数待发起数量', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 904a21025..3ce895f7f 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -670,6 +670,10 @@ // } }, mounted() { + console.log(this.$route.query) + if(this.$route.query.type == '1'){ + this.handleOkRoleSwitching() + } this.GetgetLoginUserType() console.log(this.currentPersonRole) setTimeout(() => { @@ -704,35 +708,62 @@ }) }, handleOkRoleSwitching() { - this.$refs.ruleFormRoleSwitching.validate(valid => { - if (valid) { - let query = { - userType: this.formInlineRoleSwitching.roleSwitchingCode, - paramsManifestId: this.$route.query.id, - projectId: this.$route.query.projectId, - userId: this.userInfo().id - } - this.confirmLoadingRoleSwitching = true - postAction('/params/userTypeLog/edit', query).then((res) => { - if (res.success) { - this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode - this.$message.success(this.$t('OperationSuccessful')) - this.visibleRoleSwitching = false - this.confirmLoadingRoleSwitching = false - localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode)) - this.RoleType.forEach((item,index) => { - if(item.value == this.currentPersonRole){ - this.rolename = item.label - } - }) - this.selectedRowKeysValue = [] - } else { - this.confirmLoadingRoleSwitching = false - this.$message.warning(this.$t('operationFailed')) - } - }) + if(this.$route.query.type == '1'){ + let query = { + userType:this.$route.query.userType, + paramsManifestId: this.$route.query.id, + projectId: this.$route.query.projectId, + userId: this.userInfo().id } - }) + this.confirmLoadingRoleSwitching = true + postAction('/params/userTypeLog/edit', query).then((res) => { + if (res.success) { + this.currentPersonRole = this.$route.query.userType + this.visibleRoleSwitching = false + this.confirmLoadingRoleSwitching = false + localStorage.setItem('currentPersonRole', JSON.stringify(this.$route.query.userType)) + this.RoleType.forEach((item,index) => { + if(item.value == this.currentPersonRole){ + this.rolename = item.label + } + }) + this.selectedRowKeysValue = [] + } else { + this.confirmLoadingRoleSwitching = false + this.$message.warning(this.$t('operationFailed')) + } + }) + }else { + this.$refs.ruleFormRoleSwitching.validate(valid => { + if (valid) { + let query = { + userType: this.formInlineRoleSwitching.roleSwitchingCode, + paramsManifestId: this.$route.query.id, + projectId: this.$route.query.projectId, + userId: this.userInfo().id + } + this.confirmLoadingRoleSwitching = true + postAction('/params/userTypeLog/edit', query).then((res) => { + if (res.success) { + this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode + this.$message.success(this.$t('OperationSuccessful')) + this.visibleRoleSwitching = false + this.confirmLoadingRoleSwitching = false + localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode)) + this.RoleType.forEach((item,index) => { + if(item.value == this.currentPersonRole){ + this.rolename = item.label + } + }) + this.selectedRowKeysValue = [] + } else { + this.confirmLoadingRoleSwitching = false + this.$message.warning(this.$t('operationFailed')) + } + }) + } + }) + } }, roleSwitchingClick() { this.visibleRoleSwitching = true diff --git a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue index 9c75b9f51..0216f842b 100644 --- a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue @@ -8,8 +8,8 @@
{{$t('RelatedItems')}}
- + @@ -17,8 +17,8 @@
{{$t('ListTitle')}}
- +
@@ -42,14 +42,29 @@ :columns="columns" > - - {{$t('Processing')}} + + + {{text ? text:'--'}} + + + {{text}} + {{'--'}} + + + {{text}} + {{'--'}} + + + {{text}} + {{'--'}} -
+
{ + getAction('todoCenter/params/manifest/page', query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { this.pageNo = 1 @@ -246,4 +301,8 @@ ::v-deep .ant-table-body { background: transparent !important; } + .page { + text-align: right; + margin-top: 20px; + } \ No newline at end of file