From 71d838e032d13a46a07917f5606862496220ea74 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 08 一月 2024 08:35:35 +0800
Subject: [PATCH] # 入库拣货功能添加
---
src/main/webapp/static/js/order/order.js | 98 ++++++++++++++++++++++++++++++++----------------
1 files changed, 65 insertions(+), 33 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 1e87b29..f6a94a8 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -146,12 +146,11 @@
})
}
+
// 宸ュ叿鏉＄偣鍑讳簨浠�
table.on('tool(order)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
-
-
if (layEvent === 'edit') {
showEditModel(data);
@@ -189,24 +188,24 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- {field: 'owner$', title: '璐т富', width: 160},
- {field: 'payment$', title: '璐х墿鐗瑰緛', width: 160},
+ // {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
+ // {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ //
// {field: 'batch', title: '鎵瑰彿'},
+ {field: 'batch', title: '鎵规'},
+ {field: 'brand', title: '鐗屽彿'},
+ {field: 'fingerMeltingMin', title: '鏈�灏忕啍鎸�'},
+ {field: 'fingerMeltingMax', title: '鏈�澶х啍鎸�'},
+ {field: 'fusingPointMin', title: '鏈�灏忕啍鐐�'},
+ {field: 'fusingPointMax', title: '鏈�澶х啍鐐�'},
+ {field: 'yellownessMin', title: '鏈�灏忛粍搴�'},
+ {field: 'yellownessMax', title: '鏈�澶ч粍搴�'},
+ {field: 'opacityMin', title: '鏈�灏忎笉閫忔槑搴�'},
+ {field: 'opacityMax', title: '鏈�澶т笉閫忔槑搴�'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
- // {field: 'unit', title: '鍗曚綅'},
- // {
- // field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
- // return util.toDateString(d.createTime);
- // }, width: 180
- // },
- // {field: 'inQty', title: '宸插叆搴撻噺'},
- // {field: 'color', title: '棰滆壊'},
- // {field: 'specs', title: '瑙勬牸'},
- // {field: 'weight', title: '閲嶉噺'}
+
]],
request: {
pageName: 'curr',
@@ -230,6 +229,9 @@
});
}
});
+ }
+ else if (layEvent === 'printExcel'){
+ printExcel(data);
}
});
@@ -258,21 +260,24 @@
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});
+ if(!nList[xi].anfme){
+ layer.msg('鏄庣粏鏁伴噺涓嶅悎娉�', {icon: 2});
return false;
}
+ if (nList[xi].anfme <= 0){
+ layer.msg('鏄庣粏鏁伴噺涓嶅悎娉�', {icon: 2});
+ return false;
+ }
+ // if (nList[xi].batch == null || nList[xi].batch == ""){
+ // layer.msg('鎵规涓嶅悎娉�', {icon: 2});
+ // return false;
+ // }
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;
- }
- }
+
layer.load(2);
$.ajax({
url: baseUrl+"/order/form/" + (isExpAdd?"add":"modify") + "/auth",
@@ -311,15 +316,24 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- {field: 'batch', title: '鎵瑰彿', edit: true},
- {field: 'specs', title: '瑙勬牸'},
- {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: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
+ // {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
+ // {field: 'specs', title: '瑙勬牸'},
+ {field: 'batch', title: '鎵规', edit: true},
+ {field: 'brand', title: '鐗屽彿', edit: true},
+ {field: 'fingerMeltingMin', title: '鏈�灏忕啍鎸�', edit: true},
+ {field: 'fingerMeltingMax', title: '鏈�澶х啍鎸�', edit: true},
+ {field: 'fusingPointMin', title: '鏈�灏忕啍鐐�', edit: true},
+ {field: 'fusingPointMax', title: '鏈�澶х啍鐐�', edit: true},
+ {field: 'yellownessMin', title: '鏈�灏忛粍搴�', edit: true},
+ {field: 'yellownessMax', title: '鏈�澶ч粍搴�', edit: true},
+ {field: 'opacityMin', title: '鏈�灏忎笉閫忔槑搴�', edit: true},
+ {field: 'opacityMax', title: '鏈�澶т笉閫忔槑搴�', edit: true},
+
+ {field: 'anfme', title: '閲嶉噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+
// {field: 'payment', title: '璐х墿鐘舵��',align: 'center', templet: '#payment'},
- {field: 'qty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
+ {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'}
@@ -350,6 +364,7 @@
},
size: ''
};
+
if (!isExpAdd) {
$.ajax({
url: baseUrl+"/order/detl/all/auth?orderId=" + expTpe.id,
@@ -420,7 +435,7 @@
}
}
data[obj.field] = obj.value;
- insTbSSXM.reload({data: xxDataList});
+ insTbSSXM.reloadData({data: xxDataList,scrollPos: true});
});
$('#matAddBtnComment').click(function () {
@@ -429,6 +444,9 @@
// 鏄剧ず娣诲姞鏄庣粏琛ㄥ崟寮圭獥
function showEditModel2(exp) {
+ xxDataList.push({});
+ insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+ return;
admin.open({
type: 1,
offset: '150px',
@@ -502,7 +520,11 @@
}
});
+
+
}
+
+
// 鍒犻櫎鍗曟嵁
function doDel(orderId) {
@@ -582,5 +604,15 @@
,range: true
});
+ function printExcel(data){
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ layer.closeAll();
+ layer.load(1, {shade: [0.1,'#fff']});
+ location.href = baseUrl+"/order/printExport/auth?orderNo="+data.orderNo;
+ layer.closeAll('loading');
+ });
+ }
+
+
});
--
Gitblit v1.9.1