From d3cb0e841e6585aa84a45f18bb30965db8d1a6aa Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 08 一月 2025 15:48:40 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/order.js | 72 ++++++++++++++++++++++++++++++------
1 files changed, 60 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 4aeba9a..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");
});
// 宸ュ叿鏉＄偣鍑讳簨浠�
@@ -134,8 +139,18 @@
{type: 'numbers'},
{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){
+ 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: '鍗曚綅'},
@@ -252,7 +267,9 @@
{type: 'numbers', title: '#'},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{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},
@@ -521,9 +538,6 @@
}
// 鎵撳嵃
function btnPrint(orderId, orderNo, settle) {
- console.log(orderId);
- console.log(orderNo);
- console.log(settle);
printMatCodeNos.push(orderNo)
var templateNo = 3;
$.ajax({
@@ -535,16 +549,21 @@
success: function (res) {
if (res.code === 200){
layer.closeAll();
- console.log(res);
for (let i=0;i<res.data.length;i++){
var templateDom = $("#templatePreview"+templateNo);
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+";"+res.data[i].bomCode;
} else {
- res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2¶m="+res.data[i].orderNo+
- ";"+res.data[i].matnr+";"+res.data[i].batch;
+ if (res.data[i].bomCode) {
+ 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].anfme+";"+res.data[i].bomCode;
+ } 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].anfme;
+ }
+
}
}
var tpl = templateDom.html();
@@ -590,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