diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue index 2406fbb..d653443 100644 --- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue +++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue @@ -459,8 +459,8 @@ export default { if (showExtendNodeId.includes(this.currentNodeId)) { columns.push(...this.columnsExtend) } - // 需要操作的节点就加上操作列 - if (!noActionCoumnsNodes.includes(this.currentNodeId)) { + // 非禁用时,需要操作的节点就加上操作列 + if (!this.disabled && !noActionCoumnsNodes.includes(this.currentNodeId)) { columns.push(this.actionColumn) } return columns diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue index 8291740..856ec4d 100644 --- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue +++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue @@ -28,7 +28,7 @@ + v-decorator="[ 'distribute', validatorRules.isDistribute ]" /> @@ -304,15 +304,15 @@ export default { // 默认是少的条款表格 this.clauseDataSource = data.data.processStandardInterpretClauseList // 是否下发 - if (info.isDistribute === IsDistribute.DISTRIBUTE.value) { + if (info.distribute === IsDistribute.DISTRIBUTE.value) { this.isDistribute = true this.clauseDataSource = data.data.processStandardInterpretClauseList - } else if (info.isDistribute === IsDistribute.NOT_DISTRIBUTE.value) { + } else if (info.distribute === IsDistribute.NOT_DISTRIBUTE.value) { this.isDistribute = false this.clauseDataSource = data.data.processStandardInterpretClauseSublistList } // 是否下发有值就自动带入下一步,并回显数据 - if (info.isDistribute) { + if (info.distribute) { this.form.setFieldsValue(this.formInline) this.isNextStep = true this.$nextTick(() => { @@ -324,7 +324,7 @@ export default { handleNextStep () { this.form.validateFields((err, values) => { if (!err) { - this.isDistribute = values.isDistribute === IsDistribute.DISTRIBUTE.value + this.isDistribute = values.distribute === IsDistribute.DISTRIBUTE.value this.isNextStep = true this.$nextTick(() => { this.$refs.interpretationClauseTable.setData(this.clauseDataSource)