联调

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' })
+}

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 })
 }

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 })
 }

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%;
   }
 }

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
 

src/views/Basic/User/UserAssignRoleForm.vue

@@ -1,94 +0,0 @@
-<template>
-  <Dialog v-model="dialogVisible" title="分配角色">
-    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
-      <el-form-item label="用户名称">
-        <el-input v-model="formData.username" :disabled="true" />
-      </el-form-item>
-      <el-form-item label="用户昵称">
-        <el-input v-model="formData.nickname" :disabled="true" />
-      </el-form-item>
-      <el-form-item label="角色">
-        <el-select v-model="formData.roleIds" multiple placeholder="请选择角色">
-          <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-<script lang="ts" name="SystemUserAssignRoleForm" setup>
-import * as PermissionApi from '@/api/system/permission'
-import * as UserApi from '@/api/system/user'
-import * as RoleApi from '@/api/system/role'
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formData = ref({
-  id: undefined,
-  nickname: '',
-  username: '',
-  roleIds: []
-})
-const formRef = ref() // 表单 Ref
-const roleList = ref<any>([]) // 角色的列表
-
-/** 打开弹窗 */
-const open = async (row: UserApi.UserVO) => {
-  dialogVisible.value = true
-  resetForm()
-  // 设置数据
-  formData.value.id = row.id
-  formData.value.username = row.username
-  formData.value.nickname = row.nickname
-  // 获得角色拥有的菜单集合
-  formLoading.value = true
-  try {
-    formData.value.roleIds = await PermissionApi.getUserRoleList(row.id)
-  } finally {
-    formLoading.value = false
-  }
-  // 获得角色列表
-  roleList.value = await RoleApi.getSimpleRoleList()
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  if (!formRef.value) return
-  const valid = await formRef.value.validate()
-  if (!valid) return
-  // 提交请求
-  formLoading.value = true
-  try {
-    await PermissionApi.assignUserRole({
-      userId: formData.value.id,
-      roleIds: formData.value.roleIds
-    })
-    message.success(t('common.updateSuccess'))
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success', true)
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    nickname: '',
-    username: '',
-    roleIds: []
-  }
-  formRef.value?.resetFields()
-}
-</script>

src/views/Basic/User/UserForm.vue

@@ -7,7 +7,7 @@
       :rules="formRules"
       label-width="80px"
     >
-      <el-row>
+      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="用户昵称" prop="nickname">
             <el-input v-model="formData.nickname" placeholder="请输入用户昵称" />
@@ -22,7 +22,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
+      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="归属部门" prop="deptId">
             <el-tree-select
@@ -55,7 +55,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
+      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="手机号码" prop="mobile">
             <el-input v-model="formData.mobile" maxlength="11" placeholder="请输入手机号码" />
@@ -67,7 +67,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
+      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item v-if="formData.id === undefined" label="用户名称" prop="username">
             <el-input v-model="formData.username" placeholder="请输入用户名称" />
@@ -93,12 +93,11 @@
               format="YYYY-MM-DD"
               value-format="YYYY-MM-DD"
               placeholder="选择日期时间"
-              style="width: 100%"
             />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
+      <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="备注">
             <el-input v-model="formData.remark" placeholder="请输入内容" type="textarea" />

src/views/MiniMall/Product/index.vue

@@ -8,9 +8,9 @@
     label-width="68px"
   >
     <!-- TODO @puhui999：品牌应该是数据下拉哈 -->
-    <el-form-item label="品牌名称" prop="name">
+    <el-form-item label="品牌名称" prop="productBrandName">
       <el-input
-        v-model="queryParams.name"
+        v-model="queryParams.productBrandName"
         class="!w-240px"
         clearable
         placeholder="请输入品牌名称"
@@ -29,18 +29,9 @@
       />
     </el-form-item>
     <el-form-item>
-      <el-button @click="handleQuery">
+      <el-button @click="handleQuery"> 搜索 </el-button>
-        <!-- <Icon class="mr-5px" icon="ep:search" /> -->
+      <el-button @click="resetQuery"> 重置 </el-button>
-        搜索
+      <el-button plain type="primary" @click="openForm"> 新增 </el-button>
-      </el-button>
-      <el-button @click="resetQuery">
-        <!-- <Icon class="mr-5px" icon="ep:refresh" /> -->
-        重置
-      </el-button>
-      <el-button plain type="primary" @click="openForm">
-        <!-- <Icon class="mr-5px" icon="ep:plus" /> -->
-        新增
-      </el-button>
     </el-form-item>
   </el-form>
 

src/views/SchoolManagement/Class/Comp/DialogClass.vue

@@ -157,12 +157,20 @@
               :key="index"
             >
               <el-select v-model="item.ruleParam1" style="width: 100px">
-                <el-option label="单笔" :value="1" />
+                <el-option
-                <el-option label="月总" :value="2" />
+                  v-for="it in opts.percentage_param1"
+                  :key="Number(it.value)"
+                  :label="it.label"
+                  :value="Number(it.value)"
+                />
               </el-select>
               <el-select class="ml-5px" v-model="item.ruleParam2" style="width: 100px">
-                <el-option label="成交额" :value="1" />
+                <el-option
-                <el-option label="毛利" :value="2" />
+                  v-for="it in opts.percentage_param2"
+                  :key="Number(it.value)"
+                  :label="it.label"
+                  :value="Number(it.value)"
+                />
               </el-select>
               <span class="ml-5px">满</span>
               <el-input
@@ -175,8 +183,12 @@
               />
               <span class="ml-5px">元，</span>
               <el-select class="ml-5px" v-model="item.ruleParam4" style="width: 120px">
-                <el-option label="按比例" :value="1" />
+                <el-option
-                <el-option label="按固定金额" :value="2" />
+                  v-for="it in opts.percentage_param4"
+                  :key="Number(it.value)"
+                  :label="it.label"
+                  :value="Number(it.value)"
+                />
               </el-select>
               <div v-if="item.ruleParam4 == 2" class="inline-flex items-center">
                 <el-input
@@ -192,9 +204,12 @@
               <div v-else class="inline-flex items-center">
                 <span class="ml-5px">取</span>
                 <el-select class="ml-5px" v-model="item.ruleParam5" style="width: 100px">
-                  <el-option label="按成交额" :value="1" />
+                  <el-option
-                  <el-option label="按底价" :value="2" />
+                    v-for="it in opts.percentage_param5"
-                  <el-option label="按毛利" :value="3" />
+                    :key="Number(it.value)"
+                    :label="it.label"
+                    :value="Number(it.value)"
+                  />
                 </el-select>
                 <span class="ml-5px">结算</span>
                 <el-input
@@ -271,12 +286,25 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 const currentTab = ref('base')
 
+const opts = ref({
+  percentage_param1: [],
+  percentage_param2: [],
+  percentage_param4: [],
+  percentage_param5: []
+})
+
 /** 打开弹窗 */
 const open = async (type, id) => {
   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

src/views/SchoolManagement/Class/index.vue

@@ -100,6 +100,11 @@
             :width="col.width"
             show-overflow-tooltip
           />
+          <el-table-column label="备注" width="260">
+            <template #default="{ row }">
+              <div v-dompurify-html="row.remark"></div>
+            </template>
+          </el-table-column>
           <el-table-column label="状态" width="80">
             <template #default="{ row }">
               <el-switch
@@ -231,8 +236,8 @@ const columns = [
   { props: 'typeName', label: '班型名称' },
   { props: 'licenseType', label: '驾照类型', width: '100px' },
   { props: 'guidingPrice', label: '最新报价', width: '100px' },
-  { props: 'minPrice', label: '最新底价', width: '100px' },
+  { props: 'minPrice', label: '最新底价', width: '100px' }
-  { props: 'remark', label: '备注', width: '100px' }
+  // { props: 'remark', label: '备注', width: '100px' }
 ]
 
 function handleQuery() {