From 6513f2ed69fcabb1447db3237f62576f95a653a9 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 26 二月 2021 15:50:09 +0800
Subject: [PATCH] 修改销售出库新增提交报错问题

---
 WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html |  124 +++++++++++++++++++++++-----------------
 1 files changed, 71 insertions(+), 53 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 77c2ceb..ebd31d9 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"
@@ -88,7 +88,7 @@
                                             <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
                                         </div>
                                         <div class="layui-col-xs3">
-                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
                                         </div>
                                     </div>
                                 </div>
@@ -267,9 +267,14 @@
             $("#HMakerID").hide();
             $("#HBillerID").val(sessionStorage["HBillerID"]);
             $("#HBillerID").hide();
+            var HSourceFlag = sessionStorage["SourceFlag"];
 
-
-            //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
 
 
             //鑾峰彇鍙傛暟
@@ -289,7 +294,7 @@
         
             
 
-            function  RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            function  RoadBillMain(linterid)//鍔犺浇琛ㄥご-----涓嶄細璧�
             {
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetPonderationBill",
@@ -312,7 +317,7 @@
                 })
             }
 
-            function RoadSup()//鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇瀹㈡埛
+            function RoadSup()//鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇瀹㈡埛-----涓嶄細璧�
             {
                 //var sInterID = $("#HInterID").val()
                 var HSourceBillNo = $('#HSourceBillNo').val()
@@ -334,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);
                             }
@@ -348,7 +353,7 @@
                 }
             }
 
-            function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
+            function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋-----涓嶄細璧�
             {
                 table.render({
                     elem: '#wl-table'
@@ -370,7 +375,7 @@
                     , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
                     , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
                     ]]
-                    , height: 500
+                    //, height: 500
                 })
             }
              
@@ -400,7 +405,7 @@
                     }
                 }); 
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new-----涓嶄細璧�
                 RoadBillMain(linterid);
                 RoadBillSub(linterid);
             }
@@ -436,6 +441,7 @@
                     }
                 })
             });
+
             form.on('submit(HSupID-BT)', function () {//閫夋嫨瀹㈡埛
                 layer.open({
                     type: 2
@@ -499,7 +505,7 @@
             });
 
             form.on('submit(Cancel)', function () {
-                sessionStorage["SourceFlag"] = false;
+                //sessionStorage["SourceFlag"] = false;
                 parent.location.href = "../../../views/index.html"
                 //window.close();//鍏抽棴褰撳墠椤�
             })
@@ -567,7 +573,7 @@
                                     , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
                                     , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
                                    ]]
-                                    , height: 500
+                                    //, height: 500
                                })
                            }
                            else {
@@ -588,7 +594,6 @@
                 var sSourceType = $("#HBillType").val();
                 if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
                 {
-                    layer.load(3);
                     var flage = true;
                     for (var i = 0; i < sSubStr.length; i++) {
                         if (sSubStr[i].HQty == 0) {
@@ -599,42 +604,52 @@
                         layer.confirm('瀹為檯鎵弿鍗锋暟灏忎簬鎵捐揣鍗曟暟閲忥紒鏄惁缁х画鎻愪氦锛�', {
                             btn: ['缁х画', '鍙栨秷'], skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
                         }, function () {
-                            $.ajax(
-                            {
-                                type: "POST",
-                                // url: "http://61.130.49.162:9090/WMSAPI///SellOut/set_SaveSellOutBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                url: GetWEBURL() + "/SellOut/set_SaveSellOutBill_Json",
-                                async: true,
-                                data: { "oMain": sMainStr },
-                                dataType: "json",
-                                success: function (data) {
-                                    if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
-                                        layer.confirm("鐢熸垚閿�鍞嚭搴撳崟" + data.Message + $("#HBillNo").val(), {
-                                            icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                                            btn2: function () {
-                                                //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
-                                                //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
-                                                parent.location.href = "../../../views/index.html"
-                                            }//鍏抽棴
-                                        }, function () { window.location.reload(); });//鏂板
-                                    }
-                                    else {
-                                        layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                    }
-                                    layer.closeAll("loading");
-                                },
-                                error: function (err) {
-                                    layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                }
-                            });
+                            Saver(sMainStr);
                         }, function () {
                             layer.closeAll("loading");
                         });
+                    } else {
+                        Saver(sMainStr);
                     }
                     
-                    return false;
                 }
             });
+            //鎻愪氦鏂规硶璋冪敤鐨刟jax
+            function Saver(sMainStr) {
+                layer.load(1);
+                $.ajax(
+                {
+                    type: "POST",
+                    // url: "http://61.130.49.162:9090/WMSAPI///SellOut/set_SaveSellOutBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    url: GetWEBURL() + "/SellOut/set_SaveSellOutBill_Json",
+                    async: true,
+                    data: { "oMain": sMainStr },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                            layer.confirm(data.Message + $("#HBillNo").val(), {
+                                icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+                                btn2: function () {
+                                    //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                                    //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                                    parent.location.href = "../../../views/index.html";
+                                }//鍏抽棴
+                            }, function () {
+                                //sessionStorage["SourceFlag"] = false;
+                                window.location.reload();
+                            });//鏂板
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
             //鐩戝惉鎻愪氦
             form.verify({
                 numberOrEmpty: function (value, item) {
@@ -656,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
                 
@@ -674,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 == '浠撳簱鏉$爜') {
@@ -701,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");
@@ -720,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");
@@ -770,7 +785,7 @@
                               ]]
                                     // , data: [linterid]
                                     // , page: true
-                              , height: 500
+                              //, height: 500
                               , done: function () {
                                   layer.closeAll("loading");
                               }
@@ -782,6 +797,9 @@
                                 layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             }
                             layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     });
                 }
@@ -792,7 +810,7 @@
                 if (event.keyCode == 13) {
                     //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
                     $.ajax({
-                        url: GetWEBURL() + "/Web/GetSpName_Json",
+                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
                         type: "GET",
                         data: { "HBarCode": HBarCode },
                         success: function (result) {
@@ -909,7 +927,7 @@
                                 $("#HSupName").val(result.data[0].HSupName);
                                 //$("#HDeptID").val(result.data[0].HDeptID);
                                 //$("#HDeptName").val(result.data[0].HDeptName);
-                                sessionStorage["SourceFlag"] = true;
+                                HSourceFlag = true;
                                 element.tabChange('tab-SellOutBill', '2');
                                 layer.load(3);
                                 
@@ -932,7 +950,7 @@
                                   ]]
                                     // , data: [linterid]
                                     // , page: true
-                                  , height: 500
+                                  //, height: 500
                                   , done: function () {
                                       layer.closeAll("loading");
                                   }

--
Gitblit v1.9.1