Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-crm-manage-web into dev-cl

# Conflicts:
#	.env.base

.env.base

@@ -4,15 +4,15 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
+VITE_BASE_URL='http://localhost:48080'
 # VITE_BASE_URL='http://47.98.161.246:48080'
 #VITE_BASE_URL='http://114.215.207.150:48080'
-VITE_BASE_URL='http://localhost:48080'
 
 # 高德地图key密钥
 # 1寻驾
-# VITE_AMAP_KEY=ec6b7ebe38f7ff27126f7088d87a9091
+VITE_AMAP_KEY=ec6b7ebe38f7ff27126f7088d87a9091
 # 2莳松
-VITE_AMAP_KEY=9233a9d4ffe95fb335e70834503460fa
+# VITE_AMAP_KEY=9233a9d4ffe95fb335e70834503460fa
 
 # 小程序接口请求路劲
 VITE_APPLET_URL='https://cloud.ahduima.com'

.env.front

@@ -4,7 +4,8 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://47.98.161.246:48080'
+#VITE_BASE_URL='http://47.98.161.246:48080'
+VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'

.env.pro

@@ -7,9 +7,9 @@ VITE_DEV=false
 VITE_BASE_URL='/crm-api'
 # 高德地图key密钥
 # 1寻驾
-# VITE_AMAP_KEY=ec6b7ebe38f7ff27126f7088d87a9091
+VITE_AMAP_KEY=ec6b7ebe38f7ff27126f7088d87a9091
 # 2莳松
-VITE_AMAP_KEY=9233a9d4ffe95fb335e70834503460fa
+# VITE_AMAP_KEY=9233a9d4ffe95fb335e70834503460fa
 
 # 上传路径
 VITE_UPLOAD_URL='/crm-api/admin-api/system/file/upload'

.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-    "i18n-ally.localesPaths": [
-        "src/locales"
-    ]
-}

index.html

@@ -142,8 +142,8 @@
     <script type="text/javascript">
       window._AMapSecurityConfig = {
         // securityJsCode: 'f653df5a2c5f44ae68faaab6f6a6b8ab' // 你的密钥
-        // securityJsCode: '420463f2f8c849ab78b9d29548aff7d3' // 寻驾密钥
+        securityJsCode: '420463f2f8c849ab78b9d29548aff7d3' // 寻驾密钥
-        securityJsCode: 'ab6bcce5d153c4e5353b40e5b0ce6fee' // 莳松密钥
+        // securityJsCode: 'ab6bcce5d153c4e5353b40e5b0ce6fee' // 莳松密钥
       }
     </script>
   </body>

package.json

@@ -54,7 +54,6 @@
     "echarts-wordcloud": "^2.1.0",
     "element-plus": "2.9.4",
     "fast-xml-parser": "^4.2.2",
-    "file-saver": "^2.0.5",
     "highlight.js": "^11.8.0",
     "intro.js": "^7.0.1",
     "jsencrypt": "^3.3.2",
@@ -67,7 +66,7 @@
     "qs": "^6.11.2",
     "steady-xml": "^0.1.0",
     "url": "^0.11.0",
-    "video.js": "^7.0.0",
+    "video.js": "^8.3.0",
     "vue": "3.3.4",
     "vue-amap": "^0.5.10",
     "vue-dompurify-html": "^5.0.1",
@@ -79,7 +78,6 @@
     "vuedraggable": "^4.1.0",
     "web-storage-cache": "^1.1.1",
     "xe-utils": "^3.5.7",
-    "xlsx": "^0.18.5",
     "xml-js": "^1.6.11"
   },
   "devDependencies": {
@@ -115,7 +113,7 @@
     "prettier": "^2.8.8",
     "rimraf": "^5.0.1",
     "rollup": "^3.22.0",
-    "sass": "1.75.0",
+    "sass": "^1.62.1",
     "stylelint": "^15.6.2",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recommended": "^12.0.0",
@@ -126,7 +124,7 @@
     "unplugin-auto-import": "^0.16.0",
     "unplugin-element-plus": "^0.7.1",
     "unplugin-vue-components": "^0.24.1",
-    "vite": "^5.4.21",
+    "vite": "4.3.8",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-ejs": "^1.6.4",
     "vite-plugin-eslint": "^1.8.1",

src/api/clue/afterSale.js

@@ -37,12 +37,3 @@ export const cancelApplyAfterSale = async (data) => {
 export const getAfterSaleDetail = async (params) => {
   return await request.get({ url: '/admin-api/crm/sign-after-sale/get', params })
 }
-
-// 导入
-export const importAfterSales = async (data) => {
-  return await request.upload({ url: '/admin-api/crm/sign-after-sale/importAfterSales', data })
-}
-
-export const getAfterSalesTemplate = async () => {
-  return await request.get({ url: '/admin-api/crm/sign-after-sale/get-import-template' })
-}

src/api/clue/clueRemark.js

@@ -1,50 +0,0 @@
-import request from '@/config/axios'
-
-// 获得微信群列表
-export const getWxGroupPage = (params) => {
-  return request.get({ url: '/admin-api/crm/wxgroup/page', params })
-}
-
-// 创建微信群
-export const createWxGroup = (data) => {
-  return request.post({ url: '/admin-api/crm/wxgroup/create', data, isSubmitForm: true })
-}
-
-// 更新微信群
-export const updateWxGroup = (data) => {
-  return request.put({ url: '/admin-api/crm/wxgroup/update', data })
-}
-
-// 删除微信群
-export const deleteWxGroup = (id) => {
-  return request.delete({ url: `/admin-api/crm/wxgroup?groupId=${id}` })
-}
-
-export const getWxGroupSimpleList = async () => {
-  return await request.get({ url: '/admin-api/crm/wxgroup/simple-list' })
-}
-
-// 报备
-export const reportClue = (data) => {
-  return request.post({ url: '/admin-api/crm/clue-remark/remark/save', data })
-}
-
-// 接待提交报名信息
-export const registerClue = (data) => {
-  return request.post({ url: '/admin-api/crm/clue-remark/sign/save', data })
-}
-
-// 分页查询报备信息
-export const getClueRemarkPage = (data) => {
-  return request.post({ url: '/admin-api/crm/clue-remark/page', data })
-}
-
-// 区域查询报备信息
-export const getClueRemarkByRemarkId = (params) => {
-  return request.get({ url: `/admin-api/crm/clue-remark/sign/get`, params })
-}
-
-// 销售查询报备信息
-export const getClueRemarkByClueId = (params) => {
-  return request.get({ url: `/admin-api/crm/clue-remark/remark/get`, params })
-}

src/api/clue/index.js

@@ -62,12 +62,3 @@ export const getFollowUserList = async (params) => {
 export const batchUpdateFollowUser = async (data) => {
   return await request.put({ url: '/admin-api/crm/sch-clue/batchUpdateFollowUser', data })
 }
-
-// 自动分配线索新增
-export const clueInput = async (data) => {
-  return await request.post({
-    url: '/out-api/out/clue/importClue/',
-    data,
-    isSubmitForm: true
-  })
-}

src/api/clue/sign.js

@@ -61,13 +61,3 @@ export const addOrderProduct = (data) => {
 export const removeOrderProduct = (id) => {
   return request.delete({ url: '/admin-api/crm/sign-prodcut/delete?id=' + id })
 }
-
-// 查询订单商品
-export const getOrderProductList = (params) => {
-  return request.get({ url: '/admin-api/crm/sign-prodcut/list', params })
-}
-
-//
-export const createSignOnRemark = (data) => {
-  return request.post({ url: '/admin-api/crm/sign/xj-create', data })
-}

src/components/DictTag/src/DictTag.vue

@@ -50,7 +50,7 @@ export default defineComponent({
           }
           disableTransitions={true}
         >
-          {dictData.value?.label || '未知'}
+          {dictData.value?.label}
         </ElTag>
       )
     }

src/components/SSTable/index.vue

@@ -5,8 +5,6 @@
         :data="tableObject.tableList"
         :row-key="rowkey"
         :expand-row-keys="expandRowKeys"
-        :show-summary="showSummary"
-        :summary-method="summaryMethod"
         border
         style="flex: 1"
         @selection-change="handleSelectionChange"
@@ -64,9 +62,7 @@ const props = defineProps({
   tableObject: { type: Object, default: () => ({ tableList: [] }) },
   tableColumns: { type: Array, default: () => [] },
   rowkey: { type: String, default: 'id' },
-  expandRowKeys: { type: Array, default: () => [] },
+  expandRowKeys: { type: Array, default: () => [] }
-  showSummary: { type: Boolean, default: false },
-  summaryMethod: { type: Function, default: null }
 })
 
 const emit = defineEmits(['update:tableObject', 'getList', 'getCheckedColumns', 'selection-change'])

src/config/axios/service.ts

@@ -49,9 +49,6 @@ const service: AxiosInstance = axios.create({
 // request拦截器
 service.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
-    if (config.url?.startsWith('/out-api')) {
-      config.baseURL = ''
-    }
     // 是否需要设置 token
     let isToken = (config!.headers || {}).isToken === false
     whiteList.some((v) => {

src/permission.js

@@ -9,7 +9,6 @@ import { useUserStoreWithOut } from '@/store/modules/user'
 import { usePermissionStoreWithOut } from '@/store/modules/permission'
 import { useAppStoreWithOut } from '@/store/modules/app'
 import { getTenantId, getAppId, setTenantId, setAppId } from '@/utils/auth'
-import { checkPermi } from '@/utils/permission'
 
 const { start, done } = useNProgress()
 
@@ -24,7 +23,6 @@ const whiteList = [
   '/bind',
   '/register',
   '/swagger'
-  // '/crm/'
 ]
 
 // 路由加载前
@@ -42,13 +40,6 @@ router.beforeEach(async (to, from, next) => {
         await waitTime(1500)
       }
       next({ path: '/' })
-    } else if (to.name == 'ReceiveInput') {
-      if (!checkPermi(['clue:remark:receive-input'])) {
-        next({ path: '/403', replace: true, query: { noGoBack: true } })
-        return
-      } else {
-        next()
-      }
     } else {
       // 获取所有字典
       const dictStore = useDictStoreWithOut()
@@ -82,8 +73,8 @@ router.beforeEach(async (to, from, next) => {
       if (tenantId && appId) {
         next(`/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
       } else {
-        // next(`/login?redirect=${to.fullPath}`) // 使用内部路由重定向到登录页
+        // next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-        window.location.href = 'https://cloud.ahduima.com/ss/login'  // 已注释：避免外部跳转
+        window.location.href = 'https://cloud.ahduima.com/ss/login'
       }
     }
   }

src/router/modules/remaining.ts

@@ -59,8 +59,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       title: '首页',
       hidden: true
     }
-    // ,
+    // ,children: [
-    // children: [
     //   {
     //     path: '/index',
     //     component: () => import('@/views/Basic/Menu/index.vue'),
@@ -165,38 +164,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
   //     }
   //   ]
   // },
-  {
-    path: '/clue-add',
-    name: 'ClueAdd',
-    component: () => import('@/views/Clue/Pool/ClueAdd.vue'),
-    meta: {
-      title: '线索录入',
-      hidden: true,
-      noTagsView: true
-    }
-  },
-  {
-    path: '/receive-input/:id',
-    name: 'ReceiveInput',
-    component: () => import('@/views/Clue/ReceiveInput/index.vue'),
-    meta: {
-      title: '接待信息录入',
-      hidden: true,
-      noTagsView: true,
-      permission: 'clue:receiveInput:index'
-    }
-  },
-  {
-    path: '/clue-enroll/:id',
-    name: 'ClueEnroll',
-    component: () => import('@/views/Clue/Pool/ClueEnroll.vue'),
-    meta: {
-      title: '学员报名登记',
-      hidden: true,
-      noTagsView: true,
-      permission: 'clue:pool:enroll'
-    }
-  },
   {
     path: '/login',
     component: () => import('@/views/Login/Login.vue'),

src/utils/index.ts

@@ -247,56 +247,3 @@ export const exportTableWithVue = (domId: any, fileName: String) => {
   return wbout
   // });
 }
-
-/**
- * 数组数据导出为 Excel
- * @param {Array} data 要导出的数组数据（对象数组，如 [{name: '张三', age: 18}, ...]）
- * @param {String} fileName 导出的文件名（不含 .xlsx 后缀）
- * @param {Array} header 自定义表头映射（可选，格式：[{key: 'name', title: '姓名'}, ...]）
- *                       若不传入，默认使用数据对象的 key 作为表头
- */
-export const exportArrayToExcel = function (data: any[], fileName: String, header: any) {
-  // 处理表头映射
-  const worksheetData = []
-  let headerKeys = [] // 数据对象的 key 集合
-  let headerTitles = [] // 表头显示文本
-
-  if (header && header.length > 0) {
-    // 使用自定义表头
-    headerKeys = header.map((item) => item.key)
-    headerTitles = header.map((item) => item.title)
-    worksheetData.push(headerTitles) // 加入表头行
-  } else {
-    // 自动生成表头（使用数据中第一个对象的 key）
-    if (data.length === 0) {
-      console.warn('导出数据为空')
-      return
-    }
-    headerKeys = Object.keys(data[0])
-    headerTitles = headerKeys // 表头默认用 key
-    worksheetData.push(headerTitles) // 加入表头行
-  }
-
-  // 处理数据行（按表头 key 顺序提取数据）
-  data.forEach((item) => {
-    const row = headerKeys.map((key) => {
-      // 处理特殊类型（如日期对象转为字符串）
-      if (item[key] instanceof Date) {
-        return item[key].toLocaleString()
-      }
-      // 其他类型直接转为字符串（避免 undefined 显示）
-      return item[key] !== undefined ? String(item[key]) : ''
-    })
-    worksheetData.push(row)
-  })
-
-  // 创建工作簿和工作表
-  const ws = XLSX.utils.aoa_to_sheet(worksheetData) // 数组转工作表
-  const wb = XLSX.utils.book_new() // 创建工作簿
-  XLSX.utils.book_append_sheet(wb, ws, 'Sheet1') // 工作表命名为 Sheet1
-
-  // 生成二进制文件并下载
-  const excelBuffer = XLSX.write(wb, { bookType: 'xlsx', type: 'array' })
-  const blob = new Blob([excelBuffer], { type: 'application/octet-stream' })
-  saveAs(blob, `${fileName}.xlsx`) // 保存文件
-}

src/views/Basic/User/UserForm.vue

@@ -69,7 +69,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="登录账号" prop="username">
+          <el-form-item v-if="formData.id === undefined" label="登录账号" prop="username">
             <el-input v-model="formData.username" placeholder="请输入登录账号" />
           </el-form-item>
         </el-col>

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

@@ -1,15 +1,7 @@
 <template>
   <div>
     <el-form :model="searchForm" label-width="0" inline>
-      <template v-if="appStore.getAppInfo?.instanceType == 2">
       <el-form-item>
-          <el-input v-model="searchForm.signOrderId" placeholder="成交单号" clearable />
-        </el-form-item>
-        <el-form-item>
-          <el-input v-model="searchForm.signId" placeholder="子订单号" clearable />
-        </el-form-item>
-      </template>
-      <el-form-item v-else>
         <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
       </el-form-item>
       <el-form-item>
@@ -113,20 +105,6 @@
         <el-button @click="batchAudit" v-hasPermi="['clue:order:after-sale-batch-audit']">
           批量审核
         </el-button>
-        <el-upload
-          ref="salaryFile"
-          action="#"
-          :limit="1"
-          accept=".xls,.xlsx"
-          :show-file-list="false"
-          style="margin-left: 10px; height: 32px"
-          :before-upload="fileBeforeUpload"
-          :http-request="afterSalesUpload"
-          :disabled="uploading"
-          v-hasPermi="['clue:order:after-sale-import']"
-        >
-          <el-button type="primary"> 导入 </el-button>
-        </el-upload>
       </el-form-item>
     </el-form>
 
@@ -137,25 +115,7 @@
       @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="signId" label="成交单号" min-width="150px" />
-      <el-table-column
-        v-if="appStore.getAppInfo?.instanceType == 1"
-        prop="signId"
-        label="成交单号"
-        min-width="120px"
-      />
-      <el-table-column
-        v-if="appStore.getAppInfo?.instanceType == 2"
-        prop="signOrderId"
-        label="成交单号"
-        min-width="120px"
-      />
-      <el-table-column
-        v-if="appStore.getAppInfo?.instanceType == 2"
-        prop="signId"
-        label="子订单号"
-        min-width="120px"
-      />
       <el-table-column prop="name" label="线索名称" min-width="150px" />
       <el-table-column prop="phone" label="联系方式" min-width="120px" />
       <el-table-column
@@ -251,7 +211,6 @@ import DialogBatchAudit from './DialogBatchAudit.vue'
 import { removeNullField } from '@/utils'
 import { dateFormatter } from '@/utils/formatTime'
 import { useAppStore } from '@/store/modules/app'
-import { exportArrayToExcel } from '@/utils/index'
 
 const afterSaleAuditDialog = ref()
 
@@ -270,7 +229,6 @@ const searchForm = ref({
   createDate: [],
   createUser: undefined,
   checkTime: [],
-  signOrderId: undefined,
   pageNo: 1,
   pageSize: 20
 })
@@ -295,7 +253,6 @@ function handleReset() {
     createDate: [],
     createUser: undefined,
     checkTime: [],
-    signOrderId: undefined,
     pageNo: 1,
     pageSize: 20
   }
@@ -348,62 +305,6 @@ function handleAudit(row) {
   afterSaleAuditDialog.value.open(row)
 }
 
-const fileBeforeUpload = (file) => {
-  let format = '.' + file.name.split('.')[1]
-  if (!['.xls', '.xlsx'].includes(format)) {
-    message.error(`请上传指定格式".xls,.xlsx"文件`)
-    return false
-  }
-  let isRightSize = file.size / 1024 / 1024 < 20
-  if (!isRightSize) {
-    message.error('文件大小超过 20MB')
-  }
-  return isRightSize
-}
-
-const uploading = ref(false)
-async function afterSalesUpload(data) {
-  uploading.value = true
-  const fd = new FormData()
-  fd.append('file', data.file)
-  try {
-    const resp = await AfterSaleApi.importAfterSales(fd)
-    debugger
-    if (resp && resp.data && resp.data.length) {
-      const succList = resp.data.filter((item) => item.success)
-      const failList = resp.data.filter((item) => !item.success)
-      let msg = `导入完成！成功 ${succList.length} 条，失败 ${failList.length} 条。`
-      if (failList.length) {
-        // 如果有失败，提示下载失败文件
-        msg += '\n请点击消息下载失败明细进行查看。'
-      }
-      ElNotification({
-        title: '导入结果',
-        message: msg,
-        type: 'info',
-        duration: 0,
-        onClick: () => {
-          if (failList.length) {
-            // 将failList生成文件，使用前端下载
-            exportArrayToExcel(failList, `售后导入失败明细${new Date().getTime()}`, [
-              { title: '手机号', key: 'phone' },
-              { title: '售后原因', key: 'reason' },
-              { title: '退款金额', key: 'refundAmount' },
-              { title: '提成扣款', key: 'percentageDeductAmount' },
-              { title: '解决方案', key: 'solution' },
-              { title: '备注', key: 'remark' },
-              { title: '失败原因', key: 'message' }
-            ])
-          }
-        }
-      })
-    }
-  } finally {
-    uploading.value = false
-    getList()
-  }
-}
-
 const areaOptions = ref([])
 function getOptions() {
   // 区域

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

@@ -2,10 +2,7 @@
   <div>
     <el-form :model="searchForm" label-width="0" inline>
       <el-form-item>
-        <el-input v-model="searchForm.signOrderId" placeholder="成交单号" clearable />
+        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
-      </el-form-item>
-      <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 />
@@ -70,8 +67,7 @@
     </el-form>
 
     <el-table v-loading="loading" :data="tableList" border>
-      <el-table-column prop="signOrderId" label="成交单号" min-width="120px" />
+      <el-table-column prop="signId" label="成交单号" min-width="120px" />
-      <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" />
@@ -124,7 +120,6 @@ import { dateFormatter } from '@/utils/formatTime'
 
 const searchForm = ref({
   signId: undefined,
-  signOrderId: undefined,
   name: undefined,
   dealDate: [],
   signUser: undefined,
@@ -147,7 +142,6 @@ function handleSearch() {
 function handleReset() {
   searchForm.value = {
     signId: undefined,
-    signOrderId: undefined,
     name: undefined,
     dealDate: [],
     signUser: undefined,

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

@@ -44,8 +44,8 @@
         <el-col :span="12" :offset="0">
           <el-form-item label="生产状态" prop="isProduced">
             <el-radio-group v-model="form.isProduced">
-              <el-radio :label="0" :value="0">待生产</el-radio>
+              <el-radio :label="0">待生产</el-radio>
-              <el-radio :label="1" :value="1">已生产</el-radio>
+              <el-radio :label="1">已生产</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>

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

@@ -48,8 +48,8 @@
         <el-col :span="24" :offset="0" v-if="appStore.getAppInfo?.instanceType == 2">
           <el-form-item label="是否退货" prop="isReturns">
             <el-radio-group v-model="form.isReturns">
-              <el-radio :label="true" :value="true"> 退货 </el-radio>
+              <el-radio :label="true"> 退货 </el-radio>
-              <el-radio :label="false" :value="false"> 不退货 </el-radio>
+              <el-radio :label="false"> 不退货 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>

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

@@ -12,8 +12,8 @@
         <el-col :span="12" :offset="0">
           <el-form-item label="状态" prop="state">
             <el-radio-group v-model="formData.state">
-              <el-radio :label="3" :value="3"> 通过 </el-radio>
+              <el-radio :label="3"> 通过 </el-radio>
-              <el-radio :label="4" :value="4"> 驳回 </el-radio>
+              <el-radio :label="4"> 驳回 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>

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

@@ -11,8 +11,8 @@
         <el-col :span="12" :offset="0">
           <el-form-item label="状态" prop="state">
             <el-radio-group v-model="formData.state">
-              <el-radio :label="3" :value="3"> 通过 </el-radio>
+              <el-radio :label="3"> 通过 </el-radio>
-              <el-radio :label="4" :value="4"> 驳回 </el-radio>
+              <el-radio :label="4"> 驳回 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>

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

@@ -10,13 +10,13 @@
         <el-col :span="16" :offset="0">
           <el-form-item label="发货方式">
             <el-radio-group v-model="form.sendType" :disabled="autoAuditPurchase == 'false'">
-              <el-radio :label="1" :value="1">
+              <el-radio :label="1">
                 <Tooltip
                   message="必须在进销存的“通用配置-常规配置”中，将 ’采购申请自动通过‘ 设置为“是”"
                 />
                 立即采购发货
               </el-radio>
-              <el-radio :label="2" :value="2"> 使用库存发货 </el-radio>
+              <el-radio :label="2"> 使用库存发货 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>

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

@@ -74,9 +74,6 @@
 <script setup name="DialogExtraPay">
 import { signAddPay, getSignExtraPayList } from '@/api/clue/sign'
 import * as ExtraFeeApi from '@/api/clue/extraFee'
-import { useAppStore } from '@/store/modules/app'
-
-const appStore = useAppStore()
 
 const extraPayOptions = ref([])
 const message = useMessage() // 消息弹窗
@@ -95,13 +92,13 @@ defineExpose({
 const form = ref({})
 function resetForm(id) {
   form.value = {
-    id: id,
+    signId: id,
     extraPay: []
   }
 }
 
 function getFormList() {
-  getSignExtraPayList({ id: form.value.id }).then((data) => {
+  getSignExtraPayList({ id: form.value.signId }).then((data) => {
     form.value.extraPay = data.map((it) => ({
       ...it,
       editabled: false
@@ -124,14 +121,10 @@ async function onSubmit() {
   // 提交请求
   formLoading.value = true
   try {
-    let params = {
+    const params = {
+      signId: form.value.signId,
       extraPay: form.value.extraPay.filter((it) => it.editabled)
     }
-    if (appStore.getAppInfo?.instanceType == 1) {
-      params.signId = form.value.id
-    } else {
-      params.signOrderId = form.value.id
-    }
     await signAddPay(params)
     message.success('添加额外支出成功！')
     getFormList()

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

@@ -18,8 +18,8 @@
       </el-form-item>
       <el-form-item label="是否结清" prop="isPayoff">
         <el-radio-group v-model="form.isPayoff">
-          <el-radio :label="true" :value="true"> 结清 </el-radio>
+          <el-radio :label="true"> 结清 </el-radio>
-          <el-radio :label="false" :value="false"> 未结清 </el-radio>
+          <el-radio :label="false"> 未结清 </el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="备注">

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

@@ -17,8 +17,8 @@
         <el-col :span="12" :offset="0">
           <el-form-item label="状态" prop="state">
             <el-radio-group v-model="formData.state">
-              <el-radio :label="3" :value="3"> 通过 </el-radio>
+              <el-radio :label="3"> 通过 </el-radio>
-              <el-radio :label="4" :value="4"> 驳回 </el-radio>
+              <el-radio :label="4"> 驳回 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>

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

@@ -36,7 +36,7 @@
         <el-divider direction="horizontal" content-position="left">
           其他费用<span v-if="extraTotalPrice">，应收：{{ extraTotalPrice }}</span>
         </el-divider>
-        <el-table :data="orderInfo.otherPay" border stripe>
+        <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="金额" />
@@ -110,8 +110,7 @@ const show = ref(false)
 const clueInfo = ref({})
 const orderInfo = ref({
   signProducts: [],
-  extraPay: [],
+  extraPay: []
-  otherPay: []
 })
 const returnRecordList = ref([])
 const aftersaleList = ref([])
@@ -128,7 +127,7 @@ const prodTotalPrice = computed(() => {
 
 // 其他费用
 const extraTotalPrice = computed(() => {
-  return orderInfo.value.otherPay?.reduce((pre, cur) => pre + cur.extraPayMoney, 0)
+  return orderInfo.value.extraPay.reduce((pre, cur) => pre + cur.extraPayMoney, 0)
 })
 
 // 额外支出

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

@@ -1,133 +0,0 @@
-<template>
-  <Dialog title="成交商品" v-model="show" width="80%">
-    <el-table :data="orderProductList" border stripe>
-      <el-table-column prop="productName" label="成交产品" />
-      <el-table-column prop="specsName" label="产品规格" />
-      <el-table-column prop="signNum" label="成交数量" width="100px" />
-      <el-table-column prop="remark" label="产品备注" />
-      <el-table-column label="生产状态" width="160px">
-        <template #default="scope">
-          <el-switch
-            v-model="scope.row.isProduced"
-            :active-value="true"
-            :inactive-value="false"
-            active-text="已生产"
-            inactive-text="待生产"
-            v-if="checkPermi(['clue:order:update-produce'])"
-            size="small"
-            @change="handleChangeProdoce(scope.row)"
-          />
-          <div v-else>{{ scope.row.isProducedDesc }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="发货状态" prop="sendState" width="90px">
-        <template #default="scope">
-          <el-tag :type="scope.row.sendState == '待发货' ? 'danger' : 'success'" size="small">
-            {{ scope.row.sendState }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="发货备注">
-        <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>
-          <el-button
-            type="danger"
-            link
-            style="padding: 0; margin-left: 0"
-            v-hasPermi="['clue:order:remove-product']"
-            @click="handleRemoveProduct(scope.row)"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <DialogDelivery ref="deliveryDialog" @success="getList" />
-  </Dialog>
-</template>
-
-<script setup>
-import * as SignApi from '@/api/clue/sign'
-import { checkPermi } from '@/utils/permission'
-import DialogDelivery from './DialogDelivery.vue'
-
-const show = ref(false)
-const orderProductList = ref([])
-const orderId = ref(null)
-const message = useMessage() // 消息弹窗
-
-function open(signId) {
-  try {
-    show.value = true
-    orderId.value = signId
-    getList()
-  } catch (error) {
-    console.log(error)
-  }
-}
-
-function getList() {
-  try {
-    SignApi.getOrderProductList({ signId: orderId.value }).then((data) => {
-      orderProductList.value = data || []
-    })
-  } catch (error) {
-    console.log(error)
-  }
-}
-
-async function handleChangeProdoce(row) {
-  try {
-    // 修改状态的二次确认
-    await message.confirm('确认要修改生产状态吗?')
-    // 发起修改状态
-    await SignApi.updateProduceStatus({
-      signId: row.signId,
-      id: row.id,
-      isProduced: row.isProduced
-    })
-    message.success('修改成功')
-    // 刷新列表
-    // getTableList()
-  } catch {
-    // 取消后，进行恢复按钮
-    row.isProduced = !row.isProduced
-  }
-}
-
-const deliveryDialog = ref()
-function handleDelivery(row) {
-  deliveryDialog.value.open(row)
-}
-
-defineExpose({
-  open
-})
-</script>
-
-<style lang="scss" scoped></style>

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

@@ -2,6 +2,46 @@
   <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"
@@ -27,11 +67,9 @@
       v-if="!loading"
       class="mt-10px"
       v-model:tableObject="tableObject"
-      :tableColumns="allSchemas.tableColumns.filter((it) => it.paramLevel == 1)"
+      :tableColumns="allSchemas.tableColumns"
-      rowkey="signOrderId"
+      rowkey="signId"
       :expandRowKeys="expendRows"
-      :showSummary="true"
-      :summaryMethod="summaryMethod"
       @get-list="getTableList"
       @get-checked-columns="getCheckedColumns"
       @selection-change="handleSelectionChange"
@@ -40,42 +78,29 @@
       <el-table-column type="expand" fixed="left">
         <template #default="{ row }">
           <div class="p-10px flex justify-center">
-            <el-table :data="row.childrenOrder" row-key="signId" stripe>
+            <!-- <VueDraggable
-              <el-table-column
+              target="tbody"
-                :prop="item.field"
+              v-model="row.signProducts"
-                :label="item.label"
+              :animation="150"
-                v-for="item in allSchemas.tableColumns.filter((it) => it.paramLevel == 2)"
+              @end="onDragEnd"
-                :key="item.id"
+              style="width: 100%"
-                width="100px"
+            > -->
+            <el-table
+              :data="row.signProducts"
+              row-key="id"
+              stripe
+              style="width: 90%; margin: 0 auto"
             >
+              <el-table-column prop="" label="子订单号" />
+              <el-table-column prop="" label="登记人" width="120px" />
+              <el-table-column prop="" label="成交日期" width="120px" />
+              <el-table-column prop="" label="成交价" width="120px" />
+              <el-table-column prop="" label="支付金额" width="120px" />
+              <el-table-column prop="" label="已到账金额" width="120px" />
+              <el-table-column prop="" label="提成状态" width="120px" />
+              <el-table-column prop="" label="备注" />
+              <el-table-column label="操作" width="200px" fixed="right">
                 <template #default="scope">
-                  <el-popover
-                    v-if="item.field == 'remark' || item.form?.component == 'Editor'"
-                    trigger="hover"
-                    placement="top"
-                  >
-                    <div v-dompurify-html="scope.row.remark"></div>
-                    <template #reference>
-                      <el-button type="primary" link>查看</el-button>
-                    </template>
-                  </el-popover>
-                  <div v-else>
-                    <span v-if="item.isCustom">{{ scope.row.diyParams[item.field] }}</span>
-                    <span v-else>{{ scope.row[item.field] }}</span>
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" width="260px" fixed="right">
-                <template #default="scope">
-                  <el-button
-                    type="primary"
-                    class="mr-10px"
-                    link
-                    style="padding: 0; margin-left: 0"
-                    @click="openProduct(scope.row)"
-                  >
-                    成交商品
-                  </el-button>
                   <el-button
                     type="primary"
                     class="mr-10px"
@@ -106,19 +131,77 @@
                   >
                     取消登记
                   </el-button>
+                </template>
+              </el-table-column>
+              <!-- <el-table-column prop="productName" label="成交产品" width="120px" />
+                <el-table-column prop="specsName" label="产品规格" width="120px" />
+                <el-table-column prop="signNum" label="成交数量" width="90px" />
+                <el-table-column prop="remark" label="成交备注" width="100px" />
+                <el-table-column label="生产状态" width="160px">
+                  <template #default="scope">
+                    <el-switch
+                      v-model="scope.row.isProduced"
+                      :active-value="true"
+                      :inactive-value="false"
+                      active-text="已生产"
+                      inactive-text="待生产"
+                      :disabled="!checkPermi(['clue:order:update-produce'])"
+                      size="small"
+                      @change="handleChangeProdoce(scope.row)"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column label="发货状态" prop="sendState" width="90px">
+                  <template #default="scope">
+                    <el-tag
+                      :type="scope.row.sendState == '待发货' ? 'danger' : 'success'"
+                      size="small"
+                    >
+                      {{ scope.row.sendState }}
+                    </el-tag>
+                  </template>
+                </el-table-column>
+                <el-table-column label="发货备注" width="100px">
+                  <template #default="scope">
+                    <el-popover
+                      placement="top"
+                      width="500px"
+                      trigger="click"
+                      v-if="scope.row.warehouseName && scope.row.sendRemark"
+                    >
+                      <template #reference>
+                        <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+                      </template>
+                      <div v-dompurify-html="scope.row.sendRemark"></div>
+                    </el-popover>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作" width="100px">
+                  <template #default="scope">
                     <el-button
                       type="primary"
                       class="mr-10px"
                       link
+                      :disabled="scope.row.sendState == '已发货'"
                       style="padding: 0; margin-left: 0"
-                    v-hasPermi="['clue:order:add-product']"
+                      v-hasPermi="['clue:order:send']"
-                    @click="handleAddProduct(scope.row)"
+                      @click="handleDelivery(scope.row)"
                     >
-                    添加产品
+                      发货
+                    </el-button>
+                    <el-button
+                      type="danger"
+                      link
+                      style="padding: 0; margin-left: 0"
+                      v-hasPermi="['clue:order:remove-product']"
+                      @click="handleRemoveProduct(scope.row)"
+                    >
+                      删除
                     </el-button>
                   </template>
-              </el-table-column>
+                </el-table-column> -->
             </el-table>
+            <!-- </VueDraggable> -->
           </div>
         </template>
       </el-table-column>
@@ -133,7 +216,7 @@
           <div v-if="item.field == 'remark' || item.form?.component == 'Editor'">
             <el-popover placement="top" width="500px" trigger="click" v-if="row[item.field]">
               <template #reference>
-                <el-button type="primary" style="padding: 0" link>点击查看</el-button>
+                <el-button type="primary" style="padding: 0" text>点击查看</el-button>
               </template>
               <div v-dompurify-html="row[item.field]"></div>
             </el-popover>
@@ -145,6 +228,16 @@
       </el-table-column>
       <el-table-column label="操作" width="120px" 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"
@@ -160,29 +253,33 @@
     </SSTable>
 
     <!-- 详情 -->
+    <DialogOrder ref="orderDetailDialog" />
     <DialogFeeback ref="feedbackDialog" />
     <DialogAfterSale ref="afterSaleDialog" />
     <DialogExtraFee ref="extraFeeDialog" />
+    <DialogDelivery ref="deliveryDialog" @success="getTableList" />
     <DialogAddProduct ref="addProductDialog" @success="getTableList" />
-    <DialogOrderProduct ref="orderProductDialog" />
   </div>
 </template>
 
 <script setup name="ClueOrderList">
 import { getSimpleFieldList } from '@/api/clue/orderField'
 import * as SignApi from '@/api/clue/sign'
+import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
 import { getSimpleProductList } from '@/api/mall/product'
-import { getSimpleUserList as getUserOption, getAllUserListWithHire } from '@/api/system/user'
 
+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 DialogAddProduct from './DialogAddProduct.vue'
-import DialogOrderProduct from './DialogOrderProduct.vue'
 
 import { removeNullField } from '@/utils'
 import { formatDate } from '@/utils/formatTime'
 import { ElMessageBox, ElOption, ElSelect } from 'element-plus'
+// import { VueDraggable } from 'vue-draggable-plus'
+// import { checkPermi } from '@/utils/permission'
 
 const userOptions = ref([])
 const allUserOptions = ref([])
@@ -194,7 +291,20 @@ 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
@@ -205,12 +315,7 @@ const tableObject = ref({
   loading: false,
   total: 1,
   pageSize: 20,
-  pageNo: 1,
+  pageNo: 1
-  totalData: {
-    totalReceivedMoney: 0,
-    totalSignPrice: 0,
-    totalPayAmount: 0
-  }
 })
 
 function resetQuery() {
@@ -231,44 +336,29 @@ async function getTableList() {
       ...queryParams,
       ...searchForm.value,
       pageNo: tableObject.value.pageNo,
-      pageSize: tableObject.value.pageSize,
+      pageSize: tableObject.value.pageSize
-      diyParams: {}
     }
-    searchFieldList.value.map((it) => {
-      if (params[it.field]) {
-        params.diyParams[it.field] = params[it.field]
-      }
-    })
     const data = await SignApi.getSignPage(removeNullField(params))
-    tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.orderDiyParams }))
+    tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams }))
     tableObject.value.total = data.total
-    tableObject.value.totalData = data.totalData
   } finally {
     tableObject.value.loading = false
   }
 }
 
 const loading = ref(true)
-const searchFieldList = ref([])
 async function getCurdSchemas() {
   loading.value = true
   try {
     const data = await getSimpleFieldList()
-    searchFieldList.value = data.filter((it) => it.isCustom && it.isSearch)
-    // const mainOrderFields = data.filter((it) => it.paramLevel == 1)
     data.forEach((elem) => {
-      if (elem.isSearch) {
+      if (['createUser'].includes(elem.field)) {
-        // if (['createUser'].includes(elem.field)) {
+        elem.search.options = userOptions.value
-        //   elem.search.options = userOptions.value
+      } else if (['convertPeople', 'receiver'].includes(elem.field)) {
-        // } else
-        if (['convertPeople', 'receiver', 'createUser'].includes(elem.field)) {
         elem.search.options = allUserOptions.value
       }
-      }
     })
     allSchemas.value = useCrudSchemas(data).allSchemas
-  } catch (err) {
-    console.log(err)
   } finally {
     loading.value = false
     nextTick(() => {
@@ -281,8 +371,12 @@ const showColumns = ref([])
 
 // 初始化表格
 function getCheckedColumns(list) {
-  showColumns.value =
+  showColumns.value = list && list.length ? list : allSchemas.value.tableColumns
-    list && list.length ? list : allSchemas.value.tableColumns.filter((it) => it.paramLevel == 1)
+}
+
+// 详情
+function handleDetail(row) {
+  orderDetailDialog.value.open(row.clueId, row.signId)
 }
 
 const feedbackDialog = ref()
@@ -314,23 +408,32 @@ async function cancelDeal(row) {
 
 const extraFeeDialog = ref()
 function handleAddFee(row) {
-  extraFeeDialog.value.open(row.signOrderId)
+  extraFeeDialog.value.open(row.signId)
 }
 
 async function getOptions() {
-  userOptions.value = await getUserOption()
-  allUserOptions.value = await getAllUserListWithHire()
-  getCurdSchemas()
-
   // 产品
   getSimpleProductList().then((data) => {
     prodOptions.value = data
   })
+
+  userOptions.value = await getUserOption()
+  allUserOptions.value = await getAllUserList()
+  getCurdSchemas()
 }
+const deliveryDialog = ref()
+// function handleDelivery(row) {
+//   deliveryDialog.value.open(row)
+// }
+
+// const addProductDialog = ref()
+// function handleAddProduct(row) {
+//   addProductDialog.value.open(row.signId, prodOptions.value)
+// }
 
 const batchIds = ref([])
 function handleSelectionChange(val) {
-  batchIds.value = val.map((it) => it.signOrderId)
+  batchIds.value = val.map((it) => it.signId)
 }
 
 const selectedValue = ref(undefined)
@@ -384,38 +487,51 @@ function handleBatchUpdateInstall() {
   }
 }
 
-const orderProductDialog = ref()
+// async function handleRemoveProduct(row) {
-function openProduct(row) {
+//   try {
-  orderProductDialog.value.open(row.signId)
+//     // 修改状态的二次确认
-}
+//     await message.confirm(`确认要删除${row.productName}吗?`)
+//     // 发起修改状态
+//     await SignApi.removeOrderProduct(row.id)
+//     message.success('删除成功')
+//     // 刷新列表
+//     getTableList()
+//   } catch {}
+// }
 
-function summaryMethod({ columns }) {
+// async function handleChangeProdoce(row) {
-  const sums = []
+//   try {
-  columns.forEach((column, index) => {
+//     // 修改状态的二次确认
-    if (index === 0) {
+//     await message.confirm('确认要修改生产状态吗?')
-      sums[index] = '合计'
+//     // 发起修改状态
-      return
+//     await SignApi.updateProduceStatus({
-    }
+//       signId: row.signId,
-    if (column.property == 'payTotalAmount') {
+//       id: row.id,
-      sums[index] = tableObject.value.totalData?.totalPayAmount || 0
+//       isProduced: row.isProduced
-    } else if (column.property == 'signTotalPrice') {
+//     })
-      sums[index] = tableObject.value.totalData?.totalSignPrice || 0
+//     message.success('修改成功')
-    } else if (column.property == 'receivedMoney') {
+//     // 刷新列表
-      sums[index] = tableObject.value.totalData?.totalReceivedMoney || 0
+//     // getTableList()
-    } else {
+//   } catch {
-      sums[index] = ''
+//     // 取消后，进行恢复按钮
-    }
+//     row.isProduced = !row.isProduced
-  })
+//   }
-  return sums
+// }
-}
 
-const expendRows = ref([])
+// const expendRows = ref([])
-
+// async function onDragEnd(ev) {
-const addProductDialog = ref()
+//   try {
-const prodOptions = ref([])
+//     expendRows.value = [ev.data.signId]
-function handleAddProduct(row) {
+//     const list = tableObject.value.tableList.find((it) => it.signId == ev.data.signId).signProducts
-  addProductDialog.value.open(row.signId, prodOptions.value)
+//     await SignApi.updateProduceSort(list.map((it) => it.id))
-}
+//     message.success('修改成功')
+//     // 刷新列表
+//     getTableList()
+//   } catch (error) {
+//     console.log(error)
+//     getTableList()
+//   }
+// }
 </script>
 
 <style lang="scss" scoped></style>

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

@@ -1,16 +1,13 @@
 <template>
   <div>
     <el-form :model="searchForm" label-width="0" inline>
-      <template v-if="appStore.getAppInfo?.instanceType == 2">
       <el-form-item>
-          <el-input v-model="searchForm.signOrderId" placeholder="成交单号" clearable />
+        <el-input
-        </el-form-item>
+          v-model="searchForm.signId"
-        <el-form-item>
+          placeholder="成交单号"
-          <el-input v-model="searchForm.signId" placeholder="子订单号" clearable />
+          clearable
-        </el-form-item>
+          style="width: 120px"
-      </template>
+        />
-      <el-form-item v-else>
-        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
       </el-form-item>
       <el-form-item>
         <el-input v-model="searchForm.name" placeholder="线索名称" clearable style="width: 120px" />
@@ -127,8 +124,8 @@
       </el-form-item>
       <el-form-item>
         <el-radio-group v-model="searchForm.settlementState">
-          <el-radio :label="1" :value="1"> 已结算 </el-radio>
+          <el-radio :label="1"> 已结算 </el-radio>
-          <el-radio :label="0" :value="0"> 待结算 </el-radio>
+          <el-radio :label="0"> 待结算 </el-radio>
         </el-radio-group>
       </el-form-item>
 
@@ -155,24 +152,7 @@
         fixed="left"
         :selectable="(row) => row.settlementState == '待结算'"
       />
-      <el-table-column
+      <el-table-column prop="signId" label="成交单号" min-width="120px" />
-        v-if="appStore.getAppInfo?.instanceType == 1"
-        prop="signId"
-        label="成交单号"
-        min-width="120px"
-      />
-      <el-table-column
-        v-if="appStore.getAppInfo?.instanceType == 2"
-        prop="signOrderId"
-        label="成交单号"
-        min-width="120px"
-      />
-      <el-table-column
-        v-if="appStore.getAppInfo?.instanceType == 2"
-        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" />
@@ -300,10 +280,8 @@ import * as SettleApi from '@/api/clue/settle'
 import { getSupplierSimpleList } from '@/api/school/setting/supplier'
 import { removeNullField } from '@/utils/index'
 import { dateFormatter, formatDate } from '@/utils/formatTime'
-import { useAppStore } from '@/store/modules/app'
 
 const message = useMessage() // 消息弹窗
-const appStore = useAppStore()
 
 onMounted(() => {
   getOptions()
@@ -319,7 +297,6 @@ const searchForm = ref({
   signProduct: undefined,
   signSpecs: undefined,
   signId: undefined,
-  signOrderId: undefined,
   settlementState: 0,
   settlementType: undefined,
   supplier: undefined,
@@ -337,7 +314,6 @@ function handleReset() {
     signProduct: undefined,
     signSpecs: undefined,
     signId: undefined,
-    signOrderId: undefined,
     settlementState: 0,
     settlementType: undefined,
     supplier: undefined,

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

@@ -182,7 +182,7 @@
 <script setup name="ClueOrderList">
 import { getSimpleFieldList } from '@/api/clue/orderField'
 import * as SignApi from '@/api/clue/sign'
-import { getAllUserListWithHire } from '@/api/system/user'
+import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
 import { getPlaceList } from '@/api/school/place'
 import { getClassTypeList } from '@/api/school/class'
 
@@ -194,7 +194,7 @@ import DialogExtraFee from './DialogExtraPay.vue'
 import { removeNullField } from '@/utils'
 import { formatDate } from '@/utils/formatTime'
 
-// const userOptions = ref([])
+const userOptions = ref([])
 const allUserOptions = ref([])
 onMounted(() => {
   getOptions()
@@ -249,8 +249,7 @@ async function getTableList() {
       ...queryParams,
       ...searchForm.value,
       pageNo: tableObject.value.pageNo,
-      pageSize: tableObject.value.pageSize,
+      pageSize: tableObject.value.pageSize
-      diyParams: {}
     }
     searchFieldList.value.map((it) => {
       if (params[it.field]) {
@@ -271,12 +270,11 @@ async function getCurdSchemas() {
   loading.value = true
   try {
     const data = await getSimpleFieldList()
-    searchFieldList.value = data.filter((it) => it.isCustom && it.isSearch)
+    searchFieldList.value = data.filter((it) => it.isCustom)
     data.forEach((elem) => {
-      // if (['createUser'].includes(elem.field)) {
+      if (['createUser'].includes(elem.field)) {
-      //   elem.search.options = userOptions.value
+        elem.search.options = userOptions.value
-      // } else
+      } else if (['convertPeople', 'receiver'].includes(elem.field)) {
-      if (['convertPeople', 'receiver', 'createUser'].includes(elem.field)) {
         elem.search.options = allUserOptions.value
       }
     })
@@ -351,14 +349,12 @@ async function getClassTypeOptions() {
 
 async function getOptions() {
   // 驾校
-  getPlaceList({ placeStatus: 0, schoolStatus: 0, isSearchSchool: true, hasAll: true }).then(
+  getPlaceList({ placeStatus: 0, schoolStatus: 0, isSearchSchool: true }).then((data) => {
-    (data) => {
     schoolOptions.value = data.schoolList
     allPlaceOptions.value = data.placeList
-    }
+  })
-  )
+  userOptions.value = await getUserOption()
-  // userOptions.value = await getUserOption()
+  allUserOptions.value = await getAllUserList()
-  allUserOptions.value = await getAllUserListWithHire()
   getCurdSchemas()
 }
 </script>

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

@@ -1,237 +0,0 @@
-<template>
-  <div>
-    <el-form :model="searchForm" label-width="0" inline>
-      <el-form-item>
-        <el-input v-model="searchForm.name" placeholder="学员姓名" clearable style="width: 120px" />
-      </el-form-item>
-      <el-form-item>
-        <el-input
-          v-model="searchForm.phone"
-          placeholder="联系方式"
-          clearable
-          style="width: 100px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-select
-          v-model="searchForm.intentionState"
-          placeholder="学员意向"
-          clearable
-          filterable
-          style="width: 100px"
-        >
-          <el-option
-            v-for="item in intentionOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-select
-          v-model="searchForm.followUser"
-          placeholder="跟进人"
-          clearable
-          filterable
-          style="width: 120px"
-        >
-          <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.remarkDate"
-          type="daterange"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          range-separator="-"
-          start-placeholder="报备日期"
-          end-placeholder="报备日期"
-          style="width: 240px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-select
-          v-model="searchForm.schoolId"
-          placeholder="邀约驾校"
-          clearable
-          filterable
-          style="width: 120px"
-        >
-          <el-option
-            v-for="item in schoolOptions"
-            :key="item.schoolId"
-            :label="item.schoolName"
-            :value="item.schoolId"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-select
-          v-model="searchForm.placeId"
-          placeholder="邀约场地"
-          clearable
-          filterable
-          style="width: 120px"
-        >
-          <el-option
-            v-for="item in placeOptions"
-            :key="item.placeId"
-            :label="item.name"
-            :value="item.placeId"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-date-picker
-          v-model="searchForm.signDate"
-          type="daterange"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          range-separator="-"
-          start-placeholder="报名日期"
-          end-placeholder="报名日期"
-          style="width: 240px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-select
-          v-model="searchForm.isSign"
-          placeholder="报名状态"
-          clearable
-          filterable
-          style="width: 100px"
-        >
-          <el-option label="未报名" :value="0" />
-          <el-option label="已报名" :value="1" />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-select
-          v-model="searchForm.isEnroll"
-          placeholder="登记状态"
-          clearable
-          filterable
-          style="width: 100px"
-        >
-          <el-option label="未登记" :value="0" />
-          <el-option label="已登记" :value="1" />
-        </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="name" label="学员姓名" width="90px" />
-      <el-table-column prop="phone" label="联系方式" width="110px" />
-      <el-table-column prop="followUserName" label="跟进人" width="90" />
-      <el-table-column prop="intentionStateName" label="学员意向" width="90" />
-      <el-table-column prop="remarkDate" label="报备日期" width="100px" />
-      <el-table-column prop="remarkUserName" label="报备人" width="90px" />
-      <el-table-column prop="remarkContent" label="报备内容" min-width="400px" />
-      <el-table-column prop="schoolName" label="邀约驾校" width="100" />
-      <el-table-column prop="placeName" label="邀约场地" width="100" />
-      <el-table-column prop="signDate" label="报名日期" width="100px" />
-      <el-table-column prop="enterUserName" label="接待人" width="90px" />
-      <el-table-column prop="signInfo" label="报名信息" min-width="150px" />
-      <el-table-column prop="isSign" label="报名状态" width="85px" fixed="right">
-        <template #default="{ row }">
-          <el-tag type="success" v-if="row.isSign">已报名</el-tag>
-          <el-tag type="info" v-else>未报名</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column prop="isEnroll" label="登记状态" width="85px" fixed="right">
-        <template #default="{ row }">
-          <el-tag type="success" v-if="row.isEnroll">已登记</el-tag>
-          <el-tag type="info" v-else>未登记</el-tag>
-        </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>
-import { getSimpleUserList as getUserOption } from '@/api/system/user'
-import { getClueRemarkPage } from '@/api/clue/clueRemark'
-import { getPlaceList } from '@/api/school/place'
-import { getIntDictOptions } from '@/utils/dict'
-import { removeNullField } from '@/utils/index'
-
-onMounted(() => {
-  getOptions()
-  handleSearch()
-})
-
-const userOptions = ref([])
-const schoolOptions = ref([])
-const placeOptions = ref([])
-const intentionOptions = getIntDictOptions('intention_state')
-function getOptions() {
-  getUserOption().then((data) => {
-    userOptions.value = data
-  })
-
-  getPlaceList({
-    placeStatus: 0,
-    schoolStatus: 0,
-    isSearchSchool: true
-  }).then((data) => {
-    schoolOptions.value = data.schoolList
-    placeOptions.value = data.placeList
-  })
-}
-
-const searchForm = ref({
-  name: undefined,
-  phone: undefined,
-  pageSize: 20,
-  pageNo: 1
-})
-
-function handleReset() {
-  searchForm.value = {
-    name: undefined,
-    phone: undefined,
-    pageSize: 20,
-    pageNo: 1
-  }
-}
-
-function handleSearch() {
-  searchForm.value.pageNo = 1
-  getList()
-}
-
-const loading = ref(false)
-const tableList = ref([])
-const total = ref(0)
-
-async function getList() {
-  loading.value = true
-  try {
-    let params = { ...removeNullField(searchForm.value) }
-    const data = await getClueRemarkPage(params)
-    tableList.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-</script>
-
-<style lang="scss" scoped></style>

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

@@ -1,15 +1,7 @@
 <template>
   <div>
     <el-form :model="searchForm" label-width="0" inline>
-      <template v-if="appStore.getAppInfo?.instanceType == 2">
       <el-form-item>
-          <el-input v-model="searchForm.signOrderId" placeholder="成交单号" clearable />
-        </el-form-item>
-        <el-form-item>
-          <el-input v-model="searchForm.signId" placeholder="子订单号" clearable />
-        </el-form-item>
-      </template>
-      <el-form-item v-else>
         <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
       </el-form-item>
       <el-form-item>
@@ -216,24 +208,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="60" :selectable="(row) => row.state == 1" />
-      <el-table-column
+      <el-table-column prop="signId" label="成交单号" min-width="120px" />
-        v-if="appStore.getAppInfo?.instanceType == 1"
-        prop="signId"
-        label="成交单号"
-        min-width="120px"
-      />
-      <el-table-column
-        v-if="appStore.getAppInfo?.instanceType == 2"
-        prop="signOrderId"
-        label="成交单号"
-        min-width="120px"
-      />
-      <el-table-column
-        v-if="appStore.getAppInfo?.instanceType == 2"
-        prop="signId"
-        label="子订单号"
-        min-width="120px"
-      />
       <el-table-column prop="name" label="线索名称" width="120px" />
       <el-table-column prop="phone" label="联系方式" width="120px" />companyProfit
       <el-table-column prop="money" label="回款金额" min-width="120px">
@@ -464,7 +439,6 @@ const currentUserId = userStore.getUser.id
 
 const searchForm = ref({
   signId: undefined,
-  signOrderId: undefined,
   name: undefined,
   state: undefined,
   dealDate: [],
@@ -498,7 +472,6 @@ function handleSearch() {
 function handleReset() {
   searchForm.value = {
     signId: undefined,
-    signOrderId: undefined,
     receiver: undefined,
     convertPeople: undefined,
     name: undefined,

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

@@ -126,8 +126,8 @@
       </el-form-item>
       <el-form-item>
         <el-radio-group v-model="searchForm.settlementState">
-          <el-radio :label="1" :value="1"> 已结算 </el-radio>
+          <el-radio :label="1"> 已结算 </el-radio>
-          <el-radio :label="0" :value="0"> 待结算 </el-radio>
+          <el-radio :label="0"> 待结算 </el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item>

src/views/Clue/Order/index.vue

@@ -26,9 +26,6 @@
     <el-tab-pane label="对外结算" name="settle" v-if="checkPermi(['clue:order:settle-list'])">
       <Settle v-if="tabName == 'settle'" />
     </el-tab-pane>
-    <el-tab-pane label="邀约报备" name="remark" v-if="checkPermi(['clue:order:remark'])">
-      <OrderRemark v-if="tabName == 'remark'" />
-    </el-tab-pane>
   </el-tabs>
 </template>
 
@@ -40,8 +37,6 @@ import Reback from './Comp/Reback.vue'
 import AfterSales from './Comp/AfterSales.vue'
 import Delivery from './Comp/Delivery.vue'
 import Settle from './Comp/Settle.vue'
-import OrderRemark from './Comp/OrderRemark.vue'
-
 import { checkPermi } from '@/utils/permission'
 
 const appStore = useAppStore()

src/views/Clue/Pool/ClueAdd.vue

@@ -1,144 +0,0 @@
-<template>
-  <div class="p-10px">
-    <el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
-      <el-form-item label="学员姓名" prop="stuName">
-        <el-input v-model="form.stuName" placeholder="请输入" />
-      </el-form-item>
-      <el-form-item label="手机号" prop="stuMobile">
-        <el-input v-model="form.stuMobile" placeholder="请输入" />
-      </el-form-item>
-      <el-form-item label="线索来源" prop="source">
-        <el-cascader
-          :options="sourceOptions"
-          v-model="form.source"
-          clearable
-          filterable
-          :props="defaultProps"
-          style="width: 100%"
-        />
-      </el-form-item>
-      <el-form-item label="咨询日期" prop="stuConsultTime">
-        <el-date-picker
-          v-model="form.stuConsultTime"
-          type="date"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择"
-          style="width: 100%"
-        />
-      </el-form-item>
-      <el-form-item label="咨询车型" prop="stuConsultCartype">
-        <el-select v-model="form.stuConsultCartype" placeholder="请选择" clearable filterable>
-          <el-option
-            v-for="item in cartypeOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="学员诉求" prop="requirement">
-        <el-input
-          v-model="form.requirement"
-          type="textarea"
-          :autosize="{ minRows: 3 }"
-          placeholder="请输入"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="form.remark"
-          type="textarea"
-          :autosize="{ minRows: 3 }"
-          placeholder="请输入"
-        />
-      </el-form-item>
-      <el-form-item label-width="0">
-        <el-button type="primary" @click="onSubmit" size="large" style="width: 100%"
-          >提 交</el-button
-        >
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-
-<script setup>
-import { getStrDictOptions } from '@/utils/dict'
-import { getSimpleSourceList } from '@/api/clue/source'
-import { handleTree } from '@/utils/tree'
-import { formatDate } from '@/utils/formatTime'
-// import * as authUtil from '@/utils/auth'
-
-import { clueInput } from '@/api/clue'
-
-onMounted(() => {
-  getOptions()
-})
-
-const message = useMessage()
-
-const form = ref({
-  stuName: '',
-  stuMobile: '',
-  source: '',
-  stuConsultTime: formatDate(new Date()),
-  stuConsultCartype: 'C1',
-  requirement: '',
-  remark: '',
-  instanceId: '1014'
-})
-
-const defaultProps = {
-  expandTrigger: 'hover',
-  checkStrictly: false,
-  label: 'sourceName',
-  value: 'sourceId'
-}
-
-const rules = {
-  stuName: [{ required: true, message: '请输入学员姓名', trigger: 'blur' }],
-  stuMobile: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
-  source: [{ required: true, message: '请选择线索来源', trigger: 'change' }],
-  stuConsultTime: [{ required: true, message: '请选择咨询日期', trigger: 'change' }],
-  stuConsultCartype: [{ required: true, message: '请选择咨询车型', trigger: 'change' }]
-}
-
-const sourceOptions = ref([])
-const cartypeOptions = getStrDictOptions('license_type')
-
-function getOptions() {
-  getSimpleSourceList().then((data) => {
-    sourceOptions.value = handleTree(data, 'sourceId')
-  })
-}
-
-const formRef = ref(null)
-function onSubmit() {
-  formRef.value.validate((valid) => {
-    if (valid) {
-      // 提交表单
-      const params = {
-        ...form.value,
-        source: form.value.source ? form.value.source[form.value.source.length - 1] : null
-      }
-      clueInput(params).then(() => {
-        message.success('线索录入成功')
-        form.value = {
-          stuName: '',
-          stuMobile: '',
-          source: '',
-          stuConsultTime: formatDate(new Date()),
-          stuConsultCartype: '',
-          requirement: '',
-          remark: ''
-        }
-      })
-    } else {
-      console.log('表单验证失败')
-      return false
-    }
-  })
-}
-</script>
-
-<style lang="scss" scoped></style>

src/views/Clue/Pool/ClueEnroll.vue

@@ -1,593 +0,0 @@
-<template>
-  <div style="height: 100vh; overflow-y: auto">
-    <div>
-      <div>
-        <Descriptions
-          :title="`线索信息-${info.name}`"
-          :data="info"
-          :schema="showSchema"
-          :columns="2"
-          labelWidth="130px"
-          :defaultShow="false"
-        />
-        <el-form
-          :model="form"
-          ref="formRef"
-          :rules="rules"
-          label-width="85px"
-          class="mt-20px pl-10px pr-10px"
-        >
-          <el-row>
-            <el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
-              <el-form-item label="学员姓名" prop="name">
-                <el-input v-model="form.name" placeholder="请输入学员姓名" />
-              </el-form-item>
-            </el-col>
-            <el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
-              <el-form-item label="联系方式" prop="phone">
-                <el-input v-model="form.phone" placeholder="请输入联系方式" maxlength="11" />
-              </el-form-item>
-            </el-col>
-            <el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
-              <el-form-item label="成交驾校" prop="signSchool">
-                <el-select
-                  v-model="form.signSchool"
-                  placeholder="选择驾校"
-                  filterable
-                  @change="changeSchool"
-                >
-                  <el-option
-                    v-for="item in schoolOptions"
-                    :key="item.schoolId"
-                    :label="item.schoolName"
-                    :value="item.schoolId"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
-              <el-form-item label="成交场地" prop="signPlace">
-                <el-select
-                  v-model="form.signPlace"
-                  placeholder="选择场地"
-                  filterable
-                  :disabled="!form.signSchool"
-                  @change="changePlace"
-                >
-                  <el-option
-                    v-for="item in placeOptions"
-                    :key="item.placeId"
-                    :label="item.name"
-                    :value="item.placeId"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
-              <el-form-item label="成交班型" prop="signClass">
-                <el-select
-                  v-model="form.signClass"
-                  :disabled="!form.signPlace"
-                  placeholder="选择班型"
-                  filterable
-                  @change="changeClass"
-                >
-                  <el-option
-                    v-for="item in classOptions"
-                    :key="item.typeId"
-                    :label="item.typeName"
-                    :value="item.typeId"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
-              <el-form-item label="成交日期" prop="dealDate">
-                <el-date-picker
-                  v-model="form.dealDate"
-                  type="date"
-                  format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD"
-                  placeholder="选择日期时间"
-                  style="width: 100%"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
-              <el-form-item label="成交价" prop="signPrice">
-                <el-input-number
-                  v-model="form.signPrice"
-                  :min="0"
-                  style="width: 100%"
-                  :controls="false"
-                  @change="signPriceChange"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
-              <el-form-item label="是否全款">
-                <el-radio-group v-model="form.isPayoff">
-                  <el-radio :label="true" :value="true"> 全款 </el-radio>
-                  <el-radio :label="false" :value="false"> 非全款 </el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
-              <el-form-item label="支付金额" prop="payAmount">
-                <el-input-number
-                  v-model="form.payAmount"
-                  :min="0"
-                  style="width: 100%"
-                  :controls="false"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
-              <el-form-item label="公司收款" prop="isCompanyReceipts">
-                <el-radio-group v-model="form.isCompanyReceipts">
-                  <el-radio :label="true" :value="true">是</el-radio>
-                  <el-radio :label="false" :value="false">否</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24" v-if="form.signClass">
-              <el-form-item label="利润">
-                <div style="color: blue; font-weight: bold; font-size: 16px">{{ profitNum }}</div>
-              </el-form-item>
-            </el-col>
-            <el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
-              <el-form-item label="接待人" prop="receiver">
-                <el-select v-model="form.receiver" placeholder="选择接待人" clearable filterable>
-                  <el-option
-                    v-for="item in allUserOptions"
-                    :key="item.id"
-                    :label="item.nickname"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col
-              :xl="6"
-              :lg="6"
-              :md="8"
-              :sm="24"
-              :xs="24"
-              v-for="fieldItem in diyFieldList"
-              :key="fieldItem.clueParamId"
-            >
-              <el-form-item :label="fieldItem.label" :prop="fieldItem.field">
-                <component :is="componentMap[fieldItem.component]" v-model="form[fieldItem.field]">
-                  <template v-if="fieldItem.component == 'Select'">
-                    <el-option
-                      v-for="item in fieldItem.options"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id"
-                    />
-                  </template>
-                  <template v-else-if="fieldItem.component == 'Radio'">
-                    <el-radio
-                      v-for="item in fieldItem.options"
-                      :key="item.id"
-                      :label="item.id"
-                      :value="item.id"
-                    >
-                      {{ item.name }}
-                    </el-radio>
-                  </template>
-                  <template v-else-if="fieldItem.component == 'Checkbox'">
-                    <el-checkbox
-                      v-for="item in fieldItem.options"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id"
-                    />
-                  </template>
-                </component>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" :offset="0" class="mb-18px">
-              <el-divider direction="horizontal" content-position="left"> 其他费用 </el-divider>
-              <el-button
-                class="mb-5px"
-                type="primary"
-                size="small"
-                @click="form.otherPay.push({ extraPayType: undefined, extraPayMoney: 0 })"
-              >
-                添加其他费用
-              </el-button>
-              <el-table :data="form.otherPay" border size="small">
-                <el-table-column type="index" width="30" />
-                <el-table-column prop="extraPayType" label="费用类型">
-                  <template #default="{ row }">
-                    <el-select
-                      v-model="row.extraPayType"
-                      size="small"
-                      placeholder="费用类型"
-                      filterable
-                    >
-                      <el-option
-                        v-for="item in otherPayOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="extraPayMoney" label="费用金额">
-                  <template #default="{ row }">
-                    <el-input-number v-model="row.extraPayMoney" size="small" :controls="false" />
-                  </template>
-                </el-table-column>
-                <el-table-column prop="remark" label="备注">
-                  <template #default="{ row }">
-                    <el-input v-model="row.remark" size="small" placeholder="备注信息" />
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" width="50px">
-                  <template #default="{ $index }">
-                    <Icon
-                      icon="ep:remove-filled"
-                      class="text-red-500"
-                      @click="handleRemove('otherPay', $index)"
-                    />
-                  </template>
-                </el-table-column>
-              </el-table>
-            </el-col>
-            <el-col :span="24" :offset="0" class="mb-18px">
-              <el-divider direction="horizontal" content-position="left"> 额外支出 </el-divider>
-              <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="30" />
-                <el-table-column prop="extraPayType" label="支出类型">
-                  <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.id"
-                        :label="item.extraPayName"
-                        :value="item.id"
-                      />
-                    </el-select>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="extraPayMoney" label="支出金额">
-                  <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="50px">
-                  <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>
-            </el-col>
-            <el-col :span="24" :offset="0">
-              <el-form-item label="备注" label-width="50px">
-                <Editor v-model:modelValue="form.remark" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <div class="p-10px">
-          <el-button
-            v-if="!remarkInfo.isEnroll && info.clueId"
-            type="primary"
-            size="large"
-            style="width: 100%"
-            @click="handleSave"
-          >
-            提 交
-          </el-button>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import * as ClueApi from '@/api/clue'
-import { createSignOnRemark, getSignProfit } from '@/api/clue/sign'
-import { getClueRemarkByRemarkId } from '@/api/clue/clueRemark'
-import { getDiyFieldList } from '@/api/clue/orderField'
-import { getPlaceList } from '@/api/school/place'
-import { getClassTypeList } from '@/api/school/class'
-import { getConfigByConfigKey } from '@/api/system/set'
-import { getSimpleFieldList as getClueField } from '@/api/clue/clueField'
-import { getSimpleFieldList } from '@/api/clue/orderField'
-import { getExtraFeeSimpleList } from '@/api/clue/extraFee'
-import { getAllUserList } from '@/api/system/user'
-
-import { formatDate } from '@/utils/formatTime'
-import { getDictOptions } from '@/utils/dict'
-import { componentMap } from '@/components/Form/src/componentMap'
-import { useUserStore } from '@/store/modules/user'
-
-const form = ref({})
-
-const schoolRules = {
-  name: { required: true, message: '学员姓名不可为空', trigger: 'blur' },
-  phone: { required: true, message: '联系方式不可为空', trigger: 'blur' },
-  signSchool: { required: true, message: '成交驾校不可为空', trigger: 'change' },
-  signPlace: { required: true, message: '成交场地不可为空', trigger: 'change' },
-  signClass: { required: true, message: '成交班型不可为空', trigger: 'change' }
-}
-
-const info = ref({})
-const formLoading = ref(false)
-
-const route = useRoute()
-const message = useMessage() // 消息弹窗
-const userStore = useUserStore()
-
-const showSchema = ref([])
-
-const otherPayOptions = getDictOptions('other_pay_type')
-const extraPayOptions = ref([])
-
-const remarkInfo = ref({})
-
-onMounted(() => {
-  if (route.params.id && route.params.id != 0) {
-    // 这里可以调用API获取会议详情数据
-    getClueRemarkByRemarkId({ remarkId: route.params.id }).then((response) => {
-      remarkInfo.value = response
-      if (
-        userStore.getUser?.id != remarkInfo.value.remarkUser &&
-        userStore.getUser?.id != remarkInfo.value.followUser
-      ) {
-        message.error('无权限操作该登记页面！')
-        return
-      } else {
-        resetForm()
-        getOptions()
-        getDiyFields()
-        ClueApi.getClue(remarkInfo.value.clueId).then((data) => {
-          info.value = { ...data, ...data.diyParams, signInfo: remarkInfo.value.signInfo }
-          let str = ''
-          // if (!remarkInfo.value.remarkContent.includes(data.name)) {
-          //   // 提示姓名不一致
-          //   str += '学员姓名不一致'
-          // }
-          // if (!remarkInfo.value.remarkContent.includes(data.phone)) {
-          //   // 提示姓名不一致
-          //   str += '手机号不一致'
-          // }
-          if (str.length) {
-            message.warning(`请注意：${str}`)
-          }
-        })
-      }
-    })
-  } else {
-    // 关闭网页
-    window.close()
-  }
-})
-
-async function resetForm() {
-  const data = await getConfigByConfigKey({ configKey: 'companyCollectionConfig' })
-  form.value = {
-    name: remarkInfo.value.name,
-    phone: remarkInfo.value.phone,
-    clueId: remarkInfo.value.clueId,
-    dealDate: formatDate(new Date()),
-    isPayoff: true,
-    signPrice: 0,
-    payAmount: 0,
-    remark: undefined,
-    isCompanyReceipts: data?.configValue == 'true',
-    receiver: undefined,
-    extraPay: [],
-    otherPay: [],
-    signProducts: [],
-    installStatus: 3
-  }
-}
-
-const rules = ref([])
-function getDiyFields() {
-  getSimpleFieldList().then((data) => {
-    let ruleObj = {}
-    data.map((it) => {
-      if (it.isRequired) {
-        Reflect.set(ruleObj, it.field, {
-          required: true,
-          message: `${it.label}不可为空`,
-          trigger: 'blur, change'
-        })
-      }
-    })
-    rules.value = { ...ruleObj, ...schoolRules }
-  })
-}
-
-const formRef = ref()
-async function handleSave() {
-  // 校验表单
-  if (!formRef.value) return
-  const valid = await formRef.value.validate()
-  if (!valid) return
-
-  if (form.value.otherPay.some((it) => !it.extraPayType || it.extraPayMoney == null)) {
-    message.info('请将费用类型及费用金额填写完整！')
-    return
-  }
-  if (form.value.extraPay.some((it) => !it.extraPayType || it.extraPayMoney == null)) {
-    message.info('请将支出类型及支出金额填写完整！')
-    return
-  }
-
-  // 提交请求
-  formLoading.value = true
-  try {
-    const params = { ...form.value }
-    params.diyParams = {}
-    diyFieldList.value.map((it) => {
-      params.diyParams[it.field] = undefined
-    })
-    for (const key in params.diyParams) {
-      if (Object.hasOwnProperty.call(params, key)) {
-        params.diyParams[key] = params[key]
-      }
-    }
-    await createSignOnRemark(params)
-    message.success('登记成功！')
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-const schoolOptions = ref([])
-const allPlaceOptions = ref([])
-
-const diyFieldList = ref([])
-
-const placeOptions = computed(() => {
-  return allPlaceOptions.value.filter((it) => it.schoolId == form.value.signSchool)
-})
-
-const classOptions = ref([])
-const allUserOptions = ref([])
-
-async function getClassTypeOptions() {
-  const data = await getClassTypeList({ placeId: form.value.signPlace, status: 0 })
-  classOptions.value = data
-}
-
-function getOptions() {
-  getClueField().then((data) => {
-    const list = useCrudSchemas(data)?.allSchemas?.detailSchema?.map((it) => {
-      if (it.label.includes('日期')) {
-        it.dateFormat = 'YYYY-MM-DD'
-      }
-      return it
-    })
-    if (list.length % 2 != 0) {
-      list.push({})
-    }
-    const arr = [
-      {
-        field: 'requirement',
-        label: '诉求',
-        span: 2
-      },
-      {
-        field: 'remark',
-        label: '备注',
-        isEditor: true,
-        span: 2
-      },
-      {
-        field: 'signInfo',
-        label: '报名信息',
-        isEditor: true,
-        span: 2
-      }
-    ]
-    showSchema.value = [...list, ...arr]
-  })
-  // 驾校
-  getPlaceList({ placeStatus: 0, schoolStatus: 0, isSearchSchool: true }).then((data) => {
-    schoolOptions.value = data.schoolList
-    allPlaceOptions.value = data.placeList
-  })
-  // 自定义参数
-  getDiyFieldList().then((data) => {
-    diyFieldList.value = data
-  })
-  getExtraFeeSimpleList().then((data) => {
-    extraPayOptions.value = data
-  })
-  getAllUserList().then((data) => {
-    allUserOptions.value = data
-  })
-}
-
-function changeSchool() {
-  form.value.signPlace = undefined
-  form.value.signClass = undefined
-}
-
-function changePlace() {
-  form.value.signClass = undefined
-  getClassTypeOptions()
-}
-
-function changeClass() {
-  form.value.signPrice =
-    classOptions.value.find((it) => it.typeId == form.value.signClass).guidingPrice || 0
-  signPriceChange()
-}
-
-function signPriceChange() {
-  if (form.value.isPayoff) {
-    form.value.payAmount = form.value.signPrice
-  }
-  calcSignProfit()
-}
-
-const profitNum = ref(0)
-function calcSignProfit() {
-  if (form.value.signClass) {
-    // 计算员工利润
-    getSignProfit({ signClass: form.value.signClass, signPrice: form.value.signPrice }).then(
-      (data) => {
-        profitNum.value = data
-      }
-    )
-  }
-}
-
-function handleRemove(type, index) {
-  form.value[type].splice(index, 1)
-}
-</script>
-
-<style lang="scss" scoped></style>

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

@@ -335,14 +335,11 @@ async function handleSave() {
   if (!followList.value || followList.value.length == 0) {
     message.info('请添加跟进人')
     return
-  } else if (followList.value.some((it) => !it.userId)) {
+  }
+  if (followList.value && followList.value.length && followList.value.some((it) => !it.userId)) {
     message.info('请将跟进人填写完整！')
     return
-  } else if (followList.value.some((it) => it.userId == useUserStore().getUser.id && !it.content)) {
-    message.info('请填写您的首次跟进内容或将线索跟进人改成他人！')
-    return
   }
-
   if (appStore.getAppInfo?.instanceType == 1 && !address.value) {
     message.info('请选择学员位置！')
     return

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

@@ -17,6 +17,17 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12" :offset="0">
+            <el-form-item label="下次跟进时间" prop="nextFollowTime">
+              <el-date-picker
+                v-model="form.nextFollowTime"
+                type="date"
+                format="YYYY-MM-DD"
+                valueFormat="YYYY-MM-DD"
+                placeholder="下次跟进时间"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="意向状态" prop="intentionState">
               <el-select v-model="form.intentionState" filterable>
@@ -29,21 +40,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col
-            :span="12"
-            :offset="0"
-            v-if="form.intentionState != 74 && form.intentionState != '1956731237364404224'"
-          >
-            <el-form-item label="下次跟进时间" prop="nextFollowTime">
-              <el-date-picker
-                v-model="form.nextFollowTime"
-                type="date"
-                format="YYYY-MM-DD"
-                valueFormat="YYYY-MM-DD"
-                placeholder="下次跟进时间"
-              />
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="24" :offset="0">

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

@@ -1,149 +0,0 @@
-<template>
-  <Dialog title="邀约报备" v-model="show" width="600px">
-    <el-form :model="form" ref="formRef" :rules="rules" label-width="0">
-      <el-form-item prop="remarkContent">
-        <el-input
-          type="textarea"
-          placeholder="请输入报备信息"
-          v-model="form.remarkContent"
-          :autosize="{ minRows: 10 }"
-        />
-      </el-form-item>
-      <el-form-item prop="groupId">
-        <el-select v-model="form.groupId" placeholder="选择群聊发送报备信息并@区域" filterable>
-          <el-option
-            v-for="item in groupOptions"
-            :key="item.groupId"
-            :label="item.groupName"
-            :value="item.groupId"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="schoolPlace">
-        <el-cascader
-          v-model="form.schoolPlace"
-          :options="placeOptions"
-          placeholder="选择邀约驾校和场地"
-          filterable
-          show-all-levels
-          style="width: 100%"
-          :props="{ expandTrigger: 'hover', multiple: false, checkStrictly: true }"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span>
-        <el-button @click="show = false">取 消</el-button>
-        <el-button :disabled="formLoading" type="primary" @click="handleSave">提 交</el-button>
-      </span>
-    </template>
-  </Dialog>
-</template>
-
-<script setup>
-import { getWxGroupSimpleList, getClueRemarkByClueId, reportClue } from '@/api/clue/clueRemark'
-import { getPlaceList } from '@/api/school/place'
-import { useUserStore } from '@/store/modules/user'
-
-const userStore = useUserStore()
-const message = useMessage()
-
-const form = ref({
-  remarkContent: '',
-  groupId: '',
-  schoolPlace: []
-})
-const rules = {
-  remarkContent: [{ required: true, message: '请输入报备信息', trigger: 'blur' }],
-  groupId: [{ required: true, message: '请选择群聊', trigger: 'change' }]
-}
-const formLoading = ref(false)
-
-const show = ref(false)
-async function open(row) {
-  show.value = true
-  // 查询群聊
-  getOptions()
-
-  // 查询报备信息
-  const data = await getClueRemarkByClueId({ clueId: row.clueId })
-  if (data && data.remarkId) {
-    form.value = { ...data }
-    if (data.schoolId && data.placeId) {
-      form.value.schoolPlace = [data.schoolId, data.placeId]
-    } else if (data.schoolId) {
-      form.value.schoolPlace = [data.schoolId]
-    }
-    return
-  }
-
-  form.value.clueId = row.clueId
-  let remarkInfo = `学员姓名：${row.name}\n联系方式：${row.phone}\n意向驾校：\n意向班型：`
-  if (row.diyParams?.licenseType) {
-    remarkInfo += `${row.diyParams.licenseType}\n`
-  } else {
-    remarkInfo += `\n`
-  }
-  // const name = userStore.getUser.nickname.substring(0, 1)
-  const name = userStore.getUser.nickname
-  remarkInfo += `意向成交价：\n邀约时间：\n邀约人：${name}教练\n备注：`
-  form.value.remarkContent = remarkInfo
-}
-
-defineExpose({ open })
-
-const groupOptions = ref([])
-const placeOptions = ref([])
-function getOptions() {
-  getWxGroupSimpleList().then((response) => {
-    groupOptions.value = response
-  })
-
-  getPlaceList({
-    placeStatus: 0,
-    schoolStatus: 0,
-    isSearchSchool: true
-  }).then((data) => {
-    placeOptions.value = data.schoolList.map((item) => ({
-      value: item.schoolId,
-      label: item.schoolName,
-      children: data.placeList
-        .filter((place) => item.schoolId == place.schoolId)
-        .map((place) => ({
-          value: place.placeId,
-          label: place.name
-        }))
-    }))
-  })
-}
-
-const formRef = ref(null)
-function handleSave() {
-  formRef.value.validate(async (valid) => {
-    if (valid) {
-      formLoading.value = true
-      try {
-        const params = { ...form.value }
-        if (params.schoolPlace && params.schoolPlace.length) {
-          params.schoolId = params.schoolPlace[0]
-          if (params.schoolPlace.length == 2) {
-            params.placeId = params.schoolPlace[1]
-          }
-        }
-        await reportClue(params)
-        message.success('提交报备信息成功')
-        show.value = false
-      } catch (error) {
-        console.error('提交报备信息失败', error)
-      } finally {
-        formLoading.value = false
-      }
-    } else {
-      console.log('表单验证失败')
-      return false
-    }
-  })
-}
-</script>
-
-<style lang="scss" scoped></style>

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

@@ -3,27 +3,6 @@
     <template #btn>
       <el-button class="mr-20px" type="primary" size="small" @click="handleSave">保存</el-button>
     </template>
-    <div v-if="showMergeOrder">
-      <div style="color: red">
-        查询到该客户已有成交订单，请选择订单进行合并，不选择则生成独立订单
-      </div>
-      <el-radio-group v-model="mergeOrderId" style="width: 100%">
-        <el-radio
-          v-for="item in mergeOrderList"
-          :key="item.signOrderId"
-          :label="item.signOrderId"
-          :value="item.signOrderId"
-          style="width: 100%; margin: 15px 0"
-        >
-          <div class="flex justify-between">
-            <div class="mr-20px">订单编号：{{ item.signOrderId }}</div>
-            <div class="mr-20px">登记时间：{{ item.dealDate }}</div>
-            <div>线索来源：{{ item.source }}</div>
-          </div>
-        </el-radio>
-      </el-radio-group>
-    </div>
-    <div v-else>
     <Descriptions
       :title="`线索信息-${info.name}`"
       :data="info"
@@ -356,14 +335,7 @@
         </el-col>
       </el-row>
     </el-form>
-    </div>
+    <template #footer>
-    <template #footer v-if="showMergeOrder">
-      <span>
-        <el-button @click="show = false">取 消</el-button>
-        <el-button :disabled="formLoading" type="primary" @click="handleNext">下 一 步</el-button>
-      </span>
-    </template>
-    <template #footer v-else>
       <span>
         <el-button @click="show = false">取 消</el-button>
         <el-button :disabled="formLoading" type="primary" @click="handleSave">保 存</el-button>
@@ -374,7 +346,7 @@
 
 <script setup name="DialogSuccess">
 import * as ClueApi from '@/api/clue'
-import { createSign, getSignProfit, getSignPage } from '@/api/clue/sign'
+import { createSign, getSignProfit } from '@/api/clue/sign'
 import { getDiyFieldList } from '@/api/clue/orderField'
 import { getPlaceList } from '@/api/school/place'
 import { getClassTypeList } from '@/api/school/class'
@@ -413,9 +385,6 @@ const props = defineProps({
 })
 
 const prodTotalPrice = computed(() => {
-  if (appStore.getAppInfo?.instanceType != 2) {
-    return 0
-  }
   return form.value.signProducts.reduce(
     (pre, cur) => pre + (cur?.price || 0) * (cur?.signNum || 0),
     0
@@ -423,7 +392,7 @@ const prodTotalPrice = computed(() => {
 })
 
 const extraTotalPrice = computed(() => {
-  return form.value.extraPay?.reduce((pre, cur) => pre + cur.extraPayMoney, 0)
+  return form.value.extraPay.reduce((pre, cur) => pre + cur.extraPayMoney, 0)
 })
 
 const showSchema = computed(() => {
@@ -452,6 +421,23 @@ const showSchema = computed(() => {
   return [...list, ...arr]
 })
 
+// const rules = computed(() => {
+//   let ruleObj = {}
+//   props.schema.map((it) => {
+//     if (it.isRequired) {
+//       Reflect.set(ruleObj, it.field, {
+//         required: true,
+//         message: `${it.label}不可为空`,
+//         trigger: 'blur, change'
+//       })
+//     }
+//   })
+//   if (appStore.getAppInfo?.instanceType == 1) {
+//     ruleObj = { ...ruleObj, ...schoolRules }
+//   }
+//   return ruleObj
+// })
+
 const extraPayOptions = getDictOptions('other_pay_type')
 
 async function open(id) {
@@ -460,10 +446,6 @@ async function open(id) {
     getDiyFields()
     const data = await ClueApi.getClue(id)
     info.value = { ...data, ...data.diyParams }
-    // 进销存模式，查询是否需要合并订单
-    if (appStore.getAppInfo?.instanceType == 2) {
-      setMergeOrder(data.phone)
-    }
     show.value = true
   } catch (error) {
     console.log(error)
@@ -491,35 +473,6 @@ function getDiyFields() {
   })
 }
 
-const showMergeOrder = ref(false)
-const mergeOrderList = ref([])
-const mergeOrderId = ref(undefined)
-function setMergeOrder(phone) {
-  getSignPage({ phone, pageNo: 1, pageSize: 10 }).then((data) => {
-    if (data.total > 0) {
-      // 选择订单作为主订单
-      showMergeOrder.value = true
-      mergeOrderList.value = data.list
-      mergeOrderId.value = undefined
-    }
-  })
-}
-
-function handleNext() {
-  if (mergeOrderId.value) {
-    form.value.signOrderId = mergeOrderId.value
-    const order = mergeOrderList.value.find((it) => it.signOrderId == mergeOrderId.value)
-    if (order.orderDiyParams) {
-      for (const key in order.orderDiyParams) {
-        if (Object.prototype.hasOwnProperty.call(order.orderDiyParams, key)) {
-          form.value[key] = order.orderDiyParams[key]
-        }
-      }
-    }
-  }
-  showMergeOrder.value = false
-}
-
 async function resetForm(id) {
   const data = await getConfigByConfigKey({ configKey: 'companyCollectionConfig' })
   form.value = {
@@ -529,7 +482,7 @@ async function resetForm(id) {
     signPrice: 0,
     payAmount: 0,
     remark: undefined,
-    isCompanyReceipts: data?.configValue == 'true',
+    isCompanyReceipts: data.configValue == 'true',
     receiver: undefined,
     extraPay: [],
     signProducts: [],

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

@@ -16,8 +16,7 @@
         <div class="flex" style="align-items: center">
           <b class="mr-5px text-24px">{{ info.name }}</b>
           <div class="mr-5px text-16px">{{ info.phone }}</div>
-          <!-- <el-tag type="success">{{ info.intentionStateName }}</el-tag> -->
+          <el-tag type="success">{{ info.intentionStateName }}</el-tag>
-          <DictTag type="intention_state" :value="info.intentionState + ''" />
         </div>
         <div>
           <el-button type="primary" v-hasPermi="['clue:pool:update']" plain @click="handleUpdate">
@@ -65,11 +64,8 @@
           >
             <el-card shadow="always" :body-style="{ padding: '10px' }">
               <div>
-                <div class="flex items-center">
+                <div>
-                  <b class="text-18px mr-10px" style="line-height: 36px">
+                  <b class="text-18px" style="line-height: 36px">{{ item.operateUserName }}</b>
-                    {{ item.operateUserName }}
-                  </b>
-                  <DictTag type="intention_state" :value="item.intentionState + ''" />
                 </div>
                 <div>{{ item.content }}</div>
                 <div class="flex mt-10px" style="align-items: center">
@@ -232,8 +228,7 @@ function getFollowList() {
       content: item.content,
       operateDate: formatDate(item.operateTime),
       followTime: formatDate(item.operateTime, 'YYYY-MM-DD HH:mm'),
-      nextFollowTime: formatDate(item.nextFollowTime),
+      nextFollowTime: formatDate(item.nextFollowTime)
-      intentionState: item.intentionState
     }))
   })
 }

src/views/Clue/Pool/index.vue

@@ -5,7 +5,7 @@
         <el-tab-pane label="全部" name="0" />
         <el-tab-pane name="1">
           <template #label>
-            <Tooltip message="过滤掉无效线索、已流失和已成交的线索" />
+            <Tooltip message="除了无效线索和已成交的线索" />
             <el-badge v-if="clueCount.unSignNum" :value="clueCount.unSignNum" :max="9999">
               <span class="ml-3px">未成交</span>
             </el-badge>
@@ -84,7 +84,7 @@
             <div v-if="item.field == 'followRecord'">
               <el-button
                 type="primary"
-                link
+                text
                 style="padding: 0"
                 @click="handleFollow(row)"
                 v-if="queryType != 4"
@@ -133,15 +133,6 @@
               >
                 修改
               </el-button>
-              <el-button
-                type="primary"
-                link
-                @click="handleRemark(scope.row)"
-                :disabled="appStore.getAppInfo?.instanceType == 1 && scope.row.state == '成交'"
-                v-hasPermi="['clue:pool:remark']"
-              >
-                报备
-              </el-button>
               <el-button
                 type="primary"
                 link
@@ -204,7 +195,6 @@
       :userOptions="allStatusUserOptions"
       @success="getTableList"
     />
-    <DialogRemark ref="remarkRef" />
   </div>
 </template>
 
@@ -217,7 +207,6 @@ import DialogSuccess from './Comp/DialogSuccess.vue'
 import DialogFollow from './Comp/DialogFollow.vue'
 import ClueMap from './Comp/ClueMap.vue'
 import DialogBatchChangeFollow from './Comp/DialogBatchChangeFollow.vue'
-import DialogRemark from './Comp/DialogRemark.vue'
 import {
   getSimpleUserList as getUserOption,
   getAllUserList,
@@ -249,12 +238,11 @@ async function getCurdSchemas() {
   loading.value = true
   try {
     const data = await getSimpleFieldList()
-    searchFieldList.value = data.filter((it) => it.isCustom && it.isSearch)
+    searchFieldList.value = data.filter((it) => it.isCustom)
     data.forEach((elem) => {
-      // if (['followUser', 'convertPeople'].includes(elem.field)) {
+      if (['followUser', 'convertPeople'].includes(elem.field)) {
-      //   elem.search.options = userOptions.value
+        elem.search.options = userOptions.value
-      // } else
+      } else if (['firstFollowUser'].includes(elem.field)) {
-      if (['firstFollowUser', 'followUser', 'convertPeople'].includes(elem.field)) {
         elem.search.options = allStatusUserOptions.value
       }
     })
@@ -374,11 +362,6 @@ async function makeCall(phone) {
   console.log('打电话:' + phone)
 }
 
-const remarkRef = ref()
-function handleRemark(row) {
-  remarkRef.value.open(row)
-}
-
 // 登记
 function handleSuccess(row) {
   successRef.value.open(row.clueId)

src/views/Clue/ReceiveInput/index.vue

@@ -1,111 +0,0 @@
-<template>
-  <div>
-    <el-card shadow="always" :body-style="{ padding: '10px' }">
-      <template #header>
-        <div>
-          <span>报备❤</span>
-        </div>
-      </template>
-      <el-input
-        class="remark"
-        type="textarea"
-        v-model="form.remarkContent"
-        :autosize="{ minRows: 5 }"
-        readonly
-      />
-    </el-card>
-    <el-card shadow="always" :body-style="{ padding: '10px' }" class="mt-10px">
-      <template #header>
-        <div>
-          <span>接待录入</span>
-        </div>
-      </template>
-      <el-form :model="form" ref="formRef" :rules="rules" label-width="0">
-        <el-form-item prop="signInfo">
-          <el-input
-            class="remark"
-            type="textarea"
-            placeholder="请输入报名信息"
-            v-model="form.signInfo"
-            :autosize="{ minRows: 5 }"
-          />
-        </el-form-item>
-        <el-form-item prop="group">
-          <el-select v-model="form.groupId" placeholder="选择群聊并发送报名信息" filterable>
-            <el-option
-              v-for="item in groupOptions"
-              :key="item.groupId"
-              :label="item.groupName"
-              :value="item.groupId"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button class="w-full" type="primary" size="large" @click="handleSubmit">
-            提交
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
-  </div>
-</template>
-
-<script setup>
-import { getWxGroupSimpleList } from '@/api/clue/clueRemark'
-import { getClueRemarkByRemarkId, registerClue } from '@/api/clue/clueRemark'
-
-const route = useRoute()
-const message = useMessage()
-
-const groupOptions = ref([])
-
-const form = ref({
-  signInfo: '',
-  groupId: ''
-})
-const rules = {
-  signInfo: [{ required: true, message: '请输入接待信息', trigger: 'blur' }],
-  groupId: [{ required: true, message: '请选择群聊', trigger: 'change' }]
-}
-
-const formRef = ref(null)
-
-function handleSubmit() {
-  formRef.value.validate((valid) => {
-    if (valid) {
-      registerClue(form.value).then(() => {
-        message.success('提交接待信息成功')
-      })
-    } else {
-      console.log('表单验证失败')
-      return false
-    }
-  })
-}
-
-onMounted(() => {
-  if (route.params.id && route.params.id != 0) {
-    // 这里可以调用API获取会议详情数据
-    getClueRemarkByRemarkId({ remarkId: route.params.id }).then((response) => {
-      form.value = response
-    })
-  } else {
-    // 关闭网页
-    window.close()
-  }
-
-  getWxGroupSimpleList().then((response) => {
-    groupOptions.value = response
-  })
-})
-</script>
-
-<style lang="scss" scoped>
-::v-deep(.remark .el-textarea__inner) {
-  font-size: 15px;
-  color: #333;
-}
-::v-deep(.el-card__header) {
-  padding: 10px;
-}
-</style>

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

@@ -1,230 +0,0 @@
-<template>
-  <div>
-    <el-form ref="queryForm" :model="searchForm" label-width="0" inline>
-      <el-form-item>
-        <el-input
-          v-model="searchForm.groupName"
-          placeholder="请输入群名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery">搜索</el-button>
-        <el-button @click="resetQuery">重置</el-button>
-        <el-button type="primary" @click="openForm('create', null)">新增</el-button>
-      </el-form-item>
-    </el-form>
-    <el-table v-loading="loading" :data="tableList">
-      <el-table-column prop="groupName" label="群名称" />
-      <el-table-column label="区域负责人" prop="areaUserName" />
-      <el-table-column prop="remark" label="备注" />
-      <el-table-column label="操作">
-        <template #default="{ row }">
-          <el-button type="primary" style="padding: 0" text @click="openForm('update', row)">
-            修改
-          </el-button>
-          <el-button type="danger" text @click="handleDelete(row.groupId)"> 删除 </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <Pagination
-      v-model:limit="searchForm.pageSize"
-      v-model:page="searchForm.pageNo"
-      :total="total"
-      @pagination="getList"
-    />
-    <Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
-      <el-form
-        ref="formRef"
-        v-loading="formLoading"
-        :model="formData"
-        :rules="formRules"
-        label-width="100px"
-      >
-        <el-form-item label="微信群" prop="groupId">
-          <el-select
-            filterable
-            v-model="formData.groupId"
-            placeholder="请选择群聊"
-            :disabled="dialogType === 'update'"
-            style="width: 100%"
-          >
-            <el-option
-              v-for="item in groupOptions"
-              :key="item.wxGroupId"
-              :label="item.wxGroupName"
-              :value="item.wxGroupId"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="区域负责人" prop="areaUser">
-          <el-select v-model="formData.areaUser" placeholder="请选择" filterable multiple>
-            <el-option
-              v-for="item in userOptions"
-              :key="item.id"
-              :label="item.nickname"
-              :value="item.id"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input
-            type="textarea"
-            v-model="formData.remark"
-            placeholder="请输入备注"
-            :autosize="{ minRows: 4, maxRows: 8 }"
-          />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="dialogVisible = false">取 消</el-button>
-      </template>
-    </Dialog>
-  </div>
-</template>
-
-<script setup>
-import * as wxgroupApi from '@/api/clue/clueRemark'
-import { getSimpleUserList as getUserOption } from '@/api/system/user'
-import { getWxGroupList, refreshWxGroupList } from '@/api/okr/meeting'
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const searchForm = ref({
-  groupName: '',
-  pageSize: 20,
-  pageNo: 1
-})
-
-const total = ref(0)
-const tableList = ref([])
-const loading = ref(false)
-
-function handleQuery() {
-  searchForm.value.pageNo = 1
-  getList()
-}
-function resetQuery() {
-  searchForm.value = {
-    groupName: '',
-    pageSize: 20,
-    pageNo: 1
-  }
-  getList()
-}
-
-async function getList() {
-  loading.value = true
-  try {
-    const data = await wxgroupApi.getWxGroupPage(searchForm.value)
-    tableList.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const dialogType = ref('create') // 弹窗的类型 create新增 update修改
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formData = ref({
-  groupId: '',
-  areaUser: [],
-  remark: ''
-})
-const formRules = reactive({
-  groupId: [{ required: true, message: '微信群不能为空', trigger: 'change' }],
-  areaUser: [{ required: true, message: '区域负责人不能为空', trigger: 'change' }]
-})
-const formRef = ref(null) // 表单的ref
-const groupOptions = ref([]) // 微信群选项
-const userOptions = ref([]) // 用户选项
-
-async function openForm(type, row) {
-  dialogType.value = type
-  dialogTitle.value = type === 'create' ? '新增报备群' : '修改报备群'
-  dialogVisible.value = true
-  resetForm()
-  // 修改时，设置数据
-  if (row) {
-    formLoading.value = true
-    try {
-      formData.value = { ...row }
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-
-function resetForm() {
-  formData.value = {
-    groupId: '',
-    areaUser: [],
-    remark: ''
-  }
-  if (formRef.value) {
-    formRef.value.clearValidate()
-  }
-}
-
-async function handleDelete(id) {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await wxgroupApi.deleteWxGroup(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-function submitForm() {
-  if (!formRef.value) return
-  formRef.value.validate(async (valid) => {
-    if (valid) {
-      formLoading.value = true
-      formData.value.groupName = groupOptions.value.find(
-        (item) => item.wxGroupId == formData.value.groupId
-      )?.wxGroupName
-      try {
-        if (dialogType.value === 'create') {
-          await wxgroupApi.createWxGroup(formData.value)
-          message.success(t('common.addSuccess'))
-        } else {
-          await wxgroupApi.updateWxGroup(formData.value)
-          message.success(t('common.updateSuccess'))
-        }
-        dialogVisible.value = false
-        getList()
-      } finally {
-        formLoading.value = false
-      }
-    }
-  })
-}
-
-function getOptions() {
-  refreshWxGroupList().then(() => {
-    getWxGroupList().then((resp) => {
-      groupOptions.value = resp || []
-    })
-  })
-  // 获取用户选项
-  getUserOption().then((data) => {
-    userOptions.value = data
-  })
-}
-
-onMounted(() => {
-  handleQuery()
-
-  getOptions()
-})
-</script>
-
-<style lang="scss" scoped></style>

src/views/Clue/Set/index.vue

@@ -33,10 +33,6 @@
       <el-tab-pane label="其他费用项" :name="37" v-if="checkPermi(['clue:setting:other-pay'])">
         <OtherPayType v-if="tabIndex == 37" />
       </el-tab-pane>
-      <!-- 报备群设置 -->
-      <el-tab-pane label="报备群设置" :name="38" v-if="checkPermi(['clue:setting:remarkGroup'])">
-        <RemarkGroup v-if="tabIndex == 38" />
-      </el-tab-pane>
       <el-tab-pane label="常规设置" :name="40" v-if="checkPermi(['clue:setting:general-setting'])">
         <GeneralSet v-if="tabIndex == 40" :appType="appStore.getAppInfo?.instanceType" />
       </el-tab-pane>
@@ -58,7 +54,6 @@ import IntentionStatus from './Comp/IntentionStatus.vue'
 import ExtraFeeType from './Comp/ExtraFeeType.vue'
 import OtherPayType from './Comp/OtherPayType.vue'
 import GeneralSet from './Comp/GeneralSet.vue'
-import RemarkGroup from './Comp/RemarkGroup.vue'
 import { checkPermi } from '@/utils/permission'
 
 import { useAppStore } from '@/store/modules/app'

src/views/XjApplet/Vip/components/Recharge.vue

@@ -34,13 +34,7 @@
         <el-button @click="searchList">查询</el-button>
       </el-form-item>
     </el-form>
-    <el-table
+    <el-table v-loading="loading" :data="tableList" height="calc(100vh - 260px)">
-      v-loading="loading"
-      :data="tableList"
-      height="calc(100vh - 260px)"
-      show-summary
-      :summary-method="getSummaries"
-    >
       <el-table-column type="index" width="55" align="center" />
       <el-table-column label="手机号" align="left" prop="phone" width="140" />
       <el-table-column label="会员名" align="left" prop="memberName" min-width="140" />
@@ -48,7 +42,7 @@
       <el-table-column label="车型" prop="carName" align="left" width="100" />
       <el-table-column label="科目" align="left" prop="subjects" width="100" />
       <el-table-column label="充值日期" align="left" prop="payTime" min-width="120" />
-      <el-table-column label="截止日期" align="left" prop="memberEndTime" min-width="120" />
+      <el-table-column label="截止日期" align="left" prop="endDate" min-width="120" />
       <el-table-column label="分销人" align="left" prop="distributionName" min-width="100" />
     </el-table>
     <pagination
@@ -110,32 +104,6 @@ function getList() {
     loading.value = false
   })
 }
-
-function getSummaries(param) {
-  const { columns, data } = param
-  const sums = []
-  columns.forEach((column, index) => {
-    if (index === 0) {
-      sums[index] = '合计'
-      return
-    }
-    const values = data.map((item) => Number(item[column.property]))
-    if (column.property === 'money') {
-      sums[index] = values.reduce((prev, curr) => {
-        const value = Number(curr)
-        if (!isNaN(value)) {
-          return prev + curr
-        } else {
-          return prev
-        }
-      }, 0)
-      sums[index] = sums[index].toFixed(2)
-    } else {
-      sums[index] = ''
-    }
-  })
-  return sums
-}
 </script>
 
 <style lang="scss" scoped></style>

vite.config.js

@@ -40,11 +40,11 @@ export default ({ command, mode }) => {
           changeOrigin: true,
           rewrite: (path) => path.replace(new RegExp(`^/call-api`), '')
         },
-        ['/crm-api/']: {
+        ['/crm-api']: {
           target: env.VITE_BASE_URL,
           ws: false,
           changeOrigin: true,
-          rewrite: (path) => path.replace(new RegExp(`^/crm-api/`), '')
+          rewrite: (path) => path.replace(new RegExp(`^/crm-api`), '')
         },
         ['/applet-api']: {
           target: env.VITE_APPLET_URL,
@@ -57,12 +57,6 @@ export default ({ command, mode }) => {
           ws: false,
           changeOrigin: true,
           rewrite: (path) => path.replace(new RegExp(`^/tiku-api`), '')
-        },
-        ['/out-api']: {
-          target: 'http://cloud.ahfkbg.com',
-          ws: false,
-          changeOrigin: true,
-          rewrite: (path) => path.replace(new RegExp(`^/out-api`), '')
         }
       }
     },