From ecbb38cc99fc0cd69295f91b7b3c19fe4da486a2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 25 三月 2022 14:37:10 +0800
Subject: [PATCH] #杰克缝纫机立库 【wms单据明细添加作业数量】
---
src/main/webapp/static/js/order/order.js | 78 +++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 0c59c77..c0b408b 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: '700px',
+ area: '800px',
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) {
@@ -144,7 +147,6 @@
success: function (layero, dIndex) {
$(layero).children('.layui-layer-content').css('overflow', 'visible');
var isExpAdd = !expTpe;
- console.log(expTpe)
// 鍥炴樉鏁版嵁
form.val('editForm', expTpe);
if (expTpe) {
@@ -157,47 +159,51 @@
layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
return false;
}
- let param = [];
let nList = admin.util.deepClone(xxDataList);
for (let xi = 0; xi < nList.length; xi++) {
- if (nList[xi].inQty > 0 && inQtys[xi] !== nList[xi].qty) {
- layer.msg("宸插叆搴撴棤娉曚慨鏀�", {icon: 2})
- return false;
- } else if (nList[xi].qty > 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){
+ // 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;
}
}
- if (param.length === 0) {
- layer.msg('鍗曟嵁鏄庣粏鏁伴噺涓嶅悎娉�', {icon: 2});
- return false;
- }
layer.load(2);
$.ajax({
- url: baseUrl+"/waitMatin/" + (isExpAdd?"add":"modify") + "/auth",
+ url: baseUrl+"/order/form/" + (isExpAdd?"add":"modify") + "/auth",
headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify(param),
+ data: JSON.stringify({
+ orderId: Number(data.field.id),
+ docType: Number(data.field.docType),
+ orderNo: data.field.orderNo,
+ orderDetlList: nList
+ }),
contentType:'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
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+"/";
@@ -400,26 +406,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