From b2f6a4df03a96a5efc49524ccf84d356fee72479 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 12 十一月 2023 16:10:22 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pakStore/stockOutOrder.html | 4 ++
src/main/webapp/views/pakStore/stockOut.html | 4 --
src/main/webapp/static/js/pakStore/stockOut.js | 54 ---------------------------
src/main/webapp/static/js/pakStore/stockOutOrder.js | 58 ++++++++++++++++++++++++++++
4 files changed, 61 insertions(+), 59 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index 96f5e97..5b08de2 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -177,57 +177,3 @@
layer.close(locDetlLayerIdx);
}
-
-// excel瀵煎叆妯℃澘涓嬭浇
-function excelMouldDownload(){
- layer.load(1, {shade: [0.1,'#fff']});
- location.href = baseUrl + "/out/loc/box/excel/import/mould";
- layer.closeAll('loading');
-}
-
-// excel瀵煎叆
-function importExcel() {
- $("#importExcel").trigger("click");
-}
-function upload(obj){
- if(!obj.files) {
- return;
- }
- var file = obj.files[0];
- admin.confirm('纭鍚屾 [' + file.name +'] 鏂囦欢鍚楋紵', function (index) {
- layer.load(1, {shade: [0.1,'#fff']});
- var url = baseUrl + "/out/loc/box/excel/import/auth";
- var form = new FormData();
- form.append("file", file);
- xhr = new XMLHttpRequest();
- xhr.open("post", url, true); //post鏂瑰紡锛寀rl涓烘湇鍔″櫒璇锋眰鍦板潃锛宼rue 璇ュ弬鏁拌瀹氳姹傛槸鍚﹀紓姝ュ鐞嗐��
- xhr.setRequestHeader('token', localStorage.getItem('token'));
- xhr.onload = uploadComplete; //璇锋眰瀹屾垚
- xhr.onerror = uploadFailed; //璇锋眰澶辫触
- xhr.onloadend = function () { // // 涓婁紶瀹屾垚閲嶇疆鏂囦欢娴�
- layer.closeAll('loading');
- $("#importExcel").val("");
- };
- // xhr.upload.onprogress = progressFunction;//銆愪笂浼犺繘搴﹁皟鐢ㄦ柟娉曞疄鐜般��
- xhr.upload.onloadstart = function(){//涓婁紶寮�濮嬫墽琛屾柟娉�
- ot = new Date().getTime(); //璁剧疆涓婁紶寮�濮嬫椂闂�
- oloaded = 0;//璁剧疆涓婁紶寮�濮嬫椂锛屼互涓婁紶鐨勬枃浠跺ぇ灏忎负0
- };
- xhr.send(form);
- }, function(index){
- $("#importExcel").val("");
- });
-}
-function uploadComplete(evt) {
- var res = JSON.parse(evt.target.responseText);
- if(res.code === 200) {
- layer.msg(res.msg, {icon: 1});
- loadTree("");
- } else {
- layer.msg(res.msg, {icon: 2});
- }
-}
-function uploadFailed(evt) {
- var res = JSON.parse(evt.target.responseText);
- layer.msg(res.msg, {icon: 2});
-}
\ No newline at end of file
diff --git a/src/main/webapp/static/js/pakStore/stockOutOrder.js b/src/main/webapp/static/js/pakStore/stockOutOrder.js
index 12a7b99..d4675ce 100644
--- a/src/main/webapp/static/js/pakStore/stockOutOrder.js
+++ b/src/main/webapp/static/js/pakStore/stockOutOrder.js
@@ -1,5 +1,6 @@
var locDetlLayerIdx;
var locDetlData = [];
+var admin;
function getCol() {
var cols = [
// {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'},
@@ -19,7 +20,7 @@
var $ = layui.jquery;
var layer = layui.layer;
var form = layui.form;
- var admin = layui.admin;
+ admin = layui.admin;
tableIns = table.render({
elem: '#chooseData',
@@ -185,3 +186,58 @@
tableIns.reload({data: locDetlData});
layer.close(locDetlLayerIdx);
}
+
+
+// excel瀵煎叆妯℃澘涓嬭浇
+function excelMouldDownload(){
+ layer.load(1, {shade: [0.1,'#fff']});
+ location.href = baseUrl + "/out/loc/box/excel/import/mould";
+ layer.closeAll('loading');
+}
+
+// excel瀵煎叆
+function importExcel() {
+ $("#importExcel").trigger("click");
+}
+function upload(obj){
+ if(!obj.files) {
+ return;
+ }
+ var file = obj.files[0];
+ admin.confirm('纭鍚屾 [' + file.name +'] 鏂囦欢鍚楋紵', function (index) {
+ layer.load(1, {shade: [0.1,'#fff']});
+ var url = baseUrl + "/out/loc/box/excel/import/auth";
+ var form = new FormData();
+ form.append("file", file);
+ xhr = new XMLHttpRequest();
+ xhr.open("post", url, true); //post鏂瑰紡锛寀rl涓烘湇鍔″櫒璇锋眰鍦板潃锛宼rue 璇ュ弬鏁拌瀹氳姹傛槸鍚﹀紓姝ュ鐞嗐��
+ xhr.setRequestHeader('token', localStorage.getItem('token'));
+ xhr.onload = uploadComplete; //璇锋眰瀹屾垚
+ xhr.onerror = uploadFailed; //璇锋眰澶辫触
+ xhr.onloadend = function () { // // 涓婁紶瀹屾垚閲嶇疆鏂囦欢娴�
+ layer.closeAll('loading');
+ $("#importExcel").val("");
+ };
+ // xhr.upload.onprogress = progressFunction;//銆愪笂浼犺繘搴﹁皟鐢ㄦ柟娉曞疄鐜般��
+ xhr.upload.onloadstart = function(){//涓婁紶寮�濮嬫墽琛屾柟娉�
+ ot = new Date().getTime(); //璁剧疆涓婁紶寮�濮嬫椂闂�
+ oloaded = 0;//璁剧疆涓婁紶寮�濮嬫椂锛屼互涓婁紶鐨勬枃浠跺ぇ灏忎负0
+ };
+ xhr.send(form);
+ }, function(index){
+ $("#importExcel").val("");
+ });
+}
+function uploadComplete(evt) {
+ var res = JSON.parse(evt.target.responseText);
+ if(res.code === 200) {
+ layer.msg(res.msg, {icon: 1});
+ loadTree("");
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+}
+function uploadFailed(evt) {
+ var res = JSON.parse(evt.target.responseText);
+ layer.msg(res.msg, {icon: 2});
+}
\ No newline at end of file
diff --git a/src/main/webapp/views/pakStore/stockOut.html b/src/main/webapp/views/pakStore/stockOut.html
index c20d9e8..8f360a4 100644
--- a/src/main/webapp/views/pakStore/stockOut.html
+++ b/src/main/webapp/views/pakStore/stockOut.html
@@ -84,7 +84,6 @@
<!-- 鍔熻兘鍖� -->
<div class="function-area">
<button id="mat-query" class="function-btn">鎻愬彇搴撳瓨</button>
- <button class="function-btn" style="width: auto;float:right;" onclick="excelMouldDownload()">瀵煎叆绠卞彿鍑哄簱妯℃澘涓嬭浇</button>
</div>
<hr>
@@ -103,9 +102,6 @@
</select>
<!-- 2.鍚姩鍑哄簱 -->
<button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">鍚姩鍑哄簱</button>
- <!-- 3.瀵煎叆绠卞彿鍑哄簱 -->
- <button class="layui-btn layui-btn-lg" onclick="importExcel()" style="font-size: 12px;width: auto;">瀵煎叆绠卞彿鍑哄簱</button>
- <span style="display: none"><input id="importExcel" type="file" onchange="upload(this)">鍚姩鍑哄簱</span>
</div>
</div>
</script>
diff --git a/src/main/webapp/views/pakStore/stockOutOrder.html b/src/main/webapp/views/pakStore/stockOutOrder.html
index e97b4ef..d42eef5 100644
--- a/src/main/webapp/views/pakStore/stockOutOrder.html
+++ b/src/main/webapp/views/pakStore/stockOutOrder.html
@@ -84,6 +84,7 @@
<!-- 鍔熻兘鍖� -->
<div class="function-area">
<button id="mat-query" class="function-btn">鎻愬彇搴撳瓨</button>
+ <button class="function-btn" style="width: auto;float:right;" onclick="excelMouldDownload()">瀵煎叆绠卞彿鍑哄簱妯℃澘涓嬭浇</button>
</div>
<hr>
@@ -102,6 +103,9 @@
</div>
</div>
<button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">鍚姩鍑哄簱</button>
+ <!-- 3.瀵煎叆绠卞彿鍑哄簱 -->
+ <button class="layui-btn layui-btn-lg" onclick="importExcel()" style="font-size: 12px;width: auto;">瀵煎叆绠卞彿鍑哄簱</button>
+ <span style="display: none"><input id="importExcel" type="file" onchange="upload(this)">鍚姩鍑哄簱</span>
</div>
<!-- <div class="layui-btn-container">-->
<!-- <!– 1.閫夋嫨鍑哄簱鍙� –>-->
--
Gitblit v1.9.1