From 7f243b315426d8c270983ddd34a8201b478b1ff2 Mon Sep 17 00:00:00 2001
From: sunhonglai <shl>
Date: Wed, 7 May 2025 13:06:19 +0800
Subject: [PATCH] =?UTF-8?q?szx-1090=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/OrganizationApproval.vue |  7 ++-
 src/views/lecturer/OrganizationList.vue     | 68 ++++++++++++++++++++-
 2 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue
index ad030f3c..cf617cbc 100644
--- a/src/views/lecturer/OrganizationApproval.vue
+++ b/src/views/lecturer/OrganizationApproval.vue
@@ -27,7 +27,7 @@
             <a-select-option :value="0">全部</a-select-option>
             <a-select-option :value="1">待提交</a-select-option>
             <a-select-option :value="2">审核中</a-select-option>
-            <!-- <a-select-option :value="3">已完成</a-select-option> -->
+            <a-select-option :value="3">已完成</a-select-option>
             <a-select-option :value="4">审核失败</a-select-option>
             <!-- <a-select-option :value="5">撤回</a-select-option> -->
             </a-select>
@@ -769,9 +769,12 @@ export default {
       state.tableLoading = true;
       let objA = { 
         status: status?status:state.searchParam.status,
+        name: state.searchParam.name,
+        leaderName: state.searchParam.leaderName,
+        isParent: state.searchParam.isParent,
         //TODO GX03 
         //审批未通过意外的数据
-        approvalType:1,
+        // approvalType:1,
         moduleType:1,
       };
       console.log("执行 gx getTableDate objA",objA);
diff --git a/src/views/lecturer/OrganizationList.vue b/src/views/lecturer/OrganizationList.vue
index a63cd0ac..4b6f3717 100644
--- a/src/views/lecturer/OrganizationList.vue
+++ b/src/views/lecturer/OrganizationList.vue
@@ -35,6 +35,22 @@
           />
         </div>
       </a-form-item>
+      <a-form-item class="select">
+        <a-select
+            v-model:value="searchParam.trainOrgId"
+            style="width: 200px"
+            allowClear
+            showSearch
+            :filter-option="false"
+            @change="handleOrgChange"
+            @search="handleOrgSearch"
+            placeholder="请选择所有根节点列表"
+        >
+          <a-select-option v-for="item in filterOrgListSearch" :key="item.value" :value="item.value">
+            {{ item.label }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
       <div style="display: flex; margin-bottom: 20px">
         <a-button @click="searchSubmit()" type="primary" class="resetbtn"
           >查询
@@ -488,7 +504,7 @@
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch } from "vue";
+import {reactive, toRefs, ref, watch, onMounted} from "vue";
 import { FolderAddOutlined } from "@ant-design/icons-vue";
 import { message } from "ant-design-vue";
 import dialog from "@/utils/dialog";
@@ -497,7 +513,7 @@ import {
   queryTrainOrg,
   deleteTrainOrg,
   addReviewer,
-  updateTrainOrg,
+  updateTrainOrg, queryTrainOrgPor,
 } from "../../api/organization";
 import AddOrgContent from "../../components/project/AddOrgContent.vue";
 import * as lecturer from "../../api/Lecturer.js";
@@ -560,6 +576,7 @@ export default {
         affiliationOrgLists: [],
         locking: 1,
       },
+      filterOrgListSearch: [],
     });
     const PlaceOfPayList = ref([
       { value: "1", label: "一级审批" },
@@ -1176,6 +1193,50 @@ export default {
       { label: "根节点", value: "0" },
       { label: "子节点", value: "1" },
     ]);
+
+    onMounted(() => {
+      orgLists()
+    })
+    const orgLists = () => {
+      const obj = {
+        pageNo: 1,
+        pageSize: 10000,
+        moduleType: 0,
+        isParent: 0
+      }
+      queryTrainOrgPor(obj).then((res) => {
+        state.orgList = res.data.data?.map(item => {
+          return {
+            label: item.affiliationName,
+            value: item.id
+          }
+        })
+        state.orgListSearch = res.data.data?.map(item => {
+          state.orgInput = item.affiliationName;
+          return {
+            label: item.affiliationName,
+            value: item.id
+          }
+        })
+
+        state.filterOrgListSearch = state.orgListSearch
+      })
+    }
+
+    const handleOrgSearch = (value) => {
+      console.log("handleOrgSearch value： ",value)
+      //克隆数据
+      let temp = JSON.parse(JSON.stringify(state.orgListSearch));
+      //选择数据
+      state.filterOrgListSearch = temp.filter(item => item.label.includes(value))
+    }
+
+    const handleOrgChange = (value) => {
+      if(value == undefined || value == null){
+        state.filterOrgListSearch = state.orgListSearch;
+      }
+    }
+
     //回车
     const enterPressHadlerSearch = (e) => {
       if (e.keyCode === 13) {
@@ -1186,6 +1247,9 @@ export default {
       ...toRefs(state),
       enterPressHadlerSearch,
       TrainOrglist,
+      orgLists,
+      handleOrgSearch,
+      handleOrgChange,
       rules,
       formRef,
       columns,