From b66cc5ddc2e671cecefa6edfc3b33003cc8d2f8e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 六月 2020 13:14:02 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MatCodeController.java |    6 +++++-
 src/main/webapp/views/matCode/matCode.html                  |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 9ddee06..00bb494 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -1,6 +1,7 @@
 package com.zy.asrs.controller;
 
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -123,7 +124,10 @@
         response.setCharacterEncoding("utf-8");
         fileName = URLEncoder.encode(Cools.isEmpty(fileName)?"鐗╂枡缂栫爜":fileName, "UTF-8");
         response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
-        EasyExcel.write(response.getOutputStream(), MatCodeExcel.class).sheet("琛�1").doWrite(excels);
+        EasyExcel.write(response.getOutputStream(), MatCodeExcel.class)
+                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+                .sheet("琛�1")
+                .doWrite(excels);
     }
 
     // 瀵煎叆
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 9985e27..5a07624 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -22,7 +22,7 @@
     </div>
 
     <!-- 寰呮坊鍔� -->
-    <div id="data-search-btn" class="layui-btn-container layui-form-item">
+    <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
         <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
         <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
     </div>
@@ -64,7 +64,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label"  style="padding: 9px 0">瀵煎嚭琛屾暟</label>
             <div class="layui-input-block" style="margin-left: 90px;">
-                <input type="text" id="exportRowCount" placeholder="閫夊~" autocomplete="off" class="layui-input" lay-verify="number" lay-reqtext="璇疯緭鍏ユ暟瀛�">
+                <input type="text" id="exportRowCount" placeholder="閫夊~锛堥粯璁ゅ叏閮級" autocomplete="off" class="layui-input" lay-verify="number" lay-reqtext="璇疯緭鍏ユ暟瀛�">
             </div>
         </div>
         <div style="text-align: center; margin-top: 20px">

--
Gitblit v1.9.1