From 7713e63365e74047c08f3416b5a95108fdee7002 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 20 一月 2025 10:53:02 +0800
Subject: [PATCH] 产品结构树： 1、工序和工步层级新增加工设备型号和加工设备类型字段 2、各层级详细信息调整创建人及修改人字段 3、指派到设备窗口布局完成100%
---
src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue
index d7cfd63..c4ac74f 100644
--- a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue
@@ -1,13 +1,14 @@
<template>
<div>
<a-table :columns="columns" :data-source="dataSource" bordered :pagination="ipagination"
- :scroll="{y:189}" :customRow="customRow" :size="size" rowKey="docId">
+ :scroll="{y:189}" :customRow="customRow" :size="size" rowKey="docId" @change="handleTableChange">
</a-table>
<DocumentModal ref="modalForm" @ok="modalFormOk"/>
- <NcDocumentAssignModal :size="size" ref="documentAssignModalRef"/>
+ <NcDocumentAssignModal :size="size" ref="documentAssignModalRef"
+ :currentDocumentInfo="currentRightClickedDocumentInfo"/>
</div>
</template>
@@ -45,12 +46,14 @@
},
{ title: '鏂囦欢鍚嶇О', dataIndex: 'docName', align: 'center' },
{ title: '浠ｇ爜鐗堟湰', dataIndex: 'docAlias', align: 'center' },
- { title: '鍑哄簱鐘舵��', dataIndex: 'pullStatus', align: 'center' },
- { title: '鐘� 鎬�', dataIndex: 'docStatus', align: 'center' },
+ { title: '鍑哄簱鐘舵��', dataIndex: 'pullStatus_dictText', align: 'center' },
+ { title: '鐘� 鎬�', dataIndex: 'docStatus_dictText', align: 'center' },
{ title: '绯荤粺鎸囧畾鐗堟湰', dataIndex: 'publishVersion', align: 'center' },
{ title: '涓婁紶鏃堕棿', dataIndex: 'createTime', align: 'center' }
],
dataSource: [],
+ currentRightClickedDocumentInfo: {},
+ currentClickedDocumentInfo: {},
url: {
list: '/nc/doc/find/page'
}
@@ -68,16 +71,18 @@
//鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
if (arg === 1) this.ipagination.current = 1
var params = this.getQueryParams()//鏌ヨ鏉′欢
+ console.log('currentTreeNodeInfo', this.currentTreeNodeInfo)
params.attributionId = this.currentTreeNodeInfo.id
params.attributionType = this.currentTreeNodeInfo.type
params.docClassCode = 'NC'
if (!params) return false
+ this.dataSource = []
this.loading = true
getAction(this.url.list + `/${this.ipagination.current}/${this.ipagination.pageSize}`, params).then((res) => {
if (res.success) {
- this.dataSource = res.page.records
- if (res.page.total) {
- this.ipagination.total = res.page.total
+ this.dataSource = res.result.records
+ if (res.result.total) {
+ this.ipagination.total = res.result.total
} else {
this.ipagination.total = 0
}
@@ -94,10 +99,13 @@
on: {
contextmenu: event => {
event.preventDefault()
- this.$emit('handleTableContextMenuOpen', { ...record, param: 'document' })
+ this.currentRightClickedDocumentInfo = Object.assign({ param: 'NC' }, record)
+ this.$emit('handleTableContextMenuOpen', this.currentRightClickedDocumentInfo)
},
click: () => {
- this.$bus.$emit('sendCurrentLevelInfo', record)
+ if (this.currentClickedDocumentInfo.docId === record.docId) return
+ this.currentClickedDocumentInfo = Object.assign({}, record)
+ this.$bus.$emit('sendCurrentClickedDocumentInfo', record)
}
}
}
--
Gitblit v1.9.3