From bcaac64c83b58e26b733d1b0fbf049bf02d3a58d Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 07 六月 2022 09:38:18 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/order/out.js |   75 +++++++++++++++++++++++--------------
 1 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 2dd6326..4fddc97 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -134,10 +134,10 @@
                         type: 1
                         ,title: false
                         ,closeBtn: false
-                        ,offset: '100px'
+                        ,offset: '50px'
                         ,area: ['1200px', '700px']
                         ,shade: 0.5
-                        ,shadeClose: true
+                        ,shadeClose: false
                         ,btn: ['绔嬪嵆鍑哄簱', '绋嶅悗澶勭悊']
                         ,btnAlign: 'c'
                         ,moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
@@ -175,7 +175,6 @@
                                         tableCache[i]['staNo'] = Number(obj.elem.value);
                                     }
                                 }
-                                // data['staNo'] = Number(obj.elem.value);
                                 obj.othis.children().find("input").css("color", "blue");
                                 return false;
                             });
@@ -190,46 +189,66 @@
                             });
                             // 鎵归噺淇敼鍑哄簱绔� - 绔欑偣閫夋嫨
                             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)
-                                            }
-                                        )
+                                    let staNos = stoPreTabData[i].staNos;
+                                    if (staNos !== null) {
+                                        if (staBatchSelectVal.length === 0) {
+                                            staBatchSelectVal = staNos;
+                                        } else {
+                                            staBatchSelectVal = staBatchSelectVal.filter(val =>
+                                                {
+                                                    return new Set(staNos).has(val)
+                                                }
+                                            )
+                                        }
                                     }
+                                }
+                                if (staBatchSelectVal.length === 0) {
+                                    layer.msg("鍑哄簱绔欐病鏈変氦闆嗭紝鏃犳硶鎵归噺淇敼", {icon: 2});
+                                    return;
                                 }
                                 admin.open({
                                     type: 1,
                                     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 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);
+                                                    }
+                                                }
+                                            }
+                                            stoPreTabIdx.reload({data: tableCache});
+                                            arr.forEach(item => {
+                                                $('div[lay-id=stoPreTab] tr[data-index="' + item + '"] .order-sta-select').val(batchSta);
+                                            });
+                                            layui.form.render('select');
+                                            arr.forEach(item => {
+                                                $('div[lay-id=stoPreTab] tr[data-index="' + item + '"] .layui-select-title').find("input").css("color", "blue");
+                                            });
+                                            layer.close(loadIdx); layer.close(ddIndex);
+                                            return false;
+                                        });
                                         // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
                                         $(layero).children('.layui-layer-content').css('overflow', 'visible');
                                         layui.form.render('select');
                                     },
-
                                 })
                             }
 

--
Gitblit v1.9.1