From 7277731f83b359443bb8259ce568c8bcf37ac31d Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期五, 13 十二月 2024 16:19:43 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/order.js | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 2f525b3..1279588 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -45,11 +45,12 @@
cols: [[
{type: 'numbers'},
// {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
- {field: 'orderNo', title: '鍗曟嵁缂栧彿', minWidth: 160, width: 300},
- {field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
- {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
- {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
- {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
+ {field: 'orderNo', title: '鍗曟嵁缂栧彿', minWidth: 160, },
+ {field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, },
+ {field: 'threeCode', title: '閿�鍞崟鍙�', minWidth: 160, },
+ {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, },
+ {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, },
+ {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, },
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
{align: 'center', title: '鎿嶄綔', toolbar: '#operate'}
]],
@@ -90,6 +91,10 @@
// 瀵煎叆閿�鍞崟
$("#importOrder").click(function () {
$("#importExcel").trigger("click");
+ });
+ // 瀵煎叆閿�鍞崟
+ $("#importOrder2").click(function () {
+ $("#importExcel2").trigger("click");
});
// 宸ュ叿鏉＄偣鍑讳簨浠�
@@ -135,6 +140,7 @@
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'bomCode', title: 'Bom鍙�'},
+ {field: 'threeCode', title: '閿�鍞崟鍙�'},
{field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'supp', title: '绔嬪簱搴撳瓨', templet: function (item){
@@ -263,6 +269,7 @@
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
{field: 'bomCode', title: 'Bom鍙�', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'batch', title: '鎵瑰彿', edit: true},
+ {field: 'threeCode', title: '閿�鍞崟鍙�', edit: true},
{field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
// {field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
@@ -602,6 +609,35 @@
}, function(index){
});
}
+
+function upload2(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 + "/order/excel/import2/auth";
+ var form = new FormData();
+ form.append("file", file);
+ let xhr = new XMLHttpRequest();
+ xhr.open("post", url, true);
+ xhr.setRequestHeader('token', localStorage.getItem('token'));
+ xhr.onload = uploadComplete;
+ xhr.onerror = uploadFailed;
+ xhr.onloadend = function () {
+ layer.closeAll('loading');
+ };
+ // xhr.upload.onprogress = progressFunction;
+ xhr.upload.onloadstart = function(){
+ ot = new Date().getTime();
+ oloaded = 0;
+ };
+ xhr.send(form);
+ }, function(index){
+ });
+}
+
function uploadComplete(evt) {
let res = JSON.parse(evt.target.responseText);
if(res.code === 200) {
--
Gitblit v1.9.1