From 9737ae6cbdf64098554dc99e743a52669adb8138 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 14 三月 2025 10:27:15 +0800
Subject: [PATCH] Revert "1、设备类管理页面完成增删改查功能"
---
src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue | 106 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 79 insertions(+), 27 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue b/src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue
index 97b73a0..37a06d1 100644
--- a/src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue
+++ b/src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue
@@ -2,24 +2,26 @@
<a-card class="tree_con" :loading="cardLoading" :bordered="false" @contextmenu.native="e=>e.preventDefault()">
<a-spin :spinning="loading">
<div style="display: flex;flex-direction: column;height: 100%">
- <div style="display: flex">
+ <div style="display: flex;justify-content: space-between">
<a-input placeholder="杈撳叆鍏抽敭瀛楄繘琛屾悳绱�" allowClear v-model="searchInput"
@change="handleSearchInputChange"/>
- <a-dropdown :trigger="['click']" placement="bottomCenter" style="margin: 0 8px">
- <a-menu slot="overlay">
- <a-menu-item key="1" @click="expandedKeys = allTreeKeys">灞曞紑鎵�鏈�</a-menu-item>
- <a-menu-item key="2" @click="expandedKeys = ['-1']">鍚堝苟鎵�鏈�</a-menu-item>
- <a-menu-item key="3" @click="getTreeDataByApi">鍒锋柊</a-menu-item>
- </a-menu>
- <a-button>
- <a-icon type="bars"/>
- </a-button>
- </a-dropdown>
- <a-button type="primary" v-has="'product_add'"
+ <a-tooltip title="鍒锋柊">
+ <a-button icon="reload" @click="getTreeDataByApi" style="width: 18%;margin-left: 8px"></a-button>
+ </a-tooltip>
+ <a-button type="primary" v-has="'product_add'" icon="plus" style="margin-left: 8px"
@click="$refs.productModalFormRef.triggerCorrespondingMethod({modalTitle:'娣诲姞浜у搧',methodName:'handleProductAdd'})">
- <a-icon type="plus"></a-icon>
- 浜у搧
+ 娣诲姞浜у搧
</a-button>
+ <!-- <a-dropdown :trigger="['click']" placement="bottomCenter" style="margin: 0 8px">-->
+ <!-- <a-menu slot="overlay">-->
+ <!-- <a-menu-item key="1" @click="expandedKeys = allTreeKeys">灞曞紑鎵�鏈�</a-menu-item>-->
+ <!-- <a-menu-item key="2" @click="expandedKeys = ['-1']">鍚堝苟鎵�鏈�</a-menu-item>-->
+ <!-- <a-menu-item key="3" @click="getTreeDataByApi">鍒锋柊</a-menu-item>-->
+ <!-- </a-menu>-->
+ <!-- <a-button>-->
+ <!-- <a-icon type="bars"/>-->
+ <!-- </a-button>-->
+ <!-- </a-dropdown>-->
</div>
<!--浜у搧缁撴瀯鏍�-->
@@ -27,9 +29,9 @@
<a-tree blockNode show-icon :expandedKeys.sync="expandedKeys"
:selectedKeys="selectedKeys" :treeData="treeDataSource" :autoExpandParent="autoExpandParent"
@select="handleTreeSelect" @expand="handleTreeExpand" @rightClick="handleTreeRightClick">
- <template slot="title" slot-scope="{ label, parentId, entity, key:treeKey,type}">
+ <template slot="title" slot-scope="{ label, parentId, key:treeKey,type}">
<ProductStructureTreeContextMenu ref="contextMenuRef"
- :treeParams="{label,treeKey,searchValue,type,entity}"/>
+ :treeParams="{label,treeKey,searchValue,type}"/>
</template>
<a-icon slot="switcherIcon" type="down"/>
@@ -73,10 +75,12 @@
import ProcessModal from './Process/ProcessModal'
import ProcessStepModal from './ProcessStep/ProcessStepModal'
import AssignPermissionModal from './Permission/AssignPermissionModal'
+import DeviceCustomTypeModal from '@views/dnc/base/modules/ProductStructure/DeviceCustomType/DeviceCustomTypeModal.vue'
export default {
name: 'ProductStructureTree',
components: {
+ DeviceCustomTypeModal,
AssignPermissionModal,
ProcessStepModal,
ProcessModal,
@@ -100,7 +104,6 @@
autoExpandParent: true,
checkStrictly: true,
allTreeKeys: [],
- currentSelected: {},
rightClickSelected: {},
url: {
delete: '/nc/product/delete'
@@ -115,10 +118,10 @@
getTreeDataByApi() {
this.loading = true
this.cardLoading = true
+ this.treeDataSource = []
dncApi.getProductStructureTreeApi()
.then(res => {
if (res.success) {
- console.log('res=================', res)
this.dataList = []
this.allTreeKeys = []
this.treeDataSource = res.result
@@ -140,22 +143,62 @@
* @param {node} node 鑺傜偣瀵硅薄
*/
handleTreeSelect(selectedKeys, { node }) {
+ const that = this
let record = node.dataRef
- this.currentSelected = Object.assign({}, record)
- // 鍚戝彸渚х埗绾х粍浠跺彂閫佸綋鍓嶉�変腑鏍戣妭鐐逛俊鎭�
- this.$bus.$emit('sendCurrentTreeNodeInfo', this.currentSelected)
+ const { id, type } = record
+ dncApi.getProductStructureTreeNodeEntityApi({ id, type })
+ .then(res => {
+ if (res.success) {
+ let currentSelectedNodeInfo
+ if (res.result.length > 0) {
+ currentSelectedNodeInfo = Object.assign({}, record, { entity: res.result[0] })
+ } else {
+ currentSelectedNodeInfo = {}
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: '鏆傛棤璇ヨ妭鐐硅缁嗕俊鎭�'
+ })
+ }
+ // 鍚戝彸渚х埗绾х粍浠跺彂閫佸綋鍓嶉�変腑鏍戣妭鐐逛俊鎭�
+ this.$bus.$emit('sendCurrentTreeNodeInfo', currentSelectedNodeInfo)
+ } else {
+ that.$notification.error({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
if (selectedKeys.length === 0) return
this.selectedKeys = selectedKeys
},
/**
* 鏍戣妭鐐瑰彸閿崟鍑昏妭鐐规椂瑙﹀彂
- * @param event 浜嬩欢瀵硅薄
* @param node 鑺傜偣瀵硅薄
*/
- handleTreeRightClick({ event, node }) {
+ handleTreeRightClick({ node }) {
+ const that = this
const record = node.dataRef
- this.rightClickSelected = Object.assign({}, record)
+ const { id, type } = record
+ dncApi.getProductStructureTreeNodeEntityApi({ id, type })
+ .then(res => {
+ if (res.success) {
+ if (res.result.length > 0) {
+ that.rightClickSelected = Object.assign({}, record, { entity: res.result[0] })
+ } else {
+ that.rightClickSelected = {}
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: '鏆傛棤璇ヨ妭鐐硅缁嗕俊鎭�'
+ })
+ }
+ } else {
+ that.$notification.error({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
},
// 鏍戣妭鐐瑰彸閿崟鍑昏彍鍗曚腑鍒犻櫎鎸夐挳鏃惰Е鍙�
@@ -216,8 +259,18 @@
this.autoExpandParent = false
},
- /* 杈撳叆鏌ヨ鍐呭鍙樺寲鏃惰Е鍙� */
+ // 杈撳叆鏌ヨ鍐呭鍙樺寲鏃惰Е鍙戯紙澧炲姞闃叉姈鏈哄埗锛�
handleSearchInputChange() {
+ const that = this
+ let timer
+ if (timer) clearTimeout(timer)
+ timer = setTimeout(function() {
+ that.searchAndExpandTreeNode() // 鍔犲皬鎷彿璋冪敤鍑芥暟
+ }, 1000)
+ },
+
+ // 闃叉姈鍑芥暟涓Е鍙戞悳绱㈠苟灞曞紑鏍戣妭鐐�
+ searchAndExpandTreeNode() {
let search = this.searchInput
let expandedKeys
let autoExpandParent
@@ -237,7 +290,6 @@
expandedKeys = this.beforeSearchExpandedKeys
autoExpandParent = false
}
-
Object.assign(this, {
expandedKeys,
searchValue: search,
@@ -292,7 +344,7 @@
* @param treeNode
*/
setTreeNodeIcon(treeNode) {
- switch (treeNode.type) {
+ switch (+treeNode.type) {
case 1:
treeNode.slots = { icon: 'product' }
break
--
Gitblit v1.9.3