From 54522f7ca2a54f22777b2627d706149e5690aeab Mon Sep 17 00:00:00 2001
From: yangchunlong <292345300@qq.com>
Date: Tue, 14 Oct 2025 16:30:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=9A=80=20=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/warehousing.ts                |  3 ++
 src/auto-import.d.ts                          |  1 +
 src/hooks/useTable.ts                         | 14 ++++----
 .../warehousing/constant/list/search.ts       | 14 +++++---
 .../subscribe/warehousing/index.vue           | 36 +++++++++++++++++++
 src/views/home/index.vue                      |  2 +-
 6 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/src/api/modules/warehousing.ts b/src/api/modules/warehousing.ts
index 1f60c7c..4783cdd 100644
--- a/src/api/modules/warehousing.ts
+++ b/src/api/modules/warehousing.ts
@@ -2,6 +2,9 @@ import http from "@/api";
 
 //订阅入庫單列表 /admapi/subscribe /admapi/subscribe/wrr
 export const getSubscribeWrrListApi = (params: any) => {
+    if (params?.notif_ret_status === "空") {
+        params.notif_ret_status = 0;
+    }
     return http.get<any>(`subscribe/wrr`, params);
 };
 //订阅入库单刷新
diff --git a/src/auto-import.d.ts b/src/auto-import.d.ts
index 5a0d57f..a259c49 100644
--- a/src/auto-import.d.ts
+++ b/src/auto-import.d.ts
@@ -6,6 +6,7 @@
 export {}
 declare global {
     const EffectScope: typeof import("vue")["EffectScope"];
+    const ElMessage: typeof import("element-plus/es")["ElMessage"];
     const ElMessageBox: typeof import("element-plus/es")["ElMessageBox"];
     const computed: typeof import("vue")["computed"];
     const createApp: typeof import("vue")["createApp"];
diff --git a/src/hooks/useTable.ts b/src/hooks/useTable.ts
index 35cb455..fc85d1c 100644
--- a/src/hooks/useTable.ts
+++ b/src/hooks/useTable.ts
@@ -65,12 +65,12 @@ export const useTable = (
         }
     };
 
-    //其他數據處理
-    const initData = () => {
-        if (state.totalParam?.warehouse_number) {
-            state.totalParam.warehouse_number = state.totalParam?.warehouse_number.split("_")[0];
-        }
-    };
+    // //其他數據處理
+    // const initData = () => {
+    //     if (state.totalParam?.warehouse_number) {
+    //         state.totalParam.warehouse_number = state.totalParam?.warehouse_number.split("_")[0];
+    //     }
+    // };
     //删除临时参数和空值参数
     const deleteParams = () => {
         const KEY = ["Time", "customer_number1", "customer_numbers"];
@@ -90,7 +90,7 @@ export const useTable = (
         try {
             await initSubscribeData();
             await deleteParams();
-            await initData();
+            // await initData();
             let params = {
                 ...state.totalParam,
                 ...pageParam.value
diff --git a/src/views/foundation/subscribe/warehousing/constant/list/search.ts b/src/views/foundation/subscribe/warehousing/constant/list/search.ts
index 81ad5a5..feeddd4 100644
--- a/src/views/foundation/subscribe/warehousing/constant/list/search.ts
+++ b/src/views/foundation/subscribe/warehousing/constant/list/search.ts
@@ -45,6 +45,10 @@ export const FORM_DATA: FormItem[] = [
                 value: 1,
                 label: "成功"
             },
+            {
+                value: "空",
+                label: "空"
+            },
             {
                 value: -1,
                 label: "失败"
@@ -65,11 +69,11 @@ export const FORM_DATA: FormItem[] = [
         options: []
     },
     {
-        prop: "warehouse_number",
-        placeholder: "请选择仓库",
-        type: "select",
-        label: "仓库: ",
-        options: []
+        prop: "warehouse_name",
+        placeholder: "请输入仓库",
+        type: "input",
+        label: "仓库: "
+        // options: []
     },
     {
         prop: "sub_warehouse_name",
diff --git a/src/views/foundation/subscribe/warehousing/index.vue b/src/views/foundation/subscribe/warehousing/index.vue
index ab9f246..4cf7ea0 100644
--- a/src/views/foundation/subscribe/warehousing/index.vue
+++ b/src/views/foundation/subscribe/warehousing/index.vue
@@ -23,6 +23,23 @@
                     :formData="dataStore.formData"
                 />
             </template>
+            <template #notif_ret_text="scope">
+                <div
+                    v-if="scope.row.notif_ret_text === '成功'"
+                    style="color: #4178d5; cursor: pointer"
+                    @click="handleClickSuccess(scope.row)"
+                >
+                    {{ scope.row.notif_ret_text }}
+                </div>
+                <div
+                    v-else-if="scope.row.notif_ret_text === '失败'"
+                    style="color: red; cursor: pointer"
+                    @click="handleClickError(scope.row)"
+                >
+                    {{ scope.row.notif_ret_text }}
+                </div>
+                <div v-else-if="!scope.row.notif_ret_text">--</div>
+            </template>
         </ProTable>
     </div>
 </template>
@@ -96,6 +113,25 @@ const handleReset = () => {
         proTable.value!.getTableList();
     });
 };
+const handleClickSuccess = (row: any) => {
+    Array.isArray;
+    ElMessageBox.alert(
+        `<div style='font-size:16px'>${
+            Array.isArray(row?.notif_user_names) && row?.notif_user_names.length ? row?.notif_user_names.join(",") : ""
+        }</div>`,
+        "接收人",
+        {
+            dangerouslyUseHTMLString: true,
+            showConfirmButton: false
+        }
+    );
+};
+const handleClickError = (row: any) => {
+    ElMessageBox.alert(`<div style='font-size:16px'>${row.fail_msg}</div>`, "失败原因", {
+        dangerouslyUseHTMLString: true,
+        showConfirmButton: false
+    });
+};
 </script>
 
 <style scope lang="scss">
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index caa1600..7586d02 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -39,7 +39,7 @@ const getWarehousesList = async () => {
             data.forEach((item: any) => {
                 options.push({
                     id: item.id,
-                    value: item.warehouse_number + "_" + item.id,
+                    value: item.warehouse_name,
                     label: item.warehouse_name
                 });
             });