From 4bc0e006f069a171eed20523b59f9164a2269544 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 23 Aug 2024 18:03:43 +0800
Subject: [PATCH 1/2] 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 2/2] 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() {