From 52913f44bd1d0823c90c6072279ff4efeea75ad3 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期日, 29 五月 2022 23:28:28 +0800
Subject: [PATCH] 工序流转

---
 WebTM/views/生产管理/生产装箱单/QK_PackingBill.html |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
index 1252363..0714f30 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
@@ -38,7 +38,7 @@
                                     </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnPack" id="btnPack" style="padding: 0 30px; margin-left: 150px">鏉$爜鐢熸垚</button>
-                                <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnAssembly" id="btnAssembly" style="padding:0 30px">鎷艰鐢熸垚</button>-->
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnAssembly" id="btnAssembly" style="padding:0 30px">鎷艰鐢熸垚</button>
                             </div>
                         </div>
                     </form>
@@ -109,9 +109,10 @@
             });
             //鏁寸鐢熸垚
             form.on('submit(btnPack)', function (data) {
+                var flag = "ZZ";
                 var sSubStr = table.checkStatus('mainTable');
                 if (sSubStr.data.length > 0) {
-                    SavePack(sSubStr);
+                    SavePack(flag,sSubStr);
                 }
                 else {
                     layer.msg('璇锋渶灏戦�夋嫨1琛屾暟鎹紒');
@@ -121,10 +122,8 @@
             //鎷肩鐢熸垚
             form.on('submit(btnAssembly)', function (data) {
                 var flag = "PZ";
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length > 1) {
-                    var sSubStr = JSON.stringify(table.checkStatus('mainTable').data);
+                var sSubStr = table.checkStatus('mainTable');
+                if (sSubStr.data.length > 1) {
                     SavePack(flag,sSubStr);
                 }
                 else {
@@ -212,7 +211,7 @@
                 table.render(option);
             }
             //鐢熸垚
-            function SavePack(sSubStr) {
+            function SavePack(flag,sSubStr) {
                 if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
                 {
                     return false;
@@ -222,7 +221,7 @@
                         type: "POST",
                         url: GetWEBURL() + "/Sc_ICMOBill/QK_PackingBillSavePack", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         async: true,
-                        data: { "msg": JSON.stringify(sSubStr.data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"]},
+                        data: { "msg": JSON.stringify(sSubStr.data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + flag + ";" + $('#HBillNo').val()},
                         dataType: "json",
                         success: function (data) {
                             if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝

--
Gitblit v1.9.1