From 1e0ba3b6190b28f134c1b02215edbc6bb3c4b57a Mon Sep 17 00:00:00 2001 From: qsh <> Date: Thu, 30 May 2024 17:24:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/school/class/index.js | 5 + src/api/system/dict/dict.data.ts | 14 +-- src/api/system/dict/dict.type.ts | 14 +-- src/styles/index.scss | 3 +- src/views/Basic/Role/RoleForm.vue | 2 +- src/views/Basic/User/UserAssignRoleForm.vue | 94 ------------------- src/views/Basic/User/UserForm.vue | 11 +-- src/views/MiniMall/Product/index.vue | 19 +--- .../Class/Comp/DialogClass.vue | 46 +++++++-- src/views/SchoolManagement/Class/index.vue | 9 +- 10 files changed, 76 insertions(+), 141 deletions(-) delete mode 100644 src/views/Basic/User/UserAssignRoleForm.vue diff --git a/src/api/school/class/index.js b/src/api/school/class/index.js index 2f53371..6216090 100644 --- a/src/api/school/class/index.js +++ b/src/api/school/class/index.js @@ -39,3 +39,8 @@ export const batchUpdateClassTypeStatus = async (data) => { export const batchDeleteClassType = async (ids) => { return await request.delete({ url: '/admin-api/crm/sch-class-type/batch-delete?ids=' + ids }) } + +// 获取提成结算参数 +export const getCommissionParams = async () => { + return await request.get({ url: '/admin-api/crm/sch-class-type/get-percentage-param' }) +} diff --git a/src/api/system/dict/dict.data.ts b/src/api/system/dict/dict.data.ts index 7d42625..deded27 100644 --- a/src/api/system/dict/dict.data.ts +++ b/src/api/system/dict/dict.data.ts @@ -15,35 +15,35 @@ export type DictDataVO = { // 查询字典数据（精简)列表 export const listSimpleDictData = () => { - return request.get({ url: '/admin-api/system/dict-data/list-all-simple' }) + return request.get({ url: '/admin-api/system/dict-data/simple-list' }) } // 查询字典数据列表 export const getDictDataPage = (params: PageParam) => { - return request.get({ url: '/admin-api/system/dict-data/page', params }) + return request.get({ url: '/admin-api/crm/dict-data/page', params }) } // 查询字典数据详情 export const getDictData = (id: number) => { - return request.get({ url: '/admin-api/system/dict-data/get?id=' + id }) + return request.get({ url: '/admin-api/crm/dict-data/get?id=' + id }) } // 新增字典数据 export const createDictData = (data: DictDataVO) => { - return request.post({ url: '/admin-api/system/dict-data/create', data }) + return request.post({ url: '/admin-api/crm/dict-data/create', data }) } // 修改字典数据 export const updateDictData = (data: DictDataVO) => { - return request.put({ url: '/admin-api/system/dict-data/update', data }) + return request.put({ url: '/admin-api/crm/dict-data/update', data }) } // 删除字典数据 export const deleteDictData = (id: number) => { - return request.delete({ url: '/admin-api/system/dict-data/delete?id=' + id }) + return request.delete({ url: '/admin-api/crm/dict-data/delete?id=' + id }) } // 导出字典类型数据 export const exportDictData = (params) => { - return request.get({ url: '/admin-api/system/dict-data/export', params }) + return request.get({ url: '/admin-api/crm/dict-data/export', params }) } diff --git a/src/api/system/dict/dict.type.ts b/src/api/system/dict/dict.type.ts index 9bb50af..d415993 100644 --- a/src/api/system/dict/dict.type.ts +++ b/src/api/system/dict/dict.type.ts @@ -11,34 +11,34 @@ export type DictTypeVO = { // 查询字典（精简)列表 export const getSimpleDictTypeList = () => { - return request.get({ url: '/admin-api/system/dict-type/list-all-simple' }) + return request.get({ url: '/admin-api/crm/dict-type/list-all-simple' }) } // 查询字典列表 export const getDictTypePage = (params: PageParam) => { - return request.get({ url: '/admin-api/system/dict-type/page', params }) + return request.get({ url: '/admin-api/crm/dict-type/page', params }) } // 查询字典详情 export const getDictType = (id: number) => { - return request.get({ url: '/admin-api/system/dict-type/get?id=' + id }) + return request.get({ url: '/admin-api/crm/dict-type/get?id=' + id }) } // 新增字典 export const createDictType = (data: DictTypeVO) => { - return request.post({ url: '/admin-api/system/dict-type/create', data }) + return request.post({ url: '/admin-api/crm/dict-type/create', data }) } // 修改字典 export const updateDictType = (data: DictTypeVO) => { - return request.put({ url: '/admin-api/system/dict-type/update', data }) + return request.put({ url: '/admin-api/crm/dict-type/update', data }) } // 删除字典 export const deleteDictType = (id: number) => { - return request.delete({ url: '/admin-api/system/dict-type/delete?id=' + id }) + return request.delete({ url: '/admin-api/crm/dict-type/delete?id=' + id }) } // 导出字典类型 export const exportDictType = (params) => { - return request.get({ url: '/admin-api/system/dict-type/export', params }) + return request.get({ url: '/admin-api/crm/dict-type/export', params }) } diff --git a/src/styles/index.scss b/src/styles/index.scss index 06db06e..34381d3 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -64,7 +64,8 @@ .el-row .el-form-item { .el-input, .el-select, - .el-input-number { + .el-input-number, + .el-input__wrapper { width: 100%; } } diff --git a/src/views/Basic/Role/RoleForm.vue b/src/views/Basic/Role/RoleForm.vue index a8ffe91..9ed4e84 100644 --- a/src/views/Basic/Role/RoleForm.vue +++ b/src/views/Basic/Role/RoleForm.vue @@ -37,7 +37,7 @@ const formData = ref({ name: '' }) const formRules = reactive({ - name: [{ required: true, message: '岗位标题不能为空', trigger: 'blur' }] + name: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }] }) const formRef = ref() // 表单 Ref diff --git a/src/views/Basic/User/UserAssignRoleForm.vue b/src/views/Basic/User/UserAssignRoleForm.vue deleted file mode 100644 index 7089c06..0000000 --- a/src/views/Basic/User/UserAssignRoleForm.vue +++ /dev/null @@ -1,94 +0,0 @@ - - diff --git a/src/views/Basic/User/UserForm.vue b/src/views/Basic/User/UserForm.vue index 7015a10..941d81a 100644 --- a/src/views/Basic/User/UserForm.vue +++ b/src/views/Basic/User/UserForm.vue @@ -7,7 +7,7 @@ :rules="formRules" label-width="80px" > - + @@ -22,7 +22,7 @@ - + - + @@ -67,7 +67,7 @@ - + @@ -93,12 +93,11 @@ format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="选择日期时间" - style="width: 100%" /> - + diff --git a/src/views/MiniMall/Product/index.vue b/src/views/MiniMall/Product/index.vue index e1aaae6..a0e2650 100644 --- a/src/views/MiniMall/Product/index.vue +++ b/src/views/MiniMall/Product/index.vue @@ -8,9 +8,9 @@ label-width="68px" > - + - - - 搜索 - - - - 重置 - - - - 新增 - + 搜索 + 重置 + 新增 diff --git a/src/views/SchoolManagement/Class/Comp/DialogClass.vue b/src/views/SchoolManagement/Class/Comp/DialogClass.vue index f719662..4059f54 100644 --- a/src/views/SchoolManagement/Class/Comp/DialogClass.vue +++ b/src/views/SchoolManagement/Class/Comp/DialogClass.vue @@ -157,12 +157,20 @@ :key="index" > - - + - - + 满 元， - - +
取 - - - + 结算 { dialogVisible.value = true dialogTitle.value = type == 'create' ? '新增班型' : '修改班型' formType.value = type resetForm() + if (!opts.value.length) { + const arr = await ClassApi.getCommissionParams() + arr.map((item) => { + opts.value[item.dictType].push(item) + }) + } // 修改时，设置数据 if (id) { formLoading.value = true diff --git a/src/views/SchoolManagement/Class/index.vue b/src/views/SchoolManagement/Class/index.vue index 9c050e1..1c03d3e 100644 --- a/src/views/SchoolManagement/Class/index.vue +++ b/src/views/SchoolManagement/Class/index.vue @@ -100,6 +100,11 @@ :width="col.width" show-overflow-tooltip /> + + +