From 207823b94f5627fae49d29b51b5ce7186a70c8e0 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期六, 04 一月 2025 09:59:48 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/order/out.js | 37 +++++++++++++++++++++++++++++++++---- 1 files changed, 33 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js index 683acc3..a589b9f 100644 --- a/src/main/webapp/static/js/order/out.js +++ b/src/main/webapp/static/js/order/out.js @@ -35,11 +35,13 @@ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160} ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160} ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200} - ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'} - ,{field: 'specs', align: 'center',title: '瑙勬牸'} + ,{field: 'owner$', align: 'center',title: '璐т富'} + ,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��'} + ,{field: 'owner', align: 'center',title: '璐т富', hide: true} + ,{field: 'payment', align: 'center',title: '璐х墿褰㈡��', hide: true} // ,{field: 'anfme', align: 'center',title: '鏁伴噺'} // ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'} - ,{field: 'enableQty', align: 'center',title: '鎬绘暟閲�', style: 'font-weight: bold'} + ,{field: 'anfme', align: 'center',title: '鎬绘暟閲�', style: 'font-weight: bold'} // ,{field: 'name', align: 'center',title: '鍚嶇О'} // ,{field: 'model', align: 'center',title: '鍨嬪彿'} ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true} @@ -162,12 +164,13 @@ {field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'}, {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350}, {field: 'batch', title: '搴忓垪鐮�', align: 'center'}, + {field: 'manu', title: '浠撳簱', align: 'center'}, // { title: '鍓╀綑闇�姹傞噺', align: 'center' , width: 120, toolbar: '#checkNeedQty'}, // {field: 'anfme', title: '瀹為檯鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'}, { title: '鍑哄簱鏁伴噺', align: 'center',field: 'anfme', width: 90, style: 'font-weight: bold; color: red'}, {field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'}, {field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'}, - {type: 'checkbox', merge: ['locNo']}, + // {type: 'checkbox', merge: ['locNo']}, ]], done: function (res) { tableMerge.render(this); @@ -265,6 +268,7 @@ ,yes: function(index, layero){ //鎸夐挳銆愮珛鍗冲嚭搴撱�戠殑鍥炶皟 pakout(tableCache, index); + pakout2(tableCache, index); } ,btn2: function(index, layero){ //鎸夐挳銆愮◢鍚庡鐞嗐�戠殑鍥炶皟 @@ -306,6 +310,31 @@ }); } + function pakout2(tableCache, layerIndex) { + // let loadIndex = layer.load(2); + notice.msg('姝e湪鐢熸垚鎷h揣鍗�......', {icon: 4}); + $.ajax({ + url: baseUrl + "/out/pakout2/auth", + headers: {'token': localStorage.getItem('token')}, + contentType: 'application/json;charset=UTF-8', + data: JSON.stringify(tableCache), + method: 'POST', + success: function (res) { + notice.destroy(); + if (res.code === 200) { + layer.close(layerIndex); + layer.msg(res.msg, {icon: 1}); + insTb.reload({where: null}); + insTb2.reload({where: null, page: {curr: 1}}); + } else if (res.code === 403) { + top.location.href = baseUrl + "/"; + } else { + layer.msg(res.msg, {icon: 2}) + } + } + }); + } + /* 鍒犻櫎璁㈠崟 */ -- Gitblit v1.9.1