From 3c70182a85a263bcac65e3e72056b616835a10fb Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 18 Aug 2023 21:25:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kc/config/KcExportConfigTpkwcqkjzglxList.vue   |  7 +++++++
 src/views/kc/pktj/pkmxb/pkmxb.vue                  | 14 ++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue b/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue
index 121080e..93560e4 100644
--- a/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue
+++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.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"/> -->
@@ -102,6 +107,7 @@
   import { defHttp } from '/@/utils/http/axios';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { JInput } from '/@/components/Form';
+  import { getSysConfig } from '/@/views/site/utils/index';
 
   const queryParam = ref<any>({});
   const toggleSearchStatus = ref<boolean>(false);
@@ -137,6 +143,7 @@
 	  success: handleSuccess
 	},
   });
+  
   const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
   const labelCol = reactive({
     xs: { span: 24 },
diff --git a/src/views/kc/pktj/pkmxb/pkmxb.vue b/src/views/kc/pktj/pkmxb/pkmxb.vue
index c87ad62..88261f4 100644
--- a/src/views/kc/pktj/pkmxb/pkmxb.vue
+++ b/src/views/kc/pktj/pkmxb/pkmxb.vue
@@ -29,6 +29,11 @@
             </a-form-item>
           </a-col>
           <a-col :span="6">
+            <a-form-item label="">
+              <j-dict-select-tag ref="xqDictTag" placeholder="请选择学期" v-model:value="queryParam.xnxq" dictCode="kc_xqxn_history,title,title,true order by start_time desc"/>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :span="6">
             <a-form-item label="">
               <a-date-picker
                 :showTime="false"
@@ -49,7 +54,7 @@
                 style="width:100%;"
               ></a-date-picker>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="6">
             <a-form-item label="">
               <a-input placeholder="填写教师名称" v-model:value="queryParam.username"/>
@@ -146,9 +151,10 @@ const roleListApi = (params) => defHttp.get({ url: Api.roleList, params });
 
   //进入就加载
   onMounted(() => {
-    const format = 'yyyy-MM-dd';
-    queryParam.value.startTime =  dateFormat(getSysConfig().bxqkssj, format)
-    queryParam.value.endTime =  dateFormat(new Date(), format)
+    // const format = 'yyyy-MM-dd';
+    // queryParam.value.startTime =  dateFormat(getSysConfig().bxqkssj, format)
+    // queryParam.value.endTime =  dateFormat(new Date(), format)
+    queryParam.value.xnxq = getSysConfig().flag1
   });
 
   /**