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/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 @@
</el-col>
<el-col :span="20" :xs="24">
<!-- 搜索 -->
- <el-form :model="queryParams" ref="queryFormRef" inline label-width="68px">
- <el-form-item label="姓名" prop="nickname">
+ <el-form :model="queryParams" ref="queryFormRef" inline label-width="0">
+ <el-form-item>
<el-input
v-model="queryParams.nickname"
placeholder="请输入姓名"
@@ -16,7 +16,7 @@
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="手机号码" prop="mobile">
+ <el-form-item>
<el-input
v-model="queryParams.mobile"
placeholder="请输入手机号码"
@@ -25,6 +25,12 @@
class="!w-240px"
/>
</el-form-item>
+ <el-form-item>
+ <el-radio-group v-model="queryParams.status" @change="handleQuery">
+ <el-radio :label="0"> 在职 </el-radio>
+ <el-radio :label="1"> 离职 </el-radio>
+ </el-radio-group>
+ </el-form-item>
<el-form-item>
<el-button @click="handleQuery" v-hasPermi="['basic:employee:search']">搜索</el-button>
<el-button @click="resetQuery" v-hasPermi="['basic:employee:reset']">重置</el-button>
@@ -44,12 +50,14 @@
<el-table-column label="用户姓名" prop="nickname" />
<el-table-column label="部门" key="deptName" prop="deptName" />
<el-table-column label="手机号码" prop="mobile" width="120" />
- <el-table-column label="状态" key="status">
+ <el-table-column label="状态" key="status" width="180">
<template #default="scope">
<el-switch
v-model="scope.row.status"
:active-value="0"
:inactive-value="1"
+ active-text="在职"
+ inactive-text="离职"
v-hasPermi="['basic:employee:update']"
@change="handleStatusChange(scope.row)"
/>
@@ -61,7 +69,7 @@
width="180"
:formatter="dateFormatter"
/>
- <el-table-column label="操作" width="260">
+ <el-table-column label="操作" width="200">
<template #default="scope">
<el-button
type="primary"
@@ -114,13 +122,14 @@ const { t } = useI18n() // 国际化
const loading = ref(true) // 列表的加载中
const total = ref(0) // 列表的总页数
const list = ref([]) // 列表的数
-const queryParams = reactive({
+const queryParams = ref({
pageNo: 1,
- pageSize: 10,
+ pageSize: 20,
username: undefined,
nickname: undefined,
mobile: undefined,
- deptId: undefined
+ deptId: undefined,
+ status: undefined
})
const queryFormRef = ref() // 搜索的表单
@@ -128,7 +137,7 @@ const queryFormRef = ref() // 搜索的表单
const getList = async () => {
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()
}
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 @@
>
<el-table-column type="selection" width="55" :selectable="(row) => row.state == 1" />
<el-table-column prop="signId" label="成交单号" min-width="150px" />
- <el-table-column prop="name" label="线索名称" min-width="200px" />
- <el-table-column prop="phone" label="联系方式" min-width="150px" />
+ <el-table-column prop="name" label="线索名称" min-width="150px" />
+ <el-table-column prop="phone" label="联系方式" min-width="120px" />
+ <el-table-column
+ v-if="appStore.getAppInfo?.instanceType == 1"
+ prop="area"
+ label="区域"
+ min-width="90"
+ />
<el-table-column prop="reason" label="售后原因" min-width="150px" />
<el-table-column prop="refundAmount" label="退款金额" min-width="90px" />
<el-table-column prop="percentageDeductAmount" label="提成扣款" min-width="90px" />
@@ -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 @@
<span v-else>{{ row[item.field] }}</span>
</template>
</el-table-column>
- <el-table-column label="操作" width="240px" fixed="right">
+ <el-table-column label="操作" width="170px" fixed="right">
<template #default="scope">
<el-button
type="primary"
diff --git a/src/views/Clue/Order/Comp/Reback.vue b/src/views/Clue/Order/Comp/Reback.vue
index 65107ae..cbc2026 100644
--- a/src/views/Clue/Order/Comp/Reback.vue
+++ b/src/views/Clue/Order/Comp/Reback.vue
@@ -136,7 +136,7 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="60" :selectable="(row) => row.state == 1" />
- <el-table-column prop="signId" label="成交单号" min-width="150px" />
+ <el-table-column prop="signId" label="成交单号" min-width="120px" />
<el-table-column prop="name" label="线索名称" width="120px" />
<el-table-column prop="phone" label="联系方式" width="120px" />companyProfit
<el-table-column prop="money" label="回款金额" min-width="120px">
@@ -188,7 +188,7 @@
<div v-else>{{ row.personProfit }}</div>
</template>
</el-table-column>
- <el-table-column prop="signPrice" label="成交价" min-width="90" />
+ <el-table-column prop="signPrice" label="成交价" min-width="120" />
<el-table-column prop="isPayoff" label="是否结清" min-width="90">
<template #default="{ row }">
<el-select v-if="row.edit" size="small" v-model="row.isPayoffValue">
@@ -253,11 +253,12 @@
:formatter="dateFormatter"
/>
<el-table-column prop="stateName" label="审核状态" fixed="right" min-width="90" />
- <el-table-column label="操作" width="220px" fixed="right">
+ <el-table-column label="操作" width="150px" fixed="right">
<template #default="{ row }">
<el-button
type="primary"
- style="padding: 0"
+ class="mr-10px"
+ style="padding: 0; margin-left: 0"
text
v-hasPermi="['clue:order:return-detail']"
@click="handleDetail(row)"
@@ -266,7 +267,8 @@
</el-button>
<el-button
type="primary"
- style="padding: 0"
+ class="mr-10px"
+ style="padding: 0; margin-left: 0"
text
v-if="row.state == 1 && currentUserId == row.applyUser"
v-hasPermi="['clue:order:return']"
@@ -276,7 +278,8 @@
</el-button>
<el-button
type="primary"
- style="padding: 0"
+ class="mr-10px"
+ style="padding: 0; margin-left: 0"
text
v-if="row.state == 1"
v-hasPermi="['clue:order:update-return-money']"
@@ -286,7 +289,8 @@
</el-button>
<el-button
type="primary"
- style="padding: 0"
+ class="mr-10px"
+ style="padding: 0; margin-left: 0"
text
v-if="row.state == 1"
v-hasPermi="['clue:order:return-audit']"
diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index 0c91a41..6986638 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -67,8 +67,8 @@
</el-row>
</el-skeleton>
</el-card>
- <div class="mt-10px flex">
- <el-card shadow="never" class="flex-1">
+ <div class="mt-10px flex" style="flex-wrap: wrap">
+ <el-card shadow="never" :class="mobile ? 'w-full mb-10px' : 'flex-1'">
<template #header>
<div class="flex justify-between">
<span>成交率</span>
@@ -80,7 +80,7 @@
</el-skeleton>
</el-skeleton>
</el-card>
- <el-card shadow="never" class="ml-10px">
+ <el-card shadow="never" :class="mobile ? 'flex-1' : 'ml-10px'">
<template #header>
<div class="flex justify-between items-center">
<span>跟进榜Top10</span>
@@ -107,7 +107,7 @@
</ul>
</el-skeleton>
</el-card>
- <el-card shadow="never" class="ml-10px">
+ <el-card shadow="never" :class="mobile ? 'flex-1 ml-10px' : 'ml-10px'">
<template #header>
<div class="flex justify-between"> 本月成交榜Top10 </div>
</template>
@@ -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)