Compare commits

..

No commits in common. '477a279867da6548f5f073e0e6528e50923d4563' and 'c87637cc7841250e7646a8b45318a730e7ae2213' have entirely different histories.

  1. 7
      src/views/Basic/Role/Comp/ReportDaily.vue
  2. 4
      src/views/Basic/Role/index.vue
  3. 17
      src/views/SchoolManagement/Class/Comp/DialogClass.vue

@ -1,7 +0,0 @@
<template>
<div> 每日快报 </div>
</template>
<script setup name="ReportDaily"></script>
<style lang="scss" scoped></style>

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

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

Loading…
Cancel
Save