diff --git a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue index 63b5fd48..77e7eb28 100644 --- a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue +++ b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue @@ -174,7 +174,7 @@ v-model="formInline[item.dbFieldName]" :rows="4" /> 0) { + this.btnList = btnList + } else { + this.btnList = FGEntryChangeProcessNode.approve.btn + } + this.disabled = FGEntryChangeProcessNode.propertyOfValue('disabled', this.currentNode) || false // 获取人员信息 this.getPersonInfoStructure(ProcessKey.FB_ENTRY_CHANGE.value, () => { this.initPersonInfoData(this.currentNode === FGEntryChangeProcessNode.initiate.value) @@ -528,14 +536,6 @@ export default { this.formInline[field.dbFieldName] = this.formInline[field.dbFieldName] || null }) }) - // 获取按钮清单 - const btnList = FGEntryChangeProcessNode.propertyOfValue('btn', this.$route.query.nodeId) - if (btnList && btnList.length > 0) { - this.btnList = btnList - } else { - this.btnList = FGEntryChangeProcessNode.approve.btn - } - this.disabled = FGEntryChangeProcessNode.propertyOfValue('disabled', this.$route.query.nodeId) || false } else { this.$message.warning(res.message) this.loading = false @@ -1063,6 +1063,17 @@ export default { }).finally(() => { this.loading = false }) + }, + /** + * 处理关联海外标准的特殊逻辑 + * @param item + * @returns {*|string} + */ + getStandardSource (item) { + if (item.dbFieldName === 'associated_foreign_standards') { + return StandardSource.OVERSEAS.value + } + return this.formInline.source } } } diff --git a/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue b/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue index 420dce76..7a60ca5c 100644 --- a/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue +++ b/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue @@ -252,7 +252,7 @@ export default { }, created () { if (this.$route.query.processInstanceId || this.$route.query.draftId) { - this.currentNode = this.$route.query.nodeId + this.currentNode = this.$route.query.nodeId || ProcurementProcessNodes.initiate.value this.initProcessInfo() } else { this.currentNode = ProcurementProcessNodes.initiate.value @@ -277,11 +277,17 @@ export default { this.$message.warning(this.$t('selectARecord')) return } - const data = JSON.parse(JSON.stringify(this.dataSource)) - this.dataSource = data.map((tt, index) => { - return this.selectedRowKeys.includes(index) ? null : tt - }).filter(tt => !!tt) - this.selectedRowKeys = [] + this.$confirm({ + title: this.$t('confirmBatchDeletion'), + content: this.$t('deleteAData'), + onOk: () => { + const data = JSON.parse(JSON.stringify(this.dataSource)) + this.dataSource = data.map((tt, index) => { + return this.selectedRowKeys.includes(index) ? null : tt + }).filter(tt => !!tt) + this.selectedRowKeys = [] + } + }) }, handleEdit (record, index) { this.$refs.modalForm.edit(record, index) @@ -290,7 +296,7 @@ export default { this.$confirm({ title: this.$t('confirmDeletion'), content: this.$t('areYouSure'), - ok: () => { + onOk: () => { this.dataSource.splice(index, 1) } }) @@ -539,7 +545,7 @@ export default { // 销毁这个提示 modalLoading.destroy() }) - }, + } } }