From 83991888053b5aaebace24b346763db6217d1de2 Mon Sep 17 00:00:00 2001 From: "1213317725@qq.com" <1213317725@qq.com> Date: Sat, 17 May 2025 18:12:49 +0800 Subject: [PATCH] 17 --- admin/components.d.ts | 7 + admin/src/app/api/campus_person_role.ts | 12 +- admin/src/app/api/customer_resources.ts | 6 +- admin/src/app/api/departments.ts | 6 +- admin/src/app/api/market_performance.ts | 56 ++++++ .../src/app/api/six_speed_modification_log.ts | 10 +- admin/src/app/api/sys.ts | 10 + ...campus_person_role.campus_person_role.json | 20 +- .../lang/zh-cn/departments.departments.json | 4 +- ...market_performance.market_performance.json | 13 ++ ...cation_log.six_speed_modification_log.json | 8 +- .../campus_person_role/campus_person_role.vue | 94 ++++++--- .../components/campus-person-role-edit.vue | 94 +++++---- .../components/customer-resources-edit.vue | 40 +++- .../customer_resources/customer_resources.vue | 7 +- .../components/departments-edit.vue | 17 +- .../src/app/views/departments/departments.vue | 22 +- .../components/market-performance-edit.vue | 189 ++++++++++++++++++ .../market_performance/market_performance.vue | 186 +++++++++++++++++ .../six-speed-modification-log-edit.vue | 32 ++- .../six_speed_modification_log.vue | 45 +++-- .../src/app/views/yjpz_config/yjpz_config.vue | 107 ++++++++++ .../campus_person_role/CampusPersonRole.php | 29 ++- .../customer_resources/CustomerResources.php | 11 +- .../controller/departments/Departments.php | 4 + .../market_performance/MarketPerformance.php | 99 +++++++++ .../SixSpeedModificationLog.php | 14 +- .../app/adminapi/controller/sys/System.php | 18 ++ .../app/adminapi/route/campus_person_role.php | 9 + .../app/adminapi/route/customer_resources.php | 3 + niucloud/app/adminapi/route/departments.php | 3 + .../app/adminapi/route/market_performance.php | 41 ++++ .../route/six_speed_modification_log.php | 6 + niucloud/app/adminapi/route/sys.php | 4 + niucloud/app/common.php | 21 ++ .../campus_person_role/CampusPersonRole.php | 66 +++--- .../customer_resources/CustomerResources.php | 6 + .../app/model/departments/Departments.php | 22 +- .../market_performance/MarketPerformance.php | 86 ++++++++ .../SixSpeedModificationLog.php | 60 ++---- .../CampusPersonRoleService.php | 28 ++- .../CustomerResourcesService.php | 12 +- .../admin/departments/DepartmentsService.php | 16 +- .../MarketPerformanceService.php | 111 ++++++++++ .../SixSpeedModificationLogService.php | 16 +- .../app/service/admin/sys/SystemService.php | 19 ++ .../campus_person_role/CampusPersonRole.php | 4 +- .../market_performance/MarketPerformance.php | 35 ++++ 48 files changed, 1481 insertions(+), 247 deletions(-) create mode 100644 admin/src/app/api/market_performance.ts create mode 100644 admin/src/app/lang/zh-cn/market_performance.market_performance.json create mode 100644 admin/src/app/views/market_performance/components/market-performance-edit.vue create mode 100644 admin/src/app/views/market_performance/market_performance.vue create mode 100644 admin/src/app/views/yjpz_config/yjpz_config.vue create mode 100644 niucloud/app/adminapi/controller/market_performance/MarketPerformance.php create mode 100644 niucloud/app/adminapi/route/market_performance.php create mode 100644 niucloud/app/model/market_performance/MarketPerformance.php create mode 100644 niucloud/app/service/admin/market_performance/MarketPerformanceService.php create mode 100644 niucloud/app/validate/market_performance/MarketPerformance.php diff --git a/admin/components.d.ts b/admin/components.d.ts index f54888df..6fdfa48f 100644 --- a/admin/components.d.ts +++ b/admin/components.d.ts @@ -10,6 +10,7 @@ declare module '@vue/runtime-core' { Attachment: typeof import('./src/components/upload-attachment/attachment.vue')['default'] DiyLink: typeof import('./src/components/diy-link/index.vue')['default'] Editor: typeof import('./src/components/editor/index.vue')['default'] + ElAlert: typeof import('element-plus/es')['ElAlert'] ElAside: typeof import('element-plus/es')['ElAside'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] @@ -17,15 +18,18 @@ declare module '@vue/runtime-core' { ElButton: typeof import('element-plus/es')['ElButton'] ElCard: typeof import('element-plus/es')['ElCard'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] + ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] ElCol: typeof import('element-plus/es')['ElCol'] ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElContainer: typeof import('element-plus/es')['ElContainer'] + ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElDrawer: typeof import('element-plus/es')['ElDrawer'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] + ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElHeader: typeof import('element-plus/es')['ElHeader'] @@ -34,15 +38,18 @@ declare module '@vue/runtime-core' { ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] ElInput: typeof import('element-plus/es')['ElInput'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] + ElLink: typeof import('element-plus/es')['ElLink'] ElMain: typeof import('element-plus/es')['ElMain'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] + ElOptionGroup: typeof import('element-plus/es')['ElOptionGroup'] ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] ElRadio: typeof import('element-plus/es')['ElRadio'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] + ElResult: typeof import('element-plus/es')['ElResult'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] diff --git a/admin/src/app/api/campus_person_role.ts b/admin/src/app/api/campus_person_role.ts index 049c4e3d..60a47a7d 100644 --- a/admin/src/app/api/campus_person_role.ts +++ b/admin/src/app/api/campus_person_role.ts @@ -2,6 +2,8 @@ import request from '@/utils/request' + + // USER_CODE_BEGIN -- campus_person_role /** * 获取角色关系列表 @@ -49,6 +51,14 @@ export function deleteCampusPersonRole(id: number) { return request.delete(`campus_person_role/campus_person_role/${id}`, { showErrorMessage: true, showSuccessMessage: true }) } - +export function getWithCampusList(params: Record){ + return request.get('campus_person_role/campus_all', {params}) +}export function getWithPersonnelList(params: Record){ + return request.get('campus_person_role/personnel_all', {params}) +}export function getWithSysRoleList(params: Record){ + return request.get('campus_person_role/sys_role_all', {params}) +}export function getWithDepartmentsList(params: Record){ + return request.get('campus_person_role/departments_all', {params}) +} // USER_CODE_END -- campus_person_role diff --git a/admin/src/app/api/customer_resources.ts b/admin/src/app/api/customer_resources.ts index 7ccd4a9f..475aa438 100644 --- a/admin/src/app/api/customer_resources.ts +++ b/admin/src/app/api/customer_resources.ts @@ -6,6 +6,8 @@ import request from '@/utils/request' + + // USER_CODE_BEGIN -- customer_resources /** * 获取客户资源列表 @@ -53,6 +55,8 @@ export function deleteCustomerResources(id: number) { return request.delete(`customer_resources/customer_resources/${id}`, { showErrorMessage: true, showSuccessMessage: true }) } - +export function getWithCampusList(params: Record){ + return request.get('customer_resources/campus_all', {params}) +} // USER_CODE_END -- customer_resources diff --git a/admin/src/app/api/departments.ts b/admin/src/app/api/departments.ts index 587426c0..8a1b0f73 100644 --- a/admin/src/app/api/departments.ts +++ b/admin/src/app/api/departments.ts @@ -1,5 +1,7 @@ import request from '@/utils/request' + + // USER_CODE_BEGIN -- departments /** * 获取部门列表 @@ -47,6 +49,8 @@ export function deleteDepartments(id: number) { return request.delete(`departments/departments/${id}`, { showErrorMessage: true, showSuccessMessage: true }) } - +export function getWithDepartmentsList(params: Record){ + return request.get('departments/departments_all', {params}) +} // USER_CODE_END -- departments diff --git a/admin/src/app/api/market_performance.ts b/admin/src/app/api/market_performance.ts new file mode 100644 index 00000000..10d25c4a --- /dev/null +++ b/admin/src/app/api/market_performance.ts @@ -0,0 +1,56 @@ +import request from '@/utils/request' + +// USER_CODE_BEGIN -- market_performance +/** + * 获取市场绩效列表 + * @param params + * @returns + */ +export function getMarketPerformanceList(params: Record) { + return request.get(`market_performance/market_performance`, {params}) +} + +/** + * 获取市场绩效详情 + * @param id 市场绩效id + * @returns + */ +export function getMarketPerformanceInfo(id: number) { + return request.get(`market_performance/market_performance/${id}`); +} + +/** + * 添加市场绩效 + * @param params + * @returns + */ +export function addMarketPerformance(params: Record) { + return request.post('market_performance/market_performance', params, { showErrorMessage: true, showSuccessMessage: true }) +} + +/** + * 编辑市场绩效 + * @param id + * @param params + * @returns + */ +export function editMarketPerformance(params: Record) { + return request.put(`market_performance/market_performance/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true }) +} + +/** + * 删除市场绩效 + * @param id + * @returns + */ +export function deleteMarketPerformance(id: number) { + return request.delete(`market_performance/market_performance/${id}`, { showErrorMessage: true, showSuccessMessage: true }) +} + +export function getWithPersonnelList(params: Record){ + return request.get('market_performance/personnel_all', {params}) +}export function getWithCampusList(params: Record){ + return request.get('market_performance/campus_all', {params}) +} + +// USER_CODE_END -- market_performance diff --git a/admin/src/app/api/six_speed_modification_log.ts b/admin/src/app/api/six_speed_modification_log.ts index 19a02c61..51ff3456 100644 --- a/admin/src/app/api/six_speed_modification_log.ts +++ b/admin/src/app/api/six_speed_modification_log.ts @@ -1,5 +1,9 @@ import request from '@/utils/request' + + + + // USER_CODE_BEGIN -- six_speed_modification_log /** * 获取六一速修改记录列表 @@ -47,6 +51,10 @@ export function deleteSixSpeedModificationLog(id: number) { return request.delete(`six_speed_modification_log/six_speed_modification_log/${id}`, { showErrorMessage: true, showSuccessMessage: true }) } - +export function getWithCampusList(params: Record){ + return request.get('six_speed_modification_log/campus_all', {params}) +}export function getWithPersonnelList(params: Record){ + return request.get('six_speed_modification_log/personnel_all', {params}) +} // USER_CODE_END -- six_speed_modification_log diff --git a/admin/src/app/api/sys.ts b/admin/src/app/api/sys.ts index 4a8e0259..b15605d7 100644 --- a/admin/src/app/api/sys.ts +++ b/admin/src/app/api/sys.ts @@ -754,3 +754,13 @@ export function deleteExport(id: number) { export function getInstallConfig() { return request.get('sys/install/config') } + +//业绩配置 + +export function getYjpzConfig() { + return request.get('sys/get_yjpz_config') +} + +export function yjpzConfig(params: Record) { + return request.post(`sys/yjpz_config`, params) +} diff --git a/admin/src/app/lang/zh-cn/campus_person_role.campus_person_role.json b/admin/src/app/lang/zh-cn/campus_person_role.campus_person_role.json index 761e1dfe..1f9858ac 100644 --- a/admin/src/app/lang/zh-cn/campus_person_role.campus_person_role.json +++ b/admin/src/app/lang/zh-cn/campus_person_role.campus_person_role.json @@ -1,20 +1,14 @@ { "id":"关系编号", "idPlaceholder":"请输入关系编号", - "campusId":"校区ID", - "campusIdPlaceholder":"请输入校区ID", - "personId":"人员ID", - "personIdPlaceholder":"请输入人员ID", - "roleId":"角色ID", - "roleIdPlaceholder":"请输入角色ID", + "campusId":"校区", + "campusIdPlaceholder":"全部", + "personId":"人员", + "personIdPlaceholder":"全部", + "roleId":"角色", + "roleIdPlaceholder":"全部", "deptId":"部门表", - "deptIdPlaceholder":"请输入部门表", - "createdAt":"创建时间", - "createdAtPlaceholder":"请输入创建时间", - "updatedAt":"更新时间", - "updatedAtPlaceholder":"请输入更新时间", - "deletedAt":"逻辑删除时间", - "deletedAtPlaceholder":"请输入逻辑删除时间", + "deptIdPlaceholder":"全部", "addCampusPersonRole":"添加角色关系", "updateCampusPersonRole":"编辑角色关系", "campusPersonRoleDeleteTips":"确定要删除该数据吗？", diff --git a/admin/src/app/lang/zh-cn/departments.departments.json b/admin/src/app/lang/zh-cn/departments.departments.json index 0903a446..2ec66514 100644 --- a/admin/src/app/lang/zh-cn/departments.departments.json +++ b/admin/src/app/lang/zh-cn/departments.departments.json @@ -3,8 +3,8 @@ "idPlaceholder":"请输入部门编号", "departmentName":"部门名称", "departmentNamePlaceholder":"请输入部门名称", - "parentDepartmentId":"上级部门", - "parentDepartmentIdPlaceholder":"请输入上级部门", + "parentDepartmentId":"上级部门ID", + "parentDepartmentIdPlaceholder":"全部", "addDepartments":"添加部门", "updateDepartments":"编辑部门", "departmentsDeleteTips":"确定要删除该数据吗？", diff --git a/admin/src/app/lang/zh-cn/market_performance.market_performance.json b/admin/src/app/lang/zh-cn/market_performance.market_performance.json new file mode 100644 index 00000000..8963d4ca --- /dev/null +++ b/admin/src/app/lang/zh-cn/market_performance.market_performance.json @@ -0,0 +1,13 @@ +{ + "personnelId":"人员", + "personnelIdPlaceholder":"请输入人员", + "campusId":"校区", + "campusIdPlaceholder":"全部", + "performanceAmount":"绩效金额", + "performanceAmountPlaceholder":"请输入绩效金额", + "addMarketPerformance":"添加市场绩效", + "updateMarketPerformance":"编辑市场绩效", + "marketPerformanceDeleteTips":"确定要删除该数据吗？", + "startDate":"请选择开始时间", + "endDate":"请选择结束时间" +} \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/six_speed_modification_log.six_speed_modification_log.json b/admin/src/app/lang/zh-cn/six_speed_modification_log.six_speed_modification_log.json index 7d08cca1..96780dc7 100644 --- a/admin/src/app/lang/zh-cn/six_speed_modification_log.six_speed_modification_log.json +++ b/admin/src/app/lang/zh-cn/six_speed_modification_log.six_speed_modification_log.json @@ -1,10 +1,10 @@ { "id":"编号", "idPlaceholder":"请输入编号", - "campusId":"校区ID", - "campusIdPlaceholder":"请输入校区ID", - "staffId":"人员ID", - "staffIdPlaceholder":"请输入人员ID", + "campusId":"校区", + "campusIdPlaceholder":"全部", + "staffId":"人员", + "staffIdPlaceholder":"请输入人员", "modifiedField":"修改的字段", "modifiedFieldPlaceholder":"请输入修改的字段", "oldValue":"修改前的值", diff --git a/admin/src/app/views/campus_person_role/campus_person_role.vue b/admin/src/app/views/campus_person_role/campus_person_role.vue index 47e99577..e7094b1a 100644 --- a/admin/src/app/views/campus_person_role/campus_person_role.vue +++ b/admin/src/app/views/campus_person_role/campus_person_role.vue @@ -11,27 +11,54 @@ + - + + + + + - + + + + + - + + + + + - - - - - - - + + + - - - + {{ t('search') }} {{ t('reset') }} @@ -44,19 +71,13 @@ - - - - - - - + - + - + - + - +