From 1606e1b7fe21ad19eed19e623fbca970ba06eb5f Mon Sep 17 00:00:00 2001
From: suyanyan <1321717064@qq.com>
Date: Thu, 31 Oct 2024 11:06:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E3=80=90?=
 =?UTF-8?q?=E5=85=B1=E6=80=A7=E9=97=AE=E9=A2=98=E3=80=91=EF=BC=9A=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=AC=AC2=E9=A1=B5=E6=9F=90=E6=9D=A1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=BF=9B=E8=A1=8C=E4=BB=A5=E4=B8=8A=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=90=8E=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=BF=98?=
 =?UTF-8?q?=E6=98=AF=E5=81=9C=E7=95=99=E5=9C=A8=E7=AC=AC2=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SafeCampus.WEB/src/typings/props.d.ts                     | 2 +-
 .../userManage/classManage/components/formClass/index.vue | 2 +-
 .../classManage/components/formTeacher/index.vue          | 2 +-
 SafeCampus.WEB/src/views/userManage/classManage/index.vue | 3 ++-
 SafeCampus.WEB/src/views/userManage/clothing/index.vue    | 2 +-
 .../src/views/userManage/department/components/form.vue   | 8 ++++----
 SafeCampus.WEB/src/views/userManage/department/index.vue  | 3 ++-
 .../views/userManage/dormitory/components/form/index.vue  | 2 +-
 .../dormitory/components/formDormitory/index.vue          | 8 ++++----
 SafeCampus.WEB/src/views/userManage/dormitory/index.vue   | 3 ++-
 .../userManage/keyPersonnel/components/form/index.vue     | 2 +-
 .../src/views/userManage/keyPersonnel/index.vue           | 3 ++-
 .../src/views/userManage/major/components/form.vue        | 6 +++---
 SafeCampus.WEB/src/views/userManage/major/index.vue       | 3 ++-
 .../views/userManage/personnel/components/form/index.vue  | 2 +-
 SafeCampus.WEB/src/views/userManage/personnel/index.vue   | 4 ++--
 16 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/SafeCampus.WEB/src/typings/props.d.ts b/SafeCampus.WEB/src/typings/props.d.ts
index 64e1db2..380313c 100644
--- a/SafeCampus.WEB/src/typings/props.d.ts
+++ b/SafeCampus.WEB/src/typings/props.d.ts
@@ -31,6 +31,6 @@ declare namespace FormProps {
     treeAllData?: Array<any>;
     records?: Array<any>;
     /** 表单布局 */
-    successful?: () => void;
+    successful?: (init?: any) => void;
   }
 }
diff --git a/SafeCampus.WEB/src/views/userManage/classManage/components/formClass/index.vue b/SafeCampus.WEB/src/views/userManage/classManage/components/formClass/index.vue
index 53fe543..ea72ba7 100644
--- a/SafeCampus.WEB/src/views/userManage/classManage/components/formClass/index.vue
+++ b/SafeCampus.WEB/src/views/userManage/classManage/components/formClass/index.vue
@@ -98,7 +98,7 @@ async function handleSubmit() {
         .add(sysUserProps.record)
         .then(() => {
           ElMessage.success("新增成功");
-          sysUserProps.successful!(); //调用父组件的successful方法
+          sysUserProps.successful!(true); //调用父组件的successful方法
         })
         .finally(() => {
           onClose();
diff --git a/SafeCampus.WEB/src/views/userManage/classManage/components/formTeacher/index.vue b/SafeCampus.WEB/src/views/userManage/classManage/components/formTeacher/index.vue
index 4e1baff..c2772e5 100644
--- a/SafeCampus.WEB/src/views/userManage/classManage/components/formTeacher/index.vue
+++ b/SafeCampus.WEB/src/views/userManage/classManage/components/formTeacher/index.vue
@@ -96,7 +96,7 @@ async function handleSubmit() {
       await userManageTeacherApi
         .add(sysUserProps.record)
         .then(() => {
-          sysUserProps.successful!(); //调用父组件的successful方法
+          sysUserProps.successful!(true); //调用父组件的successful方法
         })
         .finally(() => {
           onClose();
diff --git a/SafeCampus.WEB/src/views/userManage/classManage/index.vue b/SafeCampus.WEB/src/views/userManage/classManage/index.vue
index ee866e7..a246713 100644
--- a/SafeCampus.WEB/src/views/userManage/classManage/index.vue
+++ b/SafeCampus.WEB/src/views/userManage/classManage/index.vue
@@ -144,7 +144,8 @@ const formRefC = ref<InstanceType<typeof FormClass> | null>(null);
 }
 
 // 刷新表格
-const RefreshTable = () => {
+const RefreshTable = (init: boolean = false) => {
+  if(init)proTable.value!.pageable.pageNum = 1
   proTable.value?.refresh();
 }
 
diff --git a/SafeCampus.WEB/src/views/userManage/clothing/index.vue b/SafeCampus.WEB/src/views/userManage/clothing/index.vue
index 6ee6956..1664063 100644
--- a/SafeCampus.WEB/src/views/userManage/clothing/index.vue
+++ b/SafeCampus.WEB/src/views/userManage/clothing/index.vue
@@ -36,7 +36,7 @@
       </template>
     </TreeFilter>
     <div class="table-box">
-      <ProTable ref="proTable" title="服装库管理" :columns="columns" rowKey="clothId" :data="tableData.clothes">
+      <ProTable ref="proTable" :pagination="false" title="服装库管理" :columns="columns" rowKey="clothId" :data="tableData.clothes">
         <!-- 表格 header 按钮 -->
         <template #tableHeader="scope">
           <s-button suffix="服装" @click="onOpen(FormOptEnum.ADD, { clothSetId: clothSetId }, treeData)" />
diff --git a/SafeCampus.WEB/src/views/userManage/department/components/form.vue b/SafeCampus.WEB/src/views/userManage/department/components/form.vue
index 4b48292..7ea4ace 100644
--- a/SafeCampus.WEB/src/views/userManage/department/components/form.vue
+++ b/SafeCampus.WEB/src/views/userManage/department/components/form.vue
@@ -32,7 +32,7 @@
 
 <script setup lang="ts">
 import { SysDepartment, userManageDepartmentApi } from "@/api";
-import { FormOptEnum, SysDictEnum } from "@/enums";
+import { FormOptEnum } from "@/enums";
 import { required } from "@/utils/formRules";
 import { FormInstance } from "element-plus";
 import { useDictStore } from "@/stores/modules";
@@ -86,16 +86,16 @@ async function handleSubmit() {
     //提交表单
     if (departmentProps.opt == FormOptEnum.ADD) {
       await userManageDepartmentApi
-        .add(departmentProps.record, departmentProps.record.id != undefined)
+        .add(departmentProps.record)
         .then(() => {
-          departmentProps.successful!(); //调用父组件的successful方法
+          departmentProps.successful!(true); //调用父组件的successful方法
         })
         .finally(() => {
           onClose();
         });
     } else {
       await userManageDepartmentApi
-        .update(departmentProps.record, departmentProps.record.id != undefined)
+        .update(departmentProps.record)
         .then(() => {
           departmentProps.successful!(); //调用父组件的successful方法
         })
diff --git a/SafeCampus.WEB/src/views/userManage/department/index.vue b/SafeCampus.WEB/src/views/userManage/department/index.vue
index 16eb98f..86fd1fa 100644
--- a/SafeCampus.WEB/src/views/userManage/department/index.vue
+++ b/SafeCampus.WEB/src/views/userManage/department/index.vue
@@ -94,7 +94,8 @@ function onOpen(opt: FormOptEnum, record: {} | SysDepartment.DepartmentInfo = {}
 }
 
 // 刷新表格
-const RefreshTable = () => {
+const RefreshTable = (init: boolean = false) => {
+  if(init)proTable.value!.pageable.pageNum = 1
   proTable.value?.refresh();
 }
 
diff --git a/SafeCampus.WEB/src/views/userManage/dormitory/components/form/index.vue b/SafeCampus.WEB/src/views/userManage/dormitory/components/form/index.vue
index ba6f738..a90e88f 100644
--- a/SafeCampus.WEB/src/views/userManage/dormitory/components/form/index.vue
+++ b/SafeCampus.WEB/src/views/userManage/dormitory/components/form/index.vue
@@ -98,7 +98,7 @@ async function handleSubmit() {
       await userManageDormitoryApi
         .add(SysDormitoryProps.record)
         .then(() => {
-          SysDormitoryProps.successful!(); //调用父组件的successful方法
+          SysDormitoryProps.successful!(true); //调用父组件的successful方法
         })
         .finally(() => {
           onClose();
diff --git a/SafeCampus.WEB/src/views/userManage/dormitory/components/formDormitory/index.vue b/SafeCampus.WEB/src/views/userManage/dormitory/components/formDormitory/index.vue
index 4757d91..7453765 100644
--- a/SafeCampus.WEB/src/views/userManage/dormitory/components/formDormitory/index.vue
+++ b/SafeCampus.WEB/src/views/userManage/dormitory/components/formDormitory/index.vue
@@ -125,7 +125,7 @@ async function handleSubmit() {
       await userManageDormitoryApi
         .addDormitory(sysDormitoryProps.record)
         .then(() => {
-          sysDormitoryProps.successful!(); //调用父组件的successful方法
+          sysDormitoryProps.successful!(true); //调用父组件的successful方法
         })
         .finally(() => {
           onClose();
@@ -156,12 +156,12 @@ const getCreamaList = () => {
     console.log(sysDormitoryProps.record, 89);
 
     creamaData.value = res.data;
-    let dormitoryData = sysDormitoryProps.record;
-    let insObj = reactive({
+    let dormitoryData: any = sysDormitoryProps.record;
+    let insObj: any = reactive({
       sensorId: "",
       sensorName: ""
     });
-    let outObj = reactive({
+    let outObj: any = reactive({
       sensorId: "",
       sensorName: ""
     });
diff --git a/SafeCampus.WEB/src/views/userManage/dormitory/index.vue b/SafeCampus.WEB/src/views/userManage/dormitory/index.vue
index 5240026..05ebe78 100644
--- a/SafeCampus.WEB/src/views/userManage/dormitory/index.vue
+++ b/SafeCampus.WEB/src/views/userManage/dormitory/index.vue
@@ -293,7 +293,8 @@ function onOpen(opt: FormOptEnum, record: {} | SysDormitory.ChamberInfo = {}) {
 }
 
 // 刷新表格
-const RefreshTable = () => {
+const RefreshTable = (init: boolean = false) => {
+  if(init)proTable.value!.pageable.pageNum = 1
   proTable.value?.refresh();
 }
 // 同时刷新列表和树并恢复初始状态
diff --git a/SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/index.vue b/SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/index.vue
index f328e6f..107b7f6 100644
--- a/SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/index.vue
+++ b/SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/index.vue
@@ -105,7 +105,7 @@ async function handleSubmit() {
       await userManageKeyPersonApi
         .add(sysUserProps.record)
         .then(() => {
-          sysUserProps.successful!(); //调用父组件的successful方法
+          sysUserProps.successful!(true); //调用父组件的successful方法
         })
         .finally(() => {
           onClose();
diff --git a/SafeCampus.WEB/src/views/userManage/keyPersonnel/index.vue b/SafeCampus.WEB/src/views/userManage/keyPersonnel/index.vue
index 7a0fb76..5d6b968 100644
--- a/SafeCampus.WEB/src/views/userManage/keyPersonnel/index.vue
+++ b/SafeCampus.WEB/src/views/userManage/keyPersonnel/index.vue
@@ -131,7 +131,8 @@ function onOpen(opt: FormOptEnum, record: {} | SysUserPersonnel.SysUserPerInfo =
 }
 
 // 刷新表格
-const RefreshTable = () => {
+const RefreshTable = (init: boolean = false) => {
+  if(init)proTable.value!.pageable.pageNum = 1
   proTable.value?.refresh();
 }
 </script>
diff --git a/SafeCampus.WEB/src/views/userManage/major/components/form.vue b/SafeCampus.WEB/src/views/userManage/major/components/form.vue
index 07a1005..e8d54e6 100644
--- a/SafeCampus.WEB/src/views/userManage/major/components/form.vue
+++ b/SafeCampus.WEB/src/views/userManage/major/components/form.vue
@@ -103,16 +103,16 @@ async function handleSubmit() {
     //提交表单
     if (majorProps.opt == FormOptEnum.ADD) {
       await userManageMajorApi
-        .add(majorProps.record, majorProps.record.id != undefined)
+        .add(majorProps.record)
         .then(() => {
-          majorProps.successful!(); //调用父组件的successful方法
+          majorProps.successful!(true); //调用父组件的successful方法
         })
         .finally(() => {
           onClose();
         });
     } else {
       await userManageMajorApi
-        .update(majorProps.record, majorProps.record.id != undefined)
+        .update(majorProps.record)
         .then(() => {
           majorProps.successful!(); //调用父组件的successful方法
         })
diff --git a/SafeCampus.WEB/src/views/userManage/major/index.vue b/SafeCampus.WEB/src/views/userManage/major/index.vue
index c5e650d..a1f9743 100644
--- a/SafeCampus.WEB/src/views/userManage/major/index.vue
+++ b/SafeCampus.WEB/src/views/userManage/major/index.vue
@@ -118,7 +118,8 @@ function onOpen(opt: FormOptEnum, record: {} | SysMajor.MajorInfo = {}) {
 }
 
 // 刷新表格
-const RefreshTable = () => {
+const RefreshTable = (init: boolean = false) => {
+  if(init)proTable.value!.pageable.pageNum = 1
   proTable.value?.refresh();
 }
 
diff --git a/SafeCampus.WEB/src/views/userManage/personnel/components/form/index.vue b/SafeCampus.WEB/src/views/userManage/personnel/components/form/index.vue
index 7fbd31e..2e37bc7 100644
--- a/SafeCampus.WEB/src/views/userManage/personnel/components/form/index.vue
+++ b/SafeCampus.WEB/src/views/userManage/personnel/components/form/index.vue
@@ -105,7 +105,7 @@ async function handleSubmit() {
       await userManagePersonnelApi
         .add(sysUserProps.record)
         .then(() => {
-          sysUserProps.successful!(); //调用父组件的successful方法
+          sysUserProps.successful!(true); //调用父组件的successful方法
         })
         .finally(() => {
           onClose();
diff --git a/SafeCampus.WEB/src/views/userManage/personnel/index.vue b/SafeCampus.WEB/src/views/userManage/personnel/index.vue
index 8dc8e5c..93ddd91 100644
--- a/SafeCampus.WEB/src/views/userManage/personnel/index.vue
+++ b/SafeCampus.WEB/src/views/userManage/personnel/index.vue
@@ -160,8 +160,8 @@ function onOpen(opt: FormOptEnum, record: {} | SysUserPersonnel.SysUserPerInfo =
 }
 
 // 刷新表格
-const RefreshTable = () => {
-  proTable.value!.pageable.pageNum = 1;
+const RefreshTable = (init: boolean = false) => {
+  if(init)proTable.value!.pageable.pageNum = 1
   proTable.value?.refresh();
   // treeFilter.value?.refresh(); //刷新树形筛选器
 }