上传

.env.base

@@ -1,20 +1,21 @@
 # 本地开发环境
-NODE_ENV=development
+VITE_NODE_ENV=development
 
 VITE_DEV=true
 
 # 请求路径
-#VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
-VITE_BASE_URL='http://localhost:48080'
+VITE_BASE_URL='http://118.31.23.45:48080'
+# VITE_BASE_URL='http://114.55.169.15:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
+# VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=/dev-api
+VITE_API_BASEPATH=/crm-api
 
 # 接口地址
 VITE_API_URL=/admin-api
 
 # 打包路径
-VITE_BASE_PATH=/
+VITE_BASE_PATH=/crm/

.env.dev

@@ -7,16 +7,16 @@ VITE_DEV=false
 VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=/dev-api
+VITE_API_BASEPATH=/crm-api
 
 # 接口地址
 VITE_API_URL=/admin-api
 
 # 打包路径
-VITE_BASE_PATH=/
+VITE_BASE_PATH=/crm/
 
 # 是否删除debugger
 VITE_DROP_DEBUGGER=false

.env.front

@@ -7,16 +7,16 @@ VITE_DEV=true
 VITE_BASE_URL='http://118.31.23.45:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=/dev-api
+VITE_API_BASEPATH=/crm-api
 
 # 接口地址
 VITE_API_URL=/admin-api
 
 # 打包路径
-VITE_BASE_PATH=/
+VITE_BASE_PATH=/crm/
 
 # 项目本地运行端口号, 与.vscode/launch.json配合
 VITE_PORT=80

.env.pro

@@ -4,13 +4,13 @@ VITE_NODE_ENV=production
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://localhost:48080'
+VITE_BASE_URL='/crm-api'
 
 # 上传路径
-VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='/crm-api/admin-api/system/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=
+VITE_API_BASEPATH=/crm-api
 
 # 接口地址
 VITE_API_URL=/admin-api
@@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=true
 VITE_SOURCEMAP=false
 
 # 打包路径
-VITE_BASE_PATH=/
+VITE_BASE_PATH=/crm/
 
 # 输出路径
 VITE_OUT_DIR=dist-pro

.env.stage

@@ -7,10 +7,10 @@ VITE_DEV=false
 VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
 
 # 上传路径
-VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=
+VITE_API_BASEPATH=/crm-api
 
 # 接口地址
 VITE_API_URL=/admin-api
@@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=true
 VITE_SOURCEMAP=false
 
 # 打包路径
-VITE_BASE_PATH='http://static-vue3.yudao.iocoder.cn/'
+VITE_BASE_PATH='/crm'
 
 # 输出路径
 VITE_OUT_DIR=dist-stage

.env.static

@@ -7,10 +7,10 @@ VITE_DEV=false
 VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=
+VITE_API_BASEPATH=/crm-api
 
 # 接口地址
 VITE_API_URL=/admin-api
@@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=true
 VITE_SOURCEMAP=false
 
 # 打包路径
-VITE_BASE_PATH=/admin-ui-vue3/
+VITE_BASE_PATH=/crm/
 
 # 输出路径
 VITE_OUT_DIR=dist-dev

.env.test

@@ -7,10 +7,10 @@ VITE_DEV=false
 VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=
+VITE_API_BASEPATH=/crm-api
 
 # 接口地址
 VITE_API_URL=/admin-api
@@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=false
 VITE_SOURCEMAP=true
 
 # 打包路径
-VITE_BASE_PATH=/
+VITE_BASE_PATH=/crm/
 
 # 输出路径
 VITE_OUT_DIR=dist-test

index.html

@@ -141,7 +141,7 @@
     <script type="module" src="/src/main.js"></script>
     <script type="text/javascript">
       window._AMapSecurityConfig = {
-        securityJsCode: 'a2f0d14a4c5c1e387f9271b1045a781d' // 你的密钥
+        securityJsCode: 'f653df5a2c5f44ae68faaab6f6a6b8ab' // 你的密钥
       }
     </script>
   </body>

src/api/clue/afterSale.js

@@ -0,0 +1,39 @@
+import request from '@/config/axios'
+
+// 查询（精简)列表
+export const getAfterSaleList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign-after-sale/list', params })
+}
+
+// 查询（精简)列表
+export const getAfterSalePage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign-after-sale/page', params })
+}
+
+// 新增
+export const createAfterSale = async (data) => {
+  return await request.post({
+    url: '/admin-api/crm/sign-after-sale/create',
+    data,
+    isSubmitForm: true
+  })
+}
+
+// 审核
+export const auditAfterSale = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-after-sale/check', data })
+}
+
+export const batchAuditAfterSale = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-after-sale/batch/check', data })
+}
+
+// 撤销
+export const cancelApplyAfterSale = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-after-sale/revoke', params: data })
+}
+
+// 查询详情
+export const getAfterSaleDetail = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign-after-sale/get', params })
+}

src/api/clue/clueCache.js

@@ -0,0 +1,11 @@
+import request from '@/config/axios'
+
+// 查询用户配置
+export const getClueCache = async (params) => {
+  return await request.get({ url: '/admin-api/crm/param-user-setting/get-by-user', params })
+}
+
+// 保存用户配置
+export const setClueCache = async (data) => {
+  return await request.post({ url: '/admin-api/crm/param-user-setting/save', data })
+}

src/api/clue/clueField.js

@@ -0,0 +1,40 @@
+import request from '@/config/axios'
+
+// 创建
+export const createField = (data) => {
+  return request.post({ url: '/admin-api/crm/param/create', data: { ...data, module: 1 } })
+}
+
+// 更新
+export const updateField = (data) => {
+  return request.put({ url: '/admin-api/crm/param/update', data })
+}
+
+// 删除
+export const deleteField = (id) => {
+  return request.delete({ url: `/admin-api/crm/param/delete?id=${id}` })
+}
+
+// 获得
+export const getField = (id) => {
+  return request.get({ url: `/admin-api/crm/param/get?id=${id}` })
+}
+
+// 获得精简信息列表
+export const getSimpleFieldList = () => {
+  return request.get({ url: '/admin-api/crm/param/simple-list', params: { module: 1 } })
+}
+
+// 获取自定义字段
+export const getDiyFieldList = () => {
+  return request.get({ url: '/admin-api/crm/param/get-diy-param', params: { module: 1 } })
+}
+
+// 状态修改
+export const updateFieldStatus = (signParamId, status) => {
+  const data = {
+    signParamId,
+    status
+  }
+  return request.put({ url: '/admin-api/crm/param/status/update', data: data })
+}

src/api/clue/clueGetSet.js

@@ -0,0 +1,26 @@
+import request from '@/config/axios'
+
+// 线索获取规则
+export const getClueGainRuleList = () => {
+  return request.get({ url: '/admin-api/crm/sch-clue-gain-rule/list' })
+}
+
+// 删除
+export const deleteClueGainRule = (id) => {
+  return request.delete({ url: `/admin-api/crm/sch-clue-gain-rule/delete?id=${id}` })
+}
+
+// 线索获取规则保存
+export const saveClueGainRule = (data) => {
+  return request.put({ url: '/admin-api/crm/sch-clue-gain-rule/batchUpdate', data })
+}
+
+// 线索规则
+export const getClueDistributeRuleByUser = (params) => {
+  return request.get({ url: '/admin-api/crm/sch-clue-distribution-rule/queryByUserId', params })
+}
+
+// 删除
+export const deleteClueDistributeRule = (id) => {
+  return request.delete({ url: `/admin-api/crm/sch-clue-gain-rule/delete?id=${id}` })
+}

src/api/clue/delivery.js

@@ -0,0 +1,21 @@
+import request from '@/config/axios'
+
+// 查询（精简)列表
+export const getDeliveryList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign-send/list', params })
+}
+
+// 查询分页列表
+export const getDeliveryPage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign-send/page', params })
+}
+
+// 新增
+export const createDelivery = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-send/create', data, isSubmitForm: true })
+}
+
+// 查询详情
+export const getDeliveryDetail = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign-send/get', params })
+}

src/api/clue/followRecord.js

@@ -0,0 +1,20 @@
+import request from '@/config/axios'
+
+// 查询（精简)列表
+export const getFollowList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/clue-follow-record/list', params })
+}
+
+// 新增
+export const createFollow = async (data) => {
+  return await request.post({
+    url: '/admin-api/crm/clue-follow-record/create',
+    data: data,
+    isSubmitForm: true
+  })
+}
+
+// 删除
+export const deleteFollow = async (id) => {
+  return await request.delete({ url: '/admin-api/crm/clue-follow-record/delete?id=' + id })
+}

src/api/clue/index.js

@@ -0,0 +1,60 @@
+import request from '@/config/axios'
+
+// 查询（精简)列表
+export const getSimpleClueList = async () => {
+  return await request.get({ url: '/admin-api/crm/sch-clue/list-all-simple' })
+}
+
+// 查询列表
+export const getCluePage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sch-clue/page', params })
+}
+
+// 查询详情
+export const getClue = async (id) => {
+  return await request.get({ url: '/admin-api/crm/sch-clue/get?id=' + id })
+}
+
+// 新增
+export const createClue = async (data) => {
+  return await request.post({
+    url: '/admin-api/crm/sch-clue/create',
+    data: data,
+    isSubmitForm: true
+  })
+}
+
+// 修改
+export const updateClue = async (params) => {
+  return await request.put({ url: '/admin-api/crm/sch-clue/update', data: params })
+}
+
+// 删除
+export const deleteClue = async (id) => {
+  return await request.delete({ url: '/admin-api/crm/sch-clue/delete?id=' + id })
+}
+
+// 释放
+export const releaseClue = async (data) => {
+  return await request.put({ url: '/admin-api/crm/sch-clue/public/save', data })
+}
+
+// 通用查询数量
+export const getClueCount = async () => {
+  return await request.get({ url: '/admin-api/crm/sch-clue/get-clue-num' })
+}
+
+// 获取操作记录
+export const getOpearateRecord = async (params) => {
+  return await request.get({ url: '/admin-api/crm/clue-operate-record/list', params })
+}
+
+// 获取公海线索
+export const getPublicClue = async (data) => {
+  return await request.put({ url: '/admin-api/crm/sch-clue/public/save', data })
+}
+
+// 获得线索跟进用户信息
+export const getFollowUserList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sch-clue/get-follow-user', params })
+}

src/api/clue/orderField.js

@@ -0,0 +1,40 @@
+import request from '@/config/axios'
+
+// 创建
+export const createField = (data) => {
+  return request.post({ url: '/admin-api/crm/param/create', data: { ...data, module: 2 } })
+}
+
+// 更新
+export const updateField = (data) => {
+  return request.put({ url: '/admin-api/crm/param/update', data })
+}
+
+// 删除
+export const deleteField = (id) => {
+  return request.delete({ url: `/admin-api/crm/param/delete?id=${id}` })
+}
+
+// 获得
+export const getField = (id) => {
+  return request.get({ url: `/admin-api/crm/param/get?id=${id}` })
+}
+
+// 获得精简信息列表
+export const getSimpleFieldList = () => {
+  return request.get({ url: '/admin-api/crm/param/simple-list', params: { module: 2 } })
+}
+
+// 获取自定义字段
+export const getDiyFieldList = () => {
+  return request.get({ url: '/admin-api/crm/param/get-diy-param', params: { module: 2 } })
+}
+
+// 状态修改
+export const updateFieldStatus = (signParamId, status) => {
+  const data = {
+    signParamId,
+    status
+  }
+  return request.put({ url: '/admin-api/crm/param/status/update', data: data })
+}

src/api/clue/payment.js

@@ -0,0 +1,39 @@
+import request from '@/config/axios'
+
+// 查询（精简)列表
+export const getPaymentList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign-pay-record/list', params })
+}
+
+// 查询（精简)列表
+export const getPaymentPage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign-pay-record/page', params })
+}
+
+// 新增
+export const createPayment = async (data) => {
+  return await request.post({
+    url: '/admin-api/crm/sign-pay-record/create',
+    data,
+    isSubmitForm: true
+  })
+}
+
+// 审核
+export const auditPayment = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-pay-record/check', data })
+}
+
+export const batchAuditPayment = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-pay-record/batch/check', data })
+}
+
+// 撤销
+export const cancelApplyPayment = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-pay-record/revoke', params: data })
+}
+
+// 查询详情
+export const getPaymentDetail = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign-pay-record/get', params })
+}

src/api/clue/settle.js

@@ -0,0 +1,26 @@
+import request from '@/config/axios'
+
+// 查询招生结算列表
+export const getSchoolSettlePage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign-settlement/sch/page', params })
+}
+
+// 查询招生结算详情
+export const getSchoolSettleDetail = async (id) => {
+  return await request.get({ url: '/admin-api/crm/sign-settlement/sch/get?id=' + id })
+}
+
+// 查询进销存结算列表
+export const getMallSettlePage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign-settlement/erp/page', params })
+}
+
+// 查询进销存结算详情
+export const getMallSettleDetail = async (id) => {
+  return await request.get({ url: '/admin-api/crm/sign-settlement/erp/get?id=' + id })
+}
+
+// 批量结算
+export const batchSaveSettle = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-settlement/batch/save', data })
+}

src/api/clue/sign.js

@@ -0,0 +1,31 @@
+import request from '@/config/axios'
+
+// 查询列表
+export const getSignPage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign/page', params })
+}
+
+// 查询详情
+export const getSign = async (id) => {
+  return await request.get({ url: '/admin-api/crm/sign/get?id=' + id })
+}
+
+// 新增
+export const createSign = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign/create', data: data, isSubmitForm: true })
+}
+
+// 取消登记
+export const cancelDeal = async (id) => {
+  return await request.delete({ url: '/admin-api/crm/sign/delete?id=' + id })
+}
+
+// 新增支出
+export const signAddPay = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign/extra-pay/save', data: data })
+}
+
+// 查询支出
+export const getSignExtraPayList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign/extra-pay/get', params })
+}

src/api/clue/skill.js

@@ -0,0 +1,26 @@
+import request from '@/config/axios'
+
+// 获得列表
+export const getSkillPage = (params) => {
+  return request.get({ url: '/admin-api/crm/skill/page', params })
+}
+
+// 创建
+export const createSkill = (data) => {
+  return request.post({ url: '/admin-api/crm/skill/create', data, isSubmitForm: true })
+}
+
+// 更新
+export const updateSkill = (data) => {
+  return request.put({ url: '/admin-api/crm/skill/update', data })
+}
+
+// 删除
+export const deleteSkill = (id) => {
+  return request.delete({ url: `/admin-api/crm/skill/delete?id=${id}` })
+}
+
+// 获得
+export const getSkill = (id) => {
+  return request.get({ url: `/admin-api/crm/skill/get?id=${id}` })
+}

src/api/clue/source.js

@@ -0,0 +1,31 @@
+import request from '@/config/axios'
+
+// 查询（精简)列表
+export const getSimpleSourceList = async () => {
+  return await request.get({ url: '/admin-api/crm/source/list' })
+}
+
+// 查询列表
+export const getSourcePage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/source/list', params })
+}
+
+// 查询详情
+export const getSource = async (id) => {
+  return await request.get({ url: '/admin-api/crm/source/get?id=' + id })
+}
+
+// 新增
+export const createSource = async (data) => {
+  return await request.post({ url: '/admin-api/crm/source/create', data: data, isSubmitForm: true })
+}
+
+// 修改
+export const updateSource = async (params) => {
+  return await request.put({ url: '/admin-api/crm/source/update', data: params })
+}
+
+// 删除
+export const deleteSource = async (id) => {
+  return await request.delete({ url: '/admin-api/crm/source/delete?id=' + id })
+}

src/api/home/index.js

@@ -0,0 +1,20 @@
+import request from '@/config/axios'
+// 线索情况
+export const getUserClueCount = async (params) => {
+  return await request.get({ url: '/admin-api/crm/home/get-user-count', params })
+}
+
+// 成交率
+export const getClueSignSignRate = async (params) => {
+  return await request.get({ url: '/admin-api/crm/home/get-sign-rate', params })
+}
+
+// 成交率
+export const getClueSignSignRank = async (params) => {
+  return await request.get({ url: '/admin-api/crm/home/get-sign-top10', params })
+}
+
+// 成交率
+export const getClueFollowRank = async (params) => {
+  return await request.get({ url: '/admin-api/crm/home/get-follow-top10', params })
+}

src/api/infra/file/index.ts

@@ -0,0 +1,45 @@
+import request from '@/config/axios'
+
+export interface FilePageReqVO extends PageParam {
+  path?: string
+  type?: string
+  createTime?: Date[]
+}
+
+// 文件预签名地址 Response VO
+export interface FilePresignedUrlRespVO {
+  // 文件配置编号
+  configId: number
+  // 文件上传 URL
+  uploadUrl: string
+  // 文件 URL
+  url: string
+}
+
+// 查询文件列表
+export const getFilePage = (params: FilePageReqVO) => {
+  return request.get({ url: '/infra/file/page', params })
+}
+
+// 删除文件
+export const deleteFile = (id: number) => {
+  return request.delete({ url: '/infra/file/delete?id=' + id })
+}
+
+// 获取文件预签名地址
+export const getFilePresignedUrl = (path: string) => {
+  return request.get<FilePresignedUrlRespVO>({
+    url: '/infra/file/presigned-url',
+    params: { path }
+  })
+}
+
+// 创建文件
+export const createFile = (data: any) => {
+  return request.post({ url: '/infra/file/create', data })
+}
+
+// 上传文件
+export const updateFile = (data: any) => {
+  return request.upload({ url: '/admin-api/system/file/upload', data })
+}

src/api/mall/product/brand.ts

@@ -32,30 +32,30 @@ export interface BrandVO {
 
 // 创建商品品牌
 export const createBrand = (data: BrandVO) => {
-  return request.post({ url: '/product/brand/create', data })
+  return request.post({ url: '/admin-api/crm/erp-product-brand/create', data, isSubmitForm: true })
 }
 
 // 更新商品品牌
 export const updateBrand = (data: BrandVO) => {
-  return request.put({ url: '/product/brand/update', data })
+  return request.put({ url: '/admin-api/crm/erp-product-brand/update', data })
 }
 
 // 删除商品品牌
 export const deleteBrand = (id: number) => {
-  return request.delete({ url: `/product/brand/delete?id=${id}` })
+  return request.delete({ url: `/admin-api/crm/erp-product-brand/delete?id=${id}` })
 }
 
 // 获得商品品牌
 export const getBrand = (id: number) => {
-  return request.get({ url: `/product/brand/get?id=${id}` })
+  return request.get({ url: `/admin-api/crm/erp-product-brand/get?id=${id}` })
 }
 
 // 获得商品品牌列表
 export const getBrandParam = (params: PageParam) => {
-  return request.get({ url: '/product/brand/page', params })
+  return request.get({ url: '/admin-api/crm/erp-product-brand/page', params })
 }
 
 // 获得商品品牌精简信息列表
 export const getSimpleBrandList = () => {
-  return request.get({ url: '/product/brand/list-all-simple' })
+  return request.get({ url: '/admin-api/crm/erp-product-brand/simple-list' })
 }

src/api/mall/product/category.ts

@@ -36,25 +36,34 @@ export interface CategoryVO {
 
 // 创建商品分类
 export const createCategory = (data: CategoryVO) => {
-  return request.post({ url: '/product/category/create', data })
+  return request.post({
+    url: '/admin-api/crm/erp-product-category/create',
+    data,
+    isSubmitForm: true
+  })
 }
 
 // 更新商品分类
 export const updateCategory = (data: CategoryVO) => {
-  return request.put({ url: '/product/category/update', data })
+  return request.put({ url: '/admin-api/crm/erp-product-category/update', data })
 }
 
 // 删除商品分类
 export const deleteCategory = (id: number) => {
-  return request.delete({ url: `/product/category/delete?id=${id}` })
+  return request.delete({ url: `/admin-api/crm/erp-product-category/delete?id=${id}` })
 }
 
 // 获得商品分类
 export const getCategory = (id: number) => {
-  return request.get({ url: `/product/category/get?id=${id}` })
+  return request.get({ url: `/admin-api/crm/erp-product-category/get?id=${id}` })
 }
 
 // 获得商品分类列表
 export const getCategoryList = (params: any) => {
-  return request.get({ url: '/product/category/list', params })
+  return request.get({ url: '/admin-api/crm/erp-product-category/list', params })
+}
+
+// 获得商品分类列表
+export const getCategorySimpleList = (params: any) => {
+  return request.get({ url: '/admin-api/crm/erp-product-category/simple-list', params })
 }

src/api/mall/product/index.js

@@ -0,0 +1,33 @@
+import request from '@/config/axios'
+// 查询列表
+export const getProductPage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-product/page', params })
+}
+
+// 查询详情
+export const getProduct = async (id) => {
+  return await request.get({ url: '/admin-api/crm/erp-product/get?id=' + id })
+}
+
+// 新增
+export const createProduct = async (data) => {
+  return await request.post({
+    url: '/admin-api/crm/erp-product/create',
+    data: data,
+    isSubmitForm: true
+  })
+}
+
+// 修改
+export const updateProduct = async (params) => {
+  return await request.put({ url: '/admin-api/crm/erp-product/update', data: params })
+}
+
+// 删除
+export const deleteProduct = async (id) => {
+  return await request.delete({ url: '/admin-api/crm/erp-product/delete?id=' + id })
+}
+
+export const getSimpleProductList = async () => {
+  return await request.get({ url: '/admin-api/crm/erp-product/simple-list' })
+}

src/api/mall/product/productField.js

@@ -0,0 +1,44 @@
+import request from '@/config/axios'
+
+// 创建
+export const createField = (data) => {
+  return request.post({
+    url: '/admin-api/crm/param/create',
+    data: { ...data, module: 3 },
+    isSubmitForm: true
+  })
+}
+
+// 更新
+export const updateField = (data) => {
+  return request.put({ url: '/admin-api/crm/param/update', data })
+}
+
+// 删除
+export const deleteField = (id) => {
+  return request.delete({ url: `/admin-api/crm/param/delete?id=${id}` })
+}
+
+// 获得
+export const getField = (id) => {
+  return request.get({ url: `/admin-api/crm/param/get?id=${id}` })
+}
+
+// 获得精简信息列表
+export const getSimpleFieldList = () => {
+  return request.get({ url: '/admin-api/crm/param/simple-list', params: { module: 3 } })
+}
+
+// 获取自定义字段
+export const getDiyFieldList = () => {
+  return request.get({ url: '/admin-api/crm/param/get-diy-param', params: { module: 3 } })
+}
+
+// 状态修改
+export const updateFieldStatus = (signParamId, status) => {
+  const data = {
+    signParamId,
+    status
+  }
+  return request.put({ url: '/admin-api/crm/param/status/update', data: data })
+}

src/api/mall/product/property.ts

@@ -42,7 +42,11 @@ export interface PropertyValueDetailVO {
 
 // 创建属性项
 export const createProperty = (data: PropertyVO) => {
-  return request.post({ url: '/product/property/create', data })
+  return request.post({
+    url: '/admin-api/crm/erp-product-property/create',
+    data,
+    isSubmitForm: true
+  })
 }
 
 // 更新属性项
@@ -89,7 +93,7 @@ export const getPropertyValue = (id: number): Promise<PropertyValueVO> => {
 
 // 创建属性值
 export const createPropertyValue = (data: PropertyValueVO) => {
-  return request.post({ url: '/product/property/value/create', data })
+  return request.post({ url: '/admin-api/crm/erp-product-property-value/create', data })
 }
 
 // 更新属性值

src/api/mall/product/spu.ts

@@ -1,92 +0,0 @@
-import request from '@/config/axios'
-
-export interface Property {
-  propertyId?: number // 属性编号
-  propertyName?: string // 属性名称
-  valueId?: number // 属性值编号
-  valueName?: string // 属性值名称
-}
-
-// TODO puhui999：是不是直接叫 Sku 更简洁一点哈。type 待后面，总感觉有个类型？
-export interface SkuType {
-  id?: number // 商品 SKU 编号
-  spuId?: number // SPU 编号
-  properties?: Property[] // 属性数组
-  price?: number // 商品价格
-  marketPrice?: number // 市场价
-  costPrice?: number // 成本价
-  barCode?: string // 商品条码
-  picUrl?: string // 图片地址
-  stock?: number // 库存
-  weight?: number // 商品重量，单位：kg 千克
-  volume?: number // 商品体积，单位：m^3 平米
-  subCommissionFirstPrice?: number // 一级分销的佣金
-  subCommissionSecondPrice?: number // 二级分销的佣金
-  salesCount?: number // 商品销量
-}
-
-// TODO puhui999：是不是直接叫 Spu 更简洁一点哈。type 待后面，总感觉有个类型？
-export interface SpuType {
-  id?: number
-  name?: string // 商品名称
-  categoryId?: number | null // 商品分类
-  keyword?: string // 关键字
-  unit?: number | null // 单位
-  picUrl?: string // 商品封面图
-  sliderPicUrls?: string[] // 商品轮播图
-  introduction?: string // 商品简介
-  deliveryTemplateId?: number | null // 运费模版
-  brandId?: number | null // 商品品牌编号
-  specType?: boolean // 商品规格
-  subCommissionType?: boolean // 分销类型
-  skus: SkuType[] // sku数组
-  description?: string // 商品详情
-  sort?: string // 商品排序
-  giveIntegral?: number // 赠送积分
-  virtualSalesCount?: number // 虚拟销量
-  recommendHot?: boolean // 是否热卖
-  recommendBenefit?: boolean // 是否优惠
-  recommendBest?: boolean // 是否精品
-  recommendNew?: boolean // 是否新品
-  recommendGood?: boolean // 是否优品
-}
-
-// 获得 Spu 列表
-export const getSpuPage = (params: PageParam) => {
-  return request.get({ url: '/product/spu/page', params })
-}
-
-// 获得 Spu 列表 tabsCount
-export const getTabsCount = () => {
-  return request.get({ url: '/product/spu/get-count' })
-}
-
-// 创建商品 Spu
-export const createSpu = (data: SpuType) => {
-  return request.post({ url: '/product/spu/create', data })
-}
-
-// 更新商品 Spu
-export const updateSpu = (data: SpuType) => {
-  return request.put({ url: '/product/spu/update', data })
-}
-
-// 更新商品 Spu status
-export const updateStatus = (data: { id: number; status: number }) => {
-  return request.put({ url: '/product/spu/update-status', data })
-}
-
-// 获得商品 Spu
-export const getSpu = (id: number) => {
-  return request.get({ url: `/product/spu/get-detail?id=${id}` })
-}
-
-// 删除商品 Spu
-export const deleteSpu = (id: number) => {
-  return request.delete({ url: `/product/spu/delete?id=${id}` })
-}
-
-// 导出商品 Spu Excel
-export const exportSpu = async (params) => {
-  return await request.download({ url: '/product/spu/export', params })
-}

src/api/mall/purchase/index.js

@@ -0,0 +1,29 @@
+import request from '@/config/axios'
+// 查询列表
+export const getPurchasePage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-purchase/page', params })
+}
+
+// 新增
+export const createPurchase = async (data) => {
+  return await request.post({
+    url: '/admin-api/crm/erp-purchase/create',
+    data: data,
+    isSubmitForm: true
+  })
+}
+
+// 修改
+export const updatePurchase = async (params) => {
+  return await request.put({ url: '/admin-api/crm/erp-purchase/update', data: params })
+}
+
+// 删除
+export const deletePurchase = async (id) => {
+  return await request.delete({ url: '/admin-api/crm/erp-purchase/delete?id=' + id })
+}
+
+// 审核
+export const auditPurchase = async (data) => {
+  return await request.post({ url: '/admin-api/crm/erp-purchase/audit', data })
+}

src/api/mall/warehouse/index.js

@@ -0,0 +1,49 @@
+import request from '@/config/axios'
+// 查询列表
+export const getWarehousePage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-warehouse/page', params })
+}
+
+// 新增
+export const createWarehouse = async (data) => {
+  return await request.post({
+    url: '/admin-api/crm/erp-warehouse/create',
+    data: data,
+    isSubmitForm: true
+  })
+}
+
+// 修改
+export const updateWarehouse = async (params) => {
+  return await request.put({ url: '/admin-api/crm/erp-warehouse/update', data: params })
+}
+
+// 删除
+export const deleteWarehouse = async (id) => {
+  return await request.delete({ url: '/admin-api/crm/erp-warehouse/delete?id=' + id })
+}
+
+// 获取仓库
+export const getWarehouse = async (id) => {
+  return await request.get({ url: '/admin-api/crm/erp-warehouse/get?id=' + id })
+}
+
+// 获取仓库列表
+export const getSimpleWarehouseList = async () => {
+  return await request.get({ url: '/admin-api/crm/erp-warehouse/simple-list' })
+}
+
+// 获取库存
+export const getInventoryList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-inventory/page', params })
+}
+
+// 获取库存变动记录
+export const getInventoryRecord = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-inventory-record/page', params })
+}
+
+// 获取剩余库存
+export const getRemainInventoryList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-inventory-detail/list', params })
+}

src/api/school/class/index.js

@@ -0,0 +1,54 @@
+import request from '@/config/axios'
+
+// 查询列表-分页
+export const getClassTypePage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sch-class-type/page', params })
+}
+
+export const getClassTypeList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sch-class-type/list', params })
+}
+
+// 查询详情
+export const getClassType = async (id) => {
+  return await request.get({ url: '/admin-api/crm/sch-class-type/get?id=' + id })
+}
+
+// 新增
+export const createClassType = async (data) => {
+  return await request.post({
+    url: '/admin-api/crm/sch-class-type/create',
+    data: data,
+    isSubmitForm: true
+  })
+}
+
+// 修改
+export const updateClassType = async (params) => {
+  return await request.put({ url: '/admin-api/crm/sch-class-type/update', data: params })
+}
+
+// 删除
+export const deleteClassType = async (id) => {
+  return await request.delete({ url: '/admin-api/crm/sch-class-type/delete?id=' + id })
+}
+
+// 修改状态
+export const updateClassTypeStatus = async (data) => {
+  return request.put({ url: '/admin-api/crm/sch-class-type/status/update', data })
+}
+
+// 批量修改状态
+export const batchUpdateClassTypeStatus = async (data) => {
+  return request.put({ url: '/admin-api/crm/sch-class-type/status/batch-update', data })
+}
+
+// 批量删除
+export const batchDeleteClassType = async (ids) => {
+  return await request.delete({ url: '/admin-api/crm/sch-class-type/batch-delete?ids=' + ids })
+}
+
+// 获取提成结算参数
+export const getCommissionParams = async () => {
+  return await request.get({ url: '/admin-api/crm/sch-class-type/get-percentage-param' })
+}

src/api/school/place/index.js

@@ -17,7 +17,11 @@ export const getPlace = async (id) => {
 
 // 新增
 export const createPlace = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sch-place/create', data: data })
+  return await request.post({
+    url: '/admin-api/crm/sch-place/create',
+    data: data,
+    isSubmitForm: true
+  })
 }
 
 // 修改
@@ -30,10 +34,10 @@ export const deletePlace = async (id) => {
   return await request.delete({ url: '/admin-api/crm/sch-place/delete?id=' + id })
 }
 
-export const updatePlaceStatus = async (id, status) => {
+export const updatePlaceStatus = async (placeId, status) => {
   const data = {
-    id,
+    placeId,
     status
   }
-  return request.put({ url: '/admin-api/crm/sch-place/update-status', data: data })
+  return request.put({ url: '/admin-api/crm/sch-place/status/update', data: data })
 }

src/api/school/sch/index.js

@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-
 // 查询列表
 export const getSchoolPage = async (params) => {
   return await request.get({ url: '/admin-api/crm/sch-school/page', params })
@@ -12,7 +11,11 @@ export const getSchool = async (id) => {
 
 // 新增
 export const createSchool = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sch-school/create', data: data })
+  return await request.post({
+    url: '/admin-api/crm/sch-school/create',
+    data: data,
+    isSubmitForm: true
+  })
 }
 
 // 修改
@@ -25,10 +28,10 @@ export const deleteSchool = async (id) => {
   return await request.delete({ url: '/admin-api/crm/sch-school/delete?id=' + id })
 }
 
-export const updateSchoolStatus = async (id, status) => {
+export const updateSchoolStatus = async (schoolId, status) => {
   const data = {
-    id,
+    schoolId,
     status
   }
-  return request.put({ url: '/admin-api/crm/sch-school/update-status', data: data })
+  return request.put({ url: '/admin-api/crm/sch-school/status/update', data: data })
 }

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

@@ -15,35 +15,35 @@ export type DictDataVO = {
 
 // 查询字典数据（精简)列表
 export const listSimpleDictData = () => {
-  return request.get({ url: '/admin-api/system/dict-data/list-all-simple' })
+  return request.get({ url: '/admin-api/crm/dict-data/simple-list' })
 }
 
 // 查询字典数据列表
 export const getDictDataPage = (params: PageParam) => {
-  return request.get({ url: '/admin-api/system/dict-data/page', params })
+  return request.get({ url: '/admin-api/crm/dict-data/page', params })
 }
 
 // 查询字典数据详情
 export const getDictData = (id: number) => {
-  return request.get({ url: '/admin-api/system/dict-data/get?id=' + id })
+  return request.get({ url: '/admin-api/crm/dict-data/get?id=' + id })
 }
 
 // 新增字典数据
 export const createDictData = (data: DictDataVO) => {
-  return request.post({ url: '/admin-api/system/dict-data/create', data })
+  return request.post({ url: '/admin-api/crm/dict-data/create', data })
 }
 
 // 修改字典数据
 export const updateDictData = (data: DictDataVO) => {
-  return request.put({ url: '/admin-api/system/dict-data/update', data })
+  return request.put({ url: '/admin-api/crm/dict-data/update', data })
 }
 
 // 删除字典数据
 export const deleteDictData = (id: number) => {
-  return request.delete({ url: '/admin-api/system/dict-data/delete?id=' + id })
+  return request.delete({ url: '/admin-api/crm/dict-data/delete?id=' + id })
 }
 
 // 导出字典类型数据
 export const exportDictData = (params) => {
-  return request.get({ url: '/admin-api/system/dict-data/export', params })
+  return request.get({ url: '/admin-api/crm/dict-data/export', params })
 }

src/api/system/dict/dict.type.ts

@@ -11,34 +11,34 @@ export type DictTypeVO = {
 
 // 查询字典（精简)列表
 export const getSimpleDictTypeList = () => {
-  return request.get({ url: '/admin-api/system/dict-type/list-all-simple' })
+  return request.get({ url: '/admin-api/crm/dict-type/list-all-simple' })
 }
 
 // 查询字典列表
 export const getDictTypePage = (params: PageParam) => {
-  return request.get({ url: '/admin-api/system/dict-type/page', params })
+  return request.get({ url: '/admin-api/crm/dict-type/page', params })
 }
 
 // 查询字典详情
 export const getDictType = (id: number) => {
-  return request.get({ url: '/admin-api/system/dict-type/get?id=' + id })
+  return request.get({ url: '/admin-api/crm/dict-type/get?id=' + id })
 }
 
 // 新增字典
 export const createDictType = (data: DictTypeVO) => {
-  return request.post({ url: '/admin-api/system/dict-type/create', data })
+  return request.post({ url: '/admin-api/crm/dict-type/create', data })
 }
 
 // 修改字典
 export const updateDictType = (data: DictTypeVO) => {
-  return request.put({ url: '/admin-api/system/dict-type/update', data })
+  return request.put({ url: '/admin-api/crm/dict-type/update', data })
 }
 
 // 删除字典
 export const deleteDictType = (id: number) => {
-  return request.delete({ url: '/admin-api/system/dict-type/delete?id=' + id })
+  return request.delete({ url: '/admin-api/crm/dict-type/delete?id=' + id })
 }
 // 导出字典类型
 export const exportDictType = (params) => {
-  return request.get({ url: '/admin-api/system/dict-type/export', params })
+  return request.get({ url: '/admin-api/crm/dict-type/export', params })
 }

src/api/system/library/index.js

@@ -0,0 +1,26 @@
+import request from '@/config/axios'
+
+// 查询知识库列表
+export const getLibraryPage = (params) => {
+  return request.get({ url: '/admin-api/crm/knowledge-lib/page', params })
+}
+
+// 查询知识库详情
+export const getLibrary = (id) => {
+  return request.get({ url: '/admin-api/crm/knowledge-lib/get?id=' + id })
+}
+
+// 新增知识库
+export const createLibrary = (data) => {
+  return request.post({ url: '/admin-api/crm/knowledge-lib/create', data })
+}
+
+// 修改知识库
+export const updateLibrary = (data) => {
+  return request.put({ url: '/admin-api/crm/knowledge-lib/update', data })
+}
+
+// 删除知识库
+export const deleteLibrary = (id) => {
+  return request.delete({ url: '/admin-api/crm/knowledge-lib/delete?id=' + id })
+}

src/api/system/library/resource.js

@@ -0,0 +1,26 @@
+import request from '@/config/axios'
+
+// 查询资源列表
+export const getResourcePage = (params) => {
+  return request.get({ url: '/admin-api/crm/knowledge-lib-info/page', params })
+}
+
+// 查询资源详情
+export const getResource = (id) => {
+  return request.get({ url: '/admin-api/crm/knowledge-lib-info/get?id=' + id })
+}
+
+// 新增资源
+export const createResource = (data) => {
+  return request.post({ url: '/admin-api/crm/knowledge-lib-info/create', data })
+}
+
+// 修改资源
+export const updateResource = (data) => {
+  return request.put({ url: '/admin-api/crm/knowledge-lib-info/update', data })
+}
+
+// 删除资源
+export const deleteResource = (id) => {
+  return request.delete({ url: '/admin-api/crm/knowledge-lib-info/delete?id=' + id })
+}

src/api/system/set/index.js

@@ -0,0 +1,16 @@
+import request from '@/config/axios'
+
+// 通过key，查询内容
+export const getConfigByConfigKey = (params) => {
+  return request.get({ url: '/admin-api/crm/config/getConfigByConfigKey', params })
+}
+
+// 保存配置项
+export const updateConfig = (data) => {
+  return request.put({ url: '/admin-api/crm/config/batchUpdateConfigValue', data })
+}
+
+// 根据模块获取配置列表
+export const getConfigList = (params) => {
+  return request.get({ url: '/admin-api/crm/config/query', params })
+}

src/components/Descriptions/src/Descriptions.vue

@@ -27,7 +27,8 @@ const props = defineProps({
   data: {
     type: Object as PropType<any>,
     default: () => ({})
-  }
+  },
+  defaultShow: propTypes.bool.def(true)
 })
 
 const { getPrefixCls } = useDesign()
@@ -57,7 +58,7 @@ const getBindItemValue = (item: DescriptionsSchema) => {
 }
 
 // 折叠
-const show = ref(true)
+const show = ref(props.defaultShow)
 
 const toggleClick = () => {
   if (props.collapse) {
@@ -77,7 +78,7 @@ const toggleClick = () => {
       v-if="title"
       :class="[
         `${prefixCls}-header`,
-        'h-50px flex justify-between items-center border-bottom-1 border-solid border-[var(--tags-view-border-color)] px-10px cursor-pointer dark:border-[var(--el-border-color)]'
+        'h-40px flex justify-between items-center border-bottom-1 border-solid border-[var(--tags-view-border-color)] px-10px cursor-pointer dark:border-[var(--el-border-color)]'
       ]"
       @click="toggleClick"
     >
@@ -131,7 +132,7 @@ const toggleClick = () => {
                 <DictTag :type="item.dictType" :value="data[item.field] + ''" />
               </slot>
               <slot v-else-if="item.isEditor">
-                <div v-dompurify-html="data[item.field]"></div>
+                <div v-if="data[item.field]" v-dompurify-html="data[item.field]"></div>
               </slot>
               <slot v-else :name="item.field" :row="data">{{ data[item.field] }}</slot>
             </template>

src/components/Dialog/src/Dialog.vue

@@ -55,6 +55,8 @@ const dialogStyle = computed(() => {
     height: unref(dialogHeight)
   }
 })
+
+const emit = defineEmits(['close'])
 </script>
 
 <template>
@@ -66,6 +68,7 @@ const dialogStyle = computed(() => {
     draggable
     lock-scroll
     v-bind="getBindValue"
+    @close="emit('close')"
   >
     <template #header>
       <div class="flex justify-between">

src/components/Echart/src/Echart.vue

@@ -66,6 +66,7 @@ watch(
   (options) => {
     if (echartRef) {
       echartRef?.setOption(options)
+      resizeHandler()
     }
   },
   {

src/components/Editor/src/Editor.vue

@@ -6,7 +6,7 @@ import { propTypes } from '@/utils/propTypes'
 import { isNumber } from '@/utils/is'
 import { ElMessage } from 'element-plus'
 import { useLocaleStore } from '@/store/modules/locale'
-import { getAccessToken, getTenantId } from '@/utils/auth'
+import { getAccessToken, getTenantId, getAppId } from '@/utils/auth'
 
 type InsertFnType = (url: string, alt: string, href: string) => void
 
@@ -103,7 +103,8 @@ const editorConfig = computed((): IEditorConfig => {
           headers: {
             Accept: '*',
             Authorization: 'Bearer ' + getAccessToken(),
-            'tenant-id': getTenantId()
+            'tenant-id': getTenantId(),
+            'instance-id': getAppId()
           },
 
           // 跨域是否传递 cookie ，默认为 false
@@ -140,6 +141,63 @@ const editorConfig = computed((): IEditorConfig => {
           customInsert(res: any, insertFn: InsertFnType) {
             insertFn(res.data, 'image', res.data)
           }
+        },
+        ['uploadVideo']: {
+          server: import.meta.env.VITE_UPLOAD_URL,
+          // 单个文件的最大体积限制，默认为 2M
+          maxFileSize: 100 * 1024 * 1024,
+          // 最多可上传几个文件，默认为 100
+          maxNumberOfFiles: 10,
+          // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
+          allowedFileTypes: ['video/*'],
+
+          // 自定义上传参数，例如传递验证的 token 等。参数会被添加到 formData 中，一起上传到服务端。
+          meta: { updateSupport: 0 },
+          // 将 meta 拼接到 url 参数中，默认 false
+          metaWithUrl: true,
+
+          // 自定义增加 http  header
+          headers: {
+            Accept: '*',
+            Authorization: 'Bearer ' + getAccessToken(),
+            'tenant-id': getTenantId(),
+            'instance-id': getAppId()
+          },
+
+          // 跨域是否传递 cookie ，默认为 false
+          withCredentials: true,
+
+          // 超时时间，默认为 10 秒
+          timeout: 10 * 1000, // 5 秒
+
+          // form-data fieldName，后端接口参数名称，默认值wangeditor-uploaded-image
+          fieldName: 'file',
+
+          // 上传之前触发
+          onBeforeUpload(file: File) {
+            console.log(file)
+            return file
+          },
+          // 上传进度的回调函数
+          onProgress(progress: number) {
+            // progress 是 0-100 的数字
+            console.log('progress', progress)
+          },
+          onSuccess(file: File, res: any) {
+            console.log('onSuccess', file, res)
+          },
+          onFailed(file: File, res: any) {
+            alert(res.message)
+            console.log('onFailed', file, res)
+          },
+          onError(file: File, err: any, res: any) {
+            alert(err.message)
+            console.error('onError', file, err, res)
+          },
+          // 自定义插入图片
+          customInsert(res: any, insertFn: InsertFnType) {
+            insertFn(res.data, 'video', res.data)
+          }
         }
       },
       uploadImgShowBase64: true

src/components/Form/src/Form.vue

@@ -51,7 +51,8 @@ export default defineComponent({
     // 表单label宽度
     labelWidth: propTypes.oneOfType([String, Number]).def('auto'),
     // 是否 loading 数据中 add by 芋艿
-    vLoading: propTypes.bool.def(false)
+    vLoading: propTypes.bool.def(false),
+    inlineBlock: propTypes.bool.def(false)
   },
   emits: ['register'],
   setup(props, { slots, expose, emit }) {
@@ -77,7 +78,10 @@ export default defineComponent({
     })
 
     // 对表单赋值
-    const setValues = (data: Recordable = {}) => {
+    const setValues = (data: Recordable = {}, isReset: Boolean = false) => {
+      if (isReset) {
+        formModel.value = initModel(unref(getProps).schema, unref(formModel))
+      }
       formModel.value = Object.assign(unref(formModel), data)
     }
 
@@ -181,11 +185,7 @@ export default defineComponent({
       const slotsMap: Recordable = {
         ...setItemComponentSlots(slots, item?.componentProps?.slots, item.field)
       }
-      if (
-        item?.component !== 'SelectV2' &&
-        item?.component !== 'Cascader' &&
-        item?.componentProps?.options
-      ) {
+      if (item?.component !== 'SelectV2' && item?.component !== 'Cascader' && item?.options) {
         slotsMap.default = () => renderOptions(item)
       }
 
@@ -236,6 +236,9 @@ export default defineComponent({
                   vModel={formModel.value[item.field]}
                   {...(autoSetPlaceholder && setTextPlaceholder(item))}
                   {...setComponentProps(item)}
+                  filterable
+                  format={item.component == 'DatePicker' ? 'YYYY-MM-DD' : null}
+                  value-format={item.component == 'DatePicker' ? 'YYYY-MM-DD' : null}
                   style={baseSty + item.componentProps?.style}
                   // eslint-disable-next-line prettier/prettier
                   {...(notRenderOptions.includes(item?.component as string) && item?.componentProps?.options
@@ -291,6 +294,7 @@ export default defineComponent({
         model={props.isCustom ? props.model : formModel}
         class={prefixCls}
         v-loading={props.vLoading}
+        style={props.inlineBlock ? 'display: inline' : ''}
       >
         {{
           // 如果需要自定义，就什么都不渲染，而是提供默认插槽

src/components/Form/src/components/useRenderCheckbox.tsx

@@ -5,12 +5,12 @@ import { defineComponent } from 'vue'
 export const useRenderCheckbox = () => {
   const renderCheckboxOptions = (item: FormSchema) => {
     // 如果有别名，就取别名
-    const labelAlias = item?.componentProps?.optionsAlias?.labelField
-    const valueAlias = item?.componentProps?.optionsAlias?.valueField
+    const labelAlias = item?.componentProps?.optionsAlias?.labelField || 'id'
+    const valueAlias = item?.componentProps?.optionsAlias?.valueField || 'name'
     const Com = (item.component === 'Checkbox' ? ElCheckbox : ElCheckboxButton) as ReturnType<
       typeof defineComponent
     >
-    return item?.componentProps?.options?.map((option) => {
+    return item?.options?.map((option) => {
       const { ...other } = option
       return (
         <Com {...other} label={option[valueAlias || 'value']}>

src/components/Form/src/components/useRenderRadio.tsx

@@ -5,12 +5,12 @@ import { defineComponent } from 'vue'
 export const useRenderRadio = () => {
   const renderRadioOptions = (item: FormSchema) => {
     // 如果有别名，就取别名
-    const labelAlias = item?.componentProps?.optionsAlias?.labelField
-    const valueAlias = item?.componentProps?.optionsAlias?.valueField
+    const labelAlias = item?.componentProps?.optionsAlias?.labelField || 'id'
+    const valueAlias = item?.componentProps?.optionsAlias?.valueField || 'name'
     const Com = (item.component === 'Radio' ? ElRadio : ElRadioButton) as ReturnType<
       typeof defineComponent
     >
-    return item?.componentProps?.options?.map((option) => {
+    return item?.options?.map((option) => {
       const { ...other } = option
       return (
         <Com {...other} label={option[valueAlias || 'value']}>

src/components/Form/src/components/useRenderSelect.tsx

@@ -9,12 +9,12 @@ export const useRenderSelect = (slots: Slots) => {
   const renderSelectOptions = (item: FormSchema) => {
     // 如果有别名，就取别名
     const labelAlias = item?.componentProps?.optionsAlias?.labelField
-    return item?.componentProps?.options?.map((option) => {
-      if (option?.options?.length) {
+    return item?.options?.map((option) => {
+      if (option?.length) {
         return (
           <ElOptionGroup label={option[labelAlias || 'label']}>
             {() => {
-              return option?.options?.map((v) => {
+              return option?.map((v) => {
                 return renderSelectOptionItem(item, v)
               })
             }}
@@ -29,8 +29,8 @@ export const useRenderSelect = (slots: Slots) => {
   // 渲染 select option item
   const renderSelectOptionItem = (item: FormSchema, option: ComponentOptions) => {
     // 如果有别名，就取别名
-    const labelAlias = item?.componentProps?.optionsAlias?.labelField
-    const valueAlias = item?.componentProps?.optionsAlias?.valueField
+    const labelAlias = item?.componentProps?.optionsAlias?.labelField || 'id'
+    const valueAlias = item?.componentProps?.optionsAlias?.valueField || 'name'
 
     const { label, value, ...other } = option
 

src/components/SSTable/index.vue

@@ -28,7 +28,7 @@
             @end="onDragEnd"
           >
             <template #item="{ element: item }">
-              <el-checkbox :key="item.field" :label="item.field">
+              <el-checkbox :key="item.id" :label="item.id">
                 {{ item.label }}
               </el-checkbox>
             </template>
@@ -39,7 +39,7 @@
     <!-- 分页 -->
     <Pagination
       v-model:limit="pageSize"
-      v-model:page="currentPage"
+      v-model:page="pageNo"
       :total="tableObject.total"
       @pagination="getList"
     />
@@ -48,9 +48,8 @@
 
 <script setup>
 import draggable from 'vuedraggable'
-import { useUserStore } from '@/store/modules/user'
+import * as ClueCacheApi from '@/api/clue/clueCache'
 import { useRoute } from 'vue-router'
-import cache from '@/plugins/cache'
 
 const props = defineProps({
   tableObject: { type: Object, default: () => ({ tableList: [] }) },
@@ -59,22 +58,21 @@ const props = defineProps({
 
 const emit = defineEmits(['update:tableObject', 'getList', 'getCheckedColumns'])
 const route = useRoute()
-const { id: userId } = useUserStore().user //取用户ID
 
-const currentPage = ref(props.tableObject?.currentPage || 1)
+const pageNo = ref(props.tableObject?.pageNo || 1)
 
 const pageSize = ref(props.tableObject?.pageSize || 20)
 
 const ColumnSetting = ref()
 const TableColumnPop = ref()
 // 展示在设置里的所有表格列，由于会排序，所以使用新属性，不直接修改原值
-const allColumns = ref({})
+const allColumns = ref([...props.tableColumns])
 // 已勾选的选项
 const checkedColumns = ref([])
 
 // 调用获取数据的接口,分页时需要使用
 function getList({ page, limit }) {
-  emit('update:tableObject', { ...props.tableObject, currentPage: page, pageSize: limit })
+  emit('update:tableObject', { ...props.tableObject, pageNo: page, pageSize: limit })
   nextTick(() => {
     emit('getList')
   })
@@ -85,67 +83,50 @@ const clickSetting = () => {
   unref(TableColumnPop).TableColumnPop?.delayHide?.()
 }
 
-// 获取所有的表格列，注意如果本地有缓存使用缓存数据，因为用户可能已对表格列排序，并且不依赖网络请求，可更快渲染表头
-function getAllColumns() {
-  // 1. 先获取缓存表头
-  const localData = getColumn('TableColumnAll')[route.name] || []
-  // 2. 如果有缓存的表头，直接使用，并将新增的标题加入，如果没有缓存，那就得用获取到的表头
-  if (localData && localData) {
-    const newColumns = props.tableColumns.filter(
-      (item) => !localData.some((it) => it.field == item.field)
-    )
-    allColumns.value = [...localData, ...newColumns]
-  } else {
-    allColumns.value = [...props.tableColumns]
-  }
-}
-// 获取缓存的表头
-function getColumn(name = 'shitTable') {
-  return cache.local.get(`${name}-${userId}`) || {}
-}
-// 设置表头缓存
-function setColumn(val, name = 'shitTable') {
-  cache.local.set(`${name}-${userId}`, val)
+const routeMap = {
+  CluePool: 1,
+  ClueOrder: 2
 }
+
 // 获取用户已勾选的表头
-function getUserCheckedColumns() {
-  // 1. 先获取缓存
-  const localData = getColumn('shitTable')[route.name]
-  // 2. 如果有缓存，使用缓存表头，否则使用默认的所有表头
-  if (localData && localData.length) {
-    checkedColumns.value = localData
-  } else {
-    checkedColumns.value = allColumns.value.map((it) => it.field)
-  }
-  // 3. 回显到表格中
+async function getUserCheckedColumns() {
+  checkedColumns.value = await ClueCacheApi.getClueCache({
+    settingType: 2,
+    model: routeMap[route.name]
+  })
+  // 回显到表格中
   emitColumns()
 }
 
 // 表格列排序
 function onDragEnd() {
-  const obj = getColumn('TableColumnAll')
-  obj[route.name] = allColumns.value
-  // 1. 设置缓存
-  setColumn(obj, 'TableColumnAll')
-  // 2. 表格回显
+  ClueCacheApi.setClueCache({
+    settingType: 2,
+    model: routeMap[route.name],
+    clueParamId: checkedColumns.value
+  })
+
+  // 表格回显
   emitColumns()
 }
 
 // 勾选确认
 function confirm() {
-  const obj = getColumn()
-  obj[route.name] = checkedColumns.value
-  setColumn(obj, 'shitTable')
+  ClueCacheApi.setClueCache({
+    settingType: 2,
+    model: routeMap[route.name],
+    clueParamId: checkedColumns.value
+  })
+  // usedSchema.value = allColumns.value.filter((it) => checkedColumns.value.includes(it.id))
   emitColumns()
 }
 
 // 将表头数据返回至父组件
 function emitColumns() {
-  const arr = allColumns.value.filter((item) => checkedColumns.value.includes(item.field))
+  const arr = allColumns.value.filter((item) => checkedColumns.value.includes(item.id))
   emit('getCheckedColumns', arr)
 }
 
-getAllColumns()
 getUserCheckedColumns()
 
 defineExpose({ getUserCheckedColumns })

src/components/Search/src/Search.vue

@@ -7,12 +7,10 @@ import { findIndex } from '@/utils'
 import { cloneDeep } from 'lodash-es'
 import { FormSchema } from '@/types/form'
 
-import { useUserStore } from '@/store/modules/user'
 import { useRoute } from 'vue-router'
-import cache from '@/plugins/cache'
+import * as ClueCacheApi from '@/api/clue/clueCache'
 
 const route = useRoute()
-const { id: userId } = useUserStore().user //取用户ID
 
 const { t } = useI18n()
 
@@ -33,20 +31,21 @@ const props = defineProps({
     .validate((v: string) => ['left', 'center', 'right'].includes(v))
     .def('center'),
   showLabel: propTypes.bool.def(false),
-  showSearch: propTypes.bool.def(true),
-  showReset: propTypes.bool.def(true),
+  showSearch: propTypes.bool.def(false),
+  showReset: propTypes.bool.def(false),
   // 是否显示伸缩
   expand: propTypes.bool.def(false),
   // 伸缩的界限字段
   expandField: propTypes.string.def(''),
   inline: propTypes.bool.def(true),
+  inlineBlock: propTypes.bool.def(false),
   model: {
     type: Object as PropType<Recordable>,
     default: () => ({})
   }
 })
 
-const emit = defineEmits(['search', 'reset'])
+// const emit = defineEmits(['search', 'reset'])
 
 const visible = ref(true)
 
@@ -60,6 +59,11 @@ const usedSchema = ref([])
 
 const newSchema = computed(() => {
   let schema: FormSchema[] = cloneDeep(usedSchema.value)
+  schema.forEach((item: FormSchema) => {
+    if (item.component == 'TreeSelect') {
+      item.componentProps['check-strictly'] = true
+    }
+  })
   if (props.expand && props.expandField && !unref(visible)) {
     const index = findIndex(schema, (v: FormSchema) => v.field === props.expandField)
     if (index > -1) {
@@ -80,37 +84,26 @@ const newSchema = computed(() => {
   return schema
 })
 
-function initSearch() {
-  reset()
-  // 1. 先获取缓存
-  const localData = getColumn('Schema')[route.name]
-  // 2. 如果有缓存，使用缓存表头，否则使用默认的所有表头
-  if (localData && localData.length) {
-    usedSchema.value = localData
-  } else {
-    const obj = getColumn('Schema')
-    obj[route.name] = [props.schema[0]]
-    setSchema(obj)
-    usedSchema.value = [props.schema[0]]
+const routeMap = {
+  CluePool: 1,
+  ClueOrder: 2
 }
-  checkedSchema.value = usedSchema.value.map((it) => it.field)
+async function initSearch() {
+  reset()
+  checkedSchema.value = await ClueCacheApi.getClueCache({
+    settingType: 1,
+    model: routeMap[route.name]
+  })
+  usedSchema.value = props.schema.filter((it) => checkedSchema.value.includes(it.id))
 }
 
 function changeSearch() {
-  const obj = getColumn('Schema')
-  obj[route.name] = props.schema.filter((item) => checkedSchema.value.includes(item.field))
-  setSchema(obj)
-  initSearch()
-}
-
-// 获取缓存的查询条件
-function getColumn(name = 'Schema') {
-  return cache.local.get(`${name}-${userId}`) || {}
-}
-
-// 设置查询条件缓存
-function setSchema(val: Array<Object>, name = 'Schema') {
-  cache.local.set(`${name}-${userId}`, val)
+  ClueCacheApi.setClueCache({
+    settingType: 1,
+    model: routeMap[route.name],
+    clueParamId: checkedSchema.value
+  })
+  usedSchema.value = props.schema.filter((it) => checkedSchema.value.includes(it.id))
 }
 
 function setSearch() {
@@ -121,23 +114,34 @@ const { register, elFormRef, methods } = useForm({
   model: props.model || {}
 })
 
-const search = async () => {
-  await unref(elFormRef)?.validate(async (isValid) => {
-    if (isValid) {
-      const { getFormData } = methods
-      const model = await getFormData()
-      emit('search', model)
-    }
-  })
-}
+// const search = async () => {
+//   await unref(elFormRef)?.validate(async (isValid) => {
+//     if (isValid) {
+//       const { getFormData } = methods
+//       const model = await getFormData()
+//       emit('search', model)
+//     }
+//   })
+// }
 
 const reset = async () => {
   unref(elFormRef)?.resetFields()
+  // const { getFormData } = methods
+  // const model = await getFormData()
+  // emit('reset', model)
+}
+
+async function getFormModel() {
   const { getFormData } = methods
   const model = await getFormData()
-  emit('reset', model)
+  return model
 }
 
+defineExpose({
+  getFormModel,
+  reset
+})
+
 const bottonButtonStyle = computed(() => {
   return {
     textAlign: props.buttomPosition as unknown as 'left' | 'center' | 'right'
@@ -156,6 +160,7 @@ initSearch()
   <!-- update by 芋艿：class="-mb-15px" 用于降低和 ContentWrap 组件的底部距离，避免空隙过大 -->
   <Form
     :inline="inline"
+    :inlineBlock="inlineBlock"
     :is-col="isCol"
     :is-custom="false"
     isSearch
@@ -168,10 +173,7 @@ initSearch()
   >
     <template #action>
       <div v-if="layout === 'inline'">
-        <ElButton ref="SchemaSetting" @click="setSearch">
-          <!-- <Icon class="mr-5px" icon="ep:setting" /> -->
-          查询设置
-        </ElButton>
+        <ElButton ref="SchemaSetting" @click="setSearch"> 查询设置 </ElButton>
         <el-popover
           ref="SettingPop"
           :virtual-ref="SchemaSetting"
@@ -181,7 +183,7 @@ initSearch()
           virtual-triggering
         >
           <el-checkbox-group v-model="checkedSchema" @change="changeSearch">
-            <el-checkbox v-for="item in schema" :key="item.field" :label="item.field">
+            <el-checkbox v-for="item in schema" :key="item.id" :label="item.id">
               {{ item.label }}
             </el-checkbox>
           </el-checkbox-group>
@@ -199,10 +201,10 @@ initSearch()
         </ElButton>
         <!-- add by 芋艿：补充在搜索后的按钮 -->
         <slot name="actionMore"></slot>
-        <ElButton v-if="expand" text @click="setVisible">
+        <!-- <ElButton v-if="expand" text @click="setVisible">
           {{ t(visible ? 'common.shrink' : 'common.expand') }}
-          <!-- <Icon :icon="visible ? 'ep:arrow-up' : 'ep:arrow-down'" /> -->
-        </ElButton>
+          <Icon :icon="visible ? 'ep:arrow-up' : 'ep:arrow-down'" />
+        </ElButton> -->
       </div>
     </template>
     <template v-for="name in Object.keys($slots)" :key="name" #[name]>

src/components/UploadFile/src/UploadFile.vue

@@ -23,10 +23,10 @@
     >
       <el-button type="primary"><Icon icon="ep:upload-filled" />选取文件</el-button>
       <template v-if="isShowTip" #tip>
-        <div style="font-size: 8px">
+        <div style="font-size: 12px">
           大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
         </div>
-        <div style="font-size: 8px">
+        <div style="font-size: 12px">
           格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b> 的文件
         </div>
       </template>
@@ -34,23 +34,18 @@
   </div>
 </template>
 <script setup lang="ts" name="UploadFile">
-import { PropType } from 'vue'
-
 import { propTypes } from '@/utils/propTypes'
-import { getAccessToken, getTenantId } from '@/utils/auth'
+import { getAccessToken, getTenantId, getAppId } from '@/utils/auth'
 import type { UploadInstance, UploadUserFile, UploadProps, UploadRawFile } from 'element-plus'
-
 const message = useMessage() // 消息弹窗
 const emit = defineEmits(['update:modelValue'])
 
 const props = defineProps({
-  modelValue: {
-    type: Array as PropType<UploadUserFile[]>,
-    required: true
-  },
+  modelValue: propTypes.oneOfType<string | string[]>([String, Array<String>]).isRequired,
   title: propTypes.string.def('文件上传'),
   updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
-  fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
+  // fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
+  fileType: propTypes.array.def([]),
   accept: propTypes.string.def('*'),
   fileSize: propTypes.number.def(5), // 大小限制(MB)
   limit: propTypes.number.def(5), // 数量限制
@@ -66,8 +61,10 @@ const fileList = ref<UploadUserFile[]>(props.modelValue)
 const uploadNumber = ref<number>(0)
 const uploadHeaders = ref({
   Authorization: 'Bearer ' + getAccessToken(),
-  'tenant-id': getTenantId()
+  'tenant-id': getTenantId(),
+  'instance-id': getAppId()
 })
+
 // 文件上传之前判断
 const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
   if (fileList.value.length >= props.limit) {

src/components/UploadFile/src/UploadImg.vue

@@ -55,7 +55,7 @@ import type { UploadProps } from 'element-plus'
 
 import { generateUUID } from '@/utils'
 import { propTypes } from '@/utils/propTypes'
-import { getAccessToken, getTenantId } from '@/utils/auth'
+import { getAccessToken, getTenantId, getAppId } from '@/utils/auth'
 
 type FileTypes =
   | 'image/apng'
@@ -96,7 +96,8 @@ const deleteImg = () => {
 
 const uploadHeaders = ref({
   Authorization: 'Bearer ' + getAccessToken(),
-  'tenant-id': getTenantId()
+  'tenant-id': getTenantId(),
+  'instance-id': getAppId()
 })
 
 const editImg = () => {

src/components/UploadFile/src/UploadImgs.vue

@@ -3,11 +3,12 @@
     <el-upload
       v-model:file-list="fileList"
       :accept="fileType.join(',')"
-      :action="updateUrl"
+      :action="uploadUrl"
       :before-upload="beforeUpload"
       :class="['upload', drag ? 'no-border' : '']"
+      :disabled="disabled"
       :drag="drag"
-      :headers="uploadHeaders"
+      :http-request="httpRequest"
       :limit="limit"
       :multiple="true"
       :on-error="uploadError"
@@ -28,7 +29,7 @@
             <Icon icon="ep:zoom-in" />
             <span>查看</span>
           </div>
-          <div class="handle-icon" @click="handleRemove(file)">
+          <div v-if="!disabled" class="handle-icon" @click="handleRemove(file)">
             <Icon icon="ep:delete" />
             <span>删除</span>
           </div>
@@ -45,13 +46,14 @@
     />
   </div>
 </template>
-<script lang="ts" name="UploadImgs" setup>
-import { PropType } from 'vue'
+<script lang="ts" setup>
 import type { UploadFile, UploadProps, UploadUserFile } from 'element-plus'
 import { ElNotification } from 'element-plus'
 
 import { propTypes } from '@/utils/propTypes'
-import { getAccessToken, getTenantId } from '@/utils/auth'
+import { useUpload } from './useUpload'
+
+defineOptions({ name: 'UploadImgs' })
 
 const message = useMessage() // 消息弹窗
 
@@ -68,11 +70,7 @@ type FileTypes =
   | 'image/x-icon'
 
 const props = defineProps({
-  modelValue: {
-    type: Array as PropType<UploadUserFile[]>,
-    required: true
-  },
-  updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
+  modelValue: propTypes.oneOfType<string | string[]>([String, Array<String>]).isRequired,
   drag: propTypes.bool.def(true), // 是否支持拖拽上传 ==> 非必传（默认为 true）
   disabled: propTypes.bool.def(false), // 是否禁用上传组件 ==> 非必传（默认为 false）
   limit: propTypes.number.def(5), // 最大图片上传数 ==> 非必传（默认为 5张）
@@ -80,27 +78,14 @@ const props = defineProps({
   fileType: propTypes.array.def(['image/jpeg', 'image/png', 'image/gif']), // 图片类型限制 ==> 非必传（默认为 ["image/jpeg", "image/png", "image/gif"]）
   height: propTypes.string.def('150px'), // 组件高度 ==> 非必传（默认为 150px）
   width: propTypes.string.def('150px'), // 组件宽度 ==> 非必传（默认为 150px）
-  borderRadius: propTypes.string.def('8px') // 组件边框圆角 ==> 非必传（默认为 8px）
+  borderradius: propTypes.string.def('8px') // 组件边框圆角 ==> 非必传（默认为 8px）
 })
 
-const uploadHeaders = ref({
-  Authorization: 'Bearer ' + getAccessToken(),
-  'tenant-id': getTenantId()
-})
+const { uploadUrl, httpRequest } = useUpload()
 
-const fileList = ref<UploadUserFile[]>()
-// fix: 改为动态监听赋值解决图片回显问题
-watch(
-  () => props.modelValue,
-  (data) => {
-    if (!data) return
-    fileList.value = data
-  },
-  {
-    deep: true,
-    immediate: true
-  }
-)
+const fileList = ref<UploadUserFile[]>([])
+const uploadNumber = ref<number>(0)
+const uploadList = ref<UploadUserFile[]>([])
 /**
  * @description 文件上传之前判断
  * @param rawFile 上传的文件
@@ -120,29 +105,60 @@ const beforeUpload: UploadProps['beforeUpload'] = (rawFile) => {
       message: `上传图片大小不能超过 ${props.fileSize}M！`,
       type: 'warning'
     })
+  uploadNumber.value++
   return imgType.includes(rawFile.type as FileTypes) && imgSize
 }
 
 // 图片上传成功
 interface UploadEmits {
-  (e: 'update:modelValue', value: UploadUserFile[]): void
+  (e: 'update:modelValue', value: string[]): void
 }
 
 const emit = defineEmits<UploadEmits>()
-const uploadSuccess = (response, uploadFile: UploadFile) => {
-  if (!response) return
-  // TODO 多图上传组件成功后只是把保存成功后的url替换掉组件选图时的文件路径，所以返回的fileList包含的是一个包含文件信息的对象列表
-  uploadFile.url = response.data
-  emit('update:modelValue', fileList.value)
+const uploadSuccess: UploadProps['onSuccess'] = (res: any): void => {
   message.success('上传成功')
+  // 删除自身
+  const index = fileList.value.findIndex((item) => item.response?.data === res.data)
+  fileList.value.splice(index, 1)
+  uploadList.value.push({ name: res.data, url: res.data })
+  if (uploadList.value.length == uploadNumber.value) {
+    fileList.value.push(...uploadList.value)
+    uploadList.value = []
+    uploadNumber.value = 0
+    emitUpdateModelValue()
+  }
 }
 
+// 监听模型绑定值变动
+watch(
+  () => props.modelValue,
+  (val: string | string[]) => {
+    if (!val) {
+      fileList.value = [] // fix：处理掉缓存，表单重置后上传组件的内容并没有重置
+      return
+    }
+
+    fileList.value = [] // 保障数据为空
+    fileList.value.push(
+      ...(val as string[]).map((url) => ({ name: url.substring(url.lastIndexOf('/') + 1), url }))
+    )
+  },
+  { immediate: true, deep: true }
+)
+// 发送图片链接列表更新
+const emitUpdateModelValue = () => {
+  let result: string[] = fileList.value.map((file) => file.url!)
+  emit('update:modelValue', result)
+}
 // 删除图片
 const handleRemove = (uploadFile: UploadFile) => {
   fileList.value = fileList.value.filter(
     (item) => item.url !== uploadFile.url || item.name !== uploadFile.name
   )
-  emit('update:modelValue', fileList.value)
+  emit(
+    'update:modelValue',
+    fileList.value.map((file) => file.url!)
+  )
 }
 
 // 图片上传错误提示
@@ -216,7 +232,7 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
       padding: 0;
       overflow: hidden;
       border: 1px dashed var(--el-border-color-darker);
-      border-radius: v-bind(borderRadius);
+      border-radius: v-bind(borderradius);
 
       &:hover {
         border: 1px dashed var(--el-color-primary);
@@ -233,7 +249,7 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
       width: v-bind(width);
       height: v-bind(height);
       background-color: transparent;
-      border-radius: v-bind(borderRadius);
+      border-radius: v-bind(borderradius);
     }
 
     .upload-image {
@@ -246,16 +262,16 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
       position: absolute;
       top: 0;
       right: 0;
-      box-sizing: border-box;
       display: flex;
-      align-items: center;
-      justify-content: center;
       width: 100%;
       height: 100%;
       cursor: pointer;
       background: rgb(0 0 0 / 60%);
       opacity: 0;
+      box-sizing: border-box;
       transition: var(--el-transition-duration-fast);
+      align-items: center;
+      justify-content: center;
 
       .handle-icon {
         display: flex;

src/components/UploadFile/src/useUpload.ts

@@ -0,0 +1,93 @@
+import * as FileApi from '@/api/infra/file'
+import CryptoJS from 'crypto-js'
+import { UploadRawFile, UploadRequestOptions } from 'element-plus/es/components/upload/src/upload'
+import axios from 'axios'
+
+export const useUpload = () => {
+  // 后端上传地址
+  const uploadUrl = import.meta.env.VITE_UPLOAD_URL
+  // 是否使用前端直连上传
+  const isClientUpload = UPLOAD_TYPE.CLIENT === import.meta.env.VITE_UPLOAD_TYPE
+  // 重写ElUpload上传方法
+  const httpRequest = async (options: UploadRequestOptions) => {
+    // 模式一：前端上传
+    if (isClientUpload) {
+      // 1.1 生成文件名称
+      const fileName = await generateFileName(options.file)
+      // 1.2 获取文件预签名地址
+      const presignedInfo = await FileApi.getFilePresignedUrl(fileName)
+      // 1.3 上传文件（不能使用 ElUpload 的 ajaxUpload 方法的原因：其使用的是 FormData 上传，Minio 不支持）
+      return axios.put(presignedInfo.uploadUrl, options.file).then(() => {
+        // 1.4. 记录文件信息到后端（异步）
+        createFile(presignedInfo, fileName, options.file)
+        // 通知成功，数据格式保持与后端上传的返回结果一致
+        return { data: presignedInfo.url }
+      })
+    } else {
+      // 模式二：后端上传
+      // 重写 el-upload httpRequest 文件上传成功会走成功的钩子，失败走失败的钩子
+      return new Promise((resolve, reject) => {
+        FileApi.updateFile({ file: options.file })
+          .then((res) => {
+            if (res.code === 0) {
+              resolve(res)
+            } else {
+              reject(res)
+            }
+          })
+          .catch((res) => {
+            reject(res)
+          })
+      })
+    }
+  }
+
+  return {
+    uploadUrl,
+    httpRequest
+  }
+}
+
+/**
+ * 创建文件信息
+ * @param vo 文件预签名信息
+ * @param name 文件名称
+ * @param file 文件
+ */
+function createFile(vo: FileApi.FilePresignedUrlRespVO, name: string, file: UploadRawFile) {
+  const fileVo = {
+    configId: vo.configId,
+    url: vo.url,
+    path: name,
+    name: file.name,
+    type: file.type,
+    size: file.size
+  }
+  FileApi.createFile(fileVo)
+  return fileVo
+}
+
+/**
+ * 生成文件名称（使用算法SHA256）
+ * @param file 要上传的文件
+ */
+async function generateFileName(file: UploadRawFile) {
+  // 读取文件内容
+  const data = await file.arrayBuffer()
+  const wordArray = CryptoJS.lib.WordArray.create(data)
+  // 计算SHA256
+  const sha256 = CryptoJS.SHA256(wordArray).toString()
+  // 拼接后缀
+  const ext = file.name.substring(file.name.lastIndexOf('.'))
+  return `${sha256}${ext}`
+}
+
+/**
+ * 上传类型
+ */
+enum UPLOAD_TYPE {
+  // 客户端直接上传（只支持S3服务）
+  CLIENT = 'client',
+  // 客户端发送到后端上传
+  SERVER = 'server'
+}

src/config/axios/config.ts

@@ -7,7 +7,7 @@ const config: {
   /**
    * api请求基础路径
    */
-  base_url: 'http://localhost' + import.meta.env.VITE_API_BASEPATH,
+  base_url: import.meta.env.VITE_API_BASEPATH,
   /**
    * 接口成功返回状态码
    */

src/config/axios/index.ts

@@ -5,10 +5,11 @@ import { config } from './config'
 const { default_headers } = config
 
 const request = (option: any) => {
-  const { url, method, params, data, headersType, responseType } = option
+  const { url, method, params, data, headersType, responseType, isSubmitForm } = option
   return service({
     url: url,
     method,
+    isSubmitForm,
     params,
     data,
     responseType: responseType,

src/config/axios/service.ts

@@ -21,6 +21,7 @@ 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
 
@@ -62,15 +63,11 @@ service.interceptors.request.use(
     }
     // 设置租户
     const tenantId = getTenantId()
-    if (tenantId) {
-      ;(config as Recordable).headers['tenant-id'] = tenantId
-    }
+    if (tenantId) (config as Recordable).headers['tenant-id'] = tenantId
 
     // 设置实例
     const appId = getAppId()
-    if (appId) {
-      ;(config as Recordable).headers['instance-id'] = appId
-    }
+    if (appId) (config as Recordable).headers['instance-id'] = appId
 
     const params = config.params || {}
     const data = config.data || false
@@ -83,27 +80,39 @@ service.interceptors.request.use(
     }
     // get参数编码
     if (config.method?.toUpperCase() === 'GET' && params) {
-      let url = config.url + '?'
-      for (const propName of Object.keys(params)) {
-        const value = params[propName]
-        if (value !== void 0 && value !== null && typeof value !== 'undefined') {
-          if (typeof value === 'object') {
-            for (const val of Object.keys(value)) {
-              const params = propName + '[' + val + ']'
-              const subPart = encodeURIComponent(params) + '='
-              url += subPart + encodeURIComponent(value[val]) + '&'
-            }
-          } else {
-            url += `${propName}=${encodeURIComponent(value)}&`
-          }
-        }
-      }
-      // 给 get 请求加上时间戳参数，避免从缓存中拿数据
-      // const now = new Date().getTime()
-      // params = params.substring(0, url.length - 1) + `?_t=${now}`
-      url = url.slice(0, -1)
       config.params = {}
-      config.url = url
+      const paramsStr = qs.stringify(params, { allowDots: true })
+      if (paramsStr) {
+        config.url = config.url + '?' + paramsStr
+      }
+    }
+    // 是否提交表单型的接口，如果是，不要频繁调接口
+    if (config?.isSubmitForm) {
+      const requestObj = {
+        url: config.url,
+        data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
+        time: new Date().getTime()
+      }
+      const sessionObj = cache.session.get('sessionObj')
+      if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
+        cache.session.set('sessionObj', requestObj)
+      } else {
+        const s_url = sessionObj.url // 请求地址
+        const s_data = sessionObj.data // 请求数据
+        const s_time = sessionObj.time // 请求时间
+        const interval = 1000 // 间隔时间(ms)，小于此时间视为重复提交
+        if (
+          s_data === requestObj.data &&
+          requestObj.time - s_time < interval &&
+          s_url === requestObj.url
+        ) {
+          const message = '数据正在处理，请勿重复提交'
+          console.warn(`[${s_url}]: ` + message)
+          return Promise.reject(new Error(message))
+        } else {
+          cache.session.set('sessionObj', requestObj)
+        }
+      }
     }
     return config
   },
@@ -179,7 +188,7 @@ service.interceptors.response.use(
         })
       }
     } else if (code === 500) {
-      ElMessage.error(t('sys.api.errMsg500'))
+      ElMessage.error(t(msg || 'sys.api.errMsg500'))
       return Promise.reject(new Error(msg))
     } else if (code === 901) {
       ElMessage.error({
@@ -199,6 +208,20 @@ service.interceptors.response.use(
         console.log(msg)
       } else {
         ElNotification.error({ title: msg })
+        if (code == 403) {
+          ElMessageBox.confirm(`${msg},是否重新登陆`, '提示', {
+            type: 'warning'
+          }).then(() => {
+            // 无访问权限，退出登录
+            const { wsCache } = useCache()
+            const tenantId = wsCache.get('TENANT_ID')
+            const appId = wsCache.get('App_ID')
+            resetRouter() // 重置静态路由表
+            wsCache.clear()
+            removeToken()
+            window.location.href = `/crm/login?tenantId=${tenantId}&appId=${appId}`
+          })
+        }
       }
       return Promise.reject('error')
     } else {
@@ -245,7 +268,7 @@ const handleAuthorized = () => {
       isRelogin.show = false
       // 干掉token后再走一次路由让它过router.beforeEach的校验
       // window.location.href = window.location.href
-      window.location.href = `/login?tenantId=${tenantId}&appId=${appId}`
+      window.location.href = `/crm/login?tenantId=${tenantId}&appId=${appId}`
     })
   }
   return Promise.reject(t('sys.api.timeoutMessage'))

src/hooks/web/useCrudSchemas.ts

@@ -119,7 +119,8 @@ const filterSearchSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): F
         componentProps: comonentProps,
         ...schemaItem.search,
         field: schemaItem.field,
-        label: schemaItem.search?.label || schemaItem.label
+        label: schemaItem.search?.label || schemaItem.label,
+        id: schemaItem.clueParamId
       }
       if (searchSchemaItem.api) {
         searchRequestTask.push(async () => {
@@ -165,7 +166,8 @@ const filterTableSchema = (crudSchema: CrudSchema[]): TableColumn[] => {
         }
         return {
           ...schema.table,
-          ...schema
+          ...schema,
+          id: schema.clueParamId
         }
       }
     }

src/hooks/web/useWatermark.ts

@@ -15,14 +15,14 @@ export function useWatermark(appendEl: HTMLElement | null = document.body) {
     clear()
 
     const can = document.createElement('canvas')
-    can.width = 300
+    can.width = 500
     can.height = 240
 
     const cans = can.getContext('2d')
     if (cans) {
       cans.rotate((-20 * Math.PI) / 120)
       cans.font = '15px Vedana'
-      cans.fillStyle = 'rgba(0, 0, 0, 0.15)'
+      cans.fillStyle = 'rgba(0, 0, 0, 0.05)'
       cans.textAlign = 'left'
       cans.textBaseline = 'middle'
       cans.fillText(str, can.width / 20, can.height)

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

@@ -24,7 +24,7 @@ const getUnreadCount = async () => {
 // 跳转我的站内信
 const goMyList = () => {
   push({
-    name: 'MyNotifyMessage'
+    name: 'NotifyMessage'
   })
 }
 
@@ -34,9 +34,9 @@ onMounted(() => {
   // 首次加载小红点
   getUnreadCount()
   // 轮询刷新小红点
-  msgInterval.value = setInterval(() => {
-    getUnreadCount()
-  }, 1000 * 60 * 2)
+  // msgInterval.value = setInterval(() => {
+  //   getUnreadCount()
+  // }, 1000 * 60 * 2)
 })
 
 onUnmounted(() => {

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

@@ -12,6 +12,13 @@ import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
 import ColorRadioPicker from './components/ColorRadioPicker.vue'
 // import InterfaceDisplay from './components/InterfaceDisplay.vue'
 // import LayoutRadioPicker from './components/LayoutRadioPicker.vue'
+import { useWatermark } from '@/hooks/web/useWatermark'
+
+const { setWatermark } = useWatermark()
+
+nextTick(() => {
+  setWatermark('安徽莳松科技有限公司')
+})
 
 const { t } = useI18n()
 const appStore = useAppStore()
@@ -198,6 +205,7 @@ const clear = () => {
 
 <template>
   <div
+    v-if="false"
     :class="prefixCls"
     class="fixed top-[45%] right-0 w-40px h-40px text-center leading-40px bg-[var(--el-color-primary)] cursor-pointer"
     @click="drawer = true"
@@ -205,7 +213,9 @@ const clear = () => {
     <Icon color="#fff" icon="ep:setting" />
   </div>
 
-  <ElDrawer v-model="drawer" :z-index="4000" direction="rtl" size="350px">
+  <div @click="drawer = true">主题配置</div>
+
+  <ElDrawer v-model="drawer" :z-index="4000" append-to-body direction="rtl" size="350px">
     <template #header>
       <span class="text-16px font-700">{{ t('setting.projectSetting') }}</span>
     </template>

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

@@ -124,7 +124,6 @@ const fixedMenuChange = (show: boolean) => {
 const setWater = () => {
   setWatermark(water.value)
 }
-setWater()
 
 const layout = computed(() => appStore.getLayout)
 

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

@@ -8,6 +8,8 @@ import { useUserStore } from '@/store/modules/user'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { getTenantId, getAppId } from '@/utils/auth'
 
+import { Setting } from '@/layout/components/Setting'
+
 const { t } = useI18n()
 
 const { wsCache } = useCache()
@@ -58,6 +60,10 @@ const toProfile = async () => {
     </div>
     <template #dropdown>
       <ElDropdownMenu>
+        <ElDropdownItem>
+          <Icon icon="ep:tools" />
+          <Setting />
+        </ElDropdownItem>
         <ElDropdownItem>
           <Icon icon="ep:tools" />
           <div @click="toProfile">{{ t('common.profile') }}</div>

src/permission.js

@@ -54,9 +54,9 @@ router.beforeEach(async (to, from, next) => {
       const tenantId = getTenantId()
       const appId = getAppId()
       if (tenantId && appId) {
-        next(`/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
+        next(`/crm/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
       } else {
-        next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+        next(`/crm/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
       }
     }
   }

src/router/index.ts

@@ -5,7 +5,7 @@ import remainingRouter from './modules/remaining'
 
 // 创建路由实例
 const router = createRouter({
-  history: createWebHistory(), // createWebHashHistory URL带#，createWebHistory URL不带#
+  history: createWebHistory(import.meta.env.VITE_BASE_PATH), // createWebHashHistory URL带#，createWebHistory URL不带#
   strict: true,
   routes: remainingRouter as RouteRecordRaw[],
   scrollBehavior: () => ({ left: 0, top: 0 })

src/router/modules/remaining.ts

@@ -94,8 +94,8 @@ const remainingRouter: AppRouteRecordRaw[] = [
       },
       {
         path: 'notify-message',
-        component: () => import('@/views/system/notify/my/index.vue'),
-        name: 'MyNotifyMessage',
+        component: () => import('@/views/Profile/NotifyMessage.vue'),
+        name: 'NotifyMessage',
         meta: {
           canTo: true,
           hidden: true,

src/store/modules/dict.ts

@@ -4,7 +4,7 @@ import { store } from '../index'
 import { DictDataVO } from '@/api/system/dict/types'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 const { wsCache } = useCache('sessionStorage')
-// import { listSimpleDictData } from '@/api/system/dict/dict.data'
+import { listSimpleDictData } from '@/api/system/dict/dict.data'
 
 export interface DictValueType {
   value: any
@@ -45,8 +45,7 @@ export const useDictStore = defineStore('dict', {
         this.dictMap = dictMap
         this.isSetDict = true
       } else {
-        // const res = await listSimpleDictData()
-        const res = []
+        const res = await listSimpleDictData()
         // 设置数据
         const dictDataMap = new Map<string, any>()
         res.forEach((dictData: DictDataVO) => {
@@ -76,8 +75,7 @@ export const useDictStore = defineStore('dict', {
     },
     async resetDict() {
       wsCache.delete(CACHE_KEY.DICT_CACHE)
-      // const res = await listSimpleDictData()
-      const res = []
+      const res = await listSimpleDictData()
       // 设置数据
       const dictDataMap = new Map<string, any>()
       res.forEach((dictData: DictDataVO) => {

src/styles/index.scss

@@ -64,7 +64,8 @@
 .el-row .el-form-item {
   .el-input,
   .el-select,
-  .el-input-number {
+  .el-input-number,
+  .el-input__wrapper {
     width: 100%;
   }
 }

src/styles/var.css

@@ -22,7 +22,7 @@
   /* left menu end */
 
   /* logo start */
-  --logo-height: 50px;
+  --logo-height: 40px;
 
   --logo-title-text-color: #fff;
 

src/utils/dict.ts

@@ -110,45 +110,9 @@ export enum DICT_TYPE {
   SYSTEM_MAIL_SEND_STATUS = 'system_mail_send_status',
   SYSTEM_NOTIFY_TEMPLATE_TYPE = 'system_notify_template_type',
 
-  // ========== INFRA 模块 ==========
-  INFRA_BOOLEAN_STRING = 'infra_boolean_string',
-  INFRA_JOB_STATUS = 'infra_job_status',
-  INFRA_JOB_LOG_STATUS = 'infra_job_log_status',
-  INFRA_API_ERROR_LOG_PROCESS_STATUS = 'infra_api_error_log_process_status',
-  INFRA_CONFIG_TYPE = 'infra_config_type',
-  INFRA_CODEGEN_TEMPLATE_TYPE = 'infra_codegen_template_type',
-  INFRA_CODEGEN_FRONT_TYPE = 'infra_codegen_front_type',
-  INFRA_CODEGEN_SCENE = 'infra_codegen_scene',
-  INFRA_FILE_STORAGE = 'infra_file_storage',
-
-  // ========== BPM 模块 ==========
-  BPM_MODEL_CATEGORY = 'bpm_model_category',
-  BPM_MODEL_FORM_TYPE = 'bpm_model_form_type',
-  BPM_TASK_ASSIGN_RULE_TYPE = 'bpm_task_assign_rule_type',
-  BPM_PROCESS_INSTANCE_STATUS = 'bpm_process_instance_status',
-  BPM_PROCESS_INSTANCE_RESULT = 'bpm_process_instance_result',
-  BPM_TASK_ASSIGN_SCRIPT = 'bpm_task_assign_script',
-  BPM_OA_LEAVE_TYPE = 'bpm_oa_leave_type',
-
-  // ========== PAY 模块 ==========
-  PAY_CHANNEL_WECHAT_VERSION = 'pay_channel_wechat_version', // 微信渠道版本
-  PAY_CHANNEL_ALIPAY_SIGN_TYPE = 'pay_channel_alipay_sign_type', // 支付渠道支付宝算法类型
-  PAY_CHANNEL_ALIPAY_MODE = 'pay_channel_alipay_mode', // 支付宝公钥类型
-  PAY_CHANNEL_ALIPAY_SERVER_TYPE = 'pay_channel_alipay_server_type', // 支付宝网关地址
-  PAY_CHANNEL_CODE_TYPE = 'pay_channel_code_type', // 支付渠道编码类型
-  PAY_ORDER_NOTIFY_STATUS = 'pay_order_notify_status', // 商户支付订单回调状态
-  PAY_ORDER_STATUS = 'pay_order_status', // 商户支付订单状态
-  PAY_ORDER_REFUND_STATUS = 'pay_order_refund_status', // 商户支付订单退款状态
-  PAY_REFUND_ORDER_STATUS = 'pay_refund_order_status', // 退款订单状态
-  PAY_REFUND_ORDER_TYPE = 'pay_refund_order_type', // 退款订单类别
-
-  // ========== MP 模块 ==========
-  MP_AUTO_REPLY_REQUEST_MATCH = 'mp_auto_reply_request_match', // 自动回复请求匹配类型
-  MP_MESSAGE_TYPE = 'mp_message_type', // 消息类型
-
   // ========== MALL 模块 ==========
   PRODUCT_UNIT = 'product_unit', // 商品单位
   PRODUCT_SPU_STATUS = 'product_spu_status', //商品状态
-  // ========== MALL 交易模块 ==========
-  EXPRESS_CHARGE_MODE = 'trade_delivery_express_charge_mode' //快递的计费方式
+  // ========== 驾校管理 ==========
+  LINCENSE_TYPE = 'license_type' //驾照类型
 }

src/utils/formatTime.ts

@@ -18,7 +18,7 @@ export function formatDate(date: Date, format?: string): string {
   }
   // 日期存在，则进行格式化
   if (format === undefined) {
-    format = 'YYYY-MM-DD HH:mm:ss'
+    format = 'YYYY-MM-DD'
   }
   return dayjs(date).format(format)
 }

src/utils/index.ts

@@ -209,3 +209,14 @@ export const yuanToFen = (amount: string | number): number => {
 export const fenToYuan = (amount: string | number): number => {
   return Number((Number(amount) / 100).toFixed(2))
 }
+
+export const removeNullField = (obj: Object) => {
+  for (const key in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, key)) {
+      if (obj[key] === '') {
+        delete obj[key]
+      }
+    }
+  }
+  return obj
+}

src/views/Basic/Dept/DeptForm.vue

@@ -58,7 +58,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="24" :offset="0">
-          <el-form-item label="状态" prop="remark">
+          <el-form-item label="备注" prop="remark">
             <Editor v-model:modelValue="formData.remark" />
           </el-form-item>
         </el-col>

src/views/Basic/GeneralSet/Comp/BSClue.vue

@@ -1,18 +1,42 @@
 <template>
   <el-form :model="form" ref="formRef" label-width="auto">
-    <el-form-item>
+    <el-form-item v-if="getConfig('usePhoneConfig')">
       <template #label>
-        <Tooltip message="请联系客服开通或关闭，客服电话:15955599959" />使用外呼
+        <Tooltip
+          v-if="getConfig('usePhoneConfig').remark"
+          :message="getConfig('usePhoneConfig').remark"
+        />
+        <span>使用外呼</span>
       </template>
-      <el-radio-group v-model="form.callEnable" disabled>
-        <el-radio :label="1"> 使用 </el-radio>
-        <el-radio :label="0"> 不使用 </el-radio>
+      <el-radio-group
+        v-model="form.usePhoneConfig"
+        :disabled="!getConfig('usePhoneConfig').modifiable"
+      >
+        <el-radio
+          v-for="(item, index) in getConfig('usePhoneConfig').options"
+          :key="index"
+          :label="item.id"
+        >
+          {{ item.name }}
+        </el-radio>
       </el-radio-group>
     </el-form-item>
-    <el-form-item label="跟进信息">
-      <el-radio-group v-model="form.followType">
-        <el-radio :label="1"> 展示所有 </el-radio>
-        <el-radio :label="2"> 仅展示本人 </el-radio>
+    <el-form-item v-if="getConfig('showFollowConfig')">
+      <template #label>
+        <Tooltip
+          v-if="getConfig('showFollowConfig').remark"
+          :message="getConfig('showFollowConfig').remark"
+        />
+        <span>跟进信息</span>
+      </template>
+      <el-radio-group v-model="form.showFollowConfig">
+        <el-radio
+          v-for="(item, index) in getConfig('showFollowConfig').options"
+          :key="index"
+          :label="item.id"
+        >
+          {{ item.name }}
+        </el-radio>
       </el-radio-group>
     </el-form-item>
     <el-form-item>
@@ -23,23 +47,42 @@
 </template>
 
 <script setup name="BasicSettingClue">
+import * as ConfigApi from '@/api/system/set'
+
 const message = useMessage()
 
-const form = ref({
-  followType: 1,
-  callEnable: 1
-})
+const form = ref({})
+
+const configList = ref([])
+
+function getConfig(val) {
+  return configList.value.find((it) => it.configKey == val)
+}
 
 function getData() {
-  form.value = {
-    followType: 1,
-    callEnable: 1
-  }
+  ConfigApi.getConfigList({ module: 100 }).then((data) => {
+    configList.value = data
+    // 获取所有配置项
+    data.map((it) => {
+      form.value[it.configKey] = it.configValue
+    })
+  })
 }
 
 function onSubmit() {
+  const params = configList.value.map((it) => ({
+    configId: it.configId,
+    configKey: it.configKey,
+    configValue: form.value[it.configKey]
+  }))
+  ConfigApi.updateConfig(params).then(() => {
     message.success('保存成功')
+  })
 }
+
+onMounted(() => {
+  getData()
+})
 </script>
 
 <style lang="scss" scoped></style>

src/views/Basic/GeneralSet/Comp/BSSalerComission.vue

@@ -1,16 +1,31 @@
 <template>
   <el-form :model="form" ref="formRef" label-width="auto">
-    <el-form-item label="是否关联成交率">
-      <el-radio-group v-model="form.withSuccess">
-        <el-radio :label="1"> 是 </el-radio>
-        <el-radio :label="0"> 否 </el-radio>
+    <el-form-item v-if="getConfig('saleCommissionRelateDealConfig')">
+      <template #label>
+        <Tooltip
+          v-if="getConfig('saleCommissionRelateDealConfig').remark"
+          :message="getConfig('saleCommissionRelateDealConfig').remark"
+        />
+        <span>是否关联成交率</span>
+      </template>
+      <el-radio-group
+        v-model="form.saleCommissionRelateDealConfig"
+        @change="form.saleCommissionRelateRulesConfig = []"
+      >
+        <el-radio
+          v-for="(item, index) in getConfig('saleCommissionRelateDealConfig').options"
+          :key="index"
+          :label="item.id"
+        >
+          {{ item.name }}
+        </el-radio>
       </el-radio-group>
     </el-form-item>
-    <el-form-item label="关联规则" v-if="form.withSuccess">
+    <el-form-item label="关联规则" v-if="form.saleCommissionRelateDealConfig == 'true'">
       <div>
-        <el-button @click="form.rules.push({})">新增规则</el-button>
+        <el-button @click="form.saleCommissionRelateRulesConfig.push({})">新增规则</el-button>
         <div
-          v-for="(item, index) in form.rules"
+          v-for="(item, index) in form.saleCommissionRelateRulesConfig"
           :key="index"
           class="mt-10px flex justify-center items-center"
         >
@@ -48,22 +63,52 @@
 </template>
 
 <script setup name="BasicSettingClue">
+import * as ConfigApi from '@/api/system/set'
+
 const message = useMessage()
 
-const form = ref({
-  withSuccess: 1,
-  rules: []
-})
+const form = ref({})
+const configList = ref([])
+
+const jsonArr = ['saleCommissionRelateRulesConfig']
+
+function getConfig(val) {
+  return configList.value.find((it) => it.configKey == val)
+}
 
 function getData() {
-  form.value = {
-    withSuccess: 1
+  ConfigApi.getConfigList({ module: 101 }).then((data) => {
+    configList.value = data
+    // 获取所有配置项
+    data.map((it) => {
+      form.value[it.configKey] = it.configValue
+      if (it.configKey == 'saleCommissionRelateRulesConfig') {
+        if (!form.value[it.configKey]) {
+          form.value[it.configKey] = []
+        } else {
+          form.value[it.configKey] = JSON.parse(it.configValue)
         }
       }
+    })
+  })
+}
 
 function onSubmit() {
+  const params = configList.value.map((it) => ({
+    configId: it.configId,
+    configKey: it.configKey,
+    configValue: jsonArr.includes(it.configKey)
+      ? JSON.stringify(form.value[it.configKey])
+      : form.value[it.configKey]
+  }))
+  ConfigApi.updateConfig(params).then(() => {
     message.success('保存成功')
+  })
 }
+
+onMounted(() => {
+  getData()
+})
 </script>
 
 <style lang="scss" scoped></style>

src/views/Basic/Library/Comp/DialogLibrary.vue

@@ -1,11 +1,11 @@
 <template>
   <Dialog :title="title" v-model="dialogVisible" width="800px">
-    <el-form :model="form" ref="addForm" :rules="rules" label-width="100px">
-      <el-form-item label="知识库名称" prop="name">
-        <el-input v-model="form.name" placeholder="请输入" />
+    <el-form v-loading="formLoading" :model="form" ref="formRef" :rules="rules" label-width="100px">
+      <el-form-item label="知识库名称" prop="libName">
+        <el-input v-model="form.libName" placeholder="请输入" />
       </el-form-item>
-      <el-form-item label="资源类型" prop="type">
-        <el-radio-group v-model="form.type">
+      <el-form-item label="资源类型" prop="libType">
+        <el-radio-group v-model="form.libType">
           <el-radio :label="1"> 文件 </el-radio>
           <el-radio :label="2"> 纯图片 </el-radio>
           <el-radio :label="3"> 自主编辑 </el-radio>
@@ -18,49 +18,71 @@
     <template #footer>
       <span>
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="handleSave">保 存</el-button>
+        <el-button type="primary" :disabled="formLoading" @click="handleSave">保 存</el-button>
       </span>
     </template>
   </Dialog>
 </template>
 
 <script setup>
+import * as LibraryApi from '@/api/system/library'
+
+const emit = defineEmits(['success'])
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
 const dialogVisible = ref(false) // 弹窗的是否展示
 
 const form = ref()
 const rules = ref({
-  name: { required: true, message: '名称不可为空', trigger: 'blur' }
+  libName: { required: true, message: '名称不可为空', trigger: 'blur' }
 })
 
 const title = ref('')
 
-const addForm = ref()
+const formRef = ref()
+const formLoading = ref(false)
+const formType = ref('create')
 
-const emit = defineEmits(['update'])
-
-const open = (val) => {
+const open = (type, val) => {
   dialogVisible.value = true
+  formType.value = type
   if (val) {
     title.value = '修改知识库'
     form.value = { ...val }
   } else {
     title.value = '新增知识库'
     form.value = {
-      name: '',
-      type: 1,
-      remark: undefined
+      libName: '',
+      libType: 1,
+      remark: undefined,
+      isDefault: false
     }
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
-function handleSave() {
-  addForm.value.validate((valid) => {
-    if (valid) {
-      emit('update', form.value)
-      dialogVisible.value = false
+async function handleSave() {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    if (formType.value === 'create') {
+      await LibraryApi.createLibrary(form.value)
+      message.success(t('common.createSuccess'))
+    } else {
+      await LibraryApi.updateLibrary(form.value)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
   }
-  })
 }
 </script>
 

src/views/Basic/Library/Comp/DialogResource.vue

@@ -1,6 +1,6 @@
 <template>
   <Dialog :title="title" v-model="show" width="800px">
-    <el-form :model="form" ref="resourceForm" :rules="rules" label-width="60px">
+    <el-form v-loading="formLoading" :model="form" ref="formRef" :rules="rules" label-width="60px">
       <el-row :gutter="20">
         <el-col :span="12" :offset="0">
           <el-form-item label="标题" prop="title">
@@ -8,16 +8,19 @@
           </el-form-item>
         </el-col>
         <el-col :span="12" :offset="0">
-          <el-form-item label="标签" prop="tipList">
+          <el-form-item label="标签" prop="tags">
             <el-select
-              v-model="form.tipList"
+              v-model="form.tags"
               multiple
               filterable
+              collapse-tags
+              collapse-tags-tooltip
               allow-create
               default-first-option
               :reserve-keyword="false"
               placeholder="请选择标签或输入"
               clearable
+              @change="tipChange"
               style="width: 100%"
             >
               <el-option
@@ -33,15 +36,10 @@
       <el-row :gutter="20">
         <el-col :span="24" :offset="0">
           <el-form-item label="内容" prop="content">
-            <UploadFile
-              v-if="form.type == 1"
-              v-model="form.sliderPicUrls"
-              :isShowTip="false"
-              :fileType="[]"
-            />
-            <UploadImgs
-              v-else-if="form.type == 2"
-              v-model:modelValue="form.sliderPicUrls"
+            <UploadFile v-if="libType == 1" v-model="form.files" :limit="1" :isShowTip="false" />
+            <UploadImg
+              v-else-if="libType == 2"
+              v-model:modelValue="form.files"
               width="100px"
               height="100px"
             />
@@ -60,41 +58,107 @@
     <template #footer>
       <span>
         <el-button @click="show = false">取 消</el-button>
-        <el-button type="primary" @click="handleSave">保 存</el-button>
+        <el-button type="primary" :disabled="formLoading" @click="handleSave">保 存</el-button>
       </span>
     </template>
   </Dialog>
 </template>
 
-<script setup>
+<script setup name="DialogResource">
+import * as ResourceApi from '@/api/system/library/resource'
+import { getDictOptions } from '@/utils/dict'
+import * as dictApi from '@/api/system/dict/dict.data'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
 const show = ref(false)
 const title = ref('')
+const formType = ref('create')
+const libType = ref(1)
+
 const form = ref({})
-const rules = ref({})
+const formLoading = ref(false)
+const rules = ref({
+  title: { required: true, message: '标题不可为空', trigger: 'blur' }
+})
 
-const tipOptions = ref([{ label: '绿色', value: '绿色' }])
+const tipOptions = ref([])
 
-function open(type, val) {
+function getOptions() {
+  tipOptions.value = getDictOptions('knowledge_tags')
+}
+
+async function open(type, info, id) {
   show.value = true
-  if (val) {
-    title.value = '修改资源'
-    form.value = { ...val, type }
-  } else {
-    title.value = '新增资源'
+  title.value = type == 'update' ? '修改资源' : '新增资源'
+  formType.value = type
+  libType.value = info.libType
+  resetForm(info.libId)
+  getOptions()
+  if (id) {
+    formLoading.value = true
+    try {
+      form.value = await ResourceApi.getResource(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+
+function resetForm(libId) {
   form.value = {
-      type,
+    libId,
     title: '',
-      tipList: [],
-      sliderPicUrls: [],
+    tags: [],
+    files: '',
     content: '',
-      remark: null
+    remark: null,
+    isDefault: false
   }
 }
+
+async function tipChange(val) {
+  const valStr = val.at(-1)
+  if (!tipOptions.value.some((it) => it.value == valStr)) {
+    await dictApi.createDictData({
+      label: valStr,
+      value: valStr,
+      sort: 1,
+      status: 0,
+      dictType: 'knowledge_tags'
+    })
+    tipOptions.value.push({ label: valStr, value: valStr })
   }
+}
+
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
-function handleSave() {
-  console.log('保存成功')
+const formRef = ref()
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+async function handleSave() {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    if (formType.value === 'create') {
+      await ResourceApi.createResource(form.value)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ResourceApi.updateResource(form.value)
+      message.success(t('common.updateSuccess'))
+    }
+    show.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
 }
 </script>
 

src/views/Basic/Library/Comp/ImagePreview.vue

@@ -1,7 +1,6 @@
 <template>
   <teleport v-if="show" to="#app">
     <div class="container">
-      <!-- <Icon class="ep:circle-close close-icon" /> -->
       <el-icon class="close-icon" @click="show = false"><CircleClose /></el-icon>
       <el-drawer
         v-model="showDrawer"
@@ -16,22 +15,30 @@
         <template #header>
           <span style="color: #fff">资源详情</span>
         </template>
-        <el-form style="flex: 1" :model="info" label-width="80px" label-position="left">
-          <el-form-item label="标题:">
-            {{ info.title }}
-          </el-form-item>
-          <el-form-item label="文件名称:">
-            {{ info.fileName }}
-          </el-form-item>
-          <el-form-item label="标签:">
-            <el-tag class="mr-5px mb-5px" v-for="(item, index) in info.tipList" :key="index">{{
-              item
-            }}</el-tag>
-          </el-form-item>
-          <el-form-item label="备注:">
-            {{ info.remark }}
-          </el-form-item>
-        </el-form>
+        <div>
+          <div class="flex mb-18px">
+            <div class="w-80px text-light-50">标题：</div>
+            <div class="flex-1 ml-10px text-light-50">{{ info.title }}</div>
+          </div>
+          <div class="flex mb-18px">
+            <div class="w-80px text-light-50">文件名称：</div>
+            <div class="flex-1 ml-10px text-light-50 w-80px" style="word-wrap: break-word">{{
+              info.files
+            }}</div>
+          </div>
+          <div class="flex mb-18px">
+            <div class="w-80px text-light-50">标签：</div>
+            <div class="flex-1 ml-10px w-80px">
+              <el-tag class="mr-5px" v-for="(item, index) in info.tags" :key="index">
+                {{ getDictLabel('knowledge_tags', item) }}
+              </el-tag>
+            </div>
+          </div>
+          <div class="flex mb-18px">
+            <div class="w-80px text-light-50">备注：</div>
+            <div class="flex-1 ml-10px text-light-50">{{ info.remark }}</div>
+          </div>
+        </div>
         <template #footer>
           <div class="flex justify-between">
             <el-button plain :disabled="imgIndex <= 0" @click="imgIndex--">上一张</el-button>
@@ -42,13 +49,14 @@
         </template>
       </el-drawer>
 
-      <img :src="info.fileUrl" :alt="info.fileName" srcset="" class="width-fit img" />
+      <img :src="info.files" :alt="info.files" srcset="" class="width-fit img" />
       <div class="img-idx">{{ imgIndex + 1 }} / {{ imgList.length }}</div>
     </div>
   </teleport>
 </template>
 
 <script setup>
+import { getDictLabel } from '@/utils/dict'
 import { ElIcon } from 'element-plus'
 import { CircleClose } from '@element-plus/icons-vue'
 

src/views/Basic/Library/index.vue

@@ -3,7 +3,9 @@
     <el-card shadow="always" :body-style="{ padding: '10px' }">
       <div class="flex justify-between items-center" style="width: 400px">
         <div class="text-16px font-bold">知识库名称</div>
-        <el-button type="primary" style="padding: 0px" text @click="handleAdd">新增</el-button>
+        <el-button type="primary" style="padding: 0px" text @click="openForm('create', null)"
+          >新增</el-button
+        >
       </div>
       <div class="border-top-1px mt-10px pt-10px">
         <div
@@ -11,24 +13,27 @@
           v-for="(item, index) in libraryList"
           :key="index"
           :class="{ actived: libraryIndex == index }"
-          @click="libraryIndex = index"
+          @click="handleClickLib(index)"
         >
-          <div class="flex-1 text-14px">{{ item.name }}</div>
+          <div class="flex-1 text-14px">{{ item.libName }}</div>
           <div class="ml-10px">
-            <el-button type="primary" style="padding: 0px" text @click="handleUpdate(item)"
-              >修改</el-button
-            >
+            <el-button type="primary" style="padding: 0px" text @click="openForm('update', item)">
+              修改
+            </el-button>
             <el-button
               type="primary"
               class="ml-10px"
               style="padding: 0px"
               text
-              @click="handleRemove(index)"
-              >删除</el-button
+              @click="handleRemove(item.libId)"
             >
+              删除
+            </el-button>
           </div>
         </div>
         <Pagination
+          small
+          layout="total, prev, pager, next, jumper"
           v-model:limit="pageSize"
           v-model:page="currentPage"
           :total="total"
@@ -36,44 +41,55 @@
         />
       </div>
     </el-card>
-    <el-card class="ml-20px" style="flex: 1" shadow="always" :body-style="{ padding: '10px' }">
+    <el-card
+      v-if="libraryList.length"
+      class="ml-20px"
+      style="flex: 1"
+      shadow="always"
+      :body-style="{ padding: '10px' }"
+    >
       <div class="flex justify-between items-center border-bottom-1px pb-10px mb-20px">
-        <div>【{{ libraryList[libraryIndex].name }}】资源详情</div>
-        <el-button type="primary" @click="handleAddResource">新增资源</el-button>
+        <div>【{{ libraryList[libraryIndex].libName }}】资源详情</div>
+        <el-button type="primary" @click="openResource('create', null)">新增资源</el-button>
       </div>
-      <div v-if="libraryList[libraryIndex].type == 1">
-        <el-table :data="tableList" border>
+      <div v-if="libraryList[libraryIndex].libType == 1">
+        <el-table :data="tableList" border v-loading="loading">
           <el-table-column type="index" width="50" />
           <el-table-column prop="title" label="标题" width="200" />
           <el-table-column label="标签" width="200px">
             <template #default="{ row }">
-              <el-tag v-for="(item, index) in row.tipList" :key="index" class="mr-5px">{{
-                item
-              }}</el-tag>
+              <el-tag v-for="(item, index) in row.tags" :key="index" class="mr-5px">
+                {{ getDictLabel('knowledge_tags', item) }}
+              </el-tag>
             </template>
           </el-table-column>
-          <el-table-column prop="fileName" label="附件">
+          <el-table-column prop="files" label="附件">
             <template #default="{ row }">
-              <el-link type="primary" underline :href="row.fileUrl" target="_blank">{{
-                row.fileName
-              }}</el-link>
+              <el-link type="primary" underline target="_blank" @click="handleDownload(row.files)">
+                {{ row.files }}
+              </el-link>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="120px">
             <template #default="{ row, $index }">
-              <el-button type="primary" style="padding: 0" text @click="updateResource(row)"
-                >修改</el-button
-              >
-              <el-button type="danger" style="padding: 0" text @click="removeResource($index)"
-                >删除</el-button
+              <el-button
+                type="primary"
+                style="padding: 0"
+                text
+                @click="openResource('update', row.id)"
               >
+                修改
+              </el-button>
+              <el-button type="danger" style="padding: 0" text @click="removeResource($index)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
       </div>
-      <div v-else-if="libraryList[libraryIndex].type == 2" class="flex">
+      <div v-else-if="libraryList[libraryIndex].libType == 2" class="flex">
         <div v-for="(item, index) in tableList" :key="index" class="mr-10px">
-          <el-image :src="item.fileUrl" @click="imagePreview(index)" class="w-150px h-150px" />
+          <el-image :src="item.files" @click="imagePreview(index)" class="w-150px h-150px" />
           <div class="mt-5px text-center">{{ item.title }}</div>
         </div>
       </div>
@@ -83,19 +99,24 @@
           <el-table-column prop="title" label="标题" />
           <el-table-column label="标签">
             <template #default="{ row }">
-              <el-tag v-for="(item, index) in row.tipList" :key="index" class="mr-5px">{{
-                item
-              }}</el-tag>
+              <el-tag v-for="(item, index) in row.tags" :key="index" class="mr-5px">
+                {{ getDictLabel('knowledge_tags', item) }}
+              </el-tag>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="120px">
             <template #default="{ row, $index }">
-              <el-button type="primary" style="padding: 0" text @click="updateResource(row)"
-                >修改</el-button
-              >
-              <el-button type="danger" style="padding: 0" text @click="removeResource($index)"
-                >删除</el-button
+              <el-button
+                type="primary"
+                style="padding: 0"
+                text
+                @click="openResource('update', row.infoId)"
               >
+                修改
+              </el-button>
+              <el-button type="danger" style="padding: 0" text @click="removeResource($index)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -108,27 +129,31 @@
       />
     </el-card>
   </div>
-  <DialogLibrary ref="library" @update="afterSaveLibrary" />
-  <DialogResource ref="resourceDialog" />
+  <DialogLibrary ref="library" @success="getList" />
+  <DialogResource ref="resourceDialog" @success="getResourceList" />
   <ImagePreview ref="imgPreview" />
 </template>
 
-<script setup>
+<script setup name="Library">
+import * as LibraryApi from '@/api/system/library/index'
+import * as ResourceApi from '@/api/system/library/resource'
 import DialogLibrary from './Comp/DialogLibrary.vue'
 import DialogResource from './Comp/DialogResource.vue'
 import ImagePreview from './Comp/ImagePreview.vue'
+import { getDictLabel } from '@/utils/dict'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
 
 const libraryIndex = ref(0)
-const libraryList = ref([
-  { name: '成交案例', id: 1, type: 2 },
-  { name: '公司资质材料', id: 2, type: 1 },
-  { name: '会议纪要', id: 3, type: 3 }
-])
+const libraryList = ref([])
 
 const pageSize = ref(20)
 const currentPage = ref(1)
 const total = ref(0)
 
+const loading = ref(false)
+
 const library = ref()
 const resourceDialog = ref()
 const imgPreview = ref()
@@ -137,61 +162,80 @@ const resourcePageSize = ref(20)
 const resourcePageNum = ref(1)
 const resourceTotal = ref(0)
 
-const tableList = ref([
-  {
-    fileUrl:
-      'https://img0.baidu.com/it/u=1033018635,7901815&fm=253&fmt=auto&app=138&f=JPEG?w=750&h=500',
-    fileName: '测试图片1'
-  },
-  {
-    tipList: ['优质材料', '无污染'],
-    fileUrl:
-      'https://img0.baidu.com/it/u=1610680713,975251961&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=750',
-    fileName: '测试图片2'
-  }
-])
+const tableList = ref([])
 
-function handleAdd() {
-  // 新增知识库
-  library.value.open(null)
+function openForm(type, item) {
+  library.value.open(type, item)
 }
 
-function handleUpdate(item) {
-  library.value.open(item)
+async function handleRemove(id) {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await LibraryApi.deleteLibrary(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
 }
 
-function handleRemove(index) {
-  libraryList.value.splice(index, 1)
+async function getList() {
+  const data = await LibraryApi.getLibraryPage({
+    pageNo: currentPage.value,
+    pageSize: pageSize.value
+  })
+  libraryList.value = data.list
+  total.value = data.total
+  handleClickLib(0)
 }
 
-function afterSaveLibrary(val) {
-  libraryList.value.push(val)
+function handleClickLib(index) {
+  libraryIndex.value = index
+  getResourceList()
 }
 
-function getList() {
-  libraryList.value = []
+function handleDownload(href) {
+  if (href) {
+    let a = document.createElement('a')
+    a.download = href //指定下载的文件名
+    a.href = href //  URL对象
+    a.click() // 模拟点击
+    URL.revokeObjectURL(a.href) // 释放URL 对象
+  }
 }
 
-function handleAddResource() {
-  resourceDialog.value.open(libraryList.value[libraryIndex.value].type, null)
-}
-
-function updateResource(row) {
-  resourceDialog.value.open(libraryList.value[libraryIndex.value].type, row)
+function openResource(type, id) {
+  resourceDialog.value.open(type, libraryList.value[libraryIndex.value], id)
 }
 
 function removeResource(index) {
   tableList.value.splice(index, 1)
 }
 
-function getResourceList() {
-  tableList.value = []
+async function getResourceList() {
+  loading.value = true
+  try {
+    const data = await ResourceApi.getResourcePage({
+      libId: libraryList.value[libraryIndex.value].libId,
+      pageNo: resourcePageNum.value,
+      pageSize: resourcePageSize.value
+    })
+    tableList.value = data.list
+    resourceTotal.value = data.total
+  } finally {
+    loading.value = false
+  }
 }
 
 /** 商品图预览 */
 function imagePreview(index) {
   imgPreview.value.open(index, tableList.value)
 }
+
+onMounted(() => {
+  getList()
+})
 </script>
 
 <style lang="scss" scoped>

src/views/Basic/Role/RoleDataPermissionForm.vue

@@ -107,7 +107,14 @@ const dataScopeOptions = [
 ]
 
 async function getRoleInfo(id) {
+  try {
     formData.value = await RoleApi.getRole(id)
+    nextTick(() => {
+      treeRef.value.setCheckedKeys(formData.value.dataScopeDeptIds)
+    })
+  } catch (error) {
+    console.log(error)
+  }
 }
 
 /** 提交表单 */

src/views/Basic/Role/RoleForm.vue

@@ -37,7 +37,7 @@ const formData = ref({
   name: ''
 })
 const formRules = reactive({
-  name: [{ required: true, message: '岗位标题不能为空', trigger: 'blur' }]
+  name: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 

src/views/Basic/User/UserAssignRoleForm.vue

@@ -1,94 +0,0 @@
-<template>
-  <Dialog v-model="dialogVisible" title="分配角色">
-    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
-      <el-form-item label="用户名称">
-        <el-input v-model="formData.username" :disabled="true" />
-      </el-form-item>
-      <el-form-item label="用户昵称">
-        <el-input v-model="formData.nickname" :disabled="true" />
-      </el-form-item>
-      <el-form-item label="角色">
-        <el-select v-model="formData.roleIds" multiple placeholder="请选择角色">
-          <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </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 lang="ts" name="SystemUserAssignRoleForm" setup>
-import * as PermissionApi from '@/api/system/permission'
-import * as UserApi from '@/api/system/user'
-import * as RoleApi from '@/api/system/role'
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formData = ref({
-  id: undefined,
-  nickname: '',
-  username: '',
-  roleIds: []
-})
-const formRef = ref() // 表单 Ref
-const roleList = ref<any>([]) // 角色的列表
-
-/** 打开弹窗 */
-const open = async (row: UserApi.UserVO) => {
-  dialogVisible.value = true
-  resetForm()
-  // 设置数据
-  formData.value.id = row.id
-  formData.value.username = row.username
-  formData.value.nickname = row.nickname
-  // 获得角色拥有的菜单集合
-  formLoading.value = true
-  try {
-    formData.value.roleIds = await PermissionApi.getUserRoleList(row.id)
-  } finally {
-    formLoading.value = false
-  }
-  // 获得角色列表
-  roleList.value = await RoleApi.getSimpleRoleList()
-}
-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 {
-    await PermissionApi.assignUserRole({
-      userId: formData.value.id,
-      roleIds: formData.value.roleIds
-    })
-    message.success(t('common.updateSuccess'))
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success', true)
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    nickname: '',
-    username: '',
-    roleIds: []
-  }
-  formRef.value?.resetFields()
-}
-</script>

src/views/Basic/User/UserForm.vue

@@ -7,10 +7,10 @@
       :rules="formRules"
       label-width="80px"
     >
-      <el-row>
+      <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="用户昵称" prop="nickname">
-            <el-input v-model="formData.nickname" placeholder="请输入用户昵称" />
+          <el-form-item label="用户姓名" prop="nickname">
+            <el-input v-model="formData.nickname" placeholder="请输入用户姓名" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -22,7 +22,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
+      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="归属部门" prop="deptId">
             <el-tree-select
@@ -55,7 +55,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
+      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="手机号码" prop="mobile">
             <el-input v-model="formData.mobile" maxlength="11" placeholder="请输入手机号码" />
@@ -67,10 +67,10 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
+      <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item v-if="formData.id === undefined" label="用户名称" prop="username">
-            <el-input v-model="formData.username" placeholder="请输入用户名称" />
+          <el-form-item v-if="formData.id === undefined" label="登录账号" prop="username">
+            <el-input v-model="formData.username" placeholder="请输入登录账号" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -93,12 +93,11 @@
               format="YYYY-MM-DD"
               value-format="YYYY-MM-DD"
               placeholder="选择日期时间"
-              style="width: 100%"
             />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
+      <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="备注">
             <el-input v-model="formData.remark" placeholder="请输入内容" type="textarea" />
@@ -143,8 +142,8 @@ const formData = ref({
   hireDate: ''
 })
 const formRules = ref<any>({
-  username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
-  nickname: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
+  username: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }],
+  nickname: [{ required: true, message: '用户姓名不能为空', trigger: 'blur' }],
   password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
   email: [
     {
@@ -153,13 +152,7 @@ const formRules = ref<any>({
       trigger: ['blur', 'change']
     }
   ],
-  mobile: [
-    {
-      pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
-      message: '请输入正确的手机号码',
-      trigger: 'blur'
-    }
-  ]
+  mobile: [{ required: true, message: '手机号不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 const deptList = ref<Tree[]>([]) // 树形结构

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="username">
+        <el-form-item label="登录账号" prop="username">
           <el-input
             v-model="queryParams.username"
-            placeholder="请输入用户名称"
+            placeholder="请输入登录账号"
             clearable
             @keyup.enter="handleQuery"
             class="!w-240px"
@@ -40,8 +40,8 @@
       </el-form>
       <el-table v-loading="loading" :data="list">
         <el-table-column label="用户编号" key="id" prop="id" />
-        <el-table-column label="用户名称" prop="username" />
-        <el-table-column label="用户昵称" prop="nickname" />
+        <el-table-column label="登录账号" prop="username" />
+        <el-table-column label="用户姓名" prop="nickname" />
         <el-table-column label="部门" key="deptName" prop="deptName" />
         <el-table-column label="手机号码" prop="mobile" width="120" />
         <el-table-column label="状态" key="status">

src/views/Basic/dict/DictTypeForm.vue

@@ -86,7 +86,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   // 校验表单
-  if (!formRef) return
+  if (!formRef.value) return
   const valid = await formRef.value.validate()
   if (!valid) return
   // 提交请求

src/views/Basic/dict/data/DictDataForm.vue

@@ -141,7 +141,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   // 校验表单
-  if (!formRef) return
+  if (!formRef.value) return
   const valid = await formRef.value.validate()
   if (!valid) return
   // 提交请求

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

@@ -0,0 +1,248 @@
+<template>
+  <div>
+    <el-form :model="searchForm" label-width="0" inline>
+      <el-form-item>
+        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
+      </el-form-item>
+      <el-form-item>
+        <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>
+        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
+          <el-option
+            v-for="item in userOptions"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.dealDate"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          range-separator="-"
+          start-placeholder="成交日期"
+          end-placeholder="成交日期"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.applyUser" placeholder="申请人" clearable filterable>
+          <el-option
+            v-for="item in userOptions"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.applyTime"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          range-separator="-"
+          start-placeholder="申请日期"
+          end-placeholder="申请日期"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+        <el-button @click="batchAudit">批量审核</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      v-loading="loading"
+      :data="tableList"
+      border
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" :selectable="(row) => row.state == 1" />
+      <el-table-column prop="signId" label="成交单号" min-width="150px" />
+      <el-table-column prop="name" label="线索名称" min-width="200px" />
+      <el-table-column prop="phone" label="联系方式" min-width="150px" />
+      <el-table-column prop="reason" label="售后原因" min-width="150px" />
+      <el-table-column prop="refundAmount" label="退款金额" min-width="90px" />
+      <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" />
+      <el-table-column
+        prop="dealDate"
+        label="成交日期"
+        min-width="120px"
+        :formatter="dateFormatter"
+      />
+      <el-table-column prop="applyUserName" label="申请人" min-width="90px" />
+      <el-table-column
+        prop="applyTime"
+        label="申请时间"
+        min-width="120px"
+        :formatter="dateFormatter"
+      />
+      <el-table-column prop="stateName" label="审核状态" fixed="right" min-width="90px" />
+      <el-table-column label="操作" width="150px" fixed="right">
+        <template #default="{ row }">
+          <el-button type="primary" style="padding: 0" text @click="handleDetail(row.id)">
+            详情
+          </el-button>
+          <el-button
+            type="primary"
+            style="padding: 0"
+            text
+            v-if="row.state == 1 && currentUserId == row.applyUser"
+            v-hasPermi="['clue:order:after-sale']"
+            @click="handleCancel(row.id)"
+          >
+            撤销
+          </el-button>
+          <el-button
+            type="primary"
+            style="padding: 0"
+            text
+            v-if="row.state == 1"
+            v-hasPermi="['clue:order:after-sale-audit']"
+            @click="handleAudit(row)"
+          >
+            审核
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination
+      v-model:limit="searchForm.pageSize"
+      v-model:page="searchForm.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+    <DialogAfterSaleAudit ref="afterSaleAuditDialog" @success="getList" />
+    <DialogAfterSaleDetail ref="afterSaleDetailDialog" />
+    <DialogBatchAudit ref="batchAuditDialog" @success="getList" />
+  </div>
+</template>
+
+<script setup name="AfterSales">
+import * as AfterSaleApi from '@/api/clue/afterSale'
+import { getSimpleUserList as getUserOption } from '@/api/system/user'
+import { useUserStore } from '@/store/modules/user'
+
+import DialogAfterSaleAudit from './DialogAfterSaleAudit.vue'
+import DialogAfterSaleDetail from './DialogAfterSaleDetail.vue'
+import DialogBatchAudit from './DialogBatchAudit.vue'
+
+import { dateFormatter } from '@/utils/formatTime'
+
+const afterSaleAuditDialog = ref()
+
+const userStore = useUserStore()
+const message = useMessage() // 消息弹窗
+
+const currentUserId = userStore.getUser.id
+
+const searchForm = ref({
+  signId: undefined,
+  name: undefined,
+  dealDate: [],
+  state: undefined,
+  dealUser: undefined,
+  createDate: [],
+  createUser: undefined,
+  pageNo: 1,
+  pageSize: 20
+})
+
+const userOptions = ref([])
+
+const tableList = ref([])
+const total = ref(0)
+
+function handleSearch() {
+  searchForm.value.pageNo = 1
+  getList()
+}
+
+function handleReset() {
+  searchForm.value = {
+    signId: undefined,
+    name: undefined,
+    state: undefined,
+    dealDate: [],
+    dealUser: undefined,
+    createDate: [],
+    createUser: undefined,
+    pageNo: 1,
+    pageSize: 20
+  }
+}
+
+const loading = ref(false)
+async function getList() {
+  loading.value = true
+  try {
+    const data = await AfterSaleApi.getAfterSalePage(searchForm.value)
+    tableList.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+const batchIds = ref([])
+function handleSelectionChange(val) {
+  batchIds.value = val.map((it) => it.id)
+}
+
+const batchAuditDialog = ref()
+function batchAudit() {
+  if (batchIds.value.length) {
+    batchAuditDialog.value.open('aftersale', batchIds.value)
+  } else {
+    message.info('请选择表格中需要审核的数据')
+  }
+}
+
+const afterSaleDetailDialog = ref()
+function handleDetail(id) {
+  afterSaleDetailDialog.value.open(id)
+}
+async function handleCancel(id) {
+  try {
+    // 删除的二次确认
+    await message.confirm('是否确认撤销申请？')
+    // 发起删除
+    await AfterSaleApi.cancelApplyAfterSale({ id })
+    message.success('撤销成功！')
+    // 刷新列表
+    await getList()
+  } catch (err) {
+    console.log(err)
+  }
+}
+function handleAudit(row) {
+  afterSaleAuditDialog.value.open(row)
+}
+
+function getOptions() {
+  getUserOption().then((data) => {
+    userOptions.value = data
+  })
+}
+onMounted(() => {
+  getOptions()
+  handleSearch()
+})
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -0,0 +1,194 @@
+<template>
+  <div>
+    <el-form :model="searchForm" label-width="0" inline>
+      <el-form-item>
+        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
+          <el-option
+            v-for="item in userOptions"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.dealDate"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          range-separator="-"
+          start-placeholder="成交日期"
+          end-placeholder="成交日期"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-select
+          v-model="searchForm.productId"
+          placeholder="选择成交产品"
+          filterable
+          clearable
+          @change="searchForm.specsId = undefined"
+        >
+          <el-option
+            v-for="item in prodOptions"
+            :key="item.productId"
+            :label="item.productName"
+            :value="item.productId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-select
+          v-model="searchForm.specsId"
+          placeholder="选择规格"
+          filterable
+          clearable
+          :disabled="!searchForm.productId"
+        >
+          <el-option
+            v-for="item in specsOptions(searchForm.productId)"
+            :key="item.specsId"
+            :label="item.specsName"
+            :value="item.specsId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="tableList" border>
+      <el-table-column prop="signId" label="成交单号" min-width="120px" />
+      <el-table-column prop="name" label="线索名称" min-width="120px" />
+      <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="productName" label="成交产品" min-width="150px" />
+      <el-table-column prop="specsName" label="产品规格" min-width="150px" />
+      <el-table-column prop="signNum" label="销售数量" width="90px" />
+      <el-table-column
+        prop="createTime"
+        label="发货时间"
+        width="120px"
+        :formatter="dateFormatter"
+      />
+      <el-table-column prop="batchNo" label="发货批次" min-width="120px" />
+      <el-table-column prop="warehouseName" label="发货仓库" min-width="120px" />
+      <el-table-column prop="sendNum" label="发货数量" width="90px" />
+      <el-table-column label="发货备注">
+        <template #default="scope">
+          <el-popover
+            placement="top"
+            width="500px"
+            trigger="click"
+            v-if="scope.row.warehouseName && scope.row.remark"
+          >
+            <template #reference>
+              <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+            </template>
+            <div v-dompurify-html="scope.row.remark"></div>
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination
+      v-model:limit="searchForm.pageSize"
+      v-model:page="searchForm.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script setup name="Delivery">
+import { getSimpleUserList as getUserOption } from '@/api/system/user'
+import { getSimpleProductList } from '@/api/mall/product'
+import * as DeliveryApi from '@/api/clue/delivery'
+
+import { dateFormatter } from '@/utils/formatTime'
+// const message = useMessage() // 消息弹窗
+
+const searchForm = ref({
+  signId: undefined,
+  name: undefined,
+  dealDate: [],
+  signUser: undefined,
+  productId: undefined,
+  specsId: undefined,
+  pageNo: 1,
+  pageSize: 20
+})
+
+const userOptions = ref([])
+
+const tableList = ref([])
+const total = ref(0)
+
+function handleSearch() {
+  searchForm.value.pageNo = 1
+  getList()
+}
+
+function handleReset() {
+  searchForm.value = {
+    signId: undefined,
+    name: undefined,
+    dealDate: [],
+    signUser: undefined,
+    productId: undefined,
+    specsId: undefined,
+    pageNo: 1,
+    pageSize: 20
+  }
+}
+
+const loading = ref(false)
+async function getList() {
+  loading.value = true
+  try {
+    const data = await DeliveryApi.getDeliveryPage(searchForm.value)
+    tableList.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+const prodOptions = ref([])
+
+const specsOptions = computed({
+  get() {
+    return (prodId) => {
+      if (prodId) {
+        return prodOptions.value.find((it) => it.productId == prodId).productSpecList
+      }
+      return []
+    }
+  }
+})
+function getOptions() {
+  getUserOption().then((data) => {
+    userOptions.value = data
+  })
+  // 产品
+  getSimpleProductList().then((data) => {
+    prodOptions.value = data
+  })
+}
+
+onMounted(() => {
+  getOptions()
+  handleSearch()
+})
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -0,0 +1,122 @@
+<template>
+  <Dialog title="售后记录" v-model="show" width="800px">
+    <el-table :data="aftersaleList" border stripe>
+      <el-table-column type="index" width="50" />
+      <el-table-column prop="reason" label="售后原因" />
+      <el-table-column prop="refundAmount" label="退款金额" />
+      <el-table-column prop="isReturns" label="是否退货" />
+      <el-table-column prop="applyTime" label="申请日期" width="180px" />
+      <el-table-column prop="stateName" label="审核状态" />
+    </el-table>
+    <el-divider direction="horizontal" />
+
+    <el-button v-show="showAdd" class="mb-10px" type="primary" @click="handleAdd">
+      新增售后
+    </el-button>
+    <el-form v-if="!showAdd" :model="form" ref="formRef" :rules="rules" label-width="80px">
+      <el-form-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>
+      </el-form-item>
+    </el-form>
+  </Dialog>
+</template>
+
+<script setup name="DialogAfterSale">
+import { getAfterSalePage, createAfterSale } from '@/api/clue/afterSale'
+
+const message = useMessage() // 消息弹窗
+
+const show = ref(false)
+const aftersaleList = ref([])
+const orderId = ref('')
+
+function open(signId) {
+  show.value = true
+  orderId.value = signId
+  try {
+    getList()
+  } catch (error) {
+    console.log(error)
+  }
+}
+
+const showAdd = ref(true)
+const form = ref({})
+const rules = {
+  refundAmount: { required: true, message: '回款金额不可为空', trigger: 'blur' },
+  reason: { required: true, message: '售后原因不可为空', trigger: 'blur' },
+  solution: { required: true, message: '解决方案不可为空', trigger: 'blur' }
+}
+
+function getList() {
+  getAfterSalePage({ signId: orderId.value, pageNo: 1, pageSize: 100 }).then((data) => {
+    aftersaleList.value = data.list
+  })
+}
+
+function handleAdd() {
+  showAdd.value = false
+  form.value = {
+    signId: orderId.value,
+    reason: undefined,
+    solution: undefined,
+    refundAmount: undefined,
+    isReturns: false,
+    remark: undefined
+  }
+}
+
+const formRef = ref()
+const formLoading = ref(false)
+async function onSubmit() {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    await createAfterSale(form.value)
+    message.success('申请成功！')
+    getList()
+    showAdd.value = true
+  } finally {
+    formLoading.value = false
+  }
+}
+
+defineExpose({
+  open
+})
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -0,0 +1,137 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
+    <Descriptions :data="orderInfo" :schema="schema" :columns="2" labelWidth="130px" />
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+      <el-form-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>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script name="DialogAfterSaleAudit" setup>
+import { auditAfterSale } from '@/api/clue/afterSale'
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+
+const schema = [
+  {
+    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: 'reason',
+    label: '售后原因',
+    span: 1
+  },
+  {
+    field: 'solution',
+    label: '解决方案',
+    span: 1
+  },
+  {
+    field: 'refundAmount',
+    label: '退款金额',
+    span: 1
+  },
+  {
+    field: 'isReturns',
+    label: '是否退货',
+    span: 1
+  },
+  {
+    field: 'applyUserName',
+    label: '申请人',
+    span: 1
+  },
+  {
+    field: 'applyTime',
+    label: '申请时间',
+    dateFormat: 'YYYY-MM-DD',
+    span: 1
+  },
+  {
+    field: 'remark',
+    label: '备注',
+    span: 2,
+    isEditor: true
+  }
+]
+
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  state: 3,
+  remark: ''
+})
+const formRef = ref() // 表单 Ref
+
+const orderInfo = ref({})
+/** 打开弹窗 */
+const open = async (row) => {
+  dialogVisible.value = true
+  dialogTitle.value = '售后审核'
+  resetForm(row.id)
+  // 修改时，设置数据
+  orderInfo.value = { ...row }
+}
+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 {
+    await auditAfterSale(formData.value)
+    message.success('审核完成！')
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = (signId) => {
+  formData.value = {
+    saleId: signId,
+    state: 3,
+    remark: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>

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

@@ -0,0 +1,137 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="900px">
+    <Descriptions
+      title="申请详情"
+      :data="orderInfo"
+      :schema="applySchema"
+      :columns="2"
+      labelWidth="130px"
+    />
+    <Descriptions
+      title="审核详情"
+      :data="orderInfo"
+      :schema="orderInfo.state == 2 ? cancelSchema : auditSchema"
+      :columns="orderInfo.state == 2 ? 2 : 3"
+      labelWidth="100px"
+    />
+  </Dialog>
+</template>
+<script name="DialogAfterSaleDetail" setup>
+import { getAfterSaleDetail } from '@/api/clue/afterSale'
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+
+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: 'reason',
+    label: '售后原因',
+    span: 1
+  },
+  {
+    field: 'refundAmount',
+    label: '退款金额',
+    span: 1
+  },
+  {
+    field: 'isReturns',
+    label: '是否退货',
+    span: 1
+  },
+  {
+    field: 'solution',
+    label: '解决方案',
+    span: 1
+  },
+  {
+    field: 'applyUserName',
+    label: '申请人',
+    span: 1
+  },
+  {
+    field: 'applyTime',
+    label: '申请时间',
+    dateFormat: 'YYYY-MM-DD',
+    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 (id) => {
+  dialogVisible.value = true
+  dialogTitle.value = '售后申请详情'
+  try {
+    orderInfo.value = await getAfterSaleDetail({ id })
+  } catch (error) {
+    console.log(error)
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>

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

@@ -0,0 +1,87 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
+    <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>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script name="DialogAfterSaleAudit" setup>
+import { batchAuditAfterSale } from '@/api/clue/afterSale'
+import { batchAuditPayment } from '@/api/clue/payment'
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  state: 3,
+  remark: ''
+})
+const formRef = ref() // 表单 Ref
+const formType = ref('aftersale')
+const titleMap = {
+  aftersale: '批量售后审核',
+  feeback: '批量回款审核'
+}
+
+/** 打开弹窗 */
+const open = (type, ids) => {
+  dialogVisible.value = true
+  formType.value = type
+  dialogTitle.value = titleMap[type] || '批量审核'
+  resetForm(ids)
+}
+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 == 'aftersale') {
+      await batchAuditAfterSale(formData.value)
+      message.success('审核完成！')
+    } else if (formType.value == 'feeback') {
+      await batchAuditPayment(formData.value)
+      message.success('审核完成！')
+    } else {
+      return
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = (ids) => {
+  formData.value = {
+    payIds: ids,
+    saleIds: ids,
+    state: 3,
+    remark: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>

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

@@ -0,0 +1,244 @@
+<template>
+  <el-dialog title="发货" v-model="show" width="700px">
+    <el-form :model="form" ref="formRef" :rules="rules" label-width="85px">
+      <el-row :gutter="20">
+        <el-col :span="8" :offset="0">
+          <el-form-item label="待发数量">
+            <span class="font-bold">：{{ form.sendTotalNum }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="16" :offset="0">
+          <el-form-item label="发货方式">
+            <el-radio-group v-model="form.sendType" :disabled="autoAuditPurchase == 'false'">
+              <el-radio :label="1">
+                <Tooltip
+                  message="必须在进销存的“通用配置-常规配置”中，将 ’采购申请自动通过‘ 设置为“是”"
+                />
+                立即采购发货
+              </el-radio>
+              <el-radio :label="2"> 使用库存发货 </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <template v-if="form.sendType == 1">
+        <el-row :gutter="20">
+          <el-col :span="12" :offset="0">
+            <el-form-item label="供应商" prop="supplier">
+              <el-select v-model="form.supplier" placeholder="选择供应商" filterable>
+                <el-option
+                  v-for="item in supplierOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" :offset="0">
+            <el-form-item label="采购数量" prop="num">
+              <el-input-number
+                :min="form.sendTotalNum"
+                v-model="form.num"
+                :controls="false"
+                placeholder="请输入"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12" :offset="0">
+            <el-form-item label="采购单价" prop="unitPrice">
+              <el-input-number
+                :min="0"
+                :controls="false"
+                v-model="form.unitPrice"
+                placeholder="请输入"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" :offset="0">
+            <el-form-item label="存放仓库" prop="warehouseId">
+              <el-select
+                v-model="form.warehouseId"
+                placeholder="请选择"
+                filterable
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in warehouseOptions"
+                  :key="item.warehouseId"
+                  :label="item.warehouseName"
+                  :value="item.warehouseId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </template>
+      <template v-else>
+        <el-table :data="inventoryList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" />
+          <el-table-column prop="batchNo" label="入库批次号" width="150px" />
+          <el-table-column prop="warehouseName" label="存放仓库" width="120px" />
+          <el-table-column prop="price" label="采购价" width="90px" />
+          <el-table-column prop="num" label="剩余库存" width="90px" />
+          <el-table-column label="发货数量">
+            <template #default="{ row }">
+              <el-input-number
+                v-model="row.sendNum"
+                size="small"
+                :min="1"
+                :max="row.num"
+                :controls="false"
+              />
+            </template>
+          </el-table-column>
+        </el-table>
+      </template>
+      <el-form-item label="备注">
+        <Editor v-model:modelValue="form.remark" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span>
+        <el-button @click="show = false">取 消</el-button>
+        <el-button :disabled="formLoading" type="primary" @click="onSubmit">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup name="DialogDelivery">
+import { getSimpleWarehouseList, getRemainInventoryList } from '@/api/mall/warehouse'
+import { createDelivery } from '@/api/clue/delivery'
+import { getConfigList } from '@/api/system/set'
+import { getDictOptions } from '@/utils/dict'
+
+const message = useMessage() // 消息弹窗
+
+const warehouseOptions = ref([])
+const supplierOptions = getDictOptions('erp_supplier')
+function getOptions() {
+  getSimpleWarehouseList().then((data) => {
+    warehouseOptions.value = data
+  })
+}
+
+function getRemainInventory(signProductId) {
+  getRemainInventoryList({ signProductId }).then((data) => {
+    inventoryList.value = data
+  })
+}
+
+const show = ref(false)
+function open(row) {
+  show.value = true
+  resetForm(row)
+  getRemainInventory(row.id)
+}
+defineExpose({
+  open
+})
+
+const form = ref({})
+const rules = ref({
+  supplier: { required: true, message: '供应商不可为空', trigger: 'change' },
+  warehouseId: { required: true, message: '仓库不可为空', trigger: 'change' },
+  num: { required: true, message: '采购数量不可为空', trigger: 'change,blur' },
+  unitPrice: { required: true, message: '采购单价不可为空', trigger: 'change,blur' },
+  warehouseId: { required: true, message: '仓库不可为空', trigger: 'change' }
+})
+function resetForm(row) {
+  form.value = {
+    sendType: 2,
+    sendTotalNum: row.signNum,
+    signProductId: row.id,
+    productId: row.productId,
+    specsId: row.specsId,
+    warehouseId: undefined,
+    supplier: undefined,
+    num: row.signNum,
+    unitPrice: undefined,
+    remark: undefined
+  }
+}
+
+const emit = defineEmits(['success'])
+const formLoading = ref(false)
+const formRef = ref()
+async function onSubmit() {
+  // 校验表单
+  if (!formRef.value) return
+
+  if (form.value.sendType == 1) {
+    const valid = await formRef.value.validate()
+    if (!valid) return
+  } else {
+    if (!deliveryArr.value.length) {
+      message.info('请选择库存发货！')
+      return
+    } else {
+      const deliveryCount = deliveryArr.value.reduce((pre, cur) => pre + cur.sendNum, 0)
+      if (deliveryCount < form.value.sendTotalNum) {
+        message.info('所选发货库存少于待发货数量，请重新选择后再发货！')
+        return
+      } else if (deliveryCount > form.value.sendTotalNum) {
+        message.info('所选发货库存多于待发货数量，请重新选择后再发货！')
+        return
+      }
+    }
+  }
+
+  // 提交请求
+  formLoading.value = true
+  try {
+    let params = {
+      signProductId: form.value.signProductId,
+      sendType: form.value.sendType,
+      remark: form.value.remark
+    }
+    if (params.sendType == 1) {
+      params.purchaseOrder = {
+        productId: form.value.productId,
+        specsId: form.value.specsId,
+        supplier: form.value.supplier,
+        num: form.value.num,
+        unitPrice: form.value.unitPrice,
+        warehouseId: form.value.warehouseId
+      }
+    } else {
+      params.detailList = inventoryList.value
+    }
+
+    await createDelivery(params)
+    message.success('发货成功！')
+    show.value = false
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+const inventoryList = ref([])
+
+const deliveryArr = ref([])
+function handleSelectionChange(val) {
+  deliveryArr.value = val
+}
+
+const autoAuditPurchase = ref('false')
+onMounted(() => {
+  getOptions()
+  getConfigList({ module: 3 }).then((data) => {
+    // 获取所有配置项
+    autoAuditPurchase.value = data.find(
+      (it) => it.configKey == 'purchaseAuditAutoCompleteConfig'
+    ).configValue
+  })
+})
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -0,0 +1,140 @@
+<template>
+  <el-dialog title="额外支出" v-model="show" width="800px">
+    <el-button
+      class="mb-5px"
+      type="primary"
+      size="small"
+      @click="
+        form.extraPay.push({
+          extraPayType: undefined,
+          extraPayMoney: 0,
+          dictType: 'extra_pay_type',
+          editabled: true
+        })
+      "
+    >
+      添加额外支出
+    </el-button>
+    <el-table :data="form.extraPay" border size="small">
+      <el-table-column type="index" width="50" />
+      <el-table-column prop="extraPayType" label="费用类型" width="200px">
+        <template #default="{ row }">
+          <el-select
+            v-if="row.editabled"
+            v-model="row.extraPayType"
+            size="small"
+            placeholder="其他费用类型"
+            filterable
+          >
+            <el-option
+              v-for="item in extraPayOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column prop="extraPayMoney" label="费用金额" width="180px">
+        <template #default="{ row }">
+          <el-input-number
+            v-if="row.editabled"
+            v-model="row.extraPayMoney"
+            size="small"
+            :controls="false"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注">
+        <template #default="{ row }">
+          <el-input v-if="row.editabled" v-model="row.remark" size="small" placeholder="备注信息" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="60px">
+        <template #default="{ row, $index }">
+          <Icon
+            icon="ep:remove-filled"
+            class="text-red-500"
+            v-if="row.editabled"
+            @click="handleRemove('extraPay', $index)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <template #footer>
+      <span>
+        <el-button @click="show = false">取 消</el-button>
+        <el-button :disabled="formLoading" type="primary" @click="onSubmit">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup name="DialogExtraPay">
+import { signAddPay, getSignExtraPayList } from '@/api/clue/sign'
+import { getDictOptions } from '@/utils/dict'
+
+const extraPayOptions = getDictOptions('extra_pay_type')
+const message = useMessage() // 消息弹窗
+
+const show = ref(false)
+function open(id) {
+  show.value = true
+  resetForm(id)
+  getFormList()
+}
+defineExpose({
+  open
+})
+
+const form = ref({})
+function resetForm(id) {
+  form.value = {
+    signId: id,
+    extraPay: []
+  }
+}
+
+function getFormList() {
+  getSignExtraPayList({ id: form.value.signId }).then((data) => {
+    form.value.extraPay = data.map((it) => ({
+      ...it,
+      editabled: false
+    }))
+  })
+}
+
+const formLoading = ref(false)
+async function onSubmit() {
+  // 校验表单
+  if (form.value.extraPay.length) {
+    if (form.value.extraPay.some((it) => !it.extraPayType || it.extraPayMoney == null)) {
+      message.info('请想额外支出信息填写完整！')
+      return
+    }
+  } else {
+    message.info('请添加额外支出')
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const params = {
+      signId: form.value.signId,
+      extraPay: form.value.extraPay.filter((it) => it.editabled)
+    }
+    await signAddPay(params)
+    message.success('添加额外支出成功！')
+    getFormList()
+  } finally {
+    formLoading.value = false
+  }
+}
+
+function handleRemove(type, index) {
+  form.value[type].splice(index, 1)
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -0,0 +1,101 @@
+<template>
+  <Dialog title="回款记录" v-model="show" width="800px">
+    <el-table :data="feebackList" border stripe>
+      <el-table-column type="index" width="50" />
+      <el-table-column prop="money" label="回款金额" />
+      <el-table-column prop="applyTime" label="申请日期" />
+      <el-table-column prop="isPayoff" label="是否结清" />
+      <el-table-column prop="stateName" label="审核状态" />
+    </el-table>
+    <el-divider direction="horizontal" />
+
+    <el-button v-show="showAdd" class="mb-10px" type="primary" @click="handleAdd">
+      新增回款
+    </el-button>
+    <el-form v-if="!showAdd" :model="form" ref="formRef" :rules="rules" label-width="80px">
+      <el-form-item label="回款金额" prop="money">
+        <el-input-number v-model="form.money" :min="0" :controls="false" placeholder="请输入金额" />
+      </el-form-item>
+      <el-form-item label="是否结清" prop="isPayoff">
+        <el-radio-group v-model="form.isPayoff">
+          <el-radio :label="true"> 结清 </el-radio>
+          <el-radio :label="false"> 未结清 </el-radio>
+        </el-radio-group>
+      </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>
+      </el-form-item>
+    </el-form>
+  </Dialog>
+</template>
+
+<script setup name="DialogFeeback">
+import { getPaymentPage, createPayment } from '@/api/clue/payment'
+
+const message = useMessage() // 消息弹窗
+
+const show = ref(false)
+const feebackList = ref([])
+const orderId = ref('')
+
+function open(signId) {
+  show.value = true
+  orderId.value = signId
+  try {
+    getList()
+  } catch (error) {
+    console.log(error)
+  }
+}
+
+const showAdd = ref(true)
+const form = ref({})
+const rules = {
+  money: { required: true, message: '回款金额不可为空', trigger: 'blur' }
+}
+
+function getList() {
+  getPaymentPage({ signId: orderId.value, pageNo: 1, pageSize: 100 }).then((data) => {
+    feebackList.value = data.list
+  })
+}
+
+function handleAdd() {
+  showAdd.value = false
+  form.value = {
+    signId: orderId.value,
+    money: undefined,
+    isPayoff: true,
+    remark: undefined
+  }
+}
+
+const formRef = ref()
+const formLoading = ref(false)
+async function onSubmit() {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    await createPayment(form.value)
+    message.success('申请成功！')
+    getList()
+    showAdd.value = true
+  } finally {
+    formLoading.value = false
+  }
+}
+
+defineExpose({
+  open
+})
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -0,0 +1,127 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
+    <Descriptions :data="orderInfo" :schema="schema" :columns="2" labelWidth="130px" />
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+      <el-form-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>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script name="DialogFeebackAudit" setup>
+import { auditPayment } from '@/api/clue/payment'
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+
+const schema = [
+  {
+    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',
+    span: 1
+  },
+  {
+    field: 'remark',
+    label: '备注',
+    span: 2,
+    isEditor: true
+  }
+]
+
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  state: 3,
+  remark: ''
+})
+const formRef = ref() // 表单 Ref
+
+const orderInfo = ref({})
+/** 打开弹窗 */
+const open = async (row) => {
+  dialogVisible.value = true
+  dialogTitle.value = '回款审核'
+  resetForm(row.id)
+  // 修改时，设置数据
+  orderInfo.value = { ...row }
+}
+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 {
+    await auditPayment(formData.value)
+    message.success('审核完成！')
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = (signId) => {
+  formData.value = {
+    payId: signId,
+    state: 3,
+    remark: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>

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

@@ -0,0 +1,127 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="900px">
+    <Descriptions
+      title="申请详情"
+      :data="orderInfo"
+      :schema="applySchema"
+      :columns="2"
+      labelWidth="130px"
+    />
+    <Descriptions
+      title="审核详情"
+      :data="orderInfo"
+      :schema="orderInfo.state == 2 ? cancelSchema : auditSchema"
+      :columns="orderInfo.state == 2 ? 2 : 3"
+      labelWidth="100px"
+    />
+  </Dialog>
+</template>
+<script name="DialogFeebackDetail" setup>
+import { getPaymentDetail } from '@/api/clue/payment'
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+
+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 (id) => {
+  dialogVisible.value = true
+  dialogTitle.value = '回款申请详情'
+  try {
+    orderInfo.value = await getPaymentDetail({ id })
+  } catch (error) {
+    console.log(error)
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>

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

@@ -0,0 +1,212 @@
+<template>
+  <Dialog title="成交详情" v-model="show" width="800px">
+    <el-tabs v-model="tabName">
+      <el-tab-pane label="线索信息" name="clueInfo">
+        <Descriptions :data="clueInfo" :schema="clueSchema" :columns="2" labelWidth="130px" />
+      </el-tab-pane>
+      <el-tab-pane label="成交信息" name="orderInfo">
+        <Descriptions :data="orderInfo" :schema="orderSchema" :columns="2" labelWidth="130px" />
+        <template v-if="orderInfo.signProducts && orderInfo.signProducts.length">
+          <el-divider direction="horizontal" content-position="left">
+            成交产品<span v-if="prodTotalPrice">，应收：{{ prodTotalPrice }}</span>
+          </el-divider>
+          <el-table :data="orderInfo.signProducts" border stripe>
+            <el-table-column type="index" width="50" />
+            <el-table-column prop="productName" label="成交产品" />
+            <el-table-column prop="specsName" label="产品规格" />
+            <el-table-column prop="signNum" label="成交数量" width="100px" />
+            <el-table-column label="发货状态" prop="sendState" width="100px" />
+            <el-table-column label="发货备注">
+              <template #default="scope">
+                <el-popover
+                  placement="top"
+                  width="500px"
+                  trigger="click"
+                  v-if="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>
+        </template>
+        <el-divider direction="horizontal" content-position="left">
+          其他费用<span v-if="extraTotalPrice">，应收：{{ extraTotalPrice }}</span>
+        </el-divider>
+        <el-table :data="orderInfo.extraPay" border stripe>
+          <el-table-column type="index" width="50" />
+          <el-table-column prop="extraPayType" label="费用项" />
+          <el-table-column prop="extraPayMoney" label="金额" />
+          <el-table-column prop="remark" label="备注" />
+        </el-table>
+        <el-divider
+          v-if="prodTotalPrice + extraTotalPrice"
+          direction="horizontal"
+          content-position="left"
+        >
+          合计应收：{{ prodTotalPrice + extraTotalPrice }}
+        </el-divider>
+        <div v-if="checkPermi(['clue:order:add-fee'])">
+          <el-divider direction="horizontal" content-position="left">
+            额外支出<span v-if="extraPayTotalFee">，合计：{{ extraPayTotalFee }}</span>
+          </el-divider>
+          <el-table :data="extraPayList" border stripe>
+            <el-table-column type="index" width="50" />
+            <el-table-column prop="extraPayType" label="支出项" />
+            <el-table-column prop="extraPayMoney" label="金额" />
+            <el-table-column prop="remark" label="备注" />
+          </el-table>
+        </div>
+      </el-tab-pane>
+      <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="回款金额" />
+          <el-table-column prop="applyTime" label="申请日期" />
+          <el-table-column prop="isPayoff" label="是否结清" />
+          <el-table-column prop="stateName" label="审核状态" />
+        </el-table>
+      </el-tab-pane>
+      <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="售后原因" />
+          <el-table-column prop="refundAmount" label="退款金额" />
+          <el-table-column prop="isReturns" label="是否退货" />
+          <el-table-column prop="applyTime" label="申请日期" width="180px" />
+          <el-table-column prop="stateName" label="审核状态" />
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+    <div class="mb-15px"></div>
+  </Dialog>
+</template>
+
+<script setup name="DialogOrder">
+import * as ClueApi from '@/api/clue'
+import * as OrderApi from '@/api/clue/sign'
+import { getSimpleFieldList as getClueFieldList } from '@/api/clue/clueField'
+import { getSimpleFieldList as getOrderFieldList } from '@/api/clue/orderField'
+import { getPaymentPage } from '@/api/clue/payment'
+import { getAfterSalePage } from '@/api/clue/afterSale'
+
+import { checkPermi } from '@/utils/permission'
+import { formatDate } from '@/utils/formatTime'
+
+const tabName = ref('clueInfo')
+const show = ref(false)
+const clueInfo = ref({})
+const orderInfo = ref({
+  signProducts: [],
+  extraPay: []
+})
+const returnRecordList = ref([])
+const aftersaleList = ref([])
+const extraPayList = ref([])
+
+const prodTotalPrice = computed(() => {
+  return (
+    orderInfo.value.signProducts?.reduce(
+      (pre, cur) => pre + (cur?.price || 0) * (cur?.signNum || 0),
+      0
+    ) || 0
+  )
+})
+
+// 其他费用
+const extraTotalPrice = computed(() => {
+  return orderInfo.value.extraPay.reduce((pre, cur) => pre + cur.extraPayMoney, 0)
+})
+
+// 额外支出
+const extraPayTotalFee = computed(() => {
+  return extraPayList.value.reduce((pre, cur) => pre + cur.extraPayMoney, 0)
+})
+
+function open(clueId, orderId) {
+  try {
+    show.value = true
+    tabName.value = 'clueInfo'
+    getFields()
+    ClueApi.getClue(clueId).then((data) => {
+      clueInfo.value = { ...data, ...data.diyParams }
+    })
+    OrderApi.getSign(orderId).then((data) => {
+      orderInfo.value = { ...data, ...data.diyParams }
+      orderInfo.value.dealDate = formatDate(orderInfo.value.dealDate, 'YYYY-MM-DD HH:mm')
+    })
+    OrderApi.getSignExtraPayList({ id: orderId }).then((data) => {
+      extraPayList.value = data
+    })
+    getPaymentPage({ signId: orderId, pageNo: 1, pageSize: 100 }).then((data) => {
+      returnRecordList.value = data.list
+    })
+    getAfterSalePage({ signId: orderId, pageNo: 1, pageSize: 100 }).then((data) => {
+      aftersaleList.value = data.list
+    })
+  } catch (error) {
+    console.log(error)
+  }
+}
+
+const clueSchema = ref([])
+const orderSchema = ref([])
+function getFields() {
+  getClueFieldList().then((data) => {
+    const arr = useCrudSchemas(data).allSchemas.detailSchema
+
+    arr.forEach((it) => {
+      if (it.label.includes('日期')) {
+        it.dateFormat = 'YYYY-MM-DD'
+      }
+    })
+    if (arr.length % 2 != 0) {
+      arr.push({})
+    }
+    clueSchema.value = [
+      ...arr,
+      {
+        field: 'requirement',
+        label: '诉求',
+        span: 2
+      },
+      {
+        field: 'remark',
+        label: '备注',
+        span: 2,
+        isEditor: true
+      }
+    ]
+  })
+
+  getOrderFieldList().then((data) => {
+    const arr = useCrudSchemas(data).allSchemas.detailSchema
+    arr.forEach((it) => {
+      if (it.label.includes('日期')) {
+        it.dateFormat = 'YYYY-MM-DD'
+      }
+    })
+    if (arr.length % 2 != 0) {
+      arr.push({})
+    }
+    orderSchema.value = [
+      ...arr,
+      {
+        field: 'remark',
+        label: '备注',
+        span: 2,
+        isEditor: true
+      }
+    ]
+  })
+}
+
+defineExpose({
+  open
+})
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -0,0 +1,358 @@
+<template>
+  <div>
+    <!-- 搜索工作栏 -->
+    <div>
+      <el-form
+        :model="searchForm"
+        ref="moreSearchRef"
+        inline
+        label-width="0"
+        style="display: inline"
+      >
+        <el-form-item style="margin-bottom: 10px">
+          <el-select
+            v-model="searchForm.signProduct"
+            placeholder="选择成交产品"
+            filterable
+            clearable
+            @change="searchForm.specsId = undefined"
+          >
+            <el-option
+              v-for="item in prodOptions"
+              :key="item.productId"
+              :label="item.productName"
+              :value="item.productId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item style="margin-bottom: 10px">
+          <el-select
+            v-model="searchForm.specsId"
+            placeholder="选择规格"
+            filterable
+            clearable
+            :disabled="!searchForm.signProduct"
+          >
+            <el-option
+              v-for="item in specsOptions(searchForm.signProduct)"
+              :key="item.specsId"
+              :label="item.specsName"
+              :value="item.specsId"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <Search
+        v-if="!loading"
+        ref="searchRef"
+        :schema="allSchemas.searchSchema"
+        inlineBlock
+        labelWidth="0"
+      >
+        <template #actionMore>
+          <el-button @click="getTableList" v-hasPermi="['clue:order:search']"> 搜索 </el-button>
+          <el-button @click="resetQuery" v-hasPermi="['clue:order:reset']"> 重置 </el-button>
+        </template>
+      </Search>
+    </div>
+    <!-- 列表 -->
+    <SSTable
+      v-if="!loading"
+      class="mt-10px"
+      v-model:tableObject="tableObject"
+      :tableColumns="allSchemas.tableColumns"
+      @get-list="getTableList"
+      @get-checked-columns="getCheckedColumns"
+    >
+      <el-table-column type="expand">
+        <template #default="{ row }">
+          <div class="p-10px flex justify-center">
+            <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>
+      <el-table-column
+        v-for="item in showColumns"
+        :key="item.field"
+        :prop="item.field"
+        :label="item.label"
+        min-width="120px"
+      >
+        <template #default="{ row }">
+          <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>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="240px" fixed="right">
+        <template #default="scope">
+          <el-button
+            type="primary"
+            class="mr-10px"
+            link
+            style="padding: 0; margin-left: 0"
+            v-hasPermi="['clue:order:detail']"
+            @click="handleDetail(scope.row)"
+          >
+            详情
+          </el-button>
+          <el-button
+            type="primary"
+            class="mr-10px"
+            link
+            style="padding: 0; margin-left: 0"
+            v-hasPermi="['clue:order:after-sale']"
+            @click="sellAfter(scope.row)"
+          >
+            售后
+          </el-button>
+          <el-button
+            type="primary"
+            class="mr-10px"
+            link
+            style="padding: 0; margin-left: 0"
+            v-if="scope.row.isPayoff == '未结清'"
+            v-hasPermi="['clue:order:return']"
+            @click="feeBack(scope.row)"
+          >
+            回款
+          </el-button>
+          <el-button
+            type="primary"
+            class="mr-10px"
+            link
+            style="padding: 0; margin-left: 0"
+            v-hasPermi="['clue:order:add-fee']"
+            @click="handleAddFee(scope.row)"
+          >
+            添加支出
+          </el-button>
+          <el-button
+            type="primary"
+            class="mr-10px"
+            link
+            style="padding: 0; margin-left: 0"
+            v-hasPermi="['clue:pool:enroll']"
+            @click="cancelDeal(scope.row)"
+          >
+            取消登记
+          </el-button>
+        </template>
+      </el-table-column>
+    </SSTable>
+
+    <!-- 详情 -->
+    <DialogOrder ref="orderDetailDialog" />
+    <DialogFeeback ref="feedbackDialog" />
+    <DialogAfterSale ref="afterSaleDialog" />
+    <DialogExtraFee ref="extraFeeDialog" />
+    <DialogDelivery ref="deliveryDialog" @success="getTableList" />
+  </div>
+</template>
+
+<script setup name="ClueOrderList">
+import { getSimpleFieldList } from '@/api/clue/orderField'
+import * as SignApi from '@/api/clue/sign'
+import { getSimpleUserList as getUserOption } from '@/api/system/user'
+import { getSimpleProductList } from '@/api/mall/product'
+
+import DialogOrder from './DialogOrder.vue'
+import DialogFeeback from './DialogFeeback.vue'
+import DialogAfterSale from './DialogAfterSale.vue'
+import DialogExtraFee from './DialogExtraPay.vue'
+import DialogDelivery from './DialogDelivery.vue'
+
+import { removeNullField } from '@/utils'
+import { formatDate } from '@/utils/formatTime'
+
+const userOptions = ref([])
+onMounted(() => {
+  getUserOption().then((data) => {
+    userOptions.value = data
+    getCurdSchemas()
+  })
+  getOptions()
+})
+
+const message = useMessage() // 消息弹窗
+
+const allSchemas = ref({})
+
+const orderDetailDialog = ref()
+const searchRef = ref()
+const prodOptions = ref([])
+
+const specsOptions = computed({
+  get() {
+    return (prodId) => {
+      if (prodId) {
+        return prodOptions.value.find((it) => it.productId == prodId).productSpecList
+      }
+      return []
+    }
+  }
+})
+
+const searchForm = ref({
+  signProduct: undefined
+})
+
+const tableObject = ref({
+  tableList: [],
+  loading: false,
+  total: 1,
+  pageSize: 20,
+  pageNo: 1
+})
+
+function resetQuery() {
+  searchForm.value = {
+    signProduct: undefined
+  }
+  searchRef.value.reset()
+  tableObject.value.pageNo = 1
+  getTableList()
+}
+// 查询
+async function getTableList() {
+  // 查询
+  tableObject.value.loading = true
+  try {
+    const queryParams = await searchRef.value.getFormModel()
+    const params = {
+      ...queryParams,
+      ...searchForm.value,
+      pageNo: tableObject.value.pageNo,
+      pageSize: tableObject.value.pageSize
+    }
+    const data = await SignApi.getSignPage(removeNullField(params))
+    tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams }))
+    tableObject.value.total = data.total
+  } finally {
+    tableObject.value.loading = false
+  }
+}
+
+const loading = ref(true)
+async function getCurdSchemas() {
+  loading.value = true
+  try {
+    const data = await getSimpleFieldList()
+    data.forEach((elem) => {
+      if (elem.field == 'createUser') {
+        elem.search.options = userOptions.value
+      }
+    })
+    allSchemas.value = useCrudSchemas(data).allSchemas
+  } finally {
+    loading.value = false
+    nextTick(() => {
+      getTableList()
+    })
+  }
+}
+
+const showColumns = ref([])
+
+// 初始化表格
+function getCheckedColumns(list) {
+  showColumns.value = list && list.length ? list : allSchemas.value.tableColumns
+}
+
+// 详情
+function handleDetail(row) {
+  orderDetailDialog.value.open(row.clueId, row.signId)
+}
+
+const feedbackDialog = ref()
+const afterSaleDialog = ref()
+// 售后
+function sellAfter(row) {
+  afterSaleDialog.value.open(row.signId)
+}
+
+// 回款
+function feeBack(row) {
+  feedbackDialog.value.open(row.signId)
+}
+
+// 取消登记
+async function cancelDeal(row) {
+  try {
+    // 二次确认
+    await message.confirm('是否确认取消登记该线索？')
+    // 发起删除
+    await SignApi.cancelDeal(row.signId)
+    message.success('取消登记成功！')
+    // 刷新列表
+    await getTableList()
+  } catch (err) {
+    console.log(err)
+  }
+}
+
+const extraFeeDialog = ref()
+function handleAddFee(row) {
+  extraFeeDialog.value.open(row.signId)
+}
+
+function getOptions() {
+  // 产品
+  getSimpleProductList().then((data) => {
+    prodOptions.value = data
+  })
+}
+const deliveryDialog = ref()
+function handleDelivery(row) {
+  deliveryDialog.value.open(row)
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -0,0 +1,335 @@
+<template>
+  <div>
+    <el-form :model="searchForm" label-width="0" inline>
+      <el-form-item>
+        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="searchForm.phone" placeholder="联系方式" clearable />
+      </el-form-item>
+      <el-form-item>
+        <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>
+          <el-option
+            v-for="item in userOptions"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.dealDate"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          range-separator="-"
+          start-placeholder="成交日期"
+          end-placeholder="成交日期"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-select
+          v-model="searchForm.signProduct"
+          placeholder="选择成交产品"
+          filterable
+          clearable
+          @change="searchForm.signSpecs = undefined"
+        >
+          <el-option
+            v-for="item in prodOptions"
+            :key="item.productId"
+            :label="item.productName"
+            :value="item.productId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-select
+          v-model="searchForm.signSpecs"
+          placeholder="选择规格"
+          filterable
+          clearable
+          :disabled="!searchForm.signProduct"
+        >
+          <el-option
+            v-for="item in specsOptions(searchForm.signProduct)"
+            :key="item.specsId"
+            :label="item.specsName"
+            :value="item.specsId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.supplier" placeholder="选择供应商" filterable clearable>
+          <el-option
+            v-for="item in supplierOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-radio-group v-model="searchForm.settlementState">
+          <el-radio :label="1"> 已结算 </el-radio>
+          <el-radio :label="0"> 待结算 </el-radio>
+        </el-radio-group>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+        <el-button @click="batchSettle">批量结算</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      v-loading="loading"
+      :data="tableList"
+      border
+      show-summary
+      :summary-method="getSummaries"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        type="selection"
+        width="60"
+        fixed="left"
+        :selectable="(row) => row.settlementState == '待结算'"
+      />
+      <el-table-column prop="signId" label="成交单号" min-width="120px" />
+      <el-table-column prop="name" label="线索名称" min-width="120px" />
+      <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="signProduct" label="成交产品" min-width="150px" />
+      <el-table-column prop="signSpecs" label="成交规格" min-width="150px" />
+      <el-table-column prop="supplier" label="供应商" min-width="150px" />
+      <el-table-column prop="settlementPrice" label="结算单价" min-width="150px" />
+      <el-table-column prop="settlementNum" label="结算数量" min-width="150px" />
+      <el-table-column prop="settlementMoney" label="结算金额" min-width="150px" />
+      <el-table-column label="费用备注" width="90px">
+        <template #default="scope">
+          <el-popover placement="top" width="500px" trigger="click" v-if="scope.row.extraRemark">
+            <template #reference>
+              <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+            </template>
+            <div v-dompurify-html="scope.row.extraRemark"></div>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="settlementDate"
+        label="结算时间"
+        width="120px"
+        :formatter="dateFormatter"
+      />
+      <el-table-column prop="settlementUserName" label="结算人" min-width="90px" />
+      <el-table-column prop="settlementType" label="结算类型" width="90px" fixed="right" />
+      <el-table-column prop="settlementState" label="结算状态" width="90px" fixed="right" />
+      <el-table-column label="结算备注" width="90px">
+        <template #default="scope">
+          <el-popover placement="top" width="500px" trigger="click" v-if="scope.row.remark">
+            <template #reference>
+              <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+            </template>
+            <div v-dompurify-html="scope.row.remark"></div>
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination
+      v-model:limit="searchForm.pageSize"
+      v-model:page="searchForm.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+    <el-dialog title="批量结算" v-model="showDailog" width="600px">
+      <el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
+        <el-form-item label="结算金额">
+          {{ settleAmount }}
+        </el-form-item>
+        <el-form-item label="结算备注" prop="remark">
+          <Editor v-model:modelValue="form.remark" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span>
+          <el-button @click="showDailog = false">取 消</el-button>
+          <el-button :disabled="formLoading" type="primary" @click="handleSaveSettle">
+            确 定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="MallSettle">
+import { getSimpleUserList as getUserOption } from '@/api/system/user'
+import { getSimpleProductList } from '@/api/mall/product'
+import * as SettleApi from '@/api/clue/settle'
+
+import { getDictOptions } from '@/utils/dict'
+import { removeNullField } from '@/utils/index'
+import { dateFormatter } from '@/utils/formatTime'
+
+const message = useMessage() // 消息弹窗
+
+onMounted(() => {
+  getOptions()
+  handleSearch()
+})
+
+const searchForm = ref({
+  name: undefined,
+  phone: undefined,
+  signUser: undefined,
+  dealDate: [],
+  signProduct: undefined,
+  signSpecs: undefined,
+  signId: undefined,
+  settlementState: 0,
+  settlementType: undefined,
+  supplier: undefined,
+  pageSize: 20,
+  pageNo: 1
+})
+
+function handleReset() {
+  searchForm.value = {
+    name: undefined,
+    phone: undefined,
+    signUser: undefined,
+    dealDate: [],
+    signProduct: undefined,
+    signSpecs: undefined,
+    signId: undefined,
+    settlementState: 0,
+    settlementType: undefined,
+    supplier: undefined,
+    pageSize: 20,
+    pageNo: 1
+  }
+}
+
+function handleSearch() {
+  searchForm.value.pageNo = 1
+  getList()
+}
+
+const loading = ref(false)
+const tableList = ref([])
+const total = ref(0)
+const totalNum = ref(0)
+const totalAmount = ref(0)
+async function getList() {
+  loading.value = true
+  try {
+    const data = await SettleApi.getMallSettlePage(removeNullField(searchForm.value))
+    tableList.value = data.list
+    total.value = data.total
+    totalNum.value = data.totalNum
+    totalAmount.value = data.totalAmount
+  } finally {
+    loading.value = false
+  }
+}
+
+function getSummaries(param) {
+  const { columns } = param
+  const sums = []
+  columns.forEach((column, index) => {
+    if (index === 0) {
+      sums[index] = '合计'
+    } else if (column.property == 'settlementNum') {
+      sums[index] = totalNum.value
+    } else if (column.property == 'settlementMoney') {
+      sums[index] = totalAmount.value
+    } else {
+      sums[index] = ''
+    }
+  })
+
+  return sums
+}
+
+const selectList = ref([])
+function handleSelectionChange(val) {
+  selectList.value = [...val]
+}
+
+const showDailog = ref(false)
+const form = ref({})
+const formRef = ref()
+const formLoading = ref(false)
+const rules = {
+  remark: { required: true, message: '结算备注不可为空', trigger: 'change,blur' }
+}
+
+const settleAmount = ref(0)
+function batchSettle() {
+  if (selectList.value.length) {
+    showDailog.value = true
+    form.value = {
+      settlementIds: selectList.value.map((it) => it.settlementId),
+      reamrk: undefined
+    }
+    settleAmount.value = selectList.value.reduce((pre, cur) => pre + cur.settlementMoney, 0)
+  } else {
+    message.info('请选择表格数据！')
+  }
+}
+
+async function handleSaveSettle() {
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  try {
+    formLoading.value = true
+    await SettleApi.batchSaveSettle(form.value)
+    message.success('结算成功')
+    showDailog.value = false
+    getList()
+  } finally {
+    formLoading.value = false
+  }
+}
+
+const userOptions = ref([])
+const prodOptions = ref([])
+const supplierOptions = getDictOptions('erp_supplier')
+
+function getOptions() {
+  // 产品
+  getSimpleProductList().then((data) => {
+    prodOptions.value = data
+  })
+  getUserOption().then((data) => {
+    userOptions.value = data
+  })
+}
+
+const specsOptions = computed({
+  get() {
+    return (prodId) => {
+      if (prodId) {
+        return prodOptions.value.find((it) => it.productId == prodId).productSpecList
+      }
+      return []
+    }
+  }
+})
+</script>
+
+<style lang="scss" scoped></style>