From 75d99a1160ca9bc5e13590b769b7b8f793b698ff Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 26 一月 2026 13:21:12 +0800
Subject: [PATCH] 库存管理和采购管理增加删除

---
 src/views/procureMent/index.vue         |   37 +++++++++++++-----
 src/views/warehouseManagement/index.vue |   48 ++++++++++++++++++++++-
 src/api/warehouseManagement/index.js    |   14 +++++++
 3 files changed, 85 insertions(+), 14 deletions(-)

diff --git a/src/api/warehouseManagement/index.js b/src/api/warehouseManagement/index.js
index 859f8e9..9de1965 100644
--- a/src/api/warehouseManagement/index.js
+++ b/src/api/warehouseManagement/index.js
@@ -9,6 +9,13 @@
         params: query
     })
 }
+export function batchDeletePendingInventoryByIds(ids) {
+    return request({
+        url: '/pendingInventory/delPending',
+        method: 'delete',
+        data: ids
+    })
+}
 // 鏌ヨ姝e紡鍏ュ簱绠$悊鍒楄〃
 export function officialInventoryList(query) {
     return request({
@@ -17,6 +24,13 @@
         params: query
     })
 }
+export function batchDeleteOfficialInventoryByIds(ids) {
+    return request({
+        url: '/officialInventory/delete',
+        method: 'delete',
+        data: ids
+    })
+}
 // All鐓よ川鏂规鏌ヨ
 export function coalPlanList(query) {
     return request({
diff --git a/src/views/procureMent/index.vue b/src/views/procureMent/index.vue
index 159c0fc..fa58789 100644
--- a/src/views/procureMent/index.vue
+++ b/src/views/procureMent/index.vue
@@ -20,9 +20,9 @@
         <el-button type="primary" :icon="Plus" @click="handleAdd"
           >鏂板缓
         </el-button>
-        <!-- <el-button type="danger" :icon="Delete" @click="handleDelete"
+        <el-button type="danger" :icon="Delete" @click="handleDelete"
           >鍒犻櫎
-        </el-button> -->
+        </el-button>
       </el-row>
       <!-- 琛ㄦ牸缁勪欢 -->
       <data-table
@@ -258,15 +258,30 @@
   addOrEdit.value = "viewRow";
   handleAddEdit();
 };
-// 浣跨敤鍒犻櫎缁勫悎寮忓嚱鏁� - 绠�鍖栫増鏈�
-const { handleDeleteBatch: handleDelete } = useDelete({
-  deleteApi: delPR,
-  selectedRows,
-  tableData,
-  total,
-  confirmText: "纭畾鍒犻櫎閫変腑鐨勯噰璐褰曞悧锛�",
-  useLocalUpdate: true
-});
+const handleDelete = () => {
+  if (selectedRows.value.length === 0) {
+    proxy.$modal.msgWarning("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁");
+    return;
+  }
+  proxy.$modal
+      .confirm("鏄惁瑕佸垹闄�" +`閫変腑鐨�${selectedRows.value.length}鏉℃暟鎹紵`)
+      .then((res) => {
+        if (res) {
+          delPR(selectedRows.value.map((row) => row.id)).then((res) => {
+            if (res.result.code === 200) {
+              proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+              getList();
+            } else {
+              proxy.$modal.msgError("鍒犻櫎澶辫触锛�" + res.result.msg);
+            }
+          }).finally(() => {
+            handleQuery()
+          })
+        }
+      })
+      .catch(() => {})
+}
+
 const handleDeleteSuccess = (row) => {
   ElMessage.success("鍒犻櫎鎴愬姛锛�" + row.supplierName);
 	handleQuery()
diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index 32946d7..27a9c11 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -41,7 +41,7 @@
       </el-tabs>
       <!-- 鎿嶄綔鎸夐挳鍖� -->
       <el-space>
-        <!--        <el-button type="danger" :icon="Delete">鍒犻櫎</el-button>-->
+        <el-button type="danger" :icon="Delete" @click="batchDelete(type)">鍒犻櫎</el-button>
         <!-- <el-button type="info" plain :icon="Download">瀵煎嚭</el-button>  -->
         <el-button
           type="success"
@@ -474,8 +474,11 @@
   coalPlanList,
   officialInventoryList,
   pendingInventoryList,
+  batchDeletePendingInventoryByIds,
+  batchDeleteOfficialInventoryByIds,
+  editOfficial,
+  merge
 } from "@/api/warehouseManagement/index.js";
-import { editOfficial, merge } from "../../api/warehouseManagement/index.js";
 import { getSupplyList } from "@/api/procureMent/index.js";
 import { getCoalInfoList } from "@/api/production/index.js";
 import { ElMessage } from "element-plus";
@@ -555,7 +558,8 @@
 // 鏍囩椤垫暟鎹�
 const tabs = reactive([
   { name: "pendingInbound", label: "寰呭叆搴�" },
-  { name: "officialInventory", label: "姝e紡搴撳瓨" },
+  { name: "officialInventory", label: "鐑熺叅搴撳瓨" },
+  { name: "officialInventory", label: "鍨嬬叅搴撳瓨" },
 ]);
 // 鏌ヨ鍙傛暟
 const queryParams = reactive({
@@ -739,6 +743,44 @@
     `${new Date().getTime()}${name}${new Date().toLocaleDateString("en-CA")}.xlsx`
   );
 };
+
+const batchDelete = () => {
+  if (selectedRows.value.length === 0) {
+    proxy.$modal.msgWarning("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁");
+    return;
+  }
+  proxy.$modal
+    .confirm("鏄惁瑕佸垹闄�" +`閫変腑鐨�${selectedRows.value.length}鏉℃暟鎹紵`)
+    .then((res) => {
+      if (res) {
+        deleteData();
+      }
+    })
+    .catch(() => {});
+};
+// 鍒犻櫎搴撳瓨鏁版嵁鏂规硶
+const deleteData = () => {
+  if (activeTab.value === "pendingInbound") {
+    batchDeletePendingInventoryByIds(selectedRows.value.map((row) => row.id)).then((res) => {
+      if (res.result.code === 200) {
+        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+        getList();
+      } else {
+        proxy.$modal.msgError("鍒犻櫎澶辫触锛�" + res.result.msg);
+      }
+    });
+  } else {
+    batchDeleteOfficialInventoryByIds(selectedRows.value.map((row) => row.id)).then((res) => {
+      if (res.result.code === 200) {
+        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+        getList();
+      } else {
+        proxy.$modal.msgError("鍒犻櫎澶辫触锛�" + res.result.msg);
+      }
+    })
+  }
+  handleQuery()
+};
 // 鍚堝苟搴撳瓨鏁版嵁鏂规硶
 const mergeRows = (type, row) => {
   getDropdownData();

--
Gitblit v1.9.3