From d17c089f1d7ff3be848b05161917346e7f664a1d Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 26 四月 2022 15:17:53 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/order.js | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index cb499c9..eeac82c 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -53,6 +53,7 @@
}
});
+
/* 琛ㄦ牸鎼滅储 */
form.on('submit(docTypeTableSearch)', function (data) {
insTb.reload({where: {doc_name: data.field.docName,doc_class:2}});
@@ -180,6 +181,7 @@
,{field: 'defNumber', align: 'center',title: '鍒濆绁ㄦ嵁鍙�', hide: true}
,{field: 'number', align: 'center',title: '绁ㄦ嵁鍙�', hide: true}
,{field: 'cstmrName', align: 'center',title: '瀹㈡埛'}
+ ,{field: 'waveNo', align: 'center', title: '娉㈡缂栧彿'}
,{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 140, width: 140}
,{field: 'tel', align: 'center',title: '鑱旂郴鏂瑰紡', hide: true}
,{field: 'operMemb', align: 'center',title: '鎿嶄綔浜哄憳', hide: true}
@@ -197,8 +199,8 @@
,{field: 'sendTime$', align: 'center',title: '鍙戣揣鏃堕棿', hide: true}
,{field: 'shipName', align: 'center',title: '鐗╂祦鍚嶇О', hide: true}
,{field: 'shipCode', align: 'center',title: '鐗╂祦鍗曞彿', hide: true}
- ,{field: 'settle$', align: 'center',title: '璁㈠崟鐘舵��', templet: '#settleTpl', width: 100}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 120}
+ ,{field: 'settle$', align: 'center',title: '璁㈠崟鐘舵��', templet: '#settleTpl', width: 105}
+ // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 120}
]],
request: {
pageName: 'curr',
@@ -225,11 +227,13 @@
});
/* 琛ㄦ牸2鎼滅储 */
form.on('submit(orderTbSearch)', function (data) {
+
insTb2.reload({where: data.field, page: {curr: 1}});
return false;
});
/* 琛ㄦ牸2閲嶇疆 */
form.on('submit(orderTbReset)', function (data) {
+ $("#orderNo").val("");
insTb2.reload({where: null,page: {curr: 1}});
return false;
});
@@ -248,6 +252,13 @@
return d.id;
});
doDelOrder({ids: ids});
+ }else if (obj.event === 'wave'){
+ var checkRows = table.checkStatus('orderTable');
+ if (checkRows.data.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佺敓鎴愭尝娆＄殑鏁版嵁', {icon: 2});
+ return;
+ }
+ doWaveOrder(checkRows);
}
});
@@ -424,6 +435,36 @@
});
}
+ /* 鐢熸垚娉㈡ */
+ function doWaveOrder(obj) {
+ console.log(obj.data);
+ layer.confirm('纭畾瑕佺敓鎴愭尝娆�?', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/orders/wave/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(obj.data),
+ contentType: 'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ $(".layui-laypage-btn")[0].click();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+
+ });
+ }
// 鐢熸垚鎷ｈ揣鍗�
function stockOut(orderNo) {
--
Gitblit v1.9.1