From 746102d4bf481d6940f60d51453d0ac1d7c21549 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期一, 02 十一月 2026 14:15:36 +0800
Subject: [PATCH] fix(bpm/hrm): 修复流程发起人搜索、流程管理员默认超管;核算新增批量删除

---
 src/views/system/user/components/select-modal.vue |    9 +++-
 src/api/hrm/salary/calculation/index.ts           |    7 +++
 src/views/bpm/model/form/index.vue                |   13 ++++++
 src/views/hrm/salary/calculation/index.vue        |   38 +++++++++++++++++++
 4 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/src/api/hrm/salary/calculation/index.ts b/src/api/hrm/salary/calculation/index.ts
index d37208c..aaf500d 100644
--- a/src/api/hrm/salary/calculation/index.ts
+++ b/src/api/hrm/salary/calculation/index.ts
@@ -124,6 +124,13 @@
   return requestClient.delete(`/hrm/salary/calculation/delete?id=${id}`);
 }
 
+/** 鎵归噺鍒犻櫎钖叕鏍哥畻璁板綍锛堜笉闄愬埗鐘舵�侊紝鍕鹃�夊嵆鍒狅級 */
+export function deleteSalaryCalculationBatch(ids: number[]) {
+  return requestClient.delete<number>(
+    `/hrm/salary/calculation/delete-batch?ids=${ids.join(',')}`,
+  );
+}
+
 /** 瀵煎嚭钖叕鏍哥畻琛� */
 export function exportSalaryCalculation(params: any) {
   return requestClient.download('/hrm/salary/calculation/export-excel', { params });
diff --git a/src/views/bpm/model/form/index.vue b/src/views/bpm/model/form/index.vue
index 8ac2c8d..e76ccf9 100644
--- a/src/views/bpm/model/form/index.vue
+++ b/src/views/bpm/model/form/index.vue
@@ -188,7 +188,7 @@
   } else {
     // 鎯呭喌涓夛細鏂板鍦烘櫙
     formData.value.startUserType = 0; // 鍏ㄤ綋
-    formData.value.managerUserIds.push(userStore.userInfo?.id);
+    // 娴佺▼绠$悊鍛橀粯璁ゅ�肩◢鍚庤缃紙闇�瑕佸厛鍔犺浇鐢ㄦ埛鍒楄〃鎵嶈兘瀹氫綅瓒呯骇绠$悊鍛橈級
   }
 
   // 鑾峰彇琛ㄥ崟鍒楄〃
@@ -199,6 +199,17 @@
   // 鑾峰彇閮ㄩ棬鍒楄〃
   deptList.value = await getSimpleDeptList();
 
+  // 鏂板鍦烘櫙锛堟祦绋嬬鐞嗗憳杩樻病鍊兼椂锛夐粯璁ゅ彇瓒呯骇绠$悊鍛橈紙admin锛夛紝鑰屼笉鏄綋鍓嶇櫥褰曠敤鎴�
+  if (!formData.value.managerUserIds?.length) {
+    const adminUser = userList.value.find(
+      (user: SystemUserApi.User) => user.username === 'admin',
+    );
+    const defaultManagerId = adminUser?.id ?? userStore.userInfo?.id;
+    if (defaultManagerId) {
+      formData.value.managerUserIds = [defaultManagerId];
+    }
+  }
+
   // 鏈�缁堬紝璁剧疆 currentStep 鍒囨崲鍒扮涓�姝�
   currentStep.value = 0;
   // 浠ュ墠鏈厤缃洿澶氳缃殑娴佺▼
diff --git a/src/views/hrm/salary/calculation/index.vue b/src/views/hrm/salary/calculation/index.vue
index ae28b78..ac47e68 100644
--- a/src/views/hrm/salary/calculation/index.vue
+++ b/src/views/hrm/salary/calculation/index.vue
@@ -17,6 +17,7 @@
   calculateSalary,
   confirmSalary,
   deleteSalaryCalculation,
+  deleteSalaryCalculationBatch,
   exportSalaryCalculation,
   getSalaryCalculationPage,
   previewSalaryCalculation,
@@ -189,6 +190,37 @@
   const ids = records.map((r) => r.id!);
   await confirmSalary(ids);
   message.success('纭鎴愬姛');
+  handleRefresh();
+}
+
+/** 鎵归噺鍒犻櫎閫変腑鐨勬牳绠楄褰曪紙涓嶉檺鍒剁姸鎬侊紝鍕鹃�夊嵆鍒狅級 */
+async function handleBatchDelete() {
+  const records = gridApi.grid.getCheckboxRecords() as HrmSalaryCalculationApi.SalaryCalculation[];
+  if (records.length === 0) {
+    message.warning('璇烽�夋嫨瑕佸垹闄ょ殑鏍哥畻璁板綍');
+    return;
+  }
+  const ids = records.map((r) => r.id!).filter(Boolean);
+  if (ids.length === 0) {
+    message.warning('閫変腑鐨勮褰曠己灏� ID锛岃鍒锋柊鍚庨噸璇�');
+    return;
+  }
+  const confirmed = await new Promise<boolean>((resolve) => {
+    Modal.confirm({
+      title: '纭鎵归噺鍒犻櫎',
+      content: `纭畾鍒犻櫎閫変腑鐨� ${ids.length} 鏉℃牳绠楄褰曞悧锛熷垹闄ゅ悗闇�閲嶆柊鏍哥畻锛屼笖涓嶅彲鎭㈠銆俙,
+      okText: '纭畾鍒犻櫎',
+      okType: 'danger',
+      cancelText: '鍙栨秷',
+      onOk: () => resolve(true),
+      onCancel: () => resolve(false),
+    });
+  });
+  if (!confirmed) {
+    return;
+  }
+  const count = await deleteSalaryCalculationBatch(ids);
+  message.success(`宸插垹闄� ${count ?? ids.length} 鏉℃牳绠楄褰昤);
   handleRefresh();
 }
 
@@ -611,6 +643,12 @@
               onClick: handleBatchSave,
             },
             {
+              label: '鎵归噺鍒犻櫎',
+              danger: true,
+              auth: ['hrm:salary-calculation:delete'],
+              onClick: handleBatchDelete,
+            },
+            {
               label: '淇濆瓨淇敼',
               type: 'primary',
               auth: ['hrm:salary-calculation:calculate'],
diff --git a/src/views/system/user/components/select-modal.vue b/src/views/system/user/components/select-modal.vue
index 7553992..5e7f53c 100644
--- a/src/views/system/user/components/select-modal.vue
+++ b/src/views/system/user/components/select-modal.vue
@@ -193,7 +193,8 @@
       pageNo,
       pageSize,
       deptId: selectedDeptId.value,
-      username: leftListState.value.searchValue || undefined,
+      // 浼� keyword锛氬悗绔悓鏃舵寜銆岃处鍙枫�嶅拰銆屽鍚嶃�嶆ā绯婂尮閰嶏紙鍘熸潵鍙紶 username锛屼腑鏂囧鍚嶆悳涓嶅埌锛�
+      keyword: leftListState.value.searchValue?.trim() || undefined,
     });
 
     leftListState.value.dataSource = list;
@@ -310,8 +311,10 @@
 }
 
 // TODO   鍚庣鎺ュ彛鐩墠浠呮敮鎸�  username 妫�绱紝 绛涢�夋潯浠堕渶瑕佽窡鍚庣璇锋眰鍙傛暟淇濇寔涓�鑷淬��
-function filterOption(inputValue: string, option: any) {
-  return option.username.toLowerCase().includes(inputValue.toLowerCase());
+function filterOption(_inputValue: string, _option: any) {
+  // 鎼滅储鐢卞悗绔畬鎴愶紙keyword 鍚屾椂鍖归厤璐﹀彿涓庡鍚嶏級锛岃繖閲屾亽杩斿洖 true锛�
+  // 鍚﹀垯鍓嶇鍙細杩囨护褰撳墠椤� dataSource锛屽鑷存悳涓嶅埌鍏朵粬椤�/鍏朵粬鐢ㄦ埛鐨勮褰�
+  return true;
 }
 
 /** 澶勭悊閮ㄩ棬鏍戝睍寮�/鎶樺彔 */

--
Gitblit v1.9.3