From e6cbd2b4aa660eec59f458433976e7397bbcf455 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 6 Dec 2023 08:23:12 +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

---
 src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue    | 2 +-
 src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue  | 2 +-
 src/views/kc/config/StaticCon/StaticCon.vue               | 2 +-
 src/views/kc/config/StaticCon/StaticConGlyChart.vue       | 2 +-
 .../kcKechengtixingdingyue/KcKechengtixingdingyueList.vue | 5 +++++
 src/views/kc/xxhbtkxx/XxhbtkxxList.vue                    | 8 +++++++-
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue b/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue
index e88c162..58f5ac1 100644
--- a/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue
+++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue
@@ -12,7 +12,7 @@
           <a-col :lg="8" v-if="!!roleList.filter(x => x.roleCode == 'admin' ).length">
             <a-form-item label="学院名称">
               <!-- <j-dict-select-tag placeholder="请选择单位名称" v-model:value="queryParam.tklx" dictCode="tpkwcqkjzglx"/> -->
-              <j-dict-select-tag placeholder="请选择学院名称" v-model:value="queryParam.dwmc" dictCode="kc_kkdw21_view,kkdw,kkdw"/>
+              <j-dict-select-tag placeholder="请选择学院名称" v-model:value="queryParam.dwmc" dictCode="kc_kkdw21_view,kkdw,kkdw,true order by id asc"/>
             </a-form-item>
           </a-col>
           <a-col :lg="8">
diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue b/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue
index ea2bfd4..df16555 100644
--- a/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue
+++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue
@@ -12,7 +12,7 @@
           <a-col :lg="8">
             <a-form-item label="学院名称">
               <!-- <j-dict-select-tag placeholder="请选择单位名称" v-model:value="queryParam.tklx" dictCode="tpkwcqkjzglx"/> -->
-              <j-dict-select-tag placeholder="请选择学院名称" v-model:value="queryParam.dwmc" dictCode="kc_kkdw21_view,kkdw,kkdw"/>
+              <j-dict-select-tag placeholder="请选择学院名称" v-model:value="queryParam.dwmc" dictCode="kc_kkdw21_view,kkdw,kkdw,true order by id asc"/>
             </a-form-item>
           </a-col>
           <a-col :lg="8">
diff --git a/src/views/kc/config/StaticCon/StaticCon.vue b/src/views/kc/config/StaticCon/StaticCon.vue
index d9d5237..28b7f40 100644
--- a/src/views/kc/config/StaticCon/StaticCon.vue
+++ b/src/views/kc/config/StaticCon/StaticCon.vue
@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :span="8">
             <a-form-item label="学院名称">
-              <j-dict-select-tag  placeholder="请选择学院名称" v-model:value="queryParam.dwmc" dictCode="kc_kkdw21_view,kkdw,kkdw"/>
+              <j-dict-select-tag  placeholder="请选择学院名称" v-model:value="queryParam.dwmc" dictCode="kc_kkdw21_view,kkdw,kkdw,true order by id asc"/>
             </a-form-item>
           </a-col>
           <a-col  :span="8">
diff --git a/src/views/kc/config/StaticCon/StaticConGlyChart.vue b/src/views/kc/config/StaticCon/StaticConGlyChart.vue
index fdef994..b421085 100644
--- a/src/views/kc/config/StaticCon/StaticConGlyChart.vue
+++ b/src/views/kc/config/StaticCon/StaticConGlyChart.vue
@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :span="8">
             <a-form-item label="学院名称">
-              <j-dict-select-tag  placeholder="请选择学院名称" v-model:value="queryParam.dwmc" dictCode="kc_kkdw21_view,kkdw,kkdw"/>
+              <j-dict-select-tag  placeholder="请选择学院名称" v-model:value="queryParam.dwmc" dictCode="kc_kkdw21_view,kkdw,kkdw,true order by id asc"/>
             </a-form-item>
           </a-col>
           <a-col  :span="8">
diff --git a/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyueList.vue b/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyueList.vue
index 3f22863..f091ee2 100644
--- a/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyueList.vue
+++ b/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyueList.vue
@@ -100,6 +100,11 @@
     exportConfig: {
       name: "课程提醒订阅",
       url: getExportUrl,
+      params: () => {
+        let params:any = {};
+        return Object.assign(params,queryParam.value);
+      }
+
     },
 	importConfig: {
 	  url: getImportUrl,
diff --git a/src/views/kc/xxhbtkxx/XxhbtkxxList.vue b/src/views/kc/xxhbtkxx/XxhbtkxxList.vue
index 1f43536..0420a1c 100644
--- a/src/views/kc/xxhbtkxx/XxhbtkxxList.vue
+++ b/src/views/kc/xxhbtkxx/XxhbtkxxList.vue
@@ -43,7 +43,8 @@
             </a-col> -->
             <a-col :lg="8">
               <a-form-item label="申请人单位">
-                <j-input placeholder="请输入申请人单位" v-model:value="queryParam.sqrdw"></j-input>
+                <!-- <j-input placeholder="请输入申请人单位" v-model:value="queryParam.sqrdw"></j-input> -->
+                <j-dict-select-tag placeholder="请选择申请人单位" v-model:value="queryParam.sqrdw" dictCode="kc_kkdw21_view,kkdw,kkdw,true order by id asc"/>
               </a-form-item>
             </a-col>
             <!-- <a-col :lg="8">
@@ -146,6 +147,7 @@
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+              <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px">导出</a-button>
                 <!--<a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
                   {{ toggleSearchStatus ? '收起' : '展开' }}
                   <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
@@ -234,6 +236,10 @@
     exportConfig: {
       name: "同步数据表(tkxx)",
       url: getExportUrl,
+      params: () => {
+        let params:any = {};
+        return Object.assign(params,queryParam.value);
+      }
     },
 	importConfig: {
 	  url: getImportUrl,