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 | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue b/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue
index e643836..e8efdee 100644
--- a/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue
+++ b/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue
@@ -2,10 +2,16 @@
<div>
<a-table :columns="columns" :data-source="dataSource" bordered :pagination="ipagination" :loading="loading"
:scroll="{y:265}" :customRow="customRow" :size="size" rowKey="docId" @change="handleTableChange">
-
+ <!-- 瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
+ <span slot="docName" slot-scope="text">
+ <j-ellipsis :value="text"/>
+ </span>
</a-table>
<DocumentModal ref="modalForm" @ok="modalFormOk"/>
+
+ <has-received-document-assign-modal :size="size" ref="documentAssignModalRef"
+ :currentDocumentInfo="currentRightClickedDocumentInfo"/>
</div>
</template>
@@ -13,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
@@ -48,10 +55,10 @@
dataIndex: 'docName',
key: 'docName',
align: 'center',
+ scopedSlots: { customRender: 'docName' },
width: 300,
sorter: true
},
- { title: '浠ｇ爜鐗堟湰', dataIndex: 'docAlias', align: 'center' },
{
title: '鍑哄簱鐘舵��',
dataIndex: 'pullStatus_dictText',
@@ -64,13 +71,15 @@
},
{
title: '鐘� 鎬�',
- dataIndex: 'docStatus_dictText',
- key: 'docStatus',
+ dataIndex: 'docDispatchStatus_dictText',
+ key: 'docDispatchStatus',
align: 'center',
filters: [
- { text: '璁捐', value: 1 },
- { text: '鍙戝竷', value: 2 },
- { text: '褰掓。', value: 3 }
+ { text: '缂栧埗', value: 1 },
+ { text: '鏍″', value: 2 },
+ { text: '鎵瑰噯', value: 3 },
+ { text: '璇曞垏', value: 4 },
+ { text: '瀹氬瀷', value: 5 }
]
},
{ title: '绯荤粺鎸囧畾鐗堟湰', dataIndex: 'publishVersion', align: 'center' },
@@ -180,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