yangchunlong/new_wms_admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 🧩 修改bug

Browse Source
This commit is contained in:
yangchunlong
2025-10-10 11:28:56 +08:00
parent 2837efee97
commit efee846973
9 changed files with 64 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@@ -1,4 +1,4 @@
ENV = 'test'
ENV = 'dev'
VITE_APP_API_VERSION =""
VITE_APP_API_BASEURL = https://dev.wms.api.v2.f2b211.com/v1/admapi/
VITE_APP_SSO_LOGINURL = http://dev.uc.v3.f2b211.com/uc/login # http://dev.uc.f2b211.com/index.php/uc/user/login.html
@@ -8,7 +8,7 @@ VITE_REDIRECT_URL =http://localhost:8080/login #单点从定向地址
VITE_SINGLE_URL = https://dev.uc.v3.f2b211.com/ #测试环境单点登录通知
# 测试环境
VITE_USER_NODE_ENV = test
VITE_USER_NODE_ENV = development
# 公共基础路径
VITE_PUBLIC_PATH = /

29
src/components/DetailsSearch/index.vue
View File

@@ -113,6 +113,7 @@
v-model="_searchResult[`${item.prop}`]"
multiple
filterable
:reserve-keyword="false"
@remove-tag="handleRomoveTag(item)"
:disabled="item.disabled"
:placeholder="item.placeholder"
@@ -129,15 +130,16 @@
<template
v-if="item.type === 'selectMultipleRemoteCustomersNames' || item.type === 'selectProductLinesRemote'"
>
<!-- // filterable -->
<el-select
v-model="_searchResult[`${item.prop}`]"
:placeholder="item.placeholder"
remote
multiple
filterable
multiple
:reserve-keyword="false"
@remove-tag="handleTagRemove1(item)"
class="m-2 select"
remote-show-suffix
@clear="handleSelectClear(item.prop)"
:remote-method="(query:any)=> handleSelectMultipleRemote(query, item)"
:disabled="item.disabled"
>
@@ -169,6 +171,7 @@ const props = defineProps<{
inline?: Boolean;
getSearchValue?: () => void;
selectMultipleRemoveTag?: () => void;
selectMultipleRemoteTag1?: () => void;
setRuleFormValue?: () => void;
}>();
@@ -181,12 +184,17 @@ const emits = defineEmits<{
(e: "setMaterialList", result: Record<string, any>): void;
(e: "setRuleFormValue", result: Record<string, any>): void;
(e: "selectMultipleRemoveTag", result: Record<string, any>): void;
(e: "selectMultipleRemoteTag1", result: Record<string, any>): void;
}>();
const handleRomoveTag = (item: any) => {
emits("selectMultipleRemoveTag", { item, org_number: _searchResult.value.org_number });
};
const handleTagRemove1 = (item: any) => {
if (!_searchResult.value[item.prop].length) {
item.options = [];
}
};
//客戶
const getCustomers = async (keywords: any, item: any) => {
let org_number = _searchResult.value.org_number.join(",");
@@ -202,6 +210,8 @@ const getCustomers = async (keywords: any, item: any) => {
});
});
item.options = options;
} else {
item.options = [];
}
}
};
@@ -220,6 +230,8 @@ const getProductLines = async (keywords: any, item: any) => {
});
});
item.options = options;
} else {
item.options = [];
}
}
};
@@ -234,10 +246,12 @@ const getUsers = async (keywords: any, item: any) => {
data.forEach((item: any) => {
options.push({
value: item.dduid,
label: item.realname
label: item.realname + " " + item.mobile
});
});
item.options = options;
} else {
item.options = [];
}
}
};
@@ -247,6 +261,7 @@ const handleSelectMultipleRemote = (query: any, item: any) => {
if (!query) {
return;
}
item.options = [];
let valClone = query.replace(/^\s*|\s*$/g, "");
if (!valClone) {
return;
@@ -271,9 +286,7 @@ const remoteMethod = async (query: any, item: any) => {
getUsers(valClone, item);
}
};
const handleSelectClear = (prop: any) => {
console.log("会触发吗?", prop);
};
//input输入验证
const valueVerify = (item: any) => {
//只能输入整数

3
src/components/SearchForm/index.vue
View File

@@ -94,6 +94,7 @@
remote
multiple
filterable
:reserve-keyword="false"
@clear="handleClear(item)"
:loading="loading"
class="m-2 select"
@@ -127,6 +128,7 @@
:disabled="item.disabled"
:placeholder="item.placeholder"
class="m-2 select"
:reserve-keyword="false"
style="width: 224px"
>
<!-- 循环渲染选项：label 为显示文本，value 为实际提交值 -->
@@ -145,6 +147,7 @@
v-model="_searchParams[`${item.prop}`]"
filterable
clearable
:reserve-keyword="false"
:disabled="item.disabled"
:placeholder="item.placeholder"
class="m-2 select"

9
src/layouts/components/Header/components/Avatar.vue
View File

@@ -2,7 +2,7 @@
<!-- 公司名 -->
<div class="name-box font12" style="padding-top: 2px">
<span style="margin-right: 10px; margin-left: 10px">
{{ userStore.userInfo.corp.corp_name ? userStore.userInfo.corp.corp_name : "" }}
{{ userStore?.userInfo?.corp?.corp_name ? userStore?.userInfo?.corp?.corp_name : "" }}
</span>
</div>
@@ -10,7 +10,7 @@
<div class="name-box font12">
<el-dropdown trigger="click" class="triangle-box">
<div>
{{ userStore.userInfo.nickname }}
{{ userStore?.userInfo?.nickname }}
<el-icon class="triangle">
<i-ep-arrow-down />
</el-icon>
@@ -41,15 +41,12 @@ const logout = () => {
cancelButtonText: "取消",
type: "warning"
}).then(async () => {
//1.退出登录
const result: any = await logoutApi();
if (result?.code === 0) {
location.href = usePathUrl();
setTimeout(() => {
userStore.$reset();
//清除本地
localStorage.clear();
}, 300);
location.href = usePathUrl();
}
});
};

7
src/views/foundation/subscribe/list/add.vue
View File

@@ -44,6 +44,13 @@ const userStore = useUserStore();
const $route = useRoute();
dataStore.formData[0].options = userStore.orgIdArr;
const init = () => {
//$route.query.title === "新增订阅" ? org_number: ["101"],
if ($route.query.title === "新增订阅") {
dataStore.ruleForm.org_number = ["101"];
}
};
init();
//新增
const handleAdd = () => {
if (

11
src/views/foundation/subscribe/list/constant/add/serach.ts
View File

@@ -1,17 +1,18 @@
export const FORM_DATA: any[] = [
{
prop: "org_number",
placeholder: "",
placeholder: "请输入",
type: "selectMultiple",
label: "组织：",
disabled: false,
required: true,
class: "form-item1",
options: []
},
{
prop: "customer_number",
placeholder: "",
placeholder: "请输入",
type: "selectMultipleRemoteCustomersNames",
label: "客户名称：",
disabled: false,
@@ -21,7 +22,7 @@ export const FORM_DATA: any[] = [
},
{
prop: "customer_number",
placeholder: "",
placeholder: "请输入",
type: "input",
label: "客户编码：",
disabled: true,
@@ -30,7 +31,7 @@ export const FORM_DATA: any[] = [
},
{
prop: "product_lines",
placeholder: "",
placeholder: "请输入",
type: "selectProductLinesRemote",
label: "品线：",
disabled: false,
@@ -40,7 +41,7 @@ export const FORM_DATA: any[] = [
},
{
prop: "subscriber_dduid",
placeholder: "",
placeholder: "请输入",
type: "selectRemoteUser",
label: "订阅账号：",
disabled: false,

15
src/views/foundation/subscribe/list/constant/list/table.ts
View File

@@ -3,19 +3,20 @@ export const COLUMNS = [
{
align: "left",
label: "订阅账号",
prop: "subscriber_name"
},
{
align: "left",
fixed: true,
label: "客户名称",
prop: "customer_name"
prop: "subscriber_name",
fixed: true
},
{
align: "left",
label: "组织",
prop: "org_name"
},
{
align: "left",
label: "客户名称",
prop: "customer_name"
},
{
align: "left",
label: "客户编码",

2
src/views/foundation/subscribe/list/init/setDetailsData.ts
View File

@@ -43,7 +43,7 @@ export const setDetailsData = (dataStore: any, data: any) => {
dataStore.formData[4].options = [
{
value: data?.subscriber_dduid,
label: data?.subscriber_name
label: data?.subscriber_mobile ? data?.subscriber_name + " " + data?.subscriber_mobile : data?.subscriber_name
}
];
dataStore.ruleForm.subscriber_dduid = data?.subscriber_dduid;

28
src/views/login/index.vue
View File

@@ -5,37 +5,31 @@
//useRouter
import { useRoute, useRouter } from "vue-router";
// import { useMsg } from "@/hooks/useMsg";
//重定向
import { usePathUrl } from "@/hooks/usePathUrl";
//登录请求接口
import { loginApi } from "@/api/modules/login";
//用户信息存储
import { useUserStore } from "@/stores/modules/user";
//重定向
import { usePathUrl } from "@/hooks/usePathUrl";
const userStore = useUserStore();
// 路由
//路由;
const $route = useRoute();
const $router = useRouter();
// 设置用户数据
const setUserData = (data: any) => {
// 设置token
userStore.setToken(data.access_token);
// 设置用户信息
userStore.setUserInfo(data.user_data);
//设置好了token和用户信息跳转到首页
setTimeout(() => {
$router.push({ path: "/" });
}, 500);
};
// 登录
const loginHttp = async (code: any) => {
const result: Record<string, any> = await loginApi(code);
if (result.code === 0) {
setUserData(result.data);
userStore.setToken(result?.data?.access_token);
console.log(result?.data?.access_token, "=data.access_token=");
// 设置用户信息
userStore.setUserInfo(result?.data?.user_data);
//设置好了token和用户信息跳转到首页
setTimeout(() => {
$router.push({ path: "/" });
}, 500);
} else {
location.href = usePathUrl();
}