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 |  236 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 160 insertions(+), 76 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 0c4acb3..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>
@@ -19,6 +20,7 @@
     <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;
@@ -43,79 +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="HBillNo" id="HBillNo" style="width:190px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+                                               id="HBillNo" style="width:190px;">
                                     </div>
                                 </div>
-                                
-                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁勭粐</label>
+                                    <div class="layui-input-block" 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="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;">
+                                                <input type="text" class="layui-input ForFilteringSchemes"
+                                                       name="HBillno2" id="HBillno2" style="width:190px;">
                                             </div>
                                         </div>
-                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+                                                lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">
+                                            閲嶆柊鍚屾
+                                        </button>
 
-                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnzManual" id="btnResCnzManual" 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>
@@ -123,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>
 
@@ -131,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>
@@ -151,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>
 
@@ -159,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>
@@ -179,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>
@@ -211,6 +260,7 @@
                                 <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" style="margin-top:35px"></table>
@@ -231,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
@@ -253,7 +303,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1102";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion
 
             ////涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
@@ -391,7 +441,12 @@
                 get_ResCnzManual(layer, HBillType, get_FastQuery)
             })
 
-            table.on('tool(mainTable)' , function (obj) {
+            //涓嬫帹鏉ユ枡妫�楠屽崟
+            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();
@@ -418,7 +473,7 @@
 
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                get_FastQuery(table, option,2);
+                get_FastQuery(table, option, 2);
             });
 
             //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
@@ -461,10 +516,12 @@
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 ////鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
-                get_FastQuery(table, option,1)
-
+                get_FastQuery(table, option, 1)
+                
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
                 get_DefaultModule();
+
+                Organ();
             }
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
@@ -492,7 +549,7 @@
                     , totalRow: true
                     , cellMinWidth: 90
                     , limit: 50
-                    , cols:[[]]
+                    , cols: [[]]
                     , limits: [50, 500, 5000, 20000]
                     , done: function (res, curr, count) {
                         soulTable.render(this);
@@ -507,7 +564,7 @@
                     url: GetWEBURL() + '/Cg_POOrderBill/QueryList',
                     type: "GET",
                     async: false,
-                    data: { "sWhere": sWhere  , "user": sessionStorage["HUserName"]},
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             var data = [];//鍒楀瓧娈垫暟鎹�
@@ -525,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) {
@@ -545,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>{{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 });
+                                            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 });
@@ -564,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 });
@@ -580,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; //鑾峰緱褰撳墠琛屾暟鎹�
@@ -595,7 +673,7 @@
                         if (data1.count == 1) {
                             var data = [];//鍒楀瓧娈垫暟鎹�
                             var col = [];
-                            var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�","鍏ュ簱鏁伴噺", "閲戦"];
+                            var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鍏ュ簱鏁伴噺", "閲戦"];
                             titleData = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
                             for (var key in data1.list) {
@@ -715,30 +793,30 @@
                     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();
-                                        });
+                        $.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 });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
                                 }
-                            });
+
+                            }, error: function () {
+
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
                         //} else {
                         //    layer.msg('璇ユ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
 
@@ -1073,12 +1151,13 @@
 
 
             //蹇�熻繃婊�
-            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()
@@ -1175,7 +1254,9 @@
                     sWhere += " and 渚涘簲鍟� like '%" + HSupName + "%'";
 
                 }
-
+                if (HUSEORGID) {
+                    sWhere += " and 缁勭粐 like '%" + HUSEORGID + "%'";
+                }
 
                 sWhere += addSWhereByOpenType();
                 //娣诲姞鏌ヨ鏉′欢锛屾牴鎹綋鍓嶇櫥褰曠敤鎴峰叧鑱旇亴鍛樿繑鍥炴暟鎹�
@@ -1217,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 () {
@@ -1287,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;
@@ -1507,7 +1590,7 @@
                 });
                 //鏄剧ず瀛愯〃
                 get_DisplaySub(obj.data);
-                
+
             })
             //瀛愯〃鍗曢��
             table.on('row(mainTableSub)', function (obj) {
@@ -1533,7 +1616,7 @@
                 //鍒锋柊鎸夐挳鏄剧ず
                 var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
                 Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-            }); 
+            });
             //#endregion
 
             //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
@@ -1629,8 +1712,8 @@
                             //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
                             //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
                             document.getElementById("HFilterScheme_Now").style.display = "none";
-                            ////鎵ц鏌ヨ鏂规硶
-                            get_FastQuery()
+                            //鎵ц鏌ヨ鏂规硶
+                            //get_FastQuery()
                             //form.render("select");
                         }
                     }, error: function () {
@@ -1873,4 +1956,5 @@
         //#endregion
     </script>
 </body>
+
 </html>
\ No newline at end of file

--
Gitblit v1.9.1