From b7e08df5a07b3fa832a46ecc31983e16f2bccc8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 七月 2023 14:56:01 +0800
Subject: [PATCH] # 出库作业，和库存明细管理 排序
---
src/main/webapp/static/js/waitMatout/waitMatout.js | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/src/main/webapp/static/js/waitMatout/waitMatout.js b/src/main/webapp/static/js/waitMatout/waitMatout.js
index 40a9fbc..fff1015 100644
--- a/src/main/webapp/static/js/waitMatout/waitMatout.js
+++ b/src/main/webapp/static/js/waitMatout/waitMatout.js
@@ -61,7 +61,7 @@
table.on('tool(waitMatout)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
- console.log(obj)
+ var checkStatus = table.checkStatus(obj.config);
if (layEvent === 'edit') {
showEditModel(data);
} else if (layEvent === 'del') {
@@ -100,7 +100,7 @@
return util.toDateString(d.createTime);
}, width: 180
},
- {field: 'outqty', title: '宸插嚭搴撻噺'},
+ {field: 'outQty', title: '宸插嚭搴撻噺'},
{field: 'color', title: '棰滆壊'},
{field: 'specs', title: '瑙勬牸'},
]],
@@ -120,7 +120,8 @@
response: {
statusCode: 200
},
- done: function () {
+ done: function (res) {
+ // console.log(res);
$(layero).find('.layui-table-view').css('margin', '0');
},
size: ''
@@ -133,23 +134,9 @@
// 鏄剧ず琛ㄥ崟寮圭獥
function showEditModel(expTpe) {
- //matOut ajax
- // var DataList = [];
- // $.ajax({
- // url: baseUrl+"/waitMatout/list/auth2?billNo=" + expTpe.billNo,
- // headers: {'token': localStorage.getItem('token')},
- // contentType:'application/json;charset=UTF-8',
- // method: 'POST',
- // success: function (res) {
- // console.log(res)
- // var list=res.data.records;
- // for (let i = 0; i < list.length; i++) {
- // DataList.push(list[i]);
- // }
- // }
- // })
- // console.log(DataList)
+ var mlist=null
+ var oldQtys=[]
admin.open({
type: 1,
title: (expTpe ? '淇敼' : '娣诲姞') + '鍗曟嵁',
@@ -165,7 +152,6 @@
}
// 琛ㄥ崟鎻愪氦浜嬩欢
form.on('submit(waitMatoutEditSubmit)', function (data) {
- console.log(data)
// 缁勮鏁版嵁
if (xxDataList.length <= 0) {
layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
@@ -173,10 +159,13 @@
}
var param = [];
var nList = admin.util.deepClone(xxDataList);
- console.log(nList)
for (var xi = 0; xi < nList.length; xi++) {
- if (nList[xi].outQty > 0 ) {
-
+ // console.log('宸插嚭搴擄細'+nList[xi].outQty)
+ // console.log('鏃ф暟閲忥細'+oldQtys[xi])
+ // console.log('鏁伴噺锛�'+nList[xi].qty)
+ if (nList[xi].outQty > 0 && oldQtys[xi]!=nList[xi].qty) {
+ layer.msg("宸插嚭搴撴棤娉曚慨鏀�", {icon: 2})
+ return false;
} else if (nList[xi].qty > 0) {
param.push({
billNo: data.field.billNo,
@@ -191,6 +180,9 @@
outQty: nList[xi].outQty,
qty: nList[xi].qty,
})
+ }else if (nList[xi].qty == 0){
+ layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
+ return false;
}
}
if (param.length === 0) {
@@ -242,7 +234,11 @@
{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80}
]],
done: function (res) {
- var list= res.data
+ mlist= res.data
+ for (let i = 0; i < mlist.length; i++) {
+ var waitOut=mlist[i]
+ oldQtys.push(waitOut.qty)
+ }
$(layero).find('.layui-table-view').css('margin', '0');
},
size: ''
@@ -290,7 +286,6 @@
});
// 鏁伴噺淇敼
table.on('edit(formSSXMTable)', function (obj) {
- debugger;
if (obj.field=='memo'){
let vle = obj.value;
for (var i=0;i<xxDataList.length;i++) {
@@ -355,7 +350,6 @@
success: function (res) {
if (res.code === 200){
var mat = res.data;
- console.log(mat)
xxDataList.push({
matNo: mat.matNo,
matName: mat.matName,
--
Gitblit v1.9.1