feat: 🚀 修复bug

src/api/modules/foundationMaterial.ts

@@ -6,6 +6,9 @@ import http from "@/api";
 
 //物料分页列表
 export const getMaterialListApi = (params: any) => {
+    if (params.disabled && params.disabled === "启用") {
+        params.disabled = 0;
+    }
     return http.get<any>(`material`, params);
 };
 //刷新 /admapi/material/reload

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);
 };
 //订阅入库单刷新

src/hooks/useTable.ts

@@ -31,7 +31,7 @@ export const useTable = (
         }
     });
 
-    //数据处理
+    //訂閲数据处理
     const initSubscribeData = () => {
         if (routeName === "foundationSubscribeList") {
             if (Array.isArray(state.totalParam?.org_number) && state.totalParam?.org_number?.length) {
@@ -64,6 +64,13 @@ export const useTable = (
             }
         }
     };
+
+    // //其他數據處理
+    // 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"];
@@ -81,12 +88,14 @@ export const useTable = (
         if (!api) return;
 
         try {
-            initSubscribeData();
+            await initSubscribeData();
-            deleteParams();
+            await deleteParams();
+            // await initData();
             let params = {
                 ...state.totalParam,
                 ...pageParam.value
             };
+
             const { data } = await api(params);
             state.tableData = data.data || [];
             clearSelection && clearSelection();
@@ -136,6 +145,7 @@ export const useTable = (
             state.totalParam = {};
             // 同步到查询参数
             state.searchParam = { ...newVal };
+            console.log(state.searchParam, "=  state.searchParam=");
             // 同步到参数快照
             state.totalParam = { ...newVal, ...pageParam.value };
         },

src/views/foundation/set/material/constant/list/search.ts

@@ -34,6 +34,22 @@ export const FORM_DATA: FormItem[] = [
         placeholder: "请输入品线",
         type: "input",
         label: "品线: "
+    },
+    {
+        prop: "disabled",
+        placeholder: "请选择",
+        type: "select",
+        label: "物料状态: ",
+        options: [
+            {
+                value: 1,
+                label: "禁用"
+            },
+            {
+                value: "启用",
+                label: "启用"
+            }
+        ]
     }
 ];
 

src/views/foundation/set/material/constant/list/table.ts

@@ -1,3 +1,4 @@
+import { RenderScope } from "@/components/ProTable/interface";
 export const COLUMNS = [
     { type: "selection", fixed: "left", width: 40 },
     {
@@ -69,5 +70,24 @@ export const COLUMNS = [
         label: "SPU",
         prop: "spu",
         width: 200
+    },
+    {
+        align: "left",
+        label: "物料状态",
+        prop: "disabled",
+        width: 200,
+        render: (scope: RenderScope<any>): VNode | string | any => {
+            const OBJ: any = {
+                0: "启用",
+                1: "禁用"
+            };
+            return OBJ[scope.row.disabled];
+        }
+    },
+    {
+        align: "left",
+        label: "更新时间",
+        prop: "updated_at",
+        width: 200
     }
 ];

src/views/foundation/set/material/index.vue

@@ -66,7 +66,7 @@ const selectionChange = (selection: any) => {
 };
 const handleButtonClickCallback = (item: any) => {
     const { type } = item;
-    // dataStore.selectionList, proTableRef
+
     btnClick[type]({
         selectionList: dataStore.selectionList,
         proTableRef,

src/views/foundation/set/material/init/btnClick.ts

@@ -25,7 +25,7 @@ export const handleReload = async (params: any) => {
     const result = await getMaterialListReloadApi({ id });
     if (result?.code === 0) {
         useMsg("success", "数据刷新成功 ！");
-        proTable.value!.getTableList();
+        proTable?.value!.getTableList();
     }
 };
 

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",
+        prop: "warehouse_name",
-        placeholder: "请选择仓库",
+        placeholder: "请输入仓库",
-        type: "select",
+        type: "input",
-        label: "仓库: ",
+        label: "仓库: "
-        options: []
+        // options: []
     },
     {
         prop: "sub_warehouse_name",

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">

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,
+                    value: item.warehouse_name,
                     label: item.warehouse_name
                 });
             });