更新了地缘获客、表单重审

index.html

@@ -229,7 +229,7 @@
     <!--引入高德地图JSAPI -->
     <script
       type="text/javascript"
-      src="https://webapi.amap.com/maps?v=2.0&key=df6e9416230b57f3c7f48be57dd2f813&plugin=AMap.Autocomplete,AMap.PlaceSearch,AMap.SearchNearBy,AMap.Geocoder,AMap.Geolocation"
+      src="https://webapi.amap.com/maps?v=2.0&key=df6e9416230b57f3c7f48be57dd2f813&plugin=AMap.Autocomplete,AMap.PlaceSearch,AMap.SearchNearBy,AMap.Geocoder,AMap.Geolocation,AMap.Marker"
     ></script>
     <!--引入UI组件库（1.1版本） -->
     <!-- <script src="https://webapi.amap.com/ui/1.1/main.js"></script> -->

src/api/geopoliticalCustomers/index.ts

@@ -7,9 +7,13 @@ import type {
 import type {
   GeopoliticalCustomersDTO,
   CustomerDTO,
-  customId
+  customId,
+  auditDTO
+} from '@/api/geopoliticalCustomers/types'
+import type {
+  GeopoliticalCustomersPageParam,
+  storePageParam
 } from '@/api/geopoliticalCustomers/types'
-import type { GeopoliticalCustomersPageParam } from '@/api/geopoliticalCustomers/types'
 
 /**
  * 地缘获客分页查询
@@ -96,3 +100,24 @@ export function getDetail(customId: customId) {
     params: customId
   })
 }
+/**
+ * 审核客户
+ * @param customerDto 客户信息传输对象
+ */
+export function auditCustomer(customerDto: auditDTO) {
+  return httpClient.post<ApiResult<void>>('/custom/audit', customerDto)
+}
+// export function auditCustomer(customerDto: CustomerDTO) {
+//   return httpClient.get<ApiResult>('/custom/audit', {
+//     params: customerDto
+//   })
+// }
+/**
+ * 查询范围内所有的门店
+ * @param pageParams 分页参数
+ */
+export function getStoreData(pageParams: storePageParam) {
+  return httpClient.get<ApiResult>('/store/queryRange', {
+    params: pageParams
+  })
+}

src/api/geopoliticalCustomers/types.ts

@@ -154,32 +154,40 @@ interface customStoreEntitiesItem {
   // customStoreId: number
   // storeId: number
   // customId: number
+  //门店id
+  storeId: number
   //门店名称
-  storeName: string
+  storeName?: string
   //预约时间
   reservationTime: string
 }
 export interface CustomerDTO {
   customId?: number | undefined
   //客户名称
-  customName: string | undefined
+  customName?: string | undefined
   //客户联系方式
-  customNid: string | undefined
+  customNid?: string | undefined
   address?: Array<any>
   //省
-  economize: string
+  economize?: string
   //市
-  market: string
+  market?: string
   //区
-  distinguish: string
+  distinguish?: string
   //详细地址
-  detailAddress: any
+  detailAddress?: any
   //半径
-  radius: any
+  radius?: any
   //报名状态
-  enrollStatus: number
+  enrollStatus?: number
   //门店信息
   customStoreEntities: Array<customStoreEntitiesItem>
+  description?: number | undefined
+  status?: number | undefined
+}
+export interface auditDTO {
+  customId?: number | undefined
+  status?: number | undefined
 }
 /**
  * 任务ID(接口里面用到)
@@ -237,3 +245,32 @@ export interface GeopoliticalCustomersSearch {
   // 访问时间区间的结束值
   endTime?: string
 }
+/**
+ * 表单重审搜索区域表单
+ */
+export interface FormReviewSearch {
+  batchNo?: string
+  // 访问时间区间的开始值
+  startTime?: string
+  // 访问时间区间的结束值
+  endTime?: string
+}
+/**
+ * 门店分页参数
+ */
+export type storePageParam = storeQO & PageParam
+/**
+ * 门店查询对象
+ */
+export type storeQO = {
+  //经度
+  longitude?: number
+  //市
+  latitude?: number
+  //纬度
+  distance?: number
+  // 开始时间
+  startTime?: string
+  // 结束时间
+  endTime?: string
+}

src/views/formReview/formReview.vue

@@ -25,8 +25,8 @@
     <template #bodyCell="{ column, record }">
       <template v-if="column.key === 'operate'">
         <operation-group>
-          <!-- <a @click="handleView(record)">查看</a> -->
+          <a v-if="record.enrollStatus !== 2" @click="handleAudit(record)">审核</a>
-          <a @click="handleEdit(record)">审核</a>
+          <span v-else>-</span>
         </operation-group>
       </template>
     </template>
@@ -52,7 +52,7 @@ import type {
   GeopoliticalCustomersPageParam
 } from '@/api/geopoliticalCustomers/types'
 
-defineOptions({ name: 'GeopoliticalCustomers' })
+defineOptions({ name: 'FormReview' })
 
 //底部表格
 // 表格组件引用
@@ -78,23 +78,9 @@ const searchTable = (params: GeopoliticalCustomersPageParam) => {
   searchParams = params
   reloadTable(true) // 会调用 tableRequest
 }
-//新建预约
-const newAppointment = () => {
-  geopoliticalCustomersModalRef.value?.open({
-    newFormAction: FormAction.CREATE
-  })
-}
-//查看
-const handleView = (record: GeopoliticalCustomersRecord) => {
-  geopoliticalCustomersModalRef.value?.open({
-    newFormAction: FormAction.UPDATE,
-    type: 'view',
-    record: record
-  })
-}
 
-//编辑预约
+//审核
-const handleEdit = (record: GeopoliticalCustomersRecord) => {
+const handleAudit = (record: GeopoliticalCustomersRecord) => {
   geopoliticalCustomersModalRef.value?.open({
     newFormAction: FormAction.UPDATE,
     type: 'audit',
@@ -105,10 +91,8 @@ const handleEdit = (record: GeopoliticalCustomersRecord) => {
 const columns: ProColumns[] = [
   {
     title: '编号',
-    width: 80,
+    width: 160,
-    customRender: function ({ index }) {
+    dataIndex: 'batchNo'
-      return `${index + 1}`
-    }
   },
   {
     title: '客户名称',
@@ -126,6 +110,8 @@ const columns: ProColumns[] = [
         return h('div', '待提交')
       } else if (record.enrollStatus === 1) {
         return h('div', '已报名')
+      } else if (record.enrollStatus === 2) {
+        return h('div', '审核通过')
       }
     }
   },
@@ -159,15 +145,15 @@ const columns: ProColumns[] = [
 }
 
 //批量操作、更多操作
-.operationButtonArea {
+// .operationButtonArea {
-  padding-bottom: 20px;
+//   padding-bottom: 20px;
-}
+// }
-.operationButton {
+// .operationButton {
-  background-color: #f4f4f5;
+//   background-color: #f4f4f5;
-  border-radius: 5px;
+//   border-radius: 5px;
-  color: #909399;
+//   color: #909399;
-  margin-right: 10px;
+//   margin-right: 10px;
-}
+// }
 .editable-row-operations a {
   margin-right: 8px;
 }

src/views/formReview/formReviewSearch.vue

@@ -2,42 +2,11 @@
   <a-card :bordered="false" style="margin-bottom: 16px" :body-style="{ paddingBottom: 0 }">
     <a-form :model="formModel" :label-col="labelCol">
       <a-row :gutter="16">
-        <!-- v-if="userInfoCurrent === 'ROLE_ADMIN'" -->
         <a-col :xl="8" :md="12" :sm="24">
           <a-form-item label="编号">
-            <a-input v-model:value="formModel.customName" placeholder="请输入" />
+            <a-input v-model:value="formModel.batchNo" placeholder="请输入" />
           </a-form-item>
         </a-col>
-        <!-- <a-col v-if="userInfoCurrent === 'ROLE_SALES_EXECUTIVE'" :xl="8" :md="12" :sm="24">
-          <a-form-item label="坐席名称">
-            <a-input v-model:value="formModel.customName" placeholder="请输入" />
-          </a-form-item>
-        </a-col> -->
-        <!-- <a-col :xl="8" :md="12" :sm="24">
-          <a-form-item label="坐席名称">
-            <dict-select
-              v-model:value="formModel.ip"
-              dict-code="user_status"
-              allow-clear
-              placeholder="请选择"
-            />
-          </a-form-item>
-        </a-col> -->
-        <!-- <a-col :xl="8" :md="12" :sm="24">
-          <a-form-item label="报名状态">
-            <dict-select
-              v-model:value="formModel.enrollStatus"
-              dict-code="registration_status"
-              allow-clear
-              placeholder="请选择"
-            />
-          </a-form-item>
-        </a-col>
-        <a-col :xl="8" :md="12" :sm="24">
-          <a-form-item label="联系方式">
-            <a-input v-model:value="formModel.customNid" placeholder="请输入" />
-          </a-form-item>
-        </a-col> -->
         <a-col :xl="8" :md="12" :sm="24">
           <a-form-item label="填写时间">
             <a-range-picker
@@ -61,19 +30,9 @@
 
 <script setup lang="ts">
 import { Form } from 'ant-design-vue'
-import type { GeopoliticalCustomersSearch } from '@/api/geopoliticalCustomers/types'
+import type { FormReviewSearch } from '@/api/geopoliticalCustomers/types'
 import dayjs from 'dayjs'
 import type { Dayjs } from 'dayjs'
-//获取当前账号角色
-import { useUserStore } from '@/stores/user-store'
-const { userInfo } = useUserStore()
-
-const userInfoCurrent = ref<string | undefined>('')
-onMounted(() => {
-  console.log(userInfo, 'userInfo?.permissions')
-  // userInfoCurrent = userInfo?.roleCodes
-  userInfoCurrent.value = userInfo?.roleCodes?.toLocaleString()
-})
 
 const useForm = Form.useForm
 
@@ -92,10 +51,8 @@ const emits = defineEmits<{
 }>()
 
 const searchTimeValue = ref<[Dayjs, Dayjs]>()
-const formModel = reactive<GeopoliticalCustomersSearch>({
+const formModel = reactive<FormReviewSearch>({
-  customName: '',
+  batchNo: ''
-  customNid: '',
-  enrollStatus: undefined
 })
 
 const { resetFields } = useForm(formModel)

src/views/geopoliticalCustomers/geopoliticalCustomers.vue

@@ -27,7 +27,7 @@
       <template v-if="column.key === 'operate'">
         <operation-group>
           <a @click="handleView(record)">查看</a>
-          <a @click="handleEdit(record)">编辑</a>
+          <a v-if="record.enrollStatus === 0" @click="handleEdit(record)">编辑</a>
         </operation-group>
       </template>
     </template>
@@ -106,10 +106,8 @@ const handleEdit = (record: GeopoliticalCustomersRecord) => {
 const columns: ProColumns[] = [
   {
     title: '编号',
-    width: 80,
+    width: 160,
-    customRender: function ({ index }) {
+    dataIndex: 'batchNo'
-      return `${index + 1}`
-    }
   },
   {
     title: '客户名称',
@@ -127,6 +125,8 @@ const columns: ProColumns[] = [
         return h('div', '待提交')
       } else if (record.enrollStatus === 1) {
         return h('div', '已报名')
+      } else if (record.enrollStatus === 2) {
+        return h('div', '审核通过')
       }
     }
   },

src/views/geopoliticalCustomers/geopoliticalCustomersSearch.vue

@@ -8,21 +8,6 @@
             <a-input v-model:value="formModel.customName" placeholder="请输入" />
           </a-form-item>
         </a-col>
-        <!-- <a-col v-if="userInfoCurrent === 'ROLE_SALES_EXECUTIVE'" :xl="8" :md="12" :sm="24">
-          <a-form-item label="坐席名称">
-            <a-input v-model:value="formModel.customName" placeholder="请输入" />
-          </a-form-item>
-        </a-col> -->
-        <!-- <a-col :xl="8" :md="12" :sm="24">
-          <a-form-item label="坐席名称">
-            <dict-select
-              v-model:value="formModel.ip"
-              dict-code="user_status"
-              allow-clear
-              placeholder="请选择"
-            />
-          </a-form-item>
-        </a-col> -->
         <a-col :xl="8" :md="12" :sm="24">
           <a-form-item label="报名状态">
             <dict-select
@@ -65,15 +50,15 @@ import type { GeopoliticalCustomersSearch } from '@/api/geopoliticalCustomers/ty
 import dayjs from 'dayjs'
 import type { Dayjs } from 'dayjs'
 //获取当前账号角色
-import { useUserStore } from '@/stores/user-store'
+// import { useUserStore } from '@/stores/user-store'
-const { userInfo } = useUserStore()
+// const { userInfo } = useUserStore()
 
-const userInfoCurrent = ref<string | undefined>('')
+// const userInfoCurrent = ref<string | undefined>('')
-onMounted(() => {
+// onMounted(() => {
-  console.log(userInfo, 'userInfo?.permissions')
+//   console.log(userInfo, 'userInfo?.permissions')
-  // userInfoCurrent = userInfo?.roleCodes
+//   // userInfoCurrent = userInfo?.roleCodes
-  userInfoCurrent.value = userInfo?.roleCodes?.toLocaleString()
+//   userInfoCurrent.value = userInfo?.roleCodes?.toLocaleString()
-})
+// })
 
 const useForm = Form.useForm
 

src/views/login/components/AccountLoginForm.vue

@@ -105,6 +105,9 @@ defineExpose<LoginFormInstance>({
       uuid: modelRef.uuid,
       code: modelRef.code
     })
+  },
+  getCode() {
+    getCode()
   }
 })
 </script>

src/views/login/components/LoginContent.vue

@@ -79,6 +79,7 @@ import { useUserStore } from '@/stores/user-store'
 import { projectTitle, projectDesc, enableLoginCaptcha } from '@/config'
 import { SliderCaptcha as LoginCaptcha } from '@/components/Captcha'
 import { useI18n } from 'vue-i18n'
+import { getCodeData } from '@/api/auth'
 
 const { t } = useI18n()
 
@@ -146,6 +147,16 @@ function handleLogin() {
     // enableLoginCaptcha ? loginCaptchaRef.value?.show() : handleSubmit()
   })
 }
+// //获取验证码
+// const getCode = () => {
+//   doRequest(getCodeData(), {
+//     onSuccess: (res: any) => {
+//       console.log(res, 'res')
+//       codeUrl.value = res.data.img
+//       modelRef.uuid = res.data.uuid
+//     }
+//   })
+// }
 
 const router = useRouter()
 
@@ -161,6 +172,8 @@ function handleSubmit(captchaId?: string) {
       router.push(nextPath)
     })
     .catch(err => {
+      // console.log(accountLoginFormRef.value, 'accountLoginFormRef')
+      accountLoginFormRef.value?.getCode()
       isLoginError.value = true
       loginErrorMessage.value =
         ((err.response || {}).data || {}).message ||

src/views/login/components/types.ts

@@ -8,4 +8,5 @@ export type LoginType = 'account' | 'mobile'
 export interface LoginFormInstance {
   validate: <T = any>(names?: namesType, option?: validateOptions) => Promise<T>
   doLogin: (captchaId?: string) => Promise<LoginResult>
+  getCode: any
 }

src/views/salesmanagement/salespersonList/salespersonListModal.vue

@@ -49,12 +49,7 @@
           </a-form-item>
 
           <a-form-item v-if="isCreateForm" label="角色" v-bind="validateInfos.roleCodes">
-            <sys-role-select
+            <sys-role-select v-model:value="formModel.roleCodes" allow-clear placeholder="请选择" />
-              v-model:value="formModel.roleCodes"
-              mode="multiple"
-              allow-clear
-              placeholder="请选择"
-            />
           </a-form-item>
           <a-form-item label="状态">
             <dict-radio-group v-model:value="formModel.status" dict-code="user_status" />
@@ -102,7 +97,7 @@ const formRule = reactive({
   username: [{ required: true, message: '请输入用户名!' }],
   pass: [{ required: isCreateForm, message: '请输入密码!' }],
   nickname: [{ required: true, message: '请输入昵称!' }],
-  roleCodes: [{ type: 'array', required: true, message: '请选择角色', trigger: ['blur', 'change'] }]
+  roleCodes: [{ required: true, message: '请选择角色', trigger: ['blur', 'change'] }]
 })
 
 // 表单的提交请求

types/components.d.ts

@@ -58,7 +58,6 @@ declare module '@vue/runtime-core' {
     ArrowUpOutlined: typeof import('@ant-design/icons-vue')['ArrowUpOutlined']
     ASelect: typeof import('ant-design-vue/es')['Select']
     ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
-    ASkeleton: typeof import('ant-design-vue/es')['Skeleton']
     ASpace: typeof import('ant-design-vue/es')['Space']
     ASpin: typeof import('ant-design-vue/es')['Spin']
     AStep: typeof import('ant-design-vue/es')['Step']
@@ -70,7 +69,6 @@ declare module '@vue/runtime-core' {
     ATag: typeof import('ant-design-vue/es')['Tag']
     ATextarea: typeof import('ant-design-vue/es')['Textarea']
     ATimePicker: typeof import('ant-design-vue/es')['TimePicker']
-    ATimeRangePicker: typeof import('ant-design-vue/es')['TimeRangePicker']
     ATooltip: typeof import('ant-design-vue/es')['Tooltip']
     ATransfer: typeof import('ant-design-vue/es')['Transfer']
     ATree: typeof import('ant-design-vue/es')['Tree']

vite.config.ts

@@ -19,17 +19,26 @@ import VueI18n from '@intlify/unplugin-vue-i18n/vite'
 import { projectTitle } from './src/config'
 import { antdvStyleDeps } from './src/utils/resolvers'
 
+//项目
 // const serverAddress = 'http://admin.ballcat.cn'
-// const serverAddress = 'http://172.18.0.225:8100'
+//xy
-// const serverAddress = 'http://172.18.1.8:8100'
+// const serverAddress = 'http://172.18.0.225:8000'
+//jt
+// const serverAddress = 'http://172.18.1.8:8000'
+//ts
+// const serverAddress = 'http://172.18.0.228:8000'
+//测试
+const serverAddress = 'http://39.100.77.21:8000'
 
-const serverAddress = 'http://8.130.96.163:8100'
+//线上ip
+// const serverAddress = 'http://175.27.212.74:80'
+//线上域名
 // const serverAddress = 'https://baiyea.net'
-
+// const serverAddress = 'http://8.130.96.163:8100'
 // https://vitejs.dev/config/
 export default defineConfig({
   server: {
-    port: 8101,
+    port: 8001,
     proxy: {
       '^/api': {
         target: serverAddress,