From 997175b461ab192d8e249e216e1364d8a4d6c524 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 14 五月 2024 11:02:09 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/order.js | 63 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index e9df873..62ab391 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -1,4 +1,6 @@
var insTbCount = 0;
+var admin;
+var insTb
var printMatCodeNos = [];
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
@@ -8,7 +10,7 @@
var form = layui.form;
var table = layui.table;
var util = layui.util;
- var admin = layui.admin;
+ admin = layui.admin;
var xmSelect = layui.xmSelect;
var layDate = layui.laydate;
@@ -85,6 +87,11 @@
showEditModel();
});
+ // 瀵煎叆閿�鍞崟
+ $("#importOrder").click(function () {
+ $("#importExcel").trigger("click");
+ });
+
// 宸ュ叿鏉$偣鍑讳簨浠�
table.on('tool(order)', function (obj) {
var data = obj.data;
@@ -129,6 +136,14 @@
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
+ {field: 'supp', title: '绔嬪簱搴撳瓨', templet: function (item){
+ if(item.supp >= item.anfme) return `<span style="color: #00FF00">${item.supp}</span>`;
+ else return `<span style="color: red">${item.supp}</span>`;
+ }},
+ {field: 'suppCode', title: '骞冲簱搴撳瓨' , templet: function (item){
+ if(item.suppCode >= item.anfme) return `<span style="color: #00FF00">${item.suppCode}</span>`;
+ else return `<span style="color: red">${item.suppCode}</span>`;
+ }},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
// {field: 'unit', title: '鍗曚綅'},
@@ -534,10 +549,10 @@
var className = templateDom.attr("class");
if (className === 'template-barcode') {
res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1¶m="+res.data[i].orderNo+
- ";"+res.data[i].matnr+";"+res.data[i].batch;
+ ";"+res.data[i].matnr+";"+res.data[i].batch+";"+res.data[i].anfme;
} else {
res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2¶m="+res.data[i].orderNo+
- ";"+res.data[i].matnr+";"+res.data[i].batch;
+ ";"+res.data[i].matnr+";"+res.data[i].batch+";"+res.data[i].anfme;
}
}
var tpl = templateDom.html();
@@ -556,3 +571,45 @@
})
}
});
+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 + "/order/excel/import/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) {
+ layer.msg(res.msg, {icon: 1});
+ insTb.reload({page: {curr: 1}});
+ } else {
+ alert(res.msg);
+ // layer.msg(res.msg, {icon: 2});
+ }
+}
+function uploadFailed(evt) {
+ let res = JSON.parse(evt.target.responseText);
+ alert(res.msg);
+ // layer.msg(res.msg, {icon: 2});
+}
--
Gitblit v1.9.1