diff --git a/src/api/workCenter.js b/src/api/workCenter.js index fe2d709..298bc97 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -78,7 +78,7 @@ const interpretFlowReject = (params) => postAction('/process/standardInterpretFl // 保存 const interpretFlowSave = (params) => postAction('/process/standardInterpretFlow/flowSave', params) // 保存 -const interpretFlowTransfer = (params) => postAction('/process/standardInterpretFlow/flowTransfer', params) +const interpretFlowTransfer = (params) => getAction('/process/standardInterpretFlow/flowTransfer', params) // 获取详情 const interpretGetDetail = (params) => getAction('/process/standardInterpretFlow/queryDetail', params) diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index b23a585..5465a56 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -163,6 +163,7 @@ module.exports = { lookDetail: 'View details', batchReject: 'Batch rejection', pleaseSelectDistributeData: 'Select the data you want to distribute', + pleaseSelectDeleteData: 'Please select the data to be deleted', deadline: 'Deadline', submitAddAdd: 'Submit and add', pleaseSelectOneStandard: 'Please select at least one criterion', diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 24652f9..eb7b8fb 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -169,6 +169,7 @@ module.exports = { lookDetail: '查看详情', batchReject: '批量驳回', pleaseSelectDistributeData: '请选择要分发的数据', + pleaseSelectDeleteData: '请选择要删除的数据', deadline: '截止时间', submitAddAdd: '提交并新增', pleaseSelectOneStandard: '请选择至少一条标准', diff --git a/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue b/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue index eb1f85f..f684d8a 100644 --- a/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue +++ b/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue @@ -402,8 +402,9 @@ export default { // 发起节点 if (this.isInitiate) { const standardData = compData.standardData[0] || {} + const formData = this.info.data && this.info.data.processStandardInterpret // 选择的标准数据 - params.data.processStandardInterpret = Object.assign({}, { + params.data.processStandardInterpret = Object.assign({}, formData, { // 分解单来源 decompositionSource: standardData.decompositionSource, // 标准id @@ -422,6 +423,7 @@ export default { params.data.processStandardInterpret = Object.assign({}, this.info.data.processStandardInterpret, compData.formData, { projectId: this.projectId }) + params.map.passFirst = compData.isDistribute ? IsDistribute.DISTRIBUTE.value : IsDistribute.NOT_DISTRIBUTE.value // 条款列表(分发和不分发传入的字段不一样) if (compData.isDistribute) { params.data.processStandardInterpretClauseList = compData.clauseData diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue index d653443..d344223 100644 --- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue +++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue @@ -9,6 +9,7 @@ {{ $t('import') }} @@ -121,6 +122,12 @@ export default { type: Object, default: () => ({}), required: false + }, + // 是否禁用导入 + disabledImport: { + type: Boolean, + default: false, + required: false } }, data () { @@ -682,9 +689,9 @@ export default { * 批量选择人员 */ handleBatchSelectUser () { - // 至少勾选一条数据 + // 请选择要分发的数据 if (!this.selectedRowKeys.length) { - this.$message.warning(this.$t('selectARecord')) + this.$message.warning(this.$t('pleaseSelectDistributeData')) return } this.$refs.userSelectModal.open() @@ -759,7 +766,7 @@ export default { handleBatchDelete () { // 至少勾选一条数据 if (!this.selectedRowKeys.length) { - this.$message.warning(this.$t('selectARecord')) + this.$message.warning(this.$t('pleaseSelectDeleteData')) return } const that = this diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInitiate.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInitiate.vue index bf0bf80..469ac05 100644 --- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInitiate.vue +++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInitiate.vue @@ -168,7 +168,7 @@ export default { // 如果来源选择不带入,至少选择一条条款信息 const isNoInput = this.dataSource.length && (this.dataSource[0].decompositionSource === DecompositionSource.NO_INPUT.value) // 是否没有条款数据 - const isClauseNotData = this.showClauseTable && !this.$refs.interpretationClauseTable.getData().length + const isClauseNotData = !this.showClauseTable || !this.$refs.interpretationClauseTable.getData().length if (isNoInput && isClauseNotData) { this.$message.warn(this.$t('workCenter.standardInterpretationProcess.pleaseSelectClause')) obj._flag = true @@ -224,6 +224,7 @@ export default { this.$nextTick(() => { this.$refs.interpretationClauseTable.setData([{ uuid: randomUUID(), + clauseId: this.dataSource[0].standardId, itemTitle: this.dataSource[0].standardName, itemNum: this.dataSource[0].standardNumber }]) diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue index 856ec4d..e7e31b0 100644 --- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue +++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue @@ -44,6 +44,7 @@ :disabled="disabled" :current-node-id="currentNodeId" :import-params="importParams" + :disabled-import="disabledImport" :is-distribute="isDistribute"/>