feat: 🚀 入库单列表增加客户名称搜索条件

.env.production

@@ -1,10 +1,10 @@
 ENV = 'production'
 VITE_APP_API_VERSION = "" #版本号
-VITE_APP_API_BASEURL =  https://opsscmapi.f2b211.com/api/ #请求地址
+VITE_APP_API_BASEURL =  https://newwms.api.f2b211.com/v1/admapi/ #请求地址
 VITE_APP_SSO_LOGINURL = https://uc.v3.f2b211.com/uc/login
-VITE_APP_SSO_APPID = 100664627590856707
+VITE_APP_SSO_APPID = 100664627590856709
 
-VITE_REDIRECT_URL = https://wms.v2.f2b211.com/login  #单点从定向地址
+VITE_REDIRECT_URL = https://newwms.f2b211.com/login  #单点从定向地址
 VITE_SINGLE_URL = https://uc.v3.f2b211.com/ #单点登录通知 
 # 线上环境
 VITE_USER_NODE_ENV = production

src/api/modules/warehousing.ts

@@ -12,5 +12,8 @@ export const getSubscribeResetListApi = (params: any) => {
     return http.get<any>(`subscribe/wrr/reload`, params);
 };
 export const getSubscribeResetListExportApi = (params: any) => {
+    if (params?.notif_ret_status === "空") {
+        params.notif_ret_status = 0;
+    }
     return http.get<any>(`subscribe/wrr/export`, params);
 };

src/components/ProTable/index.vue

@@ -147,7 +147,7 @@ const newValInitParams = toRef(props, "initParam");
 const { selectionChange, selectedList, selectedListIds, isSelected } = useSelection(props.rowKey);
 
 // 清空选中数据列表
-const clearSelection = () => tableRef.value!.clearSelection();
+const clearSelection = () => tableRef?.value!.clearSelection();
 // 表格操作 Hooks
 const { tableData, pageable, getTableList, handleSizeChange, handleCurrentChange } = useTable(
     routeName.value,

src/layouts/components/Header/components/Breadcrumb.vue

@@ -7,7 +7,7 @@
                         <!-- <el-icon v-show="item.meta.icon && globalStore.breadcrumbIcon" class="breadcrumb-icon">
                             <component :is="item.meta.icon"></component>
                         </el-icon> -->
-
+                        <!-- {{ breadcrumbList }} -->
                         <span class="breadcrumb-title">{{ item.meta.title }}</span>
                     </div>
                 </el-breadcrumb-item>
@@ -28,13 +28,22 @@ const route = useRoute();
 const router = useRouter();
 const authStore = useAuthStore();
 const globalStore = useGlobalStore();
-
+// const routeName: any = ref(router.currentRoute.value.name);
 const breadcrumbList = computed(() => {
     let breadcrumbData = authStore.breadcrumbListGet[route.matched[route.matched.length - 1].path] ?? [];
     // 🙅‍♀️不需要首页面包屑可删除以下判断
     if (breadcrumbData[0].path !== HOME_URL) {
         breadcrumbData = [{ path: HOME_URL, meta: { icon: "HomeFilled", title: "首页" } }, ...breadcrumbData];
     }
+    if (route.query.title === "新增订阅" || "编辑订阅") {
+        breadcrumbData.forEach((item: any) => {
+            if (item.name === "foundationSubscribeListAdd") {
+                item.meta.title = route.query.title;
+            }
+        });
+        console.log("");
+    }
+
     return breadcrumbData;
 });
 

src/layouts/components/Tabs/index.vue

@@ -55,6 +55,7 @@ watch(
     () => {
         if (route.meta.isFull) return;
         tabsMenuValue.value = route.fullPath;
+
         let title: any = route.query.title ? route.query.title : route.meta.title;
 
         const tabsParams = {

src/stores/interface/tabs.ts

@@ -10,4 +10,5 @@ export interface TabsMenuProps {
 /* TabsState */
 export interface TabsState {
     tabsMenuList: TabsMenuProps[];
+    isSubscribeAdd: Boolean;
 }

src/stores/modules/auth.ts

@@ -65,23 +65,26 @@ export const useAuthStore = defineStore({
         // 获取权限菜单列表并处理按钮权限
         async getAuthMenuList() {
             const { data } = await getAuthMenuListApi();
-            let dataClone = data;
+            let dataClone =
+                Array.isArray(data) && data.length
+                    ? data
+                    : [
+                          {
+                              path: "/index",
+                              name: "home",
+                              component: "/home/index",
+                              hidden: true,
+                              children: [],
+                              meta: {
+                                  icon: "",
+                                  title: "首页",
+                                  isKeepAlive: true
+                              }
+                          }
+                      ];
 
             // 如果没有路由数据，设置默认首页
-            this.authMenuList = dataClone || [
-                {
-                    path: "/index",
-                    name: "home",
-                    component: "/home/index",
-                    hidden: true,
-                    children: [],
-                    meta: {
-                        icon: "",
-                        title: "首页",
-                        isKeepAlive: true
-                    }
-                }
-            ];
+            this.authMenuList = dataClone;
 
             // 提取按钮权限
             this.buttonPermissions = extractButtonPermissions(this.authMenuList);
@@ -92,7 +95,6 @@ export const useAuthStore = defineStore({
         // 构建页面与按钮的映射关系
         buildPageButtonMap() {
             const pageButtonMap: PageButtonMap = {};
-
             // 递归处理路由，建立页面与按钮的关联
             const processRoutes = (routes: any[], parentPageName?: string) => {
                 routes.forEach((route: any) => {
@@ -102,7 +104,6 @@ export const useAuthStore = defineStore({
                         if (!pageButtonMap[route.name]) {
                             pageButtonMap[route.name] = [];
                         }
-
                         // 处理子节点中的按钮权限
                         if (route.children && route.children.length > 0) {
                             route.children.forEach((child: any) => {
@@ -123,7 +124,6 @@ export const useAuthStore = defineStore({
                     }
                 });
             };
-
             processRoutes(this.authMenuList);
             this.pageButtonMap = pageButtonMap;
         },

src/stores/modules/tabs.ts

@@ -6,6 +6,7 @@ import piniaPersistConfig from "@/config/piniaPersist";
 export const useTabsStore = defineStore({
     id: "wms-tabs",
     state: (): TabsState => ({
+        isSubscribeAdd: false,
         tabsMenuList: [
             {
                 icon: "", // 首页的icon，按实际路由meta.icon填写（如"Home"）
@@ -133,6 +134,10 @@ export const useTabsStore = defineStore({
             this.tabsMenuList.forEach(item => {
                 if (item.path == nowFullPath) item.title = title;
             });
+        },
+        async setSIsSubscribeAdd(is: any) {
+            console.log(is, "==========is========");
+            this.isSubscribeAdd = is;
         }
     },
     persist: piniaPersistConfig("wms-tabs")

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

@@ -6,7 +6,7 @@ export const handleExport = async (params: any) => {
     const { initParam } = params;
     const result = await getMaterialListExportApi(initParam);
     if (result?.code === 0) {
-        useMsg("success", "导出成功 ！");
+        useMsg("success", "导出成功请前往导出列表中进行下载！");
     }
 };
 //刷新

src/views/foundation/subscribe/list/add.vue

@@ -31,6 +31,8 @@ import { BUTTON } from "./constant/add/button";
 import { useUserStore } from "@/stores/modules/user";
 import { cloneDeep } from "lodash-es";
 import $Bus from "@/utils/mittBus";
+// import { useTabsStore } from "@/stores/modules/tabs";
+// const tabStore = useTabsStore();
 const dataStore = reactive({
     formData: cloneDeep(FORM_DATA),
     ruleForm: cloneDeep(RULE_FORM),
@@ -53,28 +55,37 @@ const init = () => {
 init();
 //新增
 const handleAdd = () => {
-    if (
-        dataStore.ruleForm?.customer_number?.length ||
-        dataStore.ruleForm?.org_number ||
-        dataStore.ruleForm?.product_lines ||
-        dataStore.ruleForm?.subscriber_dduid
-    ) {
-        ElMessageBox.confirm("当前数据未提交, 确认放弃新增数据?", "温馨提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-        })
-            .then(async () => {
-                dataStore.ruleForm = cloneDeep(RULE_FORM);
-                dataStore.ruleForm.org_number = ["101"];
-                dataStore.isAdd = true;
-                detailsRef?.value?.formElement?.resetFields();
+    if ($route.query.title === "编辑订阅") {
+        $router.replace({
+            path: "/foundation/subscribe/list/add",
+            query: {
+                title: "新增订阅"
+            }
+        });
+    }
+    if ($route.query.title === "新增订阅") {
+        if (
+            dataStore.ruleForm?.customer_number?.length ||
+            dataStore.ruleForm?.org_number ||
+            dataStore.ruleForm?.product_lines ||
+            dataStore.ruleForm?.subscriber_dduid
+        ) {
+            ElMessageBox.confirm("当前数据未提交, 确认放弃新增数据?", "温馨提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
             })
-            .catch(() => {});
+                .then(async () => {
+                    dataStore.ruleForm = cloneDeep(RULE_FORM);
+                    dataStore.ruleForm.org_number = ["101"];
+                    dataStore.isAdd = true;
+                    detailsRef?.value?.formElement?.resetFields();
+                })
+                .catch(() => {});
+        }
     }
 };
 const handleGoList = () => {
-    detailsRef?.value?.formElement?.resetFields();
     setTimeout(() => {
         $router.replace({ path: "/foundation/subscribe/list/index" });
         $Bus.emit("setResetList");
@@ -88,6 +99,8 @@ const getSubscribeAdd = async (params: any) => {
         useMsg("success", "新增成功 ！");
         dataStore.ruleForm = cloneDeep(RULE_FORM);
         dataStore.ruleForm.org_number = ["101"];
+        detailsRef?.value?.formElement?.resetFields();
+        handleGoList();
     }
 };
 //更新

src/views/foundation/subscribe/warehousing/constant/list/search.ts

@@ -81,7 +81,12 @@ export const FORM_DATA: FormItem[] = [
         type: "input",
         label: "子仓库: "
     },
-
+    {
+        prop: "customer_name",
+        placeholder: "请输入客户名称",
+        type: "input",
+        label: "客户名称: "
+    },
     {
         prop: "Time",
         type: "daterange",

src/views/foundation/subscribe/warehousing/init/btnClick.ts

@@ -9,7 +9,7 @@ export const handleExport = async (data: any) => {
         Array.isArray(params?.org_number) && params?.org_number?.length ? params.org_number.join(",") : params.org_number;
     const result = await getSubscribeResetListExportApi(params);
     if (result?.code === 0) {
-        useMsg("success", "导出成功 ！");
+        useMsg("success", "导出成功请前往导出列表中进行下载 ！");
     }
 };
 // proTable: any