From 7e45c420dd19a3ffe224e9cd42bf7ea31277d7be Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 27 五月 2022 16:48:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jkasrs' into jkasrs
---
src/main/webapp/static/js/order/out.js | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 67ece60..974456b 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -137,13 +137,13 @@
,offset: '100px'
,area: ['1200px', '700px']
,shade: 0.5
- ,shadeClose: true
+ ,shadeClose: false
,btn: ['绔嬪嵆鍑哄簱', '绋嶅悗澶勭悊']
,btnAlign: 'c'
,moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
,content: $('#pakoutPreviewBox').html()
,success: function(layero, index){
- table.render({
+ stoPreTabIdx = table.render({
elem: '#stoPreTab',
data: res.data,
height: 520,
@@ -182,18 +182,54 @@
// 鎵归噺淇敼鍑哄簱绔�
form.on('submit(batchModifySta)', function () {
let stoPreTabData = layui.table.checkStatus('stoPreTab').data;
- console.log(stoPreTabData)
if (stoPreTabData.length < 1) {
layer.msg("璇疯嚦灏戦�夋嫨涓�鏉′互涓婂悎骞舵暟鎹�", {icon: 7});
return false;
}
- modifySta(stoPreTabData.map(function (d) {
- return d.id;
- }));
+ modifySta(stoPreTabData);
});
// 鎵归噺淇敼鍑哄簱绔� - 绔欑偣閫夋嫨
- function modifySta(data) {
-
+ function modifySta(stoPreTabData) {
+ // 鍑哄簱绔欏彇浜ら泦
+ let staBatchSelectVal = [];
+ for(let i = 0; i<stoPreTabData.length; i++) {
+ if (i === 0) {
+ staBatchSelectVal = stoPreTabData[i].staNos;
+ } else {
+ let staNos = stoPreTabData[i].staNos;
+ staBatchSelectVal = staBatchSelectVal.filter( val => {
+ return new Set(staNos).has(val)
+ }
+ )
+ }
+ }
+ admin.open({
+ type: 1,
+ area: '300px',
+ offset: 'auto',
+ title: '璇烽�夋嫨绔欑偣',
+ content: $('#staBatchSelectDialog').html(),
+ success: function (layero, dIndex) {
+ // 娓叉煋涓嬫媺妗�
+ 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);
+ // }
+ }
+ $('.order-sta-select').val(181);
+ stoPreTabIdx.reload({data: tableCache})
+ return false;
+ });
+ // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ },
+ })
}
}
--
Gitblit v1.9.1