From ee72d3e2d766293bab49564cd261b87284f1343e Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Fri, 16 Jan 2026 13:42:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E5=B2=97=E7=AE=A1=E7=90=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workLicense/jobTransferManagement.js | 10 +++
 src/views/workLicense/personnelEquipment.vue | 46 ++++++----
 src/views/workLicense/workLicense.vue        | 91 ++++++++++----------
 3 files changed, 88 insertions(+), 59 deletions(-)

diff --git a/src/api/workLicense/jobTransferManagement.js b/src/api/workLicense/jobTransferManagement.js
index c89ddee..a350d9e 100644
--- a/src/api/workLicense/jobTransferManagement.js
+++ b/src/api/workLicense/jobTransferManagement.js
@@ -95,3 +95,13 @@ export const layoffPlan = row => {
     params:row
   });
 };
+
+
+// 获取人员信息  /blade-desk/BA/TeamSet/getOneByUserId?userId=1297
+export const getOneByUserId = params => {
+  return request({
+    url: '/blade-desk/BA/TeamSet/getOneByUserId',
+    method: 'get',
+    params:params
+  });
+};
\ No newline at end of file
diff --git a/src/views/workLicense/personnelEquipment.vue b/src/views/workLicense/personnelEquipment.vue
index e0ad770..9ea9770 100644
--- a/src/views/workLicense/personnelEquipment.vue
+++ b/src/views/workLicense/personnelEquipment.vue
@@ -16,9 +16,10 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
-      :span-method="spanMethod"
+     
       :row-class-name="rowClassName"
     >
+     <!-- :span-method="spanMethod" -->
       <template #menu-left>
         <el-button type="danger" @click="handleDeletes">批量删除</el-button>
         <el-button type="primary" @click="handleMaintain">设备维护</el-button>
@@ -387,26 +388,41 @@ export default {
       if (this.selectionList.length == 0) {
         this.$message.error('请至少选择一条数据');
       } else {
-        let ids = [];
-        this.selectionList.forEach(item => {
-          ids.push(item.id);
-        });
-        remove({ ids: ids.join(',') }).then(res => {
-          this.$message.success('操作成功');
-          this.onLoad(this.page, this.query);
+       // 检查是否所有选中项都有 certificateTypeId
+        const invalidItem = this.selectionList.find(
+          item => !item.certificateTypeId || item.certificateTypeId === ''
+        );
+        if (invalidItem) {
+          this.$message.error('存在未分配设备的数据，无法删除');
+          return;
+        }
+        this.$confirm('确定删除数据吗?', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          let ids = [];
+
+          this.selectionList.forEach(item => {
+            ids.push(item.id);
+          });
+          remove(ids.join(',')).then(res => {
+            this.$message.success('操作成功');
+            this.onLoad(this.page, this.query);
+          });
         });
       }
     },
     // 维护设备
     handleMaintain() {
       if (this.selectionList.length > 0) {
-        let tmp = this.data.filter(item1 =>
-          this.selectionList.some(item2 => item2.name === item1.name)
-        );
-        let tmp1 = Array.from(new Set(tmp.map(item => item.equipmentId))).map(wlCode => {
-          return tmp.find(item => item.equipmentId === wlCode);
-        });
-        this.maintainList = tmp1;
+        // let tmp = this.data.filter(item1 =>
+        //   this.selectionList.some(item2 => item2.name === item1.name)
+        // );
+        // let tmp1 = Array.from(new Set(tmp.map(item => item.equipmentId))).map(wlCode => {
+        //   return tmp.find(item => item.equipmentId === wlCode);
+        // });
+        this.maintainList = this.selectionList;
       } else {
         this.maintainList = [];
       }
diff --git a/src/views/workLicense/workLicense.vue b/src/views/workLicense/workLicense.vue
index b1f7eeb..4c952ca 100644
--- a/src/views/workLicense/workLicense.vue
+++ b/src/views/workLicense/workLicense.vue
@@ -15,9 +15,10 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
-      :span-method="spanMethod"
+     
       :row-class-name="rowClassName"
     >
+     <!-- :span-method="spanMethod" -->
       <template #menu-left>
         <el-button type="danger" @click="handleDeletes">批量删除</el-button>
         <el-button type="primary" @click="handleMaintain">证书维护</el-button>
@@ -25,7 +26,9 @@
       <template #menu-right>
         <!-- <el-button type="primary" @click="handleImport">导 入</el-button> -->
       </template>
-      <template #menu="{ row }"> </template>
+      <template #menu="{ row }"> 
+        <!-- <el-button type="text" @click="handleDeletes(row)">删除</el-button> -->
+      </template>
 
       <template #heatTreat="scope"> </template>
     </avue-crud>
@@ -428,13 +431,13 @@ export default {
     // 证书维护
     handleMaintain() {
       if (this.selectionList.length > 0) {
-        let tmp = this.data.filter(item1 =>
-          this.selectionList.some(item2 => item2.name === item1.name)
-        );
-        let tmp1 = Array.from(new Set(tmp.map(item => item.certificateCode))).map(wlCode => {
-          return tmp.find(item => item.certificateCode === wlCode);
-        });
-        this.maintainList = tmp1;
+        // let tmp = this.data.filter(item1 =>
+        //   this.selectionList.some(item2 => item2.name === item1.name)
+        // );
+        // let tmp1 = Array.from(new Set(tmp.map(item => item.certificateCode))).map(wlCode => {
+        //   return tmp.find(item => item.certificateCode === wlCode);
+        // });
+        this.maintainList = this.selectionList;
       } else {
         this.maintainList = [];
       }
@@ -486,44 +489,44 @@ export default {
     },
     // 合并单元格
     spanMethod({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 0 || columnIndex === 1) {
-        // 只处理“姓名”列（prop: 'name' 对应第0列）
-        const rows = this.data;
-        const currentName = row.name;
-        let rowspan = 1;
-        let isTopRow = true;
+      // if (columnIndex === 0 || columnIndex === 1) {
+      //   // 只处理“姓名”列（prop: 'name' 对应第0列）
+      //   const rows = this.data;
+      //   const currentName = row.name;
+      //   let rowspan = 1;
+      //   let isTopRow = true;
 
-        // 向上查找是否是连续相同 name 的起始行
-        for (let i = rowIndex - 1; i >= 0; i--) {
-          if (rows[i].name === currentName) {
-            isTopRow = false;
-            break;
-          } else {
-            break;
-          }
-        }
+      //   // 向上查找是否是连续相同 name 的起始行
+      //   for (let i = rowIndex - 1; i >= 0; i--) {
+      //     if (rows[i].name === currentName) {
+      //       isTopRow = false;
+      //       break;
+      //     } else {
+      //       break;
+      //     }
+      //   }
 
-        // 如果不是顶部行，则隐藏（rowspan=0）
-        if (!isTopRow) {
-          return {
-            rowspan: 0,
-            colspan: 0,
-          };
-        }
-        // 向下统计相同 name 的行数
-        for (let i = rowIndex + 1; i < rows.length; i++) {
-          if (rows[i].name === currentName) {
-            rowspan++;
-          } else {
-            break;
-          }
-        }
+      //   // 如果不是顶部行，则隐藏（rowspan=0）
+      //   if (!isTopRow) {
+      //     return {
+      //       rowspan: 0,
+      //       colspan: 0,
+      //     };
+      //   }
+      //   // 向下统计相同 name 的行数
+      //   for (let i = rowIndex + 1; i < rows.length; i++) {
+      //     if (rows[i].name === currentName) {
+      //       rowspan++;
+      //     } else {
+      //       break;
+      //     }
+      //   }
 
-        return {
-          rowspan: rowspan,
-          colspan: 1,
-        };
-      }
+      //   return {
+      //     rowspan: rowspan,
+      //     colspan: 1,
+      //   };
+      // }
     },
 
     searchReset() {