sc

Reviewed-on: http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web/pulls/3

src/App.vue

@@ -2,19 +2,19 @@
 import { isDark } from '@/utils/is'
 import { useAppStore } from '@/store/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
 import routerSearch from '@/components/RouterSearch/index.vue'
+import cache from '@/plugins/cache'
 
 const { getPrefixCls } = useDesign()
 const prefixCls = getPrefixCls('app')
 const appStore = useAppStore()
 const currentSize = computed(() => appStore.getCurrentSize)
 const greyMode = computed(() => appStore.getGreyMode)
-const { wsCache } = useCache()
 
 // 根据浏览器当前主题设置系统主题色
 const setDefaultTheme = () => {
-  let isDarkTheme = wsCache.get(CACHE_KEY.IS_DARK)
+  let isDarkTheme = cache.local.get(CACHE_KEY.IS_DARK)
   if (isDarkTheme === null) {
     isDarkTheme = isDark()
   }

src/api/clue/extraFee.js

@@ -0,0 +1,30 @@
+import request from '@/config/axios'
+
+// 获得列表
+export const getExtraFeePage = (params) => {
+  return request.get({ url: '/admin-api/crm/extra-pay/page', params })
+}
+
+// 创建
+export const createExtraFee = (data) => {
+  return request.post({ url: '/admin-api/crm/extra-pay/create', data, isSubmitForm: true })
+}
+
+// 更新
+export const updateExtraFee = (data) => {
+  return request.put({ url: '/admin-api/crm/extra-pay/update', data })
+}
+
+// 删除
+export const deleteExtraFee = (id) => {
+  return request.delete({ url: `/admin-api/crm/extra-pay/delete?id=${id}` })
+}
+
+// 获得
+export const getExtraFee = (id) => {
+  return request.get({ url: `/admin-api/crm/extra-pay/get?id=${id}` })
+}
+
+export const getExtraFeeSimpleList = async () => {
+  return await request.get({ url: '/admin-api/crm/extra-pay/simple-list' })
+}

src/api/clue/index.js

@@ -6,8 +6,8 @@ export const getSimpleClueList = async () => {
 }
 
 // 查询列表
-export const getCluePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sch-clue/page', params })
+export const getCluePage = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sch-clue/page', data })
 }
 
 // 查询详情
@@ -58,3 +58,7 @@ export const getPublicClue = async (data) => {
 export const getFollowUserList = async (params) => {
   return await request.get({ url: '/admin-api/crm/sch-clue/get-follow-user', params })
 }
+
+export const batchUpdateFollowUser = async (data) => {
+  return await request.put({ url: '/admin-api/crm/sch-clue/batchUpdateFollowUser', data })
+}

src/api/clue/settle.js

@@ -24,3 +24,8 @@ export const getMallSettleDetail = async (id) => {
 export const batchSaveSettle = async (data) => {
   return await request.post({ url: '/admin-api/crm/sign-settlement/batch/save', data })
 }
+
+// 修改结算
+export const updateSettle = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-settlement/update/money', data })
+}

src/api/clue/sign.js

@@ -1,8 +1,8 @@
 import request from '@/config/axios'
 
 // 查询列表
-export const getSignPage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign/page', params })
+export const getSignPage = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign/page', data })
 }
 
 // 查询详情
@@ -29,3 +29,25 @@ export const signAddPay = async (data) => {
 export const getSignExtraPayList = async (params) => {
   return await request.get({ url: '/admin-api/crm/sign/extra-pay/get', params })
 }
+
+// 安装状态修改
+export const updateInstallStatus = (signIdList, installStatus) => {
+  const data = {
+    signIdList,
+    installStatus
+  }
+  return request.post({ url: '/admin-api/crm/sign/install-status/batchSave', data: data })
+}
+
+// 修改生产状态
+export const updateProduceStatus = (data) => {
+  return request.put({ url: '/admin-api/crm/sign-prodcut/update', data: data })
+}
+
+export const updateProduceSort = (data) => {
+  return request.post({ url: '/admin-api/crm/sign-prodcut/adjust/sort', data: data })
+}
+
+export const getSignProfit = (params) => {
+  return request.get({ url: '/admin-api/crm/sign/profit', params })
+}

src/api/home/reportChannel.js

@@ -0,0 +1,8 @@
+import request from '@/config/axios'
+export const getList = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sch-clue/clueQuality/report', data })
+}
+
+export const getPeriodList = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sch-clue/clueQuality/period/report', data })
+}

src/api/home/reportSignDetail.js

@@ -0,0 +1,8 @@
+import request from '@/config/axios'
+export const getInfo = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sch-clue/signData/report/one', data })
+}
+
+export const getList = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sch-clue/signData/report/two', data })
+}

src/api/home/reportSignRate.js

@@ -0,0 +1,4 @@
+import request from '@/config/axios'
+export const getList = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sch-clue/signRate/report', data })
+}

src/api/login/index.ts

@@ -71,3 +71,10 @@ export const getAppInfo = (instanceId: number) => {
     url: '/admin-api/system/serviceInstance/getInstanceInfo?instanceId=' + instanceId
   })
 }
+
+export const bindWx = (data: any) => {
+  return request.post({
+    url: '/admin-api/system/user/bind/wx',
+    data
+  })
+}

src/api/system/dept/index.ts

@@ -41,3 +41,13 @@ export const updateDept = async (params: DeptVO) => {
 export const deleteDept = async (id: number) => {
   return await request.delete({ url: '/admin-api/system/dept/delete?id=' + id })
 }
+
+// 获取部门业务指标
+export const getDeptTarget = async (deptId: number) => {
+  return await request.get({ url: '/admin-api/crm/dept-target/get', params: { deptId } })
+}
+
+// 更新部门业务指标
+export const updateDeptTarget = async (data: any) => {
+  return await request.put({ url: '/admin-api/crm/dept-target/save', data, isSubmitForm: true })
+}

src/api/system/dict/dict.data.ts

@@ -44,6 +44,11 @@ export const deleteDictData = (id: number) => {
 }
 
 // 导出字典类型数据
-export const exportDictData = (params) => {
+export const exportDictData = (params: any) => {
   return request.get({ url: '/admin-api/crm/dict-data/export', params })
 }
+
+// 获取通用字典数据
+export const getGeneralSysDictData = (dictType: string) => {
+  return request.get({ url: '/admin-api/system/dict-data/get-by-type', params: { dictType } })
+}

src/api/system/notify/message/index.ts

@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-import qs from 'qs'
 
 export interface NotifyMessageVO {
   id: number
@@ -16,35 +15,39 @@ export interface NotifyMessageVO {
 }
 
 // 查询站内信消息列表
-export const getNotifyMessagePage = async (params: PageParam) => {
+export const getNotifyMessagePage = async (params: any) => {
   return await request.get({ url: '/admin-api/system/notify-message/page', params })
 }
 
 // 获得我的站内信分页
-export const getMyNotifyMessagePage = async (params: PageParam) => {
+export const getMyNotifyMessagePage = async (params: any) => {
   return await request.get({ url: '/admin-api/system/notify-message/my-page', params })
 }
 
 // 批量标记已读
-export const updateNotifyMessageRead = async (ids) => {
+export const updateNotifyMessageRead = async (data: any) => {
   return await request.put({
-    url:
-      '/admin-api/system/notify-message/update-read?' +
-      qs.stringify({ ids: ids }, { indices: false })
+    url: '/admin-api/system/notify-message/update-read?',
+    data
   })
 }
 
 // 标记所有站内信为已读
-export const updateAllNotifyMessageRead = async () => {
-  return await request.put({ url: '/admin-api/system/notify-message/update-all-read' })
+export const updateAllNotifyMessageRead = async (data: any) => {
+  return await request.put({ url: '/admin-api/system/notify-message/update-all-read', data })
 }
 
 // 获取当前用户的最新站内信列表
-export const getUnreadNotifyMessageList = async () => {
-  return await request.get({ url: '/admin-api/system/notify-message/get-unread-list' })
+export const getUnreadNotifyMessageList = async (params: any) => {
+  return await request.get({ url: '/admin-api/system/notify-message/get-unread-list', params })
 }
 
 // 获得当前用户的未读站内信数量
-export const getUnreadNotifyMessageCount = async () => {
-  return await request.get({ url: '/admin-api/system/notify-message/get-unread-count' })
+export const getUnreadNotifyMessageCount = async (params: any) => {
+  return await request.get({ url: '/admin-api/system/notify-message/get-unread-count', params })
+}
+
+// 获取详情
+export const getNotifyMessageDetail = async (id: number) => {
+  return await request.get({ url: '/admin-api/system/notify-message/get', params: { id } })
 }

src/api/system/role/daliyReport.js

@@ -0,0 +1,25 @@
+import request from '@/config/axios'
+
+// 获取角色快报配置
+export const getRoleDaliyReport = async (roleId) => {
+  return await request.get({
+    url: '/admin-api/system/role-message-setting/get',
+    params: { roleId }
+  })
+}
+
+// 保存角色每日快报配置
+export const updateRoleDaliyReport = async (data) => {
+  return await request.post({
+    url: '/admin-api/system/role-message-setting/save',
+    data,
+    isSubmitForm: true
+  })
+}
+
+// 获取每日快报发送内容
+export const getDaliyReportContent = async () => {
+  return await request.get({
+    url: '/admin-api/system/message-item/list-all-simple'
+  })
+}

src/api/system/user/index.ts

@@ -79,3 +79,8 @@ export const getSimpleUserList = (): Promise<UserVO[]> => {
 export const getAllUserList = (): Promise<UserVO[]> => {
   return request.get({ url: '/admin-api/system/user/no/permission/list-all-simple' })
 }
+
+// 获取所有包括离职的用户
+export const getAllUserListWithHire = (): Promise<UserVO[]> => {
+  return request.get({ url: '/admin-api/system/user/no/permission/list-all' })
+}

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)

src/components/Dialog/src/Dialog.vue

@@ -67,6 +67,7 @@ const emit = defineEmits(['close'])
     destroy-on-close
     draggable
     lock-scroll
+    append-to-body
     v-bind="getBindValue"
     @close="emit('close')"
   >

src/components/SSTable/index.vue

@@ -1,7 +1,14 @@
 <template>
   <div>
     <div class="flex">
-      <el-table :data="tableObject.tableList" border style="flex: 1">
+      <el-table
+        :data="tableObject.tableList"
+        :row-key="rowkey"
+        :expand-row-keys="expandRowKeys"
+        border
+        style="flex: 1"
+        @selection-change="handleSelectionChange"
+      >
         <slot></slot>
       </el-table>
       <el-button
@@ -53,10 +60,12 @@ import { useRoute } from 'vue-router'
 
 const props = defineProps({
   tableObject: { type: Object, default: () => ({ tableList: [] }) },
-  tableColumns: { type: Array, default: () => [] }
+  tableColumns: { type: Array, default: () => [] },
+  rowkey: { type: String, default: 'id' },
+  expandRowKeys: { type: Array, default: () => [] }
 })
 
-const emit = defineEmits(['update:tableObject', 'getList', 'getCheckedColumns'])
+const emit = defineEmits(['update:tableObject', 'getList', 'getCheckedColumns', 'selection-change'])
 const route = useRoute()
 
 const pageNo = ref(props.tableObject?.pageNo || 1)
@@ -110,6 +119,10 @@ function onDragEnd() {
   emitColumns()
 }
 
+function handleSelectionChange(val) {
+  emit('selection-change', val)
+}
+
 // 勾选确认
 function confirm() {
   ClueCacheApi.setClueCache({

src/components/UploadFile/src/UploadFile.vue

@@ -47,7 +47,7 @@ const props = defineProps({
   // fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
   fileType: propTypes.array.def([]),
   accept: propTypes.string.def('*'),
-  fileSize: propTypes.number.def(5), // 大小限制(MB)
+  fileSize: propTypes.number.def(100), // 大小限制(MB)
   limit: propTypes.number.def(5), // 数量限制
   autoUpload: propTypes.bool.def(true), // 自动上传
   drag: propTypes.bool.def(false), // 拖拽上传

src/config/axios/service.ts

@@ -20,7 +20,6 @@ import {
 import errorCode from './errorCode'
 
 import { resetRouter } from '@/router'
-import { useCache } from '@/hooks/web/useCache'
 import cache from '@/plugins/cache'
 
 const { result_code, base_url, request_timeout } = config
@@ -206,6 +205,8 @@ service.interceptors.response.use(
       if (msg === '无效的刷新令牌') {
         // hard coding：忽略这个提示，直接登出
         console.log(msg)
+      } else if (code == 18888) {
+        return { data }
       } else {
         ElNotification.error({ title: msg })
         if (code == 403) {
@@ -213,11 +214,10 @@ service.interceptors.response.use(
             type: 'warning'
           }).then(() => {
             // 无访问权限，退出登录
-            const { wsCache } = useCache()
-            const tenantId = wsCache.get('TENANT_ID')
-            const appId = wsCache.get('App_ID')
+            const tenantId = cache.local.get('TENANT_ID')
+            const appId = cache.local.get('App_ID')
             resetRouter() // 重置静态路由表
-            wsCache.clear()
+            cache.local.clear()
             removeToken()
             window.location.href = `/crm/login?tenantId=${tenantId}&appId=${appId}`
           })
@@ -259,11 +259,10 @@ const handleAuthorized = () => {
       confirmButtonText: t('login.relogin'),
       type: 'warning'
     }).then(() => {
-      const { wsCache } = useCache()
-      const tenantId = wsCache.get('TENANT_ID')
-      const appId = wsCache.get('App_ID')
+      const tenantId = cache.local.get('TENANT_ID')
+      const appId = cache.local.get('App_ID')
       resetRouter() // 重置静态路由表
-      wsCache.clear()
+      cache.local.clear()
       removeToken()
       isRelogin.show = false
       // 干掉token后再走一次路由让它过router.beforeEach的校验

src/directives/permission/hasPermi.ts

@@ -1,14 +1,14 @@
 import type { App } from 'vue'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
+import cache from '@/plugins/cache'
 
 const { t } = useI18n() // 国际化
 
 export function hasPermi(app: App<Element>) {
   app.directive('hasPermi', (el, binding) => {
-    const { wsCache } = useCache()
     const { value } = binding
     const all_permission = '*:*:*'
-    const permissions = wsCache.get(CACHE_KEY.USER)?.permissions || []
+    const permissions = cache.local.get(CACHE_KEY.USER)?.permissions || []
 
     if (value && value instanceof Array && value.length > 0) {
       const permissionFlag = value

src/directives/permission/hasRole.ts

@@ -1,14 +1,14 @@
 import type { App } from 'vue'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
+import cache from '@/plugins/cache'
 
 const { t } = useI18n() // 国际化
 
 export function hasRole(app: App<Element>) {
   app.directive('hasRole', (el, binding) => {
-    const { wsCache } = useCache()
     const { value } = binding
     const super_admin = 'admin'
-    const roles = wsCache.get(CACHE_KEY.USER).roles
+    const roles = cache.local.get(CACHE_KEY.USER).roles
 
     if (value && value instanceof Array && value.length > 0) {
       const roleFlag = value

src/hooks/web/useCrudSchemas.ts

@@ -229,6 +229,7 @@ const filterFormSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): For
         value: defaultValue,
         ...schemaItem.form,
         field: schemaItem.field,
+        isRequired: schemaItem.isRequired,
         label: schemaItem.form?.label || schemaItem.label
       }
 

src/hooks/web/useMessage.ts

@@ -13,7 +13,12 @@ export const useMessage = () => {
     },
     // 成功消息
     success(content: string) {
-      ElMessage.success(content)
+      // ElMessage.success(content)
+      ElMessage({
+        message: content,
+        duration: 1500,
+        type: 'success'
+      })
     },
     // 警告消息
     warning(content: string) {

src/layout/components/Message/src/Message.vue

@@ -1,6 +1,9 @@
 <script lang="ts" name="Message" setup>
 import { formatDate } from '@/utils/formatTime'
 import * as NotifyMessageApi from '@/api/system/notify/message'
+import { useUserStore } from '@/store/modules/user'
+
+const userStore = useUserStore()
 
 const { push } = useRouter()
 const activeName = ref('notice')
@@ -9,16 +12,21 @@ const list = ref<any[]>([]) // 消息列表
 
 // 获得消息列表
 const getList = async () => {
-  list.value = await NotifyMessageApi.getUnreadNotifyMessageList()
+  const data = await NotifyMessageApi.getUnreadNotifyMessageList({
+    roleId: userStore.getUser?.currentRole
+  })
+  list.value = data.list
   // 强制设置 unreadCount 为 0，避免小红点因为轮询太慢，不消除
   unreadCount.value = 0
 }
 
 // 获得未读消息数
 const getUnreadCount = async () => {
-  NotifyMessageApi.getUnreadNotifyMessageCount().then((data) => {
+  NotifyMessageApi.getUnreadNotifyMessageCount({ roleId: userStore.getUser?.currentRole }).then(
+    (data) => {
       unreadCount.value = data
-  })
+    }
+  )
 }
 
 // 跳转我的站内信
@@ -34,9 +42,9 @@ onMounted(() => {
   // 首次加载小红点
   getUnreadCount()
   // 轮询刷新小红点
-  // msgInterval.value = setInterval(() => {
-  //   getUnreadCount()
-  // }, 1000 * 60 * 2)
+  msgInterval.value = setInterval(() => {
+    getUnreadCount()
+  }, 1000 * 60 * 2)
 })
 
 onUnmounted(() => {
@@ -56,10 +64,9 @@ onUnmounted(() => {
           <div class="message-list">
             <template v-for="item in list" :key="item.id">
               <div class="message-item">
-                <img alt="" class="message-icon" src="@/assets/imgs/avatar.gif" />
                 <div class="message-content">
                   <span class="message-title">
-                    {{ item.templateNickname }}：{{ item.templateContent }}
+                    {{ item.title }}
                   </span>
                   <span class="message-date">
                     {{ formatDate(item.createTime) }}
@@ -94,7 +101,7 @@ onUnmounted(() => {
   .message-item {
     display: flex;
     align-items: center;
-    padding: 20px 0;
+    padding: 5px 0;
     border-bottom: 1px solid var(--el-border-color-light);
 
     &:last-child {
@@ -113,6 +120,7 @@ onUnmounted(() => {
 
       .message-title {
         margin-bottom: 5px;
+        font-weight: bold;
       }
 
       .message-date {

src/layout/components/Setting/src/Setting.vue

@@ -2,8 +2,9 @@
 // import { ElMessage } from 'element-plus'
 // import { useClipboard, useCssVar } from '@vueuse/core'
 import { useCssVar } from '@vueuse/core'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
 import { useDesign } from '@/hooks/web/useDesign'
+import cache from '@/plugins/cache'
 
 import { setCssVar, trim } from '@/utils'
 import { colorIsDark, hexToRGB, lighten } from '@/utils/color'
@@ -195,10 +196,9 @@ watch(
 
 // 清空缓存
 const clear = () => {
-  const { wsCache } = useCache()
-  wsCache.delete(CACHE_KEY.LAYOUT)
-  wsCache.delete(CACHE_KEY.THEME)
-  wsCache.delete(CACHE_KEY.IS_DARK)
+  cache.local.delete(CACHE_KEY.LAYOUT)
+  cache.local.delete(CACHE_KEY.THEME)
+  cache.local.delete(CACHE_KEY.IS_DARK)
   window.location.reload()
 }
 </script>

src/layout/components/UserInfo/src/UserInfo.vue

@@ -1,19 +1,18 @@
 <script lang="ts" name="UserInfo" setup>
 import { ElMessageBox } from 'element-plus'
 
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
 import { useDesign } from '@/hooks/web/useDesign'
 import avatarImg from '@/assets/imgs/avatar.gif'
 import { useUserStore } from '@/store/modules/user'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { getTenantId, getAppId } from '@/utils/auth'
+import cache from '@/plugins/cache'
 
 import { Setting } from '@/layout/components/Setting'
 
 const { t } = useI18n()
 
-const { wsCache } = useCache()
-
 const { push, replace } = useRouter()
 
 const userStore = useUserStore()
@@ -24,7 +23,7 @@ const { getPrefixCls } = useDesign()
 
 const prefixCls = getPrefixCls('user-info')
 
-const user = wsCache.get(CACHE_KEY.USER)
+const user = cache.local.get(CACHE_KEY.USER)
 
 const avatar = user.user.avatar ? user.user.avatar : avatarImg
 

src/permission.js

@@ -1,6 +1,6 @@
 import router from './router'
 import { isRelogin } from '@/config/axios/service'
-import { getAccessToken } from '@/utils/auth'
+import { getAccessToken, removeToken } from '@/utils/auth'
 import { useTitle } from '@/hooks/web/useTitle'
 import { useNProgress } from '@/hooks/web/useNProgress'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
@@ -8,17 +8,35 @@ import { useDictStoreWithOut } from '@/store/modules/dict'
 import { useUserStoreWithOut } from '@/store/modules/user'
 import { usePermissionStoreWithOut } from '@/store/modules/permission'
 import { getTenantId, getAppId } from '@/utils/auth'
+import cache from '@/plugins/cache'
 
 const { start, done } = useNProgress()
 
 const { loadStart, loadDone } = usePageLoading()
 // 路由不重定向白名单
-const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/register', '/swagger']
+const whiteList = [
+  '/login',
+  '/mp-login',
+  '/nm-detail',
+  '/social-login',
+  '/auth-redirect',
+  '/bind',
+  '/register',
+  '/swagger'
+]
 
 // 路由加载前
 router.beforeEach(async (to, from, next) => {
   start()
   loadStart()
+  if (getAppId() && to.query?.appId && getAppId() != to.query?.appId) {
+    removeToken()
+    cache?.local?.delete('appInfo')
+    cache?.local?.delete('roleRouters')
+    cache?.local?.delete('user')
+    cache?.local?.delete('App_ID')
+    next(`/login?tenantId=${to.query?.tenantId}&appId=${to.query?.appId}`)
+  } else {
     if (getAccessToken()) {
       if (to.path === '/login') {
         next({ path: '/' })
@@ -27,7 +45,7 @@ router.beforeEach(async (to, from, next) => {
         const dictStore = useDictStoreWithOut()
         const userStore = useUserStoreWithOut()
         const permissionStore = usePermissionStoreWithOut()
-      if (!dictStore.getIsSetDict) {
+        if (!dictStore.getIsSetDict && to.path != '/nm-detail') {
           await dictStore.setDictMap()
         }
         if (!userStore.getIsSetUser) {
@@ -60,6 +78,7 @@ router.beforeEach(async (to, from, next) => {
         }
       }
     }
+  }
 })
 
 router.afterEach((to) => {

src/plugins/cache/index.js

@@ -26,7 +26,7 @@ const sessionCache = {
     let storage = storageStr ? JSON.parse(storageStr) : {}
     return storage[key]
   },
-  remove(key) {
+  delete(key) {
     if (!sessionStorage) {
       return null
     }
@@ -62,7 +62,7 @@ const localCache = {
     let storage = storageStr ? JSON.parse(storageStr) : {}
     return storage[key]
   },
-  remove(key) {
+  delete(key) {
     if (!localStorage) {
       return null
     }
@@ -73,6 +73,10 @@ const localCache = {
     let storage = storageStr ? JSON.parse(storageStr) : {}
     delete storage[key]
     localStorage.setItem(name, JSON.stringify(storage))
+  },
+  clear() {
+    let storage = {}
+    localStorage.setItem(name, JSON.stringify(storage))
   }
 }
 

src/router/modules/remaining.ts

@@ -106,7 +106,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
       }
     ]
   },
-
   // {
   //   path: '/dict',
   //   component: Layout,
@@ -134,7 +133,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
   //   path: '/Basic',
   //   component: Layout,
   //   name: 'Basic',
-  //   meta: {},
+  //   meta: { title: '菜单管理' },
   //   redirect: '/Basic/menu',
   //   children: [
   //     {
@@ -161,6 +160,16 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
+  {
+    path: '/mp-login',
+    component: () => import('@/views/Login/MPLogin.vue'),
+    name: 'MPLogin',
+    meta: {
+      hidden: true,
+      title: '用户绑定',
+      noTagsView: true
+    }
+  },
   {
     path: '/sso',
     component: () => import('@/views/Login/Login.vue'),
@@ -171,6 +180,16 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
+  {
+    path: '/nm-detail',
+    component: () => import('@/views/Profile/NotifyMessageDetail.vue'),
+    name: 'NMDetail',
+    meta: {
+      hidden: true,
+      title: '通知详情',
+      noTagsView: true
+    }
+  },
   {
     path: '/403',
     component: () => import('@/views/Error/403.vue'),

src/store/modules/app.ts

@@ -2,13 +2,12 @@ import { defineStore } from 'pinia'
 import { store } from '../index'
 import { setCssVar, humpToUnderline } from '@/utils'
 import { ElMessage } from 'element-plus'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
 import { ElementPlusSize } from '@/types/elementPlus'
 import { LayoutType } from '@/types/layout'
 import { ThemeTypes } from '@/types/theme'
 import { getAppInfo } from '@/api/login'
-
-const { wsCache } = useCache()
+import cache from '@/plugins/cache'
 
 interface AppState {
   breadcrumb: boolean
@@ -46,7 +45,7 @@ export const useAppStore = defineStore('app', {
       sizeMap: ['default', 'large', 'small'],
       mobile: false, // 是否是移动端
       title: import.meta.env.VITE_APP_TITLE, // 标题
-      appInfo: wsCache.get('appInfo'),
+      appInfo: cache.local.get('appInfo'),
       pageLoading: false, // 路由跳转loading
 
       breadcrumb: true, // 面包屑
@@ -64,12 +63,12 @@ export const useAppStore = defineStore('app', {
       fixedHeader: true, // 固定toolheader
       footer: false, // 显示页脚
       greyMode: false, // 是否开始灰色模式，用于特殊悼念日
-      fixedMenu: wsCache.get('fixedMenu') || false, // 是否固定菜单
+      fixedMenu: cache.local.get('fixedMenu') || false, // 是否固定菜单
 
-      layout: wsCache.get(CACHE_KEY.LAYOUT) || 'classic', // layout布局
-      isDark: wsCache.get(CACHE_KEY.IS_DARK) || false, // 是否是暗黑模式
-      currentSize: wsCache.get('default') || 'default', // 组件尺寸
-      theme: wsCache.get(CACHE_KEY.THEME) || {
+      layout: cache.local.get(CACHE_KEY.LAYOUT) || 'classic', // layout布局
+      isDark: cache.local.get(CACHE_KEY.IS_DARK) || false, // 是否是暗黑模式
+      currentSize: cache.local.get('default') || 'default', // 组件尺寸
+      theme: cache.local.get(CACHE_KEY.THEME) || {
         // 主题色
         elColorPrimary: '#409eff',
         // 左侧菜单边框颜色
@@ -225,7 +224,7 @@ export const useAppStore = defineStore('app', {
       this.greyMode = greyMode
     },
     setFixedMenu(fixedMenu: boolean) {
-      wsCache.set('fixedMenu', fixedMenu)
+      cache.local.set('fixedMenu', fixedMenu)
       this.fixedMenu = fixedMenu
     },
     setPageLoading(pageLoading: boolean) {
@@ -237,7 +236,7 @@ export const useAppStore = defineStore('app', {
         return
       }
       this.layout = layout
-      wsCache.set(CACHE_KEY.LAYOUT, this.layout)
+      cache.local.set(CACHE_KEY.LAYOUT, this.layout)
     },
     setTitle(title: string) {
       this.title = title
@@ -251,18 +250,18 @@ export const useAppStore = defineStore('app', {
         document.documentElement.classList.add('light')
         document.documentElement.classList.remove('dark')
       }
-      wsCache.set(CACHE_KEY.IS_DARK, this.isDark)
+      cache.local.set(CACHE_KEY.IS_DARK, this.isDark)
     },
     setCurrentSize(currentSize: ElementPlusSize) {
       this.currentSize = currentSize
-      wsCache.set('currentSize', this.currentSize)
+      cache.local.set('currentSize', this.currentSize)
     },
     setMobile(mobile: boolean) {
       this.mobile = mobile
     },
     setTheme(theme: ThemeTypes) {
       this.theme = Object.assign(this.theme, theme)
-      wsCache.set(CACHE_KEY.THEME, this.theme)
+      cache.local.set(CACHE_KEY.THEME, this.theme)
     },
     setCssVarTheme() {
       for (const key in this.theme) {
@@ -274,7 +273,7 @@ export const useAppStore = defineStore('app', {
     },
     async setAppInfo(appId: number) {
       const appInfo = await getAppInfo(appId)
-      wsCache.set('appInfo', appInfo)
+      cache.local.set('appInfo', appInfo)
       this.appInfo = appInfo
       return appInfo
     }

src/store/modules/dict.ts

@@ -2,8 +2,8 @@ import { defineStore } from 'pinia'
 import { store } from '../index'
 // @ts-ignore
 import { DictDataVO } from '@/api/system/dict/types'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-const { wsCache } = useCache('sessionStorage')
+import { CACHE_KEY } from '@/hooks/web/useCache'
+import cache from '@/plugins/cache'
 import { listSimpleDictData } from '@/api/system/dict/dict.data'
 
 export interface DictValueType {
@@ -28,7 +28,7 @@ export const useDictStore = defineStore('dict', {
   }),
   getters: {
     getDictMap(): Recordable {
-      const dictMap = wsCache.get(CACHE_KEY.DICT_CACHE)
+      const dictMap = cache.session.get(CACHE_KEY.DICT_CACHE)
       if (dictMap) {
         this.dictMap = dictMap
       }
@@ -40,7 +40,7 @@ export const useDictStore = defineStore('dict', {
   },
   actions: {
     async setDictMap() {
-      const dictMap = wsCache.get(CACHE_KEY.DICT_CACHE)
+      const dictMap = cache.session.get(CACHE_KEY.DICT_CACHE)
       if (dictMap) {
         this.dictMap = dictMap
         this.isSetDict = true
@@ -64,7 +64,7 @@ export const useDictStore = defineStore('dict', {
         })
         this.dictMap = dictDataMap
         this.isSetDict = true
-        wsCache.set(CACHE_KEY.DICT_CACHE, dictDataMap, { exp: 60 }) // 60 秒 过期
+        cache.session.set(CACHE_KEY.DICT_CACHE, dictDataMap) // 60 秒 过期
       }
     },
     getDictByType(type: string) {
@@ -74,7 +74,7 @@ export const useDictStore = defineStore('dict', {
       return this.dictMap[type]
     },
     async resetDict() {
-      wsCache.delete(CACHE_KEY.DICT_CACHE)
+      cache.session.delete(CACHE_KEY.DICT_CACHE)
       const res = await listSimpleDictData()
       // 设置数据
       const dictDataMap = new Map<string, any>()
@@ -94,7 +94,7 @@ export const useDictStore = defineStore('dict', {
       })
       this.dictMap = dictDataMap
       this.isSetDict = true
-      wsCache.set(CACHE_KEY.DICT_CACHE, dictDataMap, { exp: 60 }) // 60 秒 过期
+      cache.session.set(CACHE_KEY.DICT_CACHE, dictDataMap) // 60 秒 过期
     }
   }
 })

src/store/modules/permission.ts

@@ -3,9 +3,8 @@ import { store } from '../index'
 import { cloneDeep } from 'lodash-es'
 import remainingRouter from '@/router/modules/remaining'
 import { generateRoute, flatMultiLevelRoutes } from '@/utils/routerHelper'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-
-const { wsCache } = useCache()
+import { CACHE_KEY } from '@/hooks/web/useCache'
+import cache from '@/plugins/cache'
 
 export interface PermissionState {
   routers: AppRouteRecordRaw[]
@@ -34,8 +33,8 @@ export const usePermissionStore = defineStore('permission', {
     async generateRoutes(): Promise<unknown> {
       return new Promise<void>(async (resolve) => {
         let res: AppCustomRouteRecordRaw[] = []
-        if (wsCache.get(CACHE_KEY.ROLE_ROUTERS)) {
-          res = wsCache.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[]
+        if (cache.local.get(CACHE_KEY.ROLE_ROUTERS)) {
+          res = cache.local.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[]
         }
         const routerMap: AppRouteRecordRaw[] = generateRoute(res)
         // 动态路由，404一定要放到最后面

src/store/modules/user.ts

@@ -1,15 +1,15 @@
 import { store } from '../index'
 import { defineStore } from 'pinia'
 import { getAccessToken, removeToken } from '@/utils/auth'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
 import { getInfo, loginOut } from '@/api/login'
-
-const { wsCache } = useCache()
+import cache from '@/plugins/cache'
 
 interface UserVO {
   id: number
   avatar: string
   nickname: string
+  currentRole: number
 }
 interface UserInfoVO {
   permissions: string[]
@@ -26,7 +26,8 @@ export const useUserStore = defineStore('admin-user', {
     user: {
       id: 0,
       avatar: '',
-      nickname: ''
+      nickname: '',
+      currentRole: 0
     }
   }),
   getters: {
@@ -49,21 +50,21 @@ export const useUserStore = defineStore('admin-user', {
         this.resetState()
         return null
       }
-      let userInfo = wsCache.get(CACHE_KEY.USER)
-      if (!userInfo) {
+      let userInfo = cache.local.get(CACHE_KEY.USER)
+      if (!userInfo || !userInfo?.menus || userInfo.menus.length == 0) {
         userInfo = await getInfo({})
       }
       this.permissions = userInfo.permissions
       this.roles = userInfo.roles
       this.user = userInfo.user
       this.isSetUser = true
-      wsCache.set(CACHE_KEY.USER, userInfo)
-      wsCache.set(CACHE_KEY.ROLE_ROUTERS, userInfo.menus)
+      cache.local.set(CACHE_KEY.USER, userInfo)
+      cache.local.set(CACHE_KEY.ROLE_ROUTERS, userInfo.menus)
     },
     async loginOut() {
       await loginOut()
       removeToken()
-      wsCache.clear()
+      cache.local.clear()
       this.resetState()
     },
     resetState() {
@@ -73,11 +74,12 @@ export const useUserStore = defineStore('admin-user', {
       this.user = {
         id: 0,
         avatar: '',
-        nickname: ''
+        nickname: '',
+        currentRole: 0
       }
     },
     refresh() {
-      wsCache.delete(CACHE_KEY.USER)
+      cache.local.delete(CACHE_KEY.USER)
       this.resetState()
       window.location.href = ''
     }

src/utils/auth.ts

@@ -1,8 +1,6 @@
-import { useCache } from '@/hooks/web/useCache'
 import { TokenType } from '@/api/login/types'
 import { decrypt, encrypt } from '@/utils/jsencrypt'
-
-const { wsCache } = useCache()
+import cache from '@/plugins/cache'
 
 const AccessTokenKey = 'ACCESS_TOKEN'
 const RefreshTokenKey = 'REFRESH_TOKEN'
@@ -10,24 +8,26 @@ const RefreshTokenKey = 'REFRESH_TOKEN'
 // 获取token
 export const getAccessToken = () => {
   // 此处与TokenKey相同，此写法解决初始化时Cookies中不存在TokenKey报错
-  return wsCache.get(AccessTokenKey) ? wsCache.get(AccessTokenKey) : wsCache.get('ACCESS_TOKEN')
+  return cache.local.get(AccessTokenKey)
+    ? cache.local.get(AccessTokenKey)
+    : cache.local.get('ACCESS_TOKEN')
 }
 
 // 刷新token
 export const getRefreshToken = () => {
-  return wsCache.get(RefreshTokenKey)
+  return cache.local.get(RefreshTokenKey)
 }
 
 // 设置token
 export const setToken = (token: TokenType) => {
-  wsCache.set(RefreshTokenKey, token.refreshToken, { exp: token.expiresTime })
-  wsCache.set(AccessTokenKey, token.accessToken)
+  cache.local.set(RefreshTokenKey, token.refreshToken)
+  cache.local.set(AccessTokenKey, token.accessToken)
 }
 
 // 删除token
 export const removeToken = () => {
-  wsCache.delete(AccessTokenKey)
-  wsCache.delete(RefreshTokenKey)
+  cache.local.delete(AccessTokenKey)
+  cache.local.delete(RefreshTokenKey)
 }
 
 /** 格式化token（jwt格式） */
@@ -47,7 +47,7 @@ export type LoginFormType = {
 }
 
 export const getLoginForm = () => {
-  const loginForm: LoginFormType = wsCache.get(LoginFormKey)
+  const loginForm: LoginFormType = cache.local.get(LoginFormKey)
   if (loginForm) {
     loginForm.password = decrypt(loginForm.password) as string
   }
@@ -56,11 +56,11 @@ export const getLoginForm = () => {
 
 export const setLoginForm = (loginForm: LoginFormType) => {
   loginForm.password = encrypt(loginForm.password) as string
-  wsCache.set(LoginFormKey, loginForm, { exp: 30 * 24 * 60 * 60 })
+  cache.local.set(LoginFormKey, loginForm)
 }
 
 export const removeLoginForm = () => {
-  wsCache.delete(LoginFormKey)
+  cache.local.delete(LoginFormKey)
 }
 
 // ========== 租户相关 ==========
@@ -69,52 +69,52 @@ const TenantIdKey = 'TENANT_ID'
 const TenantNameKey = 'TENANT_NAME'
 
 export const getTenantName = () => {
-  return wsCache.get(TenantNameKey)
+  return cache.local.get(TenantNameKey)
 }
 
 export const setTenantName = (username: string) => {
-  wsCache.set(TenantNameKey, username, { exp: 30 * 24 * 60 * 60 })
+  cache.local.set(TenantNameKey, username)
 }
 
 export const removeTenantName = () => {
-  wsCache.delete(TenantNameKey)
+  cache.local.delete(TenantNameKey)
 }
 
 export const getTenantId = () => {
-  return wsCache.get(TenantIdKey)
+  return cache.local.get(TenantIdKey)
 }
 
 export const setTenantId = (username: string) => {
-  wsCache.set(TenantIdKey, username)
+  cache.local.set(TenantIdKey, username)
 }
 
 export const removeTenantId = () => {
-  wsCache.delete(TenantIdKey)
+  cache.local.delete(TenantIdKey)
 }
 
 const AppIdKey = 'App_ID'
 const AppNameKey = 'App_NAME'
 
 export const getAPPName = () => {
-  return wsCache.get(AppNameKey)
+  return cache.local.get(AppNameKey)
 }
 
 export const setAppName = (name: string) => {
-  wsCache.set(AppNameKey, name, { exp: 30 * 24 * 60 * 60 })
+  cache.local.set(AppNameKey, name)
 }
 
 export const removeAppName = () => {
-  wsCache.delete(AppNameKey)
+  cache.local.delete(AppNameKey)
 }
 
 export const getAppId = () => {
-  return wsCache.get(AppIdKey)
+  return cache.local.get(AppIdKey)
 }
 
 export const setAppId = (id: number) => {
-  wsCache.set(AppIdKey, id)
+  cache.local.set(AppIdKey, id)
 }
 
 export const removeAppId = () => {
-  wsCache.delete(AppIdKey)
+  cache.local.delete(AppIdKey)
 }

src/utils/permission.ts

@@ -1,4 +1,5 @@
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
+import cache from '@/plugins/cache'
 
 const { t } = useI18n() // 国际化
 
@@ -9,10 +10,9 @@ const { t } = useI18n() // 国际化
  */
 export function checkPermi(value: string[]) {
   if (value && value instanceof Array && value.length > 0) {
-    const { wsCache } = useCache()
     const permissionDatas = value
     const all_permission = '*:*:*'
-    const permissions = wsCache.get(CACHE_KEY.USER).permissions
+    const permissions = cache.local.get(CACHE_KEY.USER).permissions
     const hasPermission = permissions.some((permission) => {
       return all_permission === permission || permissionDatas.includes(permission)
     })
@@ -30,10 +30,9 @@ export function checkPermi(value: string[]) {
  */
 export function checkRole(value: string[]) {
   if (value && value instanceof Array && value.length > 0) {
-    const { wsCache } = useCache()
     const permissionRoles = value
     const super_admin = 'admin'
-    const roles = wsCache.get(CACHE_KEY.USER).roles
+    const roles = cache.local.get(CACHE_KEY.USER).roles
     const hasRole = roles.some((role) => {
       return super_admin === role || permissionRoles.includes(role)
     })

src/views/Basic/Dept/DeptForm.vue

@@ -70,7 +70,7 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="SystemDeptForm" setup>
+<script name="SystemDeptForm" setup>
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
 import * as UserApi from '@/api/system/user'
@@ -81,6 +81,7 @@ const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
+
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
@@ -92,7 +93,7 @@ const formData = ref({
   status: CommonStatusEnum.ENABLE,
   remark: undefined
 })
-const formRules = reactive<any>({
+const formRules = reactive({
   parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
   sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
@@ -104,10 +105,10 @@ const formRules = reactive<any>({
 })
 const formRef = ref() // 表单 Ref
 const deptTree = ref() // 树形结构
-const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+const userList = ref([]) // 用户列表
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (type, id) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
@@ -138,7 +139,7 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as DeptApi.DeptVO
+    const data = formData.value
     if (formType.value === 'create') {
       await DeptApi.createDept(data)
       message.success(t('common.createSuccess'))
@@ -172,7 +173,7 @@ const resetForm = () => {
 const getTree = async () => {
   deptTree.value = []
   const data = await DeptApi.getSimpleDeptList()
-  let dept: Tree = { id: 0, name: '顶级部门', children: [] }
+  let dept = { id: 0, name: '顶级部门', children: [] }
   dept.children = handleTree(data)
   deptTree.value.push(dept)
 }

src/views/Basic/Dept/DialogTarget.vue

@@ -0,0 +1,133 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
+    <el-form ref="formRef" :model="formData" label-width="130px">
+      <el-form-item label="每日跟进指标数">
+        <el-input-number v-model="formData.targetNum" :controls="false" style="width: 150px" />
+      </el-form-item>
+      <el-form-item label="跟进指标生效日期">
+        <el-date-picker
+          v-model="formData.startDate"
+          type="date"
+          placeholder="选择日期时间"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          style="width: 150px"
+        />
+      </el-form-item>
+    </el-form>
+    <el-divider direction="horizontal" content-position="left">成交额指标</el-divider>
+    <el-button class="mb-10px" type="primary" @click="handleAddPrice"> 添加年份 </el-button>
+    <el-table :data="formData.deptSignPriceTargetVOList" border>
+      <el-table-column label="年份" width="120">
+        <template #default="{ row }">
+          <el-date-picker
+            v-model="row.year"
+            type="year"
+            placeholder="选择年份"
+            size="small"
+            format="YYYY"
+            value-format="YYYY"
+            style="width: 100%"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column v-for="col in 12" :key="col" :label="`${col}月`" width="100px">
+        <template #default="{ row }">
+          <el-input-number
+            v-model="row.monthTargetVOList[col - 1].targetPrice"
+            size="small"
+            :controls="false"
+            style="width: 100%"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <template #footer>
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script setup name="DialogTarget">
+import * as DeptApi from '@/api/system/dept'
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  remark: undefined
+})
+
+/** 打开弹窗 */
+const open = async (deptId) => {
+  dialogVisible.value = true
+  dialogTitle.value = '业绩指标'
+  resetForm()
+  // 修改时，设置数据
+  if (deptId) {
+    formLoading.value = true
+    try {
+      formData.value = await DeptApi.getDeptTarget(deptId)
+      formData.value.deptId = deptId
+      if (formData.value?.deptSignPriceTargetVOList) {
+        formData.value.deptSignPriceTargetVOList.forEach((it) => {
+          it.year = it.year + ''
+        })
+      }
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const formRef = ref() // 表单 Ref
+const submitForm = async () => {
+  // 提交请求
+  formLoading.value = true
+  try {
+    await DeptApi.updateDeptTarget(formData.value)
+    message.success('修改成功')
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    targetNum: undefined,
+    startDate: undefined,
+    deptSignPriceTargetVOList: []
+  }
+  formRef.value?.resetFields()
+}
+
+function handleAddPrice() {
+  const obj = {
+    year: undefined,
+    monthTargetVOList: []
+  }
+  for (let i = 1; i <= 12; i++) {
+    obj.monthTargetVOList.push({
+      month: i,
+      targetPrice: undefined
+    })
+  }
+  if (!formData.value.deptSignPriceTargetVOList) {
+    formData.value.deptSignPriceTargetVOList = []
+  }
+  formData.value.deptSignPriceTargetVOList.push(obj)
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/Basic/Dept/index.vue

@@ -23,9 +23,13 @@
     <el-table-column prop="name" label="部门名称" />
     <el-table-column prop="leader" label="负责人" width="120" />
     <el-table-column prop="sort" label="排序" width="200" />
-    <el-table-column prop="status" label="状态" width="100" />
+    <el-table-column prop="status" label="状态" width="100">
+      <template #default="{ row }">
+        {{ ['启用', '禁用'][row.status] }}
+      </template>
+    </el-table-column>
     <el-table-column label="创建时间" prop="createTime" width="180" :formatter="dateFormatter" />
-    <el-table-column label="操作" class-name="fixed-width" width="160">
+    <el-table-column label="操作" class-name="fixed-width" width="240">
       <template #default="scope">
         <el-button
           link
@@ -35,6 +39,14 @@
         >
           修改
         </el-button>
+        <el-button
+          link
+          type="primary"
+          @click="openTarget(scope.row.id)"
+          v-hasPermi="['basic:dept:update']"
+        >
+          业绩指标
+        </el-button>
         <el-button
           link
           type="danger"
@@ -49,11 +61,13 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <DeptForm ref="formRef" @success="getList" />
+  <DialogTarget ref="targetDialogRef" @success="getList" />
 </template>
 <script setup lang="ts" name="SystemDept">
 import { handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
 import DeptForm from './DeptForm.vue'
+import DialogTarget from './DialogTarget.vue'
 import { dateFormatter } from '@/utils/formatTime'
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -93,6 +107,11 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
 
+const targetDialogRef = ref()
+const openTarget = (id: number) => {
+  targetDialogRef.value.open(id)
+}
+
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {

src/views/Basic/GeneralSet/index.vue

@@ -4,16 +4,16 @@
       <el-tab-pane label="线索管理" :name="0" v-if="checkPermi(['basic:setting:clue'])">
         <BSClue v-if="tabIndex == 0" />
       </el-tab-pane>
-      <el-tab-pane label="销售提成" :name="10" v-if="checkPermi(['basic:setting:comission'])">
+      <!-- <el-tab-pane label="销售提成" :name="10" v-if="checkPermi(['basic:setting:comission'])">
         <BSSalerComission v-if="tabIndex == 10" />
-      </el-tab-pane>
+      </el-tab-pane> -->
     </el-tabs>
   </div>
 </template>
 
 <script setup name="GeneralSetting">
 import BSClue from './Comp/BSClue.vue'
-import BSSalerComission from './Comp/BSSalerComission.vue'
+// import BSSalerComission from './Comp/BSSalerComission.vue'
 import { checkPermi } from '@/utils/permission'
 
 const tabIndex = ref(0)

src/views/Basic/Menu/MenuForm.vue

@@ -116,11 +116,11 @@
 <script lang="ts" name="SystemMenuForm" setup>
 // import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as MenuApi from '@/api/system/menu'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
 import { CommonStatusEnum, SystemMenuTypeEnum } from '@/utils/constants'
 import { defaultProps, handleTree } from '@/utils/tree'
+import cache from '@/plugins/cache'
 
-const { wsCache } = useCache()
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -218,7 +218,7 @@ const submitForm = async () => {
   } finally {
     formLoading.value = false
     // 清空，从而触发刷新
-    wsCache.delete(CACHE_KEY.ROLE_ROUTERS)
+    cache.local.delete(CACHE_KEY.ROLE_ROUTERS)
   }
 }
 

src/views/Basic/Menu/index.vue

@@ -88,8 +88,8 @@
 import { handleTree } from '@/utils/tree'
 import * as MenuApi from '@/api/system/menu'
 import MenuForm from './MenuForm.vue'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-const { wsCache } = useCache()
+import { CACHE_KEY } from '@/hooks/web/useCache'
+import cache from '@/plugins/cache'
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -145,7 +145,7 @@ const refreshMenu = async () => {
   try {
     await message.confirm('即将更新缓存刷新浏览器！', '刷新菜单缓存')
     // 清空，从而触发刷新
-    wsCache.delete(CACHE_KEY.ROLE_ROUTERS)
+    cache.local.delete(CACHE_KEY.ROLE_ROUTERS)
     // 刷新浏览器
     location.reload()
   } catch {}

src/views/Basic/Role/Comp/ReportDaily.vue

@@ -0,0 +1,149 @@
+<template>
+  <div class="pl-20px pr-20px">
+    <el-form :model="form" ref="formRef" :rules="rules" label-width="auto" v-loading="formLoading">
+      <el-form-item label="开启通知">
+        <el-radio-group v-model="form.status">
+          <el-radio :label="0"> 开启 </el-radio>
+          <el-radio :label="1"> 关闭 </el-radio>
+        </el-radio-group>
+      </el-form-item>
+
+      <el-form-item label="发送途径">
+        <el-checkbox-group v-model="form.sendType">
+          <el-checkbox v-for="(item, index) in sendTypeOptions" :key="index" :label="item.value">
+            {{ item.label }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <el-form-item label="发送时间">
+        <el-time-picker
+          v-model="form.sendTime"
+          placeholder="任意时间点"
+          format="HH:mm"
+          value-format="HH:mm"
+        />
+      </el-form-item>
+      <el-form-item label="发送内容">
+        <el-tree
+          ref="treeRef"
+          :data="contentOptions"
+          :props="defaultProps"
+          empty-text="加载中，请稍候"
+          node-key="id"
+          show-checkbox
+          default-expand-all
+          style="width: 100%"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button :disabled="formLoading" type="primary" @click="submitForm"> 保 存 </el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script setup name="ReportDaily">
+import * as DaliyReportApi from '@/api/system/role/daliyReport'
+import { defaultProps, handleTree } from '@/utils/tree'
+import { getGeneralSysDictData } from '@/api/system/dict/dict.data'
+
+const message = useMessage() // 消息弹窗
+const props = defineProps({
+  roleId: {
+    type: Number
+  }
+})
+
+const formLoading = ref(false)
+const form = ref({
+  sendItem: []
+})
+
+watch(
+  () => props.roleId,
+  () => {
+    getReportInfo()
+  }
+)
+
+onMounted(() => {
+  init()
+})
+
+const formRef = ref()
+
+const rules = {}
+
+const contentOptions = ref([])
+
+async function init() {
+  getOptions()
+  getReportInfo()
+}
+
+const sendTypeOptions = ref([])
+const treeRef = ref()
+function getOptions() {
+  getGeneralSysDictData('message_send_type').then((data) => {
+    sendTypeOptions.value = data
+  })
+  DaliyReportApi.getDaliyReportContent().then((data) => {
+    contentOptions.value = handleTree(data)
+  })
+}
+
+async function getReportInfo() {
+  try {
+    formLoading.value = true
+    const data = await DaliyReportApi.getRoleDaliyReport(props.roleId)
+    form.value = { ...data }
+
+    if (!form.value.sendType) {
+      form.value.sendType = []
+    }
+
+    if (!form.value.sendTime) {
+      form.value.sendTime = '22:00'
+    }
+
+    if (!form.value.sendItem) {
+      form.value.sendItem = []
+    }
+    treeRef.value.setCheckedKeys([], false)
+    // 设置选中
+    form.value.sendItem.forEach((menuId) => {
+      treeRef.value.setChecked(menuId, true, false)
+    })
+    formLoading.value = false
+  } catch (error) {
+    console.log(error)
+    formLoading.value = false
+  }
+}
+
+/** 提交表单 */
+const submitForm = async () => {
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = {
+      id: form.value.id,
+      roleId: props.roleId,
+      sendType: form.value.sendType,
+      sendTime: form.value.sendTime,
+      status: form.value.status,
+      sendItem: [
+        ...treeRef.value.getCheckedKeys(false), // 获得当前选中节点
+        ...treeRef.value.getHalfCheckedKeys() // 获得半选中的父节点
+      ]
+    }
+    await DaliyReportApi.updateRoleDaliyReport(data)
+    message.success('保存成功')
+    getReportInfo()
+  } finally {
+    formLoading.value = false
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/Basic/Role/index.vue

@@ -75,6 +75,13 @@
             @success="getList"
           />
         </el-tab-pane>
+        <el-tab-pane label="每日快报" :name="4">
+          <ReportDaily
+            v-if="roleOperateIndex == 4"
+            ref="reportDailyRef"
+            :roleId="list[libraryIndex].id"
+          />
+        </el-tab-pane>
       </el-tabs>
     </el-card>
     <!-- 表单弹窗：添加/修改 -->
@@ -86,6 +93,7 @@ import RoleForm from './RoleForm.vue'
 import RoleEmployee from './Comp/RoleEmployee.vue'
 import RoleAssignMenuForm from './RoleAssignMenuForm.vue'
 import RoleDataPermissionForm from './RoleDataPermissionForm.vue'
+import ReportDaily from './Comp/ReportDaily.vue'
 import * as RoleApi from '@/api/system/role'
 
 const message = useMessage() // 消息弹窗

src/views/Basic/User/DeptTree.vue

@@ -1,11 +1,4 @@
 <template>
-  <div class="head-container">
-    <el-input v-model="deptName" class="mb-20px" clearable placeholder="请输入部门名称">
-      <template #prefix>
-        <Icon icon="ep:search" />
-      </template>
-    </el-input>
-  </div>
   <div class="head-container">
     <el-tree
       ref="treeRef"
@@ -26,7 +19,6 @@ import { ElTree } from 'element-plus'
 import * as DeptApi from '@/api/system/dept'
 import { defaultProps, handleTree } from '@/utils/tree'
 
-const deptName = ref('')
 const deptList = ref<Tree[]>([]) // 树形结构
 const treeRef = ref<InstanceType<typeof ElTree>>()
 

src/views/Basic/User/UserForm.vue

@@ -139,7 +139,8 @@ const formData = ref({
   remark: '',
   status: CommonStatusEnum.ENABLE,
   roleIds: [],
-  hireDate: ''
+  hireDate: '',
+  isNewUserConfirm: false
 })
 const formRules = ref<any>({
   username: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }],
@@ -192,8 +193,14 @@ const submitForm = async () => {
   try {
     const data = formData.value as unknown as UserApi.UserVO
     if (formType.value === 'create') {
-      await UserApi.createUser(data)
+      const resp = await UserApi.createUser(data)
+      if (resp.code == 18888) {
+        await message.confirm(resp.msg)
+        formData.value.isNewUserConfirm = true
+        submitForm()
+      } else {
         message.success(t('common.createSuccess'))
+      }
     } else {
       await UserApi.updateUser(data)
       message.success(t('common.updateSuccess'))
@@ -220,7 +227,8 @@ const resetForm = () => {
     remark: '',
     status: CommonStatusEnum.ENABLE,
     roleIds: [],
-    hireDate: formatDate(new Date(), 'YYYY-MM-DD')
+    hireDate: formatDate(new Date(), 'YYYY-MM-DD'),
+    isNewUserConfirm: false
   }
   formRef.value?.resetFields()
 }

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()
 }
 

src/views/Clue/Order/Comp/AfterSales.vue

@@ -8,7 +8,7 @@
         <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.state" placeholder="审核状态" clearable>
+        <el-select v-model="searchForm.state" placeholder="审核状态" clearable style="width: 120px">
           <el-option label="待审核" :value="1" />
           <el-option label="已撤销" :value="2" />
           <el-option label="已通过" :value="3" />
@@ -16,7 +16,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
+        <el-select
+          v-model="searchForm.signUser"
+          placeholder="登记人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -34,10 +40,17 @@
           range-separator="-"
           start-placeholder="成交日期"
           end-placeholder="成交日期"
+          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.applyUser" placeholder="申请人" clearable filterable>
+        <el-select
+          v-model="searchForm.applyUser"
+          placeholder="申请人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -55,12 +68,31 @@
           range-separator="-"
           start-placeholder="申请日期"
           end-placeholder="申请日期"
+          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleSearch">查询</el-button>
-        <el-button @click="handleReset">重置</el-button>
-        <el-button @click="batchAudit">批量审核</el-button>
+        <el-date-picker
+          v-model="searchForm.checkTime"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          range-separator="-"
+          start-placeholder="审核日期"
+          end-placeholder="审核日期"
+          style="width: 240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch" v-hasPermi="['clue:order:after-sale-search']">
+          查询
+        </el-button>
+        <el-button @click="handleReset" v-hasPermi="['clue:order:after-sale-reset']">
+          重置
+        </el-button>
+        <el-button @click="batchAudit" v-hasPermi="['clue:order:after-sale-batch-audit']">
+          批量审核
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -72,10 +104,18 @@
     >
       <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" />
+      <el-table-column prop="isCompanyReceipts" label="是否公司收款" min-width="120px" />
       <el-table-column prop="isReturns" label="是否退货" min-width="90px" />
       <el-table-column prop="solution" label="解决方案" min-width="150px" />
       <el-table-column prop="signUserName" label="登记人" min-width="90px" />
@@ -92,10 +132,23 @@
         min-width="120px"
         :formatter="dateFormatter"
       />
+      <el-table-column prop="checkUser" label="审核人" min-width="90" />
+      <el-table-column
+        prop="checkTime"
+        label="审核时间"
+        min-width="120px"
+        :formatter="dateFormatter"
+      />
       <el-table-column prop="stateName" label="审核状态" fixed="right" min-width="90px" />
       <el-table-column label="操作" width="150px" fixed="right">
         <template #default="{ row }">
-          <el-button type="primary" style="padding: 0" text @click="handleDetail(row.id)">
+          <el-button
+            type="primary"
+            style="padding: 0"
+            text
+            v-hasPermi="['clue:order:after-sale-detail']"
+            @click="handleDetail(row.id)"
+          >
             详情
           </el-button>
           <el-button
@@ -144,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
@@ -160,6 +215,7 @@ const searchForm = ref({
   dealUser: undefined,
   createDate: [],
   createUser: undefined,
+  checkTime: [],
   pageNo: 1,
   pageSize: 20
 })
@@ -183,6 +239,7 @@ function handleReset() {
     dealUser: undefined,
     createDate: [],
     createUser: undefined,
+    checkTime: [],
     pageNo: 1,
     pageSize: 20
   }

src/views/Clue/Order/Comp/DialogAfterSale.vue

@@ -4,6 +4,7 @@
       <el-table-column type="index" width="50" />
       <el-table-column prop="reason" label="售后原因" />
       <el-table-column prop="refundAmount" label="退款金额" />
+      <el-table-column prop="percentageDeductAmount" label="提成扣款" />
       <el-table-column prop="isReturns" label="是否退货" />
       <el-table-column prop="applyTime" label="申请日期" width="180px" />
       <el-table-column prop="stateName" label="审核状态" />
@@ -13,10 +14,16 @@
     <el-button v-show="showAdd" class="mb-10px" type="primary" @click="handleAdd">
       新增售后
     </el-button>
-    <el-form v-if="!showAdd" :model="form" ref="formRef" :rules="rules" label-width="80px">
+    <el-form v-if="!showAdd" :model="form" ref="formRef" :rules="rules" label-width="auto">
+      <el-row :gutter="20">
+        <el-col :span="24" :offset="0">
           <el-form-item label="售后原因" prop="reason">
             <el-input v-model="form.reason" placeholder="请输入售后原因" />
           </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12" :offset="0">
           <el-form-item label="退款金额" prop="refundAmount">
             <el-input-number
               v-model="form.refundAmount"
@@ -25,12 +32,28 @@
               placeholder="请输入金额"
             />
           </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="提成扣款金额" prop="percentageDeductAmount">
+            <el-input-number
+              v-model="form.percentageDeductAmount"
+              :min="0"
+              :controls="false"
+              placeholder="请输入金额"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24" :offset="0" v-if="appStore.getAppInfo?.instanceType == 2">
           <el-form-item label="是否退货" prop="isReturns">
             <el-radio-group v-model="form.isReturns">
               <el-radio :label="true"> 退货 </el-radio>
               <el-radio :label="false"> 不退货 </el-radio>
             </el-radio-group>
           </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0">
           <el-form-item label="解决方案" prop="solution">
             <el-input
               type="textarea"
@@ -39,9 +62,13 @@
               placeholder="请输入退款原因"
             />
           </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0">
           <el-form-item label="备注">
             <Editor v-model:modelValue="form.remark" />
           </el-form-item>
+        </el-col>
+      </el-row>
       <el-form-item>
         <el-button :disabled="formLoading" type="primary" @click="onSubmit">保存</el-button>
         <el-button @click="showAdd = true">取消</el-button>
@@ -52,7 +79,9 @@
 
 <script setup name="DialogAfterSale">
 import { getAfterSalePage, createAfterSale } from '@/api/clue/afterSale'
+import { useAppStore } from '@/store/modules/app'
 
+const appStore = useAppStore()
 const message = useMessage() // 消息弹窗
 
 const show = ref(false)
@@ -72,7 +101,8 @@ function open(signId) {
 const showAdd = ref(true)
 const form = ref({})
 const rules = {
-  refundAmount: { required: true, message: '回款金额不可为空', trigger: 'blur' },
+  percentageDeductAmount: { required: true, message: '提成扣款金额不可为空', trigger: 'blur' },
+  refundAmount: { required: true, message: '退款金额不可为空', trigger: 'blur' },
   reason: { required: true, message: '售后原因不可为空', trigger: 'blur' },
   solution: { required: true, message: '解决方案不可为空', trigger: 'blur' }
 }
@@ -91,6 +121,7 @@ function handleAdd() {
     solution: undefined,
     refundAmount: undefined,
     isReturns: false,
+    percentageDeductAmount: undefined,
     remark: undefined
   }
 }

src/views/Clue/Order/Comp/DialogAfterSaleAudit.vue

@@ -1,16 +1,39 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
     <Descriptions :data="orderInfo" :schema="schema" :columns="2" labelWidth="130px" />
-    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :rules="ruels"
+      :model="formData"
+      label-width="80px"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12" :offset="0">
           <el-form-item label="状态" prop="state">
             <el-radio-group v-model="formData.state">
               <el-radio :label="3"> 通过 </el-radio>
               <el-radio :label="4"> 驳回 </el-radio>
             </el-radio-group>
           </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="审核日期" prop="checkTime">
+            <el-date-picker
+              v-model="formData.checkTime"
+              type="date"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0">
           <el-form-item label="备注" prop="remark">
             <Editor v-model:modelValue="formData.remark" />
           </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -20,6 +43,7 @@
 </template>
 <script name="DialogAfterSaleAudit" setup>
 import { auditAfterSale } from '@/api/clue/afterSale'
+import { formatDate } from '@/utils/formatTime'
 
 const message = useMessage() // 消息弹窗
 
@@ -63,6 +87,16 @@ const schema = [
     label: '退款金额',
     span: 1
   },
+  {
+    field: 'percentageDeductAmount',
+    label: '提成扣款',
+    span: 1
+  },
+  {
+    field: 'isCompanyReceipts',
+    label: '是否公司收款',
+    span: 1
+  },
   {
     field: 'isReturns',
     label: '是否退货',
@@ -94,6 +128,10 @@ const formData = ref({
 })
 const formRef = ref() // 表单 Ref
 
+const ruels = {
+  checkTime: { required: true, message: '审核日期不可为空', trigger: 'blur,change' }
+}
+
 const orderInfo = ref({})
 /** 打开弹窗 */
 const open = async (row) => {
@@ -130,6 +168,7 @@ const resetForm = (signId) => {
   formData.value = {
     saleId: signId,
     state: 3,
+    checkTime: formatDate(new Date()),
     remark: ''
   }
   formRef.value?.resetFields()

src/views/Clue/Order/Comp/DialogAfterSaleDetail.vue

@@ -54,6 +54,16 @@ const applySchema = [
     label: '退款金额',
     span: 1
   },
+  {
+    field: 'percentageDeductAmount',
+    label: '提成扣款',
+    span: 1
+  },
+  {
+    field: 'isCompanyReceipts',
+    label: '是否公司收款',
+    span: 1
+  },
   {
     field: 'isReturns',
     label: '是否退货',

src/views/Clue/Order/Comp/DialogBatchAudit.vue

@@ -1,15 +1,38 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
-    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :rules="ruels"
+      :model="formData"
+      label-width="80px"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12" :offset="0">
           <el-form-item label="状态" prop="state">
             <el-radio-group v-model="formData.state">
               <el-radio :label="3"> 通过 </el-radio>
               <el-radio :label="4"> 驳回 </el-radio>
             </el-radio-group>
           </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="审核日期" prop="checkTime">
+            <el-date-picker
+              v-model="formData.checkTime"
+              type="date"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0">
           <el-form-item label="备注" prop="remark">
             <Editor v-model:modelValue="formData.remark" />
           </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -20,6 +43,7 @@
 <script name="DialogAfterSaleAudit" setup>
 import { batchAuditAfterSale } from '@/api/clue/afterSale'
 import { batchAuditPayment } from '@/api/clue/payment'
+import { formatDate } from '@/utils/formatTime'
 
 const message = useMessage() // 消息弹窗
 
@@ -32,6 +56,10 @@ const formData = ref({
   remark: ''
 })
 const formRef = ref() // 表单 Ref
+const ruels = {
+  checkTime: { required: true, message: '审核日期不可为空', trigger: 'blur,change' }
+}
+
 const formType = ref('aftersale')
 const titleMap = {
   aftersale: '批量售后审核',
@@ -79,6 +107,7 @@ const resetForm = (ids) => {
   formData.value = {
     payIds: ids,
     saleIds: ids,
+    checkTime: formatDate(new Date()),
     state: 3,
     remark: ''
   }

src/views/Clue/Order/Comp/DialogDelivery.vue

@@ -77,6 +77,32 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12" :offset="0">
+            <el-form-item label="其他支出">
+              <el-select v-model="extraPay.extraPayType" placeholder="其他支出类型" filterable>
+                <el-option
+                  v-for="item in extraPayOptions"
+                  :key="item.id"
+                  :label="item.extraPayName"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" :offset="0">
+            <el-form-item label="支出金额">
+              <el-input-number v-model="extraPay.extraPayMoney" :controls="false" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24" :offset="0">
+            <el-form-item label="支出备注">
+              <el-input v-model="extraPay.remark" placeholder="备注信息" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </template>
       <template v-else>
         <el-table :data="inventoryList" @selection-change="handleSelectionChange">
@@ -98,7 +124,7 @@
           </el-table-column>
         </el-table>
       </template>
-      <el-form-item label="备注">
+      <el-form-item label="发货备注">
         <Editor v-model:modelValue="form.remark" />
       </el-form-item>
     </el-form>
@@ -116,15 +142,20 @@ import { getSimpleWarehouseList, getRemainInventoryList } from '@/api/mall/wareh
 import { createDelivery } from '@/api/clue/delivery'
 import { getConfigList } from '@/api/system/set'
 import { getDictOptions } from '@/utils/dict'
+import { getExtraFeeSimpleList } from '@/api/clue/extraFee'
 
 const message = useMessage() // 消息弹窗
 
 const warehouseOptions = ref([])
+const extraPayOptions = ref([])
 const supplierOptions = getDictOptions('erp_supplier')
 function getOptions() {
   getSimpleWarehouseList().then((data) => {
     warehouseOptions.value = data
   })
+  getExtraFeeSimpleList().then((data) => {
+    extraPayOptions.value = data
+  })
 }
 
 function getRemainInventory(signProductId) {
@@ -144,6 +175,7 @@ defineExpose({
 })
 
 const form = ref({})
+const extraPay = ref({})
 const rules = ref({
   supplier: { required: true, message: '供应商不可为空', trigger: 'change' },
   warehouseId: { required: true, message: '仓库不可为空', trigger: 'change' },
@@ -164,6 +196,11 @@ function resetForm(row) {
     unitPrice: undefined,
     remark: undefined
   }
+  extraPay.value = {
+    extraPayType: undefined,
+    extraPayMoney: undefined,
+    remark: undefined
+  }
 }
 
 const emit = defineEmits(['success'])
@@ -209,6 +246,9 @@ async function onSubmit() {
         unitPrice: form.value.unitPrice,
         warehouseId: form.value.warehouseId
       }
+      if (extraPay.value.extraPayMoney) {
+        params.purchaseOrder.extraPay = [extraPay.value]
+      }
     } else {
       params.detailList = deliveryArr.value
     }

src/views/Clue/Order/Comp/DialogExtraPay.vue

@@ -28,9 +28,9 @@
           >
             <el-option
               v-for="item in extraPayOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              :key="item.id"
+              :label="item.extraPayName"
+              :value="item.id"
             />
           </el-select>
         </template>
@@ -73,9 +73,9 @@
 
 <script setup name="DialogExtraPay">
 import { signAddPay, getSignExtraPayList } from '@/api/clue/sign'
-import { getDictOptions } from '@/utils/dict'
+import * as ExtraFeeApi from '@/api/clue/extraFee'
 
-const extraPayOptions = getDictOptions('extra_pay_type')
+const extraPayOptions = ref([])
 const message = useMessage() // 消息弹窗
 
 const show = ref(false)
@@ -83,6 +83,7 @@ function open(id) {
   show.value = true
   resetForm(id)
   getFormList()
+  getOptions()
 }
 defineExpose({
   open
@@ -135,6 +136,12 @@ async function onSubmit() {
 function handleRemove(type, index) {
   form.value[type].splice(index, 1)
 }
+
+function getOptions() {
+  ExtraFeeApi.getExtraFeeSimpleList().then((data) => {
+    extraPayOptions.value = data
+  })
+}
 </script>
 
 <style lang="scss" scoped></style>

src/views/Clue/Order/Comp/DialogFeebackAudit.vue

@@ -1,21 +1,44 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
     <Descriptions :data="orderInfo" :schema="schema" :columns="2" labelWidth="130px" />
-    <el-table :data="followList" size="small" border class="mt-10px">
+    <el-table :data="followList" size="small" border class="mt-10px mb-10px">
       <el-table-column prop="userName" label="跟进人" />
       <el-table-column prop="followTime" label="最新跟进时间" :formatter="dateFormatter" />
       <el-table-column prop="signSate" label="成交状态" />
     </el-table>
-    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="ruels"
+      label-width="80px"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12" :offset="0">
           <el-form-item label="状态" prop="state">
             <el-radio-group v-model="formData.state">
               <el-radio :label="3"> 通过 </el-radio>
               <el-radio :label="4"> 驳回 </el-radio>
             </el-radio-group>
           </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="审核日期" prop="checkTime">
+            <el-date-picker
+              v-model="formData.checkTime"
+              type="date"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0">
           <el-form-item label="备注" prop="remark">
             <Editor v-model:modelValue="formData.remark" />
           </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -25,9 +48,9 @@
 </template>
 <script name="DialogFeebackAudit" setup>
 import { getFollowUserList } from '@/api/clue'
-import { auditPayment } from '@/api/clue/payment'
-import { dateFormatter } from '@/utils/formatTime'
-
+import { auditPayment, getPaymentDetail } from '@/api/clue/payment'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
+import {} from '@/utils/formatTime'
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
@@ -89,6 +112,11 @@ const formData = ref({
   state: 3,
   remark: ''
 })
+
+const ruels = {
+  checkTime: { required: true, message: '审核日期不可为空', trigger: 'blur,change' }
+}
+
 const formRef = ref() // 表单 Ref
 
 const orderInfo = ref({})
@@ -98,7 +126,7 @@ const open = async (row) => {
   dialogTitle.value = '回款审核'
   resetForm(row.id)
   // 设置数据
-  orderInfo.value = { ...row }
+  orderInfo.value = await getPaymentDetail({ id: row.id })
   // 获取跟进信息
   getFollowInfo(row.clueId)
 }
@@ -129,6 +157,7 @@ const resetForm = (signId) => {
   formData.value = {
     payId: signId,
     state: 3,
+    checkTime: formatDate(new Date()),
     remark: ''
   }
   formRef.value?.resetFields()

src/views/Clue/Order/Comp/DialogOrder.vue

@@ -1,7 +1,7 @@
 <template>
   <Dialog title="成交详情" v-model="show" width="800px">
     <el-tabs v-model="tabName">
-      <el-tab-pane label="线索信息" name="clueInfo">
+      <el-tab-pane label="线索信息" name="clueInfo" v-if="checkPermi(['clue:pool:detail'])">
         <Descriptions :data="clueInfo" :schema="clueSchema" :columns="2" labelWidth="130px" />
       </el-tab-pane>
       <el-tab-pane label="成交信息" name="orderInfo">
@@ -61,7 +61,11 @@
           </el-table>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="回款记录" name="returnRecord">
+      <el-tab-pane
+        label="回款记录"
+        name="returnRecord"
+        v-if="checkPermi(['clue:order:return-list'])"
+      >
         <el-table :data="returnRecordList" border stripe>
           <el-table-column type="index" width="50" />
           <el-table-column prop="money" label="回款金额" />
@@ -70,7 +74,11 @@
           <el-table-column prop="stateName" label="审核状态" />
         </el-table>
       </el-tab-pane>
-      <el-tab-pane label="售后记录" name="afterSale">
+      <el-tab-pane
+        label="售后记录"
+        name="afterSale"
+        v-if="checkPermi(['clue:order:after-sale-list'])"
+      >
         <el-table :data="aftersaleList" border stripe>
           <el-table-column type="index" width="50" />
           <el-table-column prop="reason" label="售后原因" />
@@ -183,11 +191,17 @@ function getFields() {
   })
 
   getOrderFieldList().then((data) => {
-    const arr = useCrudSchemas(data).allSchemas.detailSchema
-    arr.forEach((it) => {
+    const list = useCrudSchemas(data).allSchemas.detailSchema
+    const arr = []
+    list.forEach((it) => {
       if (it.label.includes('日期')) {
         it.dateFormat = 'YYYY-MM-DD'
       }
+      if (it.field == 'receivedMoney') {
+        checkPermi(['clue:order:return-list']) && arr.push(it)
+      } else {
+        arr.push(it)
+      }
     })
     if (arr.length % 2 != 0) {
       arr.push({})

src/views/Clue/Order/Comp/MallOrderList.vue

@@ -52,6 +52,13 @@
         <template #actionMore>
           <el-button @click="getTableList" v-hasPermi="['clue:order:search']"> 搜索 </el-button>
           <el-button @click="resetQuery" v-hasPermi="['clue:order:reset']"> 重置 </el-button>
+          <el-button
+            type="primary"
+            @click="handleBatchUpdateInstall"
+            v-hasPermi="['clue:order:batch-update-install']"
+          >
+            批量修改安装状态
+          </el-button>
         </template>
       </Search>
     </div>
@@ -61,18 +68,57 @@
       class="mt-10px"
       v-model:tableObject="tableObject"
       :tableColumns="allSchemas.tableColumns"
+      rowkey="signId"
+      :expandRowKeys="expendRows"
       @get-list="getTableList"
       @get-checked-columns="getCheckedColumns"
+      @selection-change="handleSelectionChange"
     >
+      <el-table-column type="selection" width="60" />
       <el-table-column type="expand">
         <template #default="{ row }">
           <div class="p-10px flex justify-center">
-            <el-table :data="row.signProducts" stripe style="width: 900px">
+            <VueDraggable
+              target="tbody"
+              v-model="row.signProducts"
+              :animation="150"
+              @end="onDragEnd"
+              style="width: 100%"
+            >
+              <el-table
+                :data="row.signProducts"
+                row-key="id"
+                stripe
+                style="width: 80%; margin: 0 auto"
+              >
                 <el-table-column prop="productName" label="成交产品" />
-              <el-table-column prop="specsName" label="产品规格" width="100px" />
+                <el-table-column prop="specsName" label="产品规格" />
                 <el-table-column prop="signNum" label="成交数量" width="90px" />
-              <el-table-column prop="remark" label="成交备注" />
-              <el-table-column label="发货状态" prop="sendState" width="90px" />
+                <el-table-column prop="remark" label="成交备注" width="100px" />
+                <el-table-column label="生产状态" width="160px">
+                  <template #default="scope">
+                    <el-switch
+                      v-model="scope.row.isProduced"
+                      :active-value="true"
+                      :inactive-value="false"
+                      active-text="已生产"
+                      inactive-text="待生产"
+                      :disabled="!checkPermi(['clue:order:update-produce'])"
+                      size="small"
+                      @change="handleChangeProdoce(scope.row)"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column label="发货状态" prop="sendState" width="90px">
+                  <template #default="scope">
+                    <el-tag
+                      :type="scope.row.sendState == '待发货' ? 'danger' : 'success'"
+                      size="small"
+                    >
+                      {{ scope.row.sendState }}
+                    </el-tag>
+                  </template>
+                </el-table-column>
                 <el-table-column label="发货备注" width="100px">
                   <template #default="scope">
                     <el-popover
@@ -104,6 +150,7 @@
                   </template>
                 </el-table-column>
               </el-table>
+            </VueDraggable>
           </div>
         </template>
       </el-table-column>
@@ -115,17 +162,14 @@
         min-width="120px"
       >
         <template #default="{ row }">
-          <el-popover
-            placement="top"
-            width="500px"
-            trigger="click"
-            v-if="item.field == 'remark' && row.remark"
-          >
+          <div v-if="item.field == 'remark' || item.form?.component == 'Editor'">
+            <el-popover placement="top" width="500px" trigger="click" v-if="row[item.field]">
               <template #reference>
                 <el-button type="primary" style="padding: 0" text>点击查看</el-button>
               </template>
-            <div v-dompurify-html="row.remark"></div>
+              <div v-dompurify-html="row[item.field]"></div>
             </el-popover>
+          </div>
           <span v-else-if="item.form?.component == 'DatePicker'">
             {{ formatDate(row[item.field]) }}
           </span>
@@ -211,6 +255,9 @@ import DialogDelivery from './DialogDelivery.vue'
 
 import { removeNullField } from '@/utils'
 import { formatDate } from '@/utils/formatTime'
+import { ElMessageBox, ElOption, ElSelect } from 'element-plus'
+import { VueDraggable } from 'vue-draggable-plus'
+import { checkPermi } from '@/utils/permission'
 
 const userOptions = ref([])
 const allUserOptions = ref([])
@@ -356,6 +403,96 @@ const deliveryDialog = ref()
 function handleDelivery(row) {
   deliveryDialog.value.open(row)
 }
+
+const batchIds = ref([])
+function handleSelectionChange(val) {
+  batchIds.value = val.map((it) => it.signId)
+}
+
+const selectedValue = ref(undefined)
+const installOptions = [
+  { label: '待安装', value: 1 },
+  { label: '已安装', value: 2 },
+  { label: '无需安装', value: 3 }
+]
+
+const select = () =>
+  h(
+    ElSelect,
+    {
+      modelValue: selectedValue.value,
+      placeholder: '新状态',
+      'onUpdate:modelValue': (val) => {
+        selectedValue.value = val
+      }
+    },
+    () =>
+      installOptions.map((item) => {
+        return h(ElOption, { label: item.label, value: item.value })
+      })
+  )
+
+function handleBatchUpdateInstall() {
+  if (batchIds.value.length) {
+    ElMessageBox({
+      title: '是否确认修改安装状态？',
+      message: select,
+      showCancelButton: true,
+      confirmButtonText: '确定',
+      cancelButtonText: '取消'
+    }).then(async (action) => {
+      // 处理用户点击确定或取消按钮后的逻辑
+      if (action == 'confirm') {
+        try {
+          // 发起修改状态
+          await SignApi.updateInstallStatus(batchIds.value, selectedValue.value)
+          message.success('修改成功')
+          // 刷新列表
+          await getTableList()
+        } catch (err) {
+          // 取消后，进行恢复按钮
+          console.log(err)
+        }
+      }
+    })
+  } else {
+    message.info('请选择表格行')
+  }
+}
+
+async function handleChangeProdoce(row) {
+  try {
+    // 修改状态的二次确认
+    await message.confirm('确认要修改生产状态吗?')
+    // 发起修改状态
+    await SignApi.updateProduceStatus({
+      signId: row.signId,
+      id: row.id,
+      isProduced: row.isProduced
+    })
+    message.success('修改成功')
+    // 刷新列表
+    getTableList()
+  } catch {
+    // 取消后，进行恢复按钮
+    row.isProduced = !row.isProduced
+  }
+}
+
+const expendRows = ref([])
+async function onDragEnd(ev) {
+  try {
+    expendRows.value = [ev.data.signId]
+    const list = tableObject.value.tableList.find((it) => it.signId == ev.data.signId).signProducts
+    await SignApi.updateProduceSort(list.map((it) => it.id))
+    message.success('修改成功')
+    // 刷新列表
+    getTableList()
+  } catch (error) {
+    console.log(error)
+    getTableList()
+  }
+}
 </script>
 
 <style lang="scss" scoped></style>

src/views/Clue/Order/Comp/MallSettle.vue

@@ -2,22 +2,44 @@
   <div>
     <el-form :model="searchForm" label-width="0" inline>
       <el-form-item>
-        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
+        <el-input
+          v-model="searchForm.signId"
+          placeholder="成交单号"
+          clearable
+          style="width: 120px"
+        />
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
+        <el-input v-model="searchForm.name" placeholder="线索名称" clearable style="width: 120px" />
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.phone" placeholder="联系方式" clearable />
+        <el-input
+          v-model="searchForm.phone"
+          placeholder="联系方式"
+          clearable
+          style="width: 120px"
+        />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.settlementType" placeholder="结算类型" clearable filterable>
+        <el-select
+          v-model="searchForm.settlementType"
+          placeholder="结算类型"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option label="货款" value="货款" />
           <el-option label="其他支出" value="其他支出" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
+        <el-select
+          v-model="searchForm.signUser"
+          placeholder="登记人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -35,6 +57,19 @@
           range-separator="-"
           start-placeholder="成交日期"
           end-placeholder="成交日期"
+          style="width: 240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.createDate"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          range-separator="-"
+          start-placeholder="支出日期"
+          end-placeholder="支出日期"
+          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
@@ -44,6 +79,7 @@
           filterable
           clearable
           @change="searchForm.signSpecs = undefined"
+          style="width: 150px"
         >
           <el-option
             v-for="item in prodOptions"
@@ -60,6 +96,7 @@
           filterable
           clearable
           :disabled="!searchForm.signProduct"
+          style="width: 120px"
         >
           <el-option
             v-for="item in specsOptions(searchForm.signProduct)"
@@ -70,7 +107,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.supplier" placeholder="选择供应商" filterable clearable>
+        <el-select
+          v-model="searchForm.supplier"
+          placeholder="选择供应商"
+          filterable
+          clearable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in supplierOptions"
             :key="item.value"
@@ -87,9 +130,11 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button @click="handleSearch">查询</el-button>
-        <el-button @click="handleReset">重置</el-button>
-        <el-button @click="batchSettle">批量结算</el-button>
+        <el-button @click="handleSearch" v-hasPermi="['clue:order:settle-search']">查询</el-button>
+        <el-button @click="handleReset" v-hasPermi="['clue:order:settle-reset']">重置</el-button>
+        <el-button @click="batchSettle" v-hasPermi="['clue:order:settle-batch-audit']">
+          批量结算
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -112,10 +157,38 @@
       <el-table-column prop="phone" label="联系方式" width="120px" />
       <el-table-column prop="signUserName" label="登记人" min-width="90" />
       <el-table-column prop="dealDate" label="成交日期" width="120px" :formatter="dateFormatter" />
+      <el-table-column prop="createTime" label="支出日期" width="140px">
+        <template #default="{ row, col }">
+          <el-date-picker
+            v-if="row.edit"
+            v-model="row.createTime"
+            type="date"
+            size="small"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            style="width: 110px"
+            :clearable="false"
+            placeholder="选择日期"
+          />
+          <div v-else>{{ dateFormatter(row, col, row.createTime) }}</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="signProduct" label="成交产品" min-width="150px" />
       <el-table-column prop="signSpecs" label="成交规格" min-width="150px" />
       <el-table-column prop="supplier" label="供应商" min-width="150px" />
-      <el-table-column prop="settlementPrice" label="结算单价" min-width="150px" />
+      <el-table-column prop="settlementPrice" label="结算单价" min-width="150px">
+        <template #default="{ row }">
+          <el-input-number
+            v-if="row.edit"
+            v-model="row.settlementPrice"
+            size="small"
+            :min="0"
+            :controls="false"
+            style="width: 100%"
+          />
+          <div v-else>{{ row.settlementPrice }}</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="settlementNum" label="结算数量" min-width="150px" />
       <el-table-column prop="settlementMoney" label="结算金额" min-width="150px" />
       <el-table-column label="费用备注" width="90px">
@@ -136,6 +209,7 @@
       />
       <el-table-column prop="settlementUserName" label="结算人" min-width="90px" />
       <el-table-column prop="settlementType" label="结算类型" width="90px" fixed="right" />
+      <el-table-column prop="isCommissioned" label="提成状态" width="90px" fixed="right" />
       <el-table-column prop="settlementState" label="结算状态" width="90px" fixed="right" />
       <el-table-column label="结算备注" width="90px">
         <template #default="scope">
@@ -147,6 +221,19 @@
           </el-popover>
         </template>
       </el-table-column>
+      <el-table-column label="操作" width="100px" fixed="right">
+        <template #default="{ row }">
+          <el-button
+            v-if="row.settlementState == '待结算'"
+            type="primary"
+            text
+            v-hasPermi="['clue:order:settle-update']"
+            @click="handleUpdate(row)"
+          >
+            {{ row.edit ? '保存' : '修改' }}
+          </el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <Pagination
       v-model:limit="searchForm.pageSize"
@@ -196,6 +283,7 @@ const searchForm = ref({
   phone: undefined,
   signUser: undefined,
   dealDate: [],
+  createDate: [],
   signProduct: undefined,
   signSpecs: undefined,
   signId: undefined,
@@ -212,6 +300,7 @@ function handleReset() {
     phone: undefined,
     signUser: undefined,
     dealDate: [],
+    createDate: [],
     signProduct: undefined,
     signSpecs: undefined,
     signId: undefined,
@@ -264,6 +353,28 @@ function getSummaries(param) {
   return sums
 }
 
+async function handleUpdate(row) {
+  if (row.edit) {
+    // 删除的二次确认
+    await message.confirm('是否确认修改结算数据？')
+    // 保存
+    SettleApi.updateSettle({
+      settlementId: row.settlementId,
+      settlementPrice: row.settlementPrice,
+      createTime: row.createTime
+    })
+      .then(() => {
+        message.success('修改成功')
+        getList()
+      })
+      .finally(() => {
+        row.edit = false
+      })
+  } else {
+    row.edit = true
+  }
+}
+
 const selectList = ref([])
 function handleSelectionChange(val) {
   selectList.value = [...val]

src/views/Clue/Order/Comp/OrderList.vue

@@ -89,24 +89,31 @@
         min-width="120px"
       >
         <template #default="{ row }">
-          <el-popover
-            placement="top"
-            width="500px"
-            trigger="click"
-            v-if="item.field == 'remark' && row[item.field]"
-          >
+          <div v-if="item.field == 'remark' || item.form?.component == 'Editor'">
+            <el-popover placement="top" width="500px" trigger="click" v-if="row[item.field]">
               <template #reference>
                 <el-button type="primary" style="padding: 0" text>点击查看</el-button>
               </template>
-            <div v-dompurify-html="row.remark"></div>
+              <div v-dompurify-html="row[item.field]"></div>
             </el-popover>
+          </div>
           <span v-else-if="item.form?.component == 'DatePicker'">
             {{ formatDate(row[item.field]) }}
           </span>
+          <div v-else-if="item.form?.component == 'UploadImg'">
+            <el-image
+              v-if="row[item.field]"
+              :src="row[item.field]"
+              preview-teleported
+              :lazy="true"
+              :preview-src-list="[row[item.field]]"
+            />
+            <!-- <img v-if="row[item.field]" :src="row[item.field]" style="width: 100%; height: 100%" /> -->
+          </div>
           <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"
@@ -153,6 +160,7 @@
             type="primary"
             class="mr-10px"
             link
+            :disabled="scope.row.isCommissioned != '未发放'"
             style="padding: 0; margin-left: 0"
             v-hasPermi="['clue:pool:enroll']"
             @click="cancelDeal(scope.row)"
@@ -243,6 +251,11 @@ async function getTableList() {
       pageNo: tableObject.value.pageNo,
       pageSize: tableObject.value.pageSize
     }
+    searchFieldList.value.map((it) => {
+      if (params[it.field]) {
+        params.diyParams[it.field] = params[it.field]
+      }
+    })
     const data = await SignApi.getSignPage(removeNullField(params))
     tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams }))
     tableObject.value.total = data.total
@@ -252,10 +265,12 @@ async function getTableList() {
 }
 
 const loading = ref(true)
+const searchFieldList = ref([])
 async function getCurdSchemas() {
   loading.value = true
   try {
     const data = await getSimpleFieldList()
+    searchFieldList.value = data.filter((it) => it.isCustom)
     data.forEach((elem) => {
       if (['createUser'].includes(elem.field)) {
         elem.search.options = userOptions.value

src/views/Clue/Order/Comp/Reback.vue

@@ -8,7 +8,10 @@
         <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.state" placeholder="审核状态" clearable>
+        <el-input v-model="searchForm.mobile" placeholder="联系方式" clearable />
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.state" placeholder="审核状态" clearable style="width: 120px">
           <el-option label="待审核" :value="1" />
           <el-option label="已撤销" :value="2" />
           <el-option label="已通过" :value="3" />
@@ -16,7 +19,13 @@
         </el-select>
       </el-form-item>
       <el-form-item v-if="appStore.getAppInfo?.instanceType == 1">
-        <el-select v-model="searchForm.receiver" placeholder="接待人" clearable filterable>
+        <el-select
+          v-model="searchForm.receiver"
+          placeholder="接待人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in allUserOptions"
             :key="item.id"
@@ -26,7 +35,13 @@
         </el-select>
       </el-form-item>
       <el-form-item v-else-if="appStore.getAppInfo?.instanceType == 2">
-        <el-select v-model="searchForm.convertPeople" placeholder="转化人" clearable filterable>
+        <el-select
+          v-model="searchForm.convertPeople"
+          placeholder="转化人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in allUserOptions"
             :key="item.id"
@@ -36,7 +51,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
+        <el-select
+          v-model="searchForm.signUser"
+          placeholder="登记人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -54,10 +75,17 @@
           range-separator="-"
           start-placeholder="成交日期"
           end-placeholder="成交日期"
+          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.applyUser" placeholder="申请人" clearable filterable>
+        <el-select
+          v-model="searchForm.applyUser"
+          placeholder="申请人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -75,12 +103,27 @@
           range-separator="-"
           start-placeholder="申请日期"
           end-placeholder="申请日期"
+          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleSearch">查询</el-button>
-        <el-button @click="handleReset">重置</el-button>
-        <el-button @click="batchAudit">批量审核</el-button>
+        <el-date-picker
+          v-model="searchForm.checkTime"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          range-separator="-"
+          start-placeholder="审核日期"
+          end-placeholder="审核日期"
+          style="width: 240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch" v-hasPermi="['clue:order:return-search']">查询</el-button>
+        <el-button @click="handleReset" v-hasPermi="['clue:order:return-reset']">重置</el-button>
+        <el-button @click="batchAudit" v-hasPermi="['clue:order:return-batch-audit']">
+          批量审核
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -93,8 +136,8 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="60" :selectable="(row) => row.state == 1" />
-      <el-table-column prop="signId" label="成交单号" min-width="180px" />
-      <el-table-column prop="name" label="线索名称" 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">
         <template #default="{ row }">
@@ -145,8 +188,16 @@
           <div v-else>{{ row.personProfit }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="signPrice" label="成交价" min-width="90" />
-      <el-table-column prop="isPayoff" 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">
+            <el-option label="结清" :value="true" />
+            <el-option label="未结清" :value="false" />
+          </el-select>
+          <div v-else>{{ row.isPayoff }}</div>
+        </template>
+      </el-table-column>
       <el-table-column
         v-if="appStore.getAppInfo?.instanceType == 1"
         prop="receiverName"
@@ -159,6 +210,12 @@
         label="转化人"
         min-width="90"
       />
+      <el-table-column
+        v-if="appStore.getAppInfo?.instanceType == 1"
+        prop="area"
+        label="区域"
+        min-width="90"
+      />
       <el-table-column prop="signUserName" label="登记人" min-width="90" />
       <el-table-column
         prop="dealDate"
@@ -170,18 +227,48 @@
       <el-table-column
         prop="applyTime"
         label="申请时间"
+        min-width="140px"
+        :formatter="dateFormatter"
+      >
+        <template #default="{ row, col }">
+          <el-date-picker
+            v-if="row.edit"
+            v-model="row.applyTime"
+            type="date"
+            size="small"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            style="width: 110px"
+            :clearable="false"
+            placeholder="选择日期"
+          />
+          <div v-else>{{ dateFormatter(row, col, row.applyTime) }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="checkUser" label="审核人" min-width="90" />
+      <el-table-column
+        prop="checkTime"
+        label="审核时间"
         min-width="120px"
         :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" text @click="handleDetail(row)">
+          <el-button
+            type="primary"
+            class="mr-10px"
+            style="padding: 0; margin-left: 0"
+            text
+            v-hasPermi="['clue:order:return-detail']"
+            @click="handleDetail(row)"
+          >
             详情
           </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']"
@@ -191,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']"
@@ -201,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']"
@@ -236,7 +325,7 @@ import DialogBatchAudit from './DialogBatchAudit.vue'
 
 import { removeNullField } from '@/utils'
 import { useAppStore } from '@/store/modules/app'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
 
 const userStore = useUserStore()
 const message = useMessage() // 消息弹窗
@@ -254,6 +343,8 @@ const searchForm = ref({
   signUser: undefined,
   applyTime: [],
   applyUser: undefined,
+  checkTime: [],
+  phone: undefined,
   pageNo: 1,
   pageSize: 20
 })
@@ -280,6 +371,8 @@ function handleReset() {
     signUser: undefined,
     applyTime: [],
     applyUser: undefined,
+    checkTime: [],
+    mobile: undefined,
     pageNo: 1,
     pageSize: 20
   }
@@ -354,7 +447,7 @@ function getSummaries(param) {
     } else if (column.property == 'personProfit') {
       sums[index] = totalInfo.value.totalPersonProfit
     } else if (column.property == 'companyProfit') {
-      sums[index] = totalInfo.value.totalPersonProfit
+      sums[index] = totalInfo.value.totalCompanyProfit
     } else if (column.property == 'signPrice') {
       sums[index] = totalInfo.value.totalSignPrice
     } else {
@@ -370,15 +463,24 @@ async function handleUpdate(row) {
     // 删除的二次确认
     await message.confirm('是否确认修改回款金额？')
     // 保存
-    FeebackApi.updateApplyPayment({ id: row.id, money: row.money })
+    FeebackApi.updateApplyPayment({
+      id: row.id,
+      money: row.money,
+      companyProfit: row.companyProfit,
+      personProfit: row.personProfit,
+      isPayoff: row.isPayoffValue,
+      applyTime: formatDate(row.applyTime)
+    })
       .then(() => {
         message.success('修改成功')
+        getList()
       })
       .finally(() => {
         row.edit = false
       })
   } else {
     row.edit = true
+    row.isPayoffValue = row.isPayoff == '结清'
   }
 }
 

src/views/Clue/Order/Comp/SchoolSettle.vue

@@ -2,22 +2,44 @@
   <div>
     <el-form :model="searchForm" label-width="0" inline>
       <el-form-item>
-        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
+        <el-input
+          v-model="searchForm.signId"
+          placeholder="成交单号"
+          clearable
+          style="width: 120px"
+        />
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
+        <el-input v-model="searchForm.name" placeholder="线索名称" clearable style="width: 120px" />
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.phone" placeholder="联系方式" clearable />
+        <el-input
+          v-model="searchForm.phone"
+          placeholder="联系方式"
+          clearable
+          style="width: 120px"
+        />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.settlementType" placeholder="结算类型" clearable filterable>
+        <el-select
+          v-model="searchForm.settlementType"
+          placeholder="结算类型"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option label="报名费" value="报名费" />
           <el-option label="其他支出" value="其他支出" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
+        <el-select
+          v-model="searchForm.signUser"
+          placeholder="登记人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -35,6 +57,19 @@
           range-separator="-"
           start-placeholder="成交日期"
           end-placeholder="成交日期"
+          style="width: 240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.createDate"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          range-separator="-"
+          start-placeholder="支出日期"
+          end-placeholder="支出日期"
+          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
@@ -44,6 +79,7 @@
           filterable
           clearable
           @change="changeSchool"
+          style="width: 120px"
         >
           <el-option
             v-for="item in schoolOptions"
@@ -61,6 +97,7 @@
           clearable
           :disabled="!searchForm.signSchool"
           @change="changePlace"
+          style="width: 120px"
         >
           <el-option
             v-for="item in placeOptions"
@@ -77,6 +114,7 @@
           placeholder="选择班型"
           filterable
           clearable
+          style="width: 120px"
         >
           <el-option
             v-for="item in classOptions"
@@ -93,9 +131,11 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleSearch">查询</el-button>
-        <el-button @click="handleReset">重置</el-button>
-        <el-button @click="batchSettle">批量结算</el-button>
+        <el-button @click="handleSearch" v-hasPermi="['clue:order:settle-search']">查询</el-button>
+        <el-button @click="handleReset" v-hasPermi="['clue:order:settle-reset']">重置</el-button>
+        <el-button @click="batchSettle" v-hasPermi="['clue:order:settle-batch-audit']">
+          批量结算
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -118,10 +158,38 @@
       <el-table-column prop="phone" label="联系方式" width="120px" />
       <el-table-column prop="signUserName" label="登记人" min-width="90" />
       <el-table-column prop="dealDate" label="成交日期" width="120px" :formatter="dateFormatter" />
+      <el-table-column prop="createTime" label="支出日期" width="140px">
+        <template #default="{ row, col }">
+          <el-date-picker
+            v-if="row.edit"
+            v-model="row.createTime"
+            type="date"
+            size="small"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            style="width: 110px"
+            :clearable="false"
+            placeholder="选择日期"
+          />
+          <div v-else>{{ dateFormatter(row, col, row.createTime) }}</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="signSchool" label="成交驾校" min-width="150px" />
       <el-table-column prop="signPlace" label="成交场地" min-width="150px" />
       <el-table-column prop="signClass" label="成交班型" min-width="150px" />
-      <el-table-column prop="settlementPrice" label="结算单价" min-width="150px" />
+      <el-table-column prop="settlementPrice" label="结算单价" min-width="150px">
+        <template #default="{ row }">
+          <el-input-number
+            v-if="row.edit"
+            v-model="row.settlementPrice"
+            size="small"
+            :min="0"
+            :controls="false"
+            style="width: 100%"
+          />
+          <div v-else>{{ row.settlementPrice }}</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="settlementNum" label="结算数量" min-width="150px" />
       <el-table-column prop="settlementMoney" label="结算金额" min-width="150px" />
       <el-table-column label="费用备注" width="90px">
@@ -142,6 +210,7 @@
       />
       <el-table-column prop="settlementUserName" label="结算人" min-width="90px" />
       <el-table-column prop="settlementType" label="结算类型" width="90px" fixed="right" />
+      <el-table-column prop="isCommissioned" label="提成状态" width="90px" fixed="right" />
       <el-table-column prop="settlementState" label="结算状态" width="90px" fixed="right" />
       <el-table-column label="结算备注" width="90px">
         <template #default="scope">
@@ -153,6 +222,19 @@
           </el-popover>
         </template>
       </el-table-column>
+      <el-table-column label="操作" width="100px" fixed="right">
+        <template #default="{ row }">
+          <el-button
+            v-if="row.settlementState == '待结算'"
+            type="primary"
+            text
+            v-hasPermi="['clue:order:settle-update']"
+            @click="handleUpdate(row)"
+          >
+            {{ row.edit ? '保存' : '修改' }}
+          </el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <Pagination
       v-model:limit="searchForm.pageSize"
@@ -203,6 +285,7 @@ const searchForm = ref({
   phone: undefined,
   signUser: undefined,
   dealDate: [],
+  createDate: [],
   signSchool: undefined,
   signPlace: undefined,
   signClass: undefined,
@@ -219,6 +302,7 @@ function handleReset() {
     phone: undefined,
     signUser: undefined,
     dealDate: [],
+    createDate: [],
     signSchool: undefined,
     signPlace: undefined,
     signClass: undefined,
@@ -252,6 +336,28 @@ async function getList() {
   }
 }
 
+async function handleUpdate(row) {
+  if (row.edit) {
+    // 删除的二次确认
+    await message.confirm('是否确认修改结算数据？')
+    // 保存
+    SettleApi.updateSettle({
+      settlementId: row.settlementId,
+      settlementPrice: row.settlementPrice,
+      createTime: row.createTime
+    })
+      .then(() => {
+        message.success('修改成功')
+        getList()
+      })
+      .finally(() => {
+        row.edit = false
+      })
+  } else {
+    row.edit = true
+  }
+}
+
 function getSummaries(param) {
   const { columns } = param
   const sums = []

src/views/Clue/Order/index.vue

@@ -1,21 +1,29 @@
 <template>
   <el-tabs v-model="tabName">
-    <el-tab-pane label="成交列表" name="list">
+    <el-tab-pane label="成交列表" name="list" v-if="checkPermi(['clue:order:order-list'])">
       <template v-if="tabName == 'list'">
         <OrderList v-if="appStore.getAppInfo?.instanceType == 1" />
         <MallOrderList v-else-if="appStore.getAppInfo?.instanceType == 2" />
       </template>
     </el-tab-pane>
-    <el-tab-pane label="回款申请" name="commission">
+    <el-tab-pane label="回款申请" name="commission" v-if="checkPermi(['clue:order:return-list'])">
       <Reback v-if="tabName == 'commission'" />
     </el-tab-pane>
-    <el-tab-pane label="售后申请" name="aftersale">
+    <el-tab-pane
+      label="售后申请"
+      name="aftersale"
+      v-if="checkPermi(['clue:order:after-sale-list'])"
+    >
       <AfterSales v-if="tabName == 'aftersale'" />
     </el-tab-pane>
-    <el-tab-pane label="发货列表" name="delivery" v-if="appStore.getAppInfo?.instanceType == 2">
+    <el-tab-pane
+      label="发货列表"
+      name="delivery"
+      v-if="appStore.getAppInfo?.instanceType == 2 && checkPermi(['clue:order:delivery-list'])"
+    >
       <Delivery v-if="tabName == 'delivery'" />
     </el-tab-pane>
-    <el-tab-pane label="对外结算" name="settle" v-if="checkPermi(['clue:order:settle'])">
+    <el-tab-pane label="对外结算" name="settle" v-if="checkPermi(['clue:order:settle-list'])">
       <Settle v-if="tabName == 'settle'" />
     </el-tab-pane>
   </el-tabs>

src/views/Clue/Pool/Comp/ClueMap.vue

@@ -39,6 +39,7 @@
 
 <script setup name="ClueMap">
 import { getPlaceList } from '@/api/school/place'
+import { getConfigByConfigKey } from '@/api/system/set'
 
 import ImgPostion from '@/assets/imgs/flag/position_black.png'
 import FlagRed from '@/assets/imgs/flag/flag_red.png'
@@ -69,9 +70,17 @@ const defaultLatLng = ref({
   lat: 31.86119,
   lng: 117.283042
 })
+const defaultCity = ref('合肥')
 
 let AutoComplete = ref(null)
-function initMap() {
+async function initMap() {
+  const data = await getConfigByConfigKey({ configKey: 'defaultLocation' })
+  const cityInfo = JSON.parse(data.configValue)
+  defaultLatLng.value = {
+    lat: cityInfo.lat,
+    lng: cityInfo.lng
+  }
+  defaultCity.value = cityInfo.locationName
   AMapLoader.load({
     key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key
     version: '2.0',
@@ -79,7 +88,7 @@ function initMap() {
   }).then((AMap) => {
     aMap.value = AMap
     AutoComplete.value = new AMap.AutoComplete({
-      city: '合肥'
+      city: defaultCity.value
     })
     clueMap.value = new AMap.Map('mapClue', {
       zoom: 14,

src/views/Clue/Pool/Comp/DialogBatchChangeFollow.vue

@@ -0,0 +1,98 @@
+<template>
+  <Dialog title="批量修改跟进人" v-model="show" width="400px">
+    <el-form :model="form" ref="formRef" :rules="rules" label-width="auto">
+      <el-form-item label="修改线索数">
+        {{ form.clueIdList.length }}
+      </el-form-item>
+      <el-form-item label="原跟进人" prop="originFollowUserId">
+        <el-select v-model="form.originFollowUserId" placeholder="原跟进人" filterable>
+          <el-option
+            v-for="item in props.userOptions"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="新跟进人" prop="newFollowUserId">
+        <el-select v-model="form.newFollowUserId" placeholder="新跟进人" filterable>
+          <el-option
+            v-for="item in props.userOptions"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span>
+        <el-button @click="show = false">取 消</el-button>
+        <el-button :disabled="formLoading" type="primary" @click="handleSave">保 存</el-button>
+      </span>
+    </template>
+  </Dialog>
+</template>
+
+<script setup name="DialogBatchChangeFollow">
+import { batchUpdateFollowUser } from '@/api/clue'
+
+const message = useMessage() // 消息弹窗
+const props = defineProps({
+  userOptions: {
+    type: Array
+  }
+})
+
+const show = ref(false)
+const form = ref({
+  clueIdList: [],
+  originFollowUserId: undefined,
+  newFollowUserId: undefined
+})
+
+const rules = ref({
+  originFollowUserId: { required: true, message: '原跟进人不可为空', trigger: 'change' }
+  // newFollowUserId: { required: true, message: '新跟进人不可为空', trigger: 'change' }
+})
+
+function open(clueIdList) {
+  resetForm(clueIdList)
+  show.value = true
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+function resetForm(clueIdList) {
+  form.value = {
+    clueIdList,
+    originFollowUserId: undefined,
+    newFollowUserId: undefined
+  }
+}
+
+const formLoading = ref(false)
+const emit = defineEmits(['success'])
+const formRef = ref()
+async function handleSave() {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  // 提交请求
+  formLoading.value = true
+  try {
+    await batchUpdateFollowUser(form.value)
+    message.success('修改成功！')
+    show.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } catch (err) {
+    console.log(err)
+  } finally {
+    formLoading.value = false
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/Clue/Pool/Comp/DialogClue.vue

@@ -33,7 +33,7 @@
                 v-model="row.nextFollowTime"
                 type="date"
                 placeholder="选择日期时间"
-                :disabled="!row.editable"
+                :disabled="row.userId != useUserStore().getUser.id"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 style="width: 100%"
@@ -47,7 +47,7 @@
                 type="textarea"
                 :autoSize="{ minRows: 2 }"
                 placeholder="输入跟进内容"
-                :disabled="!row.editable"
+                :disabled="row.userId != useUserStore().getUser.id"
               />
             </template>
           </el-table-column>
@@ -133,6 +133,7 @@
 import { useAppStore } from '@/store/modules/app'
 import { useUserStore } from '@/store/modules/user'
 import { getPlaceList } from '@/api/school/place'
+import { getConfigByConfigKey } from '@/api/system/set'
 import * as ClueApi from '@/api/clue'
 import { getDiyFieldList } from '@/api/clue/clueField'
 import { formatDate } from '@/utils/formatTime'
@@ -168,8 +169,12 @@ const formSchema = computed(() => {
   newSchema.forEach((it) => {
     if (it.field == 'consultTime') {
       it.componentProps['disabled-date'] = dateAfterToday
-      it.componentProps['disabled'] = formType.value != 'create'
+      // it.componentProps['disabled'] = formType.value != 'create'
+      it.componentProps['disabled'] = true
     }
+    // else if (it.field == 'convertPeople' && formType.value == 'update') {
+    //   it.componentProps['disabled'] = true
+    // }
     if (it.field == 'convertPeople') {
       it.options = props.allUserOptions.map((it) => ({ ...it, name: it.nickname }))
     }
@@ -198,6 +203,20 @@ const formSchema = computed(() => {
   ]
 })
 
+const rules = computed(() => {
+  let ruleObj = {}
+  props.schema.map((it) => {
+    if (it.isRequired) {
+      Reflect.set(ruleObj, it.field, {
+        required: true,
+        message: `${it.label}不可为空`,
+        trigger: 'blur, change'
+      })
+    }
+  })
+  return ruleObj
+})
+
 const dateAfterToday = (t) => {
   return t.getTime() > Date.now()
 }
@@ -208,14 +227,6 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formRef = ref() // 表单 Ref
 
-const rules = {
-  name: { required: true, message: '线索名称不可为空', trigger: 'blur' },
-  phone: { required: true, message: '联系方式不可为空', trigger: 'blur' },
-  source: { required: true, message: '线索来源不可为空', trigger: 'change' },
-  intentionState: { required: true, message: '意向状态不可为空', trigger: 'change' },
-  consultTime: { required: true, message: '咨询日期不可为空', trigger: 'change' }
-}
-
 const tabName = ref('info')
 
 const followList = ref([])
@@ -226,6 +237,7 @@ const defaultLatLng = ref({
   lat: 31.86119,
   lng: 117.283042
 })
+const defaultCity = ref('合肥')
 const info = ref({})
 
 const diyFieldArr = ref([])
@@ -265,9 +277,14 @@ const open = async (type, id) => {
       }
     ]
     address.value = ''
+    if (appStore.getAppInfo?.instanceType == 1) {
+      const data = await getConfigByConfigKey({ configKey: 'defaultLocation' })
+      const cityInfo = JSON.parse(data.configValue)
       defaultLatLng.value = {
-      lat: 31.86119,
-      lng: 117.283042
+        lat: cityInfo.lat,
+        lng: cityInfo.lng
+      }
+      defaultCity.value = cityInfo.locationName
     }
     nextTick(() => {
       formRef.value.setValues(info.value, true)
@@ -347,8 +364,8 @@ async function handleSave() {
       const data = await ClueApi.createClue(params)
       message.success(data)
     } else {
-      const data = await ClueApi.updateClue(params)
-      message.success(data)
+      await ClueApi.updateClue(params)
+      message.success('修改成功')
     }
     dialogVisible.value = false
     // 发送操作成功的事件
@@ -396,7 +413,7 @@ function initMap(data) {
     })
     addmark(defaultLatLng.value.lng, defaultLatLng.value.lat, AMap)
     AutoComplete.value = new AMap.AutoComplete({
-      city: '合肥'
+      city: defaultCity.value
     })
     geoCoder.value = new AMap.Geocoder()
     dialogMap.value.on('click', (e) => {

src/views/Clue/Pool/Comp/DialogSchoolInfo.vue

@@ -1,18 +1,44 @@
 <template>
   <el-dialog width="800px" :title="title" v-model="show" append-to-body>
+    <el-divider direction="horizontal" content-position="left" style="margin-top: 10px">
+      场地班型
+    </el-divider>
+    <el-table :data="tableList" border stripe size="small">
+      <el-table-column type="index" width="50" />
+      <el-table-column prop="typeName" label="班型名称" />
+      <el-table-column prop="licenseType" label="驾照类型" />
+      <el-table-column label="班型备注">
+        <template #default="{ row }">
+          <el-popover placement="top" width="500px" trigger="click">
+            <template #reference>
+              <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+            </template>
+            <div v-dompurify-html="row.remark"></div>
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-divider direction="horizontal" content-position="left">场地详细信息</el-divider>
     <div v-dompurify-html="detail" class="mb-20px"></div>
   </el-dialog>
 </template>
 
 <script setup name="DialogSchoolInfo">
+import { getClassTypeList } from '@/api/school/class'
 const title = ref('')
 const show = ref(false)
 const detail = ref('')
 
+const tableList = ref([])
 function open(info) {
   title.value = `【${info.schoolName}】详细信息`
   show.value = true
   detail.value = info.introduce || '该驾校暂未配置详细信息'
+
+  getClassTypeList({ placeId: info.placeId, status: 0 }).then((data) => {
+    tableList.value = data
+  })
 }
 
 defineExpose({

src/views/Clue/Pool/Comp/DialogSuccess.vue

@@ -11,7 +11,7 @@
       labelWidth="130px"
       :defaultShow="false"
     />
-    <el-form :model="form" ref="formRef" :rules="rules" label-width="auto" class="mt-20px">
+    <el-form :model="form" ref="formRef" :rules="rules" label-width="100px" class="mt-20px">
       <el-row :gutter="20">
         <!-- 驾校招生模式 -->
         <template v-if="appStore.getAppInfo?.instanceType == 1">
@@ -118,7 +118,13 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="8" :offset="0" v-if="appStore.getAppInfo?.instanceType == 1">
+        <template v-if="appStore.getAppInfo?.instanceType == 1">
+          <el-col :span="8" :offset="0" v-if="form.signClass">
+            <el-form-item label="利润">
+              <div style="color: blue; font-weight: bold; font-size: 16px">{{ profitNum }}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" :offset="0">
             <el-form-item label="接待人" prop="receiver">
               <el-select v-model="form.receiver" placeholder="选择接待人" clearable filterable>
                 <el-option
@@ -130,8 +136,20 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </template>
+        <template v-else>
+          <el-col :span="8" :offset="0">
+            <el-form-item label="安装状态" prop="installStatus">
+              <el-select v-model="form.installStatus">
+                <el-option label="待安装" :value="1" />
+                <el-option label="已安装" :value="2" />
+                <el-option label="无需安装" :value="3" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </template>
         <el-col
-          :span="8"
+          :span="fieldItem.component == 'Editor' ? 24 : 8"
           :offset="0"
           v-for="fieldItem in diyFieldList"
           :key="fieldItem.clueParamId"
@@ -323,11 +341,13 @@
 
 <script setup name="DialogSuccess">
 import * as ClueApi from '@/api/clue'
-import { createSign } from '@/api/clue/sign'
+import { createSign, getSignProfit } from '@/api/clue/sign'
 import { getDiyFieldList } from '@/api/clue/orderField'
 import { getPlaceList } from '@/api/school/place'
 import { getClassTypeList } from '@/api/school/class'
 import { getSimpleProductList } from '@/api/mall/product'
+import { getConfigByConfigKey } from '@/api/system/set'
+import { getSimpleFieldList } from '@/api/clue/orderField'
 
 // import { getSimpleWarehouseList } from '@/api/mall/warehouse'
 import { formatDate } from '@/utils/formatTime'
@@ -337,11 +357,6 @@ import { useAppStore } from '@/store/modules/app'
 
 const show = ref(false)
 const form = ref({})
-const rules = ref({
-  dealDate: { required: true, message: '成交日期不可为空', trigger: 'change' },
-  payAmount: { required: true, message: '支付金额不可为空', trigger: 'change,blur' },
-  signPrice: { required: true, message: '支付金额不可为空', trigger: 'change,blur' }
-})
 
 const schoolRules = {
   signSchool: { required: true, message: '成交驾校不可为空', trigger: 'change' },
@@ -401,11 +416,29 @@ const showSchema = computed(() => {
   return [...list, ...arr]
 })
 
+// const rules = computed(() => {
+//   let ruleObj = {}
+//   props.schema.map((it) => {
+//     if (it.isRequired) {
+//       Reflect.set(ruleObj, it.field, {
+//         required: true,
+//         message: `${it.label}不可为空`,
+//         trigger: 'blur, change'
+//       })
+//     }
+//   })
+//   if (appStore.getAppInfo?.instanceType == 1) {
+//     ruleObj = { ...ruleObj, ...schoolRules }
+//   }
+//   return ruleObj
+// })
+
 const extraPayOptions = getDictOptions('other_pay_type')
 
 async function open(id) {
   try {
     resetForm(id)
+    getDiyFields()
     const data = await ClueApi.getClue(id)
     info.value = { ...data, ...data.diyParams }
     show.value = true
@@ -415,7 +448,28 @@ async function open(id) {
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
-function resetForm(id) {
+const rules = ref([])
+function getDiyFields() {
+  getSimpleFieldList().then((data) => {
+    let ruleObj = {}
+    data.map((it) => {
+      if (it.isRequired) {
+        Reflect.set(ruleObj, it.field, {
+          required: true,
+          message: `${it.label}不可为空`,
+          trigger: 'blur, change'
+        })
+      }
+    })
+    if (appStore.getAppInfo?.instanceType == 1) {
+      ruleObj = { ...ruleObj, ...schoolRules }
+    }
+    rules.value = ruleObj
+  })
+}
+
+async function resetForm(id) {
+  const data = await getConfigByConfigKey({ configKey: 'companyCollectionConfig' })
   form.value = {
     clueId: id,
     dealDate: formatDate(new Date()),
@@ -423,10 +477,11 @@ function resetForm(id) {
     signPrice: 0,
     payAmount: 0,
     remark: undefined,
-    isCompanyReceipts: appStore.getAppInfo?.instanceType == 2,
+    isCompanyReceipts: data.configValue == 'true',
     receiver: undefined,
     extraPay: [],
-    signProducts: []
+    signProducts: [],
+    installStatus: 3
   }
 }
 
@@ -544,6 +599,19 @@ function signPriceChange() {
   if (form.value.isPayoff) {
     form.value.payAmount = form.value.signPrice
   }
+  calcSignProfit()
+}
+
+const profitNum = ref(0)
+function calcSignProfit() {
+  if (form.value.signClass && appStore.getAppInfo?.instanceType == 1) {
+    // 计算员工利润
+    getSignProfit({ signClass: form.value.signClass, signPrice: form.value.signPrice }).then(
+      (data) => {
+        profitNum.value = data
+      }
+    )
+  }
 }
 
 function handleRemove(type, index) {
@@ -551,9 +619,6 @@ function handleRemove(type, index) {
 }
 
 onMounted(() => {
-  if (appStore.getAppInfo?.instanceType == 1) {
-    rules.value = { ...rules.value, ...schoolRules }
-  }
   getOptions()
 })
 </script>

src/views/Clue/Pool/Comp/DrawerClue.vue

@@ -22,7 +22,13 @@
           <el-button type="primary" v-hasPermi="['clue:pool:update']" plain @click="handleUpdate">
             修改
           </el-button>
-          <el-button type="danger" v-hasPermi="['clue:pool:delete']" plain @click="handleRemove">
+          <el-button
+            type="danger"
+            v-if="info.state != '成交'"
+            v-hasPermi="['clue:pool:delete']"
+            plain
+            @click="handleRemove"
+          >
             删除
           </el-button>
         </div>

src/views/Clue/Pool/index.vue

@@ -14,7 +14,7 @@
         </el-tab-pane>
         <el-tab-pane name="2">
           <template #label>
-            <Tooltip message="下次跟进时间在今日之前的未成交线索" />
+            <Tooltip message="下次跟进时间在今日及之前的未成交线索" />
             <el-badge v-if="clueCount.followNum" :value="clueCount.followNum" :max="9999">
               <span class="ml-3px">待跟进</span>
             </el-badge>
@@ -53,6 +53,12 @@
         <template #actionMore>
           <el-button @click="getTableList" v-hasPermi="['clue:pool:search']"> 搜索 </el-button>
           <el-button @click="resetQuery" v-hasPermi="['clue:pool:reset']"> 重置 </el-button>
+          <el-button
+            @click="handleBatchChangeFollow"
+            v-hasPermi="['clue:pool:batch-update-follow']"
+          >
+            批量修改跟进人
+          </el-button>
         </template>
       </Search>
       <!-- 列表 -->
@@ -63,7 +69,9 @@
         :tableColumns="allSchemas.tableColumns"
         @get-list="getTableList"
         @get-checked-columns="getCheckedColumns"
+        @selection-change="handleSelectionChange"
       >
+        <el-table-column type="selection" width="60" />
         <el-table-column
           v-for="item in showColumns"
           :key="item.field"
@@ -178,6 +186,11 @@
       @success="getTableList"
     />
     <DialogFollow ref="followRef" @success="getTableList" />
+    <DialogBatchChangeFollow
+      ref="batchChangeFollowDialog"
+      :userOptions="allStatusUserOptions"
+      @success="getTableList"
+    />
   </div>
 </template>
 
@@ -189,7 +202,12 @@ import DrawerClue from './Comp/DrawerClue.vue'
 import DialogSuccess from './Comp/DialogSuccess.vue'
 import DialogFollow from './Comp/DialogFollow.vue'
 import ClueMap from './Comp/ClueMap.vue'
-import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
+import DialogBatchChangeFollow from './Comp/DialogBatchChangeFollow.vue'
+import {
+  getSimpleUserList as getUserOption,
+  getAllUserList,
+  getAllUserListWithHire
+} from '@/api/system/user'
 
 import { removeNullField } from '@/utils'
 import { formatDate } from '@/utils/formatTime'
@@ -210,14 +228,18 @@ const followRef = ref()
 const loading = ref(true)
 
 const allSchemas = ref({})
+const searchFieldList = ref([])
 
 async function getCurdSchemas() {
   loading.value = true
   try {
     const data = await getSimpleFieldList()
+    searchFieldList.value = data.filter((it) => it.isCustom)
     data.forEach((elem) => {
-      if (elem.field == 'followUser' || elem.field == 'convertPeople') {
+      if (['followUser', 'convertPeople'].includes(elem.field)) {
         elem.search.options = userOptions.value
+      } else if (['firstFollowUser'].includes(elem.field)) {
+        elem.search.options = allStatusUserOptions.value
       }
     })
     allSchemas.value = useCrudSchemas(data).allSchemas
@@ -270,12 +292,18 @@ async function getTableList() {
   getSearchCount()
   try {
     const queryParams = await searchRef.value.getFormModel()
-    const params = {
+    let params = {
       ...queryParams,
       pageNo: tableObject.value.pageNo,
       pageSize: tableObject.value.pageSize,
-      queryType: queryType.value
+      queryType: queryType.value,
+      diyParams: {}
     }
+    searchFieldList.value.map((it) => {
+      if (params[it.field]) {
+        params.diyParams[it.field] = params[it.field]
+      }
+    })
     const data = await ClueApi.getCluePage(removeNullField(params))
     tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams }))
     tableObject.value.total = data.total
@@ -295,6 +323,20 @@ function getSearchCount() {
   })
 }
 
+const batchIds = ref([])
+function handleSelectionChange(val) {
+  batchIds.value = val.map((it) => it.clueId)
+}
+
+const batchChangeFollowDialog = ref()
+function handleBatchChangeFollow() {
+  if (batchIds.value.length) {
+    batchChangeFollowDialog.value.open(batchIds.value)
+  } else {
+    message.info('请选择表格中的数据！')
+  }
+}
+
 // 新增
 function handleInsert() {
   formRef.value.open('create', null)
@@ -359,10 +401,12 @@ function handleGain(id) {
 
 const userOptions = ref([])
 const allUserOptions = ref([])
+const allStatusUserOptions = ref([])
 
 onMounted(async () => {
   userOptions.value = await getUserOption()
   allUserOptions.value = await getAllUserList()
+  allStatusUserOptions.value = await getAllUserListWithHire()
   getCurdSchemas()
 })
 </script>

src/views/Clue/Set/Comp/ClueSource.vue

@@ -9,6 +9,12 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
+      <el-form-item>
+        <el-radio-group v-model="searchForm.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">搜索</el-button>
         <el-button @click="resetQuery">重置</el-button>
@@ -59,7 +65,8 @@ const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
 const searchForm = ref({
-  sourceName: undefined
+  sourceName: undefined,
+  status: 0
 })
 
 const sourceDialog = ref()
@@ -71,7 +78,8 @@ function handleQuery() {
 }
 function resetQuery() {
   searchForm.value = {
-    sourceName: ''
+    sourceName: '',
+    status: 0
   }
   getList()
 }

src/views/Clue/Set/Comp/DialogExtraFee.vue

@@ -5,10 +5,16 @@
       v-loading="formLoading"
       :model="formData"
       :rules="formRules"
-      label-width="80px"
+      label-width="auto"
     >
-      <el-form-item label="支出项" prop="label">
-        <el-input v-model="formData.label" placeholder="请输入支出项" />
+      <el-form-item label="支出项" prop="extraPayName">
+        <el-input v-model="formData.extraPayName" placeholder="请输入支出项" />
+      </el-form-item>
+      <el-form-item label="是否扣除提成" prop="isPercentage">
+        <el-radio-group v-model="formData.isPercentage">
+          <el-radio :label="true">是</el-radio>
+          <el-radio :label="false">否</el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="排序" prop="sort">
         <el-input v-model="formData.sort" placeholder="请输入排序" type="number" :min="0" />
@@ -29,7 +35,8 @@
   </Dialog>
 </template>
 <script name="DialogExtraFee" setup>
-import * as dictApi from '@/api/system/dict/dict.data'
+import * as ExtraFeeApi from '@/api/clue/extraFee'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -38,12 +45,13 @@ const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
-  label: '',
+  extraPayName: '',
+  isPercentage: false,
   sort: 1,
   remark: ''
 })
 const formRules = reactive({
-  label: [{ required: true, message: '支出项不能为空', trigger: 'blur' }]
+  extraPayName: [{ required: true, message: '支出项不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -57,7 +65,7 @@ const open = async (type, id) => {
   if (id) {
     formLoading.value = true
     try {
-      formData.value = await dictApi.getDictData(id)
+      formData.value = await ExtraFeeApi.getExtraFee(id)
     } finally {
       formLoading.value = false
     }
@@ -75,14 +83,11 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    if (!formData.value.value) {
-      formData.value.value = formData.value.label
-    }
     if (formType.value === 'create') {
-      await dictApi.createDictData(formData.value)
+      await ExtraFeeApi.createExtraFee(formData.value)
       message.success(t('common.createSuccess'))
     } else {
-      await dictApi.updateDictData(formData.value)
+      await ExtraFeeApi.updateExtraFee(formData.value)
       message.success(t('common.updateSuccess'))
     }
     dialogVisible.value = false
@@ -96,10 +101,10 @@ const submitForm = async () => {
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-    label: '',
+    extraPayName: '',
+    isPercentage: false,
     sort: 1,
     status: 0,
-    dictType: 'extra_pay_type',
     remark: ''
   }
   formRef.value?.resetFields()

src/views/Clue/Set/Comp/ExtraFeeType.vue

@@ -3,7 +3,7 @@
     <el-form ref="queryForm" :model="searchForm" label-width="0" inline>
       <el-form-item>
         <el-input
-          v-model="searchForm.name"
+          v-model="searchForm.extraPayName"
           placeholder="请输入名称"
           clearable
           @keyup.enter="handleQuery"
@@ -16,7 +16,12 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="tableList">
-      <el-table-column prop="label" label="支出项" />
+      <el-table-column prop="extraPayName" label="支出项" />
+      <el-table-column prop="isPercentage" label="是否扣除提成">
+        <template #default="{ row }">
+          {{ row.isPercentage ? '是' : '否' }}
+        </template>
+      </el-table-column>
       <el-table-column prop="sort" label="排序" width="100px" />
       <el-table-column prop="remark" label="备注" />
       <el-table-column
@@ -27,22 +32,10 @@
       />
       <el-table-column label="操作">
         <template #default="scope">
-          <el-button
-            type="primary"
-            :disabled="!scope.row.editable"
-            text
-            @click="openForm('update', scope.row.id)"
-          >
+          <el-button type="primary" text @click="openForm('update', scope.row.id)">
             修改
           </el-button>
-          <el-button
-            type="danger"
-            :disabled="!scope.row.editable"
-            text
-            @click="handleDelete(scope.row.id)"
-          >
-            删除
-          </el-button>
+          <el-button type="danger" text @click="handleDelete(scope.row.id)"> 删除 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -60,16 +53,16 @@
 <script setup name="ExtraFeeType">
 import { dateFormatter } from '@/utils/formatTime'
 import DialogExtraFee from './DialogExtraFee.vue'
-import * as dictApi from '@/api/system/dict/dict.data'
+import * as ExtraFeeApi from '@/api/clue/extraFee'
+import { removeNullField } from '@/utils'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const searchForm = ref({
-  label: '',
+  extraPayName: '',
   pageSize: 20,
-  pageNo: 1,
-  dictType: 'extra_pay_type'
+  pageNo: 1
 })
 
 const total = ref(0)
@@ -83,10 +76,9 @@ function handleQuery() {
 }
 function resetQuery() {
   searchForm.value = {
-    label: '',
+    extraPayName: '',
     pageSize: 20,
-    pageNo: 1,
-    dictType: 'extra_pay_type'
+    pageNo: 1
   }
   getList()
 }
@@ -94,7 +86,7 @@ function resetQuery() {
 async function getList() {
   loading.value = true
   try {
-    const data = await dictApi.getDictDataPage(searchForm.value)
+    const data = await ExtraFeeApi.getExtraFeePage(removeNullField(searchForm.value))
     tableList.value = data.list
     total.value = data.total
   } finally {
@@ -111,7 +103,7 @@ async function handleDelete(id) {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await dictApi.deleteDictData(id)
+    await ExtraFeeApi.deleteExtraFee(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()

src/views/Clue/Set/Comp/FieldClue.vue

@@ -5,11 +5,16 @@
       <el-table :data="tableList" :row-class-name="setRowClass" @row-click="handleRowClick">
         <el-table-column prop="label" label="名称" />
         <el-table-column prop="field" label="属性编码" />
-        <el-table-column prop="component" label="类型" width="200px">
+        <el-table-column prop="component" label="类型">
           <template #default="{ row }">
             {{ typeOptions.find((it) => it.value == row.component).label }}
           </template>
         </el-table-column>
+        <el-table-column label="是否必填" width="80">
+          <template #default="{ row }">
+            {{ row.isRequired ? '必填' : '非必填' }}
+          </template>
+        </el-table-column>
         <el-table-column label="启用状态" width="100">
           <template #default="{ row }">
             <el-switch
@@ -43,6 +48,12 @@
           </template>
           <el-input v-model="form.field" placeholder="请输入属性编码" />
         </el-form-item>
+        <el-form-item label="是否必填" prop="isRequired">
+          <el-radio-group v-model="form.isRequired">
+            <el-radio :label="true"> 必填 </el-radio>
+            <el-radio :label="false"> 非必填 </el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="属性类型" prop="component">
           <el-select
             v-model="form.component"
@@ -118,6 +129,7 @@ const form = ref({
   component: undefined,
   options: [],
   status: 0,
+  isRequired: false,
   isCustom: true,
   isForm: true,
   isSearch: true,
@@ -157,6 +169,7 @@ function handleInsert() {
     component: undefined,
     options: [],
     status: 0,
+    isRequired: false,
     isCustom: true,
     isForm: true,
     isSearch: true,

src/views/Clue/Set/Comp/FieldOrder.vue

@@ -5,11 +5,16 @@
       <el-table :data="tableList" :row-class-name="setRowClass" @row-click="handleRowClick">
         <el-table-column prop="label" label="名称" />
         <el-table-column prop="field" label="属性编码" />
-        <el-table-column prop="component" label="类型" width="200px">
+        <el-table-column prop="component" label="类型">
           <template #default="{ row }">
             {{ typeOptions.find((it) => it.value == row.component).label }}
           </template>
         </el-table-column>
+        <el-table-column label="是否必填" width="80">
+          <template #default="{ row }">
+            {{ row.isRequired ? '必填' : '非必填' }}
+          </template>
+        </el-table-column>
         <el-table-column label="启用状态" width="100">
           <template #default="{ row }">
             <el-switch
@@ -43,6 +48,12 @@
           </template>
           <el-input v-model="form.field" placeholder="请输入属性编码" />
         </el-form-item>
+        <el-form-item label="是否必填" prop="isRequired">
+          <el-radio-group v-model="form.isRequired">
+            <el-radio :label="true"> 必填 </el-radio>
+            <el-radio :label="false"> 非必填 </el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="属性类型" prop="component">
           <el-select
             v-model="form.component"
@@ -118,6 +129,7 @@ const form = ref({
   component: undefined,
   options: [],
   status: 0,
+  isRequired: false,
   isCustom: true,
   isForm: true,
   isSearch: true,
@@ -157,6 +169,7 @@ function handleInsert() {
     component: undefined,
     options: [],
     status: 0,
+    isRequired: false,
     isCustom: true,
     isForm: true,
     isSearch: true,

src/views/Clue/Skill/index.vue

@@ -61,6 +61,7 @@
 <script setup name="ClueSkill">
 import * as SkillApi from '@/api/clue/skill'
 import DialogSkill from './Comp/DialogSkill.vue'
+import { removeNullField } from '@/utils'
 
 const skillDialog = ref()
 
@@ -95,7 +96,7 @@ function handleQuery() {
 async function getList() {
   loading.value = true
   try {
-    const data = await SkillApi.getSkillPage(searchForm.value)
+    const data = await SkillApi.getSkillPage(removeNullField(searchForm.value))
     tableList.value = data.list
     total.value = data.total
   } finally {
@@ -108,7 +109,7 @@ function handleAdd() {
 }
 
 function handleUpdate(row) {
-  skillDialog.value.open('update', row.id)
+  skillDialog.value.open('update', row.skillId)
 }
 
 async function handleDelete(row) {

src/views/Home/ChannelReport.vue

@@ -0,0 +1,35 @@
+<template>
+  <div>
+    <el-tabs v-model="tabName" type="border-card" tab-position="top">
+      <el-tab-pane label="月度统计" name="monthly">
+        <ChannelMonthly :sourceOptions="sourceOptions" />
+      </el-tab-pane>
+      <el-tab-pane label="周期统计" name="period">
+        <ChannelPeriod :sourceOptions="sourceOptions" />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script setup name="ChannelReport">
+import ChannelMonthly from './Comp/ChannelMonthly.vue'
+import ChannelPeriod from './Comp/ChannelPeriod.vue'
+import { getSimpleSourceList } from '@/api/clue/source'
+import { handleTree } from '@/utils/tree'
+
+const tabName = ref('monthly')
+
+onMounted(() => {
+  getOptions()
+})
+
+const sourceOptions = ref([])
+
+function getOptions() {
+  getSimpleSourceList().then((data) => {
+    sourceOptions.value = handleTree(data, 'sourceId')
+  })
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/Home/CloseRate.vue

@@ -0,0 +1,114 @@
+<template>
+  <div>
+    <ContentWrap>
+      <el-form :model="searchForm" label-width="0" inline>
+        <el-form-item>
+          <el-date-picker
+            v-model="searchForm.year"
+            type="year"
+            format="YYYY"
+            value-format="YYYY"
+            placeholder="选择年"
+            :clearable="false"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="searchForm.nickname" placeholder="销售姓名" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleSearch">查询</el-button>
+          <el-button @click="handleReset">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-table v-loading="loading" :data="tableList" border stripe>
+        <el-table-column type="index" width="50" fixed="left" />
+        <el-table-column prop="nickname" label="姓名" width="80" />
+        <el-table-column
+          v-for="(item, index) in new Date().getMonth() + 1"
+          :key="index"
+          :label="item + '月'"
+          sortable
+          min-width="150"
+          :sort-method="(pre, cur) => monthSort(pre, cur, index)"
+        >
+          <template #default="{ row }">
+            <span>{{ (row.monthClueSignRateReportList[index].rate * 100).toFixed(2) }}%</span>
+            <span>({{ row.monthClueSignRateReportList[index].clueSignNum }}/</span>
+            <span>{{ row.monthClueSignRateReportList[index].followClueNum }})</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="总成交率"
+          prop="totalRate"
+          min-width="150"
+          fixed="right"
+          sortable
+          :sort-method="totalSort"
+        />
+      </el-table>
+    </ContentWrap>
+  </div>
+</template>
+
+<script setup name="CloseRate">
+import * as reportApi from '@/api/home/reportSignRate'
+import { removeNullField } from '@/utils'
+
+onMounted(() => {
+  handleReset()
+  handleSearch()
+})
+
+const searchForm = ref({})
+
+function handleReset() {
+  searchForm.value = {
+    nickname: undefined,
+    year: new Date().getFullYear() + ''
+  }
+}
+
+const loading = ref(false)
+const tableList = ref([])
+async function handleSearch() {
+  loading.value = true
+  try {
+    const data = await reportApi.getList(removeNullField(searchForm.value))
+    tableList.value = data.map((item) => {
+      const count = item.monthClueSignRateReportList.reduce(
+        (pre, cur) => {
+          return {
+            signCount: pre.signCount + cur.clueSignNum,
+            clueCount: pre.clueCount + cur.followClueNum
+          }
+        },
+        { signCount: 0, clueCount: 0 }
+      )
+      const rate = count.clueCount > 0 ? ((count.signCount * 100) / count.clueCount).toFixed(2) : 0
+      return {
+        ...item,
+        totalRate: `${rate}%(${count.signCount}/${count.clueCount})`,
+        totalRateNum: rate
+      }
+    })
+  } finally {
+    loading.value = false
+  }
+}
+
+function totalSort(pre, cur) {
+  return Number(pre.totalRateNum) - Number(cur.totalRateNum)
+}
+
+function monthSort(pre, cur, idx) {
+  console.log(idx)
+
+  return (
+    Number(pre.monthClueSignRateReportList[idx].rate) -
+    Number(cur.monthClueSignRateReportList[idx].rate)
+  )
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/Home/Comp/ChannelMonthly.vue

@@ -0,0 +1,147 @@
+<template>
+  <ContentWrap>
+    <el-form :model="searchForm" label-width="0" inline>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.period"
+          type="month"
+          format="YYYY-MM"
+          value-format="YYYY-MM"
+          placeholder="选择年月"
+          :clearable="false"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-tree-select
+          v-model="searchForm.sourceId"
+          :data="props.sourceOptions"
+          :props="defaultProps"
+          check-strictly
+          node-key="sourceId"
+          placeholder="请选择渠道"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      v-loading="loading"
+      :data="tableList"
+      border
+      stripe
+      :summary-method="getSummaries"
+      show-summary
+    >
+      <el-table-column prop="sourceName" label="渠道名称" />
+      <el-table-column prop="newClueSignNum" label="新线索当月成交数" sortable>
+        <template #header>
+          <Tooltip message="当月咨询且当月成交的线索数" /> <span>新线索当月成交数</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="newClueNum" label="新线索总数" sortable>
+        <template #header>
+          <Tooltip message="当月咨询的线索数" /> <span>新线索总数</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="rate" label="新线索当月成交率" sortable :formatter="parseRate" />
+      <el-table-column prop="reallyClueSignNum" sortable>
+        <template #header>
+          <Tooltip message="成交日期在本月的线索数" /> <span>当月总成交数</span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </ContentWrap>
+</template>
+
+<script setup name="ChannelMonthly">
+import * as reportApi from '@/api/home/reportChannel'
+import { removeNullField } from '@/utils'
+import { formatDate } from '@/utils/formatTime'
+
+const props = defineProps({
+  sourceOptions: {
+    type: Array,
+    default: () => []
+  }
+})
+
+const defaultProps = {
+  children: 'children',
+  label: 'sourceName',
+  value: 'sourceId',
+  isLeaf: 'leaf'
+}
+
+onMounted(() => {
+  getOptions()
+  handleReset()
+  handleSearch()
+})
+
+const searchForm = ref({})
+
+function handleReset() {
+  searchForm.value = {
+    sourceId: undefined,
+    period: formatDate(new Date(), 'YYYY-MM')
+  }
+}
+
+function getOptions() {}
+
+const loading = ref(false)
+const tableList = ref([])
+async function handleSearch() {
+  loading.value = true
+  try {
+    const data = await reportApi.getList(removeNullField(searchForm.value))
+    tableList.value = data
+  } finally {
+    loading.value = false
+  }
+}
+
+function parseRate(row) {
+  return Number(row.rate * 100).toFixed(2) + '%'
+}
+
+function getSummaries({ columns, data }) {
+  let sums = []
+  columns.forEach((column, index) => {
+    if (index == 0) {
+      sums[index] = '合计'
+      return
+    }
+    const values = data.map((item) => Number(item[column.property]))
+    if (!values.every((value) => Number.isNaN(value))) {
+      if (column.property == 'rate') {
+        const sum = data.reduce(
+          (pre, cur) => ({
+            clueNum: pre.clueNum + cur.newClueNum,
+            signNum: pre.signNum + cur.newClueSignNum
+          }),
+          { clueNum: 0, signNum: 0 }
+        )
+        sums[index] = sum.clueNum > 0 ? ((sum.signNum * 100) / sum.clueNum).toFixed(2) + '%' : 0
+      } else {
+        sums[index] = values.reduce((prev, curr) => {
+          const value = Number(curr)
+          if (!Number.isNaN(value)) {
+            return prev + curr
+          } else {
+            return prev
+          }
+        }, 0)
+      }
+    } else {
+      sums[index] = ''
+    }
+  })
+  return sums
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/Home/Comp/ChannelPeriod.vue

@@ -0,0 +1,169 @@
+<template>
+  <ContentWrap>
+    <el-form ref="searchRef" :model="searchForm" :rules="searchRules" label-width="100px" inline>
+      <el-form-item label="咨询日期" prop="consultDate">
+        <el-date-picker
+          v-model="searchForm.consultDate"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="选择日期"
+          end-placeholder="选择日期"
+        />
+      </el-form-item>
+      <el-form-item label="成交周期" prop="periodNumber">
+        <el-input-number
+          v-model="searchForm.periodNumber"
+          :min="1"
+          :controls="false"
+          style="width: 100%"
+        />
+      </el-form-item>
+      <el-form-item label="渠道来源" prop="sourceId">
+        <el-tree-select
+          v-model="searchForm.sourceId"
+          :data="props.sourceOptions"
+          :props="defaultProps"
+          check-strictly
+          node-key="sourceId"
+          placeholder="请选择渠道"
+          style="width: 100%"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      v-loading="loading"
+      :data="tableList"
+      border
+      stripe
+      :summary-method="getSummaries"
+      show-summary
+    >
+      <el-table-column prop="sourceName" label="渠道名称" />
+      <el-table-column prop="newClueSignNum" label="新线索成交数" sortable>
+        <template #header>
+          <Tooltip message="咨询日期在查询范围内，且在所查成交周期内成交的线索数" />
+          <span>新线索成交数</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="newClueNum" label="新线索总数" sortable>
+        <template #header>
+          <Tooltip message="咨询日期在查询范围内，咨询的线索数" /> <span>新线索总数</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="rate" label="新线索成交率" sortable :formatter="parseRate" />
+    </el-table>
+  </ContentWrap>
+</template>
+
+<script setup name="ChannelPeriod">
+import { getPeriodList } from '@/api/home/reportChannel'
+import { removeNullField } from '@/utils'
+import { formatDate } from '@/utils/formatTime'
+
+const props = defineProps({
+  sourceOptions: {
+    type: Array,
+    default: () => []
+  }
+})
+
+const defaultProps = {
+  children: 'children',
+  label: 'sourceName',
+  value: 'sourceId',
+  isLeaf: 'leaf'
+}
+
+const searchRef = ref()
+
+const searchRules = {
+  // consultDate: { required: true, type: 'array', message: '请选择咨询日期', trigger: 'change,blur' },
+  periodNumber: { required: true, message: '请输入成交周期', trigger: 'blur' }
+}
+
+onMounted(() => {
+  getOptions()
+  handleReset()
+  handleSearch()
+})
+
+const searchForm = ref({})
+
+function handleReset() {
+  const date = new Date()
+  date.setDate(1)
+  searchForm.value = {
+    sourceId: undefined,
+    periodNumber: 30,
+    consultDate: [formatDate(date), formatDate(new Date())]
+  }
+}
+
+function getOptions() {}
+
+const loading = ref(false)
+const tableList = ref([])
+async function handleSearch() {
+  try {
+    const valid = await searchRef.value.validate()
+    if (!valid) return
+    loading.value = true
+    const params = { ...searchForm.value }
+    if (params.consultDate && params.consultDate.length) {
+      params.startDateTime = params.consultDate[0]
+      params.endDateTime = params.consultDate[1]
+    }
+    const data = await getPeriodList(removeNullField(params))
+    tableList.value = data
+  } finally {
+    loading.value = false
+  }
+}
+
+function parseRate(row) {
+  return Number(row.rate * 100).toFixed(2) + '%'
+}
+
+function getSummaries({ columns, data }) {
+  let sums = []
+  columns.forEach((column, index) => {
+    if (index == 0) {
+      sums[index] = '合计'
+      return
+    }
+    const values = data.map((item) => Number(item[column.property]))
+    if (!values.every((value) => Number.isNaN(value))) {
+      if (column.property == 'rate') {
+        const sum = data.reduce(
+          (pre, cur) => ({
+            clueNum: pre.clueNum + cur.newClueNum,
+            signNum: pre.signNum + cur.newClueSignNum
+          }),
+          { clueNum: 0, signNum: 0 }
+        )
+        sums[index] = sum.clueNum > 0 ? ((sum.signNum * 100) / sum.clueNum).toFixed(2) + '%' : 0
+      } else {
+        sums[index] = values.reduce((prev, curr) => {
+          const value = Number(curr)
+          if (!Number.isNaN(value)) {
+            return prev + curr
+          } else {
+            return prev
+          }
+        }, 0)
+      }
+    } else {
+      sums[index] = ''
+    }
+  })
+  return sums
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/Home/Comp/SignListCard.vue

@@ -0,0 +1,149 @@
+<template>
+  <ContentWrap>
+    <el-form :model="searchForm" label-width="0" inline>
+      <el-form-item>
+        <el-select v-model="searchForm.detailType" :clearable="false" filterable>
+          <el-option
+            v-for="item in detailTypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="searchForm.detailType == 1">
+        <el-date-picker
+          v-model="searchForm.month"
+          type="month"
+          format="YYYY-MM"
+          value-format="YYYY-MM"
+          placeholder="选择年月"
+          :clearable="false"
+        />
+      </el-form-item>
+      <el-form-item v-if="[2, 3].includes(searchForm.detailType)">
+        <el-date-picker
+          v-model="searchForm.year"
+          type="year"
+          format="YYYY"
+          value-format="YYYY"
+          placeholder="选择年"
+          :clearable="false"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="tableList" border stripe show-summary :summary-method="getSummaries">
+      <el-table-column label="周期" prop="period" width="110px" />
+      <el-table-column prop="signNumber" label="成交数" />
+      <el-table-column prop="signPrice" label="成交额" />
+      <el-table-column
+        prop="signPriceSequentialGrowth"
+        label="成交额环比增长"
+        :formatter="parseRate"
+      />
+      <el-table-column
+        prop="signPriceSamePeriodCompareGrowth"
+        label="成交额同比增长"
+        :formatter="parseRate"
+      />
+      <el-table-column prop="profit" label="利润" />
+      <el-table-column prop="profitSequentialGrowth" label="利润环比增长" :formatter="parseRate" />
+      <el-table-column
+        prop="profitSamePeriodCompareGrowth"
+        label="利润同比增长"
+        :formatter="parseRate"
+      />
+      <el-table-column prop="notReceivedMoney" label="未到账金额" />
+      <el-table-column prop="receivedMoney" label="已到账金额" />
+      <el-table-column prop="waitSettleMoney" label="待结算金额" />
+      <el-table-column prop="settledMoney" label="已结算金额" />
+      <el-table-column prop="refundAmount" label="已退款金额" />
+      <el-table-column prop="remainMoney" label="结余" />
+    </el-table>
+  </ContentWrap>
+</template>
+
+<script setup name="SignListCard">
+import { getList } from '@/api/home/reportSignDetail'
+import { formatDate } from '@/utils/formatTime'
+import { removeNullField } from '@/utils'
+
+const detailTypeOptions = [
+  { label: '日明细', value: 1 },
+  { label: '月明细', value: 2 },
+  { label: '季明细', value: 3 },
+  { label: '年明细', value: 4 }
+]
+
+onMounted(() => {
+  handleReset()
+  handleSearch()
+})
+
+const searchForm = ref({})
+
+function handleReset() {
+  searchForm.value = {
+    detailType: 2,
+    month: formatDate(new Date(), 'YYYY-MM'),
+    year: new Date().getFullYear() + ''
+  }
+}
+const loading = ref(false)
+const tableList = ref([])
+async function handleSearch() {
+  loading.value = true
+  try {
+    let params = { detailType: searchForm.value.detailType }
+    if (params.detailType == 1) {
+      const d = new Date(searchForm.value.month)
+      params.month = d.getMonth() + 1
+      params.year = d.getFullYear()
+    } else if ([2, 3].includes(params.detailType)) {
+      params.year = searchForm.value.year
+    }
+    const data = await getList(removeNullField(params))
+    tableList.value = data
+  } finally {
+    loading.value = false
+  }
+}
+
+function parseRate(row, column) {
+  return Number(row[column.property] * 100).toFixed(2) + '%'
+}
+
+function getSummaries({ columns, data }) {
+  let sums = []
+  columns.forEach((column, index) => {
+    if (index == 0) {
+      sums[index] = '合计'
+      return
+    }
+    const values = data.map((item) => Number(item[column.property]))
+    if (!values.every((value) => Number.isNaN(value))) {
+      if (column.property.includes('Growth')) {
+        sums[index] = ''
+      } else {
+        sums[index] = values.reduce((prev, curr) => {
+          const value = Number(curr)
+          if (!Number.isNaN(value)) {
+            return prev + curr
+          } else {
+            return prev
+          }
+        }, 0)
+      }
+    } else {
+      sums[index] = ''
+    }
+  })
+  return sums
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/Home/Comp/SignTotalCard.vue

@@ -0,0 +1,195 @@
+<template>
+  <ContentWrap>
+    <div class="flex items-center">
+      <span class="mr-20px">成交概况</span>
+      <el-dropdown>
+        <el-button size="small"
+          >{{ periodTypeOptions[periodType] }} <Icon icon="ep:arrow-down"
+        /></el-button>
+        <template #dropdown>
+          <el-dropdown-menu>
+            <el-dropdown-item
+              v-for="(item, index) in periodTypeOptions"
+              :key="index"
+              @click="handleSearchTotalInfo(index)"
+            >
+              {{ item }}
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </template>
+      </el-dropdown>
+    </div>
+    <el-row :gutter="20" v-loading="infoLoading">
+      <el-col :span="8" :offset="0">
+        <div class="statistic-card">
+          <el-statistic :value="totalData.signNumber" title="成交数" />
+          <div
+            class="statistic-footer"
+            :class="periodType != 4 ? 'justify-between' : 'justify-center'"
+          >
+            <div class="footer-item">
+              <span>环比</span>
+              <span :class="getColor(totalData.signNumberSequentialGrowth)">
+                {{ totalData.signNumberSequentialGrowth }}%
+                <Icon class="ml-2px" :icon="getIcon(totalData.signNumberSequentialGrowth)" />
+              </span>
+            </div>
+            <div class="footer-item" v-if="periodType != 4">
+              <span>同比</span>
+              <span :class="getColor(totalData.signNumberPeriodCompareGrowth)">
+                {{ totalData.signNumberPeriodCompareGrowth }}%
+                <Icon class="ml-2px" :icon="getIcon(totalData.signNumberPeriodCompareGrowth)" />
+              </span>
+            </div>
+          </div>
+        </div>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <div class="statistic-card">
+          <el-statistic :value="totalData.signPrice" title="成交额" :precision="2" />
+          <div
+            class="statistic-footer"
+            :class="periodType != 4 ? 'justify-between' : 'justify-center'"
+          >
+            <div class="footer-item">
+              <span>环比</span>
+              <span :class="getColor(totalData.signPriceSequentialGrowth)">
+                {{ totalData.signPriceSequentialGrowth }}%
+                <Icon class="ml-2px" :icon="getIcon(totalData.signPriceSequentialGrowth)" />
+              </span>
+            </div>
+            <div class="footer-item" v-if="periodType != 4">
+              <span>同比</span>
+              <span :class="getColor(totalData.signPriceSamePeriodCompareGrowth)">
+                {{ totalData.signPriceSamePeriodCompareGrowth }}%
+                <Icon class="ml-2px" :icon="getIcon(totalData.signPriceSamePeriodCompareGrowth)" />
+              </span>
+            </div>
+          </div>
+        </div>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <div class="statistic-card">
+          <el-statistic :value="totalData.profit" title="利润" :precision="2" />
+          <div
+            class="statistic-footer"
+            :class="periodType != 4 ? 'justify-between' : 'justify-center'"
+          >
+            <div class="footer-item">
+              <span>环比</span>
+              <span :class="getColor(totalData.profitSequentialGrowth)">
+                {{ totalData.profitSequentialGrowth }}%
+                <Icon class="ml-2px" :icon="getIcon(totalData.profitSequentialGrowth)" />
+              </span>
+            </div>
+            <div class="footer-item" v-if="periodType != 4">
+              <span>同比</span>
+              <span :class="getColor(totalData.profitSamePeriodCompareGrowth)">
+                {{ totalData.profitSamePeriodCompareGrowth }}%
+                <Icon class="ml-2px" :icon="getIcon(totalData.profitSamePeriodCompareGrowth)" />
+              </span>
+            </div>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+  </ContentWrap>
+</template>
+
+<script setup name="SignTotalCard">
+import { getInfo } from '@/api/home/reportSignDetail'
+
+const periodTypeOptions = ['本日', '本周', '本月', '本季', '本年']
+
+const periodType = ref(2)
+const totalData = ref({})
+
+onMounted(() => {
+  handleSearchTotalInfo(2)
+})
+
+const infoLoading = ref(false)
+async function handleSearchTotalInfo(index) {
+  periodType.value = index
+  infoLoading.value = true
+  try {
+    const data = await getInfo({ periodType: periodType.value + 1 })
+    totalData.value = data
+  } finally {
+    infoLoading.value = false
+  }
+}
+
+function getIcon(val) {
+  if (val > 0) {
+    return 'ep:caret-top'
+  } else if (val < 0) {
+    return 'ep:caret-bottom'
+  } else {
+    return 'ep:minus'
+  }
+}
+
+function getColor(val) {
+  if (val > 0) {
+    return 'green'
+  } else if (val < 0) {
+    return 'red'
+  } else {
+    return 'gley'
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.el-col {
+  text-align: center;
+}
+:global(h2#card-usage ~ .example .example-showcase) {
+  background-color: var(--el-fill-color) !important;
+}
+
+.el-statistic {
+  --el-statistic-content-font-size: 28px;
+}
+
+.statistic-card {
+  height: 100%;
+  // padding: 20px;
+  border-radius: 4px;
+  background-color: var(--el-bg-color-overlay);
+}
+
+.statistic-footer {
+  margin: 16px auto 0;
+  display: flex;
+  // justify-content: space-between;
+  align-items: center;
+  flex-wrap: wrap;
+  font-size: 12px;
+  color: var(--el-text-color-regular);
+  width: 300px;
+}
+
+.statistic-footer .footer-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.statistic-footer .footer-item span:last-child {
+  display: inline-flex;
+  align-items: center;
+  margin-left: 4px;
+}
+
+.green {
+  color: var(--el-color-success);
+}
+.gley {
+  color: var(--el-color-info);
+}
+.red {
+  color: var(--el-color-error);
+}
+</style>

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>
@@ -116,7 +116,7 @@
             <el-table-column type="index" />
             <el-table-column prop="username" label="姓名" width="100" />
             <el-table-column prop="followNum" label="成交数量" width="70" />
-            <el-table-column prop="deptName" label="所属组织" />
+            <el-table-column prop="deptName" label="所属组织" width="150" />
           </el-table>
         </el-skeleton>
       </el-card>
@@ -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)
 

src/views/Home/SignReport.vue

@@ -0,0 +1,13 @@
+<template>
+  <div>
+    <SignTotalCard />
+    <SignListCard />
+  </div>
+</template>
+
+<script setup name="SignReport">
+import SignTotalCard from './Comp/SignTotalCard.vue'
+import SignListCard from './Comp/SignListCard.vue'
+</script>
+
+<style lang="scss" scoped></style>

src/views/Home/channel.vue

@@ -1,7 +0,0 @@
-<template>
-  <div> </div>
-</template>
-
-<script setup></script>
-
-<style lang="scss" scoped></style>

src/views/Login/Login.vue

@@ -96,7 +96,7 @@ const chars = computed(() => {
   return text.slice(0, currentCharIndex.value)
 })
 
-function init() {
+async function init() {
   const res = currentRoute.value?.query?.tenantId
   authUtil.setTenantId(res)
 

src/views/Login/MPLogin.vue

@@ -0,0 +1,86 @@
+<template>
+  <div class="p-20px">
+    <p class="mb-30px font-bold text-20px">微信授权登陆</p>
+    <el-form :model="form" ref="formRef" :rules="rules" label-width="auto">
+      <el-form-item label="用户名" prop="username">
+        <el-input v-model="form.username" placeholder="请输入用户名" />
+      </el-form-item>
+      <el-form-item label="密码" prop="password">
+        <el-input v-model="form.password" placeholder="请输入密码" show-password type="password" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" :disabled="formLoading" class="w-full" @click="onSubmit">
+      授权登陆
+    </el-button>
+  </div>
+</template>
+
+<script setup name="MPLogin">
+import { bindWx } from '@/api/login'
+
+const message = useMessage() // 消息弹窗
+
+const form = ref({
+  code: undefined,
+  username: undefined,
+  password: undefined
+})
+const formRef = ref()
+const rules = {
+  username: { required: true, message: '用户名不可为空', trigger: 'blur' },
+  password: { required: true, message: '密码不可为空', trigger: 'blur' }
+}
+
+// 微信授权登陆地址
+const WX_AUTH_URL = 'https://open.weixin.qq.com/connect/oauth2/authorize?'
+// 重定向参数-固定写法
+const REDIRECT = '#wechat_redirect'
+
+const params = ref({
+  appid: 'wxf87aa1f474c0494f', // 公众号 APP ID
+  redirect_uri: ``, // 授权后重定向的回调链接地址， 请使用 urlEncode 对链接进行处理
+  response_type: 'code', // 固定写法
+  scope: 'snsapi_base' // snsapi_base 静默授权获取 open id ；snsapi_userinfo 需要用户授权，获取详细信息
+  // state:'code', // a-zA-Z0-9的参数值，最多128字节
+})
+
+const formLoading = ref(false)
+async function onSubmit() {
+  // 这些需要判断没有 code 情况拉起授权登陆，有就结束放在重复拉起授权登陆
+  if (!form.value.code) {
+    const access_url = WX_AUTH_URL + `${new URLSearchParams(params.value)}` + REDIRECT
+    location.href = access_url
+  } else {
+    // 校验表单
+    if (!formRef.value) return
+    const valid = await formRef.value.validate()
+    if (!valid) return
+    // 提交请求
+    formLoading.value = true
+    try {
+      await bindWx(form.value)
+      message.success('绑定成功')
+      window.close()
+    } catch (error) {
+      console.log(error)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+
+onMounted(() => {
+  const uri = location.origin + location.pathname
+  params.value.redirect_uri = encodeURI(uri)
+  // 获取地址参数
+  const param = new URLSearchParams(location.search)
+  form.value.code = param.get('code')
+
+  if (!form.value.code) {
+    const access_url = WX_AUTH_URL + `${new URLSearchParams(params.value)}` + REDIRECT
+    location.href = access_url
+  }
+})
+</script>
+
+<style lang="scss" scoped></style>

src/views/Profile/NotifyMessage.vue

@@ -1,7 +1,193 @@
 <template>
-  <div> 站内信 </div>
+  <!-- 搜索工作栏 -->
+  <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="0">
+    <el-form-item>
+      <el-select
+        v-model="queryParams.messageType"
+        placeholder="消息类型"
+        clearable
+        filterable
+        @change="handleQuery"
+      >
+        <el-option
+          v-for="item in typeOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+    </el-form-item>
+    <el-form-item>
+      <el-select
+        v-model="queryParams.readStatus"
+        placeholder="状态"
+        clearable
+        filterable
+        @change="handleQuery"
+      >
+        <el-option label="已读" :value="true" />
+        <el-option label="未读" :value="false" />
+      </el-select>
+    </el-form-item>
+    <el-form-item>
+      <el-button :disabled="selectedIds.length == 0" @click="handleUpdateList">
+        标记已读
+      </el-button>
+      <el-button @click="handleUpdateAll"> 全部已读 </el-button>
+    </el-form-item>
+  </el-form>
+
+  <el-text class="mb-10px" type="danger">tips: 双击展示消息详情</el-text>
+
+  <!-- 列表 -->
+  <el-table
+    ref="tableRef"
+    v-loading="loading"
+    :data="list"
+    row-key="id"
+    @selection-change="handleSelectionChange"
+    @row-dblclick="handleDetail"
+  >
+    <el-table-column type="selection" :selectable="selectable" reserve-selection width="60px" />
+    <el-table-column label="类型" align="left" prop="messageTypeName" width="200px" />
+    <el-table-column label="标题" align="left" prop="title" />
+    <el-table-column
+      label="时间"
+      align="left"
+      prop="createTime"
+      width="180"
+      :formatter="dateFormatter"
+    />
+    <el-table-column label="状态" align="left" width="100px">
+      <template #default="{ row }">
+        <el-tag :type="row.readStatus ? 'success' : 'info'">
+          {{ row.readStatus ? '已读' : '未读' }}
+        </el-tag>
       </template>
+    </el-table-column>
+  </el-table>
+  <!-- 分页 -->
+  <Pagination
+    :total="total"
+    v-model:page="queryParams.pageNo"
+    v-model:limit="queryParams.pageSize"
+    @pagination="getList"
+  />
+</template>
+<script lang="ts" setup name="NotifyMessage">
+import { dateFormatter } from '@/utils/formatTime'
+import * as NotifyMessageApi from '@/api/system/notify/message'
+import { useUserStore } from '@/store/modules/user'
+import { getGeneralSysDictData } from '@/api/system/dict/dict.data'
 
-<script setup name="NotifyMessage"></script>
+const router = useRouter()
 
-<style lang="scss" scoped></style>
+const userStore = useUserStore()
+const message = useMessage() // 消息
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref<any[]>([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 20,
+  messageType: undefined,
+  readStatus: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await NotifyMessageApi.getMyNotifyMessagePage({
+      ...queryParams,
+      roleId: userStore.getUser?.currentRole
+    })
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 某一行，是否允许选中 */
+const selectable = (row: any) => {
+  return !row.readStatus
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+async function handleDetail(row: any) {
+  if (!row.readStatus) {
+    await handleReadOne(row.id)
+  }
+  const url = router.resolve({
+    path: '/nm-detail',
+    query: { id: row.id }
+  })
+  window.open(url.href, '_blank')
+}
+
+const tableRef = ref() // 表格的 Ref
+const selectedIds = ref<number[]>([]) // 表格的选中 ID 数组
+
+/** 标记一条站内信已读 */
+const handleReadOne = async (id: number) => {
+  await NotifyMessageApi.updateNotifyMessageRead({
+    ids: [id]
+  })
+  await getList()
+}
+
+/** 标记全部站内信已读 **/
+const handleUpdateAll = async () => {
+  await NotifyMessageApi.updateAllNotifyMessageRead({
+    roleId: userStore.getUser?.currentRole
+  })
+  message.success('全部已读成功！')
+  tableRef.value.clearSelection()
+  await getList()
+}
+
+/** 标记一些站内信已读 **/
+const handleUpdateList = async () => {
+  if (selectedIds.value.length === 0) {
+    return
+  }
+  await NotifyMessageApi.updateNotifyMessageRead({
+    ids: selectedIds.value,
+    roleId: userStore.getUser?.currentRole
+  })
+  message.success('批量已读成功！')
+  tableRef.value.clearSelection()
+  await getList()
+}
+
+/** 当表格选择项发生变化时会触发该事件  */
+const handleSelectionChange = (array: NotifyMessageApi.NotifyMessageVO[]) => {
+  selectedIds.value = []
+  if (!array) {
+    return
+  }
+  array.forEach((row) => selectedIds.value.push(row.id))
+}
+
+const typeOptions = ref<any[]>([])
+
+function getOptions() {
+  getGeneralSysDictData('message_type').then((data) => {
+    typeOptions.value = data
+  })
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getOptions()
+  getList()
+})
+</script>

src/views/Profile/NotifyMessageDetail.vue

@@ -0,0 +1,91 @@
+<!--
+ * @Author: riverQiu
+ * @Date: 2024-09-11 18:42:37
+ * @LastEditors: riverQiu
+ * @LastEditTime: 2024-09-11 19:03:23
+ * @Description: 
+-->
+<template>
+  <div class="container">
+    <ContentWrap style="max-width: 1000px; margin: 0 auto; overflow-x: auto">
+      <div class="text-center">
+        <div class="mb-10px" style="font-size: 24px; letter-spacing: 2px">
+          {{ info.title }}
+        </div>
+        <el-text>
+          {{ formatDate(info.createTime, 'YYYY-MM-DD hh:mm:ss') }}
+        </el-text>
+      </div>
+      <el-divider direction="horizontal" />
+
+      <div v-dompurify-html="info.content"></div>
+    </ContentWrap>
+  </div>
+</template>
+
+<script setup name="NMDetail">
+import { getNotifyMessageDetail, updateNotifyMessageRead } from '@/api/system/notify/message'
+import { formatDate } from '@/utils/formatTime'
+
+const route = useRoute()
+const info = ref({})
+
+function init() {
+  getNotifyMessageDetail(route.query.id).then((data) => {
+    info.value = data
+    if (!data.readStatus) {
+      handleReadOne(data.id)
+    }
+  })
+}
+
+/** 标记一条站内信已读 */
+const handleReadOne = async (id) => {
+  await updateNotifyMessageRead({
+    ids: [id]
+    // roleId: userStore.getUser?.currentRole
+  })
+  await getList()
+}
+
+onMounted(() => {
+  init()
+})
+</script>
+
+<style lang="scss" scoped>
+.container {
+  padding: 20px;
+  max-height: 100%;
+  overflow-y: auto;
+}
+:deep(p) {
+  font-size: 14px;
+}
+:deep(table) {
+  margin-top: 10px;
+  border-collapse: separate;
+  text-indent: initial;
+  border-spacing: 1px;
+  text-align: left;
+  border-width: 1px;
+  box-sizing: border-box;
+}
+:deep(th) {
+  font-size: 14px;
+  text-align: left;
+  border-width: 1px;
+  box-sizing: border-box;
+}
+:deep(td) {
+  font-size: 12px;
+  text-align: left;
+  border-width: 1px;
+  box-sizing: border-box;
+  min-width: 44px;
+  word-break: break-all;
+}
+:deep(.el-card__body) {
+  padding: 20px 10px;
+}
+</style>

src/views/SchoolManagement/Class/Comp/DialogClass.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1000px">
+  <Dialog v-if="dialogVisible" :title="dialogTitle" v-model="dialogVisible" width="1000px">
     <el-tabs v-model="currentTab">
       <el-tab-pane label="基础信息" name="base">
         <el-form
@@ -474,12 +474,15 @@ const opts = ref({
 })
 
 /** 打开弹窗 */
-const open = async (type, id) => {
+const open = async (type, id, sp) => {
   dialogVisible.value = true
   dialogTitle.value = type == 'create' ? '新增班型' : '修改班型'
   formType.value = type
   currentTab.value = 'base'
   resetForm()
+  if (type == 'create' && sp && sp.length) {
+    formData.value.schPlace = sp
+  }
   if (!opts.value.length) {
     const arr = await ClassApi.getCommissionParams()
     arr.map((item) => {
@@ -491,6 +494,7 @@ const open = async (type, id) => {
     formLoading.value = true
     try {
       formData.value = await ClassApi.getClassType(id)
+      formData.value.remark = formData.value.remark || ''
       formData.value.schPlace = [formData.value.schoolId, formData.value.placeId]
       if (!formData.value.companyProfitVO) {
         profitCompanyForm.value = {
@@ -540,11 +544,23 @@ const resetForm = () => {
     typeName: '',
     licenseType: '',
     status: 0,
-    remark: '',
+    remark: undefined,
     quotations: [],
     percentages: []
   }
   formRef.value?.resetFields()
+
+  profitCompanyForm.value = {
+    profitMode: 1,
+    dangwei: [],
+    profitRule: {}
+  }
+
+  profitEmployeeForm.value = {
+    profitMode: 1,
+    dangwei: [],
+    profitRule: {}
+  }
 }
 
 function handleAddPrice() {

src/views/SchoolManagement/Class/index.vue

@@ -47,20 +47,23 @@
           plain
           @click="handleOpenDialog('create', null)"
           v-hasPermi="['school:class:add']"
-          >新增</el-button
         >
+          新增
+        </el-button>
         <el-button
           type="danger"
           @click="handleBatchDelete([])"
           v-hasPermi="['school:class:batch-delete']"
-          >批量删除</el-button
         >
+          批量删除
+        </el-button>
         <el-button
           type="warning"
           @click="handleBatchStatus"
           v-hasPermi="['school:class:batch-status']"
-          >批量启/停用</el-button
         >
+          批量启/停用
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -235,7 +238,7 @@ async function getList() {
 
 const ClassDialog = ref()
 function handleOpenDialog(type, id = null) {
-  ClassDialog.value.open(type, id)
+  ClassDialog.value.open(type, id, searchForm.value.schPlace)
 }
 
 function handleReset() {

src/views/SchoolManagement/Place/index.vue

@@ -109,10 +109,22 @@
               <el-input v-model="placeForm.address" placeholder="输入地址" />
             </el-form-item>
             <el-form-item label="经度" prop="lng">
-              <el-input v-model="placeForm.lng" placeholder="输入经度" />
+              <el-input-number
+                v-model="placeForm.lng"
+                :min="1"
+                :controls="false"
+                placeholder="输入经度"
+                style="width: 100%"
+              />
             </el-form-item>
             <el-form-item label="纬度" prop="lat">
-              <el-input v-model="placeForm.lat" placeholder="输入纬度" />
+              <el-input-number
+                v-model="placeForm.lat"
+                :min="1"
+                :controls="false"
+                placeholder="输入纬度"
+                style="width: 100%"
+              />
             </el-form-item>
             <el-form-item label="所属区域" prop="area">
               <el-select v-model="placeForm.area" placeholder="请选择" clearable class="w-full">
@@ -130,10 +142,10 @@
             <el-form-item label="负责人" prop="contact">
               <el-input v-model="placeForm.contact" placeholder="输入负责人" />
             </el-form-item>
-            <el-form-item label="是否推荐" prop="contact">
+            <!-- <el-form-item label="是否推荐" prop="contact">
               <el-radio v-model="placeForm.recommend" :label="true">是</el-radio>
               <el-radio v-model="placeForm.recommend" :label="false">否</el-radio>
-            </el-form-item>
+            </el-form-item> -->
           </el-form>
         </el-tab-pane>
         <el-tab-pane label="描述" name="desc">
@@ -145,6 +157,19 @@
         <el-button @click="closePlaceDialog">取消</el-button>
       </div>
     </el-card>
+    <el-autocomplete
+      :style="{
+        position: 'absolute',
+        top: '20px',
+        left: placeDialogShow ? '380px' : '20px',
+        width: '200px'
+      }"
+      v-model="areaValue"
+      clearable
+      placeholder="输入并搜索位置"
+      :fetch-suggestions="remoteMethod"
+      @select="currentSelect"
+    />
 
     <!-- 底部驾校场地列表 -->
     <el-card
@@ -234,6 +259,7 @@
 
 <script setup name="Place">
 import * as PlaceApi from '@/api/school/place'
+import { getConfigByConfigKey } from '@/api/system/set'
 import { getAreaSimpleList } from '@/api/school/setting/area'
 import { checkPermi } from '@/utils/permission'
 
@@ -267,18 +293,35 @@ const mapHelpText = ref('')
 const tipPostion = ref({})
 const placeTab = ref('info')
 
-function initMap() {
+const defaultLatLng = ref({
+  lat: 31.86119,
+  lng: 117.283042
+})
+const defaultCity = ref('合肥')
+
+let AutoComplete = ref(null)
+async function initMap() {
+  const data = await getConfigByConfigKey({ configKey: 'defaultLocation' })
+  const cityInfo = JSON.parse(data.configValue)
+  defaultLatLng.value = {
+    lat: cityInfo.lat,
+    lng: cityInfo.lng
+  }
+  defaultCity.value = cityInfo.locationName
   AMapLoader.load({
     key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key
     version: '2.0',
-    plugins: ['AMap.Geocoder']
+    plugins: ['AMap.Geocoder', 'AMap.AutoComplete']
   }).then((AMap) => {
     aMap.value = AMap
     geoCoder.value = new AMap.Geocoder()
     dialogMap.value = new AMap.Map('dialogMap', {
       zoom: 12,
       zooms: [2, 22],
-      center: [117.283042, 31.86119]
+      center: [defaultLatLng.value.lng, defaultLatLng.value.lat]
+    })
+    AutoComplete.value = new AMap.AutoComplete({
+      city: defaultCity.value
     })
     locationMarker.value = new AMap.Marker({
       icon: FlagRed
@@ -313,6 +356,32 @@ function initMap() {
   })
 }
 
+const areaValue = ref('')
+function remoteMethod(searchValue, cb) {
+  if (searchValue) {
+    AutoComplete.value?.search(searchValue, (status, result) => {
+      if (result.tips?.length) {
+        // areaList.value = result?.tips
+        const list = result.tips.map((it) => ({
+          ...it,
+          value: it.name
+        }))
+        cb(list)
+      } else {
+        cb([])
+      }
+    })
+  } else {
+    cb([])
+  }
+}
+
+function currentSelect(val) {
+  if (val) {
+    dialogMap.value.setCenter([val.location?.lng, val.location?.lat], true)
+  }
+}
+
 function regeoCode() {
   geoCoder.value.getAddress([placeForm.value.lng, placeForm.value.lat], (status, result) => {
     if (status === 'complete' && result.regeocode) {