From 34f70b69d93447969c0094937a9693f80dde15a3 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 26 二月 2021 21:24:19 +0800
Subject: [PATCH] 销售出库跳转页签,产品入口解决新增提交问题

---
 WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html |   45 ++++++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 21 deletions(-)

diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index 8d2e163..4769384 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -267,6 +267,7 @@
             $("#HMakerID").hide();
             $("#HBillerID").val(sessionStorage["HBillerID"]);
             $("#HBillerID").hide();
+            var HSourceFlag = sessionStorage["SourceFlag"];
 
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             if (sessionStorage.login != "login") {
@@ -293,7 +294,7 @@
         
             
 
-            function  RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            function  RoadBillMain(linterid)//鍔犺浇琛ㄥご-----涓嶄細璧�
             {
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetPonderationBill",
@@ -316,7 +317,7 @@
                 })
             }
 
-            function RoadSup()//鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇瀹㈡埛
+            function RoadSup()//鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇瀹㈡埛-----涓嶄細璧�
             {
                 //var sInterID = $("#HInterID").val()
                 var HSourceBillNo = $('#HSourceBillNo').val()
@@ -338,8 +339,8 @@
                                 $("#HSupID").val(result.data[0].HSupID);
                                 $("#HSupName").val(result.data[0].HSupName);
                                 $("#HDeptID").val(result.data[0].HDeptID);
-                                $("#HDeptName").val(result.data[0].HDeptName);
-                                sessionStorage["SourceFlag"] = true;
+                                //$("#HDeptName").val(result.data[0].HDeptName);
+                                //sessionStorage["SourceFlag"] = true;
                                 element.tabChange('tab-SellOutBill', '2');
                                 layer.load(3);
                             }
@@ -352,7 +353,7 @@
                 }
             }
 
-            function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
+            function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋-----涓嶄細璧�
             {
                 table.render({
                     elem: '#wl-table'
@@ -404,7 +405,7 @@
                     }
                 }); 
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new-----涓嶄細璧�
                 RoadBillMain(linterid);
                 RoadBillSub(linterid);
             }
@@ -504,7 +505,7 @@
             });
 
             form.on('submit(Cancel)', function () {
-                sessionStorage["SourceFlag"] = false;
+                //sessionStorage["SourceFlag"] = false;
                 parent.location.href = "../../../views/index.html"
                 //window.close();//鍏抽棴褰撳墠椤�
             })
@@ -634,7 +635,7 @@
                                     parent.location.href = "../../../views/index.html";
                                 }//鍏抽棴
                             }, function () {
-                                sessionStorage["SourceFlag"] = false;
+                                //sessionStorage["SourceFlag"] = false;
                                 window.location.reload();
                             });//鏂板
                         }
@@ -670,7 +671,7 @@
                 var sHWHID = $("#HWHID").val();//浠撳簱ID
                 var sHSPID = $("#HStockPlaceID").val();//浠撲綅ID
                 var sQty = $("#HQty").val()//鏁伴噺
-                var SourceFlag = sessionStorage["SourceFlag"];
+                //var SourceFlag = sessionStorage["SourceFlag"];
                 var sSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍙�
                 var sHBillType = $("#HBillType").val()  //婧愬崟绫诲瀷-鍙戣揣閫氱煡鍗曪細1402锛岄攢鍞鍗�1401
                 
@@ -688,7 +689,7 @@
                     $.ajax({
                         url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
                         type: "GET",
-                        data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": SourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
+                        data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
                         success: function (result) {
                             if (result.count == 1) {
                                 if (result.data.HBarType == '浠撳簱鏉$爜') {
@@ -715,10 +716,10 @@
                                 else if (result.data.HBarType == '婧愬崟鏉$爜') {
                                     $("#HSupName").val(result.data.HSupName);
                                     $("#HSupID").val(result.data.HSupID);
-                                    $("#HDeptName").val(result.data.HDeptName);
+                                    //$("#HDeptName").val(result.data.HDeptName);
                                     $("#HDeptID").val(result.data.HDeptID);
                                     $("#HSourceBillNo").val(result.data.HSourceBillNo);
-                                    sessionStorage["SourceFlag"] = true;
+                                    HSourceFlag = true;
                                     //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
                                     if (result.data.HSourceBillType == "1402") {
                                         $("#HBillType").val("1402");
@@ -734,16 +735,16 @@
                                     element.tabChange('tab-Kf_SellOutBill', '3');
                                 }
                                 else {
-                                    if (sessionStorage["SourceFlag"] == "true") {
+                                    if (HSourceFlag == "true") {
                                         element.tabChange('tab-Kf_SellOutBill', '3');
                                     }
                                     else {
                                         $("#HSupName").val(result.data.HSupName);
                                         $("#HSupID").val(result.data.HSupID);
-                                        $("#HDeptName").val(result.data.HDeptName);
+                                        //$("#HDeptName").val(result.data.HDeptName);
                                         $("#HDeptID").val(result.data.HDeptID);
                                         $("#HSourceBillNo").val(result.data.HSourceBillNo);
-                                        sessionStorage["SourceFlag"] = true;
+                                        HSourceFlag = true;
                                         //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
                                         if (result.data.HSourceBillType == "1402") {
                                             $("#HBillType").val("1402");
@@ -911,8 +912,10 @@
                 var sBillNo = $("#HBillNo").val()
                 var HSourceBillType = $("#HBillType").val()
                 if (event.keyCode == 13) {
+                    var index = layer.load(0);
                     //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
                     if (HSourceBillNo == "" || sInterID <= 0) {
+                        layer.close(index);
                         layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return;
                     }
@@ -926,10 +929,8 @@
                                 $("#HSupName").val(result.data[0].HSupName);
                                 //$("#HDeptID").val(result.data[0].HDeptID);
                                 //$("#HDeptName").val(result.data[0].HDeptName);
-                                sessionStorage["SourceFlag"] = true;
-                                element.tabChange('tab-SellOutBill', '2');
-                                layer.load(3);
-                                
+                                HSourceFlag = true;
+                                element.tabChange('tab-SellOutBill', '3');
                                 table.render({
                                     elem: '#wl-table'
                                     , url: GetWEBURL1() + '/SellOut/DisBillEntryList_Webs_Json'
@@ -951,14 +952,16 @@
                                     // , page: true
                                   //, height: 500
                                   , done: function () {
-                                      layer.closeAll("loading");
+                                      layer.close(index);
                                   }
                                 });
+                                layer.close(index);
                             }
                             else {
+                                layer.close(index);
                                 layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             }
-                            layer.closeAll("loading");
+                            layer.close(index);
                         }
                     });
                 }

--
Gitblit v1.9.1