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 | 96 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 85 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 b4d946f..e8efdee 100644
--- a/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue
+++ b/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue
@@ -1,11 +1,17 @@
<template>
<div>
- <a-table :columns="columns" :data-source="dataSource" bordered :pagination="ipagination"
- :scroll="{y:189}" :customRow="customRow" :size="size" rowKey="docId" @change="handleTableChange">
-
+ <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,14 +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
},
size: {
type: String
@@ -40,12 +50,46 @@
return parseInt(index) + 1
}
},
- { title: '鏂囦欢鍚嶇О', dataIndex: 'docName', align: 'center' },
- { title: '浠ｇ爜鐗堟湰', dataIndex: 'docAlias', align: 'center' },
- { title: '鍑哄簱鐘舵��', dataIndex: 'pullStatus_dictText', align: 'center' },
- { title: '鐘� 鎬�', dataIndex: 'docStatus_dictText', align: 'center' },
+ {
+ title: '鏂囦欢鍚嶇О',
+ dataIndex: 'docName',
+ key: 'docName',
+ align: 'center',
+ scopedSlots: { customRender: 'docName' },
+ width: 300,
+ sorter: true
+ },
+ {
+ title: '鍑哄簱鐘舵��',
+ dataIndex: 'pullStatus_dictText',
+ key: 'pullStatus',
+ align: 'center',
+ filters: [
+ { text: '鏈嚭搴�', value: 1 },
+ { text: '宸插嚭搴�', value: 2 }
+ ]
+ },
+ {
+ title: '鐘� 鎬�',
+ dataIndex: 'docDispatchStatus_dictText',
+ key: 'docDispatchStatus',
+ align: 'center',
+ filters: [
+ { text: '缂栧埗', value: 1 },
+ { text: '鏍″', value: 2 },
+ { text: '鎵瑰噯', value: 3 },
+ { text: '璇曞垏', value: 4 },
+ { text: '瀹氬瀷', value: 5 }
+ ]
+ },
{ title: '绯荤粺鎸囧畾鐗堟湰', dataIndex: 'publishVersion', align: 'center' },
- { title: '涓婁紶鏃堕棿', dataIndex: 'createTime', align: 'center' }
+ {
+ title: '鍒涘缓鏃堕棿',
+ dataIndex: 'createTime',
+ align: 'center',
+ width: 200,
+ sorter: true
+ }
],
dataSource: [],
currentRightClickedDocumentInfo: {},
@@ -77,7 +121,7 @@
var params = this.getQueryParams()//鏌ヨ鏉′欢
console.log('currentTreeNodeInfo', this.currentTreeNodeInfo)
params.attributionId = this.currentTreeNodeInfo.key
- params.attributionType = 4
+ params.attributionType = this.currentTypeOfDevice
params.docClassCode = 'REC'
if (!params) return false
this.dataSource = []
@@ -100,6 +144,9 @@
customRow(record) {
return {
+ style: {
+ backgroundColor: this.currentClickedDocumentInfo.docId === record.docId ? '#BAE7FF' : 'transparent'
+ },
on: {
contextmenu: event => {
event.preventDefault()
@@ -115,12 +162,39 @@
}
},
+ /**
+ * 琛ㄦ牸鍒嗛〉銆佹帓搴忔敼鍙樸�佺瓫閫夋椂瑙﹀彂
+ * @param pagination 鍒嗛〉鍣ㄩ�夐」
+ * @param filters 绛涢�夐�夐」
+ * @param sorter 鎺掑簭閫夐」
+ */
+ handleTableChange(pagination, filters, sorter) {
+ if (sorter.order) {
+ this.isorter.column = sorter.field
+ this.isorter.order = sorter.order === 'ascend' ? 'asc' : 'desc'
+ } else {
+ this.isorter.column = 'createTime'
+ this.isorter.order = 'desc'
+ }
+ for (let key in filters) {
+ this.filters[key] = filters[key].join(',')
+ }
+ this.ipagination = pagination
+ this.loadData()
+ },
+
handleDocumentEdit(record, modalTitle) {
+ if (!this.$refs.modalForm) return
this.$refs.modalForm.edit(record)
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