From fdeeae16c5cd5c39aa20bdda07cd76ce9ab230f9 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Tue, 14 Jan 2025 15:07:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue |  1 +
 src/views/lecturer/InsideTeaching.vue   |  1 +
 src/views/lecturer/Organization.vue     | 38 +++++++++++++++++++------
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 94c0b0f7..9697e99a 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -751,6 +751,7 @@ export default {
     // getSysTypeMap()
     // 搜索
     const searchSubmit = () => {
+      state.searchParam.pageNo = 1
       getTableDate();
     };
     //重置
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index e0d17904..0ae6905c 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -1020,6 +1020,7 @@ export default {
     }
     // 搜索
     const searchSubmit = () => {
+      state.searchParam.pageNo = 1
       getTableDate();
     };
     //修改时间
diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index a84f20b0..b43ee3b9 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -9,6 +9,19 @@
           v-on:keydown.enter="enterPressHadlerSearch" />
           </div>
         </a-form-item>
+        <a-form-item class="select">
+          <div>
+            <a-select style="width: 235px" v-model:value="searchParam.isParent" placeholder="请选择节点类型" allowClear
+              :options="TrainOrglist" 
+              v-on:keydown.enter="enterPressHadlerSearch"/>
+          </div>
+        </a-form-item>
+        <a-form-item class="select">
+          <div>
+          <a-input style="width: 235px; height: 40px; border-radius: 8px" v-model:value="searchParam.leaderName" placeholder="请输入担当姓名/工号"
+          v-on:keydown.enter="enterPressHadlerSearch" />
+          </div>
+        </a-form-item>
         <div style="display: flex; margin-bottom: 20px">
           <a-button @click="searchSubmit()" type="primary" class="resetbtn">查询 </a-button>
           <!-- <div class="btn btn1" @click="searchReset" style="background:rgba(64, 158, 255, 0);" > -->
@@ -336,6 +349,8 @@ export default{
       delId:null,
       searchParam: {
         name:null,
+        isParent: null,
+        leaderName: null,
         pageNo: "1",
         pageSize: "10"
       },
@@ -540,6 +555,8 @@ const getTableDate = (obj) => {
     const searchReset = () => {
       state.searchParam = {
         name:null,
+        isParent: null,
+        leaderName: null,
         pageNo: 1,
         pageSize: 10,
       };
@@ -650,7 +667,7 @@ const getTableDate = (obj) => {
       })
     }
     const downOpen = () => {
-      window.open(`/manageApi/admin/export/exportTeacherAffiliation?name=${state.searchParam.name || ''}`)
+      window.open(`/manageApi/admin/export/exportTeacherAffiliation?name=${state.searchParam.name || ''}&isParent=${state.searchParam.isParent||''}&leaderName=${state.searchParam.leaderName||''}`)
     }
     const addContentData = () => {
       state.showContent = true
@@ -869,16 +886,21 @@ const getTableDate = (obj) => {
       orglistName: [{ required: true, message: '',log:'请选择管理组织' }],
 
     }
-        //回车
-        const enterPressHadlerSearch = e => {
-    if (e.keyCode === 13) {
-      searchSubmit()
-
-    }
-};
+    const TrainOrglist = ref([
+      {label: '全部', value: ''},
+      {label: '根节点', value: '0'},
+      {label: '子节点', value: '1'},
+    ])
+    //回车
+    const enterPressHadlerSearch = e => {
+      if (e.keyCode === 13) {
+        searchSubmit()
+      }
+    };
     return{
         ...toRefs(state),
         enterPressHadlerSearch,
+        TrainOrglist,
         rules,
         formRef,
         columns,