From 1b13c69e4e2bb00bea4e90232a78715d49f1e24f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 01 四月 2022 13:38:14 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/order.js | 79 +++++++++++----------------------------
1 files changed, 23 insertions(+), 56 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 5cd8afc..d85f0c4 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -1,3 +1,4 @@
+var insTbCount = 0;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).use(['layer', 'form', 'table', 'util', 'admin', 'xmSelect', 'laydate'], function () {
@@ -46,6 +47,7 @@
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
+ insTbCount = count;
}
});
@@ -66,7 +68,7 @@
if (layEvent === 'edit') {
showEditModel(data);
} else if (layEvent === 'del') {
- doDel(data.billNo);
+ doDel(data.id);
} else if (layEvent === 'look') {
var $a = $(obj.tr).find('a[lay-event="look"]');
var offset = $a.offset();
@@ -75,7 +77,7 @@
layer.open({
type: 1,
title: false,
- area: '750px',
+ area: '820px',
offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
@@ -97,6 +99,7 @@
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
+ {field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'},
{field: 'unit', title: '鍗曚綅'},
// {
// field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
@@ -134,8 +137,6 @@
// 鏄剧ず琛ㄥ崟寮圭獥
function showEditModel(expTpe) {
- var mlist=null
- var inQtys=[]
admin.open({
type: 1,
title: (expTpe ? '淇敼' : '娣诲姞') + '鍗曟嵁',
@@ -158,27 +159,6 @@
}
let nList = admin.util.deepClone(xxDataList);
for (let xi = 0; xi < nList.length; xi++) {
- // if (nList[xi].inQty > 0 && inQtys[xi] !== nList[xi].anfme) {
- // layer.msg("宸插叆搴撴棤娉曚慨鏀�", {icon: 2})
- // return false;
- // } else if (nList[xi].anfme > 0) {
- // param.push({
- // billNo: data.field.billNo,
- // billType: data.field.billType,
- // matNo: nList[xi].matNo,
- // matName: nList[xi].matName,
- // color: nList[xi].color,
- // size: nList[xi].size,
- // specs: nList[xi].specs,
- // memo: nList[xi].memo,
- // unit: nList[xi].unit,
- // qty: nList[xi].qty,
- // inQty: nList[xi].inQty,
- // })
- // } else if (nList[xi].anfme <= 0){
- // layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
- // return false;
- // }
if (nList[xi].anfme <= 0){
layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
return false;
@@ -189,6 +169,7 @@
url: baseUrl+"/order/form/" + (isExpAdd?"add":"modify") + "/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
+ orderId: Number(data.field.id),
docType: Number(data.field.docType),
orderNo: data.field.orderNo,
orderDetlList: nList
@@ -199,7 +180,7 @@
layer.closeAll('loading');
if (res.code === 200){
layer.close(dIndex);
- insTb.reload({page: {curr: 1}});
+ $(".layui-laypage-btn")[0].click();
layer.msg(res.msg, {icon: 1});
} else if (res.code === 403){
top.location.href = baseUrl+"/";
@@ -223,7 +204,7 @@
{type: 'numbers', title: '#'},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- {field: 'batch', title: '鎵瑰彿'},
+ {field: 'batch', title: '鎵瑰彿', edit: true},
{field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
// {field: 'inQty', title: '宸插叆搴撻噺', minWidth: 100, width: 100},
@@ -232,11 +213,6 @@
{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
]],
done: function (res) {
- mlist= res.data
- for (let i = 0; i < mlist.length; i++) {
- var waitIn=mlist[i]
- inQtys.push(waitIn.qty)
- }
$(layero).find('.layui-table-view').css('margin', '0');
},
size: ''
@@ -284,35 +260,24 @@
});
// 鏄庣粏鏁版嵁淇敼
table.on('edit(formSSXMTable)', function (obj) {
- if (obj.field === 'memo'){
- for (let i=0;i<xxDataList.length;i++) {
- if (xxDataList[i]["matnr"] === obj.data.matnr && xxDataList[i]["batch"] === obj.data.batch) {
- xxDataList[i]["memo"] = obj.value;
- break;
- }
- }
- } else if (obj.field==='anfme'){
+ let index = obj.tr.attr("data-index");
+ let data = xxDataList[index];
+ if (obj.field === 'anfme'){
let vle = Number(obj.value);
if (isNaN(vle)) {
layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
return false;
} else {
- if (vle > 0) {
- for (let i=0;i<xxDataList.length;i++) {
- if (xxDataList[i]["matnr"] === obj.data.matnr && xxDataList[i]["batch"] === obj.data.batch) {
- xxDataList[i]["anfme"] = vle;
- break;
- }
- }
- } else {
+ if (vle <= 0) {
layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
return false;
}
}
}
+ data[obj.field] = obj.value;
insTbSSXM.reload({data: xxDataList});
});
- //
+
$('#matAddBtnComment').click(function () {
showEditModel2();
});
@@ -341,7 +306,7 @@
if (existMats.indexOf(item.value) === -1) {
// 鏌ヨ鐗╂枡璇︽儏
$.ajax({
- url: baseUrl+"/matCode/covert/"+item.value+"/auth",
+ url: baseUrl+"/mat/covert/"+item.value+"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
async: false,
@@ -402,26 +367,28 @@
}
// 鍒犻櫎鍗曟嵁
- function doDel(billNo) {
+ function doDel(orderId) {
layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
shade: .1,
skin: 'layui-layer-admin'
}, function (i) {
layer.close(i);
layer.load(2);
-
$.ajax({
- url: baseUrl+"/waitMatin/delete/auth",
+ url: baseUrl+"/order/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {
- billNo: billNo
+ orderId: orderId
},
- // contentType:'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
layer.closeAll('loading');
if (res.code === 200){
- insTb.reload({page: {curr: 1}});
+ if (insTbCount === 0) {
+ insTb.reload({page: {curr: 1}});
+ } else {
+ $(".layui-laypage-btn")[0].click();
+ }
layer.msg(res.msg, {icon: 1});
} else if (res.code === 403){
top.location.href = baseUrl+"/";
--
Gitblit v1.9.1