diff --git a/.env.production b/.env.production index f0c633d..569758a 100644 --- a/.env.production +++ b/.env.production @@ -1,10 +1,10 @@ ENV = 'production' VITE_APP_API_VERSION = "" #版本号 -VITE_APP_API_BASEURL = https://newwms.api.f2b211.com/ #请求地址 +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 diff --git a/src/api/modules/warehousing.ts b/src/api/modules/warehousing.ts index 4783cdd..295cbb1 100644 --- a/src/api/modules/warehousing.ts +++ b/src/api/modules/warehousing.ts @@ -12,5 +12,8 @@ export const getSubscribeResetListApi = (params: any) => { return http.get(`subscribe/wrr/reload`, params); }; export const getSubscribeResetListExportApi = (params: any) => { + if (params?.notif_ret_status === "空") { + params.notif_ret_status = 0; + } return http.get(`subscribe/wrr/export`, params); }; diff --git a/src/components/ProTable/index.vue b/src/components/ProTable/index.vue index d5ddcf7..4078c1c 100644 --- a/src/components/ProTable/index.vue +++ b/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, diff --git a/src/stores/modules/auth.ts b/src/stores/modules/auth.ts index 6c4e972..6d9e08b 100644 --- a/src/stores/modules/auth.ts +++ b/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); diff --git a/src/views/foundation/set/material/init/btnClick.ts b/src/views/foundation/set/material/init/btnClick.ts index 83f2e10..d5d69d3 100644 --- a/src/views/foundation/set/material/init/btnClick.ts +++ b/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", "导出成功请前往导出列表中进行下载!"); } }; //刷新 diff --git a/src/views/foundation/subscribe/warehousing/constant/list/search.ts b/src/views/foundation/subscribe/warehousing/constant/list/search.ts index feeddd4..e7baa38 100644 --- a/src/views/foundation/subscribe/warehousing/constant/list/search.ts +++ b/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", diff --git a/src/views/foundation/subscribe/warehousing/init/btnClick.ts b/src/views/foundation/subscribe/warehousing/init/btnClick.ts index ee22a5d..8e3900a 100644 --- a/src/views/foundation/subscribe/warehousing/init/btnClick.ts +++ b/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