From 4c9e1ba3c7f5c95a1789e88823ff262c26a53bce Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期二, 08 七月 2025 20:34:32 +0800
Subject: [PATCH] 解决 生产加工煤种字段匹配

---
 src/views/procureMent/index.vue |   56 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/views/procureMent/index.vue b/src/views/procureMent/index.vue
index f692780..24929ac 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
@@ -73,9 +73,15 @@
   purchaseRegistration,
   getSupplyList,
   getCoalInfoList,
+  delPR
 } from "@/api/procureMent";
-
+import { useDelete } from "@/hooks/useDelete";
+const userStore = useUserStore();
 import useUserStore from "@/store/modules/user";
+let userList = ref([]);
+userStore.getUserList().then((res) => {
+  userList.value = res;
+});
 // 寮曞叆瀛楀吀鏁版嵁
 const { proxy } = getCurrentInstance();
 const dialogFormVisible = ref(false);
@@ -107,7 +113,7 @@
   // 杩欓噷娣诲姞瀹為檯鐨勬煡璇㈤�昏緫
   getList();
 };
-const userStore = useUserStore();
+
 // 鑾峰彇鐢ㄦ埛淇℃伅
 const userInfo = ref({});
 onMounted(async () => {
@@ -146,7 +152,13 @@
   { prop: "totalPriceIncludingTax", label: "鎬讳环锛堝惈绋庯級", minWidth: 100 },
   { prop: "taxRate", label: "绋庣巼", minWidth: 100 },
   { prop: "priceExcludingTax", label: "涓嶅惈绋庡崟浠�", minWidth: 100 },
-  { prop: "registrantId", label: "鐧昏浜�", minWidth: 100 },
+  { prop: "registrantId", label: "鐧昏浜�", minWidth: 100,
+    formatter: (row) => {
+      // 鍖归厤鐢ㄦ埛淇℃伅
+      const user = userList.value.find((user) => user.userId === row.registrantId);
+      return user ? user.nickName : "鏈煡鐢ㄦ埛";
+    },
+  },
   { prop: "registrationDate", label: "鐧昏鏃ユ湡", minWidth: 100 },
 ]);
 
@@ -194,6 +206,7 @@
     // 瑙﹀彂ref閲岄潰鐨勬柟娉�
     return;
   }
+  console.log(userInfo.value)
   // 鏂板缓鏃跺垵濮嬪寲琛ㄥ崟
   form.value = {
     supplierName: "",
@@ -205,7 +218,7 @@
     priceIncludingTax: "",
     totalPriceIncludingTax: "",
     taxRate: "",
-    registrantId: userInfo.value.userName,
+    registrantId: userInfo.value.userId,
     registrationDate: new Date().toISOString().split("T")[0],
   };
   // 鏂板缓鏃朵篃闇�瑕佽缃� copyForm 鐢ㄤ簬閲嶇疆鍔熻兘
@@ -238,28 +251,15 @@
   addOrEdit.value = "viewRow";
   handleAddEdit();
 };
-const handleDelete = () => {
-  if (selectedRows.value.length === 0) {
-    ElMessage.warning("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁");
-    return;
-  }
-  ElMessageBox.confirm(`纭畾鍒犻櫎閫変腑鐨勬暟鎹悧锛焋, "鎻愮ず", {
-    confirmButtonText: "纭畾",
-    cancelButtonText: "鍙栨秷",
-    type: "warning",
-  })
-    .then(() => {
-      // 妯℃嫙鍒犻櫎鎿嶄綔
-      tableData.value = tableData.value.filter(
-        (item) => !selectedRows.value.includes(item)
-      );
-      total.value = tableData.value.length;
-      ElMessage.success("鍒犻櫎鎴愬姛");
-    })
-    .catch(() => {
-      ElMessage.info("宸插彇娑堝垹闄�");
-    });
-};
+// 浣跨敤鍒犻櫎缁勫悎寮忓嚱鏁� - 绠�鍖栫増鏈�
+const { handleDeleteBatch: handleDelete } = useDelete({
+  deleteApi: delPR,
+  selectedRows,
+  tableData,
+  total,
+  confirmText: "纭畾鍒犻櫎閫変腑鐨勯噰璐褰曞悧锛�",
+  useLocalUpdate: true
+});
 const handleDeleteSuccess = (row) => {
   ElMessage.success("鍒犻櫎鎴愬姛锛�" + row.supplierName);
 };

--
Gitblit v1.9.3