From e34c002fefc989c22c69918319a55394e72e50d3 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 22 十二月 2023 09:58:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/webapp/static/js/order/order.js | 131 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 123 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 3a7bc90..abe7000 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -146,6 +146,7 @@
})
}
+
// 宸ュ叿鏉＄偣鍑讳簨浠�
table.on('tool(order)', function (obj) {
var data = obj.data;
@@ -158,7 +159,8 @@
} else if (layEvent === 'del') {
doDel(data.id);
}else if (layEvent === 'btnPrint') {
- btnPrint(data.id, data.orderNo, 4);
+ //btnPrint(data.id, data.orderNo, 4);
+ btnPrint2(data.id, data.orderNo, 4);
} else if (layEvent === 'complete') {
doModify(data.id, data.orderNo, 4);
}else if (layEvent === 'manPrint') {
@@ -191,9 +193,11 @@
{type: 'numbers'},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- {field: 'batch', title: '鎵瑰彿'},
+ {field: 'owner$', title: '璐т富', width: 160},
+ {field: 'payment$', title: '璐х墿鐗瑰緛', width: 160},
+ // {field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
- // {field: 'workQty', title: '浣滀笟鏁伴噺'},
+ {field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
// {field: 'unit', title: '鍗曚綅'},
// {
@@ -203,8 +207,8 @@
// },
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
- {field: 'specs', title: '瑙勬牸'},
- {field: 'weight', title: '閲嶉噺'}
+ // {field: 'specs', title: '瑙勬牸'},
+ {field: 'weight', title: '閲嶉噺'}
]],
request: {
pageName: 'curr',
@@ -228,6 +232,9 @@
});
}
});
+ }
+ else if (layEvent === 'printExcel'){
+ printExcel(data);
}
});
@@ -254,6 +261,7 @@
return false;
}
let nList = admin.util.deepClone(xxDataList);
+ console.log(nList);
for (let xi = 0; xi < nList.length; xi++) {
if (nList[xi].anfme <= 0){
layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
@@ -261,6 +269,12 @@
}
if (nList[xi].anfme < nList[xi].workQty){
layer.msg('鏁伴噺涓嶈兘灏忎簬宸蹭綔涓氭暟閲�', {icon: 2});
+ return false;
+ }
+ }
+ for (let xi = 0; xi < nList.length; xi++) {
+ if (nList[xi].owner <= 0){
+ layer.msg('璐т富缂栧彿璇锋煡鐪嬭揣涓绘。妗�', {icon: 2});
return false;
}
}
@@ -304,19 +318,44 @@
{type: 'numbers', title: '#'},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- {field: 'batch', title: '鎵瑰彿', edit: true},
{field: 'specs', title: '瑙勬牸'},
+ {field: 'weight', title: '閲嶉噺', edit: true},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+ {field: 'owner', title: '璐т富缂栧彿', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+ {field: 'payment', title: '璐х墿鐘舵��', style: 'color: blue;font-weight: bold', templet: '#payment'},
+ // {field: 'payment', title: '璐х墿鐘舵��',align: 'center', templet: '#payment'},
{field: 'qty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
{field: 'memo', title: '澶囨敞' , edit: true},
{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
]],
- done: function (res) {
+ done: function (res, curr, count) {
$(layero).find('.layui-table-view').css('margin', '0');
+ var options = this;
+
+ // 鑾峰彇褰撳墠琛屾暟鎹�
+ table.getRowData = function(elem){
+ var index = $(elem).closest('tr').data('index');
+ return table.cache[options.id][index] || {};
+ };
+
+ $('.select-primary').on('change', function(){
+ var value = this.value; // 鑾峰彇閫変腑椤� value
+ var data = table.getRowData(this);
+ console.log(value);
+ xxDataList.forEach(res => {
+ if (data.id === res.id){
+ console.log(res)
+ res.payment = value;
+ }
+ })
+
+
+ });
},
size: ''
};
+
if (!isExpAdd) {
$.ajax({
url: baseUrl+"/order/detl/all/auth?orderId=" + expTpe.id,
@@ -387,7 +426,7 @@
}
}
data[obj.field] = obj.value;
- insTbSSXM.reload({data: xxDataList});
+ insTbSSXM.reloadData({data: xxDataList,scrollPos: true});
});
$('#matAddBtnComment').click(function () {
@@ -469,7 +508,11 @@
}
});
+
+
}
+
+
// 鍒犻櫎鍗曟嵁
function doDel(orderId) {
@@ -548,4 +591,76 @@
,type: 'datetime'
,range: true
});
+
+ function printExcel(data){
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ layer.closeAll();
+ layer.load(1, {shade: [0.1,'#fff']});
+ // location.href = "http://192.168.4.121:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
+ location.href = baseUrl+"/order/printExport/auth?orderNo="+data.orderNo;
+ layer.closeAll('loading');
+ });
+ }
+
+
+ function btnPrint2(orderId, orderNo, settle) {
+ console.log(orderId);
+ console.log(orderNo);
+ console.log(settle);
+ printMatCodeNos.push(orderNo)
+ var templateNo = 4;
+ $.ajax({
+ url: baseUrl + "/order/print2/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {param: printMatCodeNos},
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ layer.closeAll();
+ var json = res;
+
+ json.docNum = orderNo;
+ console.log("json"+json);
+ var sum = new Decimal("0");
+
+
+ for (let i = 0; i < res.data.length; i++){
+ sum = sum.plus(res.data[i].anfme);
+
+ }
+ json.anfmeSum = sum;
+ var barcodeUrl = baseUrl + "/order/code/auth?type=1¶m=" + res.data[0].docNum;
+ console.log("barcodeUrl:"+barcodeUrl);
+ json.barcodeUrl = barcodeUrl;
+ console.log(json.data);
+ for (let i = 0; i < json.data.length; i++) {
+ var templateDom = $("#templatePreview" + templateNo);
+ var className = templateDom.attr("class");
+
+ if (className === 'template-barcode') {
+ json.data[i]["barcodeUrl"] = baseUrl + "/order/code/auth?type=2¶m=" + (json.data[i].orderNo+";"+json.data[i].matnr+";");
+ } else {
+ json.data[i]["barcodeUrl"] = baseUrl + "/order/code/auth?type=2¶m=" + (json.data[i].orderNo+";"+json.data[i].matnr+";");
+ }
+ }
+ var tpl = templateDom.html();
+ var template = Handlebars.compile(tpl);
+ var html = template(json);
+ var box = $("#box");
+ box.html(html);
+ box.show();
+ box.print({mediaPrint: true});
+ box.hide();
+ } else if (json.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(json.msg)
+ }
+ }
+ })
+ }
+
+
+
});
--
Gitblit v1.9.1