From bc55e59f49229ffa77d2b32dd9fd0a9b6049b9b8 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 14 三月 2025 09:44:25 +0800
Subject: [PATCH] 1、设备类管理页面完成增删改查功能 2、产品结构树工序及工步层级引入设备类概念由系统参数配置决定是否展示，若设备类存在时则NC文档挂载在设备类下不存在时则按照对应工序或工步层级下 3、产品结构树工序及工步层级的刀具列表实现增删改查功能 4、新增设备类管理页面并完成布局 5、产品结构树接口调整，产品结构树节点实体信息通过点击后调取接口获取 6、产品结构树搜素输入框增加防抖机制，避免每次输入都重新计算消耗性能使页面卡顿 7、新增工序及工步层级的刀具列表并添加系统权限 8、用户管理页面移除新增用户时的密码校验 9、产品结构树各层级属性信息展示由每行3列调整为每行4列 10、产品结构树页面在工序和工步层级实现对设备类的增删改查功能
---
src/views/dnc/base/WorkUpcomingList.vue | 87 +++++++++++++------------------------------
1 files changed, 26 insertions(+), 61 deletions(-)
diff --git a/src/views/dnc/base/WorkUpcomingList.vue b/src/views/dnc/base/WorkUpcomingList.vue
index 23453c8..c034832 100644
--- a/src/views/dnc/base/WorkUpcomingList.vue
+++ b/src/views/dnc/base/WorkUpcomingList.vue
@@ -33,11 +33,15 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
<a-button type="primary" @click="searchQuery" icon="search">鍒锋柊</a-button>
-<!-- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>-->
+ <a-button @click="handleAdd" type="primary" icon="plus">鎵归噺瀹℃牳</a-button>
</div>
<!-- table鍖哄煙-begin -->
<div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
+ <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
+ </div>
<a-table
ref="table"
@@ -49,6 +53,7 @@
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
@@ -73,33 +78,17 @@
</template>
<span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)">缂栬緫</a>
+ <a @click="handleApproval(record)">瀹℃壒</a>
<a-divider type="vertical" />
- <a-dropdown>
- <a class="ant-dropdown-link">鏇村
- <a-icon type="down" />
- </a>
- <a-menu slot="overlay">
- <a-menu-item>
- <a @click="handleDetail(record)">璇︽儏</a>
- </a-menu-item>
- <a-menu-item>
- <a-popconfirm
- title="纭畾鍒犻櫎鍚�?"
- @confirm="() => handleDelete(record.id)"
- >
- <a>鍒犻櫎</a>
- </a-popconfirm>
- </a-menu-item>
- </a-menu>
- </a-dropdown>
+ <a @click="handleDetail(record)">璇︽儏</a>
</span>
</a-table>
</div>
- <AssignApproveUserModal ref="modalForm" @ok="modalFormOk"></AssignApproveUserModal>
+ <WorkUpcomingModal ref="modalForm" @ok="modalFormOk"></WorkUpcomingModal>
+ <WorkUpcomingApprovalModal ref="modalFormApproval" @ok="modalFormOk"></WorkUpcomingApprovalModal>
</a-card>
</template>
@@ -109,14 +98,15 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JDictSelectTag from '@comp/dict/JDictSelectTag.vue'
-import AssignApproveUserModal from './modules/AssignApproveUser/AssignApproveUserModal__Style#Drawer.vue'
-
+import WorkUpcomingModal from './modules/WorkUpcoming/WorkUpcomingModal__Style#Drawer.vue'
+import WorkUpcomingApprovalModal from './modules/WorkUpcoming/WorkUpcomingApprovalModal.vue'
export default {
name: 'AssignApproveUser',
mixins:[JeecgListMixin, mixinDevice],
components: {
JDictSelectTag,
- AssignApproveUserModal
+ WorkUpcomingModal,
+ WorkUpcomingApprovalModal
},
data () {
return {
@@ -134,58 +124,28 @@
}
},
{
- title: '浜у搧鍚嶇О',
+ title: '鏂囨。鍚嶇О',
align: "center",
- dataIndex: 'productName',
+ dataIndex: 'assignFileStream.docName',
width: 200,
},
{
title: '閮ㄤ欢鍚嶇О',
align: "center",
- dataIndex: 'componentName',
+ dataIndex: 'assignFileStream.deviceName',
width: 220,
- },
- {
- title: '闆朵欢鍚嶇О',
- align: "center",
- dataIndex: 'partsName',
- width: 250,
- },
- {
- title: '鏂囨。鍚嶇О',
- align: "center",
- dataIndex: 'docName',
- width: 250,
- },
- {
- title: '璁惧鍚嶇О',
- align: "center",
- dataIndex: 'deviceName',
- width: 250,
},
{
title: '鏂囨。鐗堟湰',
align: "center",
- dataIndex: 'version',
+ dataIndex: 'assignFileStream.version',
width: 250,
},
{
- title: '鐢宠浜�',
+ title: '瀵嗙骇',
align: "center",
- dataIndex: 'applyUser_dictText',
- width:300
- },
- {
- title: '鐢宠鍘熷洜',
- align: "center",
- dataIndex: 'applyReason',
- width:300
- },
- {
- title: '鐢宠鏃堕棿',
- align: "center",
- dataIndex: 'applyTime',
- width:300
+ dataIndex: 'assignFileStream.secretLevel',
+ width: 250,
},
{
title: '鎿嶄綔',
@@ -212,6 +172,11 @@
},
methods: {
initDictConfig(){
+ },
+ handleApproval(record){
+ this.$refs.modalFormApproval.edit(record);
+ this.$refs.modalFormApproval.title = "瀹℃壒";
+ this.$refs.modalFormApproval.disableSubmit = false;
}
}
}
--
Gitblit v1.9.3