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 @@ + + +