From 82bcd0328dddbaad65933e2fada22bc68e82b3d5 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期六, 26 八月 2023 10:07:46 +0800 Subject: [PATCH] # 导入订单增加单据类型 --- src/main/webapp/static/js/order/order.js | 43 +++++++++++++++++++++++++++---------------- 1 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js index bf48418..86868e3 100644 --- a/src/main/webapp/static/js/order/order.js +++ b/src/main/webapp/static/js/order/order.js @@ -1,5 +1,6 @@ var insTbCount = 0; var admin; +var insTb layui.config({ base: baseUrl + "/static/layui/lay/modules/" }).use(['layer', 'form', 'table', 'util', 'admin', 'xmSelect', 'laydate'], function () { @@ -35,7 +36,7 @@ }) // 娓叉煋琛ㄦ牸 - var insTb = table.render({ + insTb = table.render({ elem: '#order', url: baseUrl+'/order/head/page/auth', headers: {token: localStorage.getItem('token')}, @@ -128,11 +129,12 @@ cellMinWidth: 100, cols: [[ {type: 'numbers'}, - {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160}, - {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160}, - {field: 'batch', title: '搴忓垪鐮�'}, - {field: 'anfme', title: '鏁伴噺'}, - {field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}, + {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 280}, + {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 150}, + // {field: 'batch', title: '鎵瑰彿'}, + {field: 'specs', title: '瑙勬牸', width: 180}, + {field: 'anfme', title: '鏁伴噺', width: 70}, + {field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold', width: 90} // {field: 'unit', title: '鍗曚綅'}, // { // field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) { @@ -141,7 +143,6 @@ // }, // {field: 'inQty', title: '宸插叆搴撻噺'}, // {field: 'color', title: '棰滆壊'}, - {field: 'specs', title: '瑙勬牸'} ]], request: { pageName: 'curr', @@ -235,11 +236,12 @@ 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: 'matnr', title: '鍟嗗搧缂栫爜', width: 280}, + {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 150}, + // {field: 'batch', title: '鎵瑰彿', edit: true}, + {field: 'specs', title: '瑙勬牸', width: 180}, + {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 100}, + {field: 'sum', title: '搴撳瓨鏁伴噺', style: 'color: red;font-weight: bold', minWidth: 110, width: 100}, // {field: 'inQty', title: '宸插叆搴撻噺', minWidth: 100, width: 100}, // {field: 'unit', title: '鍗曚綅', width: 80}, {field: 'memo', title: '澶囨敞' , edit: true}, @@ -333,14 +335,23 @@ let item = selectList[i]; // 鏌ヨ鐗╂枡璇︽儏 $.ajax({ - url: baseUrl+"/mat/covert/"+item.value+"/auth", + url: baseUrl+"/mat/covert/"+btoa(item.value)+"/auth", headers: {'token': localStorage.getItem('token')}, method: 'GET', async: false, success: function (res) { if (res.code === 200){ - xxDataList.push(res.data); - insTbSSXM.reload({data: xxDataList, page: {curr: 1}}); + var bige=true; + for (var j = 0; j < xxDataList.length; j++) { + if (xxDataList[j].matnr === res.data.matnr && xxDataList[j].batch === res.data.batch) { + bige=false; + break; + } + } + if (bige){ + xxDataList.push(res.data); + insTbSSXM.reload({data: xxDataList, page: {curr: 1}}); + } } else if (res.code === 403){ top.location.href = baseUrl+"/"; }else { @@ -565,7 +576,7 @@ let res = JSON.parse(evt.target.responseText); if(res.code === 200) { layer.msg(res.msg, {icon: 1}); - tableReload(); + insTb.reload({page: {curr: 1}}); } else { alert(res.msg); // layer.msg(res.msg, {icon: 2}); -- Gitblit v1.9.1