From 4a96df3ea2c19216bd49f2dfa4a41decd16a1486 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 23 六月 2025 09:52:12 +0800
Subject: [PATCH] 1、设备结构树页面接收NC文件列表新增指派到产品NC文件功能 2、设备TEEP页面故障率数据展示格式调整
---
src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue b/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue
index ee053f4..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
@@ -45,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',
@@ -61,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' },
@@ -109,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 = []
@@ -132,6 +144,9 @@
customRow(record) {
return {
+ style: {
+ backgroundColor: this.currentClickedDocumentInfo.docId === record.docId ? '#BAE7FF' : 'transparent'
+ },
on: {
contextmenu: event => {
event.preventDefault()
@@ -169,11 +184,17 @@
},
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