From 26bf11018b2b145942631421c7e634c5df91aea6 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 21 一月 2025 15:33:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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