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'