From 3425237a2b54ca28fc3e3c5f7c35a7fbef4e15fa Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 29 十二月 2025 09:19:29 +0800
Subject: [PATCH] 1

---
 WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html |  407 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 236 insertions(+), 171 deletions(-)

diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index 574df8c..97e18fe 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -1,5 +1,6 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>閿�鍞鍗曞垪琛�</title>
@@ -18,13 +19,14 @@
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
     <script src="../../../layuiadmin/HideButton.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
-
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <style type="text/css">
         input.layui-input.layui-unselect {
             padding-right: 0;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-col-md12">
@@ -41,45 +43,62 @@
                                 <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 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;">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
+                                            style="width:190px;">
                                     </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="HEndDate" style="width:190px;">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+                                            style="width:190px;">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁鍙�</label>
                                     <div class="layui-input-block">
-                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+                                            id="HBillNo" style="width:190px;">
                                     </div>
                                 </div>
-                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">椤圭洰缂栧彿</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber"
+                                            id="HProjectNumber" style="width:190px;">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+                                    lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
-                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+                                    lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
                                 <!--鏄剧ず褰撳墠杩囨护鏂规-->
                                 <div class="layui-inline" style="margin-left:5px;">
-                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+                                        id="HFilterScheme_Now"></div>
                                 </div>
 
                                 <div style="display:none;">
                                     <div class="layui-inline">
                                         <label class="layui-form-label">鍗曟嵁鍙�</label>
                                         <div class="layui-input-block">
-                                            <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
+                                            <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2"
+                                                id="HBillno2" style="width:190px;">
                                         </div>
                                     </div>
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding: 0 5px;">閲嶆柊鍚屾</button>
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+                                        lay-filter="btnResCnz" id="btnReSearch" style="padding: 0 5px;">閲嶆柊鍚屾</button>
                                 </div>
 
                                 <div class="layui-colla-content">
@@ -87,19 +106,22 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label">瀹㈡埛</label>
                                             <div class="layui-input-block">
-                                                <input type="text" class="layui-input ForFilteringSchemes" name="HCusID" id="HCusID" style="width:190px;">
+                                                <input type="text" class="layui-input ForFilteringSchemes" name="HCusID"
+                                                    id="HCusID" style="width:190px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label">鐗╂枡浠g爜</label>
                                             <div class="layui-input-block">
-                                                <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+                                                <input type="text" class="layui-input ForFilteringSchemes"
+                                                    name="HMaterNumber" id="HMaterNumber" style="width:190px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label">鐗╂枡鍚嶇О</label>
                                             <div class="layui-input-block">
-                                                <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName" style="width:190px;">
+                                                <input type="text" class="layui-input ForFilteringSchemes"
+                                                    name="HMaterName" id="HMaterName" style="width:190px;">
                                             </div>
                                         </div>
                                     </div>
@@ -107,19 +129,25 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
                                             <div class="layui-input-block">
-                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes"
+                                                    lay-filter="ColName" style="width:190px;">
                                                 </select>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
+                                                lay-filter="Comparator" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<="><=</option>
-                                                <option value="<"><</option>
-                                                <option value="<>"><></option>
+                                                <option value="<=">
+                                                    <=< /option>
+                                                <option value="<">
+                                                    << /option>
+                                                <option value="<>">
+                                                    <>
+                                                </option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -127,7 +155,8 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
+                                                name="ColContent" id="ColContent">
                                         </div>
                                     </div>
 
@@ -135,19 +164,25 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
                                             <div class="layui-input-block">
-                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes"
+                                                    lay-filter="ColName1" style="width:190px;">
                                                 </select>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
+                                                lay-filter="Comparator1" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<="><=</option>
-                                                <option value="<"><</option>
-                                                <option value="<>"><></option>
+                                                <option value="<=">
+                                                    <=< /option>
+                                                <option value="<">
+                                                    << /option>
+                                                <option value="<>">
+                                                    <>
+                                                </option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -155,7 +190,8 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
+                                                name="ColContent1" id="ColContent1">
                                         </div>
                                     </div>
 
@@ -163,19 +199,25 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
                                             <div class="layui-input-block">
-                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
+                                                    lay-filter="ColName2" style="width:190px;">
                                                 </select>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
+                                                lay-filter="Comparator2" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<="><=</option>
-                                                <option value="<"><</option>
-                                                <option value="<>"><></option>
+                                                <option value="<=">
+                                                    <=< /option>
+                                                <option value="<">
+                                                    << /option>
+                                                <option value="<>">
+                                                    <>
+                                                </option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -183,7 +225,8 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
+                                                name="ColContent2" id="ColContent2">
                                         </div>
                                     </div>
                                 </div>
@@ -193,42 +236,43 @@
                         <div id="page"></div>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-file-b"></i>澶嶅埗</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" 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="" 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="" lay-event="btn-PushSeOrderChangeBill" id="btn-PushSeOrderChangeBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(閿�鍞鍗曞彉鏇村崟)</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-PushExceptiveCheckRequestBill" id="btn-PushExceptiveCheckRequestBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐗规壒鐢宠鍗�)</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-PushICMOBill" id="btn-PushICMOBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇璁㈠崟)</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-PushICStockBills" id="btn-PushICStockBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(閿�鍞嚭搴撳崟)</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-PushICStockBackBills" id="btn-PushICStockBackBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(閿�鍞��璐у崟)</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="btn-PushReceivableBills" id="btn-PushReceivableBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(搴旀敹鍗�)</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" 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="" lay-event="get_LookDown" id="get_LookDown"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_needClose" id="get_needClose"><i class="layui-icon layui-icon-refresh-3"></i>寰呭叧闂」</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-file-b"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" 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" 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" lay-event="btn-PushSeOrderChangeBill" id="btn-PushSeOrderChangeBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(閿�鍞鍗曞彉鏇村崟)</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushExceptiveCheckRequestBill" id="btn-PushExceptiveCheckRequestBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐗规壒鐢宠鍗�)</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushICMOBill" id="btn-PushICMOBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇璁㈠崟)</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushOutCompCheckBill" id="btn-PushOutCompCheckBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鍑哄巶妫�楠屽崟)</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushICStockBills" id="btn-PushICStockBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(閿�鍞嚭搴撳崟)</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushICStockBackBills" id="btn-PushICStockBackBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(閿�鍞��璐у崟)</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushReceivableBills" id="btn-PushReceivableBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(搴旀敹鍗�)</button>
+                                <button type="button" class="layui-btn layui-btn-sm" 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" lay-event="get_LookDown" id="get_LookDown"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_needClose" id="get_needClose"><i class="layui-icon layui-icon-refresh-3"></i>寰呭叧闂」</button>
                                 <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>鏌ョ湅瀹℃壒杩涘害</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>椹冲洖</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" 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="" 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="" 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="" 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="" 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="" 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" style="" 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="" 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="" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>鎵撳嵃</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" id="btn-print_StockIn" lay-event="btn-print_StockIn"><i class="layui-icon layui-icon-form"></i>鎵撳嵃(鍏ュ簱鐮佸崟)</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" 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="" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
-                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm"  lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
+                                <button type="button" class="layui-btn layui-btn-sm"  lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>鏌ョ湅瀹℃壒杩涘害</button>
+                                <button type="button" class="layui-btn layui-btn-sm"  lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm"  lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm"  lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>椹冲洖</button>
+                                <button type="button" class="layui-btn layui-btn-sm"  lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm"  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="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm"  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"  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"  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="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                <button type="button" class="layui-btn layui-btn-sm"  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"  id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm"  id="btn-print_StockIn" lay-event="btn-print_StockIn"><i class="layui-icon layui-icon-form"></i>鎵撳嵃(鍏ュ簱鐮佸崟)</button>
+                                <button type="button" class="layui-btn layui-btn-sm"  lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm"  lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm"  lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm"  lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
                                 <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_QueryCondition" id="set_QueryCondition"><i class="layui-icon layui-icon-set"></i>楂樼骇杩囨护</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" style="" 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"  lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -262,8 +306,6 @@
             var Organization = sessionStorage["Organization"];
             var sWhere = "";
             var option = [];
-            var page = 1;//鍒嗛〉鏁版嵁
-            var size = 50;
 
             var HModName = "Xs_SeOrderBillList";
             var HBillType = "1401";
@@ -279,7 +321,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1401";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion
             var titleData = ["hmainid", "HBillType", "HCusID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             //#region 銆愯繃婊ゆ柟妗堛��
@@ -310,10 +352,16 @@
             form.on('submit(btnSearch)', function (data) {
                 //鏍囪褰撳墠鏁版嵁涓� 鏌ヨ鏁版嵁
                 get_needClose_Bar = 0;
-                if (page != 1) {
-                    $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
-                } else {
-                    get_FastQuery(table, option);
+                optionPage.curr = 1;
+                get_FastQuery(table, option);
+
+            });
+            //#endregion
+
+            //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+            $('input[type="text"]').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    $("#btnSearch").click();
                 }
             });
             //#endregion
@@ -323,11 +371,9 @@
                 //娓呯┖杩囨护鏉′欢
                 set_ClearQuery();
 
-                if (page != 1) {
-                    $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
-                } else {
-                    get_FastQuery(table, option);
-                }
+                optionPage.curr = 1;
+                get_FastQuery(table, option);
+
             });
             //#endregion
 
@@ -368,6 +414,10 @@
                     //涓嬫帹(鐢熶骇璁㈠崟)
                     case 'btn-PushICMOBill':
                         set_PushICMOBill();
+                        break;
+                    // 涓嬫帹(鍑哄巶妫�楠屽崟)
+                    case 'btn-PushOutCompCheckBill':
+                        set_PushOutCompCheckBill()
                         break;
                     //澶氳涓嬫帹(閿�鍞嚭搴撳崟)
                     case 'btn-PushICStockBills':
@@ -467,45 +517,20 @@
             });
             //#endregion
 
-            //#region 鐩戝惉鎺掑簭浜嬩欢
-            table.on('sort(mainTable)', function (obj) {
-                //// 鑾峰彇鎺掑簭瀛楁鍜岀被鍨�
-                //var field = obj.field;
-                //var type = obj.type;
-                ////璁板綍杩囨护鏉′欢
-                //var temp = sWhere_Bak;
-
-                ////涓鸿繃婊ゆ潯浠跺鍔犳帓搴�
-                //sWhere_Bak += " order by " + field + " " + (type == "null" ? "" : type) + " ";
-
-                ////鑾峰彇鎺掑簭鍚庣殑鏁版嵁骞堕噸鏂版覆鏌�
-                //var ajaxLoad = layer.load();
-                //$.ajax({
-                //    url: GetWEBURL() + '/Xs_SeOrderBill/sortList',
-                //    async: false,
-                //    type: "GET",
-                //    data: { "sWhere": sWhere_Bak, "user": sessionStorage["HUserName"] },
-                //    success: function (data1) {
-                //        if (data1.count == 1) {
-
-                //            option.data = data1.data;
-                //            table.render(option);
-                //            layer.close(ajaxLoad);
-
-                //            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
-                //                ColFilter();
-                //            }
-                //        } else {
-                //            layer.close(ajaxLoad);
-                //            layer.alert(data1.code + data1.Message, { icon: 5 });
-                //        }
-                //    }, error: function () {
-                //        layer.close(ajaxLoad);
-                //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                //    }
-                //});
-
-                //sWhere_Bak = temp;
+            //#region 鎺掑簭鍚庨�夋嫨
+            table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+                table.reload('mainTable', {
+                    initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+                    , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+                        field: obj.field //鎺掑簭瀛楁   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                        , order: obj.type //鎺掑簭鏂瑰紡   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                    }
+                });
+                option.data = layui.table.cache["mainTable"];
+                table.render(option);
+                //鍒锋柊鎸夐挳鏄剧ず
+                // var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                // Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
             });
             //#endregion
 
@@ -613,14 +638,13 @@
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
-                //get_FastQuery();
-                //get_Display(" and 1=0 ");
-
-                get_DisplayPage(" and 1=0 ");
+                get_FastQuery();
+                //鍒濆鍖栭〉澶у皬
+                //DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
 
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
                 get_DefaultModule();
-                DisPlay_HideColumn();
+                //DisPlay_HideColumn();
             }
             //#endregion
 
@@ -637,7 +661,7 @@
                     //, limits: [50, 500, 5000, 20000]
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
-                       ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                         , { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, sort: true }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 125, sort: true }
                         , { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
@@ -722,8 +746,8 @@
                         soulTable.render(this);
 
                         //鍒锋柊鎸夐挳鏄剧ず
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        // var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        // Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
 
                         //寰幆琛ㄦ暟鎹牴鎹甪lag鐘舵�佺粰琛屼笂鑹�
                         //$.each(res['data'], function (i, j) {
@@ -756,9 +780,13 @@
                         if (!first) {
                             //do something
                             console.log(obj)
-                            page = obj.curr;
-                            size = obj.limit;
-                            get_FastQuery();
+
+                            if (get_needClose_Bar == 0) {
+                                get_FastQuery();
+                            } else if (get_needClose_Bar == 1) {
+                                get_needClose();
+                            }
+
                         }
                     }
                 }
@@ -782,7 +810,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../../閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html?OperationType=3&linterid='+linterid+'& HSouceBillType=0&closeType=1'  //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+                        , content: '../../閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html?OperationType=3&linterid=' + linterid + '& HSouceBillType=0&closeType=1'  //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
 
                         , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
                         end: function () {  //褰撳叧闂椂璋冪敤
@@ -794,7 +822,7 @@
                     })
                 }
             });
-             //#endregion
+            //#endregion
 
             //#region 杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
             function get_Display(sWhere) {
@@ -927,7 +955,7 @@
                                 option.data = result;
                                 ins = table.render(option);
                             }
-                            
+
                             layer.close(ajaxLoad);
                             DisPlay_HideColumn();
 
@@ -954,10 +982,10 @@
                 $.ajax({
                     url: GetWEBURL() + '/Xs_SeOrderBill/list_ByPage',
                     type: "GET",
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
                     success: function (data1) {
-                        option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
-                        if (data1.count != 0) {
+                        option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+                        if (data1.code == 1) {
                             optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
                             var data = [];//鍒楀瓧娈垫暟鎹�
                             var col = [];
@@ -998,22 +1026,8 @@
                                     }
                                 }
                             }
-                            //鍔ㄦ�佹樉绀哄垪鍚�
-                            option = {
-                                elem: '#mainTable'
-                                , toolbar: '#toolbarDemo'
-                                , cols: [col]
-                                , data: data1.data
-                                , height: 800
-                                //, page: true
-                                , totalRow: true
-                                , cellMinWidth: 90
-                                , limit: 50
-                                , limits: [50, 500, 5000, 20000]
-                                , done: function (res, curr, count) {
-                                    soulTable.render(this);
-                                }
-                            }
+                            option.cols = [col];
+                            option.data = data1.data;
                             //璁剧疆鏁版嵁
                             var result = data1.data;
                             var temp = "";
@@ -1043,10 +1057,8 @@
                             }
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
-                            option.data = [];
-                            table.render(option);
                             layer.close(ajaxLoad);
-                            /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(ajaxLoad);
@@ -1061,6 +1073,7 @@
                 var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
                 var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
                 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
                 var HCusID = $("#HCusID").val();
                 var HMaterNumber = $("#HMaterNumber").val();
                 var HMaterName = $("#HMaterName").val();
@@ -1152,6 +1165,9 @@
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like ''%" + HBillNo + "%''";
                 }
+                if (HProjectNumber) {
+                    sWhere += " and 椤圭洰缂栫爜 like ''%" + HProjectNumber + "%''";
+                }
                 if (HCusID) {
                     sWhere += " and 瀹㈡埛 like ''%" + HCusID + "%''";
                 }
@@ -1189,6 +1205,7 @@
                 $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //缁撴潫鏃ユ湡
                 $("#HBillNo").val("");//
+                $("#HProjectNumber").val("");
                 $("#HCusID").val("");
                 $("#HMaterNumber").val("");
                 $("#HMaterName").val("");
@@ -1509,6 +1526,39 @@
             }
             //#endregion
 
+            //#region 涓嬫帹 鍑哄巶妫�楠屽崟
+            function set_PushOutCompCheckBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length != 1) {
+                    return layer.msg("璇烽�夋嫨涓�琛屽崟鎹笅鎺�")
+                }
+                debugger
+                var linterid = data[0]['hmainid']
+                var hsubid = data[0]['hsubid']
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '閿�鍞鍗�-涓嬫帹鍑哄巶妫�楠屽崟'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../璐ㄩ噺绠$悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBill.html?operationType=2&linterid=' + linterid
+                    + "&HSouceBillType="+ HBillType + "&HICMOEntryID=&HEntryID="+ hsubid
+                    , btn: [],
+                    // 鎸夐挳1 鐨勫洖璋�
+                    end: function (index, layero, that) {
+                        ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                        //if (get_needClose_Bar == 0) {
+                        //    $("#btnSearch").trigger('click');
+                        //} else if (get_needClose_Bar == 1) {
+                        //    $("#get_needClose").trigger('click');
+                        //}
+                    }
+                })
+
+            }
+            //#endregion
+
+
             //#region 澶氳涓嬫帹锛堥攢鍞嚭搴撳崟锛�
             function set_PushICStockBills() {
                 var checkStatus = table.checkStatus('mainTable')
@@ -1745,14 +1795,17 @@
             function get_needClose() {
                 //璁板綍杩囨护鏉′欢
                 var temp = sWhere_Bak;
+
+                if (get_needClose_Bar == 0) {
+                    //璁剧疆椤垫暟涓�1
+                    optionPage.curr = 1;
+                }
+
                 //鏍囪褰撳墠鏁版嵁涓� 寰呭叧闂」
                 get_needClose_Bar = 1;
 
                 //涓鸿繃婊ゆ潯浠跺鍔犳帓搴�
                 //sWhere_Bak += " and 鍓╀綑璁㈤噾>0 and 鍓╀綑璁㈤噾<=1000 and 鍏抽棴浜�='' and 琛屽叧闂汉='' and 鐘舵�� = '宸插鏍�' and HCusID <> 166351 order by 鍗曟嵁鍙� desc";
-
-                //璁剧疆椤垫暟涓�1
-                page = 1;
 
                 //鑾峰彇鎺掑簭鍚庣殑鏁版嵁骞堕噸鏂版覆鏌�
                 var ajaxLoad = layer.load();
@@ -1760,9 +1813,9 @@
                     url: GetWEBURL() + '/Xs_SeOrderBill/sortList__ByPage',
                     async: false,
                     type: "GET",
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size},
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
                     success: function (data1) {
-                        option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+                        option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
                         if (data1.count != 0) {
                             optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
                             var data = [];//鍒楀瓧娈垫暟鎹�
@@ -1880,7 +1933,7 @@
                     $.ajax({
                         type: "GET",
                         url: GetWEBURL() + "/Xs_SeOrderBill/StartCheckFlow_SeOrderBIll", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID,"CurUserName": sessionStorage["HUserName"] },
+                        data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
                         success: function (result) {
                             if (result.count == 1) {
                                 layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -2278,8 +2331,10 @@
                     , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
-                        //鍒锋柊琛ㄦ牸鏁版嵁
-                        DisPlay_HideColumn();
+                        //鍒濆鍖栭〉澶у皬
+                        DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
+                        //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+                        get_FastQuery()
                         //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                         layer.close(index);//鍏抽棴寮圭獥
                     }
@@ -2290,7 +2345,7 @@
             function DisPlay_HideColumn() {
                 $.ajax({
                     url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
-                    async:false,
+                    async: false,
                     type: "GET",
                     data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
@@ -2302,8 +2357,7 @@
                             dataCol = data1.data[0].HGridString.split(',');
 
                             for (var i = 0; i < option.cols[0].length - 1; i++) {
-                                if (i >= dataCol.length)
-                                {
+                                if (i >= dataCol.length) {
                                     continue;
                                 }
                                 var dataCols = dataCol[i].split('|');
@@ -2362,6 +2416,15 @@
                                     option.cols[0][i + 1]["fixed"] = "left";
                                 }
                             }
+                            //璁剧疆鍒楁帓搴�
+                            for (var i = 1; i < option.cols[0].length; i++) {
+                                if (data1.data[0].HSortFlag == "鏄�") {
+                                    option.cols[0][i]["sort"] = true;
+                                }
+                                else {
+                                    option.cols[0][i]["sort"] = false;
+                                }
+                            }
                             table.render(option);
 
                             //鍒锋柊鎸夐挳鏄剧ず
@@ -2406,6 +2469,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
                     type: "GET",
+                    async: false,
                     data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
                     success: function (data1) {
                         if (data1.count == 1) {
@@ -2450,7 +2514,7 @@
                                 //$("#HBeginDate").val(HBeginDate);
 
                                 //鎵ц鏌ヨ鏂规硶
-                                get_FastQuery();
+                                // get_FastQuery();
                             } else {
                                 //$('#HBeginDate').prop('disabled', false);
                                 //$('#HEndDate').prop('disabled', false);
@@ -2464,7 +2528,7 @@
                             //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
                             document.getElementById("HFilterScheme_Now").style.display = "none";
                             //鎵ц鏌ヨ鏂规硶
-                            get_FastQuery()
+                            //get_FastQuery()
                             form.render("select");
                         }
                     }, error: function () {
@@ -2650,7 +2714,7 @@
                 }
                 colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
 
-               var HModBillName = "h_v_IF_SeOrderBillList";//绛変簬璇ュ垪琛ㄧ殑瑙嗗浘
+                var HModBillName = "h_v_IF_SeOrderBillList";//绛変簬璇ュ垪琛ㄧ殑瑙嗗浘
 
                 contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_QueryCondition.html?HModName=' + HModBillName + '&colName=' + colName;
 
@@ -2673,9 +2737,9 @@
                         var myIframe = window[laero.find('iframe')[0]['name']];
                         GetDataCols += "and (";
                         for (var i = 0; i < checkStatus.length; i++) {
-                            GetDataCols += myIframe.get_FastQuery(checkStatus[i]) ; //get_FastQuery()涓哄瓙椤甸潰鐨勬柟娉�
+                            GetDataCols += myIframe.get_FastQuery(checkStatus[i]); //get_FastQuery()涓哄瓙椤甸潰鐨勬柟娉�
                             if ((i + 1) < checkStatus.length) {
-                                GetDataCols += " " + checkStatus[i]["HRelationCol"]+" ";
+                                GetDataCols += " " + checkStatus[i]["HRelationCol"] + " ";
                             }
                         }
                         GetDataCols += ")";
@@ -2714,8 +2778,8 @@
 
             //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
             function setSelect_HInitTimeCycle() {
-                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
-                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29, 180, 365];
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�", "杩戝崐骞�", "杩戜竴骞�"];
 
                 var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';
                 for (var i = 0; i < valueList.length; i++) {
@@ -2855,4 +2919,5 @@
     </script>
 
 </body>
-</html>
+
+</html>
\ No newline at end of file

--
Gitblit v1.9.1