diff --git a/src/views/auth/login/index.vue b/src/views/auth/login/index.vue
index 0242f5c..e781d8b 100644
--- a/src/views/auth/login/index.vue
+++ b/src/views/auth/login/index.vue
@@ -205,7 +205,7 @@
const isPassing = ref(false)
const isClickPass = ref(false)
const activeLoginType = ref<'password' | 'qrcode'>('qrcode')
- const isInFeishu = /Lark|Feishu/i.test(navigator.userAgent);
+ const isInFeishu = /Lark|Feishu/i.test(navigator.userAgent)
// const isInFeishu = true;
const systemName = AppConfig.systemInfo.name
const formRef = ref
()
@@ -214,7 +214,7 @@
const systemsid = ref('')
systemsid.value = useUserStore().systemsid
const iscompany = ref(false)
- const { companyabbr } = useUserStore()
+ const { companyabbr, systemsabbr } = useUserStore()
//获取公司 getCompanyList
const companyList = ref()
//系统
@@ -222,13 +222,12 @@
const feishuresponse = ref()
const formData = reactive({
account: '',
- systems: useUserStore().companyid ? Number(useUserStore().companyid) : '',
+ systems: useUserStore().systemsid ? Number(useUserStore().systemsid) : '',
company: useUserStore().companyid ? Number(useUserStore().companyid) : '',
username: '',
password: '',
rememberPassword: true
})
-
const rules = computed(() => ({
username: [{ required: true, message: t('login.placeholder[0]'), trigger: 'blur' }],
password: [{ required: true, message: t('login.placeholder[1]'), trigger: 'blur' }],
@@ -256,8 +255,8 @@
const getfeishuAppList = async () => {
feishuresponse.value = await UserService.getfeishuAppList({
- corp_id: companyid.value,
- system_id: systemsid.value
+ corp_id: useUserStore().companyid,
+ system_id: useUserStore().systemsid
})
if (activeLoginType.value == 'qrcode') {
feishulogin()
@@ -268,12 +267,11 @@
const systemsdata = systemsList.value.find((c: any) => c.id === systems)
systemsid.value = systems
userStore.setSystems(systems, systemsdata?.code)
- if (companyid.value && systemsid.value) {
+ if (useUserStore().companyid && systemsid.value) {
getfeishuAppList()
}
}
//切换公司
-
const changeCompany = (company: any) => {
// if (companyid.value === company) return
const companyt = companyList.value.find((c: any) => c.id === company)
@@ -284,7 +282,7 @@
getfeishuAppList()
}
}
- if (companyabbr != '') {
+ if (companyabbr != '' && systemsabbr != '') {
iscompany.value = true
getfeishuAppList()
}
@@ -443,20 +441,20 @@
const companyabbr = Array.isArray(route.query.corp_abbr)
? route.query.corp_abbr[0]
: route.query.corp_abbr
- const system_id = Array.isArray(route.query.system_id)
- ? route.query.system_id[0]
- : route.query.system_id
- const system_code = Array.isArray(route.query.system_code)
- ? route.query.system_code[0]
- : route.query.system_code
+ // const system_id = Array.isArray(route.query.system_id)
+ // ? route.query.system_id[0]
+ // : route.query.system_id
+ // const system_code = Array.isArray(route.query.system_code)
+ // ? route.query.system_code[0]
+ // : route.query.system_code
if (companyid) {
userStore.setCompany(companyid as string, (companyabbr as string) || '')
formData.company = Number(companyid)
}
- if (system_id) {
- userStore.setSystems(companyid as string, (system_code as string) || '')
- formData.systems = Number(system_id)
- }
+ // if (system_id) {
+ // userStore.setSystems(companyid as string, (system_code as string) || '')
+ // formData.systems = Number(system_id)
+ // }
// 只有两个 id 都有值时才调用
if (companyid && systemsid.value) {
getfeishuAppList()
diff --git a/src/views/crmpc/customer/index.vue b/src/views/crmpc/customer/index.vue
index 38079af..6ae076c 100644
--- a/src/views/crmpc/customer/index.vue
+++ b/src/views/crmpc/customer/index.vue
@@ -84,6 +84,8 @@
+
+
@@ -92,6 +94,7 @@
+
+
+
+
@@ -67,7 +70,7 @@
const loading = ref(false)
const pagination = reactive({
currentPage: 1,
- pageSize: 20,
+ pageSize: 10,
total: 0
})
const remindRange = ref('')
diff --git a/src/views/crmpc/home/widget/CardList.vue b/src/views/crmpc/home/widget/CardList.vue
index c645bd2..782cbe1 100644
--- a/src/views/crmpc/home/widget/CardList.vue
+++ b/src/views/crmpc/home/widget/CardList.vue
@@ -343,8 +343,12 @@