From 83d04e73333b6446deef81c36f6b0764d1ef554a Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 20 Sep 2024 11:21:05 +0800
Subject: [PATCH 1/2] sc
---
.../ConfigGlobal/src/ConfigGlobal.vue | 4 ++--
src/views/Clue/Order/Comp/AfterSales.vue | 12 ++++++++++--
src/views/Clue/Order/Comp/OrderList.vue | 2 +-
src/views/Clue/Order/Comp/Reback.vue | 18 +++++++++++-------
src/views/Home/Index.vue | 11 +++++++----
5 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/src/components/ConfigGlobal/src/ConfigGlobal.vue b/src/components/ConfigGlobal/src/ConfigGlobal.vue
index 20ff035..429acc7 100644
--- a/src/components/ConfigGlobal/src/ConfigGlobal.vue
+++ b/src/components/ConfigGlobal/src/ConfigGlobal.vue
@@ -22,13 +22,13 @@ onMounted(() => {
appStore.setCssVarTheme()
})
-const { width } = useWindowSize()
+const { width, height } = useWindowSize()
// 监听窗口变化
watch(
() => width.value,
(width: number) => {
- if (width < 768) {
+ if (width < 768 || height.value < 450) {
!appStore.getMobile ? appStore.setMobile(true) : undefined
setCssVar('--left-menu-min-width', '0')
appStore.setCollapse(true)
diff --git a/src/views/Clue/Order/Comp/AfterSales.vue b/src/views/Clue/Order/Comp/AfterSales.vue
index d5ec55b..0d9d3b4 100644
--- a/src/views/Clue/Order/Comp/AfterSales.vue
+++ b/src/views/Clue/Order/Comp/AfterSales.vue
@@ -104,8 +104,14 @@
>
-
-
+
+
+
@@ -191,10 +197,12 @@ import DialogBatchAudit from './DialogBatchAudit.vue'
import { removeNullField } from '@/utils'
import { dateFormatter } from '@/utils/formatTime'
+import { useAppStore } from '@/store/modules/app'
const afterSaleAuditDialog = ref()
const userStore = useUserStore()
+const appStore = useAppStore()
const message = useMessage() // 消息弹窗
const currentUserId = userStore.getUser.id
diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue
index 1059b43..3c9e5c2 100644
--- a/src/views/Clue/Order/Comp/OrderList.vue
+++ b/src/views/Clue/Order/Comp/OrderList.vue
@@ -103,7 +103,7 @@
{{ row[item.field] }}
-
+
-
+
companyProfit
@@ -188,7 +188,7 @@
{{ row.personProfit }}
-
+
@@ -253,11 +253,12 @@
:formatter="dateFormatter"
/>
-
+
-
-
+
+
成交率
@@ -80,7 +80,7 @@
-
+
跟进榜Top10
@@ -107,7 +107,7 @@
-
+
本月成交榜Top10
@@ -142,12 +142,15 @@ import { useUserStore } from '@/store/modules/user'
import avatarImg from '@/assets/imgs/avatar.gif'
import { lineOptions } from './echarts-data'
import * as HomeApi from '@/api/home/index'
+import { useAppStore } from '@/store/modules/app'
const { t } = useI18n()
const userStore = useUserStore()
+const appStore = useAppStore()
const loading = ref(false)
const avatar = userStore.getUser.avatar ? userStore.getUser.avatar : avatarImg
const username = userStore.getUser.nickname
+const mobile = appStore.getMobile
const followDate = ref(1)
From 4daf01a21b8f2eb7f34420583f3e5124b2a56f8b Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 20 Sep 2024 11:48:53 +0800
Subject: [PATCH 2/2] sc
---
src/views/Basic/User/index.vue | 40 ++++++++++++++++++++++++----------
1 file changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/views/Basic/User/index.vue b/src/views/Basic/User/index.vue
index d448c63..ad1753a 100644
--- a/src/views/Basic/User/index.vue
+++ b/src/views/Basic/User/index.vue
@@ -6,8 +6,8 @@
-
-
+
+
-
+
+
+
+ 在职
+ 离职
+
+
搜索
重置
@@ -44,12 +50,14 @@
-
+
@@ -61,7 +69,7 @@
width="180"
:formatter="dateFormatter"
/>
-
+
{
loading.value = true
try {
- const data = await UserApi.getUserPage(queryParams)
+ const data = await UserApi.getUserPage(queryParams.value)
list.value = data.list
total.value = data.total
} finally {
@@ -138,19 +147,28 @@ const getList = async () => {
/** 搜索按钮操作 */
const handleQuery = () => {
- queryParams.pageNo = 1
+ queryParams.value.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields()
+ queryParams.value = {
+ pageNo: 1,
+ pageSize: 20,
+ username: undefined,
+ nickname: undefined,
+ mobile: undefined,
+ deptId: undefined,
+ status: undefined
+ }
handleQuery()
}
/** 处理部门被点击 */
const handleDeptNodeClick = async (row) => {
- queryParams.deptId = row.id
+ queryParams.value.deptId = row.id
await getList()
}