From b09112f769df272362e6382de08b3305703f6172 Mon Sep 17 00:00:00 2001
From: doublekou <951513186@qq.com>
Date: Wed, 11 Oct 2023 16:25:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E5=89=A9?=
=?UTF-8?q?=E4=BD=99=E7=BA=BF=E7=B4=A2=E6=95=B0=E9=87=8F=E5=92=8C=E8=AE=A1?=
=?UTF-8?q?=E8=B4=B9=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/system/user/types.ts | 9 ++-
.../salespersonList/salespersonList.vue | 6 ++
src/views/system/user/SysUserFormModal.vue | 11 ++--
src/views/system/user/SysUserPage.vue | 56 +++++++++++++++++++
vite.config.ts | 4 +-
5 files changed, 78 insertions(+), 8 deletions(-)
diff --git a/src/api/system/user/types.ts b/src/api/system/user/types.ts
index 1ecf3f9..b5c8324 100644
--- a/src/api/system/user/types.ts
+++ b/src/api/system/user/types.ts
@@ -140,7 +140,7 @@ export type SysUserDTOTag = {
}
export type SysUserDTO = {
//标签组名
- name: string | undefined
+ name?: string | undefined
// 主键id
// userId?: number
// // 前端传入密码
@@ -164,8 +164,13 @@ export type SysUserDTO = {
// organizationId?: number
// // 角色标识列表
// roleCodes: string[]
- desc: objectState
+ desc?: objectState
// stage?: objectState
+ //计费开关
+ chargingStatus?: number
+ nickname?: string | undefined
+ //剩余线索数量
+ residueClueNum?: number | undefined
}
//编辑线索阶段表单
diff --git a/src/views/salesmanagement/salespersonList/salespersonList.vue b/src/views/salesmanagement/salespersonList/salespersonList.vue
index 3a807ff..5faf02e 100644
--- a/src/views/salesmanagement/salespersonList/salespersonList.vue
+++ b/src/views/salesmanagement/salespersonList/salespersonList.vue
@@ -147,6 +147,12 @@ const columns: ProColumns[] = [
return h(DictBadge, { dictCode: 'user_status', value: value })
}
},
+ {
+ key: 'residueClueNum',
+ title: '剩余线索数量',
+ dataIndex: 'residueClueNum',
+ width: '100px'
+ },
{
title: '创建日期',
dataIndex: 'createTime',
diff --git a/src/views/system/user/SysUserFormModal.vue b/src/views/system/user/SysUserFormModal.vue
index fe38609..de84de8 100644
--- a/src/views/system/user/SysUserFormModal.vue
+++ b/src/views/system/user/SysUserFormModal.vue
@@ -34,9 +34,8 @@
placeholder="请选择"
/>
-
-
-
+
+
@@ -62,6 +61,9 @@
@changes="updateRole"
/>
+
+
+
@@ -98,7 +100,8 @@ const formModel = reactive({
gender: 1,
phoneNumber: '',
email: '',
- roleCodes: []
+ roleCodes: [],
+ residueClueNum: undefined
})
// 表单的校验规则
diff --git a/src/views/system/user/SysUserPage.vue b/src/views/system/user/SysUserPage.vue
index b94171c..34d8837 100644
--- a/src/views/system/user/SysUserPage.vue
+++ b/src/views/system/user/SysUserPage.vue
@@ -58,6 +58,19 @@
+
+
+
+
+
+
+ {{ record.residueClueNum }}
+
+
操作
@@ -127,6 +140,9 @@ import { doRequest } from '@/utils/axios/request'
import type { MenuInfo } from 'ant-design-vue/es/menu/src/interface'
import { DictBadge, DictText } from '@/components/Dict'
import { NewButton, DeleteTextButton } from '@/components/Button'
+//编辑接口
+import { updateUser } from '@/api/system/user'
+import { message } from 'ant-design-vue'
defineOptions({ name: 'SysUserPage' })
@@ -243,6 +259,33 @@ const uploadAvatarProcessor = (fileObj: FileObject, record: SysUserPageVO) => {
return res
})
}
+// const chargingStatus = ref()
+const switchChange = (record: any) => {
+ console.log(record, 'record')
+ if (record.chargingStatus === 1) {
+ record.chargingStatus = 0
+ } else {
+ record.chargingStatus = 1
+ }
+ doRequest(
+ updateUser(
+ toRaw({
+ chargingStatus: record.chargingStatus,
+ username: record.username,
+ userId: record.userId,
+ nickname: record.nickname
+ })
+ ),
+ {
+ onSuccess: (res: any) => {
+ if (res.code === 200) {
+ // message.success('操作成功')
+ // reloadTable()
+ }
+ }
+ }
+ )
+}
// 表格列配置
const columns: ProColumns[] = [
@@ -281,6 +324,19 @@ const columns: ProColumns[] = [
return h(DictBadge, { dictCode: 'user_status', value: value })
}
},
+ {
+ key: 'chargingStatus',
+ title: '计费开关',
+ dataIndex: 'chargingStatus',
+ width: '80px'
+ },
+ {
+ key: 'residueClueNum',
+ title: '剩余线索数量',
+ dataIndex: 'residueClueNum',
+ width: '100px',
+ align: 'center'
+ },
{
title: '创建时间',
dataIndex: 'createTime',
diff --git a/vite.config.ts b/vite.config.ts
index 17cb009..3d382a1 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -22,13 +22,13 @@ import { antdvStyleDeps } from './src/utils/resolvers'
//项目
// export const serverAddress = 'http://admin.ballcat.cn'
//xy
-// export const serverAddress = 'http://172.18.0.225:8000'
+export const serverAddress = 'http://172.18.0.225:8000'
//jt
// export const serverAddress = 'http://172.18.1.8:8000'
//ts
// export const serverAddress = 'http://172.18.0.228:8000'
//测试
-export const serverAddress = 'http://39.100.77.21:8000'
+// export const serverAddress = 'http://39.100.77.21:8000'
//线上ip
// export const serverAddress = 'http://175.27.212.74:80'
From 5e995f71cd348aec1fddf30be6d9acb22642ca54 Mon Sep 17 00:00:00 2001
From: doublekou <951513186@qq.com>
Date: Thu, 12 Oct 2023 10:30:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmap.value.clearMa?=
=?UTF-8?q?=E6=8A=A5=E9=94=99=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../geopoliticalCustomersModal.vue | 241 ++++++++++--------
src/views/system/user/SysUserPage.vue | 9 +-
vite.config.ts | 4 +-
3 files changed, 131 insertions(+), 123 deletions(-)
diff --git a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
index 7ac1c95..2bd4474 100644
--- a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
+++ b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
@@ -11,10 +11,8 @@
:width="850"
@cancel="handleClose"
>
-
-
+
+
@@ -430,8 +422,12 @@
-
-
+
+
重新匹配将清空预约门店信息,是否重新匹配?
@@ -473,7 +469,13 @@ const userInfoCurrent = ref('')
// required: true,
// trigger: 'change'
// }
-
+// watch(
+// () => activeKey.value,
+// (newVal, oldVal) => {
+// console.log('newVal, oldVal', newVal, oldVal)
+// },
+// { immediate: true, deep: true }
+// )
onMounted(() => {
//省市区三级下拉框列表数据
provincesAndCitiesAndAutonomousOptions.value = window.globalProvincesAndCitiesAndAutonomousRegions
@@ -496,7 +498,7 @@ onMounted(() => {
})
//当前激活 tab 面板的 key
-const activeKey = ref('1')
+const activeKey = ref('')
//tabs change事件
const tabsChange = (val: string) => {
handleMapInit()
@@ -530,7 +532,6 @@ const reservationTimeClass = computed(() => ({
//小区动态生成只读/禁用样式
const isDetailAddressDisabled = ref(false)
const isDetailAddressReadOnly = ref(false)
-
const detailAddressReadOnlyDynamicClass = computed(() => ({
'custom-disabled-style': isDetailAddressDisabled.value,
'custom-readonly-style':
@@ -555,7 +556,6 @@ const addressChange = async (value: any) => {
formModel.economize = value[0]
formModel.market = value[1]
formModel.distinguish = value[2]
- // console.log(value.length, 'value.length')
// if (value.length === 2) {
// formModel.detailAddress = value[0] + value[1]
// } else if (value.length === 3) {
@@ -733,7 +733,6 @@ const accordingAddressGetCenter = () => {
//输入详细地址去获取经纬度从而标记中心点封装的方法
const getLocation = (type: string) => {
- // console.log(address, '标记中心点address')
const addressValue =
//标记中心点
formModel.address?.toString().split(',').join('') + formModel.detailAddress
@@ -744,7 +743,6 @@ const getLocation = (type: string) => {
lng.value = result.geocodes[0].location.lng
lat.value = result.geocodes[0].location.lat
formModel.otherAddressesInfo = `${lng.value},${lat.value}`
- console.log(lng.value, lat.value, 'lng.value')
// 设置地图中心点
map.value.setCenter([lng.value, lat.value]) // 将经度和纬度作为参数传入
if (type === 'match') {
@@ -779,7 +777,6 @@ const getLocation = (type: string) => {
//标记中心点封装的方法
const getCenterMarker = (type: string, lng: number, lat: number) => {
formModel.otherAddressesInfo = `${lng},${lat}`
- console.log(lng, lat, 'lng')
// 设置地图中心点
map.value.setCenter([lng, lat]) // 将经度和纬度作为参数传入
if (type === 'match' || type === 'select') {
@@ -822,7 +819,6 @@ const getCenterMarkerAddress = () => {
// 处理搜索结果
const pois = result.poiList.pois
console.log(pois, 'pois')
- console.log(formModel.detailAddress, 'formModel.detailAddress匹配')
// 对获取到的兴趣点列表进行处理
if (pois[0].name.includes('小区')) {
const result = pois[0].name.replace('小区', '')
@@ -999,11 +995,6 @@ const pagingQuery = (lng: number | undefined, lat: number | undefined) => {
const accordingStorenameMatch = (pois: any) => {
isName.value = false
getCenterMarker('match', pois[0].location.lng, pois[0].location.lat)
- console.log(
- pois[0].location.lng,
- pois[0].location.lat,
- 'pois[0].location.lng, pois[0].location.lat'
- )
}
//匹配时根据详细地址区获取中心点
const accordingAddressMatch = () => {
@@ -1016,7 +1007,9 @@ const idThen = (detailAddress: string) => {
listData.value = []
lng.value = undefined
lat.value = undefined
+ // if (map.value && typeof map.value.clearMap === 'function') {
map.value.clearMap()
+ // }
// city.value = formModel.market?.slice(0, -1)
//标记中心点
@@ -1111,39 +1104,45 @@ const idThen = (detailAddress: string) => {
//匹配
const match = async (detailAddress: string) => {
// console.log(listData.length,'listData.length')
- console.log(title.value,'title.value')
+ console.log(title.value, 'title.value')
if (activeKey.value === '1') {
- if(title.value==='新建预约'&&formModel.customStoreEntities.length!==0){
- matchregisterVisible.value=true
- }else{
+ if (title.value === '新建预约' && formModel.customStoreEntities.length !== 0) {
+ matchregisterVisible.value = true
+ } else {
const fields = ['address', 'detailAddress', 'radius'] // 指定要校验的字段名
- formRef.value
- ?.validateFields(fields)
- .then(() => {
- idThen(detailAddress)
- })
- .catch(() => {
- // 校验失败
- console.log('校验失败')
- })
+ formRef.value
+ ?.validateFields(fields)
+ .then(() => {
+ idThen(detailAddress)
+ })
+ .catch(() => {
+ // 校验失败
+ console.log('校验失败')
+ })
}
-
} else {
- if(title.value==='新建预约'&&formModel.customStoreEntities.length!==0){
- matchregisterVisible.value=true
- }else{
- if (formModel.address && formModel.address.length === 0) {
- message.info('请输入您的地址信息')
- } if (!formModel.detailAddress) {
- message.info('请输入您的详细地址信息')
- } if(!formModel.radius){
- message.info('请选择区域半径')
- }
- if(formModel.address && formModel.address.length>0&&formModel.detailAddress&&formModel.radius){
- idThen(detailAddress)
+ if (title.value === '新建预约' && formModel.customStoreEntities.length !== 0) {
+ matchregisterVisible.value = true
+ } else {
+ if (formModel.address && formModel.address.length === 0) {
+ return message.info('请输入您的地址信息')
+ }
+ if (!formModel.detailAddress) {
+ return message.info('请输入您的详细地址信息')
+ }
+ if (!formModel.radius) {
+ return message.info('请选择区域半径')
+ }
+ if (
+ formModel.address &&
+ formModel.address.length > 0 &&
+ formModel.detailAddress &&
+ formModel.radius
+ ) {
+ idThen(detailAddress)
+ }
}
}
- }
}
//重置
const resetForm = () => {
@@ -1282,26 +1281,26 @@ const handleOk = async () => {
await submitOperate()
}
//匹配信息确认弹窗确定点击事件
-const matchhandleOk = async () => {
- matchregisterVisible.value=false
- listData.value.forEach((item:any)=>{
- item.disabled=false
+const matchhandleOk = async (detailAddress: string) => {
+ matchregisterVisible.value = false
+ listData.value.forEach((item: any) => {
+ item.disabled = false
})
if (infoWindows.value) {
- infoWindows.value.close(); // 关闭气泡卡片
-}
- formModel.customStoreEntities=[]
+ infoWindows.value.close() // 关闭气泡卡片
+ }
+ formModel.customStoreEntities = []
// listData.value=[]
const fields = ['address', 'detailAddress', 'radius'] // 指定要校验的字段名
- formRef.value
- ?.validateFields(fields)
- .then(() => {
- idThen(detailAddress)
- })
- .catch(() => {
- // 校验失败
- console.log('校验失败')
- })
+ formRef.value
+ ?.validateFields(fields)
+ .then(() => {
+ idThen(detailAddress)
+ })
+ .catch(() => {
+ // 校验失败
+ console.log('校验失败')
+ })
// await submitOperate()
}
//暂存
@@ -1413,9 +1412,9 @@ const handleSubmit = () => {
//弹窗关闭方法
const handleClose = () => {
- activeKey.value = '1'
+ // activeKey.value = '1'
//去除禁用/只读
- isAddressDisabled.value =
+ isAddressDisabled.value =
isAddressReadOnly.value =
isDetailAddressDisabled.value =
isDetailAddressReadOnly.value =
@@ -1445,22 +1444,28 @@ interface openObj {
type?: string
record?: GeopoliticalCustomersRecord
}
-const handleMapInit = () => {
- nextTick(() => {
- initMap()
+const handleMapInit = async () => {
+ await nextTick(async () => {
+ await initMap()
})
}
defineExpose({
open(opendata: openObj) {
+ console.log(activeKey.value, 'activeKey.value')
isSubmit.value = false
openModal()
- resetFields.value()
- if (userInfoCurrent.value === 'ROLE_REVIEWER') {
- formModel.customType = 1
- } else if (userInfoCurrent.value === 'ROLE_PRELIMINARY_EXAMINER') {
- formModel.customType = 0
- }
+ console.log('formModel.customType resssssssss', formModel.customType)
+ //不写resetFields.value()预约门店信息会反复追加进去,但是加了resetFields.value()会导致formModel.customType为0
+ // resetFields.value()
+ // formModel.customType = undefined
+ formModel.customStoreEntities = []
+ console.log('formModel.customType ddddddddddd', formModel.customType)
+ // if (userInfoCurrent.value === 'ROLE_REVIEWER') {
+ // formModel.customType = 1
+ // } else if (userInfoCurrent.value === 'ROLE_PRELIMINARY_EXAMINER') {
+ // formModel.customType = 0
+ // }
const handleSuccess = (res: any) => {
const data = res.data || {}
@@ -1494,6 +1499,7 @@ defineExpose({
formModel.distinguish = distinguish
formModel.detailAddress = detailAddress
formModel.customType = customType
+ console.log(formModel.customType, '111')
formModel.otherAddressesInfo = otherAddressesInfo
formModel.radius = radius
@@ -1502,77 +1508,86 @@ defineExpose({
formModel.customStoreEntities.forEach((i: any) => {
i.option = generateTimeSlots(i.tradeStartTime, i.tradeEndTime)
})
+ const getActiveKey = () => {
+ if (formModel.customType === 0) {
+ activeKey.value = '1'
+ } else {
+ activeKey.value = '2'
+ }
+ }
if (opendata.type === 'audit') {
- handleMapInit()
+ getActiveKey()
+ // handleMapInit()
title.value = '编辑'
// activeKey.value=formModel.customType
if (formModel.address.length !== 0) {
isAddressDisabled.value = true
// isRadiusReadOnly.value = true
- }
+ }
if (formModel.radius) {
isRadiusDisabled.value = true
- }
+ }
if (formModel.detailAddress) {
isDetailAddressDisabled.value = true
}
if (formModel.address.length !== 0 && formModel.detailAddress && formModel.radius) {
- match(formModel.detailAddress)
+ handleMapInit().then(() => {
+ match(formModel.detailAddress)
+ })
}
-
} else if (opendata.type === 'edit') {
- handleMapInit()
+ getActiveKey()
title.value = '编辑预约'
- // if(formModel.customType===0){
- // activeKey.value='1'
- // }else if(formModel.customType===1){
- // activeKey.value='2'
- // }
if (formModel.address.length !== 0) {
isAddressDisabled.value = true
- // isRadiusDisabled.value = true
- // isRadiusReadOnly.value = true
- // match(formModel.detailAddress)
}
if (formModel.radius) {
isRadiusDisabled.value = true
- }
+ }
if (formModel.detailAddress) {
isDetailAddressDisabled.value = true
}
if (formModel.address.length !== 0 && formModel.detailAddress && formModel.radius) {
- match(formModel.detailAddress)
+ handleMapInit().then(() => {
+ match(formModel.detailAddress)
+ })
+ }
+ } else if (opendata.type === 'view') {
+ if (formModel.customType === 0) {
+ activeKey.value = '1'
+ } else {
+ activeKey.value = '2'
}
-
- }
- }
-
- if (opendata.newFormAction === FormAction.CREATE) {
- handleMapInit()
- title.value = '新建预约'
- formModel.customStoreEntities.length = 0
- } else if (opendata.newFormAction === FormAction.UPDATE) {
- doRequest(getDetail({ id: opendata.record?.customId }), {
- onSuccess: handleSuccess
- })
- if (opendata.type === 'view') {
title.value = '详情'
+ console.log(formModel.customType, 'formModel.customTypeA')
+
isAddressReadOnly.value = true
isRadiusReadOnly.value = true
isDetailAddressReadOnly.value = true
isReservationTimeisReadOnly.value = true
-
} else if (opendata.type === 'distribute') {
+ getActiveKey()
title.value = '分发'
isAddressReadOnly.value = true
isRadiusReadOnly.value = true
isDetailAddressReadOnly.value = true
isReservationTimeisReadOnly.value = true
// handleMapInit()
-
+
formModel.description = 1
}
}
+
+ if (opendata.newFormAction === FormAction.CREATE) {
+ activeKey.value = '1'
+ handleMapInit()
+ title.value = '新建预约'
+ formModel.customStoreEntities.length = 0
+ } else if (opendata.newFormAction === FormAction.UPDATE) {
+ doRequest(getDetail({ id: opendata.record?.customId }), {
+ onSuccess: handleSuccess
+ })
+ }
formAction.value = opendata.newFormAction
}
})
@@ -1775,7 +1790,7 @@ const initMap = async () => {
// center: [120.1551, 30.2741], // 地图中心点经纬度
zoom: 18 // 缩放级别
})
- console.log(map.value, 'map.value')
+ console.log(map.value, 'initMap map.value')
// await auto('全国')
if (
(title.value === '编辑预约' && formModel.otherAddressesInfo) ||
diff --git a/src/views/system/user/SysUserPage.vue b/src/views/system/user/SysUserPage.vue
index 34d8837..ac597c2 100644
--- a/src/views/system/user/SysUserPage.vue
+++ b/src/views/system/user/SysUserPage.vue
@@ -259,9 +259,7 @@ const uploadAvatarProcessor = (fileObj: FileObject, record: SysUserPageVO) => {
return res
})
}
-// const chargingStatus = ref()
const switchChange = (record: any) => {
- console.log(record, 'record')
if (record.chargingStatus === 1) {
record.chargingStatus = 0
} else {
@@ -277,12 +275,7 @@ const switchChange = (record: any) => {
})
),
{
- onSuccess: (res: any) => {
- if (res.code === 200) {
- // message.success('操作成功')
- // reloadTable()
- }
- }
+ onSuccess: (res: any) => {}
}
)
}
diff --git a/vite.config.ts b/vite.config.ts
index 3d382a1..17cb009 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -22,13 +22,13 @@ import { antdvStyleDeps } from './src/utils/resolvers'
//项目
// export const serverAddress = 'http://admin.ballcat.cn'
//xy
-export const serverAddress = 'http://172.18.0.225:8000'
+// export const serverAddress = 'http://172.18.0.225:8000'
//jt
// export const serverAddress = 'http://172.18.1.8:8000'
//ts
// export const serverAddress = 'http://172.18.0.228:8000'
//测试
-// export const serverAddress = 'http://39.100.77.21:8000'
+export const serverAddress = 'http://39.100.77.21:8000'
//线上ip
// export const serverAddress = 'http://175.27.212.74:80'