From 230e4bf5772d6d60ed4cab2a50738ecd9a201efb Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 23 Aug 2024 17:57:58 +0800
Subject: [PATCH 1/4] sc

---
 src/views/Basic/Role/Comp/ReportDaily.vue | 7 +++++++
 src/views/Basic/Role/index.vue            | 4 ++++
 2 files changed, 11 insertions(+)
 create mode 100644 src/views/Basic/Role/Comp/ReportDaily.vue

diff --git a/src/views/Basic/Role/Comp/ReportDaily.vue b/src/views/Basic/Role/Comp/ReportDaily.vue
new file mode 100644
index 0000000..c6fde32
--- /dev/null
+++ b/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>
diff --git a/src/views/Basic/Role/index.vue b/src/views/Basic/Role/index.vue
index 6ba9419..aa64844 100644
--- a/src/views/Basic/Role/index.vue
+++ b/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() // 消息弹窗

From 4bc0e006f069a171eed20523b59f9164a2269544 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 23 Aug 2024 18:03:43 +0800
Subject: [PATCH 2/4] sc

---
 src/views/SchoolManagement/Class/Comp/DialogClass.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/SchoolManagement/Class/Comp/DialogClass.vue b/src/views/SchoolManagement/Class/Comp/DialogClass.vue
index 5fcd467..76384f3 100644
--- a/src/views/SchoolManagement/Class/Comp/DialogClass.vue
+++ b/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

From 42fec8b6813df998fddaecc6e9dfe2c5f6030ad5 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 23 Aug 2024 18:32:44 +0800
Subject: [PATCH 3/4] sc

---
 .../SchoolManagement/Class/Comp/DialogClass.vue   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/views/SchoolManagement/Class/Comp/DialogClass.vue b/src/views/SchoolManagement/Class/Comp/DialogClass.vue
index 76384f3..3bf88d9 100644
--- a/src/views/SchoolManagement/Class/Comp/DialogClass.vue
+++ b/src/views/SchoolManagement/Class/Comp/DialogClass.vue
@@ -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() {

From 2c5d2393116fa86b87dd56836c76854e651ad434 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 23 Aug 2024 18:37:45 +0800
Subject: [PATCH 4/4] tj

---
 src/views/Basic/Role/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/Basic/Role/index.vue b/src/views/Basic/Role/index.vue
index aa64844..2f894b1 100644
--- a/src/views/Basic/Role/index.vue
+++ b/src/views/Basic/Role/index.vue
@@ -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() // 消息弹窗