From dd6b051068d119d1b98aae66092e9358d0d7fb38 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 30 五月 2022 10:15:04 +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 | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 974456b..914e79b 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -134,7 +134,7 @@
type: 1
,title: false
,closeBtn: false
- ,offset: '100px'
+ ,offset: '50px'
,area: ['1200px', '700px']
,shade: 0.5
,shadeClose: false
@@ -209,20 +209,31 @@
offset: 'auto',
title: '璇烽�夋嫨绔欑偣',
content: $('#staBatchSelectDialog').html(),
- success: function (layero, dIndex) {
+ success: function (layero, ddIndex) {
// 娓叉煋涓嬫媺妗�
let template = Handlebars.compile($('#batchStaSelectTpl').html());
$('#batchSelectStaBox').html(template({list: staBatchSelectVal}));
// 纭
form.on('submit(staBatchSelectConfirm)', function (obj) {
- obj.field;
- for (let i = 0; i<tableCache.length; i++) {
- // if (tableCache[i].locNo === data.locNo) {
- tableCache[i]['staNo'] = Number(181);
- // }
+ let loadIdx = layer.load(2);
+ let batchSta = Number(obj.field.batchSta);
+ let arr = [];
+ for (let j = 0; j<stoPreTabData.length; j++) {
+ for (let i = 0; i<tableCache.length; i++) {
+ if (tableCache[i].orderNo === stoPreTabData[j].orderNo
+ && tableCache[i].matnr === stoPreTabData[j].matnr
+ && tableCache[i].locNo === stoPreTabData[j].locNo) {
+ tableCache[i]['staNo'] = batchSta;
+ arr.push(i);
+ }
+ }
}
- $('.order-sta-select').val(181);
stoPreTabIdx.reload({data: tableCache})
+ arr.forEach(item => {
+ $('div[lay-id=stoPreTab] tr[data-index="' + item + '"] .order-sta-select').val(batchSta);
+ })
+ layui.form.render('select');
+ layer.close(loadIdx); layer.close(ddIndex);
return false;
});
// 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
--
Gitblit v1.9.1