From c9362dbd2d0941678eaf41f75e489e311819590d Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 24 十月 2023 20:24:58 +0800
Subject: [PATCH] 销售出库单

---
 WebTM/views/领料发货/销售出库/Kf_SellOutBill.html         | 1332 +++++++++++++++++++++++++++++------------
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user |   10 
 WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html     |  561 ++++++++++-------
 3 files changed, 1,285 insertions(+), 618 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 86f1c07..eab9ecd 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -1443,7 +1443,7 @@
       <publishTime>10/15/2023 20:35:49</publishTime>
     </File>
     <File Include="views/indexMenu.html">
-      <publishTime>08/28/2023 09:22:18</publishTime>
+      <publishTime>10/24/2023 18:01:23</publishTime>
     </File>
     <File Include="views/index_KaiBeiNaiTe.html">
       <publishTime>10/15/2023 20:35:49</publishTime>
@@ -4758,16 +4758,16 @@
       <publishTime>04/11/2023 16:34:43</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html">
-      <publishTime>10/15/2023 20:35:49</publishTime>
+      <publishTime>10/24/2023 20:21:59</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html">
-      <publishTime>10/15/2023 20:35:49</publishTime>
+      <publishTime>10/24/2023 20:21:59</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
-      <publishTime>10/15/2023 20:35:49</publishTime>
+      <publishTime>10/24/2023 20:14:55</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
-      <publishTime>10/15/2023 20:35:49</publishTime>
+      <publishTime>10/24/2023 20:14:55</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_CheckList_New.html">
       <publishTime>06/29/2023 15:20:45</publishTime>
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.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.html"
index f820315..18fd067 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.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.html"
@@ -150,7 +150,6 @@
                                         </div>
 
                                     </div>
-
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">閿�鍞鍗曞彿</label>
@@ -254,10 +253,18 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <div class="layui-row" style="margin-top:10px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
-
-
                             <!--鍒跺崟淇℃伅-->
                             <div class="layui-tab-item">
                                 <div class="layui-form-item">
@@ -269,49 +276,23 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -320,12 +301,38 @@
                                                 <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                        <div class="layui-row">
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
-                                                <div class="layui-input-block" style="margin-left: 120px;">
-                                                    <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
-                                                </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -337,10 +344,12 @@
                     <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                     <script type="text/html" id="toolbarDemo">
                         <div class="layui-btn-container">
-
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InsertLine"><i class="layui-icon layui-icon-form"></i>鎻掑叆涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                         </div>
                     </script>
                     <script type="text/html" id="xuhao">
@@ -370,23 +379,25 @@
                 , table = layui.table
                 , form = layui.form
                 , element = layui.element;
-            var sWhere = "";
-            var date = new Date();
-            var day = date.getDate();
-            var month = date.getMonth() + 1;
-            var year = date.getFullYear();
-            var shijian = year + "-" + month + "-" + day;
 
             var allVal;
+            var HModName = "Kf_SellOutBill";
+
+            //璁板綍缁勭粐鐨勫��
+            var HOrgIDBar = 0;
+
+            //瀛愯〃娓叉煋鍙傛暟
+            var option = {};
             //#endregion
 
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             get_LoginIs();
+            //#endregion
 
-            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            //#region 鑾峰彇椤甸潰璺宠浆鍙傛暟
             var params = get_UrlVars();
             if (typeof (params[params[0]]) == "undefined") {
                 var OperationType = 1;//鎿嶄綔绫诲瀷
@@ -395,17 +406,26 @@
                 var linterid = params[params[1]];//婧愬崟id
                 var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
             }
-            //鍒ゆ柇鎿嶄綔绫诲瀷
-            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+            //#endregion
+
+            //#region 鍒ゆ柇鎿嶄綔绫诲瀷骞跺垵濮嬪寲鐣岄潰
+            if (OperationType == 1) {                                                   //鏃犳簮鍗曟柊澧�
                 $("#HItemID").val(0);
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                //鐢熸垚鍗曟嵁鍙峰拰鍐呯爜
+                get_MAXNum();
             }
-            else if (OperationType == 3) {//缂栬緫
-                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+            else if (OperationType == 3) {                                              //缂栬緫
+                //淇敼鏃朵富琛↖D
+                $("#HInterID").val(linterid);
+
                 //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
                 RoadBillMain(linterid);
             }
-            else if (OperationType == 4) {//娴忚
-                $("#HItemID").val(linterid);//
+            else if (OperationType == 4) {                                              //娴忚
+                $("#HItemID").val(linterid);
+
                 //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
                 RoadBillMain(linterid);
                 $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
@@ -413,20 +433,123 @@
             else {
                 layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
-            $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
-
             //#endregion
+
+
+            //璁剧疆缁勭粐
+            $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
 
             var rowdata = [{
                 "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HWHID": "0", "鍙戣揣浠撳簱": "", "HQtyMust": "0",
                 "HQty": "0", "HQty_Full": "0", "HQty_Empty": "0", "HQty_Back": "0", "HPrice": "0", "HMoney": "0", "HCostPrice": "0", "HCostMoney": "0",
-                "HSalePrice": "0", "HSeOrderInterID": 0,"HSeOrderEntryID":0, "HSeOrderBillNo": "", "HRemark": ""
+                "HSalePrice": "0", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HRemark": ""
             }];
 
-            // 鍒濆鍖栫晫
+            //鍒濆鍖栧瓙琛�
             set_InitGrid();
+            DisPlay_HideColumn();
 
-            //澶村伐鍏锋爮浜嬩欢
+            //鍒濆鍖栫粍缁�
+            Organ();
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 琛ㄥご鎿嶄綔鎸夐挳
+            //#region 閫�鍑烘寜閽�
+            form.on('submit(Exit)', function () {
+                Pub_Close(1);
+            })
+            //#endregion
+
+            //#region 淇濆瓨鎸夐挳
+            form.on('submit(Saver)', function (data) {
+                //if (AllowLoadData(data)) {
+                set_SaveBill(data);
+                //}
+            });
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨寮圭獥浜嬩欢
+            //#region 閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDeptList)', function () {
+                get_checkDept();
+            });
+            //#endregion
+
+            //#region 閫夋嫨涓荤鎸夐挳
+            form.on('submit(HManagerList)', function () {
+                get_checkManager();
+            });
+            //#endregion
+
+            //#region 閫夋嫨涓氬姟鍛樻寜閽�
+            form.on('submit(HEmpList)', function () {
+                get_checkEmp();
+            });
+            //#endregion
+
+            //#region 閫夋嫨鍙戣揣浜烘寜閽�
+            form.on('submit(HSecManagerList)', function () {
+                get_checkSecManager();
+            });
+            //#endregion
+
+            //#region 閫夋嫨淇濈鍛樻寜閽�
+            form.on('submit(HKeeperList)', function () {
+                get_checkKeeper();
+            });
+            //#endregion
+
+            //#region 閫夋嫨瀹㈡埛鎸夐挳
+            form.on('submit(HSupList)', function () {
+                get_checkSup();
+            });
+            //#endregion
+
+            //#region 閫夋嫨浠撳簱鎸夐挳
+            form.on('submit(HWHList)', function () {
+                get_checkWH();
+            });
+            //#endregion
+
+            //#region 閫夋嫨閿�鍞柟寮忔寜閽�
+            form.on('submit(HSellSList)', function () {
+                get_checkSellS();
+            });
+            //#endregion
+
+            //#region 閫夋嫨杩愯緭鏂瑰紡鎸夐挳
+            form.on('submit(HConveyTypeList)', function () {
+                get_checkConveyType();
+            });
+            //#endregion
+
+            //#region 閫夋嫨杩愯緭鍏徃鎸夐挳
+            form.on('submit(HConveyCompList)', function () {
+                get_checkConveyComp();
+            });
+            //#endregion
+
+            //#region 閫夋嫨甯佸埆鎸夐挳
+            form.on('submit(HCurList)', function () {
+                get_checkCur();
+            });
+            //#endregion
+
+            //#endregion
+            
+            //#region 澶嶉�夋鐘舵�佸彉鏇�
+            //#region 鏄惁鍨粯鎸夐挳
+            form.on('checkbox(checkboxHDFflag)', function (data) {
+                $("#HDFflag").val(data.elem.checked);
+            });
+            //#endregion
+            //#endregion
+            
+            //#region 瀛愯〃鐩稿叧鐩戝惉
+            //#region 澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
@@ -438,103 +561,30 @@
                 };
 
                 switch (obj.event) {
-                    case 'btn-AddLine':
-                        table.cache["mainTable"].push(NewRow);
-                        option.data = table.cache["mainTable"];
-
-                        table.render(option);
-                        //鍒锋柊澶嶉�夋
-                        //checkRefresh();
+                    //鏂板涓�琛�
+                    case 'btn-AddLine': btnAddLine(NewRow);
                         break;
-                    case 'btn-CopyLine':
-                        var copydata = JSON.stringify(data);
-                        if (data.length <= 0) {
-                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
-                        }
-                        else if (data.length > 1) {
-                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
-                        }
-                        else {
-                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
-                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
-                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
-                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
-                            //鍒锋柊澶嶉�夋
-                            //checkRefresh();
-                        }
+                    //澶嶅埗涓�琛�
+                    case 'btn-CopyLine': btnCopyLine(data);
                         break;
-                    ////鍒楄缃�
-                    //case 'set_HideColumn':
-                    //    get_HideColumn();
-                    //    break;
+                    //鎸囧畾浣嶇疆涓嬫彃鍏ヤ竴琛�
+                    case 'btn-InsertLine': btnInsertLine(NewRow)
+                        break;
+                    //涓婄Щ
+                    case 'btn-Up': btn_up();
+                        break;
+                    //涓嬬Щ
+                    case 'btn-Under': btn_under();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn();
+                        break;
                 }
             });
-
-            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
-            //閫�鍑烘寜閽�
-            form.on('submit(Exit)', function () {
-                Pub_Close(1);
-            })
-
-            //閫夋嫨涓氬姟鍛樻寜閽�
-            form.on('submit(HEmpList)', function () {
-                get_checkEmp();
-            });
-            //閫夋嫨瀹㈡埛鎸夐挳
-            form.on('submit(HSupList)', function () {
-                get_checkSup();
-            });
-            //閫夋嫨浠撳簱鎸夐挳
-            form.on('submit(HWHList)', function () {
-                get_checkWH();
-            });
-            //閫夋嫨甯佸埆鎸夐挳
-            form.on('submit(HCurList)', function () {
-                get_checkCur();
-            });
-
-            //閫夋嫨閮ㄩ棬鎸夐挳
-            form.on('submit(HDeptList)', function () {
-                get_checkDept();
-            });
-            //鏄惁鍨粯鎸夐挳
-            form.on('checkbox(checkboxHDFflag)', function (data) {
-                $("#HDFflag").val(data.elem.checked);
-            });
-            //閫夋嫨涓荤鎸夐挳
-            form.on('submit(HManagerList)', function () {
-                get_checkManager();
-            });
-            //閫夋嫨閿�鍞柟寮忔寜閽�
-            form.on('submit(HSellSList)', function () {
-                get_checkSellS();
-            });
-            //閫夋嫨鍙戣揣浜烘寜閽�
-            form.on('submit(HSecManagerList)', function () {
-                get_checkSecManager();
-            });
-            //閫夋嫨淇濈鍛樻寜閽�
-            form.on('submit(HKeeperList)', function () {
-                get_checkKeeper();
-            });
-            //閫夋嫨杩愯緭鏂瑰紡鎸夐挳
-            form.on('submit(HConveyTypeList)', function () {
-                get_checkConveyType();
-            });
-            //閫夋嫨杩愯緭鍏徃鎸夐挳
-            form.on('submit(HConveyCompList)', function () {
-                get_checkConveyComp();
-            });
-
-
-            //淇濆瓨鎸夐挳
-            form.on('submit(Saver)', function (data) {
-                set_SaveBill(data);
-            });
-
-            //琛屽唴浜嬩欢
+            //#endregion
+            
+            //#region 琛屽唴浜嬩欢
             table.on('tool(mainTable)', function (obj) {
                 set_GridDelete(obj);   //琛屽唴鍒犻櫎
                 set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
@@ -564,7 +614,11 @@
                 }
             });
             //#endregion
-            
+            //#endregion
+
+            //#endregion
+
+
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
 
             //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
@@ -577,6 +631,267 @@
             }
             //#endregion
 
+            //#region 鑾峰彇鏈�澶у崟鎹彿
+            function get_MAXNum() {
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '1205' },
+                    success: function (d) {
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HInterID").val(d.data[0].HInterID);
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HOrgID").append(Organization);
+                            if (OperationType == 1 || OperationType == 4) {
+                                HOrgIDBar = sessionStorage["OrganizationID"];
+                            }
+                            $("#HOrgID").val(HOrgIDBar);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 寮圭獥閫夋嫨鏂规硶
+            //#region 閫夋嫨閮ㄩ棬
+            function get_checkDept() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    //, btn: ['纭畾', '鍙栨秷']
+                    //, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    //    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    //    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    //    if (checkStatus.data.length === 0) {
+                    //        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    //    }
+                    //    $("#HDeptName").val(checkStatus.data[0].HName);
+                    //    $("#HDeptID").val(checkStatus.data[0].HItemID);
+                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    //}
+                    //, btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨涓荤
+            function get_checkManager() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '涓荤鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes']
+                    //, btn: ['纭畾', '鍙栨秷']
+                    //, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    //    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    //    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    //    if (checkStatus.data.length === 0) {
+                    //        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    //    }
+                    //    $("#HManagerName").val(checkStatus.data[0].HName);
+                    //    $("#HManagerID").val(checkStatus.data[0].HItemID);
+                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    //}
+                    //, btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨涓氬姟鍛�
+            function get_checkEmp() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '涓氬姟鍛樺垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+                    //, btn: ['纭畾', '鍙栨秷']
+                    //, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    //    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    //    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    //    if (checkStatus.data.length === 0) {
+                    //        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    //    }
+                    //    $("#HEmpName").val(checkStatus.data[0].HName);
+                    //    $("#HEmpID").val(checkStatus.data[0].HItemID);
+                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    //}
+                    //, btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨鍙戣揣浜�
+            function get_checkSecManager() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鍙戣揣浜哄垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨淇濈鍛�
+            function get_checkKeeper() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '淇濈鍛樺垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨瀹㈡埛
+            function get_checkSup() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '瀹㈡埛鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
+                    //, btn: ['纭畾', '鍙栨秷']
+                    //, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    //    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    //    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    //    if (checkStatus.data.length === 0) {
+                    //        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    //    }
+                    //    $("#HCusName").val(checkStatus.data[0].HName);
+                    //    $("#HCusID").val(checkStatus.data[0].HItemID);
+                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    //}
+                    //, btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨浠撳簱
+            function get_checkWH() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '浠撳簱鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+                    //, btn: ['纭畾', '鍙栨秷']
+                    //, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    //    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    //    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    //    if (checkStatus.data.length === 0) {
+                    //        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    //    }
+                    //    $("#HWHName").val(checkStatus.data[0].HName);
+                    //    $("#HWHID").val(checkStatus.data[0].HItemID);
+                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    //}
+                    //, btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨閿�鍞柟寮�
+            function get_checkSellS() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閿�鍞柟寮忓垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_SellStyle.html', 'yes']
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨杩愯緭鏂瑰紡
+            function get_checkConveyType() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '杩愯緭鏂瑰紡鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ConveyTypeList.html', 'yes']
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨杩愯緭鍏徃
+            function get_checkConveyComp() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '杩愯緭鍏徃鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ConveyCompList.html', 'yes']
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨甯佸埆
+            function get_checkCur() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '甯佸埆鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCurName").val(checkStatus.data[0].璐у竵鍚嶇О);
+                        $("#HCurID").val(checkStatus.data[0].HItemID);
+                        $("#HExRate").val(checkStatus.data[0].姹囩巼);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            //#endregion
+
+            //#region 瀛愯〃鍒濆鍖�
             function set_InitGrid() {
                 option = {
                     elem: '#mainTable'
@@ -616,13 +931,15 @@
                 option.data = rowdata;
                 table.render(option);
             }
+            //#endregion
 
-            //#region 鍔犺浇琛ㄥご
+            //#region 缂栬緫椤甸潰鍒濆鍖�
             function RoadBillMain(linterid) {
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 var ajaxLoad = layer.load();
                 $.ajax({
                     url: GetWEBURL() + "Kf_SellOutBill/cx",
+                    async:false,
                     type: "GET",
                     data: {
                         "HInterID": linterid
@@ -631,7 +948,7 @@
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             allVal = result.data[0];
                             var data = result.data[0];
-                           
+
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HBillNo": data.鍗曟嵁鍙�
                                 , "HDate": formatDate(data.鏃ユ湡)
@@ -660,21 +977,25 @@
                                 , "HCarriage": data.杩愯垂
                                 , "HRemark": data.琛ㄥご澶囨敞
                                 , "HExplanation": data.鎽樿
-                               
+
                                 , "HCurID": data.HCurID
                                 , "HCurName": data.甯佸埆
                                 , "HSourceBillType": data.婧愬崟绫诲瀷
                                 , "HLinkMan": data.鑱旂郴浜�
-                                , "HLinkPhone": data.鑱旂郴鐢佃瘽                                                          
+                                , "HLinkPhone": data.鑱旂郴鐢佃瘽
                                 , "HMaker": data.鍒跺崟浜�
+                                , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(data.鍒跺崟鏃ユ湡), "yyyy-MM-dd")
+                                , "HUpDater": data.淇敼浜�
+                                , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : Format(new Date(data.淇敼鏃ユ湡), "yyyy-MM-dd")
                                 , "HChecker": data.瀹℃牳浜�
+                                , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd")
                                 , "HCloseMan": data.鍏抽棴浜�
-                                , "HMakeDate": data.鍒跺崟鏃ユ湡
-                                , "HCheckDate": data.瀹℃牳鏃ユ湡
-                                , "HCloseDate": data.鍏抽棴鏃ユ湡
-                                , "HUpDateDate": data.淇敼鏃ユ湡
-                                , "HDeleteDate": data.浣滃簾鏃ユ湡
+                                , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(data.鍏抽棴鏃ユ湡), "yyyy-MM-dd")
+                                , "HDeleteMan": data.浣滃簾浜�
+                                , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
                             });
+
+                            HOrgIDBar = data.HOrgID == null ? 0 : data.HOrgID;
 
                             //瀛愯〃  璧嬪��
                             var rowdata = [];
@@ -705,33 +1026,7 @@
                 });
             }
             //#endregion
-            var date = new Date();
-            var day = date.getDate();
-            var month = date.getMonth() + 1;
-            var year = date.getFullYear();
-            var shijian = year + "-" + month + "-" + day;
 
-            //鍒ゆ柇鏄惁鏂板
-            if (linterid == null || linterid == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val("0");
-                $("#HBillNo").val("");
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '1205' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HDate").val(shijian);
-                        $("#HInterID").val(d.data[0].HInterID);
-                    }
-                });
-            }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                RoadBillMain(linterid);
-                /* RoadBillSub(linterid);*/
-            }
             //#region 淇濆瓨鏂规硶
             function set_SaveBill(data) {
 
@@ -775,7 +1070,235 @@
             }
             //#endregion
 
-            //琛屽唴蹇嵎閿瓫閫�
+            //#region 鏁版嵁鏍¢獙
+            function AllowLoadData(data) {
+                //鏁板�兼牸寮忔牎楠屽伐鍏�
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var temp = "";
+
+                //#region 琛ㄥご鏁版嵁妫�楠�
+                if ($("#HBillNo").val() == "") {
+                    layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+                    return false;
+                }
+
+                if ($("#HDate").val() == "") {
+                    layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+                    return false;
+                }
+
+                if ($("#HDeptID").val() == "0") {
+                    layer.msg("閮ㄩ棬鏈�夋嫨!");
+                    return false;
+                }
+
+                if ($("#HCusID").val() == "0") {
+                    layer.msg("瀹㈡埛鏈�夋嫨!");
+                    return false;
+                }
+
+                if ($("#HEmpID").val() == "0") {
+                    layer.msg("涓氬姟鍛樻湭閫夋嫨!");
+                    return false;
+                }
+
+                if ($("#HCurID").val() == "0") {
+                    layer.msg("甯佸埆鏈�夋嫨!");
+                    return false;
+                }
+
+                if ($("#HMangerID").val() == "0") {
+                    layer.msg("涓荤鏈�夋嫨!");
+                    return false;
+                }
+
+                if ($("#HSSID").val() == "0") {
+                    layer.msg("缁撶畻鏂瑰紡鏈�夋嫨!");
+                    return false;
+                }
+
+                if ($("#HPayCusID").val() == "0") {
+                    layer.msg("缁撶畻鏂规湭閫夋嫨!");
+                    return false;
+                }
+
+                if ($("#HDate").val() == "") {
+                    layer.msg("鏃ユ湡鏈缃�!");
+                    return false;
+                }
+
+                if ($("#HSSDate").val() == "") {
+                    layer.msg("缁撶畻鏃ユ湡鏈缃�!");
+                    return false;
+                }
+
+                temp = $("HExRate").val() + "";
+                if (temp == 0) {
+                    layer.msg("姹囩巼涓嶈兘涓�0!");
+                    return false;
+                } else if (!ref.test(temp)) {
+                    layer.msg("姹囩巼璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                    return false;
+                }
+                //#endregion
+
+                //#region 瀛愯〃 鏁版嵁妫�楠�
+                for (var i = 0; i < option.data.length; i++) {
+                    if (option.data[i]["HMaterID"] == "0") {
+                        layer.msg("绗�" + i + "琛岋細鐗╂枡鏈�夋嫨锛�");
+                        return false;
+                    }
+
+                    if (option.data[i]["HUnitID"] == "0") {
+                        layer.msg("绗�" + i + "琛岋細璁¢噺鍗曚綅鏈�夋嫨锛�");
+                        return false;
+                    }
+
+                    if (option.data[i]["HDate"] == "") {
+                        layer.msg("绗�" + i + "琛岋細浜よ揣鏃ユ湡涓嶈兘涓虹┖锛�");
+                        return false;
+                    }
+
+                    //鏁伴噺鏍煎紡鏍¢獙
+                    temp = option.data[i]["HQty"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + i + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + i + "琛岋細鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //涓嶅惈绋庡崟浠锋牸寮忔牎楠�
+                    temp = option.data[i]["HPrice"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + i + "琛岋細涓嶅惈绋庡崟浠蜂笉鑳戒负0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + i + "琛岋細涓嶅惈绋庡崟浠疯杈撳叆澶т簬0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //鍚◣鍗曚环鏍煎紡鏍¢獙
+                    temp = option.data[i]["HTaxPrice"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + i + "琛岋細鍚◣鍗曚环涓嶈兘涓�0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + i + "琛岋細鍚◣鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //閲戦鏍煎紡鏍¢獙
+                    temp = option.data[i]["HMoney"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + i + "琛岋細閲戦涓嶈兘涓�0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + i + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //鎶樻墸鐜囨牸寮忔牎楠�
+                    temp = option.data[i]["HDiscountRate"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + i + "琛岋細鎶樻墸鐜囦笉鑳戒负0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + i + "琛岋細鎶樻墸鐜囪杈撳叆澶т簬0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //瀹為檯鍚◣鍗曚环鏍煎紡鏍¢獙
+                    temp = option.data[i]["HRelTaxPrice"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + i + "琛岋細瀹為檯鍚◣鍗曚环涓嶈兘涓�0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + i + "琛岋細瀹為檯鍚◣鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //绋庣巼鏍煎紡鏍¢獙
+                    temp = option.data[i]["HTaxRate"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + i + "琛岋細绋庣巼涓嶈兘涓�0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + i + "琛岋細绋庣巼璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //绋庨鏍煎紡鏍¢獙
+                    temp = option.data[i]["HTaxMoney"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + i + "琛岋細绋庨涓嶈兘涓�0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + i + "琛岋細绋庨璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //浠风◣鍚堣鏍煎紡鏍¢獙
+                    temp = option.data[i]["HlineTotal"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + i + "琛岋細浠风◣鍚堣涓嶈兘涓�0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + i + "琛岋細浠风◣鍚堣璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //鏈綅甯佷环绋庡悎璁℃牸寮忔牎楠�
+                    temp = option.data[i]["HlineTotalBB"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + i + "琛岋細鏈綅甯佷环绋庡悎璁′笉鑳戒负0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + i + "琛岋細鏈綅甯佷环绋庡悎璁¤杈撳叆澶т簬0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //鍑哄簱鏁伴噺鏍煎紡鏍¢獙
+                    temp = option.data[i]["HOutStockQty"] + "";
+                    if (!ref.test(temp)) {
+                        layer.msg("绗�" + i + "琛岋細鍑哄簱鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //寮�绁ㄦ暟閲忔牸寮忔牎楠�
+                    temp = option.data[i]["HInvoiceQty"] + "";
+                    if (!ref.test(temp)) {
+                        layer.msg("绗�" + i + "琛岋細寮�绁ㄦ暟閲忚杈撳叆澶т簬0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+                }
+                //#endregion
+
+                //#region 瀛愯〃 鍏抽敭瀛楅噸澶嶆牎楠�
+                var num = [];
+                for (var i = 0; i < option.data.length; i++) {
+                    if ($.inArray(option.data[i]["HMaterID"], num) == -1) {
+                        num.push(option.data[i]["HMaterID"]);
+                    } else {
+                        layer.msg("绗�" + (i + 1) + "琛�,鐗╂枡:" + option.data[i]["HMaterID"] + "閲嶅!");
+                        return false;
+                    }
+                }
+                //#endregion
+                return true;
+            }
+            //#endregion
+
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+            function ReRoadBillMain() {
+                location.replace('Add_Edit_Xs_SeOutStockBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            //#endregion
+
+            //#region 琛屽唴蹇嵎閿瓫閫�
             function set_GridCellCheck(obj) {
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                     if (event.key == "F7") {
@@ -906,8 +1429,9 @@
                     }
                 })
             }
+            //#endregion
 
-            //琛屽唴鍒犻櫎
+            //#region 琛屽唴鍒犻櫎
             function set_GridDelete(obj) {
                 var data = obj.data;
                 var rowIndex = $(obj.tr).attr("data-index");
@@ -925,206 +1449,240 @@
                     });
                 }
             }
+            //#endregion
 
-            function get_checkEmp() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '涓氬姟鍛樺垪琛�'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
-                    //, btn: ['纭畾', '鍙栨秷']
-                    //, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                    //    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                    //    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                    //    if (checkStatus.data.length === 0) {
-                    //        return layer.msg('璇烽�夋嫨鏁版嵁');
-                    //    }
-                    //    $("#HEmpName").val(checkStatus.data[0].HName);
-                    //    $("#HEmpID").val(checkStatus.data[0].HItemID);
-                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    //}
-                    //, btn2: function (index, layero) { }
-                })
-            }
-            function get_checkSup() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '瀹㈡埛鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
-                    //, btn: ['纭畾', '鍙栨秷']
-                    //, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                    //    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                    //    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                    //    if (checkStatus.data.length === 0) {
-                    //        return layer.msg('璇烽�夋嫨鏁版嵁');
-                    //    }
-                    //    $("#HCusName").val(checkStatus.data[0].HName);
-                    //    $("#HCusID").val(checkStatus.data[0].HItemID);
-                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    //}
-                    //, btn2: function (index, layero) { }
-                })
-            }
-            function get_checkWH() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '浠撳簱鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
-                    //, btn: ['纭畾', '鍙栨秷']
-                    //, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                    //    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                    //    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                    //    if (checkStatus.data.length === 0) {
-                    //        return layer.msg('璇烽�夋嫨鏁版嵁');
-                    //    }
-                    //    $("#HWHName").val(checkStatus.data[0].HName);
-                    //    $("#HWHID").val(checkStatus.data[0].HItemID);
-                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    //}
-                    //, btn2: function (index, layero) { }
-                })
-            }
-            function get_checkCur() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '甯佸埆鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html', 'yes']
-                    , btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HCurName").val(checkStatus.data[0].璐у竵鍚嶇О);
-                        $("#HCurID").val(checkStatus.data[0].HItemID);
-                        $("#HExRate").val(checkStatus.data[0].姹囩巼);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            }
-
-            function get_checkDept() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
-                    //, btn: ['纭畾', '鍙栨秷']
-                    //, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                    //    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                    //    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                    //    if (checkStatus.data.length === 0) {
-                    //        return layer.msg('璇烽�夋嫨鏁版嵁');
-                    //    }
-                    //    $("#HDeptName").val(checkStatus.data[0].HName);
-                    //    $("#HDeptID").val(checkStatus.data[0].HItemID);
-                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    //}
-                    //, btn2: function (index, layero) { }
-                })
-            }
-
-            function get_checkManager() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '涓荤鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes']
-                    //, btn: ['纭畾', '鍙栨秷']
-                    //, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                    //    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                    //    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                    //    if (checkStatus.data.length === 0) {
-                    //        return layer.msg('璇烽�夋嫨鏁版嵁');
-                    //    }
-                    //    $("#HManagerName").val(checkStatus.data[0].HName);
-                    //    $("#HManagerID").val(checkStatus.data[0].HItemID);
-                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    //}
-                    //, btn2: function (index, layero) { }
-                })
-            }
-
-            function get_checkSellS() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '閿�鍞柟寮忓垪琛�'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_SellStyle.html', 'yes']
-                })
-            }
-
-            function get_checkSecManager() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '鍙戣揣浜哄垪琛�'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                })
-            }
-
-            function get_checkKeeper() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '淇濈鍛樺垪琛�'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                })
-            }
-
-            function get_checkConveyType() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '杩愯緭鏂瑰紡鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ConveyTypeList.html', 'yes']
-                })
-            }
-
-            function get_checkConveyComp() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '杩愯緭鍏徃鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ConveyCompList.html', 'yes']
-                })
-            }
-
-            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
-            function ReRoadBillMain() {
-                location.replace('Add_Edit_Xs_SeOutStockBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
-                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
-                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            //#region 鍦ㄦ湯灏惧鍔犱竴琛�
+            function btnAddLine(NewRow) {
+                table.cache["mainTable"].push(NewRow);
+                option.data = table.cache["mainTable"];
+                table.render(option);
+                //rows++;
+                layer.msg('澧炲姞涓�琛屾寜閽紒')
             }
             //#endregion
 
+            //#region 鍦ㄦ寚瀹氳涓嬫彃鍏ヤ竴琛�
+            function btnInsertLine(NewRow) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var tables = [];                                    //瀛樺偍鎻掑叆涓�琛屽悗鐨勮〃鏍兼暟鎹�
+                    //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+                    var rowList = table.cache['mainTable'];
+                    for (var i = 0; i < rowList.length; i++) {          //閬嶅巻琛ㄦ牸鐨勮
+                        tables.push(option.data[i]);
+                        if (rowList[i].LAY_CHECKED == true) {           //鑾峰彇閫変腑琛岀殑浣嶇疆
+                            tables.push(NewRow);
+                        }
+                    }
+                    option.data = tables;
+                    table.render(option);
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 澶嶅埗涓�琛�
+            function btnCopyLine(data) {
+                var copydata = JSON.stringify(data);
+                if (data.length <= 0) {
+                    layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                }
+                else if (data.length > 1) {
+                    layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                }
+                else {
+                    var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                    var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                    table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                    option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                    //璁剧疆澶嶅埗寰楀埌鐨勮褰曠殑瀹為檯绉伴噸涓�0
+                    option.data[option.data.length - 1].HWeight = "0";
+
+                    table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                }
+            }
+            //#endregion
+
+            //#region 涓婄Щ
+            function btn_up() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length == 1) {
+                    var tables = [];
+                    //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+                    var rowList = table.cache['mainTable'];
+                    for (var i = 0; i < rowList.length; i++) {          //閬嶅巻琛ㄦ牸鐨勮
+                        if (rowList[i].LAY_CHECKED == true) {           //鑾峰彇閫変腑琛岀殑浣嶇疆
+                            //濡傛灉鏄涓�琛屼笂绉伙紝鍒欏け璐ュ苟鎻愰啋
+                            if (i == 0) {
+                                layer.msg("绗竴琛屾暟鎹棤娉曚笂绉伙紒");
+                                return;
+                            }
+                            tables.push(option.data[i - 1]);
+                            data[0].LAY_CHECKED = true;
+                            option.data[i - 1] = data[0];
+                            option.data[i] = tables[0];
+                            table.render(option);
+                            break;
+                        }
+                    }
+                } else {
+                    layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+                }
+            }
+            //#endregion
+
+            //#region 涓嬬Щ
+            function btn_under() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length == 1) {
+                    var tables = [];
+                    //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+                    var rowList = table.cache['mainTable'];
+                    for (var i = 0; i < rowList.length; i++) {          //閬嶅巻琛ㄦ牸鐨勮
+                        if (rowList[i].LAY_CHECKED == true) {           //鑾峰彇閫変腑琛岀殑浣嶇疆
+                            //濡傛灉鏄渶鍚庝竴琛屼笅绉伙紝鍒欏け璐ュ苟鎻愰啋
+                            if (i == option.data.length - 1) {
+                                layer.msg("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉伙紒");
+                                return;
+                            }
+
+
+                            tables.push(option.data[i + 1]);
+                            data[0].LAY_CHECKED = true;
+                            option.data[i + 1] = data[0];
+                            option.data[i] = tables[0];
+                            table.render(option);
+                            break;
+                        }
+                    }
+                } else {
+                    layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+                }
+            }
+            //#endregion
+
+            //#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+            //#region 瀛愯〃1锛氭樉绀哄垪鏁版嵁
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    async: false,
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = ["HMaterID", "HUnitID", "HWHID", "HSeOrderInterID", "HSeOrderEntryID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            //titleData = [];
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] += "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
             //#endregion
 
 
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_SellOutBillList.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_SellOutBillList.html"
index e6839b0..c6fccd8 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_SellOutBillList.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_SellOutBillList.html"
@@ -117,16 +117,17 @@
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-BarCodeDetail" id="btn-BarCodeDetail"><i class="layui-icon layui-icon-logout"></i>鏉$爜鏄庣粏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-BarCodeDetail" id="btn-BarCodeDetail"><i class="layui-icon layui-icon-logout"></i>鏉$爜鏄庣粏</button>-->
+
                             </div>
                         </script>
                     </form>
@@ -144,6 +145,7 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -156,14 +158,15 @@
             //鏌ヨ鏉′欢
             var sWhere = "";
             var option = [];
-            var HModName = "Kf_SellOutBill";
+            var HModName = "Kf_SellOutBillList";
             var HBillType = "1205";
-
-            //鍒濆鍖栫晫闈�
-            set_ClearBill();
-
             //#endregion
 
+            //#region 鍔犺浇椤甸潰
+            set_ClearBill();
+            //#endregion
+
+            //#region 浜嬩欢鐩戝惉
             //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
                 //娓呯┖杩囨护鏉′欢
@@ -177,6 +180,120 @@
             });
             //#endregion
 
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-Add':
+                        set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btn-Edit':
+                        set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete':
+                        set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //瀹℃牳
+                    case 'set_CheckBill': set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍�
+                    case 'set_AbandonCheck': set_CheckBill(1);
+                        break;
+                    //鍏抽棴
+                    case 'set_CloseBill': set_CloseBill(0);
+                        break;
+                    //鍙嶅叧闂�
+                    case 'set_CancelCloseBill': set_CloseBill(1);
+                        break;
+                    //浣滃簾鎸夐挳       
+                    case 'set_Drop': set_DropBill(0);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'set_DeDrop': set_DropBill(1);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //闅愯棌鍒楄缃�
+                    case 'HideColumn':
+                        get_HideColumn();
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                    //鏉$爜鏄庣粏
+                    case 'btn-BarCodeDetail': get_BarCodeDetail();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 鍙屽嚮杩涘叆缂栬緫
+            table.on('rowDouble(mainTable)', function (obj) {
+                //閫変腑楂樹寒 鍙屽嚮琛�
+                obj.tr.find(':checkbox').prop('checked', true);
+                obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = true;
+                    }
+                });
+
+                var hID = obj.data["hmainid"];
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '缂栬緫閿�鍞嚭搴撳崟'
+                    , closeBtn: 1
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: '../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+                    , resize: false,
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        $("#btnSearch").trigger('click');
+                    }
+                    , cancel: function () {
+                        
+                    }
+                })
+            });
+            //#endregion
+            //#endregion
+
+            //#region 椤甸潰鍏跺畠鏂规硶
             //#region 鍒濆鍖栫晫闈�
             function set_ClearBill() {
                 //鍒濆鍖栬〃鏍�
@@ -186,6 +303,7 @@
                 DisPlay_HideColumn();
             }
             //#endregion
+
             //#region 鍒濆鍖栬〃鏍兼柟娉�
             $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
             $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -201,7 +319,7 @@
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
                        ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
-                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
                         , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 160 }
                         , { field: 'hsupid', title: 'hsupid', width: 200, hide: true }
@@ -242,7 +360,9 @@
                     ]]
                 };
             }
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
             function get_Display(sWhere) {
                 var ajaxLoad = layer.load();
                 $.ajax({
@@ -251,6 +371,16 @@
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
+                            //澶勭悊鏌ヨ缁撴灉
+                            //for (var i = 0; i < data1.data.length; i++) {
+                            //    data1.data[i]["鏃ユ湡"] = Format(new Date(data1.data[i]["鏃ユ湡"]), "yyyy-MM-dd");
+                            //    data1.data[i]["鍒跺崟鏃ユ湡"] = (data1.data[i]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(data1.data[i]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd") );
+                            //    data1.data[i]["淇敼鏃ユ湡"] = (data1.data[i]["淇敼鏃ユ湡"] == null ? "" : Format(new Date(data1.data[i]["淇敼鏃ユ湡"]), "yyyy-MM-dd") );
+                            //    data1.data[i]["瀹℃牳鏃ユ湡"] = (data1.data[i]["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data1.data[i]["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd") );
+                            //    data1.data[i]["鍏抽棴鏃ユ湡"] = (data1.data[i]["鍏抽棴鏃ユ湡"] == null ? "" : Format(new Date(data1.data[i]["鍏抽棴鏃ユ湡"]), "yyyy-MM-dd") );
+                            //    data1.data[i]["浣滃簾鏃ユ湡"] = (data1.data[i]["浣滃簾鏃ユ湡"] == null ? "" : Format(new Date(data1.data[i]["浣滃簾鏃ユ湡"]), "yyyy-MM-dd") );
+                            //}
+
                             option.data = data1.data;
                             table.render(option);
                             layer.close(ajaxLoad);
@@ -272,166 +402,7 @@
                     }
                 });
             }
-            //澶村伐鍏锋爮浜嬩欢
-            table.on('toolbar(mainTable)', function (obj) {
-                var checkStatus = table.checkStatus(obj.config.id);
-                switch (obj.event) {
-                    case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板閿�鍞嚭搴撳崟',
-                            closeBtn: 1,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
-                        break;
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫閫�璐ч�氱煡鍗�'
-                                , closeBtn: 1
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
-                        break;
-                    case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var InterID = data[0].hmainid.toString();
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "Kf_SellOutBill/DeltetSellOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"]},
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }, error: function () {
-                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                    }
-                                });
-                            })
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
-                        break;
-                    //鍒锋柊
-                    case 'get_Refresh': get_Refresh();
-                        break;
-                    //閫�鍑烘寜閽�
-                    case 'get_Exit': Pub_Close(2);
-                        break;
-                    //闅愯棌鍒楄缃�
-                    case 'HideColumn':
-                        get_HideColumn();
-                        break;
-                    //鎸夐挳璁剧疆
-                    case 'set_HideButton':
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-                        break;
-                    case 'btn-BarCodeDetail': get_BarCodeDetail();
-                        break;
-                    //瀹℃牳
-                    case 'set_CheckBill': set_CheckBill(1);
-                        break;
-                    //鍙嶅鏍�
-                    case 'set_AbandonCheck': set_CheckBill(2);
-                        break;
-                    //鍏抽棴
-                    case 'set_CloseBill': set_CloseBill(1);
-                        break;
-                    //鍙嶅叧闂�
-                    case 'set_CancelCloseBill': set_CloseBill(2);
-                        break;
-                    //浣滃簾鎸夐挳       
-                    case 'set_Drop': set_DropBill(1);
-                        break;
-                    //鍙嶄綔搴熸寜閽�
-                    case 'set_DeDrop': set_DropBill(2);
-                        break;
-                };
-            });
-
-            //鏉$爜鏄庣粏
-            function get_BarCodeDetail() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var HInterID = data[0].hmainid;
-                    var HBillType = '1205';
-                    var HBillNo = data[0]["鍗曟嵁鍙�"];
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                    layer.open({
-                        type: 2
-                        , area: ['90%', '90%']
-                        , title: '閿�鍞嚭搴撳崟鏉$爜鏄庣粏'
-                        , closeBtn: 1
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../../鏉$爜鏄庣粏/Kf_BarCodeDetailQuery.html?HInterID=' + HInterID + '&HBillType=' + HBillType + '&HBillNo=' + HBillNo
-                        , resize: false
-                        , btn: ["纭畾", "鍙栨秷"]
-                        , end: function () {
-                            //鍒锋柊椤甸潰,
-                            //location.reload();
-                        }
-                        , cancel: function () {
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
-                        }
-                    })
-
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            }
+            //#endregion
 
             //#region 蹇�熻繃婊�
             function get_FastQuery(table, option) {
@@ -488,6 +459,7 @@
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
             //#endregion
+
             //#region 閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
                 $("#HBeginDate").val("");//寮�濮嬫棩鏈�
@@ -504,81 +476,142 @@
             }
             //#endregion
 
-            //#region 鍒锋柊
-            function get_Refresh() {
-                set_ClearQuery();
-                get_Display(sWhere);
+            //#region 鏉$爜鏄庣粏
+            function get_BarCodeDetail() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid;
+                    var HBillType = '1205';
+                    var HBillNo = data[0]["鍗曟嵁鍙�"];
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['90%', '90%']
+                        , title: '閿�鍞嚭搴撳崟鏉$爜鏄庣粏'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../鏉$爜鏄庣粏/Kf_BarCodeDetailQuery.html?HInterID=' + HInterID + '&HBillType=' + HBillType + '&HBillNo=' + HBillNo
+                        , resize: false
+                        , btn: ["纭畾", "鍙栨秷"]
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            $("#btnSearch").trigger('click');
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
             }
             //#endregion
 
-            //瀹℃牳/鍙嶅鏍�
-            function set_CheckBill(num) {
+            //#region 鏂板
+            function set_AddNew() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板閿�鍞嚭搴撳崟',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        $("#btnSearch").trigger('click');
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
-
-                if (data.length == 1) {
-                    layer.confirm("纭瑕佸鏍稿悧?", function (index) {
-                        var wait = layer.load();
-                        var HInterID = data[0].hmainid;
-                        $.ajax({
-                            url: GetWEBURL() + '/Kf_SellOutBill/CheckKf_SellOutBill',
-                            type: "GET",
-                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
-                            success: function (result) {
-                                if (result.count == 1) {
-                                    get_FastQuery();
-                                    layer.msg(result.Message, { icon: 1 });
-                                    layer.close(wait);
-                                } else {
-                                    layer.alert(result.code + result.Message, { icon: 5 });
-                                    layer.close(wait);
-                                }
-                            }, error: function () {
-                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                layer.close(wait);
-                            }
-                        });
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫閿�鍞嚭搴撳崟'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            $("#btnSearch").trigger('click');
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
                     })
-                } else {
-                    layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
-                }
-            }           
 
-            //鍏抽棴/鍙嶅叧闂�
-            function set_CloseBill(num) {
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
-
-                if (data.length == 1) {
-                    layer.confirm("纭瑕佸叧闂悧?", function (index) {
-                        var wait = layer.load();
-                        var HInterID = data[0].hmainid;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
                         $.ajax({
-                            url: GetWEBURL() + '/Kf_SellOutBill/CloseKf_SellOutBill',
                             type: "GET",
-                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                            url: GetWEBURL() + "Kf_SellOutBill/DeltetSellOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
-                                    layer.msg(result.Message, { icon: 1 });
-                                    layer.close(wait);
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        $("#btnSearch").trigger('click');
+                                    });
+
                                 } else {
                                     layer.alert(result.code + result.Message, { icon: 5 });
-                                    layer.close(wait);
                                 }
                             }, error: function () {
                                 layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                layer.close(wait);
                             }
                         });
                     })
                 }
                 else {
-                    layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
                 }
-            }           
+            }
+            //#endregion
 
-            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
-            function set_DropBill(num) {
+            //#region 鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
@@ -586,8 +619,8 @@
                     //閫昏緫瀹℃牳鏂规硶
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "/Kf_SellOutBill/CancellKf_SellOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        url: GetWEBURL() + "/Kf_SellOutBill/AuditKf_SellOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
                         success: function (result) {
                             if (result.count == 1) {
                                 layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -613,8 +646,79 @@
             }
             //#endregion
 
+            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Kf_SellOutBill/CloseKf_SellOutBill_1", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
 
-            //闅愯棌鍒楄缃�
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Kf_SellOutBill/DeleteKf_SellOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹綔搴燂紒');
+                }
+            }
+            //#endregion
+
+            //#region 闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";
                 for (var i = 1; i < option.cols[0].length - 1; i++) {
@@ -640,8 +744,9 @@
                     }
                 })
             }
+            //#endregion
 
-            //鏄剧ず鍒楁暟鎹�
+            //#region 鏄剧ず鍒楁暟鎹�
             function DisPlay_HideColumn() {
                 $.ajax({
                     url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
@@ -722,8 +827,9 @@
                     }
                 })
             }
+            //#endregion
 
-            //鍒楁槑鏄剧ず涓嬫媺妗�
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
                 for (var i = 1; i < option.cols[0].length; i++) {
@@ -735,6 +841,9 @@
                 $("#ColName").append(Organization);
                 form.render('select');
             }
+            //#endregion
+
+            //#endregion
             //浠ヤ笂鏄痩ayui妯″潡
         });
 

--
Gitblit v1.9.1