From 15ac6798a771119b1c97bfbdc5d1d6faa38e9c94 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 三月 2021 15:41:12 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/ioWorks/matQuery.js | 6 +++++-
src/main/webapp/static/js/custOrder/custOrder.js | 10 ++++++----
src/main/webapp/static/js/common.js | 3 +++
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 2681c52..951a7ae 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -198,3 +198,6 @@
,{field: 'weight', align: 'center',title: '閲嶉噺', hide: true}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'}
]
+
+
+var popupRight;
\ No newline at end of file
diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index a5adbdd..5a4f5ec 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -1,15 +1,17 @@
var pageCurr;
-
function right(){
- top.layui.admin.popupRight({
+ top.popupRight = top.layui.admin.popupRight({
id: 'LAY_adminPopupLayerTest'
, area: '750px'
, type: 2
- ,content:'custOrder/matQuery.html'
- ,success: function(){
+ , content:'custOrder/matQuery.html'
+ , success: function(){
// $('#'+ this.id).html('<div style="padding: 20px;">鏀惧叆鍐呭</div>');
//admin.view(this.id).render('system/xxx')
}
+ , end: function () {
+ $(".layui-laypage-btn")[0].click();
+ }
});
}
diff --git a/src/main/webapp/static/js/ioWorks/matQuery.js b/src/main/webapp/static/js/ioWorks/matQuery.js
index ed49f52..0a22b7c 100644
--- a/src/main/webapp/static/js/ioWorks/matQuery.js
+++ b/src/main/webapp/static/js/ioWorks/matQuery.js
@@ -54,6 +54,9 @@
success: function(layero, index){
layer.iframeAuto(index)
},
+ cancel: function () {
+ $('#orderNo').val('');
+ }
});
@@ -103,9 +106,10 @@
}
});
- // 寮�濮嬫墦鍗�
+ // 寮�濮嬬敓鎴愭嫞璐у崟
form.on('submit(confirm)', function (data) {
+ top.layui.layer.close(top.popupRight);
})
function updateMatData(locNo, matnr, count) {
--
Gitblit v1.9.1