From 67a1d9c58a5a927d544e0cfbfa8ca14fbd78c49d Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期一, 30 五月 2022 07:45:54 +0800
Subject: [PATCH] Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs
---
src/main/webapp/static/js/order/out.js | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 2dd6326..69e055c 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -137,7 +137,7 @@
,offset: '100px'
,area: ['1200px', '700px']
,shade: 0.5
- ,shadeClose: true
+ ,shadeClose: false
,btn: ['绔嬪嵆鍑哄簱', '绋嶅悗澶勭悊']
,btnAlign: 'c'
,moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
@@ -190,6 +190,7 @@
});
// 鎵归噺淇敼鍑哄簱绔� - 绔欑偣閫夋嫨
function modifySta(stoPreTabData) {
+ // 鍑哄簱绔欏彇浜ら泦
let staBatchSelectVal = [];
for(let i = 0; i<stoPreTabData.length; i++) {
if (i === 0) {
@@ -207,29 +208,27 @@
area: '300px',
offset: 'auto',
title: '璇烽�夋嫨绔欑偣',
- // btn: ['绔嬪嵆鍑哄簱', '绋嶅悗澶勭悊'],
- // btnAlign: 'c',
content: $('#staBatchSelectDialog').html(),
- success: function (layero, dIndex) {
-
- console.log(staBatchSelectVal)
+ success: function (layero, ddIndex) {
+ // 娓叉煋涓嬫媺妗�
let template = Handlebars.compile($('#batchStaSelectTpl').html());
- $('#batchSelectStaBox').html(template(staBatchSelectVal));
- layui.form.render('select');
-
- for (let i = 0; i<tableCache.length; i++) {
- // if (tableCache[i].locNo === data.locNo) {
- tableCache[i]['staNo'] = Number(181);
- // }
- }
- stoPreTabIdx.reload({data: tableCache})
- $('.order-sta-select').val(181);
-
+ $('#batchSelectStaBox').html(template({list: staBatchSelectVal}));
+ // 纭
+ form.on('submit(staBatchSelectConfirm)', function (obj) {
+ let batchSta = Number(obj.field.batchSta);
+ for (let i = 0; i<tableCache.length; i++) {
+ tableCache[i]['staNo'] = Number(181);
+ }
+ stoPreTabIdx.reload({data: tableCache})
+ $('.order-sta-select').val(181);
+ layui.form.render('select');
+ layer.close(ddIndex);
+ return false;
+ });
// 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
$(layero).children('.layui-layer-content').css('overflow', 'visible');
layui.form.render('select');
},
-
})
}
--
Gitblit v1.9.1