From c1702cc51a4d94ed37d5083494c87fe0f2cbe5b3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 18 六月 2021 10:20:13 +0800
Subject: [PATCH] # 销售单取消后回滚立库出库至A99
---
src/main/webapp/static/js/order/order.js | 128 +++++++++++++-----------------------------
1 files changed, 39 insertions(+), 89 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 6206983..7375a83 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -59,13 +59,20 @@
if (obj.event === 'add') { // 娣诲姞
showEditModel();
} else if (obj.event === 'edit') { // 淇敼
- showEditModel(selObj.data, selObj);
+ if (selObj == null) {
+ return;
+ }
+ showEditModel(selObj.data);
} else if (obj.event === 'del') { // 鍒犻櫎
+ if (selObj == null) {
+ return;
+ }
doDel(selObj);
}
});
/* 鐩戝惉琛屽崟鍑讳簨浠� */
+ var selObj;
table.on('row(docTypeTable)', function (obj) {
selObj = obj;
obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
@@ -73,7 +80,7 @@
});
/* 鏄剧ず琛ㄥ崟寮圭獥 */
- function showEditModel(mData, obj) {
+ function showEditModel(mData) {
admin.open({
type: 1,
title: (mData ? '淇敼' : '娣诲姞') + '鍗曟嵁绫诲瀷',
@@ -91,13 +98,14 @@
method: 'POST',
success: function (res) {
layer.close(loadIndex);
+ selObj = null;
if (res.code === 200){
layer.close(dIndex);
layer.msg(res.msg, {icon: 1});
insTb.reload();
} else if (res.code === 403){
top.location.href = baseUrl+"/";
- }else {
+ } else {
layer.msg(res.msg, {icon: 2});
}
}
@@ -122,6 +130,7 @@
data: {param: JSON.stringify(obj.data)},
method: 'POST',
success: function (res) {
+ selObj = null;
layer.close(loadIndex);
if (res.code === 200){
layer.closeAll();
@@ -153,17 +162,17 @@
cols: [[
{type: 'checkbox'}
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
- ,{field: 'orderNo', align: 'center',title: '璁㈠崟缂栧彿'}
- ,{field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡'}
- ,{field: 'docType$', align: 'center',title: '鍗曟嵁绫诲瀷'}
- ,{field: 'itemName', align: 'center',title: '椤圭洰'}
+ ,{field: 'docType$', align: 'center',title: '绫诲埆', templet: '#docTypeTpl', width: 100}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', minWidth: 250}
+ ,{field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡', width: 120}
+ ,{field: 'itemName', align: 'center',title: '椤圭洰', hide: true}
,{field: 'allotItemId$', align: 'center',title: '璋冩嫧椤圭洰缂栧彿', hide: true}
,{field: 'defNumber', align: 'center',title: '鍒濆绁ㄦ嵁鍙�', hide: true}
- ,{field: 'number', align: 'center',title: '绁ㄦ嵁鍙�'}
- ,{field: 'cstmrName', align: 'center',title: '瀹㈡埛', hide: true}
+ ,{field: 'number', align: 'center',title: '绁ㄦ嵁鍙�', hide: true}
+ ,{field: 'cstmrName', align: 'center',title: '瀹㈡埛'}
,{field: 'tel', align: 'center',title: '鑱旂郴鏂瑰紡', hide: true}
- ,{field: 'operMemb', align: 'center',title: '鎿嶄綔浜哄憳'}
- ,{field: 'totalFee', align: 'center',title: '鍚堣閲戦'}
+ ,{field: 'operMemb', align: 'center',title: '鎿嶄綔浜哄憳', hide: true}
+ ,{field: 'totalFee', align: 'center',title: '鍚堣閲戦', hide: true}
,{field: 'discount', align: 'center',title: '浼樻儬鐜�', hide: true}
,{field: 'discountFee', align: 'center',title: '浼樻儬閲戦', hide: true}
,{field: 'otherFee', align: 'center',title: '閿�鍞垨閲囪喘璐圭敤鍚堣', hide: true}
@@ -211,8 +220,25 @@
});
/* 琛ㄦ牸2閲嶇疆 */
form.on('submit(orderTbReset)', function (data) {
- insTb2.reload({page: {curr: 1}});
+ insTb2.reload({where: null,page: {curr: 1}});
return false;
+ });
+
+ /* 琛ㄦ牸2澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */
+ table.on('toolbar(orderTable)', function (obj) {
+ if (obj.event === 'add') { // 娣诲姞
+ right();
+ } else if (obj.event === 'del') { // 鍒犻櫎
+ var checkRows = table.checkStatus('orderTable');
+ if (checkRows.data.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ var ids = checkRows.data.map(function (d) {
+ return d.id;
+ });
+ doDelOrder({ids: ids});
+ }
});
/* 琛ㄦ牸2宸ュ叿鏉＄偣鍑讳簨浠� */
@@ -232,7 +258,6 @@
method: 'POST',
success: function (res) {
layer.close(loadIndex);
- // 鎴愬姛
if (res.code === 200){
layer.open({
type: 1
@@ -289,14 +314,10 @@
break;
// 鎵撳嵃
case 'print':
- layer.confirm('寮�濮嬫墦鍗�' +data.number + ' 鎷ｈ揣鍗曪紵', {shadeClose: true}, function(){
+ layer.confirm('寮�濮嬫墦鍗�' +data.orderNo + ' 鎷ｈ揣鍗曪紵', {shadeClose: true}, function(){
layer.closeAll();
printPakouts(data.orderNo);
})
- break;
- // 淇敼
- case 'edit':
- showEditModel2(obj.data);
break;
// 鍒犻櫎
case 'del':
@@ -306,53 +327,6 @@
}
});
-
- /* 琛ㄦ牸2澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */
- table.on('toolbar(orderTable)', function (obj) {
- if (obj.event === 'add') { // 娣诲姞
- // showEditModel2();
- right();
- } else if (obj.event === 'del') { // 鍒犻櫎
- var checkRows = table.checkStatus('orderTable');
- if (checkRows.data.length === 0) {
- layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
- return;
- }
- var ids = checkRows.data.map(function (d) {
- return d.id;
- });
- doDelOrder({ids: ids});
- }
- });
-
- /* 鏄剧ず琛ㄥ崟寮圭獥2 */
- function showEditModel2(mData) {
- admin.open({
- type: 1,
- title: (mData ? '淇敼' : '娣诲姞') + '鏁版嵁瀛楀吀椤�',
- content: $('#dictDataEditDialog').html(),
- success: function (layero, dIndex) {
- // 鍥炴樉琛ㄥ崟鏁版嵁
- form.val('dictDataEditForm', mData);
- // 琛ㄥ崟鎻愪氦浜嬩欢
- form.on('submit(dictDataEditSubmit)', function (data) {
- data.field.dictId = selObj.data.dictId;
- var loadIndex = layer.load(2);
- $.get(mData ? '../../json/ok.json' : '../../json/ok.json', data.field, function (res) {
- layer.close(loadIndex);
- if (200 === res.code) {
- layer.close(dIndex);
- layer.msg(res.msg, {icon: 1});
- insTb2.reload({page: {curr: 1}});
- } else {
- layer.msg(res.msg, {icon: 2});
- }
- }, 'json');
- return false;
- });
- }
- });
- }
/* 鍒犻櫎璁㈠崟 */
function doDelOrder(obj) {
@@ -383,10 +357,8 @@
});
}
-
// 鐢熸垚鎷ｈ揣鍗�
function stockOut(orderNo) {
- // layer.confirm(number + ' 璁㈠崟寮�濮嬫嫞璐э紵', {shadeClose: true}, function(){
layer.closeAll();
$.ajax({
url: baseUrl+"/work/stock/out/create",
@@ -405,19 +377,6 @@
}, function() {
layer.closeAll();
printPakouts(orderNo);
- }
- )
- // 缂烘枡
- } else if (res.code === 20001) {
- layer.confirm(res.msg, {
- shadeClose: true
- , btn: ['搴撳瓨璋冩嫧', '鍙栨秷']
- }, function() {
- // 搴撳瓨璋冩嫧
- layer.closeAll();
- }, function() {
- alert(number)
- layer.closeAll();
}
)
} else if (res.code === 403){
@@ -485,10 +444,6 @@
})
}
-
-
-
-
// // 鎼滅储鏍忔悳绱簨浠�
// form.on('submit(search)', function (data) {
// pageCurr = 1;
@@ -539,11 +494,6 @@
}
});
}
-
-// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
- parent.layer.closeAll();
-});
function tableReload(child) {
var searchData = {};
--
Gitblit v1.9.1