From d33f1177a2057180d9db3e75894e86bc4fff67c0 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 24 六月 2024 15:47:55 +0800
Subject: [PATCH] 1

---
 WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html |  592 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 532 insertions(+), 60 deletions(-)

diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 544b683..b196b59 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -53,6 +53,13 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
+                                    <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+                                    <div class="layui-input-block">
+                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
                                     <label class="layui-form-label">寮�濮嬫棩鏈�</label>
                                     <div class="layui-input-block">
                                         <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
@@ -155,7 +162,7 @@
                                     </div>
                                     <div class="layui-inline">
                                         <label class="layui-form-label">渚涘簲鍟�</label>
-                                        <div class="layui-input-block"> 
+                                        <div class="layui-input-block">
                                             <input type="text" class="layui-input ForFilteringSchemes" name="HSupName" id="HSupName" style="width:190px;">
                                         </div>
                                     </div>
@@ -176,7 +183,7 @@
                                         <div class="layui-input-block" style="width:190px;">
                                             <select name="HFinishStatus" lay-filter="HFinishStatus">
                                                 <option value="" selected>鍏ㄩ儴</option>
-                                                <option value="鏈畬鎴�" selected>鏈畬鎴�</option>
+                                                <option value="鏈畬鎴�">鏈畬鎴�</option>
                                                 <option value="宸插畬鎴�">宸插畬鎴�</option>
                                             </select>
                                         </div>
@@ -226,10 +233,16 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="CheckBill"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="AbandonCheck"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushPOInStockBills" id="btn-PushPOInStockBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(鏀舵枡閫氱煡鍗�)</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushPOStockInBills" id="btn-PushPOStockInBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(閲囪喘鍏ュ簱鍗�)</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushPayableBills" id="btn-PushPayableBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(搴斾粯鍗�)</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushPOInStockBackBills" id="btn-PushPOInStockBackBills"><i class="layui-icon layui-icon-delete"></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" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseRow" id="set_CancelCloseRow"><i class="layui-icon layui-icon-form"></i>琛屽弽鍏抽棴</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -266,6 +279,7 @@
             var option = [];
             var Name = "MouldProdInHouseCellWidth";
             var HModName = "Cg_POOrderBillList";
+        var HBillType = "1102";
 
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1102";
@@ -275,7 +289,7 @@
 
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["hmainid","HBillType", "HSupID", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID",
-                "HFeedback", "HPriority", "HUserID"];
+                "HFeedback", "HPriority", "HUserID","甯佸埆浠g爜","閲囪喘鏂瑰紡浠g爜","缁撶畻鏂瑰紡浠g爜","閮ㄩ棬浠g爜","涓荤浠g爜","涓氬姟鍛樹唬鐮�","璁¢噺鍗曚綅浠g爜"];
             //#endregion 
 
             //#region 銆愯繃婊ゆ柟妗堛��
@@ -290,6 +304,8 @@
             window.HInterID_Choose = 0;
 
             //#endregion
+
+
 
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
             set_ClearBill();
@@ -319,13 +335,27 @@
                     //鍒锋柊
                     case 'get_Refresh': set_Refresh();
                         break;
-                    //瀹℃牳鎸夐挳
-                    case 'btn-Audit':
-                        set_CheckBill(1);
+                   //澶氳涓嬫帹(鏀舵枡閫氱煡鍗�)
+                    case 'btn-PushPOInStockBills':
+                        set_PushPOInStockBills();
                         break;
-                    //鍙嶅鏍告寜閽�
-                    case 'btn-DeAudit':
-                        set_CheckBill(2);
+                  //澶氳涓嬫帹(閲囪喘鍏ュ簱鍗�)
+                    case 'btn-PushPOStockInBills':
+                        set_PushPOStockInBills();
+                        break;
+                  //澶氳涓嬫帹(搴斾粯鍗�)
+                    case 'btn-PushPayableBills':
+                        set_PushPayableBills();
+                        break;
+                  //澶氳涓嬫帹(閫�鏂欓�氱煡鍗�)
+                    case 'btn-PushPOInStockBackBills':
+                        set_PushPOInStockBackBills();
+                        break;
+                    //瀹℃牳
+                    case 'set_CheckBill': set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍�
+                    case 'set_AbandonCheck': set_CheckBill(1);
                         break;
                     //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
                     case 'btn-Close':
@@ -334,6 +364,12 @@
                     //鍙嶅叧闂寜閽�
                     case 'btn-DeClose':
                         set_CloseBill(2);
+                        break;
+                    //琛屽叧闂�
+                    case 'set_CloseRow': set_CloseRow(0);
+                        break;
+                    //琛屽弽鍏抽棴
+                    case 'set_CancelCloseRow': set_CloseRow(1);
                         break;
                     //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
                     case 'btn-Drop':
@@ -374,6 +410,8 @@
                         break;
                 };
             });
+            //琛ㄦ牸鐐瑰嚮浜嬩欢
+            
 
             //閲嶆柊鍚屾鎸夐挳
             form.on('submit(btnResCnz)', function (data) {
@@ -385,6 +423,30 @@
                 set_ClearQuery();
             });
 
+            table.on('tool(mainTable)' , function (obj) {
+                var data = obj.data;
+                if (obj.event == '鍗曟嵁鍙�') {
+                    var linterid = data.hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: './Cg_POOrderBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+                        , resize: false,
+                        end: function () {
+                            get_FastQuery(table, option);
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                }
+            });
             //鑾峰彇缁勭粐
             function Organ() {
                 //鑾峰彇鐧诲綍椤电粍缁囧垪
@@ -449,12 +511,43 @@
                     }
                 });
             });
-            //#endregion
 
+            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            form.on('select(HInitTimeCycle)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+
+                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    //鎵ц鏌ヨ鏂规硶
+                    get_FastQuery();
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+            });
+            //#endregion
 
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
             function set_ClearBill() {
-                $("#HBeginDate").val("2022-03-14");
+                //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                setSelect_HInitTimeCycle();
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+
+                //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
@@ -467,6 +560,9 @@
 
                 //浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
                 ColFilter();
+
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
             }
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
@@ -483,9 +579,10 @@
                         { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
                         ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                         , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150}
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150, }
                         , { field: '鐘舵��', title: '鐘舵��', width: 100, sort: true }
                         , { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
+                        , { field: '琛岀姸鎬�', title: '琛岀姸鎬�', width: 125, sort: true }
                         , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 150 }
                         , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 100 }
                         //, { field: 'HBillType', title: 'HBillType', hide: true }
@@ -517,7 +614,7 @@
                         , { field: 'HUnitID', title: 'HUnitID', hide: true }
                         , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
                         //, { field: 'HUnitID', title: 'HUnitID', hide: true }  閲嶅
-                        , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 120 }
+                        , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 120 , hide: true }
                         , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100 }
                         , { field: '鎵瑰彿', title: '鎵瑰彿', width: 100 }
                         , { field: '鏁伴噺', title: '鏁伴噺', width: 100, totalRow: true }
@@ -528,24 +625,26 @@
                         , { field: '浼樺厛绾�', title: '浼樺厛绾�', width: 100 }
                         , { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', width: 100}
                         , { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
-                        , { field: '閲囪喘鏂瑰紡浠g爜', title: '閲囪喘鏂瑰紡浠g爜', width: 120}
+                        , { field: '閲囪喘鏂瑰紡浠g爜', title: '閲囪喘鏂瑰紡浠g爜', width: 120, hide: true }
                         , { field: '閲囪喘鏂瑰紡', title: '閲囪喘鏂瑰紡', width: 100}
                         , { field: 'HSSID', title: 'HSSID', hide: true }
                         , { field: '缁撶畻鏂瑰紡浠g爜', title: '缁撶畻鏂瑰紡浠g爜', width: 120}
                         , { field: '缁撶畻鏂瑰紡', title: '缁撶畻鏂瑰紡', width: 100}
                         , { field: '缁撶畻鏃ユ湡', title: '缁撶畻鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.缁撶畻鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: 'HCurID', title: 'HCurID', hide: true }
-                        , { field: '甯佸埆浠g爜', title: '甯佸埆浠g爜', width: 100}
+                        , { field: '甯佸埆浠g爜', title: '甯佸埆浠g爜', width: 100, hide: true }
                         , { field: '甯佸埆', title: '甯佸埆', width: 100}
                         , { field: '姹囩巼', title: '姹囩巼', width: 100}
                         , { field: 'HDeptID', title: 'HDeptID', hide: true }
-                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 100}
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 100, hide: true }
                         , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 100}
                         , { field: 'HManagerID', title: 'HManagerID', hide: true }
-                        , { field: '涓荤浠g爜', title: '涓荤浠g爜', width: 100}
+                        , { field: '涓荤浠g爜', title: '涓荤浠g爜', width: 100, hide: true }
                         , { field: '涓荤', title: '涓荤', width: 100}
                         , { field: 'HEmpID', title: 'HEmpID', hide: true }
-                        , { field: '鎽樿', title: '鎽樿', width: 100}
+                        , { field: '鎽樿', title: '鎽樿', width: 100 }
+                        , { field: 'HWHID', title: '涓昏〃浠撳簱ID', width: 120, hide: true}
+                        , { field: '浠撳簱', title: '涓昏〃浠撳簱', width: 100, hide: true}
                         , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 100}
                         , { field: 'hsubid', title: 'hsubid', hide: true }
                         , { field: 'HMaterID', title: 'HMaterID', hide: true }
@@ -553,20 +652,23 @@
                         , { field: '閲戦', title: '閲戦', width: 100, totalRow: true }
                         , { field: '绋庣巼', title: '绋庣巼', width: 100}
                         , { field: '绋庨', title: '绋庨', width: 100}
+                        , { field: '鎶樻墸鐜�', title: '鎶樻墸鐜�', width: 100}
                         , { field: '浠风◣鍚堣', title: '浠风◣鍚堣', width: 100}
-                        , { field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.浜よ揣鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', width: 120, templet: "<div>{{d.浜よ揣鏃ユ湡 ==null ?'':layui.util.toDateString(d.浜よ揣鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 100}
                         , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 100}
                         , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100}
-                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
                         , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 100}
-                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 120, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                         , { field: '淇敼浜�', title: '淇敼浜�', width: 100}
-                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 120, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                         , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 100}
-                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 120, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 125, sort: true }
+                       , { field: '琛屽叧闂棩鏈�', title: '琛屽叧闂棩鏈�', width: 200, templet: "<div>{{d.琛屽叧闂汉 == ''?'':layui.util.toDateString(d.琛屽叧闂棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
                         , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 100}
-                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 120, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
 
                 ]]
                
@@ -584,6 +686,7 @@
                 //        m["width"] = colWidth[x];
                 //    });
                 //}
+
             }
             //鍔犺浇缃戞牸
             function get_Display(sWhere) {
@@ -594,7 +697,7 @@
                     data: { "sWhere": sWhere  , "user": sessionStorage["HUserName"]},
                     success: function (data1) {
                         if (data1.count == 1) {
-                            var data = [];
+                            var data = [];//鍒楀瓧娈垫暟鎹�
                             var col = [];
                             var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉$爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�","瀹炴敹鏁伴噺","閲戦"];
                             //缁欑┖鐨勬暟缁勮祴鍊�
@@ -608,13 +711,19 @@
                                 if ($.inArray(data[i].name, titleData) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
                                 }
-                                else if ($.inArray(data[i].name, totalArray) > -1) {
+                                else if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒�
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
-                                } else {
+                                } else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+                                        }, style: 'cursor: pointer;'
+                                    });
+                                }else {
                                     switch (data[i].Type) {
                                         //int
                                         case 'DateTime':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name=="琛屽叧闂棩鏈�"?"琛屽叧闂汉":data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                             break;
                                         default:
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
@@ -716,31 +825,37 @@
                     var InterID = data[0].hmainid.toString();
                     //閫昏緫鍒犻櫎鏂规硶
                     layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                        var wait = layer.load();
-                        $.ajax({
-                            type: "GET",
-                            url: GetWEBURL() + "/Cg_POOrderBill/DeltetCg_POOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            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();
-                                    });
+                        
+                        if (data[0].鐘舵�� == "鍒涘缓") {
+                            $.ajax({
+                                type: "GET",
+                                url: GetWEBURL() + "/Cg_POOrderBill/DeltetCg_POOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                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 });
+                                    } else {
+                                        layer.alert(result.code + result.Message, { icon: 5 });
+                                    }
+                                  
+                                }, error: function () {
+                                    
+                                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                                 }
-                                layer.close(wait);
-                            }, error: function () {
-                                layer.close(wait);
-                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                            }
-                        });
+                            });
+                        } else {
+                            layer.msg('璇ユ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
+                          
+                        }
+                       
                     })
                 }
                 else {
@@ -797,6 +912,258 @@
                 }
             }
 
+            //#region 澶氳涓嬫帹锛堟敹鏂欓�氱煡鍗曪級
+            function set_PushPOInStockBills() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length > 0) {
+                    var dataArray = [];
+                    var HCusName = data[0].瀹㈡埛;
+                    var HEmpName = data[0].涓氬姟鍛�;
+                    for (var i = 0; i < data.length; i++) {
+                        var temp = {
+                            "hmainid": data[i].hmainid
+                            , "hsubid": data[i].hsubid
+                            , "HBillStatus": data[i].鐘舵��
+                            , "HSourceBillType": "1102"
+                        }
+                        dataArray.push(temp);
+                        if (data[i].鐘舵�� != "宸插鏍�") {
+                            var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+                            layer.alert(err, { icon: 5 });
+                            return;
+                        }
+
+                        if (data[i].琛岀姸鎬� != "" ) {
+                             var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
+                            layer.alert(err, { icon: 5 });
+                            return;
+                        }
+
+                        if (data[i].瀹㈡埛 != HCusName) {
+                            layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+                            return;
+                        }
+                        if (data[i].涓氬姟鍛� != HEmpName) {
+                            layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓涓氬姟鍛�!");
+                            return;
+                        }
+                    }
+
+                    var datajson = {
+                        "data": dataArray
+                    };
+
+                    var url = encodeURI('../../閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html?OperationType=4&linterid=0&HSouceBillType=1102&res=' + JSON.stringify(datajson))
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '閲囪喘璁㈠崟-澶氳涓嬫帹鏀舵枡閫氱煡鍗�'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: url
+                        , btn: [],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
+                }
+            }
+            //#endregion
+
+
+            //#region 澶氳涓嬫帹锛堥噰璐叆搴撳崟锛�
+            function set_PushPOStockInBills() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length > 0) {
+                    var dataArray = [];
+                    var HCusName = data[0].瀹㈡埛;
+                    var HEmpName = data[0].涓氬姟鍛�;
+                    for (var i = 0; i < data.length; i++) {
+                        var temp = {
+                            "hmainid": data[i].hmainid
+                            , "hsubid": data[i].hsubid
+                            , "HBillStatus": data[i].鐘舵��
+                            , "HSourceBillType": "1102"
+                        }
+                        dataArray.push(temp);
+                        if (data[i].鐘舵�� != "宸插鏍�") {
+                            var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+                            layer.alert(err, { icon: 5 });
+                            return;
+                        }
+
+                        if (data[i].琛岀姸鎬� != "" ) {
+                             var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
+                            layer.alert(err, { icon: 5 });
+                            return;
+                        }
+
+                        if (data[i].瀹㈡埛 != HCusName) {
+                            layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+                            return;
+                        }
+                        if (data[i].涓氬姟鍛� != HEmpName) {
+                            layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓涓氬姟鍛�!");
+                            return;
+                        }
+                    }
+
+                    var datajson = {
+                        "data": dataArray
+                    };
+
+                    var url = encodeURI('../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html?OperationType=4&linterid=0&HSouceBillType=1102&res=' + JSON.stringify(datajson))
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '閲囪喘璁㈠崟-澶氳涓嬫帹閲囪喘鍏ュ簱鍗�'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: url
+                        , btn: [],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
+                }
+            }
+            //#endregion
+
+
+            //#region 澶氳涓嬫帹锛堝簲浠樺崟锛�
+            function set_PushPayableBills() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length > 0) {
+                    var dataArray = [];
+                    var HCusName = data[0].瀹㈡埛;
+                    var HEmpName = data[0].涓氬姟鍛�;
+                    for (var i = 0; i < data.length; i++) {
+                        var temp = {
+                            "hmainid": data[i].hmainid
+                            , "hsubid": data[i].hsubid
+                            , "HBillStatus": data[i].鐘舵��
+                            , "HSourceBillType": "1102"
+                        }
+                        dataArray.push(temp);
+                        if (data[i].鐘舵�� != "宸插鏍�") {
+                            var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+                            layer.alert(err, { icon: 5 });
+                            return;
+                        }
+
+                        if (data[i].琛岀姸鎬� != "" ) {
+                             var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
+                            layer.alert(err, { icon: 5 });
+                            return;
+                        }
+
+                        if (data[i].瀹㈡埛 != HCusName) {
+                            layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+                            return;
+                        }
+                        //if (data[i].涓氬姟鍛� != HEmpName) {
+                        //    layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓涓氬姟鍛�!");
+                        //    return;
+                        //}
+                    }
+
+                    var datajson = {
+                        "data": dataArray
+                    };
+
+                    var url = encodeURI('../../閲囪喘绠$悊/搴斾粯鍗�/Cg_PayableBill.html?OperationType=4&linterid=0&HSouceBillType=1102&res=' + JSON.stringify(datajson));
+
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '閲囪喘璁㈠崟-澶氳涓嬫帹搴斾粯鍗�'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: url
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
+                }
+            }
+            //#endregion
+
+
+            //#region 澶氳涓嬫帹锛堥��鏂欓�氱煡鍗曪級
+            function set_PushPOInStockBackBills() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length > 0) {
+                    var dataArray = [];
+                    var HCusName = data[0].瀹㈡埛;
+                    var HEmpName = data[0].涓氬姟鍛�;
+                    for (var i = 0; i < data.length; i++) {
+                        var temp = {
+                            "hmainid": data[i].hmainid
+                            , "hsubid": data[i].hsubid
+                            , "HBillStatus": data[i].鐘舵��
+                            , "HSourceBillType": "1102"
+                        }
+                        dataArray.push(temp);
+                        if (data[i].鐘舵�� != "宸插鏍�") {
+                            var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+                            layer.alert(err, { icon: 5 });
+                            return;
+                        }
+
+                        if (data[i].琛岀姸鎬� != "" ) {
+                             var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
+                            layer.alert(err, { icon: 5 });
+                            return;
+                        }
+
+                        if (data[i].瀹㈡埛 != HCusName) {
+                            layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+                            return;
+                        }
+                        if (data[i].涓氬姟鍛� != HEmpName) {
+                            layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓涓氬姟鍛�!");
+                            return;
+                        }
+                    }
+
+                    var datajson = {
+                        "data": dataArray
+                    };
+
+                    var url = encodeURI('../../閲囪喘绠$悊/閫�鏂欓�氱煡鍗�/Add_Edit_Cg_POInStockBackBillList.html?OperationType=4&linterid=0&HSouceBillType=1102&res=' + JSON.stringify(datajson))
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '閲囪喘璁㈠崟-澶氳涓嬫帹鏀舵枡閫氱煡鍗�'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: url
+                        , btn: [],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
+                }
+            }
+            //#endregion
+
             //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
             function set_CheckBill(num) {
                 var checkStatus = table.checkStatus('mainTable')
@@ -807,7 +1174,7 @@
                     $.ajax({
                         type: "GET",
                         url: GetWEBURL() + "/Cg_POOrderBill/AuditCg_POOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        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 () {
@@ -832,6 +1199,7 @@
                 }
             }
             //#endregion
+           
 
             //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
             function set_CloseBill(num) {
@@ -865,6 +1233,43 @@
                 }
                 else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 琛屽弽鍏抽棴/琛屽叧闂暟鎹�
+            function set_CloseRow(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    var hsubid = data[0].hsubid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Cg_POOrderBill/CloseRowCg_POOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "HEntryID": hsubid, "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
@@ -1355,6 +1760,8 @@
                     sWhere += " and 瀹屾垚鐘舵�� like '%" + HFinishStatus + "%'";
 
                 }
+
+                sWhere += addSWhereByOpenType();
                 //娣诲姞鏌ヨ鏉′欢锛屾牴鎹綋鍓嶇櫥褰曠敤鎴峰叧鑱旇亴鍛樿繑鍥炴暟鎹�
                 //sWhere += " and HUserID =" + sessionStorage["Czybm"]
                 var index = layer.load(0);
@@ -1364,9 +1771,10 @@
             }
             //閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //缁撴潫鏃ユ湡
                 $('#HStatus').find("option[value='-1']").attr("selected", true);
-                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#HBillNo").val("");
                 $("#HEmpName").val("");
                 $("#HMaterNumber").val("");
@@ -1571,7 +1979,23 @@
             })
             //#endregion
 
- 
+            //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+            function setSelect_HInitTimeCycle() {
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+                for (var i = 0; i < valueList.length; i++) {
+                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+                }
+
+                $("#HInitTimeCycle").empty();
+                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+                form.render('select');
+
+                $("#HInitTimeCycle").val("29");
+            }
+            //#endregion
 
             //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
             function ColFilter() {
@@ -1617,6 +2041,24 @@
                                     $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
                                 }
                             }
+
+                            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                            //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                            if (HInitTimeCycle != -1) {
+                                $('#HBeginDate').prop('disabled', true);
+                                $('#HEndDate').prop('disabled', true);
+
+                                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                              
+                                //鎵ц鏌ヨ鏂规硶
+                                get_FastQuery();
+                            } else {
+                                $('#HBeginDate').prop('disabled', false);
+                                $('#HEndDate').prop('disabled', false);
+                            }
+
                             //鎵ц鏌ヨ鏂规硶
                             get_FastQuery()
                             form.render("select");
@@ -1624,9 +2066,9 @@
                             //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
                             //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
                             document.getElementById("HFilterScheme_Now").style.display = "none";
-                            //鎵ц鏌ヨ鏂规硶
-                            get_FastQuery()
-                            form.render("select");
+                            ////鎵ц鏌ヨ鏂规硶
+                            //get_FastQuery()
+                            //form.render("select");
                         }
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -1795,6 +2237,36 @@
 
             //#endregion
 
+
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+
+            //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+            function addSWhereByOpenType() {
+                //鑾峰彇鍙傛暟
+                var params = getUrlVars();
+                var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+                var HOrgID = params[params[1]];
+
+                var addSWhere = "";
+
+                if (openType == 2) {
+                    addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+                }
+                return addSWhere;
+            }
+            //#endregion
+
             //浠ヤ笂鏄痩ayui妯″潡
         });
 

--
Gitblit v1.9.1