From db7621691c91a52c259c7847ece6a4f82959963b Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 21:35:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/OrganizationApproval.vue | 25 ++++++++++++++++++++-
 src/views/lecturer/OrganizationList.vue     | 10 ++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue
index 017c1947..1dbd1db9 100644
--- a/src/views/lecturer/OrganizationApproval.vue
+++ b/src/views/lecturer/OrganizationApproval.vue
@@ -13,6 +13,22 @@
           />
         </div>
       </a-form-item>
+      <a-form-item class="select">
+        <div>
+          <!-- TODO GX03 -->
+          <a-select
+            style="width: 235px"
+            v-model:value="searchParam.isParent"
+            placeholder="请选择状态"
+            allowClear
+            v-on:keydown.enter="enterPressHadlerSearch"
+          >
+            <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>
+        </div>
+      </a-form-item>
       <a-form-item class="select">
         <div>
           <a-select
@@ -531,6 +547,8 @@ export default {
         name: null,
         isParent: null,
         leaderName: null,
+        status: null,
+        approvalType: null,
         pageNo: "1",
         pageSize: "10",
       },
@@ -724,7 +742,12 @@ export default {
     //  List接口数据
     const getTableDate = (obj) => {
       state.tableLoading = true;
-      let objA = { ...state.searchParam };
+      let objA = { 
+        ...state.searchParam ,
+        //TODO GX03 
+        //审批未通过意外的数据
+        approvalType:1
+      };
       queryTrainOrg(objA).then((res) => {
         tableData.value = res.data.data.records;
         state.tableDataTotal = Number(res.data.data.total);
diff --git a/src/views/lecturer/OrganizationList.vue b/src/views/lecturer/OrganizationList.vue
index 017c1947..3d14a1df 100644
--- a/src/views/lecturer/OrganizationList.vue
+++ b/src/views/lecturer/OrganizationList.vue
@@ -531,6 +531,8 @@ export default {
         name: null,
         isParent: null,
         leaderName: null,
+        status: null,
+        approvalType: null,
         pageNo: "1",
         pageSize: "10",
       },
@@ -724,13 +726,19 @@ export default {
     //  List接口数据
     const getTableDate = (obj) => {
       state.tableLoading = true;
-      let objA = { ...state.searchParam };
+      let objA = { 
+        ...state.searchParam ,
+        //TODO GX03 加审核结束标记
+        //审核通过数据
+        approvalType:0
+       };
       queryTrainOrg(objA).then((res) => {
         tableData.value = res.data.data.records;
         state.tableDataTotal = Number(res.data.data.total);
         state.tableLoading = false;
       });
     };
+    //初始化数据
     getTableDate();
     // 搜索
     const searchSubmit = () => {