From 69ddd687a2d2fb055a899018255dc696684f3f0a Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Tue, 29 Aug 2023 15:51:23 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B48=E6=9C=8829=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=90=AC=E8=AF=BE=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.bat                                     |  6 +++++-
 src/main.ts                                   |  6 +++---
 .../config/KcExportConfigTpkwcqkjzglxList.vue | 20 +++++++++++++------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/build.bat b/build.bat
index 15ec4f6..884426b 100644
--- a/build.bat
+++ b/build.bat
@@ -1 +1,5 @@
-yarn build
\ No newline at end of file
+yarn build
+echo 压缩
+cd dist
+tar -zcvf ../dist.tar.gz *
+cd ..
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index 584efd7..de4c9d0 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,9 +1,9 @@
 import '/@/design/index.less';
 // 注册 windi
 import 'virtual:windi-base.css';
-// import 'virtual:windi-components.css';
-// import 'virtual:windi-utilities.css';
-// import 'virtual:windi-devtools';
+import 'virtual:windi-components.css';
+import 'virtual:windi-utilities.css';
+import 'virtual:windi-devtools';
 // 注册图标
 import 'virtual:svg-icons-register';
 import App from './App.vue';
diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue b/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue
index e46a567..02b841d 100644
--- a/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue
+++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue
@@ -37,7 +37,9 @@
               <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="onExport" style="margin-left: 8px"> 导出</a-button>
+                <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExport" style="margin-left: 8px">PDF导出</a-button>
+                <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px">Excel导出</a-button>
+
                 <!--<a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
                   {{ toggleSearchStatus ? '收起' : '展开' }}
                   <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
@@ -158,8 +160,14 @@
       },
     },
     exportConfig: {
-      name: "kc_export_config_tpkwcqkjzglx",
+      name: "人员信息",
       url: getExportUrl,
+      params: () => {
+        let params:any = {};
+        params.findByDwmc = !roleList.value.filter(x => x.roleCode == 'admin' ).length
+        params.findGh = getUserId()
+        return Object.assign(params,queryParam.value);
+      }
     },
 	importConfig: {
 	  url: getImportUrl,
@@ -275,10 +283,10 @@
   }
 
   function onExport() {
-    if(!!roleList.value.filter(x => x.roleCode == 'admin' ).length && !queryParam.value.dwmc) {
-      createMessage.warn('请选择导出的单位');
-      return ;
-    }
+    // if(!!roleList.value.filter(x => x.roleCode == 'admin' ).length && !queryParam.value.dwmc) {
+    //   createMessage.warn('请选择导出的单位');
+    //   return ;
+    // }
     onExportWord();
   }