From 410861661b6e5b54ab3102c92f98c8e85c212b0d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 01 六月 2022 16:48:16 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/order/out.js |   50 +++++++++++++++++++++++++++++++++++---------------
 1 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 69e055c..4fddc97 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
@@ -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;
                             });
@@ -193,15 +192,22 @@
                                 // 鍑哄簱绔欏彇浜ら泦
                                 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,
@@ -215,14 +221,28 @@
                                         $('#batchSelectStaBox').html(template({list: staBatchSelectVal}));
                                         // 纭
                                         form.on('submit(staBatchSelectConfirm)', function (obj) {
+                                            let loadIdx = layer.load(2);
                                             let batchSta = Number(obj.field.batchSta);
-                                            for (let i = 0; i<tableCache.length; i++) {
-                                                tableCache[i]['staNo'] = Number(181);
+                                            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})
-                                            $('.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(ddIndex);
+                                            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;
                                         });
                                         // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯

--
Gitblit v1.9.1