From b7afd45a5510bb328ee4e0c2b06b909140bc4a97 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 三月 2022 12:51:27 +0800
Subject: [PATCH] #杰克缝纫机立库 【手动删除订单】 - java
---
src/main/webapp/static/js/order/order.js | 95 ++++++++++++++++++++---------------------------
1 files changed, 41 insertions(+), 54 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 69c6a85..a8b8197 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -66,7 +66,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 +75,7 @@
layer.open({
type: 1,
title: false,
- area: '700px',
+ area: '750px',
offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
@@ -96,7 +96,7 @@
{field: 'matnr', title: '鍟嗗搧缂栫爜'},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'batch', title: '鎵瑰彿'},
- {field: 'count', title: '鏁伴噺'},
+ {field: 'anfme', title: '鏁伴噺'},
{field: 'unit', title: '鍗曚綅'},
// {
// field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
@@ -144,7 +144,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,43 +156,43 @@
layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
return false;
}
- var param = [];
- var nList = admin.util.deepClone(xxDataList);
- for (var xi = 0; xi < nList.length; xi++) {
- // console.log('宸插叆搴擄細'+nList[xi].inQty)
- // console.log('鏃ф暟閲忥細'+inQtys[xi])
- // console.log('鏁伴噺锛�'+nList[xi].qty)
- 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].qty == 0){
+ 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;
}
}
- 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({
+ docType: Number(data.field.docType),
+ orderNo: data.field.orderNo,
+ orderDetlList: nList
+ }),
contentType:'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
@@ -226,7 +225,7 @@
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
{field: 'batch', title: '鎵瑰彿'},
{field: 'specs', title: '瑙勬牸'},
- {field: 'count', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+ {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
// {field: 'inQty', title: '宸插叆搴撻噺', minWidth: 100, width: 100},
{field: 'unit', title: '鍗曚綅', width: 80},
{field: 'memo', title: '澶囨敞' , edit: true},
@@ -292,7 +291,7 @@
break;
}
}
- } else if (obj.field==='count'){
+ } else if (obj.field==='anfme'){
let vle = Number(obj.value);
if (isNaN(vle)) {
layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
@@ -301,7 +300,7 @@
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]["count"] = vle;
+ xxDataList[i]["anfme"] = vle;
break;
}
}
@@ -342,23 +341,13 @@
if (existMats.indexOf(item.value) === -1) {
// 鏌ヨ鐗╂枡璇︽儏
$.ajax({
- url: baseUrl+"/matCode/"+item.value+"/auth",
+ url: baseUrl+"/matCode/covert/"+item.value+"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
async: false,
success: function (res) {
if (res.code === 200){
- var mat = res.data;
- xxDataList.push({
- matNo: mat.matNo,
- matName: mat.matName,
- color:mat.color,
- size:mat.size,
- specs:mat.specs,
- memo: mat.memo,
- unit: mat.unit,
- qty: 0.0
- });
+ xxDataList.push(res.data);
insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
} else if (res.code === 403){
top.location.href = baseUrl+"/";
@@ -413,21 +402,19 @@
}
// 鍒犻櫎鍗曟嵁
- 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');
--
Gitblit v1.9.1