From 9fc747c8fe1b492e0e82da57a60f4ac17ef196d8 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期一, 22 二月 2021 22:28:09 +0800
Subject: [PATCH] 1、上架归还单:先扫条码再扫货架,如果不匹配不允许提交。2、下架找货单:已下架的条码允许再次下架。

---
 WebTM/views/仓存管理/仓库调拨/Cc_LookingForReturnBill.html |  172 +++++++++++++++++-----------------
 WebTM/Properties/PublishProfiles/webtm.pubxml.user |    6 
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html   |   36 +++---
 WebTM/views/仓存管理/仓库调拨/Cc_LookingForBill.html       |   36 ++++---
 4 files changed, 129 insertions(+), 121 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/webtm.pubxml.user b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
index 1283724..9714924 100644
--- a/WebTM/Properties/PublishProfiles/webtm.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
@@ -1075,16 +1075,16 @@
       <publishTime>11/26/2020 17:27:35</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForBill.html">
-      <publishTime>02/21/2021 13:18:54</publishTime>
+      <publishTime>02/22/2021 22:19:13</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForReturnBill.html">
-      <publishTime>02/20/2021 15:21:20</publishTime>
+      <publishTime>02/22/2021 22:17:47</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_ReturnBill.html">
       <publishTime>02/05/2021 14:05:30</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html">
-      <publishTime>02/21/2021 21:12:01</publishTime>
+      <publishTime>02/22/2021 20:38:40</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html">
       <publishTime>01/14/2021 10:06:24</publishTime>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBill.html"
index aa02308..806fc05 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBill.html"
@@ -217,11 +217,11 @@
                     , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
                     , { field: '鍗虫椂搴撳瓨', title: '鍗虫椂搴撳瓨' }
                     , { field: 'HBarCode', title: '鏉$爜缂栧彿', hide: true }
-                    , { field: 'HInterID', title: '鍗曟嵁ID' }
+                    , { field: 'HInterID', title: '鍗曟嵁ID', hide: true }
                     , { field: 'HBillNo', title: '鍗曟嵁鍙�' }
-                    , { field: 'HMakerID', title: '鍒跺崟浜篒D' }
+                    , { field: 'HMakerID', title: '鍒跺崟浜篒D', hide: true }
                     , { field: 'HMaker', title: '鍒跺崟浜�' }
-                    , { field: 'HBillType', title: 'HBillType' }
+                    , { field: 'HBillType', title: 'HBillType', hide: true }
                 ]]
                 , text: {
                     none: '鏆傛棤鐩稿叧鏁版嵁锛岃鍏堟壂鎻忔簮鍗曞彿锛�' //榛樿锛氭棤鏁版嵁銆傛敞锛氳灞炴�т负 layui 2.2.5 寮�濮嬫柊澧�
@@ -319,10 +319,14 @@
                                 layer.close(index);
                                 $('#HBarCode').val("");
                                 layer.msg("璇ュ疄鐗╁凡鎵爜锛岃鍕块噸澶嶆壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            } else if (sSubStr[i].HStatus != null && sSubStr[i].HStatus != "" && sSubStr[i].HStatus != "鍦ㄥ簱") {
-                                layer.close(index);
-                                layer.msg("璇ュ疄鐗╁湪瑁佸垏涓紝涓嶅厑璁告壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            } else {
+                            }
+                            //else if (sSubStr[i].HStatus != null && sSubStr[i].HStatus != "" && sSubStr[i].HStatus != "鍦ㄥ簱")
+                            //{
+                            //    layer.close(index);
+                            //    layer.msg("璇ュ疄鐗╁湪" + sSubStr[i].HSource+"瑁佸垏涓紝涓嶅厑璁告壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            //}
+                            else
+                            {
                                 sSubStr[i].HIsStatus = "鏄�";
                                 sSubStr[i].HSourceID = $("#HSourceID").val();
                                 sSubStr[i].HSource = $("#HSource").val();
@@ -452,15 +456,15 @@
                         async: true,
                         data: { "oMain": sSubStr },
                         dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) {
-                                layer.confirm(data.Message, {
-                                    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"
-                                    }//鍏抽棴
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.confirm(result.Message, {
+                                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 {
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html"
index c0f31ca..3462f88 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html"
@@ -53,34 +53,6 @@
                                 <div class="layui-form-item" style="padding:0px;margin:0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
-                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
-                                        </div>
-                                        <div class="layui-col-xs6">
-                                            <input type="text" name="HWHName" id="HWHName" autocomplete="off" class="layui-input">
-                                            <input type="hidden" name="HWHID" id="HWHID" value="0" autocomplete="off" class="layui-input">
-                                        </div>
-                                        <div class="layui-col-xs3">
-                                            <button type="button" id="HWHID-BT" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-form-item" style="padding:0px;margin:0px">
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs3">
-                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
-                                        </div>
-                                        <div class="layui-col-xs6">
-                                            <input type="text" name="HSPName" id="HSPName" autocomplete="off" class="layui-input">
-                                            <input type="hidden" name="HSPID" id="HSPID" value="0" autocomplete="off" class="layui-input">
-                                        </div>
-                                        <div class="layui-col-xs3">
-                                            <button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-form-item" style="padding:0px;margin:0px">
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs3">
                                             <label class="layui-form-label" style="width:30px;padding-left:0px;">鐝粍</label>
                                         </div>
                                         <div class="layui-col-xs6">
@@ -149,6 +121,34 @@
                                     </div>
                                     <div class="layui-col-xs8">
                                         <input type="text" name="HBarCode" id="HBarCode" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HWHName" id="HWHName" autocomplete="off" class="layui-input" readonly>
+                                            <input type="hidden" name="HWHID" id="HWHID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs1">
+                                            <button type="button" id="HWHID-BT" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HSPName" id="HSPName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HSPID" id="HSPID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs1">
+                                            <button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
+                                        </div>
                                     </div>
                                 </div>
                                 <table class="layui-hide" id="bzd-table2" lay-filter="bzd-table2"></table>
@@ -229,7 +229,7 @@
                 , cellMinWidth: 90
                 , cols: [[
                     { type: 'numbers', title: '搴忓彿' }
-                    , { field: 'HIsStatus', title: '鏄惁鎵爜' }
+                    , { field: 'HIsStatus', title: '鏄惁鎵爜', hide: true }
                     , { field: 'HMTONo', title: '鎵瑰彿', width: 180 }
                     , { field: 'HSPID', title: '浠撲綅ID', hide: true }
                     , { field: 'HSPName', title: '浠撲綅' }
@@ -249,11 +249,11 @@
                     , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
                     , { field: '鍗虫椂搴撳瓨', title: '鍗虫椂搴撳瓨' }
                     , { field: 'HBarCode', title: '鏉$爜缂栧彿', hide: true }
-                    , { field: 'HInterID', title: '鍗曟嵁ID' }
-                    , { field: 'HBillNo', title: '鍗曟嵁鍙�' }
-                    , { field: 'HMakerID', title: '鍒跺崟浜篒D' }
-                    , { field: 'HMaker', title: '鍒跺崟浜�' }
-                    , { field: 'HBillType', title: 'HBillType' }
+                    , { field: 'HInterID', title: '鍗曟嵁ID', hide: true }
+                    , { field: 'HBillNo', title: '鍗曟嵁鍙�', hide: true }
+                    , { field: 'HMakerID', title: '鍒跺崟浜篒D', hide: true }
+                    , { field: 'HMaker', title: '鍒跺崟浜�', hide: true }
+                    , { field: 'HBillType', title: 'HBillType', hide: true }
                 ]]
                 , text: {
                     none: '鏆傛棤鐩稿叧鏁版嵁锛岃鍏堟壂鎻忔簮鍗曞彿锛�' //榛樿锛氭棤鏁版嵁銆傛敞锛氳灞炴�т负 layui 2.2.5 寮�濮嬫柊澧�
@@ -271,7 +271,7 @@
                     { type: 'numbers', title: '搴忓彿' }
                     //, { field: 'HIsStatus', title: '鏄惁鎵爜' }
                     , { field: 'HSourceInterID', title: '婧愬崟ID', hide: true }
-                    , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 110 }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍙�', hide: true }
                     , { field: 'HMTONo', title: '鎵瑰彿', width: 180 }
                     , { field: 'HStatus', title: '鍦ㄥ簱鐘舵��', width: 165 }
                     , { field: 'HWhID', title: '浠撳簱ID', hide: true }
@@ -436,33 +436,37 @@
                         data: { "HBarCode": HBarCode },
                         success: function (result) {
                             if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                if (sSubStr[i].HIsStatus == "鏄�") {
-                                    layer.close(index);
-                                    $('#HBarCode').val("");
-                                    layer.msg("璇ュ疄鐗╁凡鎵爜锛岃鍕块噸澶嶆壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                } else if (sSubStr[i].HStatus != null && sSubStr[i].HStatus == "" && sSubStr[i].HStatus == "鍦ㄥ簱") {
-                                    layer.close(index);
-                                    layer.msg("璇ュ疄鐗╁湪搴擄紝涓嶅厑璁告壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                } else {
-                                    var data = result.data;
-                                    option2.data = data;
-                                    table.render(option2);
-                                    var sSubStr = table.cache['bzd-table2'];
-                                    sSubStr[0].HSourceID = $("#HSourceID").val();
-                                    sSubStr[0].HSource = $("#HSource").val();
-                                    sSubStr[0].HGroupID = $("#HGroupID").val();
-                                    sSubStr[0].HGroup = $("#HGroup").val();
-                                    sSubStr[0].HInterID = $("#HInterID").val();
-                                    sSubStr[0].HBillNo = $("#HBillNo").val();
-                                    sSubStr[0].HMakerID = $("#HMakerID").val();
-                                    sSubStr[0].HMaker = $("#HMaker").val();
-                                    option2.data = table.cache["bzd-table2"];
-                                    table.render(option2);
-                                    layer.close(index);
-                                    $('#HBarCode').val("");
-                                    layer.close(index);
-                                    layer.msg("鎵爜鎴愬姛锛�", { icon: 1, time: 1000 });
+                                var sSubStr = result.data;
+                                for (var i = 0; i < sSubStr.length; i++) {
+                                    if (sSubStr[i].HIsStatus == "鏄�") {
+                                        layer.close(index);
+                                        $('#HBarCode').val("");
+                                        layer.msg("璇ュ疄鐗╁凡鎵爜锛岃鍕块噸澶嶆壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    } else if (sSubStr[i].HStatus == null || sSubStr[i].HStatus == "" || sSubStr[i].HStatus == "鍦ㄥ簱") {
+                                        layer.close(index);
+                                        layer.msg("璇ュ疄鐗╁湪" + sSubStr[i].HWhName + "-" + sSubStr[i].HSPName+"锛屼笉鍏佽鎵爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    } else {
+                                        var data = result.data;
+                                        option2.data = data;
+                                        table.render(option2);
+                                        sSubStr = table.cache['bzd-table2'];
+                                        sSubStr[i].HIsStatus = "鏄�";
+                                        sSubStr[i].HSourceID = $("#HSourceID").val();
+                                        sSubStr[i].HSource = $("#HSource").val();
+                                        sSubStr[i].HGroupID = $("#HGroupID").val();
+                                        sSubStr[i].HGroup = $("#HGroup").val();
+                                        sSubStr[i].HInterID = $("#HInterID").val();
+                                        sSubStr[i].HBillNo = $("#HBillNo").val();
+                                        sSubStr[i].HMakerID = $("#HMakerID").val();
+                                        sSubStr[i].HMaker = $("#HMaker").val();
+                                        option2.data = table.cache["bzd-table2"];
+                                        table.render(option2);
+                                        layer.close(index);
+                                        $('#HBarCode').val("");
+                                        layer.msg("鎵爜鎴愬姛锛�", { icon: 1, time: 1000 });
+                                    }
                                 }
+
                             }
                             else {
                                 option2.data = [];
@@ -553,26 +557,17 @@
 
             //鎻愪氦
             form.on('submit(Saver)', function (data) {//鎻愪氦
-                //debugger;
-                //var sMainStr = JSON.stringify(data.field);
                 var tableData = table.cache['bzd-table2'];
-                //for (var i = 0; i < tableData.length; i++) {
-                //    if (tableData[i].HIsStatus == "鏄�" ) {
-
-                //    } else {
-                //        //绉婚櫎褰撳墠琛�
-                //        tableData.splice(i, 1);
-                //        i--;
-                //        option.data = tableData;
-                //        table.render(option);
-                //    }
-                //}
                 var sSubStr = JSON.stringify(tableData);
                 sSubStr = "{\"oSub\": " + sSubStr + "}";
-                //sSubStr = JSON.stringify(sSubStr);
-                //var json = "{\"oMain\":" + sMainStr + "},{\"oMain\":" + sSubStr + "}";
                 if (AllowLoadData(sSubStr, 'Saver') != false)//闈炵┖楠岃瘉
                 {
+                    //鍒ゆ柇涓婃灦搴撲綅鏄惁涓庢潯鐮佷腑搴撲綅涓�鑷�
+                    var tableData = table.cache['bzd-table2'];
+                    if ($("#HWHID").val() != tableData[0].HWhID && $("#HSPID").val() != tableData[0].HSPID) {
+                        layer.msg("褰撳墠搴撲綅涓庡疄闄呬笉绗︼紒", { icon: 4, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
                     var index = layer.load();
                     $.ajax(
                     {
@@ -616,20 +611,30 @@
                 }
             });
 
-
+            //鎵笂鏋朵粨浣�
             $('#HSPName').on('keydown', function (event) {      //鎵粨浣�
-                var HBarCode = $('#HSPName').val()
+                var HBarCode = $('#HSPName').val();
                 if (event.keyCode == 13) {
                     //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
                     $.ajax({
-                        url: GetWEBURL() + "/Web/GetSpName_Json",
+                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
                         type: "GET",
                         data: { "HBarCode": HBarCode },
                         success: function (result) {
                             if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                $("#HSPName").val(result.data[0].HName);
-                                $("#HSPID").val(result.data[0].HItemID);
-                                element.tabChange('tab-POStockInBill', '2');
+                                var tableData = table.cache['bzd-table2'];
+                                if (tableData.length == 0) {
+                                    layer.msg("璇峰厛鎵疄鐗╂潯鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    return;
+                                }
+                                if (result.data[0].HWHID != tableData[0].HWhID && result.data[0].HItemID != tableData[0].HSPID) {
+                                    layer.msg("姝ゅ簱浣嶄笌瀹為檯涓嶇锛�", { icon: 4, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                } else {
+                                    $("#HSPName").val(result.data[0].HName);
+                                    $("#HSPID").val(result.data[0].HItemID);
+                                    $("#HWHID").val(result.data[0].HWHID);
+                                    $("#HWHName").val(result.data[0].HWhName);
+                                }
                             }
                             else {
                                 layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -733,9 +738,6 @@
                         }
                     }
                 }
-            }
-            else {
-                return true;
             }
         }
     </script>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index d8c2c36..0d02288 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
@@ -86,7 +86,7 @@
                                 <div class="layui-form-item" style="padding:0px;margin:0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
-                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">璋冨叆</label>
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撳簱</label>
                                         </div>
                                         <div class="layui-col-xs6">
                                             <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
@@ -100,7 +100,7 @@
                                 <div class="layui-form-item" style="padding:0px;margin:0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
-                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撲綅</label>
                                         </div>
                                         <div class="layui-col-xs6">
                                             <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
@@ -111,10 +111,10 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                <div class="layui-form-item" style="padding:0px;margin:0px;display: none;">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
-                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">璋冨嚭</label>
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撳簱</label>
                                         </div>
                                         <div class="layui-col-xs6">
                                             <input type="text" name="HSCWHNAME" id="HSCWHNAME" lay-verify="HSCWHNAME" autocomplete="off" class="layui-input">
@@ -125,10 +125,10 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                <div class="layui-form-item" style="padding:0px;margin:0px;display: none;">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
-                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撲綅</label>
                                         </div>
                                         <div class="layui-col-xs6">
                                             <input type="text" name="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" autocomplete="off" class="layui-input">
@@ -622,7 +622,7 @@
             var sSourceType = '-1'
             if (AllowLoadData(sSubStr, 'Saver') != false)//闈炵┖楠岃瘉
             {
-                layer.load(3);
+                var index = layer.load(3);
                 $.ajax(
                 {
                     type: "POST",
@@ -642,10 +642,12 @@
                             }, function () { window.location.reload(); });//鏂板
                         }
                         else {
+                            layer.close(index);
                             layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     },
                     error: function (err) {
+                        layer.close(index);
                         layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
                 });
@@ -685,14 +687,14 @@
                 if (sQty != "") {
                     $('#HQty').val("");
                 }
-                //if ($("#HWHNAME").val() == '') {
-                //    layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                //    return false;
-                //}
-                if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
-                    layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                if ($("#HWHNAME").val() == '') {
+                    layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return false;
                 }
+                //if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
+                //    layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return false;
+                //}
                 //if ($("#HSCWHNAME").val() == '') {
                 //    layer.msg("璋冨嚭浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 //    return false;
@@ -993,10 +995,10 @@
             layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
             return false;
         }
-        if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
-            layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
+        //if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
+        //    layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+        //    return false;
+        //}
         if ($("#HBillNo").val() == '') {
             layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
             return false;

--
Gitblit v1.9.1