diff --git a/src/api/workCenter.js b/src/api/workCenter.js index 298bc97..8b8c16a 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -77,8 +77,10 @@ const interpretFlowStart = (params) => postAction('/process/standardInterpretFlo const interpretFlowReject = (params) => postAction('/process/standardInterpretFlow/flowReject', params) // 保存 const interpretFlowSave = (params) => postAction('/process/standardInterpretFlow/flowSave', params) -// 保存 +// 转办 const interpretFlowTransfer = (params) => getAction('/process/standardInterpretFlow/flowTransfer', params) +// 加签 +const interpretFlowCountersign = (params) => getAction('/process/standardInterpretFlow/flowCountersign', params) // 获取详情 const interpretGetDetail = (params) => getAction('/process/standardInterpretFlow/queryDetail', params) @@ -148,6 +150,7 @@ export { interpretFlowReject, interpretFlowSave, interpretFlowTransfer, + interpretFlowCountersign, interpretGetDetail, compulsoryWithdrawal, diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js index b95dbb1..1b35fb3 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -81,6 +81,7 @@ module.exports = { mainInterpreter: 'Main Interpreter', interpretingTasksIsDistribute: 'Is the interpretation task issued', departInterpretingPeople: 'Interpreters from various departments involved', + interpreter: 'Interpreting people', batchSelectionUser: 'Batch selection of personnel', pleaseSelectTheNextStep: 'Please select the next step', translation: 'Translation', diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index 08cd175..e84e3e0 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -81,6 +81,7 @@ module.exports = { mainInterpreter: '主解读人', interpretingTasksIsDistribute: '解读任务是否下发', departInterpretingPeople: '各涉及部门解读人', + interpreter: '解读人', batchSelectionUser: '批量选择人员', pleaseSelectTheNextStep: '请选择下一步', translation: '译文', diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 596894a..63e6c17 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -209,12 +209,11 @@ export const StandardInterpretationNodes = new EsEnums({ controlDepartLiaisonDistribution: { text: '主控部门联络人分发', value: 'contact_person_distribute', btn: ['transfer', 'save', 'submit'] }, standardInterpreterDistribution: { text: '标准主解读人分发', value: 'master_interpret_distribute', btn: ['reject', 'transfer', 'save', 'submit'] }, standardInterpreterReDistribution: { text: '标准主解读人分发', value: 'master_interpret_again_distribute', btn: ['reject', 'transfer', 'save', 'submit'] }, - interpreterFillInfoOne: { text: '解读人填写信息', value: 'master_interpret_fillout', btn: ['reject', 'transfer', 'save', 'submit'] }, - interpreterFillInfoTwo: { text: '解读人填写信息', value: 'interpreting_people_fillout', btn: ['reject', 'transfer', 'save', 'submit'] }, + interpreterFillInfo: { text: '解读人填写信息', value: 'interpreting_people_fillout', btn: ['reject', 'transfer', 'save', 'submit'] }, mainInterpreterSingleLineReview: { text: '标准主解读人单线审核', value: 'master_interpret_approve', btn: ['reject', 'transfer', 'save', 'submit'] }, standardInterpreterSummary: { text: '标准主解读人汇总', value: 'master_interpret_summary', btn: ['transfer', 'save', 'submit'] }, - countersignOne: { text: '会签', value: 'jointly_sign_1', btn: ['reject', 'transfer', 'save', 'submit'] }, - countersignTwo: { text: '会签', value: 'jointly_sign_2', btn: ['reject', 'transfer', 'save', 'submit'] }, + countersignOne: { text: '会签', value: 'jointly_sign_1', btn: ['countersign', 'reject', 'transfer', 'save', 'submit'] }, + countersignTwo: { text: '会签', value: 'jointly_sign_2', btn: ['countersign', 'reject', 'transfer', 'save', 'submit'] }, departManagerReviewOne: { text: '各涉及部门科室经理审核', value: 'department_manager_approve_1', btn: ['reject', 'transfer', 'save', 'submit'] }, departManagerReviewTwo: { text: '各涉及部门科室经理审核', value: 'department_manager_approve_2', btn: ['reject', 'transfer', 'save', 'submit'] }, manageOrTechnicalOfficerApprovalOne: { text: '主控部门高级经理/法规认证技术官批准', value: 'technical_officer_approval_1', btn: ['transfer', 'save', 'agree', 'reject'] }, diff --git a/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue b/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue index 996b0ee..a62a70b 100644 --- a/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue +++ b/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue @@ -149,7 +149,7 @@ import { interpretFlowSave, interpretFlowReject, interpretFlowTransfer, - getLookData + getLookData, interpretFlowCountersign } from '@api/workCenter' import InterpretationInitiate from '@views/workCenter/standardInterpretationProcess/modules/InterpretationInitiate' import UserSelectModal from '@comp/selection/UserSelectModal' @@ -495,7 +495,7 @@ export default { userSelectCallback (userId) { switch (this.selectUserType) { case '1': - this.countersignCallback() + this.countersignCallback(userId) break case '2': this.continueTurnToCallback(userId) @@ -506,23 +506,23 @@ export default { if (this.loading) return this.loading = true const params = { + projectId: this.projectId, taskId: this.$route.query.taskId, userId } - // interpretFlowTransfer(params).then(res => { - // if (res.success) { - // this.$message.success(res.message) - // this.goBack() - // } else { - // this.$message.warn(res.message) - // } - // }).catch(() => { - // this.loading = false - // }).finally(() => { - // setTimeout(() => { - // this.loading = false - // }, 1000) - // }) + interpretFlowCountersign(params).then(res => { + if (res.success) { + this.$message.success(res.message) + } else { + this.$message.warn(res.message) + } + }).catch(() => { + this.loading = false + }).finally(() => { + setTimeout(() => { + this.loading = false + }, 1000) + }) }, // 转办 continueTurnToCallback (userId) { diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue index d344223..22d747f 100644 --- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue +++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue @@ -12,7 +12,7 @@ :disabled="disabledImport" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importUrl" @change="handleImport"> - {{ $t('import') }} + {{ $t('import') }} @@ -174,10 +174,10 @@ export default { }, // 解读人回显列（解读人填写信息之后的节点显示） interpretingPeopleDictColumn: { - title: this.$t('workCenter.standardInterpretationProcess.departInterpretingPeople'), + title: this.$t('workCenter.standardInterpretationProcess.interpreter'), align: 'center', width: 180, - dataIndex: 'interpretPersonIds_dictText', + dataIndex: 'interpretPersonId_dictText', scopedSlots: { customRender: 'text' } }, // 解读的其他字段（拆分表的字段） @@ -445,8 +445,7 @@ export default { ] // 显示解读其他信息的节点（填写完解读信息及后的节点都显示） const showExtendNodeId = [ - StandardInterpretationNodes.interpreterFillInfoOne.value, // 解读人填写信息 - StandardInterpretationNodes.interpreterFillInfoTwo.value, // 解读人填写信息 + StandardInterpretationNodes.interpreterFillInfo.value, // 解读人填写信息 ...showInterpreterNodes // 填写解读信息之后的节点 ] // 是否回显解读人 @@ -494,8 +493,7 @@ export default { // 显示批量编辑按钮 showBatchEditBtn () { return [ - StandardInterpretationNodes.interpreterFillInfoOne.value, // 解读人填写信息 - StandardInterpretationNodes.interpreterFillInfoTwo.value // 解读人填写信息 + StandardInterpretationNodes.interpreterFillInfo.value // 解读人填写信息 ].includes(this.currentNodeId) }, // 是否显示编辑按钮 @@ -505,8 +503,7 @@ export default { return true } return [ - StandardInterpretationNodes.interpreterFillInfoOne.value, // 解读人填写信息 - StandardInterpretationNodes.interpreterFillInfoTwo.value, // 解读人填写信息 + StandardInterpretationNodes.interpreterFillInfo.value, // 解读人填写信息 StandardInterpretationNodes.standardInterpreterSummary.value // 标准主解读人汇总 ].includes(this.currentNodeId) }, diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInitiate.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInitiate.vue index 469ac05..23a7590 100644 --- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInitiate.vue +++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInitiate.vue @@ -173,8 +173,8 @@ export default { this.$message.warn(this.$t('workCenter.standardInterpretationProcess.pleaseSelectClause')) obj._flag = true } - // 来源选择其他，没有条款数据提示至少一条数据 - if (!isNoInput && isClauseNotData) { + // 选择条款后来源选择其他，没有条款数据提示至少一条数据 + if (this.showClauseTable && !isNoInput && isClauseNotData) { this.$message.warn(this.$t('addAtLeastOneRowOfData')) // 校验失败就标记true obj._flag = true diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue index e7e31b0..924bffd 100644 --- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue +++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue @@ -265,7 +265,7 @@ export default { } else { // 只要下一步了，对新增的部分进行校验 obj.clauseData = this.$refs.interpretationClauseTable.getData() - // 至少一条条款数据 + // 至少一条条款数据(重新分发节点可以删了代表不分发) if (!obj.clauseData.length) { this.$message.warn(this.$t('addAtLeastOneRowOfData')) obj._flag = true @@ -311,8 +311,12 @@ export default { this.isDistribute = true this.clauseDataSource = data.data.processStandardInterpretClauseList } else if (info.distribute === IsDistribute.NOT_DISTRIBUTE.value) { + // 不下发回显 this.isDistribute = false this.clauseDataSource = data.data.processStandardInterpretClauseSublistList + this.$nextTick(() => { + this.userForm.setFieldsValue(this.formInline) + }) // 如果分解单来源是不带入，就禁用导入 if (info.decompositionSource === DecompositionSource.NO_INPUT.value) { this.disabledImport = true @@ -331,6 +335,10 @@ export default { handleNextStep () { this.form.validateFields((err, values) => { if (!err) { + // 不带入就禁用导入 + if (this.formInline.decompositionSource === DecompositionSource.NO_INPUT.value) { + this.disabledImport = true + } this.isDistribute = values.distribute === IsDistribute.DISTRIBUTE.value this.isNextStep = true this.$nextTick(() => {