From 539d9ffc477d28a23a923b41fdeabc8c37c99ce6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 23 九月 2024 14:43:31 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pla/plaDetl.js | 487 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 438 insertions(+), 49 deletions(-)
diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js
index 2bae082..f8e03f1 100644
--- a/src/main/webapp/static/js/pla/plaDetl.js
+++ b/src/main/webapp/static/js/pla/plaDetl.js
@@ -7,52 +7,70 @@
var checkStatus = [];
var dataCheck = [];
var admin;
+var printData = [];
+var layDate;
function getCol() {
var cols = [
{field: 'id', title: 'id', align: 'center',hide:true}
- ,{type: 'checkbox'}
- ,{field: 'pakinTime$', title: '鍏ュ簱鏃堕棿', align: 'center'}
- ,{field: 'owner', align: 'center',title: '涓讳綋',edit:true}
- ,{field: 'type', align: 'center',title: '鐗╄祫绫诲埆',hide:true,edit:true}
- ,{field: 'proOrderNo', align: 'center',title: '鍗曞彿',hide:true,edit:true}
+ ,{type: 'checkbox',totalRow:true}
+ ,{field:'id', width:80, title: '', sort: true, totalRowText: '鍚堣锛�',hide: true}
+ ,{field: 'pakinTime$', title: '鍏ュ簱鏃堕棿', align: 'center' , sort:true}
,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜',hide:true,edit:true}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿',edit:true}
- ,{field: 'packageNo', align: 'center',title: '鍖呭彿',edit:true}
,{field: 'brand', align: 'center',title: '鐗屽彿',edit:true}
- ,{field: 'weight', align: 'center',title: '閲嶉噺锛圞G锛�',edit:true}
- ,{field: 'workshop', align: 'center',title: '鐢熶骇杞﹂棿',hide:true,edit:true}
- ,{field: 'line', align: 'center',title: '鐢熶骇绾�',hide:true,edit:true}
- ,{field: 'proDate', align: 'center',title: '鐢熶骇鏃ユ湡',edit:true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿',edit:true, width: 150, sort:true}
+ ,{field: 'packageNo', align: 'center',title: '鍖呰鍙�',edit:true, sort:true}
+ ,{field: 'proDate', align: 'center',title: '鐢熶骇鏃ユ湡',edit:true, width: 100}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺KG',edit:true,totalRow:true}
+ ,{field: 'filmWrap', align: 'center',title: '缂犺啘',edit:true,hide:true}
+ ,{field: 'fingerMelting', align: 'center',title: '鐔旀寚锛実/10min',edit:true}
+ ,{field: 'water', align: 'center',title: '姘村垎锛宲pm', hide:true,edit:true}
+ ,{field: 'fusingPoint', align: 'center',title: '鐔旂偣锛屸剝',edit:true}
+ ,{field: 'vadf1', align: 'center',title: '鎸ュ彂娈碉紝%', hide:true,edit:true}
+ ,{field: 'vadf2', align: 'center',title: '鍒嗚В娈碉紝%', hide:true,edit:true}
+ ,{field: 'yellowness', align: 'center',title: '榛勫害',edit:true}
+ ,{field: 'opacity', align: 'center',title: '涓嶉�忔槑搴︼紝%',edit:true}
+ ,{field: 'l', align: 'center',title: 'L*', hide:true,edit:true}
+ ,{field: 'a', align: 'center',title: 'a*', hide:true,edit:true}
+ ,{field: 'b', align: 'center',title: 'b*', hide:true,edit:true}
+ ,{field: 'fillIn', align: 'center',title: '濉厖锛�%',hide:true,edit:true}
+ ,{field: 'str1', align: 'center',title: '鎷変几寮哄害锛孧Pa',hide:true,edit:true}
+ ,{field: 'str2', align: 'center',title: '鏂浼搁暱鐜囷紝%',hide:true,edit:true}
+ ,{field: 'str3', align: 'center',title: '缂哄彛鍐插嚮锛孠J/m2',hide:true,edit:true}
+ ,{field: 'str4', align: 'center',title: '缁村崱锛屸剝',hide:true,edit:true}
+ ,{field: 'str5', align: 'center',title: '鍗婄粨鏅舵椂闂达紝min',hide:true,edit:true}
+ ,{field: 'str6', align: 'center',title: '缁撴櫠搴︼紝%',hide:true,edit:true}
,{field: 'packageType', align: 'center',title: '鍖呰绫诲瀷',edit:true}
,{field: 'zpalletType', align: 'center',title: '鎵樼洏绫诲瀷',edit:true}
- ,{field: 'filmWrap', align: 'center',title: '缂犺啘',edit:true}
- ,{field: 'fingerMelting', align: 'center',title: '鐔旀寚锛坓/10min锛�',edit:true}
- ,{field: 'fusingPoint', align: 'center',title: '鐔旂偣锛堚剝锛�',edit:true}
- ,{field: 'vadf1', align: 'center',title: '鎸ュ彂浠�1锛�%锛�', hide:true,edit:true}
- ,{field: 'vadf2', align: 'center',title: '鎸ュ彂浠�2锛�%锛�', hide:true,edit:true}
- ,{field: 'yellowness', align: 'center',title: '榛勫害',edit:true}
- ,{field: 'opacity', align: 'center',title: '涓嶉�忔槑搴︼紙0-100%锛�',edit:true}
- ,{field: 'water', align: 'center',title: '姘村垎锛坧pm锛�', hide:true,edit:true}
- ,{field: 'l', align: 'center',title: 'l鍊�', hide:true,edit:true}
- ,{field: 'a', align: 'center',title: 'a鍊�', hide:true,edit:true}
- ,{field: 'b', align: 'center',title: 'b鍊�', hide:true,edit:true}
- ,{field: 'fillIn', align: 'center',title: '濉厖(%)',hide:true,edit:true}
,{field: 'massState', align: 'center',title: '璐ㄩ噺鐘舵��',edit:true}
- ,{field: 'problem', align: 'center',title: '澶囨敞',edit:true}
- ,{field: 'stash', align: 'center',title: '浠撳簱',edit:true}
+ ,{field: 'problem', align: 'center',title: '澶囨敞',edit:true,hide:true}
+ ,{field: 'direction', align: 'center',title: '搴旂敤鏂瑰悜',edit:true,hide:true}
+ ,{field: 'position', align: 'center',title: '瀛樻斁浣嶇疆',edit:true,hide:true}
+ ,{field: 'stash', align: 'center',title: '浠撳簱',edit:true,hide:true}
,{field: 'locNo', align: 'center',title: '搴撲綅',edit:true}
- ,{field: 'weightAnfme', align: 'center',title: '鍓╀綑閲嶉噺锛圞G锛�',edit:true}
- ,{field: 'qtyAnfme', align: 'center',title: '寰呭嚭搴撻噸閲忥紙KG锛�',hide:true}
+ ,{field: 'owner', align: 'center',title: '涓讳綋',edit:true}
+ ,{field: 'type', align: 'center',title: '鐗╄祫绫诲埆',hide:true,edit:true}
+ ,{field: 'proOrderNo', align: 'center',title: '鐢熶骇璁㈠崟缂栧彿',hide:true,edit:true}
+ ,{field: 'workshop', align: 'center',title: '鐢熶骇杞﹂棿',hide:true,edit:true}
+ ,{field: 'line', align: 'center',title: '鐢熶骇绾�',hide:true,edit:true}
+ ,{field: 'weightAnfme', align: 'center',title: '鍓╀綑閲嶉噺锛圞G锛�',edit:true,totalRow:true}
+ ,{field: 'qtyAnfme', align: 'center',title: '寰呭嚭搴撻噸閲忥紙KG锛�',hide:true,edit:true}
,{field: 'status', align: 'center',title: '鐘舵��', templet: setState ,edit:true}
+ ,{field: 'stockFreeze', align: 'center',title: '搴撳瓨鍐荤粨', templet: '#stockFreezeTpl'}
+ ,{field: 'stockFreezeBy', align: 'center',title: '鎿嶄綔浜哄憳',hide:true}
+ ,{field: 'stockFreezeDate$', align: 'center',title: '鎿嶄綔鏃ユ湡',hide:true}
,{align: 'center', title: '娴佽浆鏄庣粏', toolbar: '#tbLook'}
- ,{field: 'orderNo', align: 'center',title: '鍗曞彿', hide:true}
- ,{field: 'pakoutTime', align: 'center',title: '鍑哄簱鏃堕棿', hide:true}
- ,{field: 'orderWeight', align: 'center',title: '閲嶉噺', hide:true}
- ,{field: 'handlerBy', align: 'center',title: '缁忓姙浜�', hide:true}
- ,{field: 'transfer', align: 'center',title: '娴佽浆褰㈠紡', hide:true}
- ,{field: 'customer', align: 'center',title: '瀹㈡埛鍚嶇О', hide:true}
- ,{field: 'allocate', align: 'center',title: '璋冩嫧鍒�', hide:true}
- ,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
+ ,{field: 'createTime$', title: '鍒涘缓鏃堕棿', align: 'center' , sort:true}
+ ,{field: 'newBrand', align: 'center',title: '鍏宠仈鐗屽彿',edit:true}
+ ,{field: 'newBatch', align: 'center',title: '鍏宠仈鎵瑰彿',edit:true, width: 150, sort:true}
+ ,{field: 'newPackageNo', align: 'center',title: '鍏宠仈鍖呰鍙�',edit:true, sort:true}
+ // ,{field: 'orderNo', align: 'center',title: '鍗曞彿', hide:true}
+ // ,{field: 'pakoutTime', align: 'center',title: '鍑哄簱鏃堕棿', hide:true}
+ // ,{field: 'orderWeight', align: 'center',title: '閲嶉噺', hide:true}
+ // ,{field: 'handlerBy', align: 'center',title: '缁忓姙浜�', hide:true}
+ // ,{field: 'transfer', align: 'center',title: '娴佽浆褰㈠紡', hide:true}
+ // ,{field: 'customer', align: 'center',title: '瀹㈡埛鍚嶇О', hide:true}
+ // ,{field: 'allocate', align: 'center',title: '璋冩嫧鍒�', hide:true}
+ // ,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
];
return cols;
}
@@ -68,20 +86,29 @@
return "<span style='color: black'>閮ㄥ垎鍑哄簱</span>"
}else if(data.status === "鍏ㄩ儴鍑哄簱"){
return "<span style='color: gray'>鍏ㄩ儴鍑哄簱</span>"
+ }else if(data.status === "鏆傚叆搴�"){
+ return "<span style='color: purple'>鏆傚叆搴�</span>"
}
}
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).extend({
- dropdown: 'dropdown/dropdown',
-}).use(['table','laydate', 'form', 'admin', 'dropdown'], function() {
+}).use(['table','laydate', 'form', 'admin', 'xmSelect', 'dropdown'], function() {
+ var dropdown = layui.dropdown;
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
- var layDate = layui.laydate;
+ laydate = layui.laydate;
var form = layui.form;
admin = layui.admin;
+
+ // 鏃ユ湡鏃堕棿鑼冨洿
+ laydate.render({
+ elem: '#ID-laydate-range-datetime',
+ type: 'datetime',
+ range: true
+ });
+
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -89,29 +116,65 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/pla/list/auth?step=2',
page: true,
+ totalRow: true, // 寮�鍚悎璁¤
+ height: function(){
+ var otherHeight = $('.function-area').outerHeight() + $('#search-box').outerHeight(); // 鑷畾涔夊叾浠栧尯鍩熺殑楂樺害
+ console.log($(window).height() - otherHeight);
+ return $(window).height() - otherHeight - 100; // 杩斿洖 number 绫诲瀷
+ },
+ //height: 'full',
limit: 16,
- limits: [16, 30, 50, 100, 200, 500],
+ limits: [16, 50, 100, 200, 500,2000,5000,10000],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
- cols: [getCol()],
+ cols: [function(){
+ var arr = getCol();
+
+ // 鍒濆鍖栫瓫閫夌姸鎬�
+ var local = layui.data('table-filter-test'); // 鑾峰彇瀵瑰簲鐨勬湰鍦拌褰�
+ layui.each(arr, function(index, item){
+ if(item.field in local){
+ item.hide = local[item.field];
+ }
+ });
+ return arr;
+ }() ],
+ where:{
+ type: function() {
+ const tabPosition = JSON.parse(sessionStorage.getItem('easyweb-iframe_tempData')).tabPosition
+ return tabPosition.match(/\d+$/)[0] === '90646' ? '鏀规�ф爲鑴�' :
+ (tabPosition.match(/\d+$/)[0] === '90657' ? '绾爲鑴�' : '')
+ }
+ },
request: {
pageName: 'curr',
pageSize: 'limit'
},
parseData: function (res) {
- console.log(res)
return {
'code': res.code,
'msg': res.msg,
'count': res.data.total,
- 'data': res.data.records
+ 'data': res.data.records,
}
},
response: {
statusCode: 200
},
done: function(res, curr, count) {
+ // 璁板綍绛涢�夌姸鎬�
+ var that = this;
+ that.elem.next().on('mousedown', 'input[lay-filter="LAY_TABLE_TOOL_COLS"]+', function(){
+ var input = $(this).prev()[0];
+ // 姝ゅ琛ㄥ悕鍙换鎰忓畾涔�
+ layui.data('table-filter-test', {
+ key: input.name
+ ,value: input.checked
+ })
+ });
+
+ //$(".lavui-table-grid-down").hide();
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -127,7 +190,73 @@
res.data[_index][data.value] = 'N';
}
});
+ let headerTop = $('.layui-table-header').offset().top; //鑾峰彇琛ㄦ牸澶村埌鏂囨。椤堕儴鐨勮窛绂�
+ let headerPage = $('.layui-table-page').offset().top; //鑾峰彇琛ㄦ牸搴曢儴鏂囨。椤堕儴鐨勮窛绂�
+ $(window).scroll(function () {
+ if ((headerTop - $(window).scrollTop()) < 0) { //瓒呰繃浜�
+ $('.layui-table-header').addClass('table-header-fixed'); //娣诲姞鏍峰紡锛屽浐瀹氫綇琛ㄥご
+ } else { //娌¤秴杩�
+ $('.layui-table-header').removeClass('table-header-fixed'); //绉婚櫎鏍峰紡
+ }
+ });
}
+ });
+
+ // 娓叉煋鐗╂枡閫夋嫨
+ var matXmSelect = xmSelect.render({
+ el: '#mat',
+ style: {
+ width: '270px',
+ },
+ autoRow: true,
+ toolbar: { show: true },
+ filterable: true,
+ remoteSearch: true,
+ remoteMethod: function(val, cb, show){
+ $.ajax({
+ url: baseUrl+"/pla/batch/all/get/kv",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ condition: val
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ cb(res.data)
+ } else {
+ cb([]);
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ });
+ }
+ })
+
+ // 澶嶉�夋浜嬩欢
+ table.on('checkbox(plaDetl)', function(obj){
+ // console.log(obj); // 鏌ョ湅瀵硅薄鎵�鏈夋垚鍛�
+ // console.log(obj.checked); // 褰撳墠鏄惁閫変腑鐘舵��
+ // console.log(obj.data); // 閫変腑琛岀殑鐩稿叧鏁版嵁
+ // console.log(obj.type); // 鑻ヨЕ鍙戠殑鏄叏閫夛紝鍒欎负锛歛ll锛涜嫢瑙﹀彂鐨勬槸鍗曢�夛紝鍒欎负锛歰ne
+ var checkStatus = table.checkStatus(obj.config.id)
+ var selectedNum = checkStatus.data.length;
+ var weightAll = 0;
+ var weightAnfmeAll = 0;
+
+ for (var i in checkStatus.data){
+ weightAll += checkStatus.data[i].weight;
+ weightAnfmeAll += checkStatus.data[i].weightAnfme;
+ }
+
+ $('.layui-table-total').find('.laytable-cell-1-0-1').text(selectedNum);
+ $('.layui-table-total').find('.laytable-cell-1-0-9').text(weightAll);
+ $('.layui-table-total').find('.laytable-cell-1-0-41').text(weightAnfmeAll);
+
+ });
+
+ // 琛屽崟鍑讳簨浠�( 鍙屽嚮浜嬩欢涓�: rowDouble )
+ table.on('row(plaDetl)', function(obj){
+
});
table.on('tool(plaDetl)', function (obj) {
@@ -153,6 +282,7 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/plaQty/list/auth',
where: {
+ brand: data.brand,
batch: data.batch,
package_no: data.packageNo
},
@@ -191,13 +321,14 @@
});
}
});
-
}
+
})
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(plaDetl)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id)
+ printData = checkStatus;
switch(obj.event) {
case 'updateData':
var data = checkStatus.data;
@@ -226,9 +357,202 @@
});
}
break;
-
+ case "deleteData":
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/pla/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(data),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
+ break;
+ case "viladate":
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾鏍￠獙'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/pla/viladate/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(data),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
+ break;
+ case 'freezeData':
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾鍐荤粨'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/pla/updateStockFreeze",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(data),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ layer.msg(res.msg,{icon:1})
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg,{icon:2})
+ }
+ }
+ })
+ });
+ }
+ break;
+ case 'disFreezeData':
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾瑙ｉ櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹殑鍐荤粨鍚�', function(){
+ $.ajax({
+ url: baseUrl+"/pla/updateStockDisFreeze",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(data),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ layer.msg(res.msg,{icon:1})
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg,{icon:2})
+ }
+ }
+ })
+ });
+ }
+ break;
+ // 鎵归噺鎵撳嵃
+ case "btnPrintBatch":
+ printMatCodeNos = [];
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鎵撳嵃鏁版嵁');
+ } else {
+ layer.open({
+ type: 1,
+ area: ['600px', '750px'],
+ title: '鎵归噺鎵撳嵃 [鏁伴噺'+ data.length +']',
+ shadeClose: true,
+ content: $('#printDataDiv'),
+ success: function(layero, index){
+ for (var i = 0; i<data.length;i++) {
+ printMatCodeNos.push(data[i].matnr);
+ }
+ },
+ end: function () {
+ }
+ });
+ }
+ break;
}
})
+
+ // 妯℃澘閫夋嫨
+ form.on('radio(selectTemplateRadio)', function (data) {
+ $('.template-preview').hide();
+ $('#template-preview-'+data.value).show();
+ });
+
+ // 寮�濮嬫墦鍗�
+ form.on('submit(doPrint)', function (data) {
+ var templateNo = data.field.selectTemplate;
+ var templateDom = $("#templatePreview"+templateNo);
+ var className = templateDom.attr("class");
+ layer.closeAll();
+ for (let i=0;i<printData.data.length;i++){
+ if (className === 'template-barcode') {
+ printData.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1¶m="+(printData.data[i].brand+";"+printData.data[i].batch+";"+printData.data[i].packageNo+";"+printData.data[i].line)
+ } else {
+ printData.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2¶m="+(printData.data[i].brand+";"+printData.data[i].batch+";"+printData.data[i].packageNo+";"+printData.data[i].line)
+ }
+ }
+ var tpl = templateDom.html();
+ var template = Handlebars.compile(tpl);
+ var html = template(printData);
+ var box = $("#box");
+ box.html(html);box.show();
+ box.print({mediaPrint:true});
+ box.hide();
+ // $.ajax({
+ // url: baseUrl+"/pla/print/auth",
+ // headers: {'token': localStorage.getItem('token')},
+ // data: JSON.stringify(printData.data),
+ // contentType:'application/json;charset=UTF-8',
+ // method: 'POST',
+ // async: false,
+ // success: function (res) {
+ // if (res.code === 200){
+ // layer.closeAll();
+ // 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].matnr;
+ // } else {
+ // res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2¶m="+res.data[i].matnr;
+ // }
+ // }
+ // var tpl = templateDom.html();
+ // var template = Handlebars.compile(tpl);
+ // var html = template(res);
+ // var box = $("#box");
+ // box.html(html);box.show();
+ // box.print({mediaPrint:true});
+ // box.hide();
+ // } else if (res.code === 403){
+ // top.location.href = baseUrl+"/";
+ // }else {
+ // layer.msg(res.msg)
+ // }
+ // }
+ // })
+ });
// 鎼滅储鏍忔悳绱簨浠�
form.on('submit(search)', function (data) {
@@ -236,8 +560,11 @@
tableReload(false);
});
+ // 鐢ㄦ潵鏍囪瘑鎼滅储閲嶇疆鏃讹紝鏀规�ф爲鑴傚拰绾爲鑴備粠鐐瑰嚮浜嬩欢浼犺繃鏉ュ悕绉帮紝杩涜鐗╄川绫诲埆闄愬畾
+ let customValue = undefined
// 閲嶇疆浜嬩欢
form.on('submit(reset)', function (data) {
+ customValue = $(this).attr('data-value');
reset();
});
@@ -245,7 +572,8 @@
clearFormVal($('#search-box'));
matCodeData = [];
tableReload();
- locTips(false);
+
+ // locTips(false);
}
// 閲嶈浇琛ㄦ牸
@@ -258,6 +586,13 @@
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
+ if(customValue !== undefined){
+ searchData['type'] = customValue
+ }
+ if(searchData.select){
+ searchData.batch = searchData.select;
+ searchData.select = null;
+ }
(child ? parent.tableIns : tableIns).reload({
where: searchData,
page: {
@@ -281,6 +616,14 @@
}
});
}
+
+ $(document).on('click','#updateZpallet',function (){
+ debugger;
+ })
+ $("[name='layTableCheckbox']").click(function(){ // 閫氳繃name灞炴�ч�夊彇鍏冪礌锛屽苟娣诲姞鐐瑰嚮浜嬩欢
+ alert("Hello World!"); // 鍦ㄦ帶鍒跺彴杈撳嚭鎻愮ず淇℃伅
+ debugger
+ });
@@ -435,17 +778,25 @@
for(var i=0; i<data.length; i++){
if(data[i].LAY_CHECKED){
- if(data[i].status === "寰呭叆搴�" || data[i].status === "鍏ㄩ儴鍑哄簱"|| data[i].weightAnfme <= data[i].qtyAnfme){
+ if(data[i].status === "鏆傚叆搴�" || data[i].status === "寰呭叆搴�" || data[i].status === "鍏ㄩ儴鍑哄簱"|| data[i].weightAnfme < data[i].qtyAnfme){
layer.msg("閫変腑鐨勬槑缁嗚繕鏈叆搴撴垨鑰呭凡鍏ㄩ儴鍑哄簱鎴栬�呮病鏈夊墿浣欏彲鍑洪噸閲忥紝璇烽噸鏂伴�夋嫨");
return;
}
brand = brand ? brand : data[i].brand;
- if( brand != data[i].brand){
+ if(brand != data[i].brand){
layer.msg("閫変腑鐨勬槑缁嗕腑鍚湁澶氱鐗屽彿锛岃閲嶆柊閫夋嫨");
return;
}
+ if (data[i].zpalletType == null && data[i].packageType == null && data[i].massState == null) {
+ layer.msg("璐ㄩ噺鎸囨爣鏈笂浼�");
+ return;
+ }
+ // if(data[i].stockFreeze === 0){
+ // layer.msg("閫変腑鐨勬槑缁嗕腑鍚湁鍐荤粨鐨勫簱瀛橈紝璇疯В鍐诲悗鎿嶄綔");
+ // return;
+ // }
dataSave.push(data[i]);
}else {
dataOld.push(data[i]);
@@ -483,7 +834,7 @@
let dataOld = [];
for(var i=0; i<data.length; i++){
if(data[i].LAY_CHECKED){
- if(data[i].status === "寰呭叆搴�" || data[i].status === "鍏ㄩ儴鍑哄簱"){
+ if(data[i].status === "鏆傚叆搴�" || data[i].status === "寰呭叆搴�" || data[i].status === "鍏ㄩ儴鍑哄簱"){
layer.msg("閫変腑鐨勬槑缁嗚繕鏈叆搴撴垨鑰呭凡鍏ㄩ儴鍑哄簱锛岃閲嶆柊閫夋嫨");
return;
}
@@ -534,6 +885,42 @@
layer.getChildFrame('#data-detail-submit-edit', index).hide();
top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+ }
+ });
+ })
+ $(document).on('click','#updateOwner', function () {
+ let data = table.cache.plaDetl;
+ let dataSave = [];
+ let dataOld = [];
+ for(var i=0; i<data.length; i++){
+ if(data[i].LAY_CHECKED){
+ data[i].step = 1;
+ dataSave.push(data[i]);
+ }else {
+ dataOld.push(data[i]);
+ }
+ }
+ dataCheck = dataSave;
+
+ if(!dataSave || dataSave.length < 1){
+ layer.msg("鏈嬀閫夛紝璇峰厛鍕鹃�夐渶瑕佹洿鏀圭殑搴撳瓨");
+ return;
+ }
+
+ layer.open({
+ type: 2,
+ title: '鍙樻洿涓讳綋',
+ maxmin: true,
+ area: ['500px', top.detailHeight],
+ shadeClose: false,
+ content: 'updateOwner.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+
+ var iframe = window['layui-layer-iframe' + index];
+ iframe.child(dataSave)
}
});
})
@@ -598,5 +985,7 @@
var res = JSON.parse(evt.target.responseText);
layer.msg(res.msg, {icon: 2});
}
+function clearTable(){
+}
--
Gitblit v1.9.1