Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl

src/views/Basic/Role/Comp/ReportDaily.vue

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

src/views/Basic/Role/index.vue

@@ -75,6 +75,9 @@
             @success="getList"
           />
         </el-tab-pane>
+        <!-- <el-tab-pane label="每日快报" :name="4">
+          <ReportDaily />
+        </el-tab-pane> -->
       </el-tabs>
     </el-card>
     <!-- 表单弹窗：添加/修改 -->
@@ -86,6 +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 * as RoleApi from '@/api/system/role'
 
 const message = useMessage() // 消息弹窗

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

@@ -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() {