From 95b6a6388e4cc4e6ed0f54cc04212a86cd8cf829 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期五, 23 五月 2025 13:37:09 +0800 Subject: [PATCH] 1、用户管理新增和编辑用户时设置工单为必填项 2、新增终端登录、首页、设备点检、故障上报、上下班打卡、停机原因维护页面(未与后端联调且客户未确定页面设计)并调整全局路由守卫相关逻辑 3、调整设备结构树设备层级和车间层级区分的判断条件 4、调整电子样板检索与部件借用弹窗列表与搜索区域样式 --- src/views/dnc/base/modules/ProductStructure/Permission/DepartPermissionTransfer.vue | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/views/dnc/base/modules/ProductStructure/Permission/DepartPermissionTransfer.vue b/src/views/dnc/base/modules/ProductStructure/Permission/DepartPermissionTransfer.vue index 58f406a..7b7ee3d 100644 --- a/src/views/dnc/base/modules/ProductStructure/Permission/DepartPermissionTransfer.vue +++ b/src/views/dnc/base/modules/ProductStructure/Permission/DepartPermissionTransfer.vue @@ -5,8 +5,8 @@ :data-source="dataSource" show-search :list-style="{flex:1,height: '500px'}" - :titles="['鏈垎閰嶉儴闂�', '宸插垎閰嶉儴闂�']" - :operations="['鍒嗛厤閮ㄩ棬', '绉婚櫎閮ㄩ棬']" + :titles="['鏈垎閰嶈溅闂�', '宸插垎閰嶈溅闂�']" + :operations="['鍒嗛厤杞﹂棿', '绉婚櫎杞﹂棿']" :target-keys="targetKeys" :render="item => `${item.title}`" @change="handleChange" @@ -75,7 +75,7 @@ searchValue: '', expandedKeys: [], autoExpandParent: true, - dataSource: transferDataSource + dataSource: [] } }, watch: { @@ -92,13 +92,15 @@ } }, methods: { - // 璋冪敤鎺ュ彛鑾峰彇鏈夋潈闄愮殑閮ㄩ棬鍒楄〃 + // 璋冪敤鎺ュ彛鑾峰彇鏈夋潈闄愮殑杞﹂棿鍒楄〃 getHasPermissionDepartByApi() { const that = this that.spinning = true - dncApi.getHasPermissionDepartApi(this.currentTreeNodeInfo) + that.targetKeys = [] + that.dataSource = [] + dncApi.getHasPermissionDepartApi(that.currentTreeNodeInfo) .then(res => { - if (res.success) this.targetKeys = res.list.map(item => item.id) + if (res.success) that.targetKeys = res.list.map(item => item.id) }) .finally(() => { that.spinning = false @@ -113,7 +115,7 @@ handleSearch(direction, value) { if (direction === 'left') { let search = value - let expandedKeys = transferDataSource + let expandedKeys = this.dataSource .map(item => { if (item.title != null) { if (item.title.indexOf(search) > -1) { @@ -222,9 +224,14 @@ flatten(list = []) { list.forEach(item => { - transferDataSource.push(item) - if (item.children) { - this.flatten(item.children) + const transformedItem = { + key: item.key, + title: item.title, + children: item.children + } + this.dataSource.push(transformedItem) + if (transformedItem.children) { + this.flatten(transformedItem.children) } }) } -- Gitblit v1.9.3