From a22a69946912221dab4d32987dda6c4c8ba3c5d8 Mon Sep 17 00:00:00 2001 From: cuilei <ray_tsu1@163.com> Date: 星期二, 24 六月 2025 17:43:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue b/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue index 2fad9dd..e8efdee 100644 --- a/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue +++ b/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue @@ -9,6 +9,9 @@ </a-table> <DocumentModal ref="modalForm" @ok="modalFormOk"/> + + <has-received-document-assign-modal :size="size" ref="documentAssignModalRef" + :currentDocumentInfo="currentRightClickedDocumentInfo"/> </div> </template> @@ -16,17 +19,18 @@ import { getAction } from '@/api/manage' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import DocumentModal from '../../../../common/DocumentModal.vue' + import HasReceivedDocumentAssignModal from './HasReceivedDocumentAssignModal' export default { name: 'HasReceivedDocumentTableList', - components: { DocumentModal }, + components: { HasReceivedDocumentAssignModal, DocumentModal }, mixins: [JeecgListMixin], props: { currentTreeNodeInfo: { type: Object }, - currentTypeOfDevice:{ - type:Number + currentTypeOfDevice: { + type: Number }, size: { type: String @@ -51,7 +55,7 @@ dataIndex: 'docName', key: 'docName', align: 'center', - scopedSlots: {customRender: 'docName'}, + scopedSlots: { customRender: 'docName' }, width: 300, sorter: true }, @@ -185,7 +189,12 @@ this.$refs.modalForm.title = modalTitle }, - handleDocumentAssign(record, modalTitle) { + /** + * 鎺у埗鎸囨淳鍒颁骇鍝佸脊绐� + * @param record 琛ㄦ牸琛屼俊鎭� + * @param modalTitle 寮圭獥鏍囬 + */ + handleDocumentRecAssign(record, modalTitle) { this.$refs.documentAssignModalRef.title = modalTitle this.$refs.documentAssignModalRef.visible = true }, -- Gitblit v1.9.3