From 7ae052d141e69fe9e19392172fc2960134a03232 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 01 十二月 2025 15:54:52 +0800
Subject: [PATCH] 1.采购入库单列表、直接调拨单列表、其他出库单列表、生产入库列表、销售出库单列表:layui中开发 查看包装明细

---
 WebTM/views/采购管理/采购订单/Cg_POOrderBillQuery.html |  656 ++++++++++++++++++++++-------------------------------------
 1 files changed, 247 insertions(+), 409 deletions(-)

diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
index c900b79..8f9df81 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
@@ -1,5 +1,6 @@
 锘�<!DOCTYPE html>
 <html>
+
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>閲囪喘璁㈠崟鏌ヨ</title>
@@ -18,7 +19,16 @@
     <script src="../../../layuiadmin/HideButton.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/layui-common-custom.js"></script>
+    <script src="../../../layuiadmin/setColumn.js"></script>
+    <style type="text/css">
+        .layui-table-click {
+            background: #ceedfa;
+            color: black
+        }
+    </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-col-md12">
@@ -35,76 +45,111 @@
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鏃ユ湡闂撮殧</label>
                                     <div class="layui-input-block">
-                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
+                                                lay-filter="HInitTimeCycle" style="width:190px;">
                                         </select>
                                     </div>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">寮�濮嬫棩鏈�</label>
                                     <div class="layui-input-block">
-                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
+                                               style="width:190px;">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">缁撴潫鏃ユ湡</label>
                                     <div class="layui-input-block">
-                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+                                               style="width:190px;">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁鍙�</label>
                                     <div class="layui-input-block">
-                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+                                               id="HBillNo" style="width:190px;">
                                     </div>
                                 </div>
-                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
-                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <select name="HUSEORGID" id="HUSEORGID" class=" ForFilteringSchemes" lay-verify="HUSEORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+                                        lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
-                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+                                        lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">
+                                    閲嶇疆
+                                </button>
                                 <!--鏄剧ず褰撳墠杩囨护鏂规-->
                                 <div class="layui-inline" style="margin-left:5px;">
-                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+                                         id="HFilterScheme_Now"></div>
                                 </div>
                                 <div class="layui-colla-content">
                                     <div class="layui-row" style="margin-top:5px">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label">鍗曟嵁鍙�</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
                                             <label class="layui-form-label">涓氬姟鍛�</label>
                                             <div class="layui-input-block">
-                                                <input type="text" class="layui-input ForFilteringSchemes" name="HEmpName" id="HEmpName" style="width:190px;">
+                                                <input type="text" class="layui-input ForFilteringSchemes"
+                                                       name="HEmpName" id="HEmpName" style="width:190px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label">渚涘簲鍟�</label>
                                             <div class="layui-input-block">
-                                                <input type="text" class="layui-input ForFilteringSchemes" name="HSupName" id="HSupName" style="width:190px;">
+                                                <input type="text" class="layui-input ForFilteringSchemes"
+                                                       name="HSupName" id="HSupName" style="width:190px;">
                                             </div>
                                         </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input ForFilteringSchemes"
+                                                       name="HBillno2" id="HBillno2" style="width:190px;">
+                                            </div>
+                                        </div>
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+                                                lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">
+                                            閲嶆柊鍚屾
+                                        </button>
+
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+                                                lay-filter="btnResCnzManual" id="btnResCnzManual"
+                                                style="padding:0 5px">
+                                            鎵嬪伐鍚屾
+                                        </button>
                                     </div>
                                     <div class="layui-inline">
                                         <div class="layui-row" style="margin-top:5px">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">杩囨护</label>
                                                 <div class="layui-input-block">
-                                                    <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                    <select name="ColName" id="ColName" class="ForFilteringSchemes"
+                                                            lay-filter="ColName" style="width:190px;">
                                                     </select>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
+                                                        lay-filter="Comparator" style="width:190px;">
                                                     <option value="0" selected="selected"></option>
                                                     <option value="=">=</option>
                                                     <option value=">=">>=</option>
                                                     <option value=">">></option>
-                                                    <option value="<="><=</option>
-                                                    <option value="<"><</option>
-                                                    <option value="<>"><></option>
+                                                    <option value="<=">
+                                                        <=< /option>
+                                                    <option value="<">
+                                                        << /option>
+                                                    <option value="<>">
+                                                        <>
+                                                    </option>
                                                     <option value="7">鍖呭惈</option>
                                                     <option value="8">宸﹀寘鍚�</option>
                                                     <option value="9">鍙冲寘鍚�</option>
@@ -112,7 +157,8 @@
                                                 </select>
                                             </div>
                                             <div class="layui-inline">
-                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value=""
+                                                       name="ColContent" id="ColContent">
                                             </div>
                                         </div>
 
@@ -120,19 +166,25 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">杩囨护</label>
                                                 <div class="layui-input-block">
-                                                    <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                    <select name="ColName1" id="ColName1" class="ForFilteringSchemes"
+                                                            lay-filter="ColName1" style="width:190px;">
                                                     </select>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
+                                                <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+                                                        class="ForFilteringSchemes" style="width:190px;">
                                                     <option value="0" selected="selected"></option>
                                                     <option value="=">=</option>
                                                     <option value=">=">>=</option>
                                                     <option value=">">></option>
-                                                    <option value="<="><=</option>
-                                                    <option value="<"><</option>
-                                                    <option value="<>"><></option>
+                                                    <option value="<=">
+                                                        <=< /option>
+                                                    <option value="<">
+                                                        << /option>
+                                                    <option value="<>">
+                                                        <>
+                                                    </option>
                                                     <option value="7">鍖呭惈</option>
                                                     <option value="8">宸﹀寘鍚�</option>
                                                     <option value="9">鍙冲寘鍚�</option>
@@ -140,7 +192,8 @@
                                                 </select>
                                             </div>
                                             <div class="layui-inline">
-                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value=""
+                                                       name="ColContent1" id="ColContent1">
                                             </div>
                                         </div>
 
@@ -148,19 +201,25 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">杩囨护</label>
                                                 <div class="layui-input-block">
-                                                    <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                    <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
+                                                            lay-filter="ColName2" style="width:190px;">
                                                     </select>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+                                                <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+                                                        class="ForFilteringSchemes" style="width:190px;">
                                                     <option value="0" selected="selected"></option>
                                                     <option value="=">=</option>
                                                     <option value=">=">>=</option>
                                                     <option value=">">></option>
-                                                    <option value="<="><=</option>
-                                                    <option value="<"><</option>
-                                                    <option value="<>"><></option>
+                                                    <option value="<=">
+                                                        <=< /option>
+                                                    <option value="<">
+                                                        << /option>
+                                                    <option value="<>">
+                                                        <>
+                                                    </option>
                                                     <option value="7">鍖呭惈</option>
                                                     <option value="8">宸﹀寘鍚�</option>
                                                     <option value="9">鍙冲寘鍚�</option>
@@ -168,7 +227,8 @@
                                                 </select>
                                             </div>
                                             <div class="layui-inline">
-                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value=""
+                                                       name="ColContent2" id="ColContent2">
                                             </div>
                                         </div>
                                     </div>
@@ -200,9 +260,10 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="push_POStockInCheckBill" id="push_POStockInCheckBill"><i class="layui-icon layui-icon-set"></i>涓嬫帹(鏉ユ枡妫�楠屽崟)</button>
                             </div>
                         </script>
-                        <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+                        <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
                         <script type="text/html" id="toolbarDemoSub">
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -220,7 +281,7 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
             //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
@@ -236,19 +297,18 @@
             var sWhere = "";
             var option = [];
             var optionSub = [];
-            var Name = "Cg_POOrderBillWidth";
             var HModName = "Cg_POOrderBillQuery";
             var HModNameSub = "Cg_POOrderBillQuerySub";
             var HBillType = "1102";
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1102";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
-            //#endregion 
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
+            //#endregion
 
             ////涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = [];
-            //#endregion 
+            //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
 
@@ -269,7 +329,7 @@
 
             //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
 
-           
+
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
@@ -284,8 +344,8 @@
                     case 'btn-Delete': set_DeleteBill();
                         break;
                     //娴忚
-                    case 'btn-view': get_ViewReport();
-                        break;
+                    //case 'btn-view': get_ViewReport();
+                    //    break;
                     //鎵撳嵃
                     case 'btn-print': get_PrintReport();
                         break;
@@ -364,7 +424,7 @@
                 };
             });
             //琛ㄦ牸鐐瑰嚮浜嬩欢
-            
+
 
             //閲嶆柊鍚屾鎸夐挳
             form.on('submit(btnResCnz)', function (data) {
@@ -376,7 +436,17 @@
                 set_ClearQuery();
             });
 
-            table.on('tool(mainTable)' , function (obj) {
+            //鎵嬪伐鍚屾鎸夐挳
+            form.on('submit(btnResCnzManual)', function (data) {
+                get_ResCnzManual(layer, HBillType, get_FastQuery)
+            })
+
+            //涓嬫帹鏉ユ枡妫�楠屽崟
+            form.on("submit(push_POStockInCheckBill)", function(data){
+                push_POStockInCheckBill()
+            })
+
+            table.on('tool(mainTable)', function (obj) {
                 var data = obj.data;
                 if (obj.event == '鍗曟嵁鍙�') {
                     var linterid = data.hmainid.toString();
@@ -403,45 +473,7 @@
 
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                get_FastQuery(table, option,2);
-            });
-
-            //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
-            form.on('submit(Department)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '渚涘簲鍟嗗垪琛�',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../PublicPage/SupplierInformation.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('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HSupName").val(checkStatus.data[0].HName);
-                        $("#HSupID").val(checkStatus.data[0].HItemID);
-                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) {
-                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                    },
-                    end: function () {
-
-                    },
-                    success: function (layero, index) {
-
-                    }
-                });
+                get_FastQuery(table, option, 2);
             });
 
             //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
@@ -483,134 +515,41 @@
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
-                //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
-                get_FastQuery(table, option,1)
+                ////鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery(table, option, 1)
                 
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
                 get_DefaultModule();
+
+                Organ();
             }
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
                 option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
-                    , height: 'full-330'
+                    , height: 'full-300'
                     , page: true
                     , totalRow: true
                     , cellMinWidth: 90
                     , limit: 50
                     , limits: [50, 500, 5000, 20000]
-                    , cols: [[
-                        { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
-                        ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
-                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150, }
-                        , { field: '鐘舵��', title: '鐘舵��', width: 100, sort: true }
-                        , { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
-                        , { field: '琛岀姸鎬�', title: '琛岀姸鎬�', width: 125, sort: true }
-                        , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 150 }
-                        , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 100 }
-                        //, { field: 'HBillType', title: 'HBillType', hide: true }
-                        //, { field: 'HSupID', title: 'HSupID', hide: true }
-                        //, { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 100, hide: true }
-                        , { field: '鍒嗛厤鐘舵��', title: '鍒嗛厤鐘舵��', width: 100 }
-                        , { field: '鍙戝竷鐘舵��', title: '鍙戝竷鐘舵��', width: 100 }
-                        , { field: '渚涘簲鍟嗗崗鍚岀姸鎬�', title: '渚涘簲鍟嗗崗鍚岀姸鎬�', width: 135 }/*鐗╂枡浠g爜锛岀墿鏂欏悕绉帮紝瑙勬牸鍨嬪彿锛屾壒鍙凤紝鏁伴噺锛屽崟浣嶏紝婧愬崟鍗曞彿*/
-                        , { field: '鍙嶉鐘舵��', title: '渚涘簲鍟嗗弽棣堢姸鎬�', width: 135 }
-                        , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120 }
-                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 130 }
-                        , { field: '鏃х墿鏂欑紪鐮�', title: '鏃х墿鏂欑紪鐮�', width: 130 }
-                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 130 }
-                        , { field: '鏁伴噺', title: '璁㈠崟鏁伴噺', width: 100, totalRow: true }
-                        , { field: '鎵撳嵃鏉$爜鏁伴噺', title: '鎵撳嵃鏉$爜鏁伴噺', width: 120, totalRow: true  }
-                        /* 瀹夌憺鏂板瀛楁 begin */                   
-                        , { field: '鍙墦鍗版潯鐮佹暟閲�', title: '鍙墦鍗版潯鐮佹暟閲�', width: 120, totalRow: true}
-                        /* 瀹夌憺鏂板瀛楁 end */
-                        , { field: '鍏宠仈鏁伴噺', title: '宸插彂璐ф暟閲�', width: 120, totalRow: true}
-                        , { field: '鏈叧鑱旀暟閲�', title: '鍙彂璐ф暟閲�', width: 120, totalRow: true}
-                        /* 瀹夌憺鏂板瀛楁 begin */
-                        , { field: '閫�鏂欐暟閲�', title: '閫�鏂欐暟閲�', width: 120, totalRow: true}
-                        , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 120, totalRow: true}
-                        , { field: '鍏ュ簱鏁伴噺', title: '鍏ュ簱鏁伴噺', width: 120, totalRow: true}
-                        , { field: '鍓╀綑鍏ュ簱鏁伴噺', title: '鍓╀綑鍏ュ簱鏁伴噺', width: 120, totalRow: true}
-                        , { field: '鍓╀綑鏀舵枡鏁伴噺', title: '鍓╀綑鏀舵枡鏁伴噺', width: 120, totalRow: true}
-                        /* 瀹夌憺鏂板瀛楁 end */
-                        , { field: '瀹屾垚鐘舵��', title: '瀹屾垚鐘舵��', width: 100 }
-                        , { field: 'HUnitID', title: 'HUnitID', hide: true }
-                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
-                        //, { field: 'HUnitID', title: 'HUnitID', hide: true }  閲嶅
-                        , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 120 , hide: true }
-                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100 }
-                        , { field: '鎵瑰彿', title: '鎵瑰彿', width: 100 }
-                        , { field: '鏁伴噺', title: '鏁伴噺', width: 100, totalRow: true }
-                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
-                        //, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120, hide: true}
-                        //, { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100, hide: true}
-                        //, { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
-                        , { field: '浼樺厛绾�', title: '浼樺厛绾�', width: 100 }
-                        , { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', width: 100}
-                        , { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
-                        , { field: '閲囪喘鏂瑰紡浠g爜', title: '閲囪喘鏂瑰紡浠g爜', width: 120, hide: true }
-                        , { field: '閲囪喘鏂瑰紡', title: '閲囪喘鏂瑰紡', width: 100}
-                        , { field: 'HSSID', title: 'HSSID', hide: true }
-                        , { field: '缁撶畻鏂瑰紡浠g爜', title: '缁撶畻鏂瑰紡浠g爜', width: 120}
-                        , { field: '缁撶畻鏂瑰紡', title: '缁撶畻鏂瑰紡', width: 100}
-                        , { field: '缁撶畻鏃ユ湡', title: '缁撶畻鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.缁撶畻鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                        , { field: 'HCurID', title: 'HCurID', hide: true }
-                        , { field: '甯佸埆浠g爜', title: '甯佸埆浠g爜', width: 100, hide: true }
-                        , { field: '甯佸埆', title: '甯佸埆', width: 100}
-                        , { field: '姹囩巼', title: '姹囩巼', width: 100}
-                        , { field: 'HDeptID', title: 'HDeptID', hide: true }
-                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 100, hide: true }
-                        , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 100}
-                        , { field: 'HManagerID', title: 'HManagerID', hide: true }
-                        , { field: '涓荤浠g爜', title: '涓荤浠g爜', width: 100, hide: true }
-                        , { field: '涓荤', title: '涓荤', width: 100}
-                        , { field: 'HEmpID', title: 'HEmpID', hide: true }
-                        , { field: '鎽樿', title: '鎽樿', width: 100 }
-                        , { field: 'HWHID', title: '涓昏〃浠撳簱ID', width: 120, hide: true}
-                        , { field: '浠撳簱', title: '涓昏〃浠撳簱', width: 100, hide: true}
-                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 100}
-                        , { field: 'hsubid', title: 'hsubid', hide: true }
-                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
-                        , { field: '鍗曚环', title: '鍗曚环', width: 100}
-                        , { field: '閲戦', title: '閲戦', width: 100, totalRow: true }
-                        , { field: '绋庣巼', title: '绋庣巼', width: 100}
-                        , { field: '绋庨', title: '绋庨', width: 100}
-                        , { field: '鎶樻墸鐜�', title: '鎶樻墸鐜�', width: 100}
-                        , { field: '浠风◣鍚堣', title: '浠风◣鍚堣', width: 100}
-                        , { field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', width: 120, templet: "<div>{{d.浜よ揣鏃ユ湡 ==null ?'':layui.util.toDateString(d.浜よ揣鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                        , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 100}
-                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 100}
-                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100}
-                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
-                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 100}
-                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 120, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                        , { field: '淇敼浜�', title: '淇敼浜�', width: 100}
-                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 120, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 100}
-                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 120, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 125, sort: true }
-                       , { field: '琛屽叧闂棩鏈�', title: '琛屽叧闂棩鏈�', width: 200, templet: "<div>{{d.琛屽叧闂汉 == ''?'':layui.util.toDateString(d.琛屽叧闂棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
-                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 100}
-                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 120, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , cols: [[]]
 
-                ]]
-               
                     , done: function (res, curr, count) {
                         soulTable.render(this);
                     }
                 };
-                
+
                 optionSub = {
                     elem: '#mainTableSub'
                     , toolbar: '#toolbarDemoSub'
-                    , height: 'full-500'
-                    , page: true
+                    //, height: 'full-500'
+                    , page: false
                     , totalRow: true
                     , cellMinWidth: 90
                     , limit: 50
-                    , cols:[[]]
+                    , cols: [[]]
                     , limits: [50, 500, 5000, 20000]
                     , done: function (res, curr, count) {
                         soulTable.render(this);
@@ -624,7 +563,8 @@
                 $.ajax({
                     url: GetWEBURL() + '/Cg_POOrderBill/QueryList',
                     type: "GET",
-                    data: { "sWhere": sWhere  , "user": sessionStorage["HUserName"]},
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             var data = [];//鍒楀瓧娈垫暟鎹�
@@ -642,7 +582,7 @@
                                 }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
+                            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) {
@@ -662,11 +602,11 @@
                                             return '<span style="color: blue;">' + d.褰撳墠瀹℃牳椤圭洰 + '</span>'
                                         }, style: 'cursor: pointer;'
                                     });
-                                }else {
+                                } 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=="琛屽叧闂棩鏈�"?"琛屽叧闂汉":data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{layui.util.toDateString(d." + (data[i].name != "鏃ユ湡" ? data[i].name + ", 'yyyy-MM-dd HH:mm:ss'" : data[i].name + ", 'yyyy-MM-dd'") + ")}}</div>", width: 200 });
                                             break;
                                         default:
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
@@ -681,9 +621,9 @@
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
 
-                            
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            if ($("#ColName option").length < 1) {
                                 ColFilter();
+                                // get_DefaultModule();//鍔犺浇鏂规
                             }
                             layer.close(ajaxLoad);
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -697,7 +637,28 @@
                     }
                 });
             }
-
+            //#region 鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        var Organization = "";
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
             //鏌ヨ瀛愯〃鏁版嵁
             function get_DisplaySub(obj) {
                 var datas = obj; //鑾峰緱褰撳墠琛屾暟鎹�
@@ -712,7 +673,7 @@
                         if (data1.count == 1) {
                             var data = [];//鍒楀瓧娈垫暟鎹�
                             var col = [];
-                            var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�","鍏ュ簱鏁伴噺", "閲戦"];
+                            var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鍏ュ簱鏁伴噺", "閲戦"];
                             titleData = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
                             for (var key in data1.list) {
@@ -725,7 +686,7 @@
                                 }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            col.push({ type: 'radio', 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) {
@@ -830,62 +791,41 @@
                     var InterID = data[0].hmainid.toString();
                     //閫昏緫鍒犻櫎鏂规硶
                     layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                        
-                        if (data[0].鐘舵�� == "鍒涘缓") {
-                            $.ajax({
-                                type: "GET",
-                                url: GetWEBURL() + "/Cg_POOrderBill/DeltetCg_POOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
-                                success: function (result) {
-                                    if (result.count == 1) {
-                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                            // 寰楀埌frame绱㈠紩
-                                            var index = layer.getFrameIndex(window.name);
-                                            //鍏抽棴褰撳墠frame
-                                            layer.close(index);
-                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                            window.location.reload();
-                                        });
 
-                                    } else {
-                                        layer.alert(result.code + result.Message, { icon: 5 });
-                                    }
-                                  
-                                }, error: function () {
-                                    
-                                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        /*if (data[0].鐘舵�� == "鍒涘缓") {*/
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Cg_POOrderBill/DeltetCg_POOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
                                 }
-                            });
-                        } else {
-                            layer.msg('璇ユ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
-                          
-                        }
-                       
+
+                            }, error: function () {
+
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                        //} else {
+                        //    layer.msg('璇ユ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
+
+                        //}
+
                     })
                 }
                 else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                }
-            }
-
-            //棰勮
-            function get_ViewReport() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    layer.open({
-                        type: 2
-                        , area: ['50%', '50%']
-                        , title: '鎵撳嵃妯$増閫夋嫨'
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']
-                        , resize: false
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
                 }
             }
 
@@ -899,10 +839,7 @@
                 }
                 else {
 
-                    var hmainid = [];
-                    for (var i = 0; i < checkStatus.data.length; i++) {
-                        hmainid.push((data[i].hmainid * (10 ** 8)) + data[i].hsubid)
-                    }
+                    var hmainid = data[0].hmainid.toString();
 
                     layer.open({
                         type: 2
@@ -911,7 +848,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainid.toString() + '&MyMsg=' + hmainid.toString() + '&Type=HPOOrderBill', 'yes']
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainid.toString() + '&MyMsg=' + hmainid.toString() + '&Type=HPOOrderBillByID', 'yes']
                         , resize: false
                     })
                 }
@@ -952,7 +889,7 @@
                 }
             }
             //#endregion
-           
+
             //#region 鍙戣捣瀹℃壒
             function set_startCheckBill() {
                 var checkStatus = table.checkStatus('mainTable')
@@ -1157,8 +1094,8 @@
                                     var index = layer.getFrameIndex(window.name);
                                     //鍏抽棴褰撳墠frame
                                     layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    $("#btnSearch").trigger('click');
+                                    //淇敼涓哄姛鍚庡埛鏂板瓙琛ㄧ晫闈�
+                                    $("tr.layui-table-click").trigger("click");
                                 });
 
                             } else {
@@ -1212,125 +1149,15 @@
             //#endregion
 
 
-            //鑾峰彇鍒楀
-            function getColumnsWidth() {
-                var result = [];
-                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
-                //鑾峰彇鍒楀
-                $.ajax({
-                    url: GetWEBURL() + '/Cg_POOrderBill/list',
-                    async: false,
-                    type: "Get",
-                    dataType: "json",
-                    data: { "colNum": colNum, "Name": Name },
-                    success: function (data1) {
-                        if (data1.code == 1) {
-                            result = data1.data;
-                        }
-                        else if (data1.code == -1) {
-
-                        }
-                        else {
-                            layer.alert(data1.Message, { icon: 5 });
-                        }
-                    }, error: function (e) {
-                        layer.alert(e.Message, { icon: 5 });
-                    }
-                });
-
-                return result;
-            }
-            //淇濆瓨鍒楀
-            function set_SaveGridColWidth() {
-                var arr = [];
-                // 鍒楁暟
-                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
-                for (var i = 0; i <= colNum; i++) {
-                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
-                    var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
-                    if (colName != "" && colName != null) {
-                        arr.push(colWidth == -1 ? 200 : colWidth);
-                    }
-                }
-                arr.unshift(40); //棣栦綅杩藉姞
-                $.ajax({
-                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
-                    async: false,
-                    type: "POST",
-                    dataType: "json",
-                    data: { "myMap": JSON.stringify(arr), "Name": Name },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            layer.alert(data1.Message, { icon: 1 });
-                        } else {
-                            layer.alert(data1.Message, { icon: 5 });
-                        }
-                    }, error: function (e) {
-                        layer.alert(e.Message, { icon: 5 });
-                    }
-                });
-                //璁剧疆璧嬪�煎垪瀹�
-                var colWidth = getColumnsWidth();
-                if (colWidth == "" || colWidth == []) {
-
-                }
-                else {
-                    $.each(columns, function (x, m) {
-                        m["width"] = colWidth[x];
-                    });
-                }
-                get_FastQuery(table, option);
-            }
-            //榛樿鍒楀
-            function set_DefaultGridColWidth() {
-                var arr = [];
-                // 鍒楁暟
-                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
-                for (var i = 0; i <= colNum; i++) {
-                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
-                    if (colName != "" && colName != null) {
-                        arr.push(300);   //榛樿瀹藉害200
-                    }
-                }
-                arr.unshift(40); //棣栦綅杩藉姞
-                $.ajax({
-                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
-                    async: false,
-                    type: "POST",
-                    dataType: "json",
-                    data: { "myMap": JSON.stringify(arr), "Name": Name },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            layer.alert(data1.Message, { icon: 1 });
-
-                        } else {
-                            layer.alert(data1.Message, { icon: 5 });
-                        }
-                    }, error: function (e) {
-                        layer.alert(e.Message, { icon: 5 });
-                    }
-                });
-                //璁剧疆璧嬪�煎垪瀹�
-                var colWidth = getColumnsWidth();
-                if (colWidth == "" || colWidth == []) {
-
-                }
-                else {
-                    $.each(columns, function (x, m) {
-                        m["width"] = colWidth[x];
-                    });
-                }
-                get_FastQuery(table, option);
-            }
-
 
             //蹇�熻繃婊�
-            function get_FastQuery(table, option,number) {
+            function get_FastQuery(table, option, number) {
                 var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
                 var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
                 var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
                 var HEmpName = $("#HEmpName").val();
                 var HSupName = $("#HSupName").val();//渚涘簲鍟�
+                var HUSEORGID = $("#HUSEORGID").val();//zuzhi
                 //浠绘剰瀛楁杩囨护
                 var ColName = $("#ColName").val();//澶嶉�夋
                 var Comparator = $("#Comparator").val()
@@ -1427,7 +1254,9 @@
                     sWhere += " and 渚涘簲鍟� like '%" + HSupName + "%'";
 
                 }
-
+                if (HUSEORGID) {
+                    sWhere += " and 缁勭粐 like '%" + HUSEORGID + "%'";
+                }
 
                 sWhere += addSWhereByOpenType();
                 //娣诲姞鏌ヨ鏉′欢锛屾牴鎹綋鍓嶇櫥褰曠敤鎴峰叧鑱旇亴鍛樿繑鍥炴暟鎹�
@@ -1442,15 +1271,10 @@
                 var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                 $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //缁撴潫鏃ユ湡
-                $('#HStatus').find("option[value='-1']").attr("selected", true);
                 $("#HBillNo").val("");
                 $("#HEmpName").val("");
-                $("#HMaterNumber").val("");
-                $("#HOldMaterNumber").val("");
-                $("#HMaterShortNumber").val("");
-                $("#HMaterName").val("");
                 $("#HSupName").val("");
-                $("#HOrgID").val(sessionStorage["OrganizationID"]);
+                /*$("#HOrgID").val(sessionStorage["OrganizationID"]);*/
                 $("#ColContent").val("");
                 $("#ColName").val("0");
                 $("#Comparator").val("0");
@@ -1474,7 +1298,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Cg_POOrderBill/Cg_POOrderBillViewApi',
                     type: "GET",
-                    data: { "BillNo": HBillno2,"BillType":1102 },
+                    data: { "BillNo": HBillno2, "BillType": 1102 },
                     success: function (result) {
                         if (result.count == 1) {
                             layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -1495,7 +1319,6 @@
                     }
                 });
             }
-
             //#endregion
             //鍒锋柊
             function set_Refresh() {
@@ -1545,7 +1368,9 @@
                             dataCol = data1.data[0].HGridString.split(',');
 
                             for (var i = 0; i < option.cols[0].length - 1; i++) {
-                                var dataCols = dataCol[i].split('|');
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
                                     option.cols[0][i + 1]["hide"] = true;
@@ -1579,6 +1404,10 @@
                                 //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
                                 if (dataCols[4] != null && dataCols[4] != "") {
                                     option.cols[0][i + 1]["title"] = dataCols[4];
+                                }
+                                //缁熻鍒�
+                                if (dataCols[6] == 1) {
+                                    option.cols[0][i + 1]["totalRow"] = true;
                                 }
 
                             }
@@ -1658,7 +1487,7 @@
                         if (data1.data.length != 0) {
 
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            console.log(titleData)
+
                             dataCol = data1.data[0].HGridString.split(',');
 
                             for (var i = 0; i < optionSub.cols[0].length - 1; i++) {
@@ -1697,7 +1526,10 @@
                                 if (dataCols[4] != null && dataCols[4] != "") {
                                     optionSub.cols[0][i + 1]["title"] = dataCols[4];
                                 }
-
+                                //缁熻鍒�
+                                if (dataCols[6] == 1) {
+                                    optionSub.cols[0][i + 1]["totalRow"] = true;
+                                }
                             }
 
                             //鍙栨秷鍐荤粨鍒�
@@ -1739,40 +1571,16 @@
 
             //#region 琛岀偣鍑讳簨浠�
             table.on('row(mainTable)', function (obj) {
-                //閫変腑琛屾敼鍙橀鑹�
-                get_DisplaySub(obj.data);
-                //閫変腑琛屾敼鍙橀鑹�
-                check_row(obj);
-            })
-            table.on('row(mainTableSub)', 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).eq(2).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
-                } else {
-                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
-                    $(obj.tr.selector).eq(2).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
-                }
-                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
-                layui.each(table.cache.mainTableSub, function (i, l) {
-                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
-                        l.LAY_CHECKED = flag;
-                    }
-                });
-            })
-            //#endregion
 
-            //#region 鐐瑰嚮琛岄�変腑楂樹寒
-            function check_row(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).first().attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
                 } else {
                     obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
-                    $(obj.tr.selector).first().attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
                 }
                 //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
                 layui.each(table.cache.mainTable, function (i, l) {
@@ -1780,8 +1588,37 @@
                         l.LAY_CHECKED = flag;
                     }
                 });
-            }
+                //鏄剧ず瀛愯〃
+                get_DisplaySub(obj.data);
+
+            })
+            //瀛愯〃鍗曢��
+            table.on('row(mainTableSub)', function (obj) {
+                //鍒ゆ柇鏄惁宸茬粡琚�変腑
+                if (obj.tr.find('.layui-form-radioed').length == 0) {
+                    //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
+                    obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
+                }
+            })
             //#endregion
+
+            //#region 鎺掑簭鍚庨�夋嫨
+            table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+                table.reload('mainTable', {
+                    initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+                    , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+                        field: obj.field //鎺掑簭瀛楁   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                        , order: obj.type //鎺掑簭鏂瑰紡   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                    }
+                });
+                option.data = layui.table.cache["mainTable"];
+                table.render(option);
+                //鍒锋柊鎸夐挳鏄剧ず
+                var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+            });
+            //#endregion
+
             //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
             function setSelect_HInitTimeCycle() {
                 var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
@@ -1860,7 +1697,7 @@
                                 $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
 
-                              
+
                                 ////鎵ц鏌ヨ鏂规硶
                                 //get_FastQuery();
                             } else {
@@ -1875,7 +1712,7 @@
                             //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
                             //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
                             document.getElementById("HFilterScheme_Now").style.display = "none";
-                            ////鎵ц鏌ヨ鏂规硶
+                            //鎵ц鏌ヨ鏂规硶
                             //get_FastQuery()
                             //form.render("select");
                         }
@@ -2070,7 +1907,7 @@
                 var addSWhere = "";
 
                 if (openType == 2) {
-                    addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+                    addSWhere = " and 瀹℃牳浜�! = '' and 鍏抽棴浜� = ''";
                 }
                 return addSWhere;
             }
@@ -2119,4 +1956,5 @@
         //#endregion
     </script>
 </body>
+
 </html>
\ No newline at end of file

--
Gitblit v1.9.1