From ecdf3ac2053958ebcc2a924d85322c569e18d037 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Mon, 28 Aug 2023 23:34:36 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B48=E6=9C=8828=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/KcExportConfigTpkwcqkjzglxList.vue |  1 +
 .../KcExportConfigTpkwcqkjzglxPzList.vue      | 24 ++++++++++++++++++-
 .../KcExportConfigTpkwcqkjzglxForm.vue        |  8 +++----
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue b/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue
index c5de35d..e46a567 100644
--- a/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue
+++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue
@@ -144,6 +144,7 @@
       canResize:false,
       useSearchForm: false,
       showActionColumn: false,
+      immediate: false,
       actionColumn: {
         width: 120,
         fixed: 'right',
diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue b/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue
index c35c628..2785591 100644
--- a/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue
+++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue
@@ -4,6 +4,11 @@
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
+          <a-col :span="8">
+            <a-form-item label="学年学期">
+              <j-dict-select-tag ref="xqDictTag" placeholder="请选择学年学期" v-model:value="queryParam.xqxn" dictCode="kc_xqxn_history,title,title,true order by start_time desc"/>
+            </a-form-item>
+          </a-col>
           <a-col :lg="8">
             <a-form-item label="单位名称">
               <!-- <j-dict-select-tag placeholder="请选择单位名称" v-model:value="queryParam.tklx" dictCode="tpkwcqkjzglx"/> -->
@@ -97,7 +102,7 @@
 </template>
 
 <script lang="ts" name="config-kcExportConfigTpkwcqkjzglx" setup>
-  import { ref, reactive, computed } from 'vue';
+  import { ref, reactive, computed, watch, nextTick } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
   import { columns } from './KcExportConfigTpkwcqkjzglx.data';
@@ -111,6 +116,22 @@
   import { JInput } from '/@/components/Form';
   import { getUserInfo, getUserId } from '/@/views/site/utils/index';
 
+  const xqDictTag = ref();
+
+  watch(() => xqDictTag.value?.dictOptions,(d) => {
+    if(d){
+      queryParam.value.xqxn = d[0]?.value
+      if(queryParam.value.xqxn){
+        nextTick(() => {
+          reload();
+        })
+      }
+    }
+  },{
+    deep:true,
+    immediate:true,
+  });
+
   const roleList = computed(() => getUserInfo()?.roleList??[]);
 
   const queryParam = ref<any>({});
@@ -128,6 +149,7 @@
       columns,
       canResize:false,
       useSearchForm: false,
+      immediate: false,
       actionColumn: {
         width: 120,
         fixed: 'right',
diff --git a/src/views/kc/config/components/KcExportConfigTpkwcqkjzglxForm.vue b/src/views/kc/config/components/KcExportConfigTpkwcqkjzglxForm.vue
index e45804e..16510f7 100644
--- a/src/views/kc/config/components/KcExportConfigTpkwcqkjzglxForm.vue
+++ b/src/views/kc/config/components/KcExportConfigTpkwcqkjzglxForm.vue
@@ -18,13 +18,13 @@
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="听课类型" v-bind="validateInfos.gh">
-	          <j-dict-select-tag v-model:value="formData.tklx" dictCode="tpkwcqkjzglx" placeholder="请选择听课类型" :disabled="disabled"/>
+          <a-form-item label="身份" v-bind="validateInfos.gh">
+	          <j-dict-select-tag v-model:value="formData.tklx" dictCode="tpkwcqkjzglx" placeholder="请选择身份" :disabled="disabled"/>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="身份" v-bind="validateInfos.sf">
-            <a-input v-model:value="formData.sf" placeholder="请输身份" :disabled="disabled"></a-input>
+          <a-form-item label="听课类型" v-bind="validateInfos.sf">
+            <a-input v-model:value="formData.sf" placeholder="请输听课类型" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">