From 2f1e5bde1de562bcc0ee334714b7799d1eec0ea8 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 02 一月 2024 13:45:34 +0800
Subject: [PATCH] 生成条码时修改计算有效期至逻辑,新增生产日期不可为空控制;条码列表改为动态加载,新增列设置按钮;退货单模块;送货单列表新增凯贝修改前备份文件;送货单编辑模块新增选源单功能;采购订单列表备份;excel导入生成送货单添加行合计;

---
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList备份.html   |  648 +++++++++
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill.html         |   34 
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList_Excel.html |    5 
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html       |  223 +++
 WebSRM/WebSRM.csproj                                                      |    4 
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POStockInBillList.html     |  426 ++++++
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html           |  120 +
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html    |  134 +
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html       |  267 ++-
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBackBillList.html |  371 ++++
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html     |  210 ++
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList备份.html     |  967 ++++++++++++++
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POStockOutBillList.html    |  424 ++++++
 WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html                         |   12 
 14 files changed, 3,556 insertions(+), 289 deletions(-)

diff --git a/WebSRM/WebSRM.csproj b/WebSRM/WebSRM.csproj
index 7f6d7d3..f646908 100644
--- a/WebSRM/WebSRM.csproj
+++ b/WebSRM/WebSRM.csproj
@@ -865,6 +865,7 @@
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_AskPriceBillList.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_BarCodeBill_Bak.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POInStockBackBillList.html" />
+    <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POInStockBillList澶囦唤.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POInStockBill_Edit.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POInStockBillList.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POInStockBill.html" />
@@ -875,6 +876,9 @@
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_PODemandPlanBillList.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_EntrustOrderTrackBill.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POInStockTrackBill.html" />
+    <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POOrderBillList澶囦唤.html" />
+    <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POStockOutBillList.html" />
+    <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POStockInBillList.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POOrderBillList_Excel.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_QuotePriceBillList.html" />
     <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_SystemLogList.html" />
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
index ac5c64f..f8cbeb4 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
@@ -24,7 +24,7 @@
                                 <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>-->
                                 <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBarcodeSaverPZ">鐢熸垚鍝佺鐮�</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBarcodeSaverWY">鐢熸垚鍞竴鐮�</button>-->
-                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBarcodeSaverBox">鐢熸垚鍐呭绠辨潯鐮�</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBarcodeSaverBox" id="HBarcodeSaverBox">鐢熸垚鍐呭绠辨潯鐮�</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print">鏉$爜鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
 
@@ -115,6 +115,7 @@
     <script src="../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
     <script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
     <script src="../../../../Scripts/webConfig.js"></script>
+    <script src="../../layuiadmin/Scripts/general.js"></script>
     <!--<script src="../../../../Scripts/jquery-1.8.2.js"></script>-->
     <script>
         function f_alert(sMsg) {
@@ -149,33 +150,57 @@
                 }
             }
         }
-        function addDate(date, days) {
-            if (days == undefined || days == '') {
-                days = 1;
-            }
-            
-            var havingLeapYear = isDecimal(days / 365); //濡傛灉days涓嶈兘琚�365鏁撮櫎锛屽垯涓洪棸骞达紝闇�瑕佸噺灏戜竴澶�
-            if (havingLeapYear) {
-                days--;//缁忛獙璇侊紝澶╂暟鍙渶瑕佸噺灏戜竴娆″嵆鍙紝瀛樺湪澶氫釜闂板勾涓嶉渶瑕佸惊鐜�掑噺
-            }  
-                                    
-            var date = new Date(date);
-            date.setDate(date.getDate() + days);
-            var month = date.getMonth() + 1;
-            var day = date.getDate();
-            var mm = "'" + month + "'";
-            var dd = "'" + day + "'";
+        function addDate(date, days, HExpUnit, HKFPeriod) {
+            //璁$畻鏈夋晥鏈熻嚦
+            if (HExpUnit == "Y") {//骞�
+                date = new Date(date);
+                console.log(date.getFullYear(date));
+                date.setYear(date.getFullYear(date) + HKFPeriod);
+                console.log(Format(date, "yyyy-MM-dd"));
 
-            //鍗曚綅鏁板墠闈㈠姞0
-            if (mm.length == 3) {
-                month = "0" + month;
+                return Format(date, "yyyy-MM-dd");
             }
-            if (dd.length == 3) {
-                day = "0" + day;
+            if (HExpUnit == "M") {//鏈�
+                date = new Date(date);
+                date.setMonth(date.getMonth(date) + HKFPeriod);
+
+                return Format(date, "yyyy-MM-dd");
+            }
+            if (HExpUnit == "D") {//鏃�
+                date = new Date(date);
+                date.setDate(date.getDate(date) + HKFPeriod);
+                console.log(Format(date, "yyyy-MM-dd"));
+                return Format(date, "yyyy-MM-dd");
+            }
+            else { //瀹夌憺璁$畻鏂瑰紡          
+                if (days == undefined || days == '') {
+                    days = 1;
+                }
+
+                var havingLeapYear = isDecimal(days / 365); //濡傛灉days涓嶈兘琚�365鏁撮櫎锛屽垯涓洪棸骞达紝闇�瑕佸噺灏戜竴澶�
+                if (havingLeapYear) {
+                    days--;//缁忛獙璇侊紝澶╂暟鍙渶瑕佸噺灏戜竴娆″嵆鍙紝瀛樺湪澶氫釜闂板勾涓嶉渶瑕佸惊鐜�掑噺
+                }
+
+                var date = new Date(date);
+                date.setDate(date.getDate() + days);
+                var month = date.getMonth() + 1;
+                var day = date.getDate();
+                var mm = "'" + month + "'";
+                var dd = "'" + day + "'";
+
+                //鍗曚綅鏁板墠闈㈠姞0
+                if (mm.length == 3) {
+                    month = "0" + month;
+                }
+                if (dd.length == 3) {
+                    day = "0" + day;
+                }
+
+                var time = date.getFullYear() + "-" + month + "-" + day
+                return time;
             }
 
-            var time = date.getFullYear() + "-" + month + "-" + day
-            return time;
         }
         function DateDiff(sDate1, sDate2) {    //sDate1鍜宻Date2鏄�2002-12-18鏍煎紡
             var aDate, oDate1, oDate2, iDays
@@ -396,7 +421,7 @@
                     });
                 return false;
             });
-            //鐢熸垚鍐呭绠辩爜            
+            //鐢熸垚鍐呭绠辩爜
 
             //鑾峰彇褰撳墠鏁版嵁鎵�鍦ㄦ暟缁勭殑涓嬫爣
             function findIndex(HMaterNumber, HMaterModel, array) {
@@ -428,8 +453,8 @@
                         layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏈鐢熸垚鏉$爜鏁伴噺涓嶈兘瓒呭嚭鏈敓鎴愭潯鐮佹暟閲�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return Result = false;
                     }
-                    if (_sSubStr[i].HQty > 0 && (_sSubStr[i].HBatchNo == "" || _sSubStr[i].HKFDate == "")) {
-                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵规鎴栫敓浜ф棩鏈熶笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    if (_sSubStr[i].HQty > 0 && _sSubStr[i].HISKFPERIOD == 1 && (/*_sSubStr[i].HBatchNo == "" ||*/ _sSubStr[i].HKFDate == "")) {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return Result = false;
                     }
                     //鑾峰彇涓嬫爣
@@ -439,9 +464,11 @@
                         newArray.push(_sSubStr[i]);
 
                     } else {
-                        //濡傛灉鏁扮粍涓湁鍜屽綋鍓嶆暟鎹腑鐗╂枡浠g爜銆佽鏍煎瀷鍙蜂竴鑷寸殑淇℃伅锛屽垯灏嗕粬浠殑鏁伴噺绱姞
-                        newArray[index].HQty = Number(newArray[index].HQty) + Number(_sSubStr[i].HQty);
-                    }                             
+                        if (newArray[index].HPOOrderBillNo == _sSubStr[i].HPOOrderBillNo) {
+                            //濡傛灉鏁扮粍涓湁鍜屽綋鍓嶆暟鎹腑鐗╂枡浠g爜銆佽鏍煎瀷鍙蜂竴鑷寸殑淇℃伅锛屽垯灏嗕粬浠殑鏁伴噺绱姞
+                            newArray[index].HQty = Number(newArray[index].HQty) + Number(_sSubStr[i].HQty);
+                        }                       
+                    }
                 }
 
                 for (let i = 0; i < newArray.length; i++) {
@@ -463,6 +490,8 @@
                                 layer.msg(data.Message, { icon: 1 });
                                 element.tabDelete('tabDemo', '2'); //鍒犻櫎
                                 element.tabDelete('tabDemo', '3'); //鍒犻櫎
+
+                                $('#HBarcodeSaverBox').addClass("layui-btn-disabled").attr("disabled", true);//鐢熸垚鏉$爜鎸夐挳绂佺敤
 
                                 element.tabAdd('tabDemo', {
                                     title: '澶栫鏉$爜'
@@ -595,7 +624,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + sessionStorage["HUserName"] + '&HBarcode=&Type=' + openTmpListType, 'yes']
+                        , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + sessionStorage["linterid"] + '&HBarcode=&Type=SRM_POOrderBillList', 'yes']
                         , resize: false
                         //, cancel: function () {
                         //    $(".layui-btn").removeClass("layui-btn-disabled");
@@ -647,13 +676,17 @@
                     , { field: 'HWBQty', title: '澶栫鏁�', width: 100 }
                     , { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
                     , { field: 'HMoney', title: '閲戦', width: 100, hide: true }
-                    , { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100 }
-                    , { field: 'HBatchNo', title: '鐢熶骇鏃ユ湡D/C', width: 100, edit: 'text' }
+                    , { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100, hide: true }
+                    , { field: 'HBatchNo', title: '鎵瑰彿', width: 100 }
+                    , { field: 'HISKFPERIOD', title: '鏄惁鍚敤淇濊川鏈�', width: 100, edit: 'text', hide: true }
+                    , { field: 'HEXPUNIT', title: '淇濊川鏈熷崟浣�', width: 100, edit: 'text', hide: true }
+                    , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate' }//, event: "chooseHKFDate"
+                    , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }//
+                    , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate' }//, event: "chooseHKFDQDate"
+                    , { field: 'HSupMaterNumber', title: '渚涘簲鍟嗘枡鍙�', width: 100, edit: 'text' }
+                    , { field: 'HSupBatchNo', title: '渚涘簲鍟嗘壒娆�', width: 100, edit: 'text' }
                     //, { field: 'HBeginDate', title: '鐢熶骇鏃ユ湡', width: 120, data_field: 'HBeginDate', event: "chooseHBeginDate" }
                     //, { field: 'HEndDate', title: '澶辨晥鏃ユ湡', width: 120, data_field: 'HEndDate', event: "chooseHEndDate" }
-                    , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate", hide: true}//
-                    , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, hide: true }//
-                    , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate', hide: true}//, event: "chooseHKFDQDate"
                     //, { field: 'HDate', title: '瑕佹眰浜よ揣鏃ユ湡', width: 150 }
                     , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
                     , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
@@ -661,7 +694,7 @@
                     , { field: 'HWWOrderInterID', title: '濮斿璁㈠崟涓诲唴鐮�', width: 150, hide: true }
                     , { field: 'HWWOrderEntryID', title: '濮斿璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
                     , { field: 'HWWOrderDetaiLID	', title: '濮斿璁㈠崟鏄庣粏鍐呯爜', width: 150, hide: true }
-                    , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟鍗曞彿', width: 200 }
+                    , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟鍗曞彿', width: 200, hide: true }
                     , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
                     , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
                     , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150, hide: true }
@@ -754,6 +787,8 @@
                                                         , "HSourceInterID": data[i].HSourceInterID
                                                         , "HSupID": data[i].HSupID
                                                         , "HSupName": data[i].HSupName
+                                                        , "HSupBatchNo": data[i].HSupBatchNo
+                                                        , "HSupMaterNumber": data[i].HSupMaterNumber
                                                     }
                                                     //oldData.push(data1);
                                                     oldData.splice(dataindex, 0, data1);
@@ -876,6 +911,15 @@
                 var data = obj.data;
                 if (obj.event === 'chooseHKFDate') {
                     var field = $(this).data('field');
+                    var HExpUnit = data.HEXPUNIT; //淇濊川鏈熷崟浣�
+                    var HKFPeriod = data.HKFPeriod; //淇濊川鏈�
+                    if (HExpUnit != 'Y' && HExpUnit != 'M' && HExpUnit != 'D') {
+                        layer.msg("姝ょ墿鏂欐病鏈夊惎鐢ㄤ繚璐ㄦ湡锛�");
+                        obj.update({
+                            HKFDate: '',
+                        });
+                        return;
+                    }
                     laydate.render({
                         elem: this.firstChild
                         , show: true //鐩存帴鏄剧ず
@@ -884,7 +928,7 @@
                             data[field] = value;
                             obj.update(data);
                             if (parseInt(obj.data.HKFPeriod) >= 0) {
-                                var sKFDQDate = addDate(value, parseInt(obj.data.HKFPeriod));
+                                var sKFDQDate = addDate(value, parseInt(obj.data.HKFPeriod), HExpUnit, HKFPeriod);
                                 obj.update({
                                     HKFDQDate: sKFDQDate,
                                 });
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
index 2c1c025..0a6d86b 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
@@ -118,6 +118,7 @@
                             <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>-->
+                              <button type="button" class="layui-btn layui-btn-sm" id="btn_HideColumn" lay-event="btn-HideColumn"><i class="layui-icon layui-icon-return"></i>闅愯棌鍒楄缃�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鏉$爜鎵撳嵃</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
@@ -190,6 +191,11 @@
                 , table = layui.table
                 , form = layui.form
                 , element = layui.element;
+
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID", "HParentID", "鍗曟嵁鍙�", "鏃ユ湡", "鏁伴噺", "鐘舵��", "鍗曚綅", "閲戦"];
+            var HModName = "SRM_BarCodeBillList";
+            var option = [];
             //甯歌鐢ㄦ硶
             laydate.render({
                 elem: '#HDate1'
@@ -212,7 +218,8 @@
                 // , where: { msg: "", NowPage: 1, OnePage: 10 }
                 , cellMinWidth: 100
                 , cols: [[
-                    { checkbox: true/*, fixed: true*/ }
+                    { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
+                    //{ checkbox: true/*, fixed: true*/ }
                     , { field: 'sorderid', title: '搴忓彿', width: 80/*, fixed: true*/ }
                     , { field: 'HItemID', title: '涓婚敭', width: 100, hide: true }
                     , { field: '鐘舵��', title: '鐘舵��', width: 100, sort: true/*, fixed: true*/ }
@@ -306,7 +313,7 @@
                                 , shade: 0.6 //閬僵閫忔槑搴�
                                 , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
                                 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + sessionStorage["HUserName"] + '&HBarcode=&Type=SRM_POOrderBillList', 'yes']// 瀹夌憺 type ='SRM_POOrderBillList' 鍘焧ype = 'HBarCodePrint'
+                                , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + sessionStorage["linterid"] + '&HBarcode=&Type=SRM_POOrderBillList', 'yes']// 瀹夌憺 type ='SRM_POOrderBillList' 鍘焧ype = 'HBarCodePrint'
                                 , resize: false
                             })
                         }
@@ -351,35 +358,112 @@
                                 }
                             });
                         })
-
-
+                        break;
+                    case 'btn-HideColumn':
+                        get_HideColumn();
                         break;
                     case 'btn-exit':
                         parent.layui.admin.events.closeThisTabs();
                         break;
                 };
             });
+
+            //琛岀洃鍚簨浠�
+            table.on('row(mainTable)', function (obj) {
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            });
+
             ///鍔犺浇鏄剧ず鏁版嵁
             function RoadHBillNo(sqlWhere) {
+                var wait = layer.load();//閬僵
                 where = sqlWhere;
                 $.ajax({
                     type: "POST",
                     url: GetWEBURL() + "GetBarCodeShowList",
                     async: true,
                     data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
-                    success: function (result) {
-                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
-                        table.reload('mainTable', {
-                            data: ajaxReturnData
-                            , height: 'full-10'
-                            , page: {
-                                curr: _cur_page //蹇呴』浠庣 1 椤靛紑濮�
-                            }
-                            , loading: false
-                            , done: function (index, res) {
+                    success: function (data1) {
+                        //ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+                        //table.reload('mainTable', {
+                        //    data: ajaxReturnData
+                        //    , height: 'full-10'
+                        //    , page: {
+                        //        curr: _cur_page //蹇呴』浠庣 1 椤靛紑濮�
+                        //    }
+                        //    , loading: false
+                        //    , done: function (index, res) {
 
+                        //    }
+                        //});
+                        if (data1.Message == "鑾峰彇鎴愬姛") {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                             }
-                        });
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if (data[i].name.indexOf('id') > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //id鍒�
+                                }
+                                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 });
+                                            break;
+                                        default:
+                                            if (data[i].name == '璁㈠崟鏁伴噺' || data[i].name == '宸插彂璐ф暟閲�' || data[i].name == '鏈彂璐ф暟閲�') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+                                            } else if (data[i].name == '渚涘簲鍟嗕氦鏈熷洖澶�') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'HSupSendGoodsDateRemark' });
+                                            } else {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                            }
+                                    }
+                                }
+                            }
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , totalRow: true
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 500
+                                , limits: [50, 500, 5000, 20000]
+                            }
+                            table.render(option);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+                            layer.close(wait);
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
                     },
                     error: function (result) {
                         console.log(result);
@@ -426,6 +510,115 @@
                 var type = $(this).data('type');
                 active[type] ? active[type].call(this) : '';
             });
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            dataCol = data1.data[0].HGridString.split(',');
+                            for (var i = 0; i < dataCol.length; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //闅愯棌id
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    if (option.cols[0][i + 1]["field"] == '渚涘簲鍟嗕氦鏈熷洖澶�') {
+                                        option.cols[0][i + 1]["width"] = 120;
+                                    } else {
+                                        option.cols[0][i + 1]["width"] = dataCols[3];
+                                    }
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
         });
     </script>
 </body>
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBackBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBackBillList.html
index 140d875..c9cac9a 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBackBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBackBillList.html
@@ -30,7 +30,7 @@
                     <div class="layui-card-body">
                         <form class="layui-form" action="">
                             <div class="layui-form-item">
-                                <div class="layui-inline">
+                                <div class="layui-inline" style="display:none;">
                                     <label class="layui-form-label">璁㈠崟鐘舵��</label>
                                     <div class="layui-input-block">
                                         <select name="HStatus" id="HStatus" lay-filter="">
@@ -38,40 +38,6 @@
                                             <option value="鏈‘璁�">鏈‘璁�</option>
                                             <option value="宸茬‘璁�">宸茬‘璁�</option>
                                             <option value="宸查┏鍥�">宸查┏鍥�</option>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
-                                    <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
-                                    </div>
-                                </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">鐗╂枡浠g爜</label>
-                                    <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
-                                    </div>
-                                </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">浜у搧鍚嶇О</label>
-                                    <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HName" id="HName">
-                                    </div>
-                                </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
-                                    <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HModel" id="HModel">
-                                    </div>
-                                </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">鍏抽棴鐘舵��</label>
-                                    <div class="layui-input-block">
-                                        <select id="HClStatus" name="HClStatus" lay-filter="">
-                                            <option value="">鍏ㄩ儴</option>
-                                            <option value="鏈叧闂�" selected="">鏈叧闂�</option>
-                                            <option value="宸插叧闂�">宸插叧闂�</option>
                                         </select>
                                     </div>
                                 </div>
@@ -87,16 +53,73 @@
                                         <input type="text" class="layui-input" name="HDate2" id="HDate2">
                                     </div>
                                 </div>
-
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">閲囪喘缁勭粐</label>
+                                    <label class="layui-form-label">鐗╂枡缂栫爜</label>
                                     <div class="layui-input-block">
-                                        <select id="HPURCHASEORGID" name="HPURCHASEORGID" lay-filter="">
-                                            <option value="">缁勭粐1</option>
-                                            <option value="">缁勭粐2</option>
+                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">渚涘簲鍟嗗搴旂墿鏂欎唬鐮�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HSupNumber" id="HSupNumber" style="margin-top:10px">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HModel" id="HModel">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">閫�鏂欐柟寮�</label>
+                                    <div class="layui-input-block" style="width:185px;">
+                                        <select id="HReturnMethod" name="HReturnMethod" lay-filter="">
+                                            <option value="" selected="">鍏ㄩ儴</option>
+                                            <option value="閫�鏂欒ˉ鏂�">閫�鏂欒ˉ鏂�</option>
+                                            <option value="閫�鏂欏苟鎵f">閫�鏂欏苟鎵f</option>
                                         </select>
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">渚涘簲鍟�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HSupName" id="HSupName">
+                                    </div>
+                                </div>
+
+                                <div class="layui-inline" style="display:none;">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+
+                                <div class="layui-inline" style="display:none;">
+                                    <label class="layui-form-label">浜у搧鍚嶇О</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                    </div>
+                                </div>
+
+                                <div class="layui-inline" style="display:none;">
+                                    <label class="layui-form-label">鍏抽棴鐘舵��</label>
+                                    <div class="layui-input-block">
+                                        <select id="HClStatus" name="HClStatus" lay-filter="">
+                                            <option value="" selected="">鍏ㄩ儴</option>
+                                            <option value="鏈叧闂�">鏈叧闂�</option>
+                                            <option value="宸插叧闂�">宸插叧闂�</option>
+                                        </select>
+                                    </div>
+                                </div>
+
+                                <div class="layui-inline" style="display:none;">
+                                    <label class="layui-form-label">閫�鏂欑粍缁�</label>
+                                    <div class="layui-input-block">
+                                        <select id="HSTOCKORGID" name="HSTOCKORGID" lay-filter="">
+                                        </select>
+                                    </div>
+                                </div>                                
                                 <div class="layui-inline">
                                     <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query">
                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -112,12 +135,13 @@
                     <script type="text/html" id="toolbarDemo">
                         <div class="layui-btn-container">
                             <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
                             <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭鏀惰揣</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>鏀惰揣寮傚父</button>-->
                             <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>-->
                             <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃閫�璐у崟</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚鏉$爜</button>-->
+                              <button type="button" class="layui-btn layui-btn-sm" id="btn_HideColumn" lay-event="btn-HideColumn"><i class="layui-icon layui-icon-return"></i>闅愯棌鍒楄缃�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
 
                         </div>
@@ -195,7 +219,29 @@
                 elem: '#HDate2'
             });
             //layui.code();
-            RoadHBillNo(sql);
+            //RoadHBillNo(sql);
+
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["hsupid","FSTOCKORGID"];
+            var option = [];
+            var HModName = "SRM_POInStockBackBillList";
+
+            set_ClearBill();
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            function set_ClearBill() {
+                //娓叉煋閫�鏂欑粍缁�
+                var Organization = '<option value=' + sessionStorage["OrganizationID"] + ' style="color:red;">' + sessionStorage["Organization"] + '</option>';
+                $("#HSTOCKORGID").append(Organization);
+                form.render('select');
+                //鍒濆鍖栬〃鏍�
+                //set_InitGrid();
+                //鏄剧ず鍒楁暟鎹�
+                //DisPlay_HideColumn();
+                //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery(table, option)
+            }           
+
+            //get_Display(sql);
             layer.load(3)
             //鏂规硶绾ф覆鏌�
             table.render({
@@ -293,8 +339,88 @@
                     case 'btn-exit': 
                         parent.layui.admin.events.closeThisTabs();
                         break;
+                    case 'btn-HideColumn':
+                        get_HideColumn();
+                        break;
                 };
             });
+
+            //鍔犺浇鏄剧ず鏁版嵁
+            function get_Display(sqlWhere) {
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "GetPOInStockBackBill",
+                    async: true,
+                    data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
+                    success: function (data1) {
+                        if (data1.Message == "鑾峰彇鎴愬姛") {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if (data[i].name.indexOf('id') > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //id鍒�
+                                }
+                                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 });
+                                            break;
+                                        default:
+                                            if ( data[i].name == '瀹為��鏁伴噺') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+                                            } else if (data[i].name == '鍗曟嵁缂栧彿' || data[i].name == '閫�鏂欐棩鏈�') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 135 });
+                                            } else if (data[i].name == '渚涘簲鍟�' ) {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 220 });
+                                            } else if (data[i].name == '瑙勬牸鍨嬪彿' || data[i].name == '澶囨敞') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 515 });
+                                            } else {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                            }
+                                    }
+                                }
+                            }
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , totalRow: true
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 500
+                                , limits: [50, 500, 5000, 20000]
+                            }
+                            table.render(option);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+                            layer.close(wait);
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    },
+                    error: function (result) {
+                        layer.close(wait);
+                        layer.alert(result.Message, { icon: 5 });
+                    }
+                });
+            };
+
 
             ///鍔犺浇鏄剧ず鏁版嵁
             function RoadHBillNo(sqlWhere) {
@@ -324,33 +450,48 @@
                     }
                 });
             };
-            form.on('submit(f_Query)', function (data) {//鏌ヨ
+
+            function get_FastQuery(table, option) {
                 var sqlWhere = " ";
-                if ($("#HStatus").val() != "")
-                    sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
-                if ($("#HBillNo").val() != "")
-                    sqlWhere += " and 鍗曟嵁鍙� like ^^%" + $("#HBillNo").val() + "%^^";
-                if ($("#HNumber").val() != "")
-                    sqlWhere += " and 鐗╂枡浠g爜 like ^^%" + $("#HNumber").val() + "%^^";
-                if ($("#HName").val() != "")
-                    sqlWhere += " and 鐗╂枡鍚嶇О like ^^%" + $("#HName").val() + "%^^";
-                if ($("#HModel").val() != "")
-                    sqlWhere += " and 瑙勬牸鍨嬪彿 like ^^%" + $("#HModel").val() + "%^^";
-                if ($("#HClStatus").val() != "")
-                    sqlWhere += " and 鍏抽棴鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
-                if ($("#HPURCHASEORGID").val() != "")
-                    sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
                 if ($("#HDate1").val() != "") {
-                    sqlWhere += " and 鏃ユ湡 >= ^^" + $("#HDate1").val() + "^^";
+                    sqlWhere += " and 閫�鏂欐棩鏈� >= ^^" + $("#HDate1").val() + "^^";
                 }
                 if ($("#HDate2").val() != "") {
-                    sqlWhere += " and 鏃ユ湡 <= ^^" + $("#HDate2").val() + "^^";
+                    sqlWhere += " and 閫�鏂欐棩鏈� <= ^^" + $("#HDate2").val() + "^^";
                 }
+                if ($("#HNumber").val() != "")
+                    sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HNumber").val() + "%^^";
+                if ($("#HSupNumber").val() != "")
+                    sqlWhere += " and 渚涘簲鍟嗗搴旂墿鏂欎唬鐮� like ^^%" + $("#HSupNumber").val() + "%^^";
+                if ($("#HModel").val() != "")
+                    sqlWhere += " and 瑙勬牸鍨嬪彿 like ^^%" + $("#HModel").val() + "%^^";
+                if ($("#HReturnMethod").val() != "")
+                    sqlWhere += " and 閫�鏂欐柟寮� like ^^%" + $("#HReturnMethod").val() + "%^^";
+                if ($("#HSupName").val() != "")
+                    sqlWhere += " and 渚涘簲鍟� like ^^%" + $("#HSupName").val() + "%^^";
+
+                if ($("#HSTOCKORGID").val() != "" && $("#HSTOCKORGID option:selected").text() != "瀹夌憺闆嗗洟")
+                    sqlWhere += " and FSTOCKORGID = ^^" + $("#HSTOCKORGID").val() + "^^";
+                //if ($("#HStatus").val() != "")
+                //    sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
+                //if ($("#HBillNo").val() != "")
+                //    sqlWhere += " and 鍗曟嵁鍙� like ^^%" + $("#HBillNo").val() + "%^^";
+                //if ($("#HName").val() != "")
+                //    sqlWhere += " and 鐗╂枡鍚嶇О like ^^%" + $("#HName").val() + "%^^";
+                //if ($("#HClStatus").val() != "")
+                //    sqlWhere += " and 鍏抽棴鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
+                //if ($("#HPURCHASEORGID").val() != "")
+                //    sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
 
                 sql = sqlWhere;
                 //浠庣涓�椤靛紑濮�
                 _cur_page = 1;
-                RoadHBillNo(sqlWhere);
+                //RoadHBillNo(sqlWhere);
+                get_Display(sqlWhere);
+            }
+
+            form.on('submit(f_Query)', function (data) {//鏌ヨ
+                get_FastQuery(table, option);
             });
             var $ = layui.$, active = {
                 reload: function () {
@@ -374,6 +515,116 @@
                 var type = $(this).data('type');
                 active[type] ? active[type].call(this) : '';
             });
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            dataCol = data1.data[0].HGridString.split(',');
+                            for (var i = 0; i < dataCol.length; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //闅愯棌id
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    if (option.cols[0][i + 1]["field"] == '渚涘簲鍟嗕氦鏈熷洖澶�') {
+                                        option.cols[0][i + 1]["width"] = 120;
+                                    } else {
+                                        option.cols[0][i + 1]["width"] = dataCols[3];
+                                    }
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+
         });
     </script>
 </body>
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill.html
index e1aa230..574c7d0 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill.html
@@ -289,28 +289,42 @@
                     // , { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100,, sort: true, fixed: true edit: 'text', hide: true }
                     , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, edit: 'text', hide: true }
                     , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
-                    , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120 }
-                    , { field: 'HSubjoin', title: '鐗╂枡浠g爜', width: 120 }
+                    , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }
+                    , { field: 'HSubjoin', title: '鐗╂枡浠g爜', width: 120, hide: true }
                     , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
                     , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
-                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', width: 100 }
+
+                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', width: 120 }
+                    , { field: 'HBatChNo', title: '鎵瑰彿', width: 120 }
+                    , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', width: 100 }
+                    , { field: 'HSourceQty', title: '婧愬崟鏁伴噺', width: 100 }
+                    , { field: 'HQty', title: '閫佽揣鏁伴噺', width: 100 }
+                    , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 100 }
+                    , { field: '鏈敓鎴愭潯鐮佹暟閲�', title: '鏈敓鎴愭潯鐮佹暟閲�', width: 100 }
+                    , { field: '鏀惰揣鍦板潃', title: '鏀惰揣鍦板潃', width: 100 }
+                    , { field: '渚涘簲鍟嗘枡鍙�', title: '渚涘簲鍟嗘枡鍙�', width: 100 }
+                    , { field: '渚涘簲鍟嗘壒娆�', title: '渚涘簲鍟嗘壒娆�', width: 100 }
+                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 100 }
+                    , { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环', width: 100 }
+                    , { field: '閲戦', title: '閲戦', width: 100 }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
+
                     , { field: 'HUnitNumber', title: '璁¢噺鍗曚綅浠g爜', width: 100, hide: true }
                     , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', width: 100, hide: true }
-                    , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                    , { field: 'HPrice', title: '鍗曚环', width: 100, hide: true}
-                    , { field: 'HMoney', title: '閲戦', width: 100, hide: true}
-                    , { field: 'HWHName', title: '鏀舵枡浠撳簱', width: 100 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 100, hide: true }
+                    , { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
+                    , { field: 'HMoney', title: '閲戦', width: 100, hide: true }
+                    , { field: 'HWHName', title: '鏀舵枡浠撳簱', width: 100, hide: true }
                     , { field: 'HWHNumber', title: '鏀舵枡浠撳簱浠g爜', width: 100, hide: true }
                     , { field: 'HWHID', title: '鏀舵枡浠撳簱ID', width: 100, hide: true }
                     , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
                     , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
-                    , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 200 }
+                    , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 200, hide: true }
                     , { field: 'HWWOrderInterID', title: '濮斿璁㈠崟涓诲唴鐮�', width: 150, hide: true }
                     , { field: 'HWWOrderEntryID', title: '濮斿璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
                     , { field: 'HWWOrderDetaiLID', title: '濮斿璁㈠崟鏄庣粏鍐呯爜', width: 150, hide: true }
-                    , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟鍙�', width: 200 }
+                    , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟鍙�', width: 200, hide: true }
                     , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }
-                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
                     , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150, hide: true }
                     , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150, hide: true }
                 ]]
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
index 019dd79..5f8f8a8 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
@@ -32,42 +32,53 @@
                                         </div>
                                     </div>
                                     <div class="layui-inline">
-                                        <label class="layui-form-label">璁㈠崟鐘舵��</label>
-                                        <div class="layui-input-block">
-                                            <select name="HStatus" id="HStatus" lay-filter="">
-                                                <option value="" selected="">鍏ㄩ儴</option>
-                                                <option value="鏈墦鍗�">鏈墦鍗�</option>
-                                                <option value="鏈埌璐�">鏈埌璐�</option>
-                                                <option value="宸插埌璐�">宸插埌璐�</option>
-                                                <option value="鏈敓鎴愭潯鐮�">鏈敓鎴愭潯鐮�</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="layui-inline">
                                         <label class="layui-form-label">鍗曟嵁鍙�</label>
-                                        <div class="layui-input-block">
+                                        <div class="layui-input-block" style="width:150px;">
                                             <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
-                                        <label class="layui-form-label">婧愬崟鍗曞彿</label>
-                                        <div class="layui-input-block">
+                                        <label class="layui-form-label">閲囪喘璁㈠崟鍙�</label>
+                                        <div class="layui-input-block" style="width:150px;">
                                             <input type="text" class="layui-input" name="HBillNoFrom" id="HBillNoFrom">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
-                                        <label class="layui-form-label">閫佽揣鍗曞彿</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
+                                        <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                        <div class="layui-input-block" style="width:120px;">
+                                            <input type="text" class="layui-input" name="HDate1" id="HDate1">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
-                                        <label class="layui-form-label">鐗╂枡浠g爜</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                        <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                        <div class="layui-input-block" style="width:120px;">
+                                            <input type="text" class="layui-input" name="HDate2" id="HDate2">
                                         </div>
                                     </div>
-
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鍗曟嵁鐘舵��</label>
+                                        <div class="layui-input-block">
+                                            <select id="HClStatus" name="HClStatus" lay-filter="">
+                                                <option value=""  selected="">鍏ㄩ儴</option>
+                                                <option value="鏈鏍�">鏈鏍�</option>
+                                                <option value="宸插鏍�">宸插鏍�</option>
+                                                <option value="鏈叧闂�">鏈叧闂�</option>
+                                                <option value="宸插叧闂�">宸插叧闂�</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡缂栫爜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HName" id="HName">
+                                        </div>
+                                    </div>                                   
                                     <div class="layui-inline">
                                         <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -75,21 +86,9 @@
                                     </div>
                                     <div class="layui-colla-content" style="padding-left:82px">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label">鐗╂枡缂栫爜</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
                                             <label class="layui-form-label">鏃х墿鏂欑紪鐮�</label>
                                             <div class="layui-input-block">
                                                 <input type="text" class="layui-input" name="HOldMaterNumber" id="HOldMaterNumber">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">鐗╂枡鍚嶇О</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HName" id="HName">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -98,16 +97,28 @@
                                                 <input type="text" class="layui-input" name="HModel" id="HModel">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">鍗曟嵁鐘舵��</label>
+                                        <div class="layui-inline" style="display:none">
+                                            <label class="layui-form-label">璁㈠崟鐘舵��</label>
                                             <div class="layui-input-block">
-                                                <select id="HClStatus" name="HClStatus" lay-filter="">
-                                                    <option value="">鍏ㄩ儴</option>
-                                                    <option value="瀹℃牳">瀹℃牳</option>
-                                                    <option value="瀹℃牳">鍙嶅鏍�</option>
-                                                    <option value="鏈叧闂�" selected="">鏈叧闂�</option>
-                                                    <option value="宸插叧闂�">宸插叧闂�</option>
+                                                <select name="HStatus" id="HStatus" lay-filter="">
+                                                    <option value="" selected="">鍏ㄩ儴</option>
+                                                    <option value="鏈墦鍗�">鏈墦鍗�</option>
+                                                    <option value="鏈埌璐�">鏈埌璐�</option>
+                                                    <option value="宸插埌璐�">宸插埌璐�</option>
+                                                    <option value="鏈敓鎴愭潯鐮�">鏈敓鎴愭潯鐮�</option>
                                                 </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline" style="display:none">
+                                            <label class="layui-form-label">閫佽揣鍗曞彿</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline" style="display:none;">
+                                            <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                             </div>
                                         </div>
                                     </div>
@@ -213,6 +224,8 @@
             });
             var option = [];
             var HModName = "SRM_POInStockBillList";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID", "HParentID", "hmainid","hsubid","F_xbkf_Combo","FSHDD","HPrintId"];
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
             set_ClearBill();
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
@@ -315,7 +328,7 @@
                     success: function (data1) {
                         if (data1.data.length != 0) {
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            var titleData = ["HItemID", "HParentID", "hmainid", "hsubid", "F_xbkf_Combo", "FSHDD", "HPrintId"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
                             dataCol = data1.data[0].HGridString.split(',');
 
@@ -389,19 +402,87 @@
             ///鍔犺浇鏄剧ず鏁版嵁
             function get_Display(sqlWhere) {
                 var wait = layer.load();//閬僵
+                //$.ajax({
+                //    type: "POST",
+                //    url: GetWEBURL() + "GetPOInStockBill",
+                //    async: false,
+                //    data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
+                //    success: function (result) {
+                //        if (result.Message == "鑾峰彇鎴愬姛") {
+                //            option.data = result.data;
+                //            table.render(option);
+                //            layer.close(wait);
+                //        } else {
+                //            layer.close(wait);
+                //            layer.alert(result.Message, { icon: 5 });
+                //        }
+                //    },
+                //    error: function (result) {
+                //        layer.close(wait);
+                //        layer.alert(result.Message, { icon: 5 });
+                //    }
+                //});
+
                 $.ajax({
                     type: "POST",
                     url: GetWEBURL() + "GetPOInStockBill",
-                    async: false,
+                    async: true,
                     data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
-                    success: function (result) {
-                        if (result.Message == "鑾峰彇鎴愬姛") {
-                            option.data = result.data;
+                    success: function (data1) {
+                        if (data1.Message == "鑾峰彇鎴愬姛") {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if (data[i].name.indexOf('id') > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //id鍒�
+                                }
+                                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 });
+                                            break;
+                                        default:
+                                            if (data[i].name == '璁㈠崟鏁伴噺' || data[i].name == '宸插彂璐ф暟閲�' || data[i].name == '鏈彂璐ф暟閲�') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+                                            } else if (data[i].name == '鍥炲浜ゆ湡') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'HSupSendGoodsDateRemark' });
+                                            } else {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                            }
+                                    }
+                                }
+                            }
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , totalRow: true
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 500
+                                , limits: [50, 500, 5000, 20000]
+                            }
                             table.render(option);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
                             layer.close(wait);
                         } else {
                             layer.close(wait);
-                            layer.alert(result.Message, { icon: 5 });
+                            layer.alert(data1.Message, { icon: 5 });
                         }
                     },
                     error: function (result) {
@@ -443,6 +524,12 @@
                     sqlWhere += " and 瑙勬牸鍨嬪彿 like ^^%" + $("#HModel").val() + "%^^";
                 if ($("#HClStatus").val() != "")
                     sqlWhere += " and 鍗曟嵁鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
+                if ($("#HDate1").val() != "") {
+                    sqlWhere += " and 鏃ユ湡 >= ^^" + $("#HDate1").val() + "^^";
+                }
+                if ($("#HDate2").val() != "") {
+                    sqlWhere += " and 鏃ユ湡 <= ^^" + $("#HDate2").val() + "^^";
+                }
                 sql = sqlWhere;
                 _cur_page = 1;
                 get_Display(sqlWhere);
@@ -587,8 +674,12 @@
                     case 'btn-print':
                         var checkStatus = table.checkStatus('mainTable')
                             , data = checkStatus.data;
-                        if (data.length == 0) {
-                            layer.msg("璇烽�夋嫨鏁版嵁", { icon: 5 });
+                        if (data.length != 1) {
+                            layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�", { icon: 5 });
+                            return;
+                        }
+                        if (data[0].鍗曟嵁鐘舵�� != '宸插鏍�') {
+                            layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄨ繘琛屾墦鍗�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
                             return;
                         }
                         //for (var i = 0; i < data.length; i++) {
@@ -642,6 +733,25 @@
                         break;
                 };
             });
+
+            //琛岀洃鍚簨浠�
+            table.on('row(mainTable)', function (obj) {
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            });
         });
     </script>
 </body>
diff --git "a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList\345\244\207\344\273\275.html" "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList\345\244\207\344\273\275.html"
new file mode 100644
index 0000000..019dd79
--- /dev/null
+++ "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList\345\244\207\344\273\275.html"
@@ -0,0 +1,648 @@
+锘�
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>閫佽揣鍗曞垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/style-self.css" media="all">
+    <style type="text/css">
+        .layui-input-block {
+            width: 190px;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card" style="padding: 1px">
+                    <div class="layui-card-body" style="padding: 1px;">
+                        <form class="layui-form" action="" lay-filter="component-form-group">
+                            <div class="layui-collapse">
+                                <div class="layui-colla-item">
+                                    <div class="layui-colla-title layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鏇村</span>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">璁㈠崟鐘舵��</label>
+                                        <div class="layui-input-block">
+                                            <select name="HStatus" id="HStatus" lay-filter="">
+                                                <option value="" selected="">鍏ㄩ儴</option>
+                                                <option value="鏈墦鍗�">鏈墦鍗�</option>
+                                                <option value="鏈埌璐�">鏈埌璐�</option>
+                                                <option value="宸插埌璐�">宸插埌璐�</option>
+                                                <option value="鏈敓鎴愭潯鐮�">鏈敓鎴愭潯鐮�</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">婧愬崟鍗曞彿</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HBillNoFrom" id="HBillNoFrom">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">閫佽揣鍗曞彿</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline">
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                    <div class="layui-colla-content" style="padding-left:82px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鐗╂枡缂栫爜</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鏃х墿鏂欑紪鐮�</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HOldMaterNumber" id="HOldMaterNumber">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HName" id="HName">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HModel" id="HModel">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鐘舵��</label>
+                                            <div class="layui-input-block">
+                                                <select id="HClStatus" name="HClStatus" lay-filter="">
+                                                    <option value="">鍏ㄩ儴</option>
+                                                    <option value="瀹℃牳">瀹℃牳</option>
+                                                    <option value="瀹℃牳">鍙嶅鏍�</option>
+                                                    <option value="鏈叧闂�" selected="">鏈叧闂�</option>
+                                                    <option value="宸插叧闂�">宸插叧闂�</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>-->
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-changebg"><i class="layui-icon layui-icon-form"></i>鍙樻洿</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃閫佽揣鍗�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚鏉$爜</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-HideColumn"><i class="layui-icon layui-icon-return"></i>闅愯棌鍒楄缃�</button>
+                        </div>
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--<script src="../../layuiadmin/layui/lay/modules/mobile/jquery-3.3.1.min.js"></script>-->
+    <script src="../../layuiadmin/layui/layui.js"></script>
+    <script src="../CreateControl.js"></script>
+    <script src="../GRInstall.js"></script>
+    <script src="../GRUtility.js"></script>
+    <script src="../../../../Scripts/webConfig.js"></script>
+    <script>
+        var _cur_page = 1;
+        var sql = "";
+        var options = document.getElementById('HStatus').children;
+        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;
+        }
+        function f_alert(sMsg) {
+            layer.alert(sMsg, { icon: 5 });
+            //layer.open({
+            //    type: 1
+            //  , offset: 'auto' //鍏蜂綋閰嶇疆鍙傝�冿細http://www.layui.com/doc/modules/layer.html#offset
+            //  , id: 'layerDemo' //闃叉閲嶅寮瑰嚭
+            //  , content: '<div style="padding: 20px 100px;">' + sMsg + '</div>'
+            //  , shade: 0 //涓嶆樉绀洪伄缃�
+            //  , yes: function () {
+            //      layer.closeAll();
+            //  }
+            //});
+        }
+        var params = getUrlVars();
+        var type = params[params[0]];
+        switch (type) {
+            case "UnPrint":
+                options[1].selected = true;
+                sql += " and 鐘舵�� like ^^%鏈墦鍗�%^^";
+                break;
+            case "UnArrival":
+                options[2].selected = true;
+                sql += " and 鐘舵�� like ^^%鏈埌璐�%^^";
+                break;
+            case "ReArrival":
+                options[3].selected = true;
+                sql += " and 鐘舵�� like ^^%宸插埌璐�%^^";
+                break;
+            case "UnBarCode":
+                options[4].selected = true;
+                sql += " and 鐘舵�� like ^^%鏈敓鎴愭潯鐮�%^^";
+                break;
+        }
+        //CreateReport("Report");  //鎵撳嵃
+        //Report.LoadFromURL("閫佽揣鍗�(A4绾�).grf");//鎵撳嵃
+        layui.config({
+            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , laydate = layui.laydate
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+            //甯歌鐢ㄦ硶
+            laydate.render({
+                elem: '#HDate1'
+            });
+            laydate.render({
+                elem: '#HDate2'
+            });
+            var option = [];
+            var HModName = "SRM_POInStockBillList";
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            set_ClearBill();
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏄剧ず鍒楁暟鎹�
+                DisPlay_HideColumn();
+                //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery(table, option)
+            }
+            function set_InitGrid() {
+                var columns = [
+                    { checkbox: true, fixed: 'left', totalRowText: '鍚堣'/*, fixed: true*/ }
+                    , { field: 'sorderid', title: '搴忓彿', width: 80/*, fixed: true*/ }
+                    , { field: 'hmainid', title: 'hmainid', sort: true/*, fixed: true*/, hide: true }
+                    , { field: 'hsubid', title: 'hsubid', sort: true/*, fixed: true*/, hide: true }
+                    , { field: '鐘舵��', title: '鐘舵��', width: 100, sort: true/*, fixed: true*/ }
+                    , { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��', sort: true/*, fixed: true*/ }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 135, sort: true/*, fixed: true*/ }
+                    , { field: '閫佽揣鍗曞彿', title: '閫佽揣鍗曞彿', width: 135, sort: true/*, fixed: true*/ }
+                    , { field: 'F_xbkf_Combo', title: '鑷畾涔夋爣璇�', width: 135 }
+                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 135 }
+                    , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 135 }
+                    //, { field: '鐗╂祦鍗曞彿', title: '鐗╂祦鍗曞彿', width: 150, sort: true/*, fixed: true*/ }
+                    , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120, sort: true }
+                    , { field: '鏃х墿鏂欑紪鐮�', title: '鏃х墿鏂欑紪鐮�', width: 120, sort: true }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 120, sort: true }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120, sort: true }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120, sort: true }
+                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 80, sort: true }
+                    , { field: '鏁伴噺', title: '璁㈣揣鏁伴噺', width: 100, sort: true, totalRow: true  }
+                    , { field: '鏈敓鎴愭潯鐮佹暟閲�', title: '鏈敓鎴愭潯鐮佹暟閲�', width: 100, sort: true, totalRow: true  }
+                    , { field: '鍚堟牸鏁伴噺', title: '鍚堟牸鏁伴噺', width: 100, sort: true, totalRow: true  }
+                    , { field: '涓嶅悎鏍兼暟閲�', title: '涓嶅悎鏍兼暟閲�', width: 100, sort: true, totalRow: true  }
+                    , { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环', width: 100, sort: true, hide: true }
+                    , { field: '閲戦', title: '閲戦', width: 100, sort: true, hide: true }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 150, sort: true }
+                    , { field: '鎵规', title: '鎵规', width: 150, sort: true }
+                    , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 150, sort: true, hide: true }
+                    , { field: '棰勮鍒拌揣鏃ユ湡', title: '棰勮鍒拌揣鏃ユ湡', width: 150, sort: true, hide: true }
+                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓籌D', width: 100, hide: true }
+                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛怚D', width: 100, hide: true }
+                    , { field: 'FSHDD', title: '閫佽揣鍦扮偣', width: 120 }
+                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 80, hide: true }
+                    , { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 180, sort: true, hide: true }
+                    , { field: '濮斿璁㈠崟鍙�', title: '濮斿璁㈠崟鍙�', width: 180, sort: true, hide: true }
+                    , { field: '鍙樻洿鐘舵��', title: '鍙樻洿鐘舵��', sort: true }
+                    , { field: '鏀舵枡缁勭粐', title: '鏀舵枡缁勭粐', sort: true, hide: true }
+                    , { field: '閲囪喘缁勭粐', title: '閲囪喘缁勭粐', sort: true, hide: true }
+                    , { field: '闇�姹傜粍缁�', title: '闇�姹傜粍缁�', sort: true, hide: true }
+                ];
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    //, cellMinWidth: 120
+                    , totalRow: true
+                    , limit: 500
+                    , height: 'full-50'
+                    , cols: [columns]
+                    , limits: [500, 5000, 20000]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+            }
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < dataCol.length; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                ////璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            ///鍔犺浇鏄剧ず鏁版嵁
+            function get_Display(sqlWhere) {
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "GetPOInStockBill",
+                    async: false,
+                    data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
+                    success: function (result) {
+                        if (result.Message == "鑾峰彇鎴愬姛") {
+                            option.data = result.data;
+                            table.render(option);
+                            layer.close(wait);
+                        } else {
+                            layer.close(wait);
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                    },
+                    error: function (result) {
+                        layer.close(wait);
+                        layer.alert(result.Message, { icon: 5 });
+                    }
+                });
+            };
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {//鏌ヨ
+                get_FastQuery(table, option);
+            });
+            //鏌ヨ鏉′欢
+            function get_FastQuery(table, option) {
+                var sqlWhere = "";
+                if ($("#HStatus").val() != "")
+                    if ($("#HStatus").val() == "鏈敓鎴愭潯鐮�") {
+                        sqlWhere += " and 鏈敓鎴愭潯鐮佹暟閲� > 0";
+                    }
+                    else {
+                        sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
+                    }
+
+                if ($("#HBillNo").val() != "")
+                    sqlWhere += " and 鍗曟嵁鍙� like ^^%" + $("#HBillNo").val() + "%^^";
+                if ($("#HBillNoFrom").val() != "")
+                    sqlWhere += " and 婧愬崟鍗曞彿 like ^^%" + $("#HBillNoFrom").val() + "%^^";
+                if ($("#HInnerBillNo").val() != "")
+                    sqlWhere += " and 閫佽揣鍗曞彿 like ^^%" + $("#HInnerBillNo").val() + "%^^";
+                if ($("#HOldMaterNumber").val() != "")
+                    sqlWhere += " and 鏃х墿鏂欑紪鐮� like ^^%" + $("#HOldMaterNumber").val() + "%^^";
+                if ($("#HMaterNumber").val() != "")
+                    sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HMaterNumber").val() + "%^^";
+                if ($("#HNumber").val() != "")
+                    sqlWhere += " and 鐗╂枡浠g爜 like ^^%" + $("#HNumber").val() + "%^^";
+                if ($("#HName").val() != "")
+                    sqlWhere += " and 鐗╂枡鍚嶇О like ^^%" + $("#HName").val() + "%^^";
+                if ($("#HModel").val() != "")
+                    sqlWhere += " and 瑙勬牸鍨嬪彿 like ^^%" + $("#HModel").val() + "%^^";
+                if ($("#HClStatus").val() != "")
+                    sqlWhere += " and 鍗曟嵁鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
+                sql = sqlWhere;
+                _cur_page = 1;
+                get_Display(sqlWhere);
+            }
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    case 'btn-getCheckData':
+                        var data = checkStatus.data;
+                        layer.alert(JSON.stringify(data));
+                        break;
+                    //case 'getCheckLength':
+                    //    var data = checkStatus.data;
+                    //    layer.msg('閫変腑浜嗭細' + data.length + ' 涓�');
+                    //    break;
+                    //case 'isAll':
+                    //    layer.msg(checkStatus.isAll ? '鍏ㄩ��' : '鏈叏閫�');
+                    //    break;
+                    //瀹℃牳
+                    case 'btn-Audit':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        var InterID = "";
+                        if (checkStatus.data.length > 0) {
+                            for (var i = 0; i < checkStatus.data.length; i++) {
+                                InterID += data[i].hmainid.toString() + ",";
+                            }
+                            InterID = InterID.substring(0, InterID.length - 1);
+
+                            var HBillNo = data[0].鍗曟嵁鍙�;
+                            //閫昏緫瀹℃牳鏂规硶
+                            $.ajax({
+                                type: "GET",
+                                url: GetWEBURL() + "/AuditPOInStockBill",
+                                data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"], "HBillNo": HBillNo },
+                                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);
+                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                            get_Display(sql);
+                                        });
+
+                                    } else {
+                                        layer.alert(result.Message, { icon: 5 });
+                                    }
+                                }, error: function () {
+                                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                }
+                            });
+                        }
+                        else {
+                            layer.msg('璇烽�夋嫨鏁版嵁锛�');
+                        }
+                    //鑷畾涔夊ご宸ュ叿鏍忓彸渚у浘鏍� - 鎻愮ず
+                    case 'btn-reload':
+                        _cur_page = $(".layui-laypage-em").next().html();
+                        get_Display(sql);
+                        //    });
+                        break;
+                    case 'btn-HideColumn':
+                        get_HideColumn();
+                        break;
+                    case 'btn-details':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+
+                        var linterid = data[0].hmainid.toString();
+                        //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                        layer.open({
+                            type: 2
+                            , area: ['100%', '100%']
+                            , title: '閫佽揣鍗�'
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: '../../../src/views/SRM/SRM_POInStockBill.html?linterid=' + linterid
+                            , resize: false
+                            , cancel: function () {
+                                //$(".layui-btn").removeClass("layui-btn-disabled");
+                            }
+                        })
+                        break;
+                    case 'btn-changebg':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+
+                        var linterid = data[0].hmainid.toString();
+                        //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                        layer.open({
+                            type: 2
+                            , area: ['100%', '100%']
+                            , title: '閫佽揣鍗�'
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: '../../../src/views/SRM/SRM_POInStockBill.html?linterid=' + linterid + '&type =changebg'
+                            , resize: false
+                            , cancel: function () {
+                                //$(".layui-btn").removeClass("layui-btn-disabled");
+                            }
+                        })
+                        break;
+                    case 'btn-Delete':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        var InterID = "";
+                        for (i = 0; i < data.length; i++) {
+                            InterID += data[i].hmainid.toString() + ",";
+                        }
+                        InterID = InterID.substring(0, InterID.length - 1)
+                        //閫昏緫鍒犻櫎鏂规硶
+                        layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                            $.ajax({
+                                type: "GET",
+                                url: GetWEBURL() + "/DeltetPOInStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                data: { "HInterID": InterID, "HUserName": 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.Message, { icon: 5 });
+                                    }
+                                }, error: function () {
+                                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                }
+                            });
+                        })
+                        break;
+                    case 'btn-print':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        if (data.length == 0) {
+                            layer.msg("璇烽�夋嫨鏁版嵁", { icon: 5 });
+                            return;
+                        }
+                        //for (var i = 0; i < data.length; i++) {
+                        //    if (data[i].鍗曟嵁鐘舵�� != "瀹℃牳") {
+                        //        layer.msg("閫変腑琛屾湭瀹℃牳", { icon: 5 });
+                        //        return;
+                        //    }
+                        //}
+                        layer.open({
+                            type: 2
+                            , area: ['50%', '50%']
+                            , title: '鎵撳嵃妯$増閫夋嫨'
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=SRM_POInStockBillList', 'yes']
+                            , resize: false
+                            //, cancel: function () {
+                            //    $(".layui-btn").removeClass("layui-btn-disabled");
+                            //}
+                        })
+
+                        break;
+                    case 'btn-generate':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        if (data[0].鏈敓鎴愭潯鐮佹暟閲� <= 0) {
+                            layer.msg("閫変腑琛屽凡鐢熸垚鏉$爜锛�", { icon: 5 });
+                        }
+                        else {
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '鏉$爜鐢熸垚'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                , content: ['../../views/SRM/SRM_BarCodeBill.html?linterid=' + data[0].hmainid + '&lentryid=' + data[0].hsubid, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        break;
+                    case 'btn-exit':
+                        //var index = parent.layer.getFrameIndex(window.name);
+                        //element.tabDelete('layadmin-layout-tabs', this);
+                        parent.layui.admin.events.closeThisTabs();
+                        //parent.layer.close(index);
+                        break;
+                };
+            });
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
index b9bb524..98ab8e4 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
@@ -27,6 +27,7 @@
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
                                 <button type="button" id="aduit-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Aduit">瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print">鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="ChooseSource">閫夋簮鍗�</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
                             </div>
                         </div>
@@ -92,7 +93,7 @@
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-col-xs3" style="display:none;">
                                                     <label class="layui-form-label"> 閮�    闂細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" readonly="readonly" autocomplete="off">
@@ -127,9 +128,9 @@
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
                                                     </div>
-                                                </div>                                               
+                                                </div>
                                             </div>
-                                        </div>                                        
+                                        </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row">
                                                 <div class="layui-col-xs3">
@@ -145,9 +146,31 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-col-xs3">
-                                                    <label class="layui-form-label"> 鑱旂郴鏂瑰紡锛�</label>
+                                                    <label class="layui-form-label"> 鑱旂郴鏂瑰紡(鏀�)锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HReceiveGoodsLink" id="HReceiveGoodsLink" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 閫佽揣浜猴細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSendGoodsMan" id="HSendGoodsMan" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 閫佽揣鍦板潃锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSendGoodsAddr" id="HSendGoodsAddr" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鑱旂郴鏂瑰紡(閫�)锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSendGoodsLink" id="HSendGoodsLink" autocomplete="off">
                                                     </div>
                                                 </div>
                                             </div>
@@ -222,6 +245,7 @@
     <script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
     <!--<script src="../../../../Scripts/jquery-1.8.2.js"></script>-->
     <script src="../../../../Scripts/webConfig.js"></script>
+    <script src="../../layuiadmin/Scripts/general.js"></script>
     <script>
         function getUrlVars() {
             var vars = [], hash;
@@ -274,6 +298,9 @@
                 $("#HManagerName").val(d.data[0].HManagerName);
                 $("#HPURCHASEORGID").val(d.data[0].FPURCHASEORGID);
                 $("#HPURCHASEORGName").val(d.data[0].HOrgName);
+                $("#HReceiveGoodsMan").val(d.data[0].HReceiveGoodsMan);
+                $("#HAddress").val(d.data[0].HAddress);
+                //$("#HSendGoodsAddr").val(d.data[0].HPROVIDERADDRESS);
             }
         });
 
@@ -289,6 +316,7 @@
                 , layer = layui.layer
                 , laydate = layui.laydate
                 , element = layui.element; //Tab鐨勫垏鎹㈠姛鑳斤紝鍒囨崲浜嬩欢鐩戝惉绛夛紝闇�瑕佷緷璧杄lement妯″潡
+            window.table = layui.table
             //甯歌鐢ㄦ硶
             laydate.render({
                 elem: '#HDHDate'
@@ -296,7 +324,10 @@
             RoadHBillSub();
             layer.load(3)
 
+            var HIsAduit = false;
+
             var HModName = "SRM_POInStockBill_Edit";
+            window.HSubData = "";//鍏ㄥ眬鍙橀噺
             var option = {
                 elem: '#mainTable'
                 , toolbar: '#toolbarDemo'
@@ -314,26 +345,27 @@
                     , { field: 'HUnitNumber', title: '璁¢噺鍗曚綅浠g爜', width: 100, hide: true }
                     , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', width: 100, hide: true }
                     , { field: 'FPrintCount', title: '鎵撳嵃鏉$爜鏁伴噺', width: 120, hide: true }
-                    , { field: 'HQty', title: '閫佽揣鏁伴噺', width: 100, edit: 'text', event: "inputHQty" }
+                    , { field: 'HQty', title: '閫佽揣鏁伴噺*', width: 100, edit: 'text', event: "inputHQty" }
                     , { field: 'HRQty', title: '鍓╀綑鍙彂璐ф暟閲�', width: 100 }
                     , { field: 'HSQty', title: '婧愬崟鏁伴噺', width: 100 }
-                    , { field: 'HBatchNo', title: '鐢熶骇鏃ユ湡D/C', width: 120, edit: 'text' }
-                    , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate", hide: true }
+                    , { field: 'HBatchNo', title: '鎵瑰彿', width: 120, edit: 'text' }
+                    , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
                     , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, hide: true }
                     , { field: 'HDate', title: '棰勮鍒拌揣鏃ユ湡', align: 'center', width: 150, data_field: 'HDate', event: "chooseHDate", hide: true }
                     , { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
                     , { field: 'HMoney', title: '閲戦', width: 100, hide: true }
                     , { field: 'HRemark', title: '澶囨敞', width: 200, edit: true }
+                    , { field: 'HTAXPRICE_T', title: '鍚◣閲嶉噺鍗曚环/鍚�', width: 200, edit: true, hide: true}                    
                     //, { field: 'HRemark', title: '澶囨敞', width: 100 }
                     , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
                     , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
                     , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 200 }
                     , { field: 'HWWOrderInterID', title: '濮斿璁㈠崟涓诲唴鐮�', width: 150, hide: true }
                     , { field: 'HWWOrderEntryID', title: '濮斿璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
-                    , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟鍙�', width: 200 }
+                    , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟鍙�', width: 200, hide: true }
                     , { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 100, hide: true }
                     , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }
-                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200, hide: true }
                     , { field: 'HSupMaterNumber', title: '渚涘簲鍟嗘枡鍙�', width: 200, edit: 'text' }
                     , { field: 'HSupBatchNo', title: '渚涘簲鍟嗘壒娆�', width: 200, edit: 'text' }
                     , { field: 'HExpressNumberSub', title: '鐗╂祦鍗曞彿', width: 200, edit: true, hide: true }//鐟炵惇,鍑礉
@@ -484,7 +516,7 @@
                     //鍒楄缃�
                     case 'set_HideColumn':
                         get_HideColumn();
-                        break; 
+                        break;
                 };
             });
             //鐩戝惉琛屽伐鍏蜂簨浠�
@@ -588,9 +620,11 @@
                     success: function (result) {
                         if (result.count == 10000) {
                             for (let i = 0; i < result.data.length; i++) {
-                                result.data[i].HBatchNo = result.data[i].HBatchNo.substring(0,6);
+                                result.data[i].HBatchNo = result.data[i].HBatchNo.substring(0, 6);
                             }
                             ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+                            HSubData = ajaxReturnData;
+                            console.log(ajaxReturnData);
                             table.reload('mainTable', {
                                 data: ajaxReturnData
                                 , height: 'full-10'
@@ -654,6 +688,7 @@
                         dataType: "json",
                         success: function (data) {
                             if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                HIsAduit = true;
                                 $('#aduit-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                 layer.msg(data.Message, { icon: 1 });
                             }
@@ -667,7 +702,11 @@
                         }
                     });
             });
-            form.on('submit(Print)', function (data) {//瀹℃牳
+            form.on('submit(Print)', function (data) {//鎵撳嵃
+                if (HIsAduit == false) {
+                    layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄨ繘琛屾墦鍗�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
+                    return;
+                }
                 $.ajax(
                     {
                         type: "GET",
@@ -701,7 +740,24 @@
                         }
                     });
             });
-            form.on('submit(Exit)', function (data) {//淇濆瓨
+
+            form.on('submit(ChooseSource)', function (data) {
+                layer.open({
+                    type: 2
+                    , area: ['95%', '95%']
+                    , title: '閲囪喘璁㈠崟鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../views/SRM/SRM_POOrderBillList.html?Type=AddRow', 'yes']
+                    , resize: false
+                    //, cancel: function () {
+                    //    $(".layui-btn").removeClass("layui-btn-disabled");
+                    //}
+                })
+            });
+
+            form.on('submit(Exit)', function (data) {//閫�鍑�
                 var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
                 parent.layer.close(index); //鍐嶆墽琛屽叧闂�
             });
@@ -773,9 +829,14 @@
                         //    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵规涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         //    return Result = false;
                         //}
-                        if (sSubStr[i].HBatchNo == "") {
+                        if (sSubStr[i].HKFDate == "") {
                             //鍑礉
-                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡D/C涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
+                        if (sSubStr[i].HKFDate > Format(new Date(), "yyyy-MM-dd")) {
+                            //鍑礉
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡澶т簬褰撳墠鏃ユ湡锛岃閲嶆柊閫夋嫨锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
                     }
@@ -907,6 +968,49 @@
             //}
 
         });
+
+        function GetPoorderValue(obj) {
+            var Batchno = Format(new Date(), "yyyy-MM-dd").replaceAll('-', '').substr(2,6);//6浣嶆暟褰撳墠鏃ユ湡
+            
+            var HSubLen = HSubData.length + 1;
+            var a = [];
+            for (let i = 0; i < obj.length; i++) {
+                var row_options = {
+                    //"sorderid": HSubLen, "HPOOrderInterID": obj[i].hmainid, "HPOOrderEntryID": obj[i].hentryid, "HPOOrderBillNo": obj[i].鍗曟嵁鍙�, "HWWOrderInterID": 0,
+                    //"HWWOrderEntryID": 0, "HWWOrderDetaiLID": 0., "HWWOrderBillNo": '', "HBillType": "1102", "HBatchNo": obj[i].HBatchNo, "HMaterID": obj[i].hmaterid,
+                    //"HMaterNumber": obj[i].鐗╂枡浠g爜, "HOldMaterNumber": obj[i].鏃х墿鏂欑紪鐮�, "HMaterShortNumber": obj[i].鐗╂枡缂栫爜, "HMaterName": obj[i].鐗╂枡鍚嶇О,
+                    //"HMaterModel": obj[i].瑙勬牸鍨嬪彿, "HUnitID": obj[i].hunitid, "HUnitNumber": obj[i].璁¢噺鍗曚綅浠g爜, "HUnitName": obj[i].璁¢噺鍗曚綅, "HQty": obj[i].鍙彂璐ф暟閲�,
+                    //"HRQty": obj[i].鍙彂璐ф暟閲�, "HSQty": obj[i].璁㈠崟鏁伴噺, "HPrice": obj[i].鍗曚环, "HMoney": obj[i].閲戦, "HDate": new Date(), "HKFDate": new Date(),
+                    //"HKFPeriod": 0, "HSourceInterID": obj[i].hmainid, "HSourceEntryID": obj[i].hentryid, "HSourceBillType": "1102", "HSourceBillNo": obj[i].鍗曟嵁鍙�,
+                    //"HMTONO": obj[i].HBatchNo, "F_xbkf_Combo": '', "FSHDD": '', "FPrintCount": obj[i].鎵撳嵃鏉$爜鏁伴噺, "HPlanArrivalDate": new Date()
+
+                    "sorderid": HSubLen, "HPOOrderInterID": obj[i].hmainid, "HPOOrderEntryID": obj[i].hsubid, "HPOOrderBillNo": obj[i].璁㈠崟鍗曞彿, "HWWOrderInterID": 0,
+                    "HWWOrderEntryID": 0, "HWWOrderDetaiLID": 0., "HWWOrderBillNo": '', "HBillType": "1102", "HBatchNo": Batchno, "HMaterID": obj[i].hmaterid,
+                    "HMaterNumber": obj[i].鐗╂枡浠g爜, "HOldMaterNumber": obj[i].鏃х墿鏂欑紪鐮�, "HMaterShortNumber": obj[i].鐗╂枡缂栫爜, "HMaterName": obj[i].鐗╂枡鍚嶇О,
+                    "HMaterModel": obj[i].瑙勬牸鍨嬪彿, "HUnitID": obj[i].hunitid, "HUnitNumber": obj[i].璁¢噺鍗曚綅浠g爜, "HUnitName": obj[i].閲囪喘鍗曚綅, "HQty": obj[i].鏈叧鑱旀暟閲�,
+                    "HRQty": obj[i].鏈叧鑱旀暟閲�, "HSQty": obj[i].閲囪喘鏁伴噺, "HPrice": obj[i].鍗曚环, "HMoney": obj[i].閲戦, "HDate": Format(new Date(), "yyyy-MM-dd"), "HKFDate": '',
+                    "HKFPeriod": 0, "HSourceInterID": obj[i].hmainid, "HSourceEntryID": obj[i].hsubid, "HSourceBillType": "1102", "HSourceBillNo": obj[i].璁㈠崟鍗曞彿,
+                    "HMTONO": obj[i].HBatchNo, "F_xbkf_Combo": '', "FSHDD": '', "FPrintCount": obj[i].鎵撳嵃鏉$爜鏁伴噺, "HPlanArrivalDate": new Date(),
+                    "HTAXPRICE_T": obj[i].鍚◣閲嶉噺鍗曚环鍚�
+                };
+                HSubData.push(row_options);
+                HSubLen++;
+
+                //var NewRow = {
+                //    "HMTONO": "", "HMaterID": 0, "HMaterNumber": "", "HOldMaterNumber": "", "HMaterShortNumber": "", "HMaterName": 0, "HMaterModel": "", "HUnitName": "0", "HUnitNumber": "",
+                //    "HUnitID": "0", "FPrintCount": "0", "HRQty": "0", "HSQty": "", "HBatchNo": "", "HKFDate": "", "HKFPeriod": "", "HDate": "", "HPrice": "", "HMoney": "", "HRemark": "", "HPOOrderInterID": "", "HPOOrderEntryID": "", "HPOOrderBillNo": "", "HWWOrderInterID": "", "HWWOrderEntryID": "", "HWWOrderBillNo": "", "HBillType": "", "HSourceBillType": "", "HSourceBillNo": "", "HSupMaterNumber": "", "HSupBatchNo": "", "HExpressNumberSub": "", "HExpressSupplierSub": "", "HPlanArrivalDate": "", "HBoxNumber": "", "HSourceInterID": "", "HSourceEntryID": ""
+                //};
+            };
+            table.reload('mainTable', {
+                data: HSubData
+                , height: 'full-10'
+                , loading: false
+                , done: function (index, res) {
+                    layer.closeAll("loading");
+                }
+            });
+        }
+
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
index c76d25b..145165f 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
@@ -31,26 +31,26 @@
                                             <span>鏇村</span>
                                         </div>
                                     </div>
-                                  
+
                                     <div class="layui-inline">
-                                        <label class="layui-form-label">鍗曟嵁鍙�</label>
-                                        <div class="layui-input-block">
+                                        <label class="layui-form-label">璁㈠崟鍗曞彿</label>
+                                        <div class="layui-input-block" style="width:130px;">
                                             <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
                                         <label class="layui-form-label">鐗╂枡缂栫爜</label>
-                                        <div class="layui-input-block">
+                                        <div class="layui-input-block" style="width:130px;">
                                             <input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
                                         </div>
                                     </div>
-                                    <div class="layui-inline">
+                                    <div class="layui-inline" style="display:none">
                                         <label class="layui-form-label">鏃х墿鏂欑紪鐮�</label>
                                         <div class="layui-input-block">
                                             <input type="text" class="layui-input" name="HOldMaterNumber" id="HOldMaterNumber">
                                         </div>
                                     </div>
-                                    <div class="layui-inline">
+                                    <div class="layui-inline" style="display:none">
                                         <label class="layui-form-label">鐗╂枡浠g爜</label>
                                         <div class="layui-input-block">
                                             <input type="text" class="layui-input" name="HNumber" id="HNumber">
@@ -58,11 +58,74 @@
                                     </div>
                                     <div class="layui-inline">
                                         <label class="layui-form-label">鐗╂枡鍚嶇О</label>
-                                        <div class="layui-input-block">
+                                        <div class="layui-input-block" style="width:130px;">
                                             <input type="text" class="layui-input" name="HName" id="HName">
                                         </div>
                                     </div>
-
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                        <div class="layui-input-block" style="width:100px;">
+                                            <input type="text" class="layui-input" name="HDate1" id="HDate1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                        <div class="layui-input-block" style="width:100px;">
+                                            <input type="text" class="layui-input" name="HDate2" id="HDate2">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐘舵��</label>
+                                        <div class="layui-input-block" style="width:120px">
+                                            <select name="HStatus" id="HStatus" lay-filter="">
+                                                <option value="" selected="">鍏ㄩ儴</option>
+                                                <option value="鏈‘璁�">鏈‘璁�</option>
+                                                <option value="宸茬‘璁�">宸茬‘璁�</option>
+                                                <option value="宸查┏鍥�">宸查┏鍥�</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鍏抽棴鐘舵��</label>
+                                        <div class="layui-input-block" style="width:120px">
+                                            <select id="HClStatus" name="HClStatus" lay-filter="">
+                                                <option value="" selected>鍏ㄩ儴</option>
+                                                <option value="鏈叧闂�">鏈叧闂�</option>
+                                                <option value="宸插叧闂�">宸插叧闂�</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <!--鐟炵惇,鍑礉-->
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">涓氬姟鐘舵��</label>
+                                        <div class="layui-input-block" style="width:120px">
+                                            <select id="HIsClose" name="HIsClose" lay-filter="">
+                                                <option value="鍏ㄩ儴" selected>鍏ㄩ儴</option>
+                                                <option value="姝e父">姝e父</option>
+                                                <option value="涓氬姟鍏抽棴">涓氬姟鍏抽棴</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鍐荤粨鐘舵��</label>
+                                        <div class="layui-input-block" style="width:120px">
+                                            <select id="HIsFreeze" name="HIsFreeze" lay-filter="">
+                                                <option value="鍏ㄩ儴" selected>鍏ㄩ儴</option>
+                                                <option value="姝e父">姝e父</option>
+                                                <option value="涓氬姟鍐荤粨">涓氬姟鍐荤粨</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">瀹屾垚鐘舵��</label>
+                                        <div class="layui-input-block" style="width:120px">
+                                            <select name="HFinishStatus" id="HFinishStatus" lay-filter="">
+                                                <option value="">鍏ㄩ儴</option>
+                                                <option value="鏈畬鎴�" selected="">鏈畬鎴�</option>
+                                                <option value="宸插畬鎴�">宸插畬鎴�</option>
+                                            </select>
+                                        </div>
+                                    </div>
                                     <div class="layui-inline">
                                         <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -73,28 +136,6 @@
                                             <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
                                             <div class="layui-input-block">
                                                 <input type="text" class="layui-input" name="HModel" id="HModel">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">鍏抽棴鐘舵��</label>
-                                            <div class="layui-input-block">
-                                                <select id="HClStatus" name="HClStatus" lay-filter="">
-                                                    <option value="" selected>鍏ㄩ儴</option>
-                                                    <option value="鏈叧闂�">鏈叧闂�</option>
-                                                    <option value="宸插叧闂�">宸插叧闂�</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">寮�濮嬫棩鏈�</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HDate1" id="HDate1">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">缁撴潫鏃ユ湡</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HDate2" id="HDate2">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -130,38 +171,6 @@
                                                 </select>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">璁㈠崟鐘舵��</label>
-                                            <div class="layui-input-block">
-                                                <select name="HStatus" id="HStatus" lay-filter="">
-                                                    <option value="" selected="">鍏ㄩ儴</option>
-                                                    <option value="鏈‘璁�">鏈‘璁�</option>
-                                                    <option value="宸茬‘璁�">宸茬‘璁�</option>
-                                                    <option value="宸查┏鍥�">宸查┏鍥�</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">瀹屾垚鐘舵��</label>
-                                            <div class="layui-input-block">
-                                                <select name="HFinishStatus" id="HFinishStatus" lay-filter="">
-                                                    <option value="">鍏ㄩ儴</option>
-                                                    <option value="鏈畬鎴�" selected="">鏈畬鎴�</option>
-                                                    <option value="宸插畬鎴�">宸插畬鎴�</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <!--鐟炵惇-->
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">涓氬姟鍏抽棴</label>
-                                            <div class="layui-input-block">
-                                                <select id="HIsClose" name="HIsClose" lay-filter="">
-                                                    <option value="鍏ㄩ儴" selected>鍏ㄩ儴</option>
-                                                    <option value="鏄�">鏄�</option>
-                                                    <option value="鍚�">鍚�</option>
-                                                </select>
-                                            </div>
-                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -171,17 +180,21 @@
                     <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                     <script type="text/html" id="toolbarDemo">
                         <div class="layui-btn-container">
+                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
+                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                            </button>
                             <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                            <button type="button" class="layui-btn layui-btn-sm" id="btn_reload" lay-submit="" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-report" id="btn_report"><i class="layui-icon layui-icon-close-fill"></i>姹囨姤</button>
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-barcode"><i class="layui-icon layui-icon-file"></i>鐢熸垚鏉$爜</button>
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-HideColumn"><i class="layui-icon layui-icon-return"></i>闅愯棌鍒楄缃�</button>
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_dao"><i class="layui-icon layui-icon-form"></i>瀵煎嚭</button>
+                            <button type="button" class="layui-btn layui-btn-sm" id="btn_details" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+                            <button type="button" class="layui-btn layui-btn-sm" id="btn_barcode" lay-event="btn-barcode"><i class="layui-icon layui-icon-file"></i>鐢熸垚鏉$爜</button>
+                            <button type="button" class="layui-btn layui-btn-sm" id="btn_generate" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" id="btn_backData" lay-event="btn_backData"><i class="layui-icon layui-icon-add-1"></i>杩斿洖鏁版嵁</button>
+                            <button type="button" class="layui-btn layui-btn-sm" id="btn_exit" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" id="btn_HideColumn" lay-event="btn-HideColumn"><i class="layui-icon layui-icon-return"></i>闅愯棌鍒楄缃�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" id="set_dao" lay-event="set_dao"><i class="layui-icon layui-icon-form"></i>瀵煎嚭</button>
                         </div>
                     </script>
                 </div>
@@ -189,6 +202,8 @@
         </div>
     </div>
     <script src="../../layuiadmin/layui/layui.js" charset="utf-8"></script>
+    <script src="../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
     <script src="../../../../Scripts/webConfig.js"></script>
     <script>
         var _cur_page = 1;
@@ -210,22 +225,7 @@
         }
         var params = getUrlVars();
         var type = params[params[0]];
-        switch (type) {
-            case "UnConfirm":
-                options[1].selected = true;
-                sql += " and 鐘舵�� like ^^%鏈‘璁�%^^";
-                //$("#HStatus").attr("disabled", true)
-                break;
-            case "ReConfirm":
-                options[2].selected = true;
-                sql += " and 鐘舵�� like ^^%宸茬‘璁�%^^";
-                sql += " and 鏈叧鑱旀暟閲� > 0";
-                break;
-            case "ReBack":
-                options[3].selected = true;
-                sql += " and 鐘舵�� like ^^%宸查┏鍥�%^^";
-                break;
-        }
+
         layui.config({
             base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
@@ -246,11 +246,46 @@
             laydate.render({
                 elem: '#HDate2'
             });
+
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            var titleData = ["HItemID", "HParentID"];
+            var titleData = ["HItemID", "HParentID", "鍗曟嵁鍙�", "鏃ユ湡", "鏁伴噺", "鐘舵��", "鍗曚綅", "閲戦"];
             var option = [];
             var HModName = "SRM_POOrderBillList";
+            var sqlWhere = "";
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            switch (type) {
+                case "UnConfirm":
+                    options[1].selected = true;
+                    sql += " and 鐘舵�� like ^^%鏈‘璁�%^^";
+                    //$("#HStatus").attr("disabled", true)
+                    break;
+                case "ReConfirm":
+                    options[2].selected = true;
+                    sql += " and 鐘舵�� like ^^%宸茬‘璁�%^^";
+                    sql += " and 鏈叧鑱旀暟閲� > 0";
+                    break;
+                case "ReBack":
+                    options[3].selected = true;
+                    sql += " and 鐘舵�� like ^^%宸查┏鍥�%^^";
+                    break;
+                //case "AddRow":
+                //    $("#HStatus").attr("disabled", "disabled");
+                //    $("#HStatus").val('宸茬‘璁�');
+                //    $("#HFinishStatus").attr("disabled", "disabled");
+                //    form.render('select');
+                //    sqlWhere += " and 鐘舵�� like ^^%宸茬‘璁�%^^";
+                //    sqlWhere += " and 瀹屾垚鐘舵�� like ^^%" + $("#HFinishStatus").val() + "%^^";
+                //    $('#btn_reload').addClass("layui-btn-disabled").attr("visibility", "hidden");
+                //    $('#btn_confirm').addClass("layui-btn-disabled").attr("disabled", true);
+                //    $('#btn_back').addClass("layui-btn-disabled").attr("disabled", true);
+                //    $('#btn_report').addClass("layui-btn-disabled").attr("disabled", true);
+                //    $('#btn_details').addClass("layui-btn-disabled").attr("disabled", true);
+                //    $('#btn_barcode').addClass("layui-btn-disabled").attr("disabled", true);
+                //    $('#btn_generate').addClass("layui-btn-disabled").attr("disabled", true);
+                //    $('#set_dao').addClass("layui-btn-disabled").attr("disabled", true);
+                //    break;
+            }
+          
             set_ClearBill();
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
             function set_ClearBill() {
@@ -373,7 +408,7 @@
                                 //闅愯棌id
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
-                                    if (option.cols[0][i + 1]["field"] == '鍥炲浜ゆ湡') {
+                                    if (option.cols[0][i + 1]["field"] == '渚涘簲鍟嗕氦鏈熷洖澶�') {
                                         option.cols[0][i + 1]["width"] = 120;
                                     } else {
                                         option.cols[0][i + 1]["width"] = dataCols[3];
@@ -468,7 +503,7 @@
                                     default:
                                         if (data[i].name == '璁㈠崟鏁伴噺' || data[i].name == '宸插彂璐ф暟閲�' || data[i].name == '鏈彂璐ф暟閲�') {
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
-                                        } else if (data[i].name == '鍥炲浜ゆ湡') {
+                                        } else if (data[i].name == '渚涘簲鍟嗕氦鏈熷洖澶�') {
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'HSupSendGoodsDateRemark' });
                                         } else {
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
@@ -532,10 +567,10 @@
                 if ($("#HPURCHASEORGID").val() != "" && $("#HPURCHASEORGID option:selected").text() != "瀹夌憺闆嗗洟")
                     sqlWhere += " and HPURCHASEORGID = ^^" + $("#HPURCHASEORGID").val() + "^^";
                 if ($("#HDate1").val() != "") {
-                    sqlWhere += " and 鏃ユ湡 >= ^^" + $("#HDate1").val() + "^^";
+                    sqlWhere += " and 閲囪喘鏃ユ湡 >= ^^" + $("#HDate1").val() + "^^";
                 }
                 if ($("#HDate2").val() != "") {
-                    sqlWhere += " and 鏃ユ湡 <= ^^" + $("#HDate2").val() + "^^";
+                    sqlWhere += " and 閲囪喘鏃ユ湡 <= ^^" + $("#HDate2").val() + "^^";
                 }
                 if ($("#HISGenerate").val() != "") {
                     if ($("#HISGenerate").val() == "鏄�") {
@@ -547,11 +582,19 @@
                 }
                 /*鐟炵惇*/
                 if ($("#HIsClose").val() != "") {
-                    if ($("#HIsClose").val() == "鏄�") {
-                        sqlWhere += " and 涓氬姟鍏抽棴 = ^^宸插叧闂璣^";
+                    if ($("#HIsClose").val() == "姝e父") {
+                        sqlWhere += " and 涓氬姟鍏抽棴 = ^^姝e父^^";
                     }
-                    else if ($("#HIsClose").val() == "鍚�") {
-                        sqlWhere += " and 涓氬姟鍏抽棴 = ^^鏈叧闂璣^";
+                    else if ($("#HIsClose").val() == "涓氬姟鍏抽棴") {
+                        sqlWhere += " and 涓氬姟鍏抽棴 = ^^涓氬姟鍏抽棴^^";
+                    }
+                }
+                if ($("#HIsFreeze").val() != "") {
+                    if ($("#HIsFreeze").val() == "姝e父") {
+                        sqlWhere += " and 涓氬姟鍐荤粨 = ^^姝e父^^";
+                    }
+                    else if ($("#HIsFreeze").val() == "涓氬姟鍐荤粨") {
+                        sqlWhere += " and 涓氬姟鍐荤粨 = ^^涓氬姟鍐荤粨^^";
                     }
                 }
                 var Time = $("#Time").val();
@@ -598,11 +641,11 @@
                     layer.prompt({
                         formType: 2
                         , area: ['400px', '50px'] //鑷畾涔夋枃鏈煙瀹介珮
-                        , title: '淇敼璁㈠崟鍙蜂负 銆� ' +  data.鍗曟嵁鍙� + ' 銆� 锛岀墿鏂欎唬鐮佷负 銆� ' + data.鐗╂枡浠g爜 + ' 銆� 鐨勫洖澶嶄氦鏈�'
-                        , value: data.鍥炲浜ゆ湡
+                        , title: '淇敼璁㈠崟鍙蜂负 銆� ' + data.鍗曟嵁鍙� + ' 銆� 锛岀墿鏂欎唬鐮佷负 銆� ' + data.鐗╂枡浠g爜 + ' 銆� 鐨勪緵搴斿晢浜ゆ湡鍥炲'
+                        , value: data.渚涘簲鍟嗕氦鏈熷洖澶�
                     }, function (value, index) {
                         layer.close(index);
-                        //鏇存柊鍥炲浜ゆ湡
+                        //鏇存柊渚涘簲鍟嗕氦鏈熷洖澶�
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + "Cg_Poorder/UpdateSupSendGoodsDateRemark",
@@ -612,7 +655,7 @@
                                 if (result.code == 1) {
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
-                                        鍥炲浜ゆ湡: value
+                                        渚涘簲鍟嗕氦鏈熷洖澶�: value
                                     });
                                 } else {
                                     layer.alert(result.Message, { icon: 5 });
@@ -621,7 +664,7 @@
                             error: function (result) {
                                 layer.alert(result.Message, { icon: 5 });
                             }
-                        });                       
+                        });
                     });
                 }
             });
@@ -948,9 +991,35 @@
                             sheet1: data
                         }, '閲囪喘璁㈠崟鍒楄〃.xlsx', 'xlsx');
                         break;
+                    case 'btn_backData':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        parent.GetPoorderValue(data);
+                        var index = parent.layer.getFrameIndex(window.name);
+                        parent.layer.close(index);
+                        break;
                 };
             });
 
+            //琛岀洃鍚簨浠�
+            table.on('row(mainTable)', function (obj) {
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            });
+
         });
     </script>
 </body>
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList_Excel.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList_Excel.html
index c7c03d2..586190c 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList_Excel.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList_Excel.html
@@ -142,12 +142,12 @@
         //鍒濆鍖栬〃鏍�  瀵煎叆淇℃伅
         function set_InitGrid1() {
             var columns = [];
-            columns.push({ type: 'checkbox', fixed: 'left' });
+            columns.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
             columns.push({ field: '缁勭粐', title: '缁勭粐', width: 150 });
             columns.push({ field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 150 });
             columns.push({ field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 150 });
             columns.push({ field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 150 });
-            columns.push({ field: '鏁伴噺', title: '鏁伴噺', width: 150 });
+            columns.push({ field: '鏁伴噺', title: '鏁伴噺', width: 150, totalRow: true});
             columns.push({ field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 150 });
             columns.push({ field: '鍒拌揣鏃ユ湡', title: '鍒拌揣鏃ユ湡', width: 150 });
             columns.push({ field: '鐗╂祦鍗曞彿', title: '鐗╂祦鍗曞彿', width: 150 });
@@ -160,6 +160,7 @@
                 , toolbar: '#toolbarDemo'
                 , height: 'full-190'
                 , page: true
+                , totalRow: true
                 , cellMinWidth: 90
                 , limit: 50
                 , limits: [50, 500, 5000, 20000]
diff --git "a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList\345\244\207\344\273\275.html" "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList\345\244\207\344\273\275.html"
new file mode 100644
index 0000000..d488d8d
--- /dev/null
+++ "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList\345\244\207\344\273\275.html"
@@ -0,0 +1,967 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>閲囪喘璁㈠崟鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+    <!--<link rel="stylesheet" href="../../layuiadmin/layui/css/layui-blue.css" media="all">-->
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/style-self.css" media="all">
+    <style type="text/css">
+        .layui-input-block {
+            width: 190px;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card" style="padding: 1px">
+                    <div class="layui-card-body" style="padding: 1px;">
+                        <!--<div class="test-table-reload-btn" style="margin-bottom: 10px;">-->
+                        <form class="layui-form" action="" lay-filter="component-form-group">
+                            <div class="layui-collapse">
+                                <div class="layui-colla-item">
+                                    <div class="layui-colla-title layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鏇村</span>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡缂栫爜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline" style="display:none">
+                                        <label class="layui-form-label">鏃х墿鏂欑紪鐮�</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HOldMaterNumber" id="HOldMaterNumber">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HName" id="HName">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HModel" id="HModel">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">渚涘簲鍟�</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HSupplier" id="HSupplier">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                    <div class="layui-colla-content" style="padding-left:82px">
+
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍏抽棴鐘舵��</label>
+                                            <div class="layui-input-block">
+                                                <select id="HClStatus" name="HClStatus" lay-filter="">
+                                                    <option value="" selected>鍏ㄩ儴</option>
+                                                    <option value="鏈叧闂�">鏈叧闂�</option>
+                                                    <option value="宸插叧闂�">宸插叧闂�</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HDate1" id="HDate1">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HDate2" id="HDate2">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">浜よ揣鏃堕棿</label>
+                                            <div class="layui-input-block">
+                                                <select id="Time" name="Time" lay-filter="">
+                                                    <option value="0" selected>鍏ㄩ儴</option>
+                                                    <option value="1">涓�鍛ㄥ唴浜よ揣</option>
+                                                    <option value="2">浜屽懆鍐呬氦璐�</option>
+                                                    <option value="3">涓�鏈堝唴浜よ揣</option>
+                                                    <option value="4">涓ゆ湀鍐呬氦璐�</option>
+                                                    <option value="5">涓夋湀鍐呬氦璐�</option>
+                                                    <option value="6">鍗婂勾鍐呬氦璐�</option>
+                                                    <option value="7">涓�骞村唴浜よ揣</option>
+                                                    <option value="8">闀挎湡浜よ揣</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">閲囪喘缁勭粐</label>
+                                            <div class="layui-input-block">
+                                                <select id="HPURCHASEORGID" name="HPURCHASEORGID" lay-filter="">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鏄惁宸蹭笅鎺�</label>
+                                            <div class="layui-input-block">
+                                                <select id="HISGenerate" name="HISGenerate" lay-filter="">
+                                                    <option value="鍏ㄩ儴" selected>鍏ㄩ儴</option>
+                                                    <option value="鏄�">鏄�</option>
+                                                    <option value="鍚�">鍚�</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">璁㈠崟鐘舵��</label>
+                                            <div class="layui-input-block">
+                                                <select name="HStatus" id="HStatus" lay-filter="">
+                                                    <option value="" selected="">鍏ㄩ儴</option>
+                                                    <option value="鏈‘璁�">鏈‘璁�</option>
+                                                    <option value="宸茬‘璁�">宸茬‘璁�</option>
+                                                    <option value="宸查┏鍥�">宸查┏鍥�</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">瀹屾垚鐘舵��</label>
+                                            <div class="layui-input-block">
+                                                <select name="HFinishStatus" id="HFinishStatus" lay-filter="">
+                                                    <option value="">鍏ㄩ儴</option>
+                                                    <option value="鏈畬鎴�" selected="">鏈畬鎴�</option>
+                                                    <option value="宸插畬鎴�">宸插畬鎴�</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <!--鐟炵惇-->
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">涓氬姟鍏抽棴</label>
+                                            <div class="layui-input-block">
+                                                <select id="HIsClose" name="HIsClose" lay-filter="">
+                                                    <option value="鍏ㄩ儴" selected>鍏ㄩ儴</option>
+                                                    <option value="鏄�">鏄�</option>
+                                                    <option value="鍚�">鍚�</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
+                        <!--</div>-->
+                    </div>
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-report" id="btn_report"><i class="layui-icon layui-icon-close-fill"></i>姹囨姤</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-barcode"><i class="layui-icon layui-icon-file"></i>鐢熸垚鏉$爜</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-HideColumn"><i class="layui-icon layui-icon-return"></i>闅愯棌鍒楄缃�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_dao"><i class="layui-icon layui-icon-form"></i>瀵煎嚭</button>
+                        </div>
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="../../layuiadmin/layui/layui.js" charset="utf-8"></script>
+    <script src="../../../../Scripts/webConfig.js"></script>
+    <script>
+        var _cur_page = 1;
+        var sql = "";
+        var options = document.getElementById('HStatus').children;
+        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;
+        }
+
+        function f_alert(sMsg) {
+            layer.alert(sMsg, { icon: 5 });
+        }
+        var params = getUrlVars();
+        var type = params[params[0]];
+        switch (type) {
+            case "UnConfirm":
+                options[1].selected = true;
+                sql += " and 鐘舵�� like ^^%鏈‘璁�%^^";
+                //$("#HStatus").attr("disabled", true)
+                break;
+            case "ReConfirm":
+                options[2].selected = true;
+                sql += " and 鐘舵�� like ^^%宸茬‘璁�%^^";
+                sql += " and 鏈叧鑱旀暟閲� > 0";
+                break;
+            case "ReBack":
+                options[3].selected = true;
+                sql += " and 鐘舵�� like ^^%宸查┏鍥�%^^";
+                break;
+        }
+        layui.config({
+            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer','excel'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , laydate = layui.laydate
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , excel = layui.excel;
+            //甯歌鐢ㄦ硶
+            laydate.render({
+                elem: '#HDate1'
+            });
+            laydate.render({
+                elem: '#HDate2'
+            });
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID", "HParentID"];
+            var option = [];
+            var HModName = "SRM_POOrderBillList";
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            set_ClearBill();
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            function set_ClearBill() {
+                //娓叉煋閲囪喘缁勭粐
+                var Organization = '<option value=' + sessionStorage["OrganizationID"] + ' style="color:red;">' + sessionStorage["Organization"] + '</option>';
+                $("#HPURCHASEORGID").append(Organization);
+                form.render('select');
+                //鍒濆鍖栬〃鏍�
+                //set_InitGrid();
+                //鏄剧ず鍒楁暟鎹�
+                //DisPlay_HideColumn();
+                //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery(table, option)
+            }
+            function set_InitGrid() {
+                //$("#HBeginDate").val("2022-03-14");
+                //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                var columns = [
+                    { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
+                    //{ type: 'radio', fixed: true }
+                    , { field: 'sorderid', title: '搴忓彿', width: 80/*, fixed: true */ }
+                    , { field: 'hmainid', title: 'hmainid', sort: true, /*fixed: true,*/ hide: true }
+                    , { field: 'hsubid', title: 'hsubid', sort: true, /*fixed: true,*/ hide: true }
+                    , { field: '鐘舵��', title: '鐘舵��', sort: true/*, fixed: true */ }
+                    , { field: '鍙嶉鐘舵��', title: '鍙嶉鐘舵��', width: 100/*, fixed: true */}
+                    //, { field: '浼樺厛绾�', title: '浼樺厛绾�', width: 100/*, fixed: true */}
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150, sort: true/*, fixed: 'left' */ }
+                    , { field: '璁″垝璺熻釜鍗曞彿', title: '璁″垝璺熻釜鍗曞彿', sort: true, hide: true }
+                    , { field: '鑷畾涔夋爣璇�', title: '鑷畾涔夋爣璇�', width: 120 }
+                    , { field: '閫佽揣鍦扮偣', title: '閫佽揣鍦扮偣', width: 120 }
+                    , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 120 }
+                    , { field: '鍞竴ID', title: '鍞竴ID', width: 120 }
+                    //, { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120, sort: true }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡缂栫爜', width: 120, sort: true }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120, sort: true }
+                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 80, sort: true }
+                    , { field: '鏁伴噺', title: '璁㈠崟鏁伴噺', sort: true }
+                    , { field: '鎵撳嵃鏉$爜鏁伴噺', title: '鎵撳嵃鏉$爜鏁伴噺', sort: true }
+                    , { field: '宸插彂璐ф暟閲�', title: '宸插彂璐ф暟閲�', sort: true, totalRow: true }
+                    , { field: '鍙彂璐ф暟閲�', title: '鍙彂璐ф暟閲�', sort: true, totalRow: true}
+                    , { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', sort: true }
+                    , { field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', width: 180, sort: true }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true/*, fixed: 'left' */ }
+                    , { field: 'HSupID', title: 'HSupID', width: 180, hide: true }
+                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 180, sort: true/*, fixed: 'left' */ }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120, sort: true }
+                    , { field: '鍓╀綑鍏ュ簱鏁伴噺', title: '鍓╀綑鍏ュ簱鏁伴噺', sort: true }
+                    , { field: '鍓╀綑鏀舵枡鏁伴噺', title: '鍓╀綑鏀舵枡鏁伴噺', sort: true }
+                    , { field: '鍏抽棴鐘舵��', title: '鍏抽棴鐘舵��', sort: true }
+                    , { field: '鍙樻洿鐘舵��', title: '鍙樻洿鐘舵��', sort: true }
+                    , { field: '閲囪喘缁勭粐', title: '閲囪喘缁勭粐', sort: true }
+                    , { field: '纭浜�', title: '纭浜�', sort: true, hide: true }
+                    , { field: '纭鏃ユ湡', title: '纭鏃ユ湡', sort: true, hide: true }
+                    , { field: '椹冲洖浜�', title: '椹冲洖浜�', sort: true, hide: true }
+                    , { field: '椹冲洖鏃ユ湡', title: '椹冲洖鏃ユ湡', sort: true, hide: true }
+                    , { field: '椹冲洖鐞嗙敱', title: '椹冲洖鐞嗙敱', sort: true, hide: true }
+
+                ];
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    //, cellMinWidth: 120
+                    , totalRow: true
+                    , limit: 500
+                    , height: 'full-50'
+                    //, cols: [columns]
+                    , limits: [500, 5000, 20000]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+            }
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            dataCol = data1.data[0].HGridString.split(',');
+                            for (var i = 0; i < dataCol.length; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //闅愯棌id
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    if (option.cols[0][i + 1]["field"] == '鍥炲浜ゆ湡') {
+                                        option.cols[0][i + 1]["width"] = 120;
+                                    } else {
+                                        option.cols[0][i + 1]["width"] = dataCols[3];
+                                    }
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //鍔犺浇鏄剧ず鏁版嵁
+            function get_Display(sqlWhere) {
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "GetPOOrderBill",
+                    async: true,
+                    data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
+                    success: function (data1) {
+                        if (data1.Message == "鑾峰彇鎴愬姛") {
+                        var data = [];
+                        var col = [];
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in data1.list) {
+                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                        }
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                        for (var i = 0; i < data.length; i++) {
+                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else if (data[i].name.indexOf('id') > -1)
+                            {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //id鍒�
+                            }
+                            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 });
+                                        break;
+                                    default:
+                                        if (data[i].name == '璁㈠崟鏁伴噺' || data[i].name == '宸插彂璐ф暟閲�' || data[i].name == '鏈彂璐ф暟閲�') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+                                        } else if (data[i].name == '鍥炲浜ゆ湡') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'HSupSendGoodsDateRemark' });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                        }
+                                }
+                            }
+                        }
+                        //鍔ㄦ�佹樉绀哄垪鍚�
+                        option = {
+                            elem: '#mainTable'
+                            , toolbar: '#toolbarDemo'
+                            , cols: [col]
+                            , data: data1.data
+                            , height: 'full-80'
+                            ,totalRow: true
+                            , page: true
+                            , cellMinWidth: 90
+                            , limit: 500
+                            , limits: [50, 500, 5000, 20000]
+                        }
+                        table.render(option);
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                            layer.close(wait);
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    },
+                    error: function (result) {
+                        layer.close(wait);
+                        layer.alert(result.Message, { icon: 5 });
+                    }
+                });
+            };
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {//鏌ヨ
+                get_FastQuery(table, option);
+            });
+            //鏌ヨ鏉′欢
+            function get_FastQuery(table, option) {
+                var sqlWhere = "";
+                if ($("#HFinishStatus").val() != "")
+                    sqlWhere += " and 瀹屾垚鐘舵�� like ^^%" + $("#HFinishStatus").val() + "%^^";
+                if ($("#HStatus").val() != "")
+                    sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
+                if ($("#HBillNo").val() != "")
+                    sqlWhere += " and 鍗曟嵁鍙� like ^^%" + $("#HBillNo").val() + "%^^";
+                if ($("#HShortNumber").val() != "")
+                    sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HShortNumber").val() + "%^^";
+                if ($("#HOldMaterNumber").val() != "")
+                    sqlWhere += " and 鏃х墿鏂欑紪鐮� like ^^%" + $("#HOldMaterNumber").val() + "%^^";
+                if ($("#HNumber").val() != "")
+                    sqlWhere += " and 鐗╂枡浠g爜 like ^^%" + $("#HNumber").val() + "%^^";
+                if ($("#HName").val() != "")
+                    sqlWhere += " and 鐗╂枡鍚嶇О like ^^%" + $("#HName").val() + "%^^";
+                if ($("#HModel").val() != "")
+                    sqlWhere += " and 瑙勬牸鍨嬪彿 like ^^%" + $("#HModel").val() + "%^^";
+                if ($("#HClStatus").val() != "")
+                    sqlWhere += " and 鍏抽棴鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
+                if ($("#HPURCHASEORGID").val() != "" && $("#HPURCHASEORGID option:selected").text() != "瀹夌憺闆嗗洟")
+                    sqlWhere += " and HPURCHASEORGID = ^^" + $("#HPURCHASEORGID").val() + "^^";
+                if ($("#HDate1").val() != "") {
+                    sqlWhere += " and 鏃ユ湡 >= ^^" + $("#HDate1").val() + "^^";
+                }
+                if ($("#HDate2").val() != "") {
+                    sqlWhere += " and 鏃ユ湡 <= ^^" + $("#HDate2").val() + "^^";
+                }
+                if ($("#HISGenerate").val() != "") {
+                    if ($("#HISGenerate").val() == "鏄�") {
+                        sqlWhere += " and 鏈叧鑱旀暟閲� <= 0";
+                    }
+                    else if ($("#HISGenerate").val() == "鍚�") {
+                        sqlWhere += " and 鏈叧鑱旀暟閲� > 0";
+                    }
+                }
+                /*鐟炵惇*/
+                if ($("#HIsClose").val() != "") {
+                    if ($("#HIsClose").val() == "鏄�") {
+                        sqlWhere += " and 涓氬姟鍏抽棴 = ^^宸插叧闂璣^";
+                    }
+                    else if ($("#HIsClose").val() == "鍚�") {
+                        sqlWhere += " and 涓氬姟鍏抽棴 = ^^鏈叧闂璣^";
+                    }
+                }
+                if ($("#HSupplier").val() != "")
+                    sqlWhere += " and 渚涘簲鍟� like ^^%" + $("#HSupplier").val() + "%^^";
+                
+                var Time = $("#Time").val();
+                if (Time > 0) {
+                    var dd = new Date();
+                    var dt;
+                    switch (Time) {
+                        case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
+                        case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
+                        case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
+                        case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
+                        case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
+                        case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
+                        case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
+                        default: dd = new Date(dd.setDate(dd.getDate()));
+                    }
+                    dt = dd.getFullYear().toString();
+                    if (dd.getMonth() + 1 < 10) {
+                        dt = dt + "-0" + (dd.getMonth() + 1).toString();
+                    }
+                    else {
+                        dt = dt + "-0" + (dd.getMonth() + 1).toString();
+                    }
+                    if (dd.getDate() < 10) {
+                        dt = dt + "-0" + dd.getDate().toString();
+                    }
+                    else {
+                        dt = dt + "-" + dd.getDate().toString();
+                    }
+                    if (Time != 8) {
+                        sqlWhere += " and 浜よ揣鏃ユ湡 <= ^^" + dt + "^^";
+                    }
+                }
+                sql = sqlWhere;
+                //浠庣涓�椤靛紑濮�
+                _cur_page = 1;
+                get_Display(sqlWhere);
+            }
+
+            //鐩戝惉鍗曞厓鏍间簨浠�
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                if (obj.event === 'HSupSendGoodsDateRemark') {
+                    layer.prompt({
+                        formType: 2
+                        , area: ['400px', '50px'] //鑷畾涔夋枃鏈煙瀹介珮
+                        , title: '淇敼璁㈠崟鍙蜂负 銆� ' +  data.鍗曟嵁鍙� + ' 銆� 锛岀墿鏂欎唬鐮佷负 銆� ' + data.鐗╂枡浠g爜 + ' 銆� 鐨勫洖澶嶄氦鏈�'
+                        , value: data.鍥炲浜ゆ湡
+                    }, function (value, index) {
+                        layer.close(index);
+                        //鏇存柊鍥炲浜ゆ湡
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Cg_Poorder/UpdateSupSendGoodsDateRemark",
+                            async: false,
+                            data: { "HInterID": data.hmainid, "HEntryID": data.hsubid, "HSupSendGoodsDateRemark": value},
+                            success: function (result) {
+                                if (result.code == 1) {
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        鍥炲浜ゆ湡: value
+                                    });
+                                } else {
+                                    layer.alert(result.Message, { icon: 5 });
+                                }
+                            },
+                            error: function (result) {
+                                layer.alert(result.Message, { icon: 5 });
+                            }
+                        });                       
+                    });
+                }
+            });
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    case 'btn-getCheckData':
+                        var data = checkStatus.data;
+                        layer.alert(JSON.stringify(data));
+                        break;
+                    case 'btn-reload':
+                        _cur_page = $(".layui-laypage-em").next().html();
+                        get_Display(sql);
+                        break;
+                    case 'btn-HideColumn':
+                        get_HideColumn();
+                        break;
+                    case 'btn-confirm':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        _cur_page = $(".layui-laypage-em").next().html();
+
+                        var HInterIDArr = "";
+                        var HBillNoArr = "";
+                        var HBillInter = "";
+
+                        for (let i = 0; i < data.length; i++) {
+                            HInterIDArr += data[i].hmainid.toString() + ",";
+                            HBillNoArr += "'" + data[i].鍗曟嵁鍙�.toString() + "'" + ",";
+                            HBillInter += data[i].鍗曟嵁鍙�.toString() + "@" + data[i].hmainid.toString() + ",";
+                        }
+
+                        HInterIDArr = HInterIDArr.substring(0, HInterIDArr.length - 1)//鍐呯爜
+                        HBillNoArr = HBillNoArr.substring(0, HBillNoArr.length - 1)//鍗曟嵁鍙�
+                        HBillInter = HBillInter.substring(0, HBillInter.length - 1)//鍗曟嵁鍙� + @ + 鍐呯爜鎷兼帴
+
+                        var oData = JSON.stringify(HInterIDArr) + ";" + JSON.stringify(HBillInter) + ";" + sessionStorage["HUserName"];
+
+                        layer.confirm('鏄惁纭鍗曟嵁?', { icon: 3, title: '鎻愮ず' }, function (index) {
+                            $.ajax({
+                                type: "post",
+                                url: GetWEBURL() + "POOrderAccept",
+                                data: { "oData": oData },
+                                success: function (result) {
+                                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                        layer.msg(result.Message, { icon: 1 });
+                                        get_FastQuery(table, option);
+                                    }
+                                    else {
+                                        // $("#verifycode").click();
+                                        layer.msg(result.Message, { icon: 5 });
+                                    }
+                                    layer.closeAll("loading");
+                                }
+                            })
+                            layer.close(index);
+                        });
+
+                        break;
+                    case 'btn-back':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        _cur_page = $(".layui-laypage-em").next().html();
+                        var HBackRemark;
+                        if (data[0]["鐘舵��"] == "鏈‘璁�") {
+
+                            layer.prompt({
+                                formType: 2,
+                                //value: '',
+                                title: '璇疯緭鍏ラ┏鍥炵悊鐢�',
+                                area: ['400px', '200px'] //鑷畾涔夋枃鏈煙瀹介珮
+                            }, function (value, index, elem) {
+                                HBackRemark = value.toString();
+                                $.ajax({
+                                    type: "get",
+                                    url: GetWEBURL() + "POOrderRefuse",
+                                    data: { "HInterID": data[0]["hmainid"].toString(), "HBillNo": data[0]["鍗曟嵁鍙�"].toString(), "HUser": sessionStorage["HUserName"], "HBackRemark": HBackRemark },
+                                    success: function (result) {
+                                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                            layer.msg("鎷掔粷鎴愬姛锛�", { icon: 1 });
+                                        }
+                                        else {
+                                            // $("#verifycode").click();
+                                            layer.msg(result.Message, { icon: 5 });
+                                        }
+                                        layer.closeAll("loading");
+                                    }
+                                })
+                                //alert(value); //寰楀埌value
+                                layer.close(index);
+                            });
+
+                        }
+                        else {
+                            layer.msg("蹇呴』鏄湭纭鍗曟嵁鎵嶈兘杩涜椹冲洖鎿嶄綔锛�", { icon: 5 });
+                        }
+                        break;
+                    case 'btn-details':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+
+                        var linterid = data[0].hmainid.toString();
+                        //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                        layer.open({
+                            type: 2
+                            , area: ['100%', '100%']
+                            , title: '閲囪喘璁㈠崟'
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: '../../../src/views/SRM/SRM_POOrderBill.html?linterid=' + linterid
+                            , resize: false
+                            , cancel: function () {
+                                //$(".layui-btn").removeClass("layui-btn-disabled");
+                            }
+                        })
+                        break;
+                    case 'btn-generate':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        if (data.length == 0) {
+                            layer.alert("璇烽�夋嫨鏁版嵁", { icon: 5 });
+                            return;
+                        }
+                        if (data[0].瀹屾垚鐘舵�� == "宸插畬鎴�") {
+                            return layer.msg('璁㈠崟宸插畬鎴愶紒')
+                        }
+                        ajaxLabelData = data;
+                        //鏍规嵁閫変腑鐨勯噰璐鍗曪紝閲嶆柊浠庨噾铦朵簯鍚屾閲囪喘璁㈠崟鍏宠仈鏁伴噺杩囨潵銆傝�冭檻閲囪喘璁㈠崟鍒犻櫎鍜屽叧闂姸鎬侊紝鍚屾鐘舵��
+                        var ids = "";
+                        var entryids = "";
+                        $.each(data, function (obj) {
+                            ids += data[obj].hmainid + ",";
+                            entryids += data[obj].hsubid + ",";
+                        })
+                        ids = ids.substring(0, ids.length - 1);
+                        entryids = entryids.substring(0, entryids.length - 1);
+                        var hasPrivileage = true;
+                        $.ajax({
+                            url: GetWEBURL() + 'TestSaverPOInStock',
+                            type: 'get',
+                            async: false,
+                            traditional: true,   //閲嶇偣
+                            data: {
+                                "ids": ids,
+                                "entryids": entryids //閲嶇偣
+                            },
+                            success: function (data) {
+                                if (data.code == "0") {
+                                    layer.alert(data.Message, { icon: 5 });
+                                    get_FastQuery(table, option);
+                                    hasPrivileage = false;
+                                    table.reload('mainTable', {
+                                        height: 'full-10'
+                                        , page: {
+                                            curr: _cur_page //蹇呴』浠庣 1 椤靛紑濮�
+                                        }
+                                        , loading: false
+                                        , done: function (index, res) {
+
+                                        }
+                                    });
+                                    return hasPrivileage;
+                                }
+                            },
+                            error: function (e) {
+                                layer.alert(e.Message, { icon: 5 });
+                            }
+                        });
+                        if (!hasPrivileage) {
+                            return;
+                        }
+                        var rows = '';
+                        var HEntry = '';
+                        for (var i = 0; i < data.length; i++) {
+                            if (data[i]["鐘舵��"] == "宸茬‘璁�") {
+                                rows += data[i].hmainid.toString() + ',' + data[i].hsubid.toString() + ';';
+                            }
+                            else {
+                                HEntry += (i + 1) + ',';
+                            }
+                        }
+                        if (HEntry != '') {
+                            HEntry = HEntry.substring(0, HEntry.length - 1);
+                            layer.msg("绗�" + HEntry + "琛屾湭纭锛�", { icon: 5 });
+                        }
+                        else {
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '閫佽揣鍗�'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                , content: ['../../views/SRM/SRM_POInStockBill_Edit.html?linterid=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString() + '&lSourceBillType=1102', 'yes']
+                                , resize: false
+                                ,end: function () {
+                                    get_FastQuery(table, option)
+                                }
+                            })
+                        }
+                        break;
+                    case 'btn-barcode':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        if (data.length == 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁')
+                        }
+                        if (data[0].瀹屾垚鐘舵�� == "宸插畬鎴�") {
+                            return layer.msg('璁㈠崟宸插畬鎴愶紒')
+                        }
+                        layer.open({
+                            type: 2
+                            , area: ['100%', '100%']
+                            , title: '鏉$爜鐢熸垚'
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: ['../../views/SRM/SRM_BarCodeBill.html?linterid=' + data[0].hmainid + '&lentryid=' + data[0].hsubid + '&type =SRM_POOrderBillList', 'yes']
+                            , resize: false
+                            , cancel: function () {
+                                $(".layui-btn").removeClass("layui-btn-disabled");
+                            }
+                        })
+                        break;
+                    case 'btn-exit':
+                        //var index = parent.layer.getFrameIndex(window.name);
+                        //element.tabDelete('layadmin-layout-tabs', this);
+                        parent.layui.admin.events.closeThisTabs();
+                        //parent.layer.close(index);
+                        break;
+                    case 'btn-report':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        _cur_page = $(".layui-laypage-em").next().html();
+                        var arr = new Array();
+                        var checkStatus = table.checkStatus('mainTable'),
+                            data = checkStatus.data;
+                        if (checkStatus.data.length == 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        for (var i = 0; i < data.length; i++) {
+                            arr.push(data[i].hmainid + '-' + data[i].hsubid);
+                        }
+                        var OrderBackId = "";
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '璁㈠崟鍙嶉鐘舵��',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['80%', '80%'],
+                            maxmin: true,
+                            content: ['../PublicPage/OrderBackInfomation.html', 'yes'],
+                            btn: ['纭畾', '鍙栨秷']
+                            , btn1: function (index, layero) {
+
+                                //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                if (checkStatus.data.length === 0) {
+                                    return layer.msg('璇烽�夋嫨鏁版嵁');
+                                }
+                                OrderBackId = checkStatus.data[0].HItemID.toString();
+
+                                $.ajax({
+                                    url: GetWEBURL() + 'POOrderBack',
+                                    //url: 'http://localhost:8082/LuBaoAPI/' + 'POOrderBack',
+                                    async: false,
+                                    type: "GET",
+                                    dataType: "json",
+                                    data: { "HmainidList": arr.toString(), "OrderBackId": OrderBackId },
+                                    success: function (data1) {
+                                        if (data1.Message.indexOf("鎴愬姛") > 0) {
+                                            layer.msg("鎿嶄綔鎴愬姛", { time: 3 * 1000, icon: 1 }, function () {
+                                                var index = layer.getFrameIndex(window.name);
+                                                //鍏抽棴褰撳墠frame
+                                                layer.close(index);
+                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                                window.location.reload();
+                                            });
+                                        } else {
+                                            layer.alert(data1.Message, { icon: 5 });
+                                        }
+                                    }, error: function (e) {
+                                        layer.alert(data1.Message, { icon: 5 });
+                                    }
+                                });
+                            }
+                            , btn2: function (index, layero) {
+                                //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                            },
+                            end: function () {
+                            },
+                            success: function (layero, index) {
+
+                            }
+                        });
+                        break;
+                    case 'set_dao':
+                        //鑾峰彇鍒楄〃鍒楁暟鎹簮
+                        var ColName = [];
+                        for (var i = 1; i < option.cols[0].length; i++) {
+                            if (option.cols[0][i]["hide"] != true) {
+                                ColName.push(option.cols[0][i]["field"]);
+                            }
+                        }
+                        //缁戝畾鏁版嵁
+                        var data = excel.filterExportData(option.data, ColName)
+
+                        //璧嬪�间簬琛ㄥご鍒楀悕
+                        var Title = [];
+                        for (var i = 0; i < ColName.length; i++) {
+                            Title.push("\"" + ColName[i] + "\":\"" + ColName[i] + "\"");
+                        }
+                        var TitleName = JSON.parse("{" + Title.toString() + "}");
+                        data.unshift(TitleName);
+
+                        //瀵煎嚭 sheet1 宸ヤ綔琛ㄥ悕
+                        excel.exportExcel({
+                            sheet1: data
+                        }, '閲囪喘璁㈠崟鍒楄〃.xlsx', 'xlsx');
+                        break;
+                };
+            });
+
+        });
+    </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POStockInBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POStockInBillList.html
new file mode 100644
index 0000000..7624989
--- /dev/null
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POStockInBillList.html
@@ -0,0 +1,426 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>閲囪喘鍏ュ簱鍗曞垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+    <!--<link rel="stylesheet" href="../../layuiadmin/layui/css/layui-blue.css" media="all">-->
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/style-self.css" media="all">
+    <style type="text/css">
+        .layui-input-block {
+            width: 190px;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card" style="padding: 1px">
+                    <div class="layui-card-body" style="padding: 1px;">
+                        <!--<div class="test-table-reload-btn" style="margin-bottom: 10px;">-->
+                        <form class="layui-form" action="" lay-filter="component-form-group">
+                            <div class="layui-collapse">
+                                <div class="layui-colla-item">
+                                    <div class="layui-colla-title layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鏇村</span>
+                                        </div>
+                                    </div>
+                                  
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡缂栫爜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
+                                        </div>
+                                    </div>                                   
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HName" id="HName">
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline">
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                    <div class="layui-colla-content" style="padding-left:82px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HModel" id="HModel">
+                                            </div>
+                                        </div>                                      
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HDate1" id="HDate1">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HDate2" id="HDate2">
+                                            </div>
+                                        </div>                                        
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">閲囪喘缁勭粐</label>
+                                            <div class="layui-input-block">
+                                                <select id="HPURCHASEORGID" name="HPURCHASEORGID" lay-filter="">
+                                                </select>
+                                            </div>
+                                        </div>                                                                              
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
+                        <!--</div>-->
+                    </div>
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-HideColumn"><i class="layui-icon layui-icon-return"></i>闅愯棌鍒楄缃�</button>
+                        </div>
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="../../layuiadmin/layui/layui.js" charset="utf-8"></script>
+    <script src="../../../../Scripts/webConfig.js"></script>
+    <script>
+        var _cur_page = 1;
+        var sql = "";
+        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;
+        }
+
+        function f_alert(sMsg) {
+            layer.alert(sMsg, { icon: 5 });
+        }
+        var params = getUrlVars();
+        var type = params[params[0]];
+      
+        layui.config({
+            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer','excel'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , laydate = layui.laydate
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , excel = layui.excel;
+            //甯歌鐢ㄦ硶
+            laydate.render({
+                elem: '#HDate1'
+            });
+            laydate.render({
+                elem: '#HDate2'
+            });
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["FID","FSupplierID","FMaterialID","FUnitID","FStockID"];
+            var option = [];
+            var HModName = "SRM_POStockInBillList";
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            set_ClearBill();
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            function set_ClearBill() {
+                //娓叉煋閲囪喘缁勭粐
+                var Organization = '<option value=' + sessionStorage["OrganizationID"] + ' style="color:red;">' + sessionStorage["Organization"] + '</option>';
+                $("#HPURCHASEORGID").append(Organization);
+                form.render('select');
+                //鍒濆鍖栬〃鏍�
+                //set_InitGrid();
+                //鏄剧ず鍒楁暟鎹�
+                //DisPlay_HideColumn();
+                //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery(table, option)
+            }
+                       
+            //鍔犺浇鏄剧ず鏁版嵁
+            function get_Display(sqlWhere) {
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "GetPOInStockInBillList",
+                    async: true,
+                    data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
+                    success: function (data1) {
+                        if (data1.Message == "鑾峰彇鎴愬姛") {
+                        var data = [];
+                        var col = [];
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in data1.list) {
+                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                        }
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                        for (var i = 0; i < data.length; i++) {
+                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else if (data[i].name.indexOf('id') > -1)
+                            {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //id鍒�
+                            }
+                            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 });
+                                        break;
+                                    default:
+                                        if (data[i].name == '璁㈠崟鏁伴噺' || data[i].name == '宸插彂璐ф暟閲�' || data[i].name == '鏈彂璐ф暟閲�') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+                                        } else if (data[i].name == '鍥炲浜ゆ湡') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'HSupSendGoodsDateRemark' });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                        }
+                                }
+                            }
+                        }
+                        //鍔ㄦ�佹樉绀哄垪鍚�
+                        option = {
+                            elem: '#mainTable'
+                            , toolbar: '#toolbarDemo'
+                            , cols: [col]
+                            , data: data1.data
+                            , height: 'full-80'
+                            ,totalRow: true
+                            , page: true
+                            , cellMinWidth: 90
+                            , limit: 500
+                            , limits: [50, 500, 5000, 20000]
+                        }
+                        table.render(option);
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        layer.close(wait);
+                        } else {
+                            table.render(option);
+                            layer.close(wait);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    },
+                    error: function (result) {
+                        layer.close(wait);
+                        layer.alert(result.Message, { icon: 5 });
+                    }
+                });
+            };
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {//鏌ヨ
+                get_FastQuery(table, option);
+            });
+            //鏌ヨ鏉′欢
+            function get_FastQuery(table, option) {
+                var sqlWhere = "";
+               
+                if ($("#HBillNo").val() != "")
+                    sqlWhere += " and 鍗曟嵁鍙� like ^^%" + $("#HBillNo").val() + "%^^";
+                if ($("#HShortNumber").val() != "")
+                    sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HShortNumber").val() + "%^^";
+                if ($("#HOldMaterNumber").val() != "")
+                if ($("#HName").val() != "")
+                    sqlWhere += " and 鐗╂枡鍚嶇О like ^^%" + $("#HName").val() + "%^^";
+                if ($("#HModel").val() != "")
+                    sqlWhere += " and 瑙勬牸鍨嬪彿 like ^^%" + $("#HModel").val() + "%^^";
+                
+                if ($("#HDate1").val() != "") {
+                    sqlWhere += " and 鍏ュ簱鏃ユ湡 >= ^^" + $("#HDate1").val() + "^^";
+                }
+                if ($("#HDate2").val() != "") {
+                    sqlWhere += " and 鍏ュ簱鏃ユ湡 <= ^^" + $("#HDate2").val() + "^^";
+                }
+                    
+                var Time = $("#Time").val();
+                if (Time > 0) {
+                    var dd = new Date();
+                    var dt;
+                    switch (Time) {
+                        case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
+                        case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
+                        case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
+                        case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
+                        case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
+                        case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
+                        case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
+                        default: dd = new Date(dd.setDate(dd.getDate()));
+                    }
+                    dt = dd.getFullYear().toString();
+                    if (dd.getMonth() + 1 < 10) {
+                        dt = dt + "-0" + (dd.getMonth() + 1).toString();
+                    }
+                    else {
+                        dt = dt + "-0" + (dd.getMonth() + 1).toString();
+                    }
+                    if (dd.getDate() < 10) {
+                        dt = dt + "-0" + dd.getDate().toString();
+                    }
+                    else {
+                        dt = dt + "-" + dd.getDate().toString();
+                    }                   
+                }
+                sql = sqlWhere;
+                //浠庣涓�椤靛紑濮�
+                _cur_page = 1;
+                get_Display(sqlWhere);
+            }
+            
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {                  
+                    case 'btn-HideColumn':
+                        get_HideColumn();
+                        break;
+                    case 'btn-exit':
+                        //var index = parent.layer.getFrameIndex(window.name);
+                        //element.tabDelete('layadmin-layout-tabs', this);
+                        parent.layui.admin.events.closeThisTabs();
+                        //parent.layer.close(index);
+                        break;
+                };
+            });
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            dataCol = data1.data[0].HGridString.split(',');
+                            for (var i = 0; i < dataCol.length; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //闅愯棌id
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    if (option.cols[0][i + 1]["field"] == '鍥炲浜ゆ湡') {
+                                        option.cols[0][i + 1]["width"] = 120;
+                                    } else {
+                                        option.cols[0][i + 1]["width"] = dataCols[3];
+                                    }
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+
+        });
+    </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POStockOutBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POStockOutBillList.html
new file mode 100644
index 0000000..cc46878
--- /dev/null
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POStockOutBillList.html
@@ -0,0 +1,424 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>閲囪喘閫�鏂欏崟鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+    <!--<link rel="stylesheet" href="../../layuiadmin/layui/css/layui-blue.css" media="all">-->
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/style-self.css" media="all">
+    <style type="text/css">
+        .layui-input-block {
+            width: 190px;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card" style="padding: 1px">
+                    <div class="layui-card-body" style="padding: 1px;">
+                        <!--<div class="test-table-reload-btn" style="margin-bottom: 10px;">-->
+                        <form class="layui-form" action="" lay-filter="component-form-group">
+                            <div class="layui-collapse">
+                                <div class="layui-colla-item">
+                                    <div class="layui-colla-title layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鏇村</span>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡缂栫爜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
+                                        </div>
+                                    </div>                                  
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HName" id="HName">
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline">
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                        </button>
+                                    </div>
+                                    <div class="layui-colla-content" style="padding-left:82px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HModel" id="HModel">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HDate1" id="HDate1">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HDate2" id="HDate2">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">閲囪喘缁勭粐</label>
+                                            <div class="layui-input-block">
+                                                <select id="HPURCHASEORGID" name="HPURCHASEORGID" lay-filter="">
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
+                        <!--</div>-->
+                    </div>
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-HideColumn"><i class="layui-icon layui-icon-return"></i>闅愯棌鍒楄缃�</button>
+                        </div>
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="../../layuiadmin/layui/layui.js" charset="utf-8"></script>
+    <script src="../../../../Scripts/webConfig.js"></script>
+    <script>
+        var _cur_page = 1;
+        var sql = "";
+        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;
+        }
+
+        function f_alert(sMsg) {
+            layer.alert(sMsg, { icon: 5 });
+        }
+        var params = getUrlVars();
+        var type = params[params[0]];
+
+        layui.config({
+            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer','excel'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , laydate = layui.laydate
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , excel = layui.excel;
+            //甯歌鐢ㄦ硶
+            laydate.render({
+                elem: '#HDate1'
+            });
+            laydate.render({
+                elem: '#HDate2'
+            });
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["FID", "FSupplierID", "FMaterialID", "FUnitID", "FStockID", "FStockOrgID"];
+            var option = [];
+            var HModName = "SRM_POStockInBillList";
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            set_ClearBill();
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            function set_ClearBill() {
+                //娓叉煋閲囪喘缁勭粐
+                var Organization = '<option value=' + sessionStorage["OrganizationID"] + ' style="color:red;">' + sessionStorage["Organization"] + '</option>';
+                $("#HPURCHASEORGID").append(Organization);
+                form.render('select');
+                //鍒濆鍖栬〃鏍�
+                //set_InitGrid();
+                //鏄剧ず鍒楁暟鎹�
+                //DisPlay_HideColumn();
+                //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery(table, option)
+            }
+
+            //鍔犺浇鏄剧ず鏁版嵁
+            function get_Display(sqlWhere) {
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "GetPOInStockOutBillList",
+                    async: true,
+                    data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
+                    success: function (data1) {
+                        if (data1.Message == "鑾峰彇鎴愬姛") {
+                        var data = [];
+                        var col = [];
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in data1.list) {
+                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                        }
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                        for (var i = 0; i < data.length; i++) {
+                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else if (data[i].name.indexOf('id') > -1)
+                            {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //id鍒�
+                            }
+                            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 });
+                                        break;
+                                    default:
+                                        if (data[i].name == '璁㈠崟鏁伴噺' || data[i].name == '宸插彂璐ф暟閲�' || data[i].name == '鏈彂璐ф暟閲�') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+                                        } else if (data[i].name == '鍥炲浜ゆ湡') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'HSupSendGoodsDateRemark' });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                        }
+                                }
+                            }
+                        }
+                        //鍔ㄦ�佹樉绀哄垪鍚�
+                        option = {
+                            elem: '#mainTable'
+                            , toolbar: '#toolbarDemo'
+                            , cols: [col]
+                            , data: data1.data
+                            , height: 'full-80'
+                            ,totalRow: true
+                            , page: true
+                            , cellMinWidth: 90
+                            , limit: 500
+                            , limits: [50, 500, 5000, 20000]
+                        }
+                        table.render(option);
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                            layer.close(wait);
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    },
+                    error: function (result) {
+                        layer.close(wait);
+                        layer.alert(result.Message, { icon: 5 });
+                    }
+                });
+            };
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {//鏌ヨ
+                get_FastQuery(table, option);
+            });
+            //鏌ヨ鏉′欢
+            function get_FastQuery(table, option) {
+                var sqlWhere = "";
+
+                if ($("#HBillNo").val() != "")
+                    sqlWhere += " and 鍗曟嵁鍙� like ^^%" + $("#HBillNo").val() + "%^^";
+                if ($("#HShortNumber").val() != "")
+                    sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HShortNumber").val() + "%^^";
+                if ($("#HName").val() != "")
+                    sqlWhere += " and 鐗╂枡鍚嶇О like ^^%" + $("#HName").val() + "%^^";
+                if ($("#HModel").val() != "")
+                    sqlWhere += " and 瑙勬牸鍨嬪彿 like ^^%" + $("#HModel").val() + "%^^";
+
+                if ($("#HDate1").val() != "") {
+                    sqlWhere += " and 閫�鏂欐棩鏈� >= ^^" + $("#HDate1").val() + "^^";
+                }
+                if ($("#HDate2").val() != "") {
+                    sqlWhere += " and 閫�鏂欐棩鏈� <= ^^" + $("#HDate2").val() + "^^";
+                }
+
+                var Time = $("#Time").val();
+                if (Time > 0) {
+                    var dd = new Date();
+                    var dt;
+                    switch (Time) {
+                        case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
+                        case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
+                        case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
+                        case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
+                        case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
+                        case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
+                        case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
+                        default: dd = new Date(dd.setDate(dd.getDate()));
+                    }
+                    dt = dd.getFullYear().toString();
+                    if (dd.getMonth() + 1 < 10) {
+                        dt = dt + "-0" + (dd.getMonth() + 1).toString();
+                    }
+                    else {
+                        dt = dt + "-0" + (dd.getMonth() + 1).toString();
+                    }
+                    if (dd.getDate() < 10) {
+                        dt = dt + "-0" + dd.getDate().toString();
+                    }
+                    else {
+                        dt = dt + "-" + dd.getDate().toString();
+                    }
+                }
+                sql = sqlWhere;
+                //浠庣涓�椤靛紑濮�
+                _cur_page = 1;
+                get_Display(sqlWhere);
+            }
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    case 'btn-HideColumn':
+                        get_HideColumn();
+                        break;
+                    case 'btn-exit':
+                        //var index = parent.layer.getFrameIndex(window.name);
+                        //element.tabDelete('layadmin-layout-tabs', this);
+                        parent.layui.admin.events.closeThisTabs();
+                        //parent.layer.close(index);
+                        break;
+                };
+            });
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            dataCol = data1.data[0].HGridString.split(',');
+                            for (var i = 0; i < dataCol.length; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //闅愯棌id
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    if (option.cols[0][i + 1]["field"] == '鍥炲浜ゆ湡') {
+                                        option.cols[0][i + 1]["width"] = 120;
+                                    } else {
+                                        option.cols[0][i + 1]["width"] = dataCols[3];
+                                    }
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+
+        });
+    </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html
index 9507b78..018eef5 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/index.html
@@ -162,6 +162,18 @@
                                         <dd data-name="SRM_EntrustOrderBillList_ReBack"><a lay-href="SRM/SRM_EntrustOrderBillList.html?type=ReBack">宸查┏鍥炲澶栬鍗�</a></dd>
                                     </dl>
                                 </dd>
+                                <dd>
+                                    <a>閲囪喘鍏ュ簱璁板綍</a>
+                                    <dl class="layui-nav-child">
+                                        <dd data-name="SRM_POStockInBillList"><a lay-href="SRM/SRM_POStockInBillList.html">閲囪喘鍏ュ簱鍗曞垪琛�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>閲囪喘閫�搴撹褰�</a>
+                                    <dl class="layui-nav-child">
+                                        <dd data-name="SRM_POStockOutBillList"><a lay-href="SRM/SRM_POStockOutBillList.html">閲囪喘閫�鏂欏崟鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
                             </dl>
                         </li>
                         <li data-name="home" class="layui-nav-item">

--
Gitblit v1.9.1