Compare commits

4 Commits

Author SHA1 Message Date
qsh
2c5d239311 tj 2024-08-23 18:37:45 +08:00
qsh
03d7c87934 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cjl 2024-08-23 18:33:37 +08:00
qsh
42fec8b681 sc 2024-08-23 18:32:44 +08:00
qsh
4bc0e006f0 sc 2024-08-23 18:03:43 +08:00
2 changed files with 18 additions and 5 deletions

View File

@@ -75,9 +75,9 @@
@success="getList"
/>
</el-tab-pane>
<el-tab-pane label="每日快报" :name="4">
<!-- <el-tab-pane label="每日快报" :name="4">
<ReportDaily />
</el-tab-pane>
</el-tab-pane> -->
</el-tabs>
</el-card>
<!-- 表单弹窗添加/修改 -->
@@ -89,7 +89,7 @@ import RoleForm from './RoleForm.vue'
import RoleEmployee from './Comp/RoleEmployee.vue'
import RoleAssignMenuForm from './RoleAssignMenuForm.vue'
import RoleDataPermissionForm from './RoleDataPermissionForm.vue'
import ReportDaily from './Comp/ReportDaily.vue'
// import ReportDaily from './Comp/ReportDaily.vue'
import * as RoleApi from '@/api/system/role'
const message = useMessage() // 消息弹窗

View File

@@ -1,5 +1,5 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="1000px">
<Dialog v-if="dialogVisible" :title="dialogTitle" v-model="dialogVisible" width="1000px">
<el-tabs v-model="currentTab">
<el-tab-pane label="基础信息" name="base">
<el-form
@@ -494,6 +494,7 @@ const open = async (type, id, sp) => {
formLoading.value = true
try {
formData.value = await ClassApi.getClassType(id)
formData.value.remark = formData.value.remark || ''
formData.value.schPlace = [formData.value.schoolId, formData.value.placeId]
if (!formData.value.companyProfitVO) {
profitCompanyForm.value = {
@@ -543,11 +544,23 @@ const resetForm = () => {
typeName: '',
licenseType: '',
status: 0,
remark: '',
remark: undefined,
quotations: [],
percentages: []
}
formRef.value?.resetFields()
profitCompanyForm.value = {
profitMode: 1,
dangwei: [],
profitRule: {}
}
profitEmployeeForm.value = {
profitMode: 1,
dangwei: [],
profitRule: {}
}
}
function handleAddPrice() {