From 98abe41e8cfa2991079b788b2fa89a3bbe7b8dce Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Thu, 6 Mar 2025 14:24:37 +0800 Subject: [PATCH] =?UTF-8?q?feat(zhjw):=20=E6=96=87=E7=AB=A0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=92=8C=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在文章管理列表中添加创建时间和更新时间的筛选条件- 在后端增加相应的搜索器方法 - 更新前端界面，增加时间筛选的表单元素 - 优化数据模型，使用软删除标记字段 --- .gitignore | 8 + admin/.env.development | 2 +- admin/auto-imports.d.ts | 2 +- admin/components.d.ts | 1 + admin/src/addon/zhjw/api/articles.ts | 6 + admin/src/addon/zhjw/api/contracts.ts | 62 ++ admin/src/addon/zhjw/api/orders.ts | 56 ++ admin/src/addon/zhjw/api/students.ts | 58 ++ admin/src/addon/zhjw/api/users.ts | 62 ++ .../zhjw/lang/zh-cn/articles.articles.json | 7 +- .../lang/zh-cn/articles.articles_edit.json | 2 +- .../zhjw/lang/zh-cn/contracts.contracts.json | 21 + .../lang/zh-cn/contracts.contracts_edit.json | 19 + .../addon/zhjw/lang/zh-cn/orders.orders.json | 26 + .../zhjw/lang/zh-cn/orders.orders_edit.json | 19 + .../zhjw/lang/zh-cn/students.students.json | 25 + .../lang/zh-cn/students.students_edit.json | 19 + .../addon/zhjw/lang/zh-cn/users.users.json | 88 +++ .../zhjw/lang/zh-cn/users.users_edit.json | 87 +++ .../addon/zhjw/views/articles/articles.vue | 43 +- .../zhjw/views/articles/articles_edit.vue | 31 +- .../addon/zhjw/views/contracts/contracts.vue | 244 +++++++ .../zhjw/views/contracts/contracts_edit.vue | 243 +++++++ admin/src/addon/zhjw/views/orders/orders.vue | 323 +++++++++ .../addon/zhjw/views/orders/orders_edit.vue | 279 ++++++++ .../addon/zhjw/views/students/students.vue | 249 +++++++ .../zhjw/views/students/students_edit.vue | 226 +++++++ .../views/users/components/users-edit.vue | 615 ++++++++++++++++++ admin/src/addon/zhjw/views/users/users.vue | 481 ++++++++++++++ .../src/addon/zhjw/views/users/users_edit.vue | 612 +++++++++++++++++ niucloud/.env | 2 +- niucloud/addon/zhjw/admin/api/articles.ts | 6 + niucloud/addon/zhjw/admin/api/contracts.ts | 62 ++ niucloud/addon/zhjw/admin/api/orders.ts | 56 ++ niucloud/addon/zhjw/admin/api/students.ts | 58 ++ niucloud/addon/zhjw/admin/api/users.ts | 62 ++ .../admin/lang/zh-cn/articles.articles.json | 7 +- .../lang/zh-cn/articles.articles_edit.json | 2 +- .../admin/lang/zh-cn/contracts.contracts.json | 21 + .../lang/zh-cn/contracts.contracts_edit.json | 19 + .../zhjw/admin/lang/zh-cn/orders.orders.json | 26 + .../admin/lang/zh-cn/orders.orders_edit.json | 19 + .../admin/lang/zh-cn/students.students.json | 25 + .../lang/zh-cn/students.students_edit.json | 19 + .../zhjw/admin/lang/zh-cn/users.users.json | 88 +++ .../admin/lang/zh-cn/users.users_edit.json | 87 +++ .../zhjw/admin/views/articles/articles.vue | 43 +- .../admin/views/articles/articles_edit.vue | 31 +- .../zhjw/admin/views/contracts/contracts.vue | 244 +++++++ .../admin/views/contracts/contracts_edit.vue | 243 +++++++ .../addon/zhjw/admin/views/orders/orders.vue | 323 +++++++++ .../zhjw/admin/views/orders/orders_edit.vue | 279 ++++++++ .../zhjw/admin/views/students/students.vue | 249 +++++++ .../admin/views/students/students_edit.vue | 226 +++++++ .../views/users/components/users-edit.vue | 615 ++++++++++++++++++ .../addon/zhjw/admin/views/users/users.vue | 481 ++++++++++++++ .../zhjw/admin/views/users/users_edit.vue | 612 +++++++++++++++++ .../adminapi/controller/articles/Articles.php | 5 +- .../controller/contracts/Contracts.php | 106 +++ .../app/adminapi/controller/orders/Orders.php | 112 ++++ .../adminapi/controller/students/Students.php | 108 +++ .../app/adminapi/controller/users/Users.php | 205 ++++++ .../addon/zhjw/app/adminapi/route/route.php | 111 ++++ .../zhjw/app/model/articles/Articles.php | 52 +- .../zhjw/app/model/contracts/Contracts.php | 154 +++++ .../addon/zhjw/app/model/orders/Orders.php | 184 ++++++ .../zhjw/app/model/students/Students.php | 178 +++++ niucloud/addon/zhjw/app/model/users/Users.php | 520 +++++++++++++++ .../admin/articles/ArticlesService.php | 8 +- .../admin/contracts/ContractsService.php | 105 +++ .../service/admin/orders/OrdersService.php | 112 ++++ .../admin/students/StudentsService.php | 105 +++ .../app/service/admin/users/UsersService.php | 104 +++ .../zhjw/app/validate/articles/Articles.php | 2 - .../zhjw/app/validate/contracts/Contracts.php | 37 ++ .../addon/zhjw/app/validate/orders/Orders.php | 46 ++ .../zhjw/app/validate/students/Students.php | 43 ++ .../addon/zhjw/app/validate/users/Users.php | 49 ++ .../app/service/admin/sys/MenuService.php | 2 +- .../00/796846cef72c1934f657158416effa.php | 4 + .../07/4bfa60510f475862a98e416426f451.php | 4 + .../08/cd218d3b0adb213bef402dcf69ffe7.php | 4 + .../09/f3d0b8f0a6d3610ef23e49d64d2f4f.php | 4 + .../0f/031b5cb7088c6004d3b5522558e3ee.php | 4 + .../10/d14b034379d95ab08972c164bd0273.php | 4 + .../13/0f87a1a4853b499cad67dae67fbbc5.php | 4 + .../1a/fde0018bb1f6dadf6e9cc67514074e.php | 4 + .../1f/893a713f7527421da280edd52452e1.php | 4 + .../20/336a007c8134208722cf4e14270f07.php | 2 +- .../25/380f91a13166c6be2a0a568ff0aba5.php | 4 + .../2c/e25dcb326df717900650d384ad7cf0.php | 2 +- .../32/0a87fb2f5a7e9725055a2c99bd1e51.php | 2 +- .../33/90cfdce4f303504facffc42620c48f.php | 4 + .../3c/e760faa975bb7ccb960047660d6e14.php | 4 + .../47/0f6e29f334d3244ee0749eb9b1a151.php | 4 + .../48/d6f2efc72c165d1f15db38570485f6.php | 4 + .../65/00bade063d7694b05ef06dcbf711a5.php | 4 + .../69/75acdbf213ccfe0e2f593a09691914.php | 4 + .../69/a49e80c01c8ac6301283724181433f.php | 4 + .../72/3ee2b5cca5d08bc4a333825c70f9c4.php | 4 - .../72/b1ac44456e27d97cfbcf004714465d.php | 4 + .../85/dff97d885b41077c47958d953c2dbd.php | 4 + .../8d/4b55ce338f9b3a100a33ac8e8243e8.php | 2 +- .../8d/fdacbfbb7ae58ba988054e909e2307.php | 2 +- .../96/42cea4fc1e386bb972a5e5dec82fda.php | 4 + .../ab/555ef399e65432b53f574cc953b7bb.php | 4 + .../ad/c87e1739067abc5b5e3de74360bf1c.php | 4 + .../b3/6fb18ab2155bbb2d24835ee0bbbcb8.php | 4 + .../b3/aebaa682a404a28967529462f051f7.php | 4 + .../b9/4985fd0d957b4ae2893ad0913c7f32.php | 4 + .../bd/359a5364051f6c84d65c787bf23f9a.php | 4 + .../be/dce92610cb76bf49f7ad23a48eb701.php | 4 + .../d9/a8c8a97892236f5eff1aee75a5cca0.php | 4 + .../e6/4fc76dda14fbc5751756c129210398.php | 4 + .../ea/6d1cebafb6a3a9d76cac7c5b977942.php | 4 + .../fd/12f4f5e17a15190420d7398a28ca9c.php | 4 + 116 files changed, 10226 insertions(+), 81 deletions(-) create mode 100644 admin/src/addon/zhjw/api/contracts.ts create mode 100644 admin/src/addon/zhjw/api/orders.ts create mode 100644 admin/src/addon/zhjw/api/students.ts create mode 100644 admin/src/addon/zhjw/api/users.ts create mode 100644 admin/src/addon/zhjw/lang/zh-cn/contracts.contracts.json create mode 100644 admin/src/addon/zhjw/lang/zh-cn/contracts.contracts_edit.json create mode 100644 admin/src/addon/zhjw/lang/zh-cn/orders.orders.json create mode 100644 admin/src/addon/zhjw/lang/zh-cn/orders.orders_edit.json create mode 100644 admin/src/addon/zhjw/lang/zh-cn/students.students.json create mode 100644 admin/src/addon/zhjw/lang/zh-cn/students.students_edit.json create mode 100644 admin/src/addon/zhjw/lang/zh-cn/users.users.json create mode 100644 admin/src/addon/zhjw/lang/zh-cn/users.users_edit.json create mode 100644 admin/src/addon/zhjw/views/contracts/contracts.vue create mode 100644 admin/src/addon/zhjw/views/contracts/contracts_edit.vue create mode 100644 admin/src/addon/zhjw/views/orders/orders.vue create mode 100644 admin/src/addon/zhjw/views/orders/orders_edit.vue create mode 100644 admin/src/addon/zhjw/views/students/students.vue create mode 100644 admin/src/addon/zhjw/views/students/students_edit.vue create mode 100644 admin/src/addon/zhjw/views/users/components/users-edit.vue create mode 100644 admin/src/addon/zhjw/views/users/users.vue create mode 100644 admin/src/addon/zhjw/views/users/users_edit.vue create mode 100644 niucloud/addon/zhjw/admin/api/contracts.ts create mode 100644 niucloud/addon/zhjw/admin/api/orders.ts create mode 100644 niucloud/addon/zhjw/admin/api/students.ts create mode 100644 niucloud/addon/zhjw/admin/api/users.ts create mode 100644 niucloud/addon/zhjw/admin/lang/zh-cn/contracts.contracts.json create mode 100644 niucloud/addon/zhjw/admin/lang/zh-cn/contracts.contracts_edit.json create mode 100644 niucloud/addon/zhjw/admin/lang/zh-cn/orders.orders.json create mode 100644 niucloud/addon/zhjw/admin/lang/zh-cn/orders.orders_edit.json create mode 100644 niucloud/addon/zhjw/admin/lang/zh-cn/students.students.json create mode 100644 niucloud/addon/zhjw/admin/lang/zh-cn/students.students_edit.json create mode 100644 niucloud/addon/zhjw/admin/lang/zh-cn/users.users.json create mode 100644 niucloud/addon/zhjw/admin/lang/zh-cn/users.users_edit.json create mode 100644 niucloud/addon/zhjw/admin/views/contracts/contracts.vue create mode 100644 niucloud/addon/zhjw/admin/views/contracts/contracts_edit.vue create mode 100644 niucloud/addon/zhjw/admin/views/orders/orders.vue create mode 100644 niucloud/addon/zhjw/admin/views/orders/orders_edit.vue create mode 100644 niucloud/addon/zhjw/admin/views/students/students.vue create mode 100644 niucloud/addon/zhjw/admin/views/students/students_edit.vue create mode 100644 niucloud/addon/zhjw/admin/views/users/components/users-edit.vue create mode 100644 niucloud/addon/zhjw/admin/views/users/users.vue create mode 100644 niucloud/addon/zhjw/admin/views/users/users_edit.vue create mode 100644 niucloud/addon/zhjw/app/adminapi/controller/contracts/Contracts.php create mode 100644 niucloud/addon/zhjw/app/adminapi/controller/orders/Orders.php create mode 100644 niucloud/addon/zhjw/app/adminapi/controller/students/Students.php create mode 100644 niucloud/addon/zhjw/app/adminapi/controller/users/Users.php create mode 100644 niucloud/addon/zhjw/app/model/contracts/Contracts.php create mode 100644 niucloud/addon/zhjw/app/model/orders/Orders.php create mode 100644 niucloud/addon/zhjw/app/model/students/Students.php create mode 100644 niucloud/addon/zhjw/app/model/users/Users.php create mode 100644 niucloud/addon/zhjw/app/service/admin/contracts/ContractsService.php create mode 100644 niucloud/addon/zhjw/app/service/admin/orders/OrdersService.php create mode 100644 niucloud/addon/zhjw/app/service/admin/students/StudentsService.php create mode 100644 niucloud/addon/zhjw/app/service/admin/users/UsersService.php create mode 100644 niucloud/addon/zhjw/app/validate/contracts/Contracts.php create mode 100644 niucloud/addon/zhjw/app/validate/orders/Orders.php create mode 100644 niucloud/addon/zhjw/app/validate/students/Students.php create mode 100644 niucloud/addon/zhjw/app/validate/users/Users.php create mode 100644 niucloud/runtime/cache/00/796846cef72c1934f657158416effa.php create mode 100644 niucloud/runtime/cache/07/4bfa60510f475862a98e416426f451.php create mode 100644 niucloud/runtime/cache/08/cd218d3b0adb213bef402dcf69ffe7.php create mode 100644 niucloud/runtime/cache/09/f3d0b8f0a6d3610ef23e49d64d2f4f.php create mode 100644 niucloud/runtime/cache/0f/031b5cb7088c6004d3b5522558e3ee.php create mode 100644 niucloud/runtime/cache/10/d14b034379d95ab08972c164bd0273.php create mode 100644 niucloud/runtime/cache/13/0f87a1a4853b499cad67dae67fbbc5.php create mode 100644 niucloud/runtime/cache/1a/fde0018bb1f6dadf6e9cc67514074e.php create mode 100644 niucloud/runtime/cache/1f/893a713f7527421da280edd52452e1.php create mode 100644 niucloud/runtime/cache/25/380f91a13166c6be2a0a568ff0aba5.php create mode 100644 niucloud/runtime/cache/33/90cfdce4f303504facffc42620c48f.php create mode 100644 niucloud/runtime/cache/3c/e760faa975bb7ccb960047660d6e14.php create mode 100644 niucloud/runtime/cache/47/0f6e29f334d3244ee0749eb9b1a151.php create mode 100644 niucloud/runtime/cache/48/d6f2efc72c165d1f15db38570485f6.php create mode 100644 niucloud/runtime/cache/65/00bade063d7694b05ef06dcbf711a5.php create mode 100644 niucloud/runtime/cache/69/75acdbf213ccfe0e2f593a09691914.php create mode 100644 niucloud/runtime/cache/69/a49e80c01c8ac6301283724181433f.php delete mode 100644 niucloud/runtime/cache/72/3ee2b5cca5d08bc4a333825c70f9c4.php create mode 100644 niucloud/runtime/cache/72/b1ac44456e27d97cfbcf004714465d.php create mode 100644 niucloud/runtime/cache/85/dff97d885b41077c47958d953c2dbd.php create mode 100644 niucloud/runtime/cache/96/42cea4fc1e386bb972a5e5dec82fda.php create mode 100644 niucloud/runtime/cache/ab/555ef399e65432b53f574cc953b7bb.php create mode 100644 niucloud/runtime/cache/ad/c87e1739067abc5b5e3de74360bf1c.php create mode 100644 niucloud/runtime/cache/b3/6fb18ab2155bbb2d24835ee0bbbcb8.php create mode 100644 niucloud/runtime/cache/b3/aebaa682a404a28967529462f051f7.php create mode 100644 niucloud/runtime/cache/b9/4985fd0d957b4ae2893ad0913c7f32.php create mode 100644 niucloud/runtime/cache/bd/359a5364051f6c84d65c787bf23f9a.php create mode 100644 niucloud/runtime/cache/be/dce92610cb76bf49f7ad23a48eb701.php create mode 100644 niucloud/runtime/cache/d9/a8c8a97892236f5eff1aee75a5cca0.php create mode 100644 niucloud/runtime/cache/e6/4fc76dda14fbc5751756c129210398.php create mode 100644 niucloud/runtime/cache/ea/6d1cebafb6a3a9d76cac7c5b977942.php create mode 100644 niucloud/runtime/cache/fd/12f4f5e17a15190420d7398a28ca9c.php diff --git a/.gitignore b/.gitignore index 06c632a7..9f48d19e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,11 @@ +/.project +/.vscode +/.settings +/.buildpath +*.log +*.txt +/.idea + # Build and Release Folders bin-debug/ bin-release/ diff --git a/admin/.env.development b/admin/.env.development index 8a72f388..2ff157d2 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -1,5 +1,5 @@ # api请求地址 -VITE_APP_BASE_URL='http://146.56.228.75:20021/adminapi/' +VITE_APP_BASE_URL='http://zhjw.cc/adminapi/' # 图片服务器地址 VITE_IMG_DOMAIN='' diff --git a/admin/auto-imports.d.ts b/admin/auto-imports.d.ts index 08908edd..a51b7a66 100644 --- a/admin/auto-imports.d.ts +++ b/admin/auto-imports.d.ts @@ -1,5 +1,5 @@ // Generated by 'unplugin-auto-import' export {} declare global { - + const ElNotification: typeof import('element-plus/es')['ElNotification'] } diff --git a/admin/components.d.ts b/admin/components.d.ts index 85639707..07bf4ae6 100644 --- a/admin/components.d.ts +++ b/admin/components.d.ts @@ -22,6 +22,7 @@ declare module '@vue/runtime-core' { 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'] diff --git a/admin/src/addon/zhjw/api/articles.ts b/admin/src/addon/zhjw/api/articles.ts index 4f6ccac3..be13b4f4 100644 --- a/admin/src/addon/zhjw/api/articles.ts +++ b/admin/src/addon/zhjw/api/articles.ts @@ -1,5 +1,11 @@ import request from '@/utils/request' + + + + + + // USER_CODE_BEGIN -- zhjw_articles /** * 获取文章管理列表 diff --git a/admin/src/addon/zhjw/api/contracts.ts b/admin/src/addon/zhjw/api/contracts.ts new file mode 100644 index 00000000..608b3f80 --- /dev/null +++ b/admin/src/addon/zhjw/api/contracts.ts @@ -0,0 +1,62 @@ +import request from '@/utils/request' + + + + + + + + + +// USER_CODE_BEGIN -- zhjw_contracts +/** + * 获取合同管理列表 + * @param params + * @returns + */ +export function getContractsList(params: Record) { + return request.get(`zhjw/contracts`, {params}) +} + +/** + * 获取合同管理详情 + * @param id 合同管理id + * @returns + */ +export function getContractsInfo(id: number) { + return request.get(`zhjw/contracts/${id}`); +} + +/** + * 添加合同管理 + * @param params + * @returns + */ +export function addContracts(params: Record) { + return request.post('zhjw/contracts', params, { showErrorMessage: true, showSuccessMessage: true }) +} + +/** + * 编辑合同管理 + * @param id + * @param params + * @returns + */ +export function editContracts(params: Record) { + return request.put(`zhjw/contracts/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true }) +} + +/** + * 删除合同管理 + * @param id + * @returns + */ +export function deleteContracts(id: number) { + return request.delete(`zhjw/contracts/${id}`, { showErrorMessage: true, showSuccessMessage: true }) +} + +export function getWithUsersList(params: Record){ + return request.get('zhjw/users_all', {params}) +} + +// USER_CODE_END -- zhjw_contracts diff --git a/admin/src/addon/zhjw/api/orders.ts b/admin/src/addon/zhjw/api/orders.ts new file mode 100644 index 00000000..1ec89b42 --- /dev/null +++ b/admin/src/addon/zhjw/api/orders.ts @@ -0,0 +1,56 @@ +import request from '@/utils/request' + +// USER_CODE_BEGIN -- zhjw_orders +/** + * 获取智慧教务-订单管理列表 + * @param params + * @returns + */ +export function getOrdersList(params: Record) { + return request.get(`zhjw/orders`, {params}) +} + +/** + * 获取智慧教务-订单管理详情 + * @param id 智慧教务-订单管理id + * @returns + */ +export function getOrdersInfo(id: number) { + return request.get(`zhjw/orders/${id}`); +} + +/** + * 添加智慧教务-订单管理 + * @param params + * @returns + */ +export function addOrders(params: Record) { + return request.post('zhjw/orders', params, { showErrorMessage: true, showSuccessMessage: true }) +} + +/** + * 编辑智慧教务-订单管理 + * @param id + * @param params + * @returns + */ +export function editOrders(params: Record) { + return request.put(`zhjw/orders/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true }) +} + +/** + * 删除智慧教务-订单管理 + * @param id + * @returns + */ +export function deleteOrders(id: number) { + return request.delete(`zhjw/orders/${id}`, { showErrorMessage: true, showSuccessMessage: true }) +} + +export function getWithMemberList(params: Record){ + return request.get('zhjw/member_all', {params}) +}export function getWithContractsList(params: Record){ + return request.get('zhjw/contracts_all', {params}) +} + +// USER_CODE_END -- zhjw_orders diff --git a/admin/src/addon/zhjw/api/students.ts b/admin/src/addon/zhjw/api/students.ts new file mode 100644 index 00000000..84b646d1 --- /dev/null +++ b/admin/src/addon/zhjw/api/students.ts @@ -0,0 +1,58 @@ +import request from '@/utils/request' + + + + + +// USER_CODE_BEGIN -- zhjw_students +/** + * 获取学员管理列表 + * @param params + * @returns + */ +export function getStudentsList(params: Record) { + return request.get(`zhjw/students`, {params}) +} + +/** + * 获取学员管理详情 + * @param id 学员管理id + * @returns + */ +export function getStudentsInfo(id: number) { + return request.get(`zhjw/students/${id}`); +} + +/** + * 添加学员管理 + * @param params + * @returns + */ +export function addStudents(params: Record) { + return request.post('zhjw/students', params, { showErrorMessage: true, showSuccessMessage: true }) +} + +/** + * 编辑学员管理 + * @param id + * @param params + * @returns + */ +export function editStudents(params: Record) { + return request.put(`zhjw/students/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true }) +} + +/** + * 删除学员管理 + * @param id + * @returns + */ +export function deleteStudents(id: number) { + return request.delete(`zhjw/students/${id}`, { showErrorMessage: true, showSuccessMessage: true }) +} + +export function getWithUsersList(params: Record){ + return request.get('zhjw/users_all', {params}) +} + +// USER_CODE_END -- zhjw_students diff --git a/admin/src/addon/zhjw/api/users.ts b/admin/src/addon/zhjw/api/users.ts new file mode 100644 index 00000000..68308fb0 --- /dev/null +++ b/admin/src/addon/zhjw/api/users.ts @@ -0,0 +1,62 @@ +import request from '@/utils/request' + + + + + + + + + +// USER_CODE_BEGIN -- zhjw_users +/** + * 获取用户管理列表 + * @param params + * @returns + */ +export function getUsersList(params: Record) { + return request.get(`zhjw/users`, {params}) +} + +/** + * 获取用户管理详情 + * @param member_id 用户管理member_id + * @returns + */ +export function getUsersInfo(member_id: number) { + return request.get(`zhjw/users/${member_id}`); +} + +/** + * 添加用户管理 + * @param params + * @returns + */ +export function addUsers(params: Record) { + return request.post('zhjw/users', params, { showErrorMessage: true, showSuccessMessage: true }) +} + +/** + * 编辑用户管理 + * @param member_id + * @param params + * @returns + */ +export function editUsers(params: Record) { + return request.put(`zhjw/users/${params.member_id}`, params, { showErrorMessage: true, showSuccessMessage: true }) +} + +/** + * 删除用户管理 + * @param member_id + * @returns + */ +export function deleteUsers(member_id: number) { + return request.delete(`zhjw/users/${member_id}`, { showErrorMessage: true, showSuccessMessage: true }) +} + +export function getWithUsersList(params: Record){ + return request.get('zhjw/users_all', {params}) +} + +// USER_CODE_END -- zhjw_users diff --git a/admin/src/addon/zhjw/lang/zh-cn/articles.articles.json b/admin/src/addon/zhjw/lang/zh-cn/articles.articles.json index 384ce01c..483f7259 100644 --- a/admin/src/addon/zhjw/lang/zh-cn/articles.articles.json +++ b/admin/src/addon/zhjw/lang/zh-cn/articles.articles.json @@ -1,14 +1,17 @@ { + "id":"序号", "title":"标题", "titlePlaceholder":"请输入标题", - "content":"内容", - "contentPlaceholder":"请输入内容", "category":"文章分类", "categoryPlaceholder":"请输入文章分类", "publisherId":"发布人", "publisherIdPlaceholder":"全部", "status":"状态", "statusPlaceholder":"请输入状态", + "createTime":"添加时间", + "createTimePlaceholder":"请输入添加时间", + "updateTime":"更新时间", + "updateTimePlaceholder":"请输入更新时间", "addArticles":"添加文章管理", "updateArticles":"编辑文章管理", "articlesDeleteTips":"确定要删除该数据吗？", diff --git a/admin/src/addon/zhjw/lang/zh-cn/articles.articles_edit.json b/admin/src/addon/zhjw/lang/zh-cn/articles.articles_edit.json index b9269c1c..7ebb27f2 100644 --- a/admin/src/addon/zhjw/lang/zh-cn/articles.articles_edit.json +++ b/admin/src/addon/zhjw/lang/zh-cn/articles.articles_edit.json @@ -8,7 +8,7 @@ "contentPlaceholder":"请输入内容", "categoryPlaceholder":"请选择文章分类", "publisherIdPlaceholder":"请选择发布人", - "statusPlaceholder":"请输入状态", + "statusPlaceholder":"请选择状态", "addArticles":"添加文章管理", "updateArticles":"编辑文章管理", "articlesDeleteTips":"确定要删除该文章管理吗？" diff --git a/admin/src/addon/zhjw/lang/zh-cn/contracts.contracts.json b/admin/src/addon/zhjw/lang/zh-cn/contracts.contracts.json new file mode 100644 index 00000000..4494b707 --- /dev/null +++ b/admin/src/addon/zhjw/lang/zh-cn/contracts.contracts.json @@ -0,0 +1,21 @@ +{ + "id":"序号", + "studentId":"学员", + "studentIdPlaceholder":"全部", + "title":"合同名称", + "titlePlaceholder":"请输入合同名称", + "startDate":"生效日期", + "startDatePlaceholder":"请输入生效日期", + "endDate":"终止日期", + "endDatePlaceholder":"请输入终止日期", + "status":"状态", + "statusPlaceholder":"请输入状态", + "createTime":"添加时间", + "createTimePlaceholder":"请输入添加时间", + "updateTime":"更新时间", + "addContracts":"添加合同管理", + "updateContracts":"编辑合同管理", + "contractsDeleteTips":"确定要删除该数据吗？", + "startDate":"请选择开始时间", + "endDate":"请选择结束时间" +} \ No newline at end of file diff --git a/admin/src/addon/zhjw/lang/zh-cn/contracts.contracts_edit.json b/admin/src/addon/zhjw/lang/zh-cn/contracts.contracts_edit.json new file mode 100644 index 00000000..65f73be9 --- /dev/null +++ b/admin/src/addon/zhjw/lang/zh-cn/contracts.contracts_edit.json @@ -0,0 +1,19 @@ +{ + "studentId":"学员", + "title":"合同名称", + "content":"合同内容", + "fileData":"合同文件路径", + "startDate":"生效日期", + "endDate":"终止日期", + "status":"状态", + "studentIdPlaceholder":"请选择学员", + "titlePlaceholder":"请输入合同名称", + "contentPlaceholder":"请输入合同内容", + "fileDataPlaceholder":"请输入合同文件路径", + "startDatePlaceholder":"请选择生效日期", + "endDatePlaceholder":"请选择终止日期", + "statusPlaceholder":"请选择状态", + "addContracts":"添加合同管理", + "updateContracts":"编辑合同管理", + "contractsDeleteTips":"确定要删除该合同管理吗？" +} \ No newline at end of file diff --git a/admin/src/addon/zhjw/lang/zh-cn/orders.orders.json b/admin/src/addon/zhjw/lang/zh-cn/orders.orders.json new file mode 100644 index 00000000..56fc98c1 --- /dev/null +++ b/admin/src/addon/zhjw/lang/zh-cn/orders.orders.json @@ -0,0 +1,26 @@ +{ + "id":"序号", + "studentId":"学员", + "studentIdPlaceholder":"全部", + "contractId":"关联合同", + "contractIdPlaceholder":"全部", + "amount":"订单金额", + "amountPlaceholder":"请输入订单金额", + "orderType":"订单类型", + "orderTypePlaceholder":"请输入订单类型", + "payType":"支付类型", + "payTypePlaceholder":"请输入支付类型", + "paymentStatus":"支付状态", + "paymentStatusPlaceholder":"请输入支付状态", + "paymentTime":"支付时间", + "paymentTimePlaceholder":"请输入支付时间", + "createTime":"添加时间", + "createTimePlaceholder":"请输入添加时间", + "updateTime":"更新时间", + "isDeleted":"是否删除", + "addOrders":"添加智慧教务-订单管理", + "updateOrders":"编辑智慧教务-订单管理", + "ordersDeleteTips":"确定要删除该数据吗？", + "startDate":"请选择开始时间", + "endDate":"请选择结束时间" +} \ No newline at end of file diff --git a/admin/src/addon/zhjw/lang/zh-cn/orders.orders_edit.json b/admin/src/addon/zhjw/lang/zh-cn/orders.orders_edit.json new file mode 100644 index 00000000..c2bce616 --- /dev/null +++ b/admin/src/addon/zhjw/lang/zh-cn/orders.orders_edit.json @@ -0,0 +1,19 @@ +{ + "studentId":"学员", + "contractId":"关联合同", + "amount":"订单金额", + "orderType":"订单类型", + "payType":"支付类型", + "paymentStatus":"支付状态", + "paymentTime":"支付时间", + "studentIdPlaceholder":"请选择学员", + "contractIdPlaceholder":"请选择关联合同", + "amountPlaceholder":"请输入订单金额", + "orderTypePlaceholder":"请选择订单类型", + "payTypePlaceholder":"请选择支付类型", + "paymentStatusPlaceholder":"请选择支付状态", + "paymentTimePlaceholder":"请选择支付时间", + "addOrders":"添加智慧教务-订单管理", + "updateOrders":"编辑智慧教务-订单管理", + "ordersDeleteTips":"确定要删除该智慧教务-订单管理吗？" +} \ No newline at end of file diff --git a/admin/src/addon/zhjw/lang/zh-cn/students.students.json b/admin/src/addon/zhjw/lang/zh-cn/students.students.json new file mode 100644 index 00000000..e3988896 --- /dev/null +++ b/admin/src/addon/zhjw/lang/zh-cn/students.students.json @@ -0,0 +1,25 @@ +{ + "id":"序号", + "name":"姓名", + "namePlaceholder":"请输入姓名", + "userId":"关联用户", + "userIdPlaceholder":"全部", + "haveStudyTime":"学员有效学时", + "haveStudyTimePlaceholder":"请输入学员有效学时", + "endStudyTime":"学员完成学时", + "endStudyTimePlaceholder":"请输入学员完成学时", + "emergencyContact":"紧急联系人", + "emergencyContactPlaceholder":"请输入紧急联系人", + "level":"学员等级", + "levelPlaceholder":"请输入学员等级", + "status":"状态", + "statusPlaceholder":"请输入状态", + "createTime":"添加时间", + "createTimePlaceholder":"请输入添加时间", + "updateTime":"更新时间", + "addStudents":"添加学员管理", + "updateStudents":"编辑学员管理", + "studentsDeleteTips":"确定要删除该数据吗？", + "startDate":"请选择开始时间", + "endDate":"请选择结束时间" +} \ No newline at end of file diff --git a/admin/src/addon/zhjw/lang/zh-cn/students.students_edit.json b/admin/src/addon/zhjw/lang/zh-cn/students.students_edit.json new file mode 100644 index 00000000..2b871db7 --- /dev/null +++ b/admin/src/addon/zhjw/lang/zh-cn/students.students_edit.json @@ -0,0 +1,19 @@ +{ + "name":"姓名", + "userId":"关联用户", + "haveStudyTime":"学员有效学时", + "endStudyTime":"学员完成学时", + "emergencyContact":"紧急联系人", + "level":"学员等级", + "status":"状态", + "namePlaceholder":"请输入姓名", + "userIdPlaceholder":"请选择关联用户", + "haveStudyTimePlaceholder":"请输入学员有效学时", + "endStudyTimePlaceholder":"请输入学员完成学时", + "emergencyContactPlaceholder":"请输入紧急联系人", + "levelPlaceholder":"请输入学员等级", + "statusPlaceholder":"请选择状态", + "addStudents":"添加学员管理", + "updateStudents":"编辑学员管理", + "studentsDeleteTips":"确定要删除该学员管理吗？" +} \ No newline at end of file diff --git a/admin/src/addon/zhjw/lang/zh-cn/users.users.json b/admin/src/addon/zhjw/lang/zh-cn/users.users.json new file mode 100644 index 00000000..00c35ca3 --- /dev/null +++ b/admin/src/addon/zhjw/lang/zh-cn/users.users.json @@ -0,0 +1,88 @@ +{ + "memberId":"序号", + "memberNo":"会员编码", + "pid":"推广会员", + "username":"会员用户名", + "usernamePlaceholder":"请输入会员用户名", + "mobile":"手机号", + "mobilePlaceholder":"请输入手机号", + "password":"会员密码", + "nickname":"会员昵称", + "nicknamePlaceholder":"请输入会员昵称", + "headimg":"会员头像", + "memberLevel":"会员等级", + "memberLevelPlaceholder":"请输入会员等级", + "memberLabel":"会员标签", + "memberLabelPlaceholder":"请输入会员标签", + "wxOpenid":"微信用户openid", + "wxOpenidPlaceholder":"请输入微信用户openid", + "weappOpenid":"微信小程序openid", + "weappOpenidPlaceholder":"请输入微信小程序openid", + "wxUnionid":"微信unionid", + "wxUnionidPlaceholder":"请输入微信unionid", + "aliOpenid":"支付宝账户id", + "aliOpenidPlaceholder":"请输入支付宝账户id", + "douyinOpenid":"抖音小程序openid", + "douyinOpenidPlaceholder":"请输入抖音小程序openid", + "registerChannel":"注册来源", + "registerChannelPlaceholder":"请输入注册来源", + "registerType":"注册方式", + "registerTypePlaceholder":"请输入注册方式", + "loginIp":"当前登录ip", + "loginIpPlaceholder":"请输入当前登录ip", + "loginType":"当前登录的操作终端类型", + "loginTypePlaceholder":"请输入当前登录的操作终端类型", + "loginChannel":"登录渠道", + "loginChannelPlaceholder":"请输入登录渠道", + "loginCount":"登录次数", + "loginCountPlaceholder":"请输入登录次数", + "loginTime":"当前登录时间", + "loginTimePlaceholder":"请输入当前登录时间", + "lastVisitTime":"最后访问时间", + "lastVisitTimePlaceholder":"请输入最后访问时间", + "lastConsumTime":"最后消费时间", + "lastConsumTimePlaceholder":"请输入最后消费时间", + "sex":"性别", + "sexPlaceholder":"请输入性别", + "status":"用户状态", + "statusPlaceholder":"请输入用户状态", + "birthday":"出生日期", + "birthdayPlaceholder":"请输入出生日期", + "point":"可用积分", + "pointPlaceholder":"请输入可用积分", + "pointGet":"累计获取积分", + "pointGetPlaceholder":"请输入累计获取积分", + "balance":"可用余额", + "balancePlaceholder":"请输入可用余额", + "balanceGet":"累计获取余额", + "balanceGetPlaceholder":"请输入累计获取余额", + "money":"可用余额（可提现）", + "moneyPlaceholder":"请输入可用余额（可提现）", + "moneyGet":"累计获取余额（可提现）", + "moneyGetPlaceholder":"请输入累计获取余额（可提现）", + "moneyCashOuting":"提现中余额（可提现）", + "moneyCashOutingPlaceholder":"请输入提现中余额（可提现）", + "growth":"成长值", + "growthPlaceholder":"请输入成长值", + "growthGet":"累计获得成长值", + "growthGetPlaceholder":"请输入累计获得成长值", + "commission":"当前佣金", + "commissionPlaceholder":"请输入当前佣金", + "commissionGet":"佣金获取", + "commissionGetPlaceholder":"请输入佣金获取", + "commissionCashOuting":"提现中佣金", + "commissionCashOutingPlaceholder":"请输入提现中佣金", + "isMember":"是否是会员", + "isMemberPlaceholder":"请输入是否是会员", + "memberTime":"成为会员时间", + "memberTimePlaceholder":"请输入成为会员时间", + "address":"详细地址", + "createTime":"注册时间", + "createTimePlaceholder":"请输入注册时间", + "updateTime":"修改时间", + "addUsers":"添加用户管理", + "updateUsers":"编辑用户管理", + "usersDeleteTips":"确定要删除该数据吗？", + "startDate":"请选择开始时间", + "endDate":"请选择结束时间" +} \ No newline at end of file diff --git a/admin/src/addon/zhjw/lang/zh-cn/users.users_edit.json b/admin/src/addon/zhjw/lang/zh-cn/users.users_edit.json new file mode 100644 index 00000000..e8f1afee --- /dev/null +++ b/admin/src/addon/zhjw/lang/zh-cn/users.users_edit.json @@ -0,0 +1,87 @@ +{ + "memberNo":"会员编码", + "pid":"推广会员", + "username":"会员用户名", + "mobile":"手机号", + "password":"会员密码", + "nickname":"会员昵称", + "headimg":"会员头像", + "memberLevel":"会员等级", + "memberLabel":"会员标签", + "wxOpenid":"微信用户openid", + "weappOpenid":"微信小程序openid", + "wxUnionid":"微信unionid", + "aliOpenid":"支付宝账户id", + "douyinOpenid":"抖音小程序openid", + "registerChannel":"注册来源", + "registerType":"注册方式", + "loginIp":"当前登录ip", + "loginType":"当前登录的操作终端类型", + "loginChannel":"登录渠道", + "loginCount":"登录次数", + "loginTime":"当前登录时间", + "lastVisitTime":"最后访问时间", + "lastConsumTime":"最后消费时间", + "sex":"性别", + "status":"用户状态", + "birthday":"出生日期", + "point":"可用积分", + "pointGet":"累计获取积分", + "balance":"可用余额", + "balanceGet":"累计获取余额", + "money":"可用余额（可提现）", + "moneyGet":"累计获取余额（可提现）", + "moneyCashOuting":"提现中余额（可提现）", + "growth":"成长值", + "growthGet":"累计获得成长值", + "commission":"当前佣金", + "commissionGet":"佣金获取", + "commissionCashOuting":"提现中佣金", + "isMember":"是否是会员", + "memberTime":"成为会员时间", + "address":"详细地址", + "memberNoPlaceholder":"请输入会员编码", + "pidPlaceholder":"请选择推广会员", + "usernamePlaceholder":"请输入会员用户名", + "mobilePlaceholder":"请输入手机号", + "passwordPlaceholder":"请输入会员密码", + "nicknamePlaceholder":"请输入会员昵称", + "headimgPlaceholder":"请上传会员头像", + "memberLevelPlaceholder":"请输入会员等级", + "memberLabelPlaceholder":"请输入会员标签", + "wxOpenidPlaceholder":"请输入微信用户openid", + "weappOpenidPlaceholder":"请输入微信小程序openid", + "wxUnionidPlaceholder":"请输入微信unionid", + "aliOpenidPlaceholder":"请输入支付宝账户id", + "douyinOpenidPlaceholder":"请输入抖音小程序openid", + "registerChannelPlaceholder":"请输入注册来源", + "registerTypePlaceholder":"请输入注册方式", + "loginIpPlaceholder":"请输入当前登录ip", + "loginTypePlaceholder":"请输入当前登录的操作终端类型", + "loginChannelPlaceholder":"请输入登录渠道", + "loginCountPlaceholder":"请输入登录次数", + "loginTimePlaceholder":"请输入当前登录时间", + "lastVisitTimePlaceholder":"请输入最后访问时间", + "lastConsumTimePlaceholder":"请输入最后消费时间", + "sexPlaceholder":"请选择性别", + "statusPlaceholder":"请选择用户状态", + "birthdayPlaceholder":"请选择出生日期", + "pointPlaceholder":"请输入可用积分", + "pointGetPlaceholder":"请输入累计获取积分", + "balancePlaceholder":"请输入可用余额", + "balanceGetPlaceholder":"请输入累计获取余额", + "moneyPlaceholder":"请输入可用余额（可提现）", + "moneyGetPlaceholder":"请输入累计获取余额（可提现）", + "moneyCashOutingPlaceholder":"请输入提现中余额（可提现）", + "growthPlaceholder":"请输入成长值", + "growthGetPlaceholder":"请输入累计获得成长值", + "commissionPlaceholder":"请输入当前佣金", + "commissionGetPlaceholder":"请输入佣金获取", + "commissionCashOutingPlaceholder":"请输入提现中佣金", + "isMemberPlaceholder":"请选择是否是会员", + "memberTimePlaceholder":"请选择成为会员时间", + "addressPlaceholder":"请输入详细地址", + "addUsers":"添加用户管理", + "updateUsers":"编辑用户管理", + "usersDeleteTips":"确定要删除该用户管理吗？" +} \ No newline at end of file diff --git a/admin/src/addon/zhjw/views/articles/articles.vue b/admin/src/addon/zhjw/views/articles/articles.vue index 97269ae9..438c5a78 100644 --- a/admin/src/addon/zhjw/views/articles/articles.vue +++ b/admin/src/addon/zhjw/views/articles/articles.vue @@ -14,9 +14,6 @@ - - - @@ -36,8 +33,8 @@ @@ -54,6 +51,16 @@ /> + + + + + + + + {{ t('search') }} @@ -67,6 +74,8 @@ + + @@ -86,6 +95,18 @@ + + + + + + + + + + + + + + + +