From 621aa5a2708e7a48de3ad1bcd5a18e0edbd50923 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 05 六月 2020 15:33:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 14 +++++++
src/main/webapp/views/matCode/matCode.html | 24 ++++++++++-
src/main/webapp/static/js/matCode/matCode.js | 28 +++++++++++++
3 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 275a57f..e5fd20f 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -12,10 +13,14 @@
import com.core.common.R;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.service.MatCodeService;
+import com.zy.common.utils.excel.EnInitData;
+import com.zy.common.utils.excel.EnInitDataListener;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
import java.util.*;
@RestController
@@ -92,6 +97,7 @@
return R.ok();
}
+ // 瀵煎嚭
@RequestMapping(value = "/matCode/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
@@ -103,6 +109,14 @@
return R.ok(exportSupport(list, fields));
}
+ // 瀵煎叆
+ @RequestMapping(value = "/matCode/import/auth")
+ @ManagerAuth
+ public R matCodeImport(MultipartFile file) throws IOException {
+ EasyExcel.read(file.getInputStream(), EnInitData.class, new EnInitDataListener()).sheet().doRead();
+ return R.ok();
+ }
+
@RequestMapping(value = "/matCodeQuery/auth")
@ManagerAuth
public R query(String condition) {
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 7886e47..d275886 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -1,9 +1,10 @@
var pageCurr;
-layui.use(['table','laydate', 'form'], function(){
+layui.use(['table','laydate', 'form','upload'], function(){
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
+ var upload = layui.upload;
var form = layui.form;
// 鏁版嵁娓叉煋
@@ -115,6 +116,19 @@
});
});
+ // 瀵煎叆excel
+
+ upload.render({
+ elem: '#uploadEx'
+ , url: baseUrl + '/matCode/import/auth' //鏀规垚鎮ㄨ嚜宸辩殑涓婁紶鎺ュ彛
+ , headers: {token: localStorage.getItem('token')}
+ , accept: 'file' //鏅�氭枃浠�
+ , exts: 'xls|excel|xlsx' //鍙厑璁哥殑鏂囦欢鍚庣紑
+ , done: function (res) {
+ layer.msg('涓婁紶鎴愬姛');
+ }
+ })
+
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(matCode)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
@@ -206,6 +220,18 @@
});
});
break;
+ case 'intoData':
+ layer.open({
+ type: 1,
+ title: '鏁版嵁瀵煎叆',
+ maxmin: true,
+ shadeClose: true,
+ content: $('#importDataDiv'),
+ success: function(layero, index){
+
+ }
+ });
+ break;
}
});
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 8562724..0ededc9 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -34,9 +34,8 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+ <button class="layui-btn layui-btn-normal" id="btn-export" lay-event="exportData" style="float: inherit">瀵煎嚭</button>
+ <button class="layui-btn " id="btn-into" lay-event="intoData">瀵煎叆</button>
</div>
</script>
@@ -53,6 +52,25 @@
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+<div id="importDataDiv" style="display: none">
+ <form id="uploadExcel" class="layui-form">
+ <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
+ <legend>璇蜂笂浼犲悎娉曡鑼冪殑Excel鏂囦欢</legend>
+ </fieldset>
+ <div class="layui-form-item">
+ <div class="layui-input-block">
+ <button type="button" class="layui-btn" id="uploadEx"><i class="layui-icon">顧�</i>涓婁紶鏂囦欢</button>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-input-block">
+ <button class="layui-btn" lay-submit lay-filter="upload">涓婁紶</button>
+ <button type="reset" class="layui-btn layui-btn-primary">閲嶇疆</button>
+ </div>
+ </div>
+ </form>
+</div>
+
</body>
</html>
--
Gitblit v1.9.1