本地启动

.env.base

@@ -4,7 +4,7 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://118.31.23.45:48080'
+VITE_BASE_URL='http://localhost:48080'
 # VITE_BASE_URL='http://114.55.169.15:48080'
 
 # 上传路径

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 } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } 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 = cache.local.get(CACHE_KEY.IS_DARK)
+  let isDarkTheme = wsCache.get(CACHE_KEY.IS_DARK)
   if (isDarkTheme === null) {
     isDarkTheme = isDark()
   }

src/api/clue/extraFee.js

@@ -1,30 +0,0 @@
-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

@@ -58,7 +58,3 @@ 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/payment.js

@@ -37,11 +37,3 @@ export const cancelApplyPayment = async (data) => {
 export const getPaymentDetail = async (params) => {
   return await request.get({ url: '/admin-api/crm/sign-pay-record/get', params })
 }
-
-// 撤销
-export const updateApplyPayment = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sign-pay-record/updateRecordMoney',
-    data
-  })
-}

src/api/clue/settle.js

@@ -24,8 +24,3 @@ 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

@@ -29,25 +29,3 @@ 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/login/index.ts

@@ -71,10 +71,3 @@ 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/school/setting/area.js

@@ -1,33 +0,0 @@
-import request from '@/config/axios'
-// 查询列表
-export const getAreaPage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/area/page', params })
-}
-
-export const getAreaSimpleList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/area/simple-list', params })
-}
-
-// 查询详情
-export const getArea = async (id) => {
-  return await request.get({ url: '/admin-api/crm/area/get?id=' + id })
-}
-
-// 新增
-export const createArea = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/area/create',
-    data: data,
-    isSubmitForm: true
-  })
-}
-
-// 修改
-export const updateArea = async (params) => {
-  return await request.put({ url: '/admin-api/crm/area/update', data: params })
-}
-
-// 删除
-export const deleteArea = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/area/delete?id=' + id })
-}

src/api/system/dept/index.ts

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

src/api/system/role/daliyReport.js

@@ -1,25 +0,0 @@
-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

@@ -74,13 +74,3 @@ export const updateUserStatus = (id: number, status: number) => {
 export const getSimpleUserList = (): Promise<UserVO[]> => {
   return request.get({ url: '/admin-api/system/user/list-all-simple' })
 }
-
-// 获取所有用户列表-无权限限制
-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/Dialog/src/Dialog.vue

@@ -67,7 +67,6 @@ const emit = defineEmits(['close'])
     destroy-on-close
     draggable
     lock-scroll
-    append-to-body
     v-bind="getBindValue"
     @close="emit('close')"
   >
@@ -76,16 +75,13 @@ const emit = defineEmits(['close'])
         <slot name="title">
           {{ title }}
         </slot>
-        <div class="flex items-center">
-          <slot name="btn"></slot>
-          <Icon
-            v-if="fullscreen"
-            :icon="isFullscreen ? 'zmdi:fullscreen-exit' : 'zmdi:fullscreen'"
-            class="mr-22px cursor-pointer is-hover z-10"
-            color="var(--el-color-info)"
-            @click="toggleFull"
-          />
-        </div>
+        <Icon
+          v-if="fullscreen"
+          :icon="isFullscreen ? 'zmdi:fullscreen-exit' : 'zmdi:fullscreen'"
+          class="mr-22px cursor-pointer is-hover mt-2px z-10"
+          color="var(--el-color-info)"
+          @click="toggleFull"
+        />
       </div>
     </template>
 

src/components/SSTable/index.vue

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

src/config/axios/service.ts

@@ -20,6 +20,7 @@ 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
@@ -205,8 +206,6 @@ 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) {
@@ -214,10 +213,11 @@ service.interceptors.response.use(
             type: 'warning'
           }).then(() => {
             // 无访问权限，退出登录
-            const tenantId = cache.local.get('TENANT_ID')
-            const appId = cache.local.get('App_ID')
+            const { wsCache } = useCache()
+            const tenantId = wsCache.get('TENANT_ID')
+            const appId = wsCache.get('App_ID')
             resetRouter() // 重置静态路由表
-            cache.local.clear()
+            wsCache.clear()
             removeToken()
             window.location.href = `/crm/login?tenantId=${tenantId}&appId=${appId}`
           })
@@ -259,10 +259,11 @@ const handleAuthorized = () => {
       confirmButtonText: t('login.relogin'),
       type: 'warning'
     }).then(() => {
-      const tenantId = cache.local.get('TENANT_ID')
-      const appId = cache.local.get('App_ID')
+      const { wsCache } = useCache()
+      const tenantId = wsCache.get('TENANT_ID')
+      const appId = wsCache.get('App_ID')
       resetRouter() // 重置静态路由表
-      cache.local.clear()
+      wsCache.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 } from '@/hooks/web/useCache'
-import cache from '@/plugins/cache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 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 = cache.local.get(CACHE_KEY.USER)?.permissions || []
+    const permissions = wsCache.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 } from '@/hooks/web/useCache'
-import cache from '@/plugins/cache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 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 = cache.local.get(CACHE_KEY.USER).roles
+    const roles = wsCache.get(CACHE_KEY.USER).roles
 
     if (value && value instanceof Array && value.length > 0) {
       const roleFlag = value

src/hooks/web/useCrudSchemas.ts

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

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

@@ -1,9 +1,6 @@
 <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')
@@ -12,21 +9,16 @@ const list = ref<any[]>([]) // 消息列表
 
 // 获得消息列表
 const getList = async () => {
-  const data = await NotifyMessageApi.getUnreadNotifyMessageList({
-    roleId: userStore.getUser?.currentRole
-  })
-  list.value = data.list
+  list.value = await NotifyMessageApi.getUnreadNotifyMessageList()
   // 强制设置 unreadCount 为 0，避免小红点因为轮询太慢，不消除
   unreadCount.value = 0
 }
 
 // 获得未读消息数
 const getUnreadCount = async () => {
-  NotifyMessageApi.getUnreadNotifyMessageCount({ roleId: userStore.getUser?.currentRole }).then(
-    (data) => {
-      unreadCount.value = data
-    }
-  )
+  NotifyMessageApi.getUnreadNotifyMessageCount().then((data) => {
+    unreadCount.value = data
+  })
 }
 
 // 跳转我的站内信
@@ -42,9 +34,9 @@ onMounted(() => {
   // 首次加载小红点
   getUnreadCount()
   // 轮询刷新小红点
-  msgInterval.value = setInterval(() => {
-    getUnreadCount()
-  }, 1000 * 60 * 2)
+  // msgInterval.value = setInterval(() => {
+  //   getUnreadCount()
+  // }, 1000 * 60 * 2)
 })
 
 onUnmounted(() => {
@@ -64,9 +56,10 @@ 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.title }}
+                    {{ item.templateNickname }}：{{ item.templateContent }}
                   </span>
                   <span class="message-date">
                     {{ formatDate(item.createTime) }}
@@ -101,7 +94,7 @@ onUnmounted(() => {
   .message-item {
     display: flex;
     align-items: center;
-    padding: 5px 0;
+    padding: 20px 0;
     border-bottom: 1px solid var(--el-border-color-light);
 
     &:last-child {
@@ -120,7 +113,6 @@ onUnmounted(() => {
 
       .message-title {
         margin-bottom: 5px;
-        font-weight: bold;
       }
 
       .message-date {

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

@@ -2,9 +2,8 @@
 // import { ElMessage } from 'element-plus'
 // import { useClipboard, useCssVar } from '@vueuse/core'
 import { useCssVar } from '@vueuse/core'
-import { CACHE_KEY } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } 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'
@@ -196,9 +195,10 @@ watch(
 
 // 清空缓存
 const clear = () => {
-  cache.local.delete(CACHE_KEY.LAYOUT)
-  cache.local.delete(CACHE_KEY.THEME)
-  cache.local.delete(CACHE_KEY.IS_DARK)
+  const { wsCache } = useCache()
+  wsCache.delete(CACHE_KEY.LAYOUT)
+  wsCache.delete(CACHE_KEY.THEME)
+  wsCache.delete(CACHE_KEY.IS_DARK)
   window.location.reload()
 }
 </script>

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

@@ -1,18 +1,19 @@
 <script lang="ts" name="UserInfo" setup>
 import { ElMessageBox } from 'element-plus'
 
-import { CACHE_KEY } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } 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()
@@ -23,7 +24,7 @@ const { getPrefixCls } = useDesign()
 
 const prefixCls = getPrefixCls('user-info')
 
-const user = cache.local.get(CACHE_KEY.USER)
+const user = wsCache.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, removeToken } from '@/utils/auth'
+import { getAccessToken } from '@/utils/auth'
 import { useTitle } from '@/hooks/web/useTitle'
 import { useNProgress } from '@/hooks/web/useNProgress'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
@@ -8,74 +8,55 @@ 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',
-  '/mp-login',
-  '/nm-detail',
-  '/social-login',
-  '/auth-redirect',
-  '/bind',
-  '/register',
-  '/swagger'
-]
+const whiteList = ['/login', '/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: '/' })
-      } else {
-        // 获取所有字典
-        const dictStore = useDictStoreWithOut()
-        const userStore = useUserStoreWithOut()
-        const permissionStore = usePermissionStoreWithOut()
-        if (!dictStore.getIsSetDict) {
-          await dictStore.setDictMap()
-        }
-        if (!userStore.getIsSetUser) {
-          isRelogin.show = true
-          await userStore.setUserInfoAction()
-          isRelogin.show = false
-          // 后端过滤菜单
-          await permissionStore.generateRoutes()
-          permissionStore.getAddRouters.forEach((route) => {
-            router.addRoute(route) // 动态添加可访问路由表
-          })
-          const redirectPath = from.query.redirect || to.path
-          const redirect = decodeURIComponent(redirectPath)
-          const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect }
-          next(nextData)
-        } else {
-          next()
-        }
-      }
+  if (getAccessToken()) {
+    if (to.path === '/login') {
+      next({ path: '/' })
     } else {
-      if (whiteList.indexOf(to.path) !== -1) {
-        next()
+      // 获取所有字典
+      const dictStore = useDictStoreWithOut()
+      const userStore = useUserStoreWithOut()
+      const permissionStore = usePermissionStoreWithOut()
+      if (!dictStore.getIsSetDict) {
+        await dictStore.setDictMap()
+      }
+      if (!userStore.getIsSetUser) {
+        isRelogin.show = true
+        await userStore.setUserInfoAction()
+        isRelogin.show = false
+        // 后端过滤菜单
+        await permissionStore.generateRoutes()
+        permissionStore.getAddRouters.forEach((route) => {
+          router.addRoute(route) // 动态添加可访问路由表
+        })
+        const redirectPath = from.query.redirect || to.path
+        const redirect = decodeURIComponent(redirectPath)
+        const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect }
+        next(nextData)
       } else {
-        const tenantId = getTenantId()
-        const appId = getAppId()
-        if (tenantId && appId) {
-          next(`/crm/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
-        } else {
-          next(`/crm/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-        }
+        next()
+      }
+    }
+  } else {
+    if (whiteList.indexOf(to.path) !== -1) {
+      next()
+    } else {
+      const tenantId = getTenantId()
+      const appId = getAppId()
+      if (tenantId && appId) {
+        next(`/crm/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      } else {
+        next(`/crm/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
       }
     }
   }

src/plugins/cache/index.js

@@ -26,7 +26,7 @@ const sessionCache = {
     let storage = storageStr ? JSON.parse(storageStr) : {}
     return storage[key]
   },
-  delete(key) {
+  remove(key) {
     if (!sessionStorage) {
       return null
     }
@@ -62,7 +62,7 @@ const localCache = {
     let storage = storageStr ? JSON.parse(storageStr) : {}
     return storage[key]
   },
-  delete(key) {
+  remove(key) {
     if (!localStorage) {
       return null
     }
@@ -73,10 +73,6 @@ 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

@@ -130,27 +130,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
   //     }
   //   ]
   // },
-  // {
-  //   path: '/Basic',
-  //   component: Layout,
-  //   name: 'Basic',
-  //   meta: {},
-  //   redirect: '/Basic/menu',
-  //   children: [
-  //     {
-  //       path: 'menu',
-  //       component: () => import('@/views/Basic/Menu/index.vue'),
-  //       name: 'Menu',
-  //       meta: {
-  //         canTo: true,
-  //         hidden: true,
-  //         noTagsView: false,
-  //         icon: 'ep:user',
-  //         title: '菜单管理'
-  //       }
-  //     }
-  //   ]
-  // },
+
   {
     path: '/login',
     component: () => import('@/views/Login/Login.vue'),
@@ -161,16 +141,6 @@ 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'),
@@ -181,16 +151,6 @@ 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,12 +2,13 @@ import { defineStore } from 'pinia'
 import { store } from '../index'
 import { setCssVar, humpToUnderline } from '@/utils'
 import { ElMessage } from 'element-plus'
-import { CACHE_KEY } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ElementPlusSize } from '@/types/elementPlus'
 import { LayoutType } from '@/types/layout'
 import { ThemeTypes } from '@/types/theme'
 import { getAppInfo } from '@/api/login'
-import cache from '@/plugins/cache'
+
+const { wsCache } = useCache()
 
 interface AppState {
   breadcrumb: boolean
@@ -45,7 +46,7 @@ export const useAppStore = defineStore('app', {
       sizeMap: ['default', 'large', 'small'],
       mobile: false, // 是否是移动端
       title: import.meta.env.VITE_APP_TITLE, // 标题
-      appInfo: cache.local.get('appInfo'),
+      appInfo: wsCache.get('appInfo'),
       pageLoading: false, // 路由跳转loading
 
       breadcrumb: true, // 面包屑
@@ -63,12 +64,12 @@ export const useAppStore = defineStore('app', {
       fixedHeader: true, // 固定toolheader
       footer: false, // 显示页脚
       greyMode: false, // 是否开始灰色模式，用于特殊悼念日
-      fixedMenu: cache.local.get('fixedMenu') || false, // 是否固定菜单
+      fixedMenu: wsCache.get('fixedMenu') || false, // 是否固定菜单
 
-      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) || {
+      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) || {
         // 主题色
         elColorPrimary: '#409eff',
         // 左侧菜单边框颜色
@@ -224,7 +225,7 @@ export const useAppStore = defineStore('app', {
       this.greyMode = greyMode
     },
     setFixedMenu(fixedMenu: boolean) {
-      cache.local.set('fixedMenu', fixedMenu)
+      wsCache.set('fixedMenu', fixedMenu)
       this.fixedMenu = fixedMenu
     },
     setPageLoading(pageLoading: boolean) {
@@ -236,7 +237,7 @@ export const useAppStore = defineStore('app', {
         return
       }
       this.layout = layout
-      cache.local.set(CACHE_KEY.LAYOUT, this.layout)
+      wsCache.set(CACHE_KEY.LAYOUT, this.layout)
     },
     setTitle(title: string) {
       this.title = title
@@ -250,18 +251,18 @@ export const useAppStore = defineStore('app', {
         document.documentElement.classList.add('light')
         document.documentElement.classList.remove('dark')
       }
-      cache.local.set(CACHE_KEY.IS_DARK, this.isDark)
+      wsCache.set(CACHE_KEY.IS_DARK, this.isDark)
     },
     setCurrentSize(currentSize: ElementPlusSize) {
       this.currentSize = currentSize
-      cache.local.set('currentSize', this.currentSize)
+      wsCache.set('currentSize', this.currentSize)
     },
     setMobile(mobile: boolean) {
       this.mobile = mobile
     },
     setTheme(theme: ThemeTypes) {
       this.theme = Object.assign(this.theme, theme)
-      cache.local.set(CACHE_KEY.THEME, this.theme)
+      wsCache.set(CACHE_KEY.THEME, this.theme)
     },
     setCssVarTheme() {
       for (const key in this.theme) {
@@ -273,7 +274,7 @@ export const useAppStore = defineStore('app', {
     },
     async setAppInfo(appId: number) {
       const appInfo = await getAppInfo(appId)
-      cache.local.set('appInfo', appInfo)
+      wsCache.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 } from '@/hooks/web/useCache'
-import cache from '@/plugins/cache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+const { wsCache } = useCache('sessionStorage')
 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 = cache.session.get(CACHE_KEY.DICT_CACHE)
+      const dictMap = wsCache.get(CACHE_KEY.DICT_CACHE)
       if (dictMap) {
         this.dictMap = dictMap
       }
@@ -40,7 +40,7 @@ export const useDictStore = defineStore('dict', {
   },
   actions: {
     async setDictMap() {
-      const dictMap = cache.session.get(CACHE_KEY.DICT_CACHE)
+      const dictMap = wsCache.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
-        cache.session.set(CACHE_KEY.DICT_CACHE, dictDataMap) // 60 秒 过期
+        wsCache.set(CACHE_KEY.DICT_CACHE, dictDataMap, { exp: 60 }) // 60 秒 过期
       }
     },
     getDictByType(type: string) {
@@ -74,7 +74,7 @@ export const useDictStore = defineStore('dict', {
       return this.dictMap[type]
     },
     async resetDict() {
-      cache.session.delete(CACHE_KEY.DICT_CACHE)
+      wsCache.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
-      cache.session.set(CACHE_KEY.DICT_CACHE, dictDataMap) // 60 秒 过期
+      wsCache.set(CACHE_KEY.DICT_CACHE, dictDataMap, { exp: 60 }) // 60 秒 过期
     }
   }
 })

src/store/modules/permission.ts

@@ -3,8 +3,9 @@ import { store } from '../index'
 import { cloneDeep } from 'lodash-es'
 import remainingRouter from '@/router/modules/remaining'
 import { generateRoute, flatMultiLevelRoutes } from '@/utils/routerHelper'
-import { CACHE_KEY } from '@/hooks/web/useCache'
-import cache from '@/plugins/cache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+const { wsCache } = useCache()
 
 export interface PermissionState {
   routers: AppRouteRecordRaw[]
@@ -33,8 +34,8 @@ export const usePermissionStore = defineStore('permission', {
     async generateRoutes(): Promise<unknown> {
       return new Promise<void>(async (resolve) => {
         let res: AppCustomRouteRecordRaw[] = []
-        if (cache.local.get(CACHE_KEY.ROLE_ROUTERS)) {
-          res = cache.local.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[]
+        if (wsCache.get(CACHE_KEY.ROLE_ROUTERS)) {
+          res = wsCache.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 } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getInfo, loginOut } from '@/api/login'
-import cache from '@/plugins/cache'
+
+const { wsCache } = useCache()
 
 interface UserVO {
   id: number
   avatar: string
   nickname: string
-  currentRole: number
 }
 interface UserInfoVO {
   permissions: string[]
@@ -26,8 +26,7 @@ export const useUserStore = defineStore('admin-user', {
     user: {
       id: 0,
       avatar: '',
-      nickname: '',
-      currentRole: 0
+      nickname: ''
     }
   }),
   getters: {
@@ -50,21 +49,21 @@ export const useUserStore = defineStore('admin-user', {
         this.resetState()
         return null
       }
-      let userInfo = cache.local.get(CACHE_KEY.USER)
-      if (!userInfo || !userInfo?.menus || userInfo.menus.length == 0) {
+      let userInfo = wsCache.get(CACHE_KEY.USER)
+      if (!userInfo) {
         userInfo = await getInfo({})
       }
       this.permissions = userInfo.permissions
       this.roles = userInfo.roles
       this.user = userInfo.user
       this.isSetUser = true
-      cache.local.set(CACHE_KEY.USER, userInfo)
-      cache.local.set(CACHE_KEY.ROLE_ROUTERS, userInfo.menus)
+      wsCache.set(CACHE_KEY.USER, userInfo)
+      wsCache.set(CACHE_KEY.ROLE_ROUTERS, userInfo.menus)
     },
     async loginOut() {
       await loginOut()
       removeToken()
-      cache.local.clear()
+      wsCache.clear()
       this.resetState()
     },
     resetState() {
@@ -74,12 +73,11 @@ export const useUserStore = defineStore('admin-user', {
       this.user = {
         id: 0,
         avatar: '',
-        nickname: '',
-        currentRole: 0
+        nickname: ''
       }
     },
     refresh() {
-      cache.local.delete(CACHE_KEY.USER)
+      wsCache.delete(CACHE_KEY.USER)
       this.resetState()
       window.location.href = ''
     }

src/utils/auth.ts

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

src/utils/index.ts

@@ -213,7 +213,7 @@ export const fenToYuan = (amount: string | number): number => {
 export const removeNullField = (obj: Object) => {
   for (const key in obj) {
     if (Object.prototype.hasOwnProperty.call(obj, key)) {
-      if (obj[key] === '' || obj[key] === null || obj[key] == undefined) {
+      if (obj[key] === '') {
         delete obj[key]
       }
     }

src/utils/permission.ts

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

src/views/Basic/Dept/DialogTarget.vue

@@ -1,133 +0,0 @@
-<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,13 +23,9 @@
     <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">
-      <template #default="{ row }">
-        {{ ['启用', '禁用'][row.status] }}
-      </template>
-    </el-table-column>
+    <el-table-column prop="status" label="状态" width="100" />
     <el-table-column label="创建时间" prop="createTime" width="180" :formatter="dateFormatter" />
-    <el-table-column label="操作" class-name="fixed-width" width="240">
+    <el-table-column label="操作" class-name="fixed-width" width="160">
       <template #default="scope">
         <el-button
           link
@@ -39,14 +35,6 @@
         >
           修改
         </el-button>
-        <el-button
-          link
-          type="primary"
-          @click="openTarget(scope.row.id)"
-          v-hasPermi="['basic:dept:update']"
-        >
-          业绩指标
-        </el-button>
         <el-button
           link
           type="danger"
@@ -61,13 +49,11 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <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() // 国际化
@@ -107,11 +93,6 @@ 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/Comp/BSClue.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form :model="form" ref="formRef" label-width="auto">
-    <!-- <el-form-item v-if="getConfig('usePhoneConfig')">
+    <el-form-item v-if="getConfig('usePhoneConfig')">
       <template #label>
         <Tooltip
           v-if="getConfig('usePhoneConfig').remark"
@@ -20,7 +20,7 @@
           {{ item.name }}
         </el-radio>
       </el-radio-group>
-    </el-form-item> -->
+    </el-form-item>
     <el-form-item v-if="getConfig('showFollowConfig')">
       <template #label>
         <Tooltip

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

@@ -10,7 +10,7 @@
       <el-form-item label="服务类型" prop="serviceId">
         <el-select v-model="formData.serviceId" placeholder="选择服务类型" filterable>
           <el-option
-            v-for="item in props.appList"
+            v-for="item in appList"
             :key="item.serviceId"
             :label="item.serviceName"
             :value="item.serviceId"
@@ -116,18 +116,14 @@
 <script lang="ts" name="SystemMenuForm" setup>
 // import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as MenuApi from '@/api/system/menu'
-import { CACHE_KEY } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } 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() // 消息弹窗
 
-const props = defineProps({
-  appList: Object as any
-})
-
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
@@ -163,6 +159,7 @@ const open = async (type: string, id?: number, parentId?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  getOptions()
   if (parentId) {
     formData.value.parentId = parentId
   }
@@ -180,6 +177,13 @@ const open = async (type: string, id?: number, parentId?: number) => {
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
+const appList = ref([])
+const getOptions = () => {
+  MenuApi.getServiceAppList().then((data) => {
+    appList.value = data
+  })
+}
+
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
@@ -218,7 +222,7 @@ const submitForm = async () => {
   } finally {
     formLoading.value = false
     // 清空，从而触发刷新
-    cache.local.delete(CACHE_KEY.ROLE_ROUTERS)
+    wsCache.delete(CACHE_KEY.ROLE_ROUTERS)
   }
 }
 

src/views/Basic/Menu/index.vue

@@ -62,11 +62,6 @@
       <el-table-column :show-overflow-tooltip="true" label="组件路径" prop="component" />
       <el-table-column :show-overflow-tooltip="true" label="组件名称" prop="componentName" />
       <el-table-column label="状态" prop="status" width="80" />
-      <el-table-column label="服务类型" prop="" width="100">
-        <template #default="{ row }">
-          {{ getServiceName(row.serviceId) }}
-        </template>
-      </el-table-column>
       <el-table-column align="center" label="操作">
         <template #default="scope">
           <el-button link type="primary" @click="openForm('update', scope.row.id)">
@@ -82,14 +77,14 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <MenuForm ref="formRef" :appList="appList" @success="getList" />
+  <MenuForm ref="formRef" @success="getList" />
 </template>
 <script lang="ts" name="SystemMenu" setup>
 import { handleTree } from '@/utils/tree'
 import * as MenuApi from '@/api/system/menu'
 import MenuForm from './MenuForm.vue'
-import { CACHE_KEY } from '@/hooks/web/useCache'
-import cache from '@/plugins/cache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+const { wsCache } = useCache()
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -145,7 +140,7 @@ const refreshMenu = async () => {
   try {
     await message.confirm('即将更新缓存刷新浏览器！', '刷新菜单缓存')
     // 清空，从而触发刷新
-    cache.local.delete(CACHE_KEY.ROLE_ROUTERS)
+    wsCache.delete(CACHE_KEY.ROLE_ROUTERS)
     // 刷新浏览器
     location.reload()
   } catch {}
@@ -165,20 +160,8 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
-const appList = ref([] as any)
-const getOptions = () => {
-  MenuApi.getServiceAppList().then((data) => {
-    appList.value = data
-  })
-}
-
-function getServiceName(serviceId: any) {
-  return appList.value.find((it: any) => it.serviceId == serviceId)?.serviceName
-}
-
 /** 初始化 **/
 onMounted(() => {
-  getOptions()
   getList()
 })
 </script>

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

@@ -1,149 +0,0 @@
-<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,13 +75,6 @@
             @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>
     <!-- 表单弹窗：添加/修改 -->
@@ -93,7 +86,6 @@ 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,4 +1,11 @@
 <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"
@@ -19,6 +26,7 @@ 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,8 +139,7 @@ const formData = ref({
   remark: '',
   status: CommonStatusEnum.ENABLE,
   roleIds: [],
-  hireDate: '',
-  isNewUserConfirm: false
+  hireDate: ''
 })
 const formRules = ref<any>({
   username: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }],
@@ -193,14 +192,8 @@ const submitForm = async () => {
   try {
     const data = formData.value as unknown as UserApi.UserVO
     if (formType.value === 'create') {
-      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'))
-      }
+      await UserApi.createUser(data)
+      message.success(t('common.createSuccess'))
     } else {
       await UserApi.updateUser(data)
       message.success(t('common.updateSuccess'))
@@ -227,8 +220,7 @@ const resetForm = () => {
     remark: '',
     status: CommonStatusEnum.ENABLE,
     roleIds: [],
-    hireDate: formatDate(new Date(), 'YYYY-MM-DD'),
-    isNewUserConfirm: false
+    hireDate: formatDate(new Date(), 'YYYY-MM-DD')
   }
   formRef.value?.resetFields()
 }

src/views/Basic/User/index.vue

@@ -7,10 +7,10 @@
     <el-col :span="20" :xs="24">
       <!-- 搜索 -->
       <el-form :model="queryParams" ref="queryFormRef" inline label-width="68px">
-        <el-form-item label="姓名" prop="nickname">
+        <el-form-item label="登录账号" prop="username">
           <el-input
-            v-model="queryParams.nickname"
-            placeholder="请输入姓名"
+            v-model="queryParams.username"
+            placeholder="请输入登录账号"
             clearable
             @keyup.enter="handleQuery"
             class="!w-240px"
@@ -118,7 +118,6 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   username: undefined,
-  nickname: undefined,
   mobile: undefined,
   deptId: undefined
 })

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 style="width: 120px">
+        <el-select v-model="searchForm.state" placeholder="审核状态" clearable>
           <el-option label="待审核" :value="1" />
           <el-option label="已撤销" :value="2" />
           <el-option label="已通过" :value="3" />
@@ -16,13 +16,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select
-          v-model="searchForm.signUser"
-          placeholder="登记人"
-          clearable
-          filterable
-          style="width: 120px"
-        >
+        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -40,17 +34,10 @@
           range-separator="-"
           start-placeholder="成交日期"
           end-placeholder="成交日期"
-          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
-        <el-select
-          v-model="searchForm.applyUser"
-          placeholder="申请人"
-          clearable
-          filterable
-          style="width: 120px"
-        >
+        <el-select v-model="searchForm.applyUser" placeholder="申请人" clearable filterable>
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -68,31 +55,12 @@
           range-separator="-"
           start-placeholder="申请日期"
           end-placeholder="申请日期"
-          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
-        <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-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+        <el-button @click="batchAudit">批量审核</el-button>
       </el-form-item>
     </el-form>
 
@@ -108,8 +76,6 @@
       <el-table-column prop="phone" label="联系方式" min-width="150px" />
       <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" />
@@ -126,23 +92,10 @@
         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
-            v-hasPermi="['clue:order:after-sale-detail']"
-            @click="handleDetail(row.id)"
-          >
+          <el-button type="primary" style="padding: 0" text @click="handleDetail(row.id)">
             详情
           </el-button>
           <el-button
@@ -189,7 +142,6 @@ import DialogAfterSaleAudit from './DialogAfterSaleAudit.vue'
 import DialogAfterSaleDetail from './DialogAfterSaleDetail.vue'
 import DialogBatchAudit from './DialogBatchAudit.vue'
 
-import { removeNullField } from '@/utils'
 import { dateFormatter } from '@/utils/formatTime'
 
 const afterSaleAuditDialog = ref()
@@ -207,7 +159,6 @@ const searchForm = ref({
   dealUser: undefined,
   createDate: [],
   createUser: undefined,
-  checkTime: [],
   pageNo: 1,
   pageSize: 20
 })
@@ -231,7 +182,6 @@ function handleReset() {
     dealUser: undefined,
     createDate: [],
     createUser: undefined,
-    checkTime: [],
     pageNo: 1,
     pageSize: 20
   }
@@ -241,7 +191,7 @@ const loading = ref(false)
 async function getList() {
   loading.value = true
   try {
-    const data = await AfterSaleApi.getAfterSalePage(removeNullField(searchForm.value))
+    const data = await AfterSaleApi.getAfterSalePage(searchForm.value)
     tableList.value = data.list
     total.value = data.total
   } finally {

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

@@ -113,7 +113,6 @@
 import { getSimpleUserList as getUserOption } from '@/api/system/user'
 import { getSimpleProductList } from '@/api/mall/product'
 import * as DeliveryApi from '@/api/clue/delivery'
-import { removeNullField } from '@/utils'
 
 import { dateFormatter } from '@/utils/formatTime'
 // const message = useMessage() // 消息弹窗
@@ -156,7 +155,7 @@ const loading = ref(false)
 async function getList() {
   loading.value = true
   try {
-    const data = await DeliveryApi.getDeliveryPage(removeNullField(searchForm.value))
+    const data = await DeliveryApi.getDeliveryPage(searchForm.value)
     tableList.value = data.list
     total.value = data.total
   } finally {

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

@@ -4,7 +4,6 @@
       <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="审核状态" />
@@ -14,61 +13,35 @@
     <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="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"
-              :min="0"
-              :controls="false"
-              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">
-          <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"
-              :autoSize="{ minRows: 3 }"
-              v-model="form.solution"
-              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 v-if="!showAdd" :model="form" ref="formRef" :rules="rules" label-width="80px">
+      <el-form-item label="售后原因" prop="reason">
+        <el-input v-model="form.reason" placeholder="请输入售后原因" />
+      </el-form-item>
+      <el-form-item label="退款金额" prop="refundAmount">
+        <el-input-number
+          v-model="form.refundAmount"
+          :min="0"
+          :controls="false"
+          placeholder="请输入金额"
+        />
+      </el-form-item>
+      <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-form-item label="解决方案" prop="solution">
+        <el-input
+          type="textarea"
+          :autoSize="{ minRows: 3 }"
+          v-model="form.solution"
+          placeholder="请输入退款原因"
+        />
+      </el-form-item>
+      <el-form-item label="备注">
+        <Editor v-model:modelValue="form.remark" />
+      </el-form-item>
       <el-form-item>
         <el-button :disabled="formLoading" type="primary" @click="onSubmit">保存</el-button>
         <el-button @click="showAdd = true">取消</el-button>
@@ -99,8 +72,7 @@ function open(signId) {
 const showAdd = ref(true)
 const form = ref({})
 const rules = {
-  percentageDeductAmount: { required: true, message: '提成扣款金额不可为空', trigger: 'blur' },
-  refundAmount: { required: true, message: '退款金额不可为空', trigger: 'blur' },
+  refundAmount: { required: true, message: '回款金额不可为空', trigger: 'blur' },
   reason: { required: true, message: '售后原因不可为空', trigger: 'blur' },
   solution: { required: true, message: '解决方案不可为空', trigger: 'blur' }
 }
@@ -119,7 +91,6 @@ function handleAdd() {
     solution: undefined,
     refundAmount: undefined,
     isReturns: false,
-    percentageDeductAmount: undefined,
     remark: undefined
   }
 }

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

@@ -1,39 +1,16 @@
 <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"
-      :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 ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+      <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-form-item label="备注" prop="remark">
+        <Editor v-model:modelValue="formData.remark" />
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -43,7 +20,6 @@
 </template>
 <script name="DialogAfterSaleAudit" setup>
 import { auditAfterSale } from '@/api/clue/afterSale'
-import { formatDate } from '@/utils/formatTime'
 
 const message = useMessage() // 消息弹窗
 
@@ -87,16 +63,6 @@ const schema = [
     label: '退款金额',
     span: 1
   },
-  {
-    field: 'percentageDeductAmount',
-    label: '提成扣款',
-    span: 1
-  },
-  {
-    field: 'isCompanyReceipts',
-    label: '是否公司收款',
-    span: 1
-  },
   {
     field: 'isReturns',
     label: '是否退货',
@@ -128,10 +94,6 @@ const formData = ref({
 })
 const formRef = ref() // 表单 Ref
 
-const ruels = {
-  checkTime: { required: true, message: '审核日期不可为空', trigger: 'blur,change' }
-}
-
 const orderInfo = ref({})
 /** 打开弹窗 */
 const open = async (row) => {
@@ -168,7 +130,6 @@ 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,16 +54,6 @@ 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,38 +1,15 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
-    <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 ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+      <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-form-item label="备注" prop="remark">
+        <Editor v-model:modelValue="formData.remark" />
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -43,7 +20,6 @@
 <script name="DialogAfterSaleAudit" setup>
 import { batchAuditAfterSale } from '@/api/clue/afterSale'
 import { batchAuditPayment } from '@/api/clue/payment'
-import { formatDate } from '@/utils/formatTime'
 
 const message = useMessage() // 消息弹窗
 
@@ -56,10 +32,6 @@ const formData = ref({
   remark: ''
 })
 const formRef = ref() // 表单 Ref
-const ruels = {
-  checkTime: { required: true, message: '审核日期不可为空', trigger: 'blur,change' }
-}
-
 const formType = ref('aftersale')
 const titleMap = {
   aftersale: '批量售后审核',
@@ -107,7 +79,6 @@ const resetForm = (ids) => {
   formData.value = {
     payIds: ids,
     saleIds: ids,
-    checkTime: formatDate(new Date()),
     state: 3,
     remark: ''
   }

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

@@ -77,32 +77,6 @@
             </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">
@@ -124,7 +98,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>
@@ -142,20 +116,15 @@ 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) {
@@ -175,7 +144,6 @@ defineExpose({
 })
 
 const form = ref({})
-const extraPay = ref({})
 const rules = ref({
   supplier: { required: true, message: '供应商不可为空', trigger: 'change' },
   warehouseId: { required: true, message: '仓库不可为空', trigger: 'change' },
@@ -196,11 +164,6 @@ function resetForm(row) {
     unitPrice: undefined,
     remark: undefined
   }
-  extraPay.value = {
-    extraPayType: undefined,
-    extraPayMoney: undefined,
-    remark: undefined
-  }
 }
 
 const emit = defineEmits(['success'])
@@ -246,9 +209,6 @@ 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.id"
-              :label="item.extraPayName"
-              :value="item.id"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
             />
           </el-select>
         </template>
@@ -73,9 +73,9 @@
 
 <script setup name="DialogExtraPay">
 import { signAddPay, getSignExtraPayList } from '@/api/clue/sign'
-import * as ExtraFeeApi from '@/api/clue/extraFee'
+import { getDictOptions } from '@/utils/dict'
 
-const extraPayOptions = ref([])
+const extraPayOptions = getDictOptions('extra_pay_type')
 const message = useMessage() // 消息弹窗
 
 const show = ref(false)
@@ -83,7 +83,6 @@ function open(id) {
   show.value = true
   resetForm(id)
   getFormList()
-  getOptions()
 }
 defineExpose({
   open
@@ -136,12 +135,6 @@ 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,44 +1,16 @@
 <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 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"
-      :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 ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+      <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-form-item label="备注" prop="remark">
+        <Editor v-model:modelValue="formData.remark" />
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -47,10 +19,8 @@
   </Dialog>
 </template>
 <script name="DialogFeebackAudit" setup>
-import { getFollowUserList } from '@/api/clue'
-import { auditPayment, getPaymentDetail } from '@/api/clue/payment'
-import { dateFormatter, formatDate } from '@/utils/formatTime'
-import {} from '@/utils/formatTime'
+import { auditPayment } from '@/api/clue/payment'
+
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
@@ -112,11 +82,6 @@ const formData = ref({
   state: 3,
   remark: ''
 })
-
-const ruels = {
-  checkTime: { required: true, message: '审核日期不可为空', trigger: 'blur,change' }
-}
-
 const formRef = ref() // 表单 Ref
 
 const orderInfo = ref({})
@@ -125,10 +90,8 @@ const open = async (row) => {
   dialogVisible.value = true
   dialogTitle.value = '回款审核'
   resetForm(row.id)
-  // 设置数据
-  orderInfo.value = await getPaymentDetail({ id: row.id })
-  // 获取跟进信息
-  getFollowInfo(row.clueId)
+  // 修改时，设置数据
+  orderInfo.value = { ...row }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -157,17 +120,8 @@ const resetForm = (signId) => {
   formData.value = {
     payId: signId,
     state: 3,
-    checkTime: formatDate(new Date()),
     remark: ''
   }
   formRef.value?.resetFields()
 }
-
-const followList = ref([])
-
-function getFollowInfo(id) {
-  getFollowUserList({ id }).then((data) => {
-    followList.value = data
-  })
-}
 </script>

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

@@ -7,11 +7,6 @@
       :columns="2"
       labelWidth="130px"
     />
-    <el-table :data="followList" size="small" border class="mt-10px">
-      <el-table-column prop="userName" label="跟进人" />
-      <el-table-column prop="followTime" label="最新跟进时间" :formatter="dateFormatter" />
-      <el-table-column prop="signSate" label="成交状态" />
-    </el-table>
     <Descriptions
       title="审核详情"
       :data="orderInfo"
@@ -23,40 +18,110 @@
 </template>
 <script name="DialogFeebackDetail" setup>
 import { getPaymentDetail } from '@/api/clue/payment'
-import { getFollowUserList } from '@/api/clue'
-
-import { useAppStore } from '@/store/modules/app'
-import { schoolApplySchema, mallApplySchema, auditSchema, cancelSchema } from './feedbackSchema.js'
-import { dateFormatter } from '@/utils/formatTime'
-
-const appStore = useAppStore()
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 
-const applySchema = computed(() => {
-  return appStore.getAppInfo?.instanceType == 1 ? schoolApplySchema : mallApplySchema
-})
+const applySchema = [
+  {
+    field: 'name',
+    label: '线索名称',
+    span: 1
+  },
+  {
+    field: 'phone',
+    label: '联系方式',
+    span: 1
+  },
+  {
+    field: 'signUserName',
+    label: '登记人',
+    span: 1
+  },
+  {
+    field: 'dealDate',
+    label: '成交日期',
+    dateFormat: 'YYYY-MM-DD',
+    span: 1
+  },
+  {
+    field: 'money',
+    label: '回款金额',
+    span: 1
+  },
+  {
+    field: 'isPayoff',
+    label: '是否结清',
+    span: 1
+  },
+  {
+    field: 'applyUserName',
+    label: '申请人',
+    span: 1
+  },
+  {
+    field: 'applyTime',
+    label: '申请时间',
+    dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    span: 1
+  },
+  {
+    field: 'remark',
+    label: '备注',
+    span: 2,
+    isEditor: true
+  }
+]
+
+const auditSchema = [
+  {
+    field: 'stateName',
+    label: '审核状态',
+    span: 1
+  },
+  {
+    field: 'checkUser',
+    label: '审核人',
+    span: 1
+  },
+  {
+    field: 'checkTime',
+    label: '审核时间',
+    dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    span: 1
+  },
+  {
+    field: 'checkRemark',
+    label: '备注',
+    span: 3,
+    isEditor: true
+  }
+]
+
+const cancelSchema = [
+  {
+    field: 'stateName',
+    label: '审核状态',
+    span: 1
+  },
+  {
+    field: 'revokeTime',
+    label: '撤销时间',
+    dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    span: 1
+  }
+]
 
 const orderInfo = ref({})
 /** 打开弹窗 */
-const open = async (row) => {
+const open = async (id) => {
   dialogVisible.value = true
   dialogTitle.value = '回款申请详情'
   try {
-    orderInfo.value = await getPaymentDetail({ id: row.id })
-    getFollowInfo(row.clueId)
+    orderInfo.value = await getPaymentDetail({ id })
   } catch (error) {
     console.log(error)
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-const followList = ref([])
-
-function getFollowInfo(id) {
-  getFollowUserList({ id }).then((data) => {
-    followList.value = data
-  })
-}
 </script>

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" v-if="checkPermi(['clue:pool:detail'])">
+      <el-tab-pane label="线索信息" name="clueInfo">
         <Descriptions :data="clueInfo" :schema="clueSchema" :columns="2" labelWidth="130px" />
       </el-tab-pane>
       <el-tab-pane label="成交信息" name="orderInfo">
@@ -61,11 +61,7 @@
           </el-table>
         </div>
       </el-tab-pane>
-      <el-tab-pane
-        label="回款记录"
-        name="returnRecord"
-        v-if="checkPermi(['clue:order:return-list'])"
-      >
+      <el-tab-pane label="回款记录" name="returnRecord">
         <el-table :data="returnRecordList" border stripe>
           <el-table-column type="index" width="50" />
           <el-table-column prop="money" label="回款金额" />
@@ -74,11 +70,7 @@
           <el-table-column prop="stateName" label="审核状态" />
         </el-table>
       </el-tab-pane>
-      <el-tab-pane
-        label="售后记录"
-        name="afterSale"
-        v-if="checkPermi(['clue:order:after-sale-list'])"
-      >
+      <el-tab-pane label="售后记录" name="afterSale">
         <el-table :data="aftersaleList" border stripe>
           <el-table-column type="index" width="50" />
           <el-table-column prop="reason" label="售后原因" />
@@ -191,17 +183,11 @@ function getFields() {
   })
 
   getOrderFieldList().then((data) => {
-    const list = useCrudSchemas(data).allSchemas.detailSchema
-    const arr = []
-    list.forEach((it) => {
+    const arr = useCrudSchemas(data).allSchemas.detailSchema
+    arr.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,13 +52,6 @@
         <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>
@@ -68,89 +61,49 @@
       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">
-            <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="产品规格" />
-                <el-table-column prop="signNum" label="成交数量" 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
-                      placement="top"
-                      width="500px"
-                      trigger="click"
-                      v-if="scope.row.warehouseName && scope.row.sendRemark"
-                    >
-                      <template #reference>
-                        <el-button type="primary" style="padding: 0" text>点击查看</el-button>
-                      </template>
-                      <div v-dompurify-html="scope.row.sendRemark"></div>
-                    </el-popover>
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" width="100px">
-                  <template #default="scope">
-                    <el-button
-                      type="primary"
-                      class="mr-10px"
-                      link
-                      :disabled="scope.row.sendState == '已发货'"
-                      style="padding: 0; margin-left: 0"
-                      v-hasPermi="['clue:order:send']"
-                      @click="handleDelivery(scope.row)"
-                    >
-                      发货
-                    </el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </VueDraggable>
+            <el-table :data="row.signProducts" stripe style="width: 900px">
+              <el-table-column prop="productName" label="成交产品" />
+              <el-table-column prop="specsName" label="产品规格" width="100px" />
+              <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 label="发货备注" width="100px">
+                <template #default="scope">
+                  <el-popover
+                    placement="top"
+                    width="500px"
+                    trigger="click"
+                    v-if="scope.row.warehouseName && scope.row.sendRemark"
+                  >
+                    <template #reference>
+                      <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+                    </template>
+                    <div v-dompurify-html="scope.row.sendRemark"></div>
+                  </el-popover>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="100px">
+                <template #default="scope">
+                  <el-button
+                    type="primary"
+                    class="mr-10px"
+                    link
+                    :disabled="scope.row.sendState == '已发货'"
+                    style="padding: 0; margin-left: 0"
+                    v-hasPermi="['clue:order:send']"
+                    @click="handleDelivery(scope.row)"
+                  >
+                    发货
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
           </div>
         </template>
       </el-table-column>
@@ -162,14 +115,17 @@
         min-width="120px"
       >
         <template #default="{ row }">
-          <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[item.field]"></div>
-            </el-popover>
-          </div>
+          <el-popover
+            placement="top"
+            width="500px"
+            trigger="click"
+            v-if="item.field == 'remark' && row.remark"
+          >
+            <template #reference>
+              <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+            </template>
+            <div v-dompurify-html="row.remark"></div>
+          </el-popover>
           <span v-else-if="item.form?.component == 'DatePicker'">
             {{ formatDate(row[item.field]) }}
           </span>
@@ -244,7 +200,7 @@
 <script setup name="ClueOrderList">
 import { getSimpleFieldList } from '@/api/clue/orderField'
 import * as SignApi from '@/api/clue/sign'
-import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
+import { getSimpleUserList as getUserOption } from '@/api/system/user'
 import { getSimpleProductList } from '@/api/mall/product'
 
 import DialogOrder from './DialogOrder.vue'
@@ -255,13 +211,13 @@ 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([])
 onMounted(() => {
+  getUserOption().then((data) => {
+    userOptions.value = data
+    getCurdSchemas()
+  })
   getOptions()
 })
 
@@ -330,10 +286,8 @@ async function getCurdSchemas() {
   try {
     const data = await getSimpleFieldList()
     data.forEach((elem) => {
-      if (['createUser'].includes(elem.field)) {
+      if (elem.field == 'createUser') {
         elem.search.options = userOptions.value
-      } else if (['convertPeople', 'receiver'].includes(elem.field)) {
-        elem.search.options = allUserOptions.value
       }
     })
     allSchemas.value = useCrudSchemas(data).allSchemas
@@ -389,110 +343,16 @@ function handleAddFee(row) {
   extraFeeDialog.value.open(row.signId)
 }
 
-async function getOptions() {
+function getOptions() {
   // 产品
   getSimpleProductList().then((data) => {
     prodOptions.value = data
   })
-
-  userOptions.value = await getUserOption()
-  allUserOptions.value = await getAllUserList()
-  getCurdSchemas()
 }
 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,44 +2,22 @@
   <div>
     <el-form :model="searchForm" label-width="0" inline>
       <el-form-item>
-        <el-input
-          v-model="searchForm.signId"
-          placeholder="成交单号"
-          clearable
-          style="width: 120px"
-        />
+        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.name" placeholder="线索名称" clearable style="width: 120px" />
+        <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
       </el-form-item>
       <el-form-item>
-        <el-input
-          v-model="searchForm.phone"
-          placeholder="联系方式"
-          clearable
-          style="width: 120px"
-        />
+        <el-input v-model="searchForm.phone" placeholder="联系方式" clearable />
       </el-form-item>
       <el-form-item>
-        <el-select
-          v-model="searchForm.settlementType"
-          placeholder="结算类型"
-          clearable
-          filterable
-          style="width: 120px"
-        >
+        <el-select v-model="searchForm.settlementType" placeholder="结算类型" clearable filterable>
           <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
-          style="width: 120px"
-        >
+        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -57,19 +35,6 @@
           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>
@@ -79,7 +44,6 @@
           filterable
           clearable
           @change="searchForm.signSpecs = undefined"
-          style="width: 150px"
         >
           <el-option
             v-for="item in prodOptions"
@@ -96,7 +60,6 @@
           filterable
           clearable
           :disabled="!searchForm.signProduct"
-          style="width: 120px"
         >
           <el-option
             v-for="item in specsOptions(searchForm.signProduct)"
@@ -107,13 +70,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select
-          v-model="searchForm.supplier"
-          placeholder="选择供应商"
-          filterable
-          clearable
-          style="width: 120px"
-        >
+        <el-select v-model="searchForm.supplier" placeholder="选择供应商" filterable clearable>
           <el-option
             v-for="item in supplierOptions"
             :key="item.value"
@@ -130,11 +87,9 @@
       </el-form-item>
 
       <el-form-item>
-        <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-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+        <el-button @click="batchSettle">批量结算</el-button>
       </el-form-item>
     </el-form>
 
@@ -157,38 +112,10 @@
       <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">
-        <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="settlementPrice" label="结算单价" min-width="150px" />
       <el-table-column prop="settlementNum" label="结算数量" min-width="150px" />
       <el-table-column prop="settlementMoney" label="结算金额" min-width="150px" />
       <el-table-column label="费用备注" width="90px">
@@ -209,7 +136,6 @@
       />
       <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">
@@ -221,19 +147,6 @@
           </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"
@@ -283,7 +196,6 @@ const searchForm = ref({
   phone: undefined,
   signUser: undefined,
   dealDate: [],
-  createDate: [],
   signProduct: undefined,
   signSpecs: undefined,
   signId: undefined,
@@ -300,7 +212,6 @@ function handleReset() {
     phone: undefined,
     signUser: undefined,
     dealDate: [],
-    createDate: [],
     signProduct: undefined,
     signSpecs: undefined,
     signId: undefined,
@@ -353,28 +264,6 @@ 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,14 +89,17 @@
         min-width="120px"
       >
         <template #default="{ row }">
-          <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[item.field]"></div>
-            </el-popover>
-          </div>
+          <el-popover
+            placement="top"
+            width="500px"
+            trigger="click"
+            v-if="item.form?.component == 'Editor' && row[item.field]"
+          >
+            <template #reference>
+              <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+            </template>
+            <div v-dompurify-html="row.remark"></div>
+          </el-popover>
           <span v-else-if="item.form?.component == 'DatePicker'">
             {{ formatDate(row[item.field]) }}
           </span>
@@ -171,7 +174,7 @@
 <script setup name="ClueOrderList">
 import { getSimpleFieldList } from '@/api/clue/orderField'
 import * as SignApi from '@/api/clue/sign'
-import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
+import { getSimpleUserList as getUserOption } from '@/api/system/user'
 import { getPlaceList } from '@/api/school/place'
 import { getClassTypeList } from '@/api/school/class'
 
@@ -184,8 +187,11 @@ import { removeNullField } from '@/utils'
 import { formatDate } from '@/utils/formatTime'
 
 const userOptions = ref([])
-const allUserOptions = ref([])
 onMounted(() => {
+  getUserOption().then((data) => {
+    userOptions.value = data
+    getCurdSchemas()
+  })
   getOptions()
 })
 
@@ -254,10 +260,8 @@ async function getCurdSchemas() {
   try {
     const data = await getSimpleFieldList()
     data.forEach((elem) => {
-      if (['createUser'].includes(elem.field)) {
+      if (elem.field == 'createUser') {
         elem.search.options = userOptions.value
-      } else if (['convertPeople', 'receiver'].includes(elem.field)) {
-        elem.search.options = allUserOptions.value
       }
     })
     allSchemas.value = useCrudSchemas(data).allSchemas
@@ -329,15 +333,12 @@ async function getClassTypeOptions() {
   classOptions.value = data
 }
 
-async function getOptions() {
+function getOptions() {
   // 驾校
   getPlaceList({ placeStatus: 0, schoolStatus: 0, isSearchSchool: true }).then((data) => {
     schoolOptions.value = data.schoolList
     allPlaceOptions.value = data.placeList
   })
-  userOptions.value = await getUserOption()
-  allUserOptions.value = await getAllUserList()
-  getCurdSchemas()
 }
 </script>
 

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

@@ -8,56 +8,15 @@
         <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
       </el-form-item>
       <el-form-item>
-        <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-select v-model="searchForm.state" placeholder="审核状态" clearable>
           <el-option label="待审核" :value="1" />
           <el-option label="已撤销" :value="2" />
           <el-option label="已通过" :value="3" />
           <el-option label="已驳回" :value="4" />
         </el-select>
       </el-form-item>
-      <el-form-item v-if="appStore.getAppInfo?.instanceType == 1">
-        <el-select
-          v-model="searchForm.receiver"
-          placeholder="接待人"
-          clearable
-          filterable
-          style="width: 120px"
-        >
-          <el-option
-            v-for="item in allUserOptions"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item v-else-if="appStore.getAppInfo?.instanceType == 2">
-        <el-select
-          v-model="searchForm.convertPeople"
-          placeholder="转化人"
-          clearable
-          filterable
-          style="width: 120px"
-        >
-          <el-option
-            v-for="item in allUserOptions"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item>
-        <el-select
-          v-model="searchForm.signUser"
-          placeholder="登记人"
-          clearable
-          filterable
-          style="width: 120px"
-        >
+        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -75,17 +34,10 @@
           range-separator="-"
           start-placeholder="成交日期"
           end-placeholder="成交日期"
-          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
-        <el-select
-          v-model="searchForm.applyUser"
-          placeholder="申请人"
-          clearable
-          filterable
-          style="width: 120px"
-        >
+        <el-select v-model="searchForm.applyUser" placeholder="申请人" clearable filterable>
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -103,27 +55,12 @@
           range-separator="-"
           start-placeholder="申请日期"
           end-placeholder="申请日期"
-          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
-        <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-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+        <el-button @click="batchAudit">批量审核</el-button>
       </el-form-item>
     </el-form>
 
@@ -131,91 +68,14 @@
       v-loading="loading"
       :data="tableList"
       border
-      show-summary
-      :summary-method="getSummaries"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="60" :selectable="(row) => row.state == 1" />
+      <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="线索名称" width="120px" />
-      <el-table-column prop="phone" label="联系方式" width="120px" />companyProfit
-      <el-table-column prop="money" label="回款金额" min-width="120px">
-        <template #default="{ row }">
-          <el-input-number
-            v-if="row.edit"
-            v-model="row.money"
-            size="small"
-            :min="0"
-            :controls="false"
-            style="width: 100%"
-          />
-          <div v-else>{{ row.money }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-if="appStore.getAppInfo?.instanceType == 1"
-        prop="companyProfit"
-        label="公司利润"
-        min-width="120px"
-      >
-        <template #default="{ row }">
-          <el-input-number
-            v-if="row.edit"
-            v-model="row.companyProfit"
-            size="small"
-            :min="0"
-            :controls="false"
-            style="width: 100%"
-          />
-          <div v-else>{{ row.companyProfit }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-if="appStore.getAppInfo?.instanceType == 1"
-        prop="personProfit"
-        label="员工利润"
-        min-width="120px"
-      >
-        <template #default="{ row }">
-          <el-input-number
-            v-if="row.edit"
-            v-model="row.personProfit"
-            size="small"
-            :min="0"
-            :controls="false"
-            style="width: 100%"
-          />
-          <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">
-        <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"
-        label="接待人"
-        min-width="90"
-      />
-      <el-table-column
-        v-else-if="appStore.getAppInfo?.instanceType == 2"
-        prop="convertPeopleName"
-        label="转化人"
-        min-width="90"
-      />
-      <el-table-column
-        v-if="appStore.getAppInfo?.instanceType == 1"
-        prop="area"
-        label="区域"
-        min-width="90"
-      />
+      <el-table-column prop="name" label="线索名称" min-width="200px" />
+      <el-table-column prop="phone" label="联系方式" min-width="150px" />
+      <el-table-column prop="money" label="回款金额" min-width="90" />
+      <el-table-column prop="isPayoff" label="是否结清" min-width="90" />
       <el-table-column prop="signUserName" label="登记人" min-width="90" />
       <el-table-column
         prop="dealDate"
@@ -227,41 +87,13 @@
       <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
-            v-hasPermi="['clue:order:return-detail']"
-            @click="handleDetail(row)"
-          >
+          <el-button type="primary" style="padding: 0" text @click="handleDetail(row.id)">
             详情
           </el-button>
           <el-button
@@ -274,16 +106,6 @@
           >
             撤销
           </el-button>
-          <el-button
-            type="primary"
-            style="padding: 0"
-            text
-            v-if="row.state == 1"
-            v-hasPermi="['clue:order:update-return-money']"
-            @click="handleUpdate(row)"
-          >
-            <span>{{ row.edit ? '保存' : '修改金额' }}</span>
-          </el-button>
           <el-button
             type="primary"
             style="padding: 0"
@@ -312,20 +134,17 @@
 
 <script setup name="Reback">
 import * as FeebackApi from '@/api/clue/payment'
-import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
+import { getSimpleUserList as getUserOption } from '@/api/system/user'
 import { useUserStore } from '@/store/modules/user'
 
 import DialogFeebackAudit from './DialogFeebackAudit.vue'
 import DialogFeebackDetail from './DialogFeebackDetail.vue'
 import DialogBatchAudit from './DialogBatchAudit.vue'
 
-import { removeNullField } from '@/utils'
-import { useAppStore } from '@/store/modules/app'
-import { dateFormatter, formatDate } from '@/utils/formatTime'
+import { dateFormatter } from '@/utils/formatTime'
 
 const userStore = useUserStore()
 const message = useMessage() // 消息弹窗
-const appStore = useAppStore()
 
 const feebackDialog = ref()
 
@@ -339,14 +158,11 @@ const searchForm = ref({
   signUser: undefined,
   applyTime: [],
   applyUser: undefined,
-  checkTime: [],
-  phone: undefined,
   pageNo: 1,
   pageSize: 20
 })
 
 const userOptions = ref([])
-const allUserOptions = ref([])
 
 const tableList = ref([])
 const total = ref(0)
@@ -359,30 +175,24 @@ function handleSearch() {
 function handleReset() {
   searchForm.value = {
     signId: undefined,
-    receiver: undefined,
-    convertPeople: undefined,
     name: undefined,
     dealDate: [],
     state: undefined,
     signUser: undefined,
     applyTime: [],
     applyUser: undefined,
-    checkTime: [],
-    mobile: undefined,
     pageNo: 1,
     pageSize: 20
   }
 }
 
-const totalInfo = ref({})
 const loading = ref(false)
 async function getList() {
   loading.value = true
   try {
-    const data = await FeebackApi.getPaymentPage(removeNullField(searchForm.value))
+    const data = await FeebackApi.getPaymentPage(searchForm.value)
     tableList.value = data.list
     total.value = data.total
-    totalInfo.value = data.totalData
   } finally {
     loading.value = false
   }
@@ -403,8 +213,8 @@ function batchAudit() {
 }
 
 const feebackDetailDialog = ref()
-function handleDetail(row) {
-  feebackDetailDialog.value.open(row)
+function handleDetail(id) {
+  feebackDetailDialog.value.open(id)
 }
 async function handleCancel(id) {
   try {
@@ -427,57 +237,6 @@ function getOptions() {
   getUserOption().then((data) => {
     userOptions.value = data
   })
-  getAllUserList().then((data) => {
-    allUserOptions.value = data
-  })
-}
-
-function getSummaries(param) {
-  const { columns } = param
-  const sums = []
-  columns.forEach((column, index) => {
-    if (index === 0) {
-      sums[index] = '合计'
-    } else if (column.property == 'money') {
-      sums[index] = totalInfo.value.totalMoney
-    } else if (column.property == 'personProfit') {
-      sums[index] = totalInfo.value.totalPersonProfit
-    } else if (column.property == 'companyProfit') {
-      sums[index] = totalInfo.value.totalCompanyProfit
-    } else if (column.property == 'signPrice') {
-      sums[index] = totalInfo.value.totalSignPrice
-    } else {
-      sums[index] = ''
-    }
-  })
-
-  return sums
-}
-
-async function handleUpdate(row) {
-  if (row.edit) {
-    // 删除的二次确认
-    await message.confirm('是否确认修改回款金额？')
-    // 保存
-    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 == '结清'
-  }
 }
 
 onMounted(() => {

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

@@ -2,44 +2,22 @@
   <div>
     <el-form :model="searchForm" label-width="0" inline>
       <el-form-item>
-        <el-input
-          v-model="searchForm.signId"
-          placeholder="成交单号"
-          clearable
-          style="width: 120px"
-        />
+        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.name" placeholder="线索名称" clearable style="width: 120px" />
+        <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
       </el-form-item>
       <el-form-item>
-        <el-input
-          v-model="searchForm.phone"
-          placeholder="联系方式"
-          clearable
-          style="width: 120px"
-        />
+        <el-input v-model="searchForm.phone" placeholder="联系方式" clearable />
       </el-form-item>
       <el-form-item>
-        <el-select
-          v-model="searchForm.settlementType"
-          placeholder="结算类型"
-          clearable
-          filterable
-          style="width: 120px"
-        >
+        <el-select v-model="searchForm.settlementType" placeholder="结算类型" clearable filterable>
           <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
-          style="width: 120px"
-        >
+        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -57,19 +35,6 @@
           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>
@@ -79,7 +44,6 @@
           filterable
           clearable
           @change="changeSchool"
-          style="width: 120px"
         >
           <el-option
             v-for="item in schoolOptions"
@@ -97,7 +61,6 @@
           clearable
           :disabled="!searchForm.signSchool"
           @change="changePlace"
-          style="width: 120px"
         >
           <el-option
             v-for="item in placeOptions"
@@ -114,7 +77,6 @@
           placeholder="选择班型"
           filterable
           clearable
-          style="width: 120px"
         >
           <el-option
             v-for="item in classOptions"
@@ -131,11 +93,9 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item>
-        <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-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+        <el-button @click="batchSettle">批量结算</el-button>
       </el-form-item>
     </el-form>
 
@@ -158,38 +118,10 @@
       <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">
-        <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="settlementPrice" label="结算单价" min-width="150px" />
       <el-table-column prop="settlementNum" label="结算数量" min-width="150px" />
       <el-table-column prop="settlementMoney" label="结算金额" min-width="150px" />
       <el-table-column label="费用备注" width="90px">
@@ -210,7 +142,6 @@
       />
       <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">
@@ -222,19 +153,6 @@
           </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"
@@ -285,7 +203,6 @@ const searchForm = ref({
   phone: undefined,
   signUser: undefined,
   dealDate: [],
-  createDate: [],
   signSchool: undefined,
   signPlace: undefined,
   signClass: undefined,
@@ -302,7 +219,6 @@ function handleReset() {
     phone: undefined,
     signUser: undefined,
     dealDate: [],
-    createDate: [],
     signSchool: undefined,
     signPlace: undefined,
     signClass: undefined,
@@ -323,41 +239,21 @@ const loading = ref(false)
 const tableList = ref([])
 const total = ref(0)
 
-const totalInfo = ref({})
+const totalNum = ref(0)
+const totalAmount = ref(0)
 async function getList() {
   loading.value = true
   try {
     const data = await SettleApi.getSchoolSettlePage(removeNullField(searchForm.value))
     tableList.value = data.list
     total.value = data.total
-    totalInfo.value = data.totalData
+    totalNum.value = data.totalNum
+    totalAmount.value = data.totalAmount
   } finally {
     loading.value = false
   }
 }
 
-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 = []
@@ -365,9 +261,9 @@ function getSummaries(param) {
     if (index === 0) {
       sums[index] = '合计'
     } else if (column.property == 'settlementNum') {
-      sums[index] = totalInfo.value.totalNum
+      sums[index] = totalNum.value
     } else if (column.property == 'settlementMoney') {
-      sums[index] = totalInfo.value.totalAmount
+      sums[index] = totalAmount.value
     } else {
       sums[index] = ''
     }

src/views/Clue/Order/Comp/feedbackSchema.js

@@ -1,150 +0,0 @@
-export const schoolApplySchema = [
-  {
-    field: 'name',
-    label: '线索名称',
-    span: 1
-  },
-  {
-    field: 'phone',
-    label: '联系方式',
-    span: 1
-  },
-  {
-    field: 'signUserName',
-    label: '登记人',
-    span: 1
-  },
-  {
-    field: 'dealDate',
-    label: '成交日期',
-    dateFormat: 'YYYY-MM-DD',
-    span: 1
-  },
-  {
-    field: 'money',
-    label: '回款金额',
-    span: 1
-  },
-  {
-    field: 'signPrice',
-    label: '成交价',
-    span: 1
-  },
-  {
-    field: 'companyProfit',
-    label: '公司利润',
-    span: 1
-  },
-  {
-    field: 'personProfit',
-    label: '员工利润',
-    span: 1
-  },
-  {
-    field: 'applyUserName',
-    label: '申请人',
-    span: 1
-  },
-  {
-    field: 'applyTime',
-    label: '申请时间',
-    dateFormat: 'YYYY-MM-DD HH:mm:ss',
-    span: 1
-  },
-  {
-    field: 'remark',
-    label: '备注',
-    span: 2,
-    isEditor: true
-  }
-]
-
-export const mallApplySchema = [
-  {
-    field: 'name',
-    label: '线索名称',
-    span: 1
-  },
-  {
-    field: 'phone',
-    label: '联系方式',
-    span: 1
-  },
-  {
-    field: 'signUserName',
-    label: '登记人',
-    span: 1
-  },
-  {
-    field: 'dealDate',
-    label: '成交日期',
-    dateFormat: 'YYYY-MM-DD',
-    span: 1
-  },
-  {
-    field: 'money',
-    label: '回款金额',
-    span: 1
-  },
-  {
-    field: 'signPrice',
-    label: '成交价',
-    span: 1
-  },
-  {
-    field: 'applyUserName',
-    label: '申请人',
-    span: 1
-  },
-  {
-    field: 'applyTime',
-    label: '申请时间',
-    dateFormat: 'YYYY-MM-DD HH:mm:ss',
-    span: 1
-  },
-  {
-    field: 'remark',
-    label: '备注',
-    span: 2,
-    isEditor: true
-  }
-]
-
-export const auditSchema = [
-  {
-    field: 'stateName',
-    label: '审核状态',
-    span: 1
-  },
-  {
-    field: 'checkUser',
-    label: '审核人',
-    span: 1
-  },
-  {
-    field: 'checkTime',
-    label: '审核时间',
-    dateFormat: 'YYYY-MM-DD HH:mm:ss',
-    span: 1
-  },
-  {
-    field: 'checkRemark',
-    label: '备注',
-    span: 3,
-    isEditor: true
-  }
-]
-
-export const cancelSchema = [
-  {
-    field: 'stateName',
-    label: '审核状态',
-    span: 1
-  },
-  {
-    field: 'revokeTime',
-    label: '撤销时间',
-    dateFormat: 'YYYY-MM-DD HH:mm:ss',
-    span: 1
-  }
-]

src/views/Clue/Order/index.vue

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

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

@@ -39,7 +39,6 @@
 
 <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'
@@ -70,17 +69,9 @@ 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
+function initMap() {
   AMapLoader.load({
     key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key
     version: '2.0',
@@ -88,7 +79,7 @@ async function initMap() {
   }).then((AMap) => {
     aMap.value = AMap
     AutoComplete.value = new AMap.AutoComplete({
-      city: defaultCity.value
+      city: '合肥'
     })
     clueMap.value = new AMap.Map('mapClue', {
       zoom: 14,

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

@@ -1,98 +0,0 @@
-<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

@@ -1,8 +1,5 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px" @close="destroyMap">
-    <template #btn>
-      <el-button class="mr-20px" type="primary" size="small" @click="handleSave">保存</el-button>
-    </template>
     <el-tabs v-model="tabName" @tab-change="changeTab">
       <el-tab-pane label="线索信息" name="info">
         <Form ref="formRef" v-loading="formLoading" :rules="rules" isCol :schema="formSchema" />
@@ -33,7 +30,7 @@
                 v-model="row.nextFollowTime"
                 type="date"
                 placeholder="选择日期时间"
-                :disabled="row.userId != useUserStore().getUser.id"
+                :disabled="!row.editable"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 style="width: 100%"
@@ -47,7 +44,7 @@
                 type="textarea"
                 :autoSize="{ minRows: 2 }"
                 placeholder="输入跟进内容"
-                :disabled="row.userId != useUserStore().getUser.id"
+                :disabled="!row.editable"
               />
             </template>
           </el-table-column>
@@ -121,10 +118,10 @@
         </el-collapse>
       </el-tab-pane>
     </el-tabs>
-    <template #footer>
+    <div style="position: absolute; top: 75px; right: 20px">
       <el-button @click="dialogVisible = false">取 消</el-button>
       <el-button :disabled="formLoading" type="primary" @click="handleSave">保 存</el-button>
-    </template>
+    </div>
     <DialogSchoolInfo ref="schoolInfoDialog" />
   </Dialog>
 </template>
@@ -133,7 +130,6 @@
 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'
@@ -158,9 +154,6 @@ const props = defineProps({
   },
   userOptions: {
     type: Array
-  },
-  allUserOptions: {
-    type: Array
   }
 })
 
@@ -169,14 +162,6 @@ const formSchema = computed(() => {
   newSchema.forEach((it) => {
     if (it.field == 'consultTime') {
       it.componentProps['disabled-date'] = dateAfterToday
-      // 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 }))
     }
   })
   return [
@@ -203,20 +188,6 @@ 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()
 }
@@ -227,6 +198,14 @@ 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([])
@@ -237,7 +216,6 @@ const defaultLatLng = ref({
   lat: 31.86119,
   lng: 117.283042
 })
-const defaultCity = ref('合肥')
 const info = ref({})
 
 const diyFieldArr = ref([])
@@ -277,14 +255,9 @@ 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: cityInfo.lat,
-        lng: cityInfo.lng
-      }
-      defaultCity.value = cityInfo.locationName
+    defaultLatLng.value = {
+      lat: 31.86119,
+      lng: 117.283042
     }
     nextTick(() => {
       formRef.value.setValues(info.value, true)
@@ -364,8 +337,8 @@ async function handleSave() {
       const data = await ClueApi.createClue(params)
       message.success(data)
     } else {
-      await ClueApi.updateClue(params)
-      message.success('修改成功')
+      const data = await ClueApi.updateClue(params)
+      message.success(data)
     }
     dialogVisible.value = false
     // 发送操作成功的事件
@@ -413,7 +386,7 @@ function initMap(data) {
     })
     addmark(defaultLatLng.value.lng, defaultLatLng.value.lat, AMap)
     AutoComplete.value = new AMap.AutoComplete({
-      city: defaultCity.value
+      city: '合肥'
     })
     geoCoder.value = new AMap.Geocoder()
     dialogMap.value.on('click', (e) => {

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

@@ -1,8 +1,5 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="1000px">
-    <template #btn>
-      <el-button class="mr-20px" type="primary" size="small" @click="handleSave">保存</el-button>
-    </template>
     <div class="flex">
       <el-form style="flex: 1" :model="form" ref="formRef" :rules="rules" label-width="120px">
         <el-row :gutter="20">

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

@@ -1,44 +1,18 @@
 <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

@@ -1,8 +1,5 @@
 <template>
   <Dialog title="成交登记" v-model="show" width="900px">
-    <template #btn>
-      <el-button class="mr-20px" type="primary" size="small" @click="handleSave">保存</el-button>
-    </template>
     <Descriptions
       :title="`线索信息-${info.name}`"
       :data="info"
@@ -11,7 +8,7 @@
       labelWidth="130px"
       :defaultShow="false"
     />
-    <el-form :model="form" ref="formRef" :rules="rules" label-width="100px" class="mt-20px">
+    <el-form :model="form" ref="formRef" :rules="rules" label-width="80px" class="mt-20px">
       <el-row :gutter="20">
         <!-- 驾校招生模式 -->
         <template v-if="appStore.getAppInfo?.instanceType == 1">
@@ -81,20 +78,9 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8" :offset="0">
-          <el-form-item label="成交价" prop="signPrice">
-            <el-input-number
-              v-model="form.signPrice"
-              :min="0"
-              style="width: 100%"
-              :controls="false"
-              @change="signPriceChange"
-            />
-          </el-form-item>
-        </el-col>
         <el-col :span="8" :offset="0">
           <el-form-item label="是否全款">
-            <el-radio-group v-model="form.isPayoff">
+            <el-radio-group v-model="form.state">
               <el-radio :label="true"> 全款 </el-radio>
               <el-radio :label="false"> 非全款 </el-radio>
             </el-radio-group>
@@ -102,12 +88,7 @@
         </el-col>
         <el-col :span="8" :offset="0">
           <el-form-item label="支付金额" prop="payAmount">
-            <el-input-number
-              v-model="form.payAmount"
-              :min="0"
-              style="width: 100%"
-              :controls="false"
-            />
+            <el-input-number v-model="form.payAmount" :min="1" :step="1" style="width: 100%" />
           </el-form-item>
         </el-col>
         <el-col :span="8" :offset="0">
@@ -118,38 +99,8 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <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
-                  v-for="item in allUserOptions"
-                  :key="item.id"
-                  :label="item.nickname"
-                  :value="item.id"
-                />
-              </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="fieldItem.component == 'Editor' ? 24 : 8"
+          :span="8"
           :offset="0"
           v-for="fieldItem in diyFieldList"
           :key="fieldItem.clueParamId"
@@ -341,14 +292,11 @@
 
 <script setup name="DialogSuccess">
 import * as ClueApi from '@/api/clue'
-import { createSign, getSignProfit } from '@/api/clue/sign'
+import { createSign } 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'
 import { getDictOptions } from '@/utils/dict'
@@ -357,6 +305,10 @@ 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' }
+})
 
 const schoolRules = {
   signSchool: { required: true, message: '成交驾校不可为空', trigger: 'change' },
@@ -373,9 +325,6 @@ const message = useMessage() // 消息弹窗
 const props = defineProps({
   schema: {
     type: Array
-  },
-  allUserOptions: {
-    type: Array
   }
 })
 
@@ -416,29 +365,11 @@ 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
@@ -448,40 +379,16 @@ async function open(id) {
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
-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' })
+function resetForm(id) {
   form.value = {
     clueId: id,
     dealDate: formatDate(new Date()),
-    isPayoff: true,
-    signPrice: 0,
+    state: true,
     payAmount: 0,
     remark: undefined,
-    isCompanyReceipts: data.configValue == 'true',
-    receiver: undefined,
+    isCompanyReceipts: appStore.getAppInfo?.instanceType == 1,
     extraPay: [],
-    signProducts: [],
-    installStatus: 3
+    signProducts: []
   }
 }
 
@@ -570,7 +477,6 @@ function getOptions() {
     // getSimpleWarehouseList().then((data) => {
     //   warehouseOptions.value = data
     // })
-    // 获取员工列表
   }
 
   // 自定义参数
@@ -590,28 +496,8 @@ function changePlace() {
 }
 
 function changeClass() {
-  form.value.signPrice =
+  form.value.payAmount =
     classOptions.value.find((it) => it.typeId == form.value.signClass).guidingPrice || 0
-  signPriceChange()
-}
-
-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) {
@@ -619,6 +505,9 @@ function handleRemove(type, index) {
 }
 
 onMounted(() => {
+  if (appStore.getAppInfo?.instanceType == 1) {
+    rules.value = { ...rules.value, ...schoolRules }
+  }
   getOptions()
 })
 </script>

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

@@ -16,19 +16,13 @@
         <div class="flex" style="align-items: center">
           <b class="mr-5px text-24px">{{ info.name }}</b>
           <div class="mr-5px text-16px">{{ info.phone }}</div>
-          <el-tag type="success">{{ info.intentionStateName }}</el-tag>
+          <el-tag type="success">{{ info.intentionState }}</el-tag>
         </div>
         <div>
           <el-button type="primary" v-hasPermi="['clue:pool:update']" plain @click="handleUpdate">
             修改
           </el-button>
-          <el-button
-            type="danger"
-            v-if="info.state != '成交'"
-            v-hasPermi="['clue:pool:delete']"
-            plain
-            @click="handleRemove"
-          >
+          <el-button type="danger" 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,12 +53,6 @@
         <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>
       <!-- 列表 -->
@@ -69,9 +63,7 @@
         :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"
@@ -167,7 +159,6 @@
       v-if="!loading"
       ref="formRef"
       :userOptions="userOptions"
-      :allUserOptions="allUserOptions"
       :schema="allSchemas.formSchema"
       @success="getTableList"
     />
@@ -178,19 +169,8 @@
       @get-list="getTableList"
       @update="handleEdit"
     />
-    <DialogSuccess
-      ref="successRef"
-      :schema="allSchemas.detailSchema"
-      :allUserOptions="allUserOptions"
-      :userOptions="userOptions"
-      @success="getTableList"
-    />
+    <DialogSuccess ref="successRef" :schema="allSchemas.detailSchema" @success="getTableList" />
     <DialogFollow ref="followRef" @success="getTableList" />
-    <DialogBatchChangeFollow
-      ref="batchChangeFollowDialog"
-      :userOptions="allStatusUserOptions"
-      @success="getTableList"
-    />
   </div>
 </template>
 
@@ -202,12 +182,7 @@ 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 DialogBatchChangeFollow from './Comp/DialogBatchChangeFollow.vue'
-import {
-  getSimpleUserList as getUserOption,
-  getAllUserList,
-  getAllUserListWithHire
-} from '@/api/system/user'
+import { getSimpleUserList as getUserOption } from '@/api/system/user'
 
 import { removeNullField } from '@/utils'
 import { formatDate } from '@/utils/formatTime'
@@ -234,10 +209,8 @@ async function getCurdSchemas() {
   try {
     const data = await getSimpleFieldList()
     data.forEach((elem) => {
-      if (['followUser', 'convertPeople'].includes(elem.field)) {
+      if (elem.field == 'followUser') {
         elem.search.options = userOptions.value
-      } else if (['firstFollowUser'].includes(elem.field)) {
-        elem.search.options = allStatusUserOptions.value
       }
     })
     allSchemas.value = useCrudSchemas(data).allSchemas
@@ -315,20 +288,6 @@ 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)
@@ -392,14 +351,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()
+onMounted(() => {
+  getUserOption().then((data) => {
+    userOptions.value = data
+    getCurdSchemas()
+  })
 })
 </script>
 

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

@@ -9,12 +9,6 @@
           @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>
@@ -65,8 +59,7 @@ const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
 const searchForm = ref({
-  sourceName: undefined,
-  status: 0
+  sourceName: undefined
 })
 
 const sourceDialog = ref()
@@ -78,8 +71,7 @@ function handleQuery() {
 }
 function resetQuery() {
   searchForm.value = {
-    sourceName: '',
-    status: 0
+    sourceName: ''
   }
   getList()
 }

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

@@ -5,16 +5,10 @@
       v-loading="formLoading"
       :model="formData"
       :rules="formRules"
-      label-width="auto"
+      label-width="80px"
     >
-      <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 label="支出项" prop="label">
+        <el-input v-model="formData.label" placeholder="请输入支出项" />
       </el-form-item>
       <el-form-item label="排序" prop="sort">
         <el-input v-model="formData.sort" placeholder="请输入排序" type="number" :min="0" />
@@ -35,8 +29,7 @@
   </Dialog>
 </template>
 <script name="DialogExtraFee" setup>
-import * as ExtraFeeApi from '@/api/clue/extraFee'
-
+import * as dictApi from '@/api/system/dict/dict.data'
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -45,13 +38,12 @@ const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
-  extraPayName: '',
-  isPercentage: false,
+  label: '',
   sort: 1,
   remark: ''
 })
 const formRules = reactive({
-  extraPayName: [{ required: true, message: '支出项不能为空', trigger: 'blur' }]
+  label: [{ required: true, message: '支出项不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -65,7 +57,7 @@ const open = async (type, id) => {
   if (id) {
     formLoading.value = true
     try {
-      formData.value = await ExtraFeeApi.getExtraFee(id)
+      formData.value = await dictApi.getDictData(id)
     } finally {
       formLoading.value = false
     }
@@ -83,11 +75,14 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    if (!formData.value.value) {
+      formData.value.value = formData.value.label
+    }
     if (formType.value === 'create') {
-      await ExtraFeeApi.createExtraFee(formData.value)
+      await dictApi.createDictData(formData.value)
       message.success(t('common.createSuccess'))
     } else {
-      await ExtraFeeApi.updateExtraFee(formData.value)
+      await dictApi.updateDictData(formData.value)
       message.success(t('common.updateSuccess'))
     }
     dialogVisible.value = false
@@ -101,10 +96,10 @@ const submitForm = async () => {
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-    extraPayName: '',
-    isPercentage: false,
+    label: '',
     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.extraPayName"
+          v-model="searchForm.name"
           placeholder="请输入名称"
           clearable
           @keyup.enter="handleQuery"
@@ -16,12 +16,7 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="tableList">
-      <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="label" label="支出项" />
       <el-table-column prop="sort" label="排序" width="100px" />
       <el-table-column prop="remark" label="备注" />
       <el-table-column
@@ -32,10 +27,22 @@
       />
       <el-table-column label="操作">
         <template #default="scope">
-          <el-button type="primary" text @click="openForm('update', scope.row.id)">
+          <el-button
+            type="primary"
+            :disabled="!scope.row.editable"
+            text
+            @click="openForm('update', scope.row.id)"
+          >
             修改
           </el-button>
-          <el-button type="danger" text @click="handleDelete(scope.row.id)"> 删除 </el-button>
+          <el-button
+            type="danger"
+            :disabled="!scope.row.editable"
+            text
+            @click="handleDelete(scope.row.id)"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -53,16 +60,16 @@
 <script setup name="ExtraFeeType">
 import { dateFormatter } from '@/utils/formatTime'
 import DialogExtraFee from './DialogExtraFee.vue'
-import * as ExtraFeeApi from '@/api/clue/extraFee'
-import { removeNullField } from '@/utils'
+import * as dictApi from '@/api/system/dict/dict.data'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const searchForm = ref({
-  extraPayName: '',
+  label: '',
   pageSize: 20,
-  pageNo: 1
+  pageNo: 1,
+  dictType: 'extra_pay_type'
 })
 
 const total = ref(0)
@@ -76,9 +83,10 @@ function handleQuery() {
 }
 function resetQuery() {
   searchForm.value = {
-    extraPayName: '',
+    label: '',
     pageSize: 20,
-    pageNo: 1
+    pageNo: 1,
+    dictType: 'extra_pay_type'
   }
   getList()
 }
@@ -86,7 +94,7 @@ function resetQuery() {
 async function getList() {
   loading.value = true
   try {
-    const data = await ExtraFeeApi.getExtraFeePage(removeNullField(searchForm.value))
+    const data = await dictApi.getDictDataPage(searchForm.value)
     tableList.value = data.list
     total.value = data.total
   } finally {
@@ -103,7 +111,7 @@ async function handleDelete(id) {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await ExtraFeeApi.deleteExtraFee(id)
+    await dictApi.deleteDictData(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()

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

@@ -5,16 +5,11 @@
       <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="类型">
+        <el-table-column prop="component" label="类型" width="200px">
           <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
@@ -48,12 +43,6 @@
           </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"
@@ -129,7 +118,6 @@ const form = ref({
   component: undefined,
   options: [],
   status: 0,
-  isRequired: false,
   isCustom: true,
   isForm: true,
   isSearch: true,
@@ -169,7 +157,6 @@ function handleInsert() {
     component: undefined,
     options: [],
     status: 0,
-    isRequired: false,
     isCustom: true,
     isForm: true,
     isSearch: true,

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

@@ -5,16 +5,11 @@
       <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="类型">
+        <el-table-column prop="component" label="类型" width="200px">
           <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
@@ -48,12 +43,6 @@
           </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"
@@ -129,7 +118,6 @@ const form = ref({
   component: undefined,
   options: [],
   status: 0,
-  isRequired: false,
   isCustom: true,
   isForm: true,
   isSearch: true,
@@ -169,7 +157,6 @@ function handleInsert() {
     component: undefined,
     options: [],
     status: 0,
-    isRequired: false,
     isCustom: true,
     isForm: true,
     isSearch: true,

src/views/Clue/Skill/index.vue

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

src/views/Home/CloseRate.vue

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

src/views/Login/Login.vue

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

src/views/Login/MPLogin.vue

@@ -1,86 +0,0 @@
-<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,193 +1,7 @@
 <template>
-  <!-- 搜索工作栏 -->
-  <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"
-  />
+  <div> 站内信 </div>
 </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'
 
-const router = useRouter()
+<script setup name="NotifyMessage"></script>
 
-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>
+<style lang="scss" scoped></style>

src/views/Profile/NotifyMessageDetail.vue

@@ -1,89 +0,0 @@
-<!--
- * @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">
-      <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;
-}
-:deep(.el-card__body) {
-  padding: 20px 10px;
-}
-</style>

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

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-if="dialogVisible" :title="dialogTitle" v-model="dialogVisible" width="1000px">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1000px">
     <el-tabs v-model="currentTab">
       <el-tab-pane label="基础信息" name="base">
         <el-form
@@ -474,15 +474,12 @@ const opts = ref({
 })
 
 /** 打开弹窗 */
-const open = async (type, id, sp) => {
+const open = async (type, id) => {
   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) => {
@@ -494,7 +491,6 @@ const open = async (type, id, sp) => {
     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 = {
@@ -544,23 +540,11 @@ const resetForm = () => {
     typeName: '',
     licenseType: '',
     status: 0,
-    remark: undefined,
+    remark: '',
     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,23 +47,20 @@
           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>
 
@@ -238,7 +235,7 @@ async function getList() {
 
 const ClassDialog = ref()
 function handleOpenDialog(type, id = null) {
-  ClassDialog.value.open(type, id, searchForm.value.schPlace)
+  ClassDialog.value.open(type, id)
 }
 
 function handleReset() {

src/views/SchoolManagement/Place/index.vue

@@ -109,30 +109,18 @@
               <el-input v-model="placeForm.address" placeholder="输入地址" />
             </el-form-item>
             <el-form-item label="经度" prop="lng">
-              <el-input-number
-                v-model="placeForm.lng"
-                :min="1"
-                :controls="false"
-                placeholder="输入经度"
-                style="width: 100%"
-              />
+              <el-input v-model="placeForm.lng" placeholder="输入经度" />
             </el-form-item>
             <el-form-item label="纬度" prop="lat">
-              <el-input-number
-                v-model="placeForm.lat"
-                :min="1"
-                :controls="false"
-                placeholder="输入纬度"
-                style="width: 100%"
-              />
+              <el-input v-model="placeForm.lat" placeholder="输入纬度" />
             </el-form-item>
             <el-form-item label="所属区域" prop="area">
               <el-select v-model="placeForm.area" placeholder="请选择" clearable class="w-full">
                 <el-option
                   v-for="dict in areaOptions"
-                  :key="dict.id"
-                  :label="dict.name"
-                  :value="dict.id"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
                 />
               </el-select>
             </el-form-item>
@@ -142,10 +130,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">
@@ -157,19 +145,6 @@
         <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
@@ -259,8 +234,6 @@
 
 <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'
 
 import FlagRed from '@/assets/imgs/flag/flag_red.png'
@@ -293,35 +266,18 @@ const mapHelpText = ref('')
 const tipPostion = ref({})
 const placeTab = ref('info')
 
-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
+function initMap() {
   AMapLoader.load({
     key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key
     version: '2.0',
-    plugins: ['AMap.Geocoder', 'AMap.AutoComplete']
+    plugins: ['AMap.Geocoder']
   }).then((AMap) => {
     aMap.value = AMap
     geoCoder.value = new AMap.Geocoder()
     dialogMap.value = new AMap.Map('dialogMap', {
       zoom: 12,
       zooms: [2, 22],
-      center: [defaultLatLng.value.lng, defaultLatLng.value.lat]
-    })
-    AutoComplete.value = new AMap.AutoComplete({
-      city: defaultCity.value
+      center: [117.283042, 31.86119]
     })
     locationMarker.value = new AMap.Marker({
       icon: FlagRed
@@ -356,32 +312,6 @@ async 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) {
@@ -663,15 +593,8 @@ function resetMarkers() {
   createMarkersInMap()
 }
 
-function getDictOptions() {
-  getAreaSimpleList().then((data) => {
-    areaOptions.value = data
-  })
-}
-
 onMounted(() => {
   initMap()
-  getDictOptions()
 })
 </script>
 

src/views/SchoolManagement/Set/Comp/DialogArea.vue

@@ -1,147 +0,0 @@
-<template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="500px">
-    <el-form
-      ref="formRef"
-      v-loading="formLoading"
-      :model="formData"
-      :rules="formRules"
-      label-width="auto"
-    >
-      <el-form-item label="名称" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入名称" />
-      </el-form-item>
-      <el-form-item label="提成比例" prop="percentageRate">
-        <el-input v-model="formData.percentageRate" placeholder="请输入比例">
-          <template #suffix> % </template>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="负责人" prop="director">
-        <el-select
-          v-model="formData.director"
-          placeholder="选择负责人"
-          clearable
-          filterable
-          style="width: 100%"
-        >
-          <el-option
-            v-for="item in employeeOptions"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-row>
-        <el-col :span="24" :offset="0">
-          <el-form-item label="开始负责时间" prop="startTime">
-            <el-date-picker
-              v-model="formData.startTime"
-              type="date"
-              placeholder="选择日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          type="textarea"
-          v-model="formData.remark"
-          placeholder="请输入备注"
-          :autosize="{ minRows: 4, maxRows: 8 }"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-<script name="DialogArea" setup>
-import * as AreaApi from '@/api/school/setting/area'
-import { getSimpleUserList } from '@/api/system/user'
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  name: undefined,
-  percentageRate: undefined,
-  director: undefined,
-  startTime: undefined,
-  remark: ''
-})
-const formRules = reactive({
-  name: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
-})
-const formRef = ref() // 表单 Ref
-
-const employeeOptions = ref([])
-
-/** 打开弹窗 */
-const open = async (type, id) => {
-  dialogVisible.value = true
-  dialogTitle.value = type == 'update' ? '修改区域' : '新增区域'
-  formType.value = type
-  resetForm()
-  getOptions()
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await AreaApi.getArea(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  if (!formRef.value) return
-  const valid = await formRef.value.validate()
-  if (!valid) return
-  // 提交请求
-  formLoading.value = true
-  try {
-    if (formType.value === 'create') {
-      await AreaApi.createArea(formData.value)
-      message.success(t('common.createSuccess'))
-    } else {
-      await AreaApi.updateArea(formData.value)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    name: undefined,
-    percentageRate: undefined,
-    director: undefined,
-    startTime: undefined,
-    remark: ''
-  }
-  formRef.value?.resetFields()
-}
-
-function getOptions() {
-  getSimpleUserList().then((data) => {
-    employeeOptions.value = data
-  })
-}
-</script>

src/views/SchoolManagement/Set/Comp/SettingArea.vue

@@ -1,105 +0,0 @@
-<template>
-  <div>
-    <el-form ref="queryForm" :model="searchForm" label-width="0" inline @submit.prevent>
-      <el-form-item>
-        <el-input
-          v-model="searchForm.name"
-          placeholder="请输入名称"
-          clearable
-          style="width: 180px"
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery">搜索</el-button>
-        <el-button @click="resetQuery">重置</el-button>
-        <el-button type="primary" @click="openForm('create', null)">新增</el-button>
-      </el-form-item>
-    </el-form>
-    <el-table v-loading="loading" :data="tableList">
-      <el-table-column prop="name" label="名称" />
-      <el-table-column prop="percentageRate" label="提成比例(%)" />
-      <el-table-column prop="directorName" label="负责人" />
-      <el-table-column prop="startTime" label="开始负责时间" />
-      <el-table-column prop="remark" label="备注" />
-      <el-table-column label="操作">
-        <template #default="{ row }">
-          <el-button type="primary" text @click="openForm('update', row.id)"> 修改 </el-button>
-          <el-button type="danger" text @click="handleDelete(row.id)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <Pagination
-      v-model:limit="searchForm.pageSize"
-      v-model:page="searchForm.pageNo"
-      :total="total"
-      @pagination="handleQuery"
-    />
-    <DialogArea ref="areaDialog" @success="handleQuery" />
-  </div>
-</template>
-
-<script setup name="SettingArea">
-import * as AreaApi from '@/api/school/setting/area'
-import DialogArea from './DialogArea.vue'
-
-import { removeNullField } from '@/utils'
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const searchForm = ref({
-  name: '',
-  pageNo: 1,
-  pageSize: 20
-})
-
-const total = ref(0)
-const tableList = ref([])
-const loading = ref(false)
-
-function handleQuery() {
-  searchForm.value.pageNo = 1
-  getList()
-}
-function resetQuery() {
-  searchForm.value = {
-    name: '',
-    pageSize: 20,
-    pageNo: 1
-  }
-  getList()
-}
-async function getList() {
-  loading.value = true
-  try {
-    const data = await AreaApi.getAreaPage(removeNullField(searchForm.value))
-    tableList.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-const areaDialog = ref()
-function openForm(type, id = null) {
-  areaDialog.value.open(type, id)
-}
-
-async function handleDelete(id) {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await AreaApi.deleteArea(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-onMounted(() => {
-  getList()
-})
-</script>
-
-<style lang="scss" scoped></style>

src/views/SchoolManagement/Set/index.vue

@@ -4,16 +4,15 @@
       <el-tab-pane label="驾照类型" :name="0" v-if="checkPermi(['school:setting:cartype'])">
         <SettingCartype v-if="tabIndex == 0" />
       </el-tab-pane>
-      <el-tab-pane label="区域" :name="10" v-if="checkPermi(['school:setting:area'])">
-        <SettingArea v-if="tabIndex == 10" />
-      </el-tab-pane>
+      <!-- <el-tab-pane label="销售提成" :name="10" v-if="checkPermi(['basic:setting:comission'])">
+        <BSSalerComission v-if="tabIndex == 10" />
+      </el-tab-pane> -->
     </el-tabs>
   </div>
 </template>
 
 <script setup name="SchoolSetting">
 import SettingCartype from './Comp/SettingCartype.vue'
-import SettingArea from './Comp/SettingArea.vue'
 import { checkPermi } from '@/utils/permission'
 
 const tabIndex = ref(0)