-- 学员选择bug

src/api/request.js

@@ -31,10 +31,19 @@ export function useBoeApiPage(_url, params = {}, config = {
         })
     }
 
+    function reset(){
+        state.data = []
+        state.loading = false
+        state.page = 1
+        state.totalPage = 0
+        state.total = 0
+    }
+
     config.init && fetch()
     return {
         ...toRefs(state),
         fetch,
+        reset
     };
 }
 

src/components/student/CommonStudent.vue

@@ -44,7 +44,8 @@
                       <a-button
                           @click="resetStu"
                           style="margin-left: 20px; border-radius: 4px"
-                        >重置</a-button
+                      >重置
+                      </a-button
                       >
                     </a-form-item>
                   </div>
@@ -64,6 +65,7 @@
                             allow-clear
                             tree-default-expand-all
                             :tree-data="treeData"
+                            v-model:selectedKeys="stuTreeSelectKeys"
                             :fieldNames="{
                             children: 'treeChildList',
                             key: 'id',
@@ -154,7 +156,8 @@
                       <a-button
                           @click="resetAudienceInfo"
                           style="margin-left: 20px; border-radius: 4px"
-                        >重置</a-button
+                      >重置
+                      </a-button
                       >
                     </a-form-item>
                   </div>
@@ -384,7 +387,6 @@
   </a-modal>
 
 
-
 </template>
 <script setup>
 import {computed, defineEmits, defineProps, ref, watch} from "vue";
@@ -422,6 +424,7 @@ const nameSearch = ref({
   page: 1,
   pageSize: 10,
 });
+const stuTreeSelectKeys = ref([])
 const audienceName = ref({
   keyword: "",
   page: 1,
@@ -440,6 +443,7 @@ const {
   pageSize: stuPageSize,
   loading: stuLoading,
   total: stuTotal,
+  reset: stuReset
 } = useBoeApiPage(USER_LIST, nameSearch.value, {
   init: false,
   result: (res) => res.result.userInfoList,
@@ -457,6 +461,7 @@ const {
   pageSize: audiPageSize,
   loading: audiLoading,
   total: audiTotal,
+  reset: auditReset
 } = useBoeApiPage(AUDIENCE_LIST, audienceName.value, {
   init: true,
   result: (res) =>
@@ -582,20 +587,24 @@ const openDrawer = () => {
 const treeData = computed(() => {
   return store.state.orgtreeList ? store.state.orgtreeList : [];
 });
+
 function onSearchStu() {
   nameSearch.value.page = 1;
   searchStu();
 }
+
 function stuStuOrgSelect(e) {
   nameSearch.value.departId = e.join("");
   searchStu();
 }
+
 function stuDel(i) {
   stuSelectKeys.value = stuSelectKeys.value.filter(
       (e) => e !== selectsData.value.studentList[i].id
   );
   selectsData.value.studentList.splice(i, 1);
 }
+
 // function orgDel(i) {
 //   orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
 //   selectsData.value.deptList.splice(i, 1)
@@ -606,6 +615,7 @@ function AuditDel(i) {
   );
   selectsData.value.groupList.splice(i, 1);
 }
+
 // function orgSelect(key, obj) {
 // console.log(obj)
 //request(ORG_CHILD_LIST, {orgId: null}).then(res => {
@@ -616,14 +626,17 @@ function onStuSelectChange(e, l) {
   stuSelectKeys.value = e;
   selectsData.value.studentList = l;
 }
+
 function onOrgSelectChange(e, l) {
   orgRowSelection.value = e;
   selectsData.value.deptList = l.selectedNodes;
 }
+
 function onAuditSelectChange(e, l) {
   auditSelectKeys.value = e;
   selectsData.value.groupList = l;
 }
+
 // const stuDepartmentSelect = (e) => {
 //   nameSearch.value.orgId = e.join('')
 //   searchStu()
@@ -641,7 +654,7 @@ const auditChangePagination = (page) => {
 const resetStu = () => {
   deleteDepSelect();
   nameSearch.value = {keyword: "", page: 1, pageSize: 10};
-
+  stuReset()
 };
 //清空选择部门信息
 const deleteDepSelect = () => {
@@ -654,7 +667,8 @@ const deleteDepSelect = () => {
 //重置受众
 const resetAudienceInfo = () => {
   audienceName.value = {keyword: "", page: 1, pageSize: 10};
-  searchStu();
+  auditReset()
+  searchAudi()
 };
 //全部清除
 // const deleteAll = () => {
@@ -672,6 +686,7 @@ const submitAuth = () => {
     handleStageOk();
   }
 };
+
 function handleStageOk() {
   stageVisible.value = false;
   visiable.value = false;
@@ -687,14 +702,16 @@ function handleStageOk() {
     emit("finash", true);
   });
 }
+
 watch(visiable, () => {
   stuSelectKeys.value = [];
   orgSelectKeys.value = [];
   auditSelectKeys.value = [];
-  stuData.value = [];
   audienceName.value.keyword = "";
   audienceName.value.page = 1;
   audienceName.value.pageSize = 10;
+  nameSearch.value.departId = null
+  stuTreeSelectKeys.value=[]
   activeKey.value = 1;
   selectsData.value = {
     stageId: "",
@@ -702,7 +719,8 @@ watch(visiable, () => {
     deptList: [],
     groupList: [],
   };
- 
+  stuReset()
+  auditReset()
 
   searchAudi();
 });
@@ -712,10 +730,12 @@ watch(visiable, () => {
   .ant-btn-primary {
     background-color: #4ea6ff !important;
   }
+
   .cus-select {
     height: 40px;
     border-radius: 8px;
   }
+
   .tableBox .ant-table-row .ant-table-cell {
     height: 48px;
     font-size: 14px;
@@ -724,18 +744,23 @@ watch(visiable, () => {
     line-height: 29px;
     padding: 0px;
   }
+
   .tableBox .ant-table-thead tr th {
     font-size: 14px;
   }
+
   .ant-tabs-tabpane {
     height: 100%;
   }
+
   .ant-tabs {
     overflow: visible;
   }
+
   .right1 {
     border-left: 1px solid #f2f6fe;
     margin-left: 20px;
+
     .onerow {
       display: flex;
       justify-content: space-between;
@@ -770,6 +795,7 @@ watch(visiable, () => {
           font-weight: 500;
         }
       }
+
       .clbox {
         margin-right: 50px;
         display: flex;
@@ -780,6 +806,7 @@ watch(visiable, () => {
         height: 32px;
         border-radius: 4px;
         background: #4ea6ff;
+
         .colose {
           width: 16px;
           height: 16px;
@@ -790,21 +817,25 @@ watch(visiable, () => {
           background-size: 100%;
           margin-right: 4px;
         }
+
         .allclear {
           color: rgba(255, 255, 255, 1);
           font-size: 14px;
         }
       }
     }
+
     .selecteds {
       display: flex;
       flex-wrap: wrap;
       margin-left: 32px;
+
       .person {
         width: 100%;
         margin-top: 20px;
         border-top: 1px solid #f2f6fe;
       }
+
       .chose {
         width: 64px;
         height: 24px;
@@ -818,6 +849,7 @@ watch(visiable, () => {
         color: rgba(56, 139, 225, 1);
         font-size: 12px;
         position: relative;
+
         .ch {
           position: absolute;
           width: 18px;
@@ -827,12 +859,14 @@ watch(visiable, () => {
           top: -8px;
         }
       }
+
       .ifsw {
         display: flex;
         align-items: end;
         justify-content: center;
         color: #4ea6ff;
       }
+
       .sw {
         display: flex;
         align-items: center;
@@ -842,11 +876,13 @@ watch(visiable, () => {
         margin-top: 23px;
         margin-left: 10px;
       }
+
       .dept {
         width: 100%;
         margin-top: 30px;
         border-top: 1px solid #f2f6fe;
       }
+
       .chose1 {
         //width: 90px;
         height: 24px;
@@ -860,11 +896,13 @@ watch(visiable, () => {
         color: rgba(56, 139, 225, 1);
         font-size: 12px;
         position: relative;
+
         .span {
           white-space: nowrap;
           overflow: hidden;
           text-overflow: ellipsis;
         }
+
         .ch1 {
           position: absolute;
           width: 18px;
@@ -874,11 +912,13 @@ watch(visiable, () => {
           top: -8px;
         }
       }
+
       .group {
         width: 100%;
         margin-top: 30px;
         border-top: 1px solid #f2f6fe;
       }
+
       .chose2 {
         //width: 120px;
         height: 24px;
@@ -892,11 +932,13 @@ watch(visiable, () => {
         color: rgba(56, 139, 225, 1);
         font-size: 12px;
         position: relative;
+
         .span {
           white-space: nowrap;
           overflow: hidden;
           text-overflow: ellipsis;
         }
+
         .ch2 {
           position: absolute;
           width: 18px;