From e6e2e89ee594f3ffcd8512113bb2ab4ce57f37bb Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 24 十二月 2024 10:13:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html     |   34 +
 WebTM/views/基础资料/通用基础资料/Gy_GeneralLookDown.html   |  151 ++++++
 WebTM/views/采购管理/应付单/Cg_PayableBillList.html      |   33 +
 WebTM/layuiadmin/SetColumn.js                     |   27 +
 WebTM/views/销售管理/应收单/Xs_ReceivableBill.html       |   97 ++--
 WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html   |   34 +
 WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html         |    2 
 WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html |   33 +
 WebTM/views/项目管理/工作任务/PM_WorkTaskBillList.html    |  197 ++++++++
 WebTM/layuiadmin/QueryScheme.js                   |  319 ++++++++++++++
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html       |  333 --------------
 WebTM/WebTM.csproj                                |    1 
 WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html     |   38 +
 13 files changed, 910 insertions(+), 389 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index f8cc25a..b1b71a9 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -97,6 +97,7 @@
     <Content Include="layuiadmin\ckou.js" />
     <Content Include="layuiadmin\echarts.min.js" />
     <Content Include="layuiadmin\grwebapp.js" />
+    <Content Include="layuiadmin\QueryScheme.js" />
     <Content Include="layuiadmin\SetColumn.js" />
     <Content Include="layuiadmin\modules\tableFilter2.js" />
     <Content Include="layuiadmin\PlateBinding.js" />
diff --git a/WebTM/layuiadmin/QueryScheme.js b/WebTM/layuiadmin/QueryScheme.js
new file mode 100644
index 0000000..5de7b7c
--- /dev/null
+++ b/WebTM/layuiadmin/QueryScheme.js
@@ -0,0 +1,319 @@
+锘�//楂樼骇杩囨护 HTableName鏄繖涓垪琛ㄧ殑瑙嗗浘鍚�
+function set_QueryCondition(option, HTableName, get_FastQuery) {
+    var colName = "";
+    var contentUrl = "";
+    for (var i = 0; i < option.cols[0].length; i++) {
+        if (option.cols[0][i]["field"] != undefined && option.cols[0][i]["hide"] != true) {
+            colName += option.cols[0][i]["title"] + ",";
+        }
+    }
+    var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+    var urlLen = urlStr.split('/');
+    for (var i = 0; i < urlLen.length - 4; i++) {
+        contentUrl += "../";
+    }
+    colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+    contentUrl += '../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_QueryCondition.html?HModName=' + HTableName + '&colName=' + colName;
+
+    layer.open({
+        type: 2
+        , skin: "layui-layer-rim" //鍔犱笂杈规
+        , title: "楂樼骇杩囨护"  //鏍囬
+        , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+        , shift: 2 //寮瑰嚭鍔ㄧ敾
+        , area: ["50%", "80%"] //绐椾綋澶у皬
+        , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+        , content: [contentUrl, "yes"]
+        , btn: ["纭畾", "鍙栨秷"]
+        , btn1: function (index, laero) {
+            var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+            var checkStatus = iframeWindow.layui.table.cache["mainTable"];//鑾峰彇閫変腑鐨勬暟鎹�
+            if (checkStatus.length == 0) {
+                return layer.msg("璇疯緭鍏ヨ繃婊ゆ潯浠�!");
+            }
+            var myIframe = window[laero.find('iframe')[0]['name']];
+            GetDataCols += "and (";
+            for (var i = 0; i < checkStatus.length; i++) {
+                GetDataCols += myIframe.get_FastQuery(checkStatus[i]); //get_FastQuery()涓哄瓙椤甸潰鐨勬柟娉�
+                if ((i + 1) < checkStatus.length) {
+                    GetDataCols += " " + checkStatus[i]["HRelationCol"] + " ";
+                }
+            }
+            GetDataCols += ")";
+            //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+            layer.close(index);//鍏抽棴寮圭獥
+        }
+        , end: function () {
+            if (GetDataCols != "") {
+                get_FastQuery();
+            }
+        }
+    })
+}
+
+//#region 銆愯繃婊ゆ柟妗堛��
+
+//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+function get_DefaultModule(get_FastQuery) {
+    $.ajax({
+        url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+        type: "GET",
+        async: false,
+        data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+        success: function (data1) {
+            if (data1.count == 1) {
+                //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+                var data = data1.data;
+                //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+                HInterID_Choose = data[0].hmainid;
+                //杩囨护鏂规鍐呯爜
+                HInterID = data[0].hmainid
+                //杩囨护鏂规鍚嶇О
+                HDefaultFilter = data[0].鏂规鍚嶇О
+                //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+                var HRemark = data[0].澶囨敞
+                //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+                document.getElementById("HFilterScheme_Now").style.display = "block";
+                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+                for (let i = 0; i < data.length; i++) {
+                    $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                    if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                        $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                    }
+                }
+
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                if (HInitTimeCycle != -1) {
+                    //$('#HDate').prop('disabled', true);
+                    //$('#HDate1').prop('disabled', true);
+
+                    $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    //鎵ц鏌ヨ鏂规硶
+                    get_FastQuery();
+                } else {
+                    //$('#HDate').prop('disabled', false);
+                    //$('#HDate1').prop('disabled', false);
+                }
+
+
+                //鎵ц鏌ヨ鏂规硶
+                get_FastQuery()
+                //form.render("select");
+            } else {
+                //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                document.getElementById("HFilterScheme_Now").style.display = "none";
+                //鎵ц鏌ヨ鏂规硶
+                //get_FastQuery()
+                //form.render("select");
+            }
+        }, error: function () {
+            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+        }
+    });
+}
+
+//淇濆瓨鏂规
+function set_SaveScheme(get_FastQuery) {
+    var index = layer.open()
+    //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+    var HIsClose_Manual = false;
+    //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+    var Filter = document.getElementsByClassName(HClassTag);
+
+    var HFilterIdList = "";//杩囨护鏉′欢
+    var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+    var HValue = "";//杩囨护鍊�
+    var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+    for (var i = 0; i < Filter.length; i++) {
+        HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+        HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+        HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+        HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+    }
+
+    //鍘婚櫎鏈熬閫楀彿
+    HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+    HValue = HValue.substring(0, HValue.length - 1);
+    HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+    //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+    if (HDefaultFilter == "") {
+        layer.open({
+            type: 2
+            , area: ['40%', '80%']
+            , title: '杩囨护鏂规'
+            , shift: 0//寮瑰嚭鍔ㄧ敾
+            , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+            , cancel: function () {
+                // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                HIsClose_Manual = true;
+            }
+            , end: function () {
+                if (HIsClose_Manual != true) {
+                    get_FastQuery();
+                    //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                    document.getElementById("HFilterScheme_Now").style.display = "block";
+                    document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                }
+            }
+        })
+        layer.close(index)
+    } else {
+        //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+        layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+            title: "鎿嶄綔鎻愮ず",
+            icon: 0,
+            btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+        }, function (index, layero) {
+            //鏂板
+            layer.open({
+                type: 2
+                , area: ['40%', '80%']
+                , title: '杩囨护鏂规'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                , end: function () {
+                    get_FastQuery()
+                    //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                    document.getElementById("HFilterScheme_Now").style.display = "block";
+                    document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                }
+            })
+            layer.close(index)
+        }, function (index) {
+            //缂栬緫
+            var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+            HFilterIdList = "";
+            HFilterIdLists = "";
+            HValue = "";
+            HElement_type = "";
+            for (var i = 0; i < Filter_Edit.length; i++) {
+                HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+            }
+            //鍘婚櫎鏈熬閫楀彿
+            HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+            HValue = HValue.substring(0, HValue.length - 1);
+            HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+            var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+            //淇敼
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                async: true,
+                data: { "oMain": sMainSub },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                    }
+                    else {
+
+                    }
+                    layer.closeAll("loading");
+                },
+                error: function (err) {
+
+
+                }
+            });
+            layer.close(index)
+        }, function (index) {
+            //鍙栨秷
+            layer.alert('鍙栨秷')
+            layer.close(index)
+        });
+    }
+
+}
+
+//璇诲彇鏂规
+function set_ReadScheme(get_FastQuery) {
+    var HIsClose_Manual = false;
+    var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+    var HFilterIdList = "";
+    var HFilterIdLists = "";
+    var HValue = "";
+    var HElement_type = "";
+    for (var i = 0; i < Filter.length; i++) {
+        HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+        HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+        HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+        HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+    }
+    //鍘婚櫎鏈熬閫楀彿
+    HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+    HValue = HValue.substring(0, HValue.length - 1);
+    HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+    layer.open({
+        type: 2
+        , area: ['80%', '80%']
+        , title: '杩囨护鏂规鍒楄〃'
+        , shift: 0//寮瑰嚭鍔ㄧ敾
+        , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+        , cancel: function () {
+            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+            HIsClose_Manual = true;
+        }
+        , end: function () {
+            if (HIsClose_Manual != true) {
+                get_FastQuery()
+                form.render("select");
+            }
+        }
+    })
+}
+//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+{
+    var HInterID = obj[0].hmainid;
+    HInterID_Choose = obj[0].hmainid;
+    $.ajax({
+        url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+        type: "GET",
+        data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+        success: function (data1) {
+            if (data1.count == 1) {
+                var data = data1.data;
+                //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                HDefaultFilter = data[0].鏂规鍚嶇О
+                var HRemark = data[0].澶囨敞
+                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                document.getElementById("HFilterScheme_Now").style.display = "block";
+                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                HInterID = data[0].hmainid
+                //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                for (let i = 0; i < data.length; i++) {
+                    $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                    if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                        $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                    }
+                }
+
+            } else {
+                layer.close(ajaxLoad);
+                layer.alert(data1.code + data1.Message, { icon: 5 });
+            }
+        }, error: function () {
+            layer.close(ajaxLoad);
+            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+        }
+    });
+}
+//#endregion
+
+//#endregion
+
diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
index 876ec63..2c354f5 100644
--- a/WebTM/layuiadmin/SetColumn.js
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -29,6 +29,33 @@
 }
 //#endregion
 
+//#region 闅愯棌鍒楄缃� 娌″垎椤垫彃浠�
+function get_HideColumnNoPage(HModName, user, option, get_Display) {
+    var colName = "";
+    for (var i = 1; i < option.cols[0].length; i++) {
+        colName += option.cols[0][i]["field"] + ",";
+    }
+
+    colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+    layer.open({
+        type: 2
+        , skin: "layui-layer-rim" //鍔犱笂杈规
+        , title: "闅愯棌鍒楄缃�"  //鏍囬
+        , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+        , shift: 2 //寮瑰嚭鍔ㄧ敾
+        , area: ["50%", "90%"] //绐椾綋澶у皬
+        , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+        , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+        , btn: ["纭畾", "鍙栨秷"]
+        , btn1: function (index, laero) {
+            //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_Display();
+            //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+            layer.close(index);//鍏抽棴寮圭獥
+        }
+    })
+}
+//#endregion
 
 //#region 璁剧疆琛ㄦ牸椤靛ぇ灏忓垵濮�
 function DisPlay_HideColumn_GetPageSize(HModName, user,optionPage) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\200\232\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GeneralLookDown.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\200\232\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GeneralLookDown.html"
index 43e74b6..91517aa 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\200\232\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GeneralLookDown.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\200\232\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GeneralLookDown.html"
@@ -11,6 +11,8 @@
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
 </head>
 <body>
     <div class="layui-fluid" style="padding: 0;">
@@ -53,9 +55,18 @@
 
         //鑾峰彇鍙傛暟
         var params = getUrlVars();
-        var linterid = params[params[0]];           //浠庡弬鏁颁腑鑾峰彇 婧愬崟鍗曟嵁鍐呯爜
+        var HInterID = params[params[0]];           //浠庡弬鏁颁腑鑾峰彇 婧愬崟鍗曟嵁鍐呯爜
         var HModName = params[params[1]];           //浠庡弬鏁颁腑鑾峰彇鍒楄缃甿odname
-        var url = "";
+        var HEntryID = params[params[2]];           //浠庡弬鏁颁腑鑾峰彇 婧愬崟瀛愬唴鐮佹殏鏃舵棤鐢�
+        var url = "";                             //ajax鍦板潃
+        var content = "";                         //缂栬緫椤甸潰鍦板潃
+        var ajaxData = {};                       //ajax鎺ュ彛浼犺緭鏁版嵁
+        //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+        var HModuleType = "";
+        //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+        var HPageTitle = "";
+        //#endregion
+
         //#endregion
 
         //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -80,11 +91,42 @@
             switch (obj.event) {
                 //鍒楄缃�
                 case 'set_HideColumn':
-                    get_HideColumn();
+                    get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_Display);
                     break;
             }
         });
         //#endregion
+
+        //#region  鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            var data = obj.data;
+
+            //鍗曟嵁鍙疯秴閾炬帴
+            if (obj.event == '鍗曟嵁鍙�') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+                var linterid = data.hmainid.toString();    //澹版槑鍙橀噺linterid 涓� data.hmainid
+                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+                    type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+                    , area: ['100%', '100%']
+                    , title: '缂栬緫' + HPageTitle  //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+                    , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: content+'?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'  //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+
+                    , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+                    end: function () {  //褰撳叧闂椂璋冪敤
+                        get_FastQuery();
+                    }
+                    , cancel: function () {  //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            }
+        });
+             //#endregion
+
 
         //#endregion
 
@@ -92,7 +134,10 @@
         //#region 鍒濆鍖栫晫闈�
         function set_ClearBill()
         {
+            set_url();
+            //鍒濆鍖栬〃鏍�
             set_InitGrid();
+            //鏌ヨ
             get_Display();
         }
         //#endregion
@@ -103,8 +148,8 @@
             option ={
                 elem: '#mainTable'
                 , toolbar: '#toolbarDemo'
-                , height: 550
-                //, page: true
+                , height: 'full-120'
+                , page: false
                 , cellMinWidth: 90
                 , limit: Number.MAX_VALUE
                 //, limits: [50, 500, 5000, 20000]
@@ -112,10 +157,38 @@
         }
         //#endregion
 
-        //#region 鏍规嵁modname璁剧疆url
-        function set_url(modname) {
-            if (modname == "") {
-
+        //#region 鏍规嵁modname璁剧疆url鍜宎jaxdata
+        function set_url() {
+            if (HModName == "Kf_SellOutBillList") {//閿�鍞嚭搴�
+                url = '/Kf_SellOutBill/GetSellOutBillList_byPage';
+                ajaxData = { "sWhere": "and HSourceInterID=" + HInterID, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"], "page": 1, "size": 1000 };
+                HModuleType = "1205";
+                content = "../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html";//缂栬緫鍦板潃
+                HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            } else if (HModName == "Xs_ReceivableBillList") {//搴旀敹鍗�
+                url = '/Xs_ReceivableBill/list_byPage';
+                ajaxData = { "sWhere": "and HSourceInterID=" + HInterID, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"], "page": 1, "size": 1000 };
+                HModuleType = "1426";
+                content = "../../閿�鍞鐞�/搴旀敹鍗�/Xs_ReceivableBill.html";//缂栬緫鍦板潃
+                HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            } else if (HModName == "Kf_POStockInBillList") {//閲囪喘鍏ュ簱鍗�
+                url = '/Kf_POStockInBill/page';
+                ajaxData = { "sWhere": "and 婧愬崟涓诲唴鐮�=" + HInterID, "user": sessionStorage["HUserName"],"page": 1, "size": 1000 };
+                HModuleType = "1201";
+                content = "../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html";//缂栬緫鍦板潃
+                HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            } else if (HModName == "Cg_PayableBillList") {//搴斾粯鍗�
+                url = '/Cg_PayableBill/page';
+                ajaxData = { "sWhere": "and HSourceInterID=" + HInterID, "user": sessionStorage["HUserName"], "page": 1, "size": 1000 };
+                HModuleType = "1114";
+                content = "../../閲囪喘绠$悊/搴斾粯鍗�/Cg_PayableBill.html";//缂栬緫鍦板潃
+                HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            } else if (HModName == "YF_PayMentBillList") {//搴斾粯鍗�
+                url = '/YF_PayMentBill/page';
+                ajaxData = { "sWhere": "and 婧愬崟涓诲唴鐮�=" + HInterID, "user": sessionStorage["HUserName"], "page": 1, "size": 1000 };
+                HModuleType = "2103";
+                content = "../../閲囪喘绠$悊/浠樻鍗�/YF_PayMentBill.html";//缂栬緫鍦板潃
+                HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
             }
         }
         //#endregion
@@ -123,12 +196,66 @@
         //#region 鏌ヨ
         function get_Display() {
             var ajaxLoad = layer.load();
+            if (url == "") {
+                layer.alert("鏃犲搴旀帴鍙e湴鍧�", { icon: 5 });
+                layer.close(ajaxLoad);
+                return false;
+            }
             $.ajax({
-                url: GetWEBURL() + '/Kf_SellOutBill/SellOutBill_LookDown',
+                url: GetWEBURL() + url,
                 type: "GET",
-                data: { "HInterID": linterid},
+                data: ajaxData,
                 success: function (data1) {
-                    if (data1.count == 1) {
+                    if (data1.code == 1) {
+                        var titleData = [];
+                        var data = [];
+                        var col = [];
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in data1.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(data1.list[key].ColmCols)) {
+                                titleData[key] = data1.list[key].ColmCols;
+                            }
+                        }
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                        for (var i = 0; i < data.length; i++) {
+                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            } else if (data[i].name == '鍗曟嵁鍙�') {
+                                col.push({
+                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�'
+                                    , event: '鍗曟嵁鍙�', templet: function (d) {
+                                        return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+                                    }, style: 'cursor: pointer;'
+                                });
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+                                        break;
+                                    case 'Decimal':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
+                                        break;
+                                    case 'Int32':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
+                                        break;
+                                    default:
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
+                                }
+                            }
+                        }
+                        option.cols = [col];
+                        option.data = data1.data;
+                        //鍒楄缃�
+                        DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
+                        table.render(option);
                         layer.close(ajaxLoad);
                     } else {
                         layer.close(ajaxLoad);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index f6e153d..8b4d6bd 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -16,6 +16,7 @@
     <script src="../../../layuiadmin/HideButton.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/QueryScheme.js"></script>
 </head>
 <body>
     <div class="layui-fluid">
@@ -376,7 +377,7 @@
             //#region 銆愯繃婊ゆ柟妗堛��
 
             //杩囨护鏉′欢鐨刢lass绫�
-            var HClassTag = "ForFilteringSchemes";
+            window.HClassTag = "ForFilteringSchemes";
             //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
             window.HModuleName = "鐢熶骇璁㈠崟";
             //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
@@ -617,14 +618,14 @@
                     case 'set_Remark': set_Remark();
                         break;
                     //淇濆瓨鏂规
-                    case 'set_SaveScheme': set_SaveScheme();
+                    case 'set_SaveScheme': set_SaveScheme(get_FastQuery);
                         break;
                     //璇诲彇鏂规
-                    case 'set_ReadScheme': set_ReadScheme();
+                    case 'set_ReadScheme': set_ReadScheme(get_FastQuery);
                         break;
                     //楂樼骇杩囨护
                     case 'set_QueryCondition':
-                        set_QueryCondition();
+                        set_QueryCondition(option, "h_v_IF_ICMOBillList", get_FastQuery);
                         break;
                 };
             });
@@ -759,7 +760,7 @@
                 //鏌ヨ
                 get_FastQuery();
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
-                get_DefaultModule();
+                get_DefaultModule(get_FastQuery);
             }
             //#endregion
 
@@ -2710,289 +2711,6 @@
                 return res;
             }
 
-            //#region 銆愯繃婊ゆ柟妗堛��
-
-            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
-            function get_DefaultModule() {
-                $.ajax({
-                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
-                    type: "GET",
-                    async: false,
-                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
-                            var data = data1.data;
-                            //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
-                            HInterID_Choose = data[0].hmainid;
-                            //杩囨护鏂规鍐呯爜
-                            HInterID = data[0].hmainid
-                            //杩囨护鏂规鍚嶇О
-                            HDefaultFilter = data[0].鏂规鍚嶇О
-                            //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
-                            var HRemark = data[0].澶囨敞
-                            //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
-                            document.getElementById("HFilterScheme_Now").style.display = "block";
-                            document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
-                            //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
-                            for (let i = 0; i < data.length; i++) {
-                                $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
-                                if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
-                                    $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
-                                }
-                            }
-
-                            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
-                            //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
-                            if (HInitTimeCycle != -1) {
-                                //$('#HDate').prop('disabled', true);
-                                //$('#HDate1').prop('disabled', true);
-
-                                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
-                                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
-
-                                //鎵ц鏌ヨ鏂规硶
-                                get_FastQuery();
-                            } else {
-                                //$('#HDate').prop('disabled', false);
-                                //$('#HDate1').prop('disabled', false);
-                            }
-
-
-                            //鎵ц鏌ヨ鏂规硶
-                            get_FastQuery()
-                            form.render("select");
-                        } else {
-                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
-                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
-                            document.getElementById("HFilterScheme_Now").style.display = "none";
-                            //鎵ц鏌ヨ鏂规硶
-                            get_FastQuery()
-                            form.render("select");
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-            }
-
-            //淇濆瓨鏂规
-            function set_SaveScheme() {
-                var index = layer.open()
-                //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
-                var HIsClose_Manual = false;
-                //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
-                var Filter = document.getElementsByClassName(HClassTag);
-
-                var HFilterIdList = "";//杩囨护鏉′欢
-                var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
-                var HValue = "";//杩囨护鍊�
-                var HElement_type = "";//杩囨护鏍囩绫诲瀷
-
-                for (var i = 0; i < Filter.length; i++) {
-                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
-                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
-                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
-                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
-                }
-
-                //鍘婚櫎鏈熬閫楀彿
-                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
-                HValue = HValue.substring(0, HValue.length - 1);
-                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
-
-                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
-                if (HDefaultFilter == "") {
-                    layer.open({
-                        type: 2
-                        , area: ['40%', '80%']
-                        , title: '杩囨护鏂规'
-                        , shift: 0//寮瑰嚭鍔ㄧ敾
-                        , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
-                        , cancel: function () {
-                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
-                            HIsClose_Manual = true;
-                        }
-                        , end: function () {
-                            if (HIsClose_Manual != true) {
-                                get_FastQuery();
-                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
-                                document.getElementById("HFilterScheme_Now").style.display = "block";
-                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
-                            }
-                        }
-                    })
-                    layer.close(index)
-                } else {
-                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
-                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
-                        title: "鎿嶄綔鎻愮ず",
-                        icon: 0,
-                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
-                    }, function (index, layero) {
-                        //鏂板
-                        layer.open({
-                            type: 2
-                            , area: ['40%', '80%']
-                            , title: '杩囨护鏂规'
-                            , shift: 0//寮瑰嚭鍔ㄧ敾
-                            , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
-                            , end: function () {
-                                get_FastQuery()
-                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
-                                document.getElementById("HFilterScheme_Now").style.display = "block";
-                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
-                            }
-                        })
-                        layer.close(index)
-                    }, function (index) {
-                        //缂栬緫
-                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
-                        HFilterIdList = "";
-                        HFilterIdLists = "";
-                        HValue = "";
-                        HElement_type = "";
-                        for (var i = 0; i < Filter_Edit.length; i++) {
-                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
-                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
-                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
-                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
-                        }
-                        //鍘婚櫎鏈熬閫楀彿
-                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
-                        HValue = HValue.substring(0, HValue.length - 1);
-                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
-
-                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
-
-                        //淇敼
-                        $.ajax({
-                            type: "POST",
-                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            async: true,
-                            data: { "oMain": sMainSub },
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
-                                }
-                                else {
-
-                                }
-                                layer.closeAll("loading");
-                            },
-                            error: function (err) {
-
-
-                            }
-                        });
-                        layer.close(index)
-                    }, function (index) {
-                        //鍙栨秷
-                        layer.alert('鍙栨秷')
-                        layer.close(index)
-                    });
-                }
-
-            }
-
-            //璇诲彇鏂规
-            function set_ReadScheme() {
-                var HIsClose_Manual = false;
-                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
-
-                var HFilterIdList = "";
-                var HFilterIdLists = "";
-                var HValue = "";
-                var HElement_type = "";
-                for (var i = 0; i < Filter.length; i++) {
-                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
-                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
-                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
-                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
-                }
-                //鍘婚櫎鏈熬閫楀彿
-                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
-                HValue = HValue.substring(0, HValue.length - 1);
-                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
-
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '杩囨护鏂规鍒楄〃'
-                    , shift: 0//寮瑰嚭鍔ㄧ敾
-                    , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
-                    , cancel: function () {
-                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
-                        HIsClose_Manual = true;
-                    }
-                    , end: function () {
-                        if (HIsClose_Manual != true) {
-                            get_FastQuery()
-                            form.render("select");
-                        }
-                    }
-                })
-            }
-
-            //楂樼骇杩囨护
-            function set_QueryCondition() {
-                var colName = "";
-                var contentUrl = "";
-                for (var i = 0; i < option.cols[0].length; i++) {
-                    if (option.cols[0][i]["field"] != undefined && option.cols[0][i]["hide"] != true) {
-                        colName += option.cols[0][i]["title"] + ",";
-                    }
-                }
-                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
-                var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 4; i++) {
-                    contentUrl += "../";
-                }
-                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
-                var HModBillName = "h_v_IF_ICMOBillList";//绛変簬璇ュ垪琛ㄧ殑瑙嗗浘
-
-                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_QueryCondition.html?HModName=' + HModBillName + '&colName=' + colName;
-
-                layer.open({
-                    type: 2
-                    , skin: "layui-layer-rim" //鍔犱笂杈规
-                    , title: "楂樼骇杩囨护"  //鏍囬
-                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                    , shift: 2 //寮瑰嚭鍔ㄧ敾
-                    , area: ["50%", "80%"] //绐椾綋澶у皬
-                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: [contentUrl, "yes"]
-                    , btn: ["纭畾", "鍙栨秷"]
-                    , btn1: function (index, laero) {
-                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.cache["mainTable"];//鑾峰彇閫変腑鐨勬暟鎹�
-                        if (checkStatus.length == 0) {
-                            return layer.msg("璇疯緭鍏ヨ繃婊ゆ潯浠�!");
-                        }
-                        var myIframe = window[laero.find('iframe')[0]['name']];
-                        GetDataCols += "and (";
-                        for (var i = 0; i < checkStatus.length; i++) {
-                            GetDataCols += myIframe.get_FastQuery(checkStatus[i]); //get_FastQuery()涓哄瓙椤甸潰鐨勬柟娉�
-                            if ((i + 1) < checkStatus.length) {
-                                GetDataCols += " " + checkStatus[i]["HRelationCol"] + " ";
-                            }
-                        }
-                        GetDataCols += ")";
-                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                        layer.close(index);//鍏抽棴寮圭獥
-                    }
-                    , end: function () {
-                        if (GetDataCols != "") {
-                            get_FastQuery();
-                        }
-                    }
-                })
-            }
-
-            //#endregion
-
 
             //#endregion
 
@@ -3069,45 +2787,6 @@
 
 
         });
-        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
-        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
-        {
-            var HInterID = obj[0].hmainid;
-            HInterID_Choose = obj[0].hmainid;
-            $.ajax({
-                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
-                type: "GET",
-                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        var data = data1.data;
-                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
-                        HDefaultFilter = data[0].鏂规鍚嶇О
-                        var HRemark = data[0].澶囨敞
-                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
-                        document.getElementById("HFilterScheme_Now").style.display = "block";
-                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
-                        HInterID = data[0].hmainid
-                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
-                        for (let i = 0; i < data.length; i++) {
-                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
-                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
-                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
-                            }
-                        }
-
-                    } else {
-                        layer.close(ajaxLoad);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(ajaxLoad);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
-        }
-        //#endregion
-
         function GetDataCol(data) {
             GetDataCols = data;
         }
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 63f6422..15695ad 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -648,7 +648,7 @@
                     , { field: 'HQCSchemeID_Patrol', title: '宸℃妫�楠屾柟妗圛D', hide: true }//f7
                     , { field: 'HQCSchemeNumber_Patrol', title: '宸℃妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Patrol", width: 125 }
                     , { field: 'HQCSchemeName_Patrol', title: '宸℃妫�楠屾柟妗堝悕绉�', width: 125 }//f7
-
+                    , { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text', width: 125}
                     //, { field: 'HPassRate', title: '鑹巼', edit: 'text' }//榛樿
                     //, { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
                     ////, { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
index d2a88f8..40e6c9a 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
@@ -169,6 +169,7 @@
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_view"><i class="layui-icon layui-icon-form"></i>娴忚</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm " lay-event="set_DeleteBill" id="DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm " lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_LookDown_PayMentBill" id="get_LookDown_PayMentBill"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡(浠樻鍗�)</button>
                                 <button type="button" class="layui-btn layui-btn-sm " lay-event="btn-Audit" id="Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm " lay-event="btn-DeAudit" id="DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
@@ -259,6 +260,10 @@
                         break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
+                        break;
+                    //涓嬫煡浠樻鍗�
+                    case 'get_LookDown_PayMentBill':
+                        set_LookDownPayMentBill();
                         break;
                     //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
                     case 'btn-Audit':
@@ -886,6 +891,34 @@
             }
             //#endregion
 
+            //#region 涓嬫煡浠樻鍗�
+            function set_LookDownPayMentBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '涓嬫煡浠樻鍗�'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_GeneralLookDown.html?linterid=' + hID + '&HModName=YF_PayMentBillList'
+                        , resize: false,
+                        end: function () {
+
+                        }
+                        , cancel: function () {
+
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
 
             //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
             function set_CheckBill(num) {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 712a5d8..f431a12 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -298,6 +298,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fb" id="fb"><i class="layui-icon layui-icon-tips"></i>鍙戝竷</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="back"><i class="layui-icon layui-icon-close-fill"></i>鎾ら攢</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-yxj" id="yxj"><i class="layui-icon layui-icon-tips"></i>浼樺厛绾�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_LookDown_POStockInBill" id="get_LookDown_POStockInBill"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡(閲囪喘鍗�)</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -483,6 +484,10 @@
                         break;
                     //浼樺厛绾�
                     case 'btn-yxj': set_Yxj();
+                        break;
+                    //涓嬫煡閲囪喘鍏ュ簱鍗�
+                    case 'get_LookDown_POStockInBill':
+                        set_LookDownPOStockInBill();
                         break;
                     case 'btn-back': set_Back();
                         break;
@@ -2301,6 +2306,35 @@
 
             }
 
+            //#region 涓嬫煡閲囪喘鍏ュ簱鍗�
+            function set_LookDownPOStockInBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '涓嬫煡閲囪喘鍏ュ簱'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_GeneralLookDown.html?linterid=' + hID + '&HModName=Kf_POStockInBillList'
+                        , resize: false,
+                        end: function () {
+
+                        }
+                        , cancel: function () {
+
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
             //蹇�熻繃婊�
             function get_FastQuery(table, option,number) {
                 var HStatus = $("select[name='HStatus']").val();//
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
index 60d8dbd..d8fdc6f 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
@@ -214,6 +214,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_LookDown" id="get_LookDown"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
@@ -779,6 +780,10 @@
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
                         break;
+                    //涓嬫煡
+                    case 'get_LookDown':
+                        set_LookDown();
+                        break;
                     //閫�鍑烘寜閽�
                     case 'get_Exit': Pub_Close(2);
                         break;
@@ -1027,6 +1032,34 @@
             }
             //#endregion
 
+            //#region 涓嬫煡閿�鍞嚭搴撳崟
+            function set_LookDown() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '涓嬫煡閿�鍞嚭搴撳崟'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_GeneralLookDown.html?linterid=' + hID + '&HModName=Kf_SellOutBillList'
+                        , resize: false,
+                        end: function () {
+                        }
+                        , cancel: function () {
+
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
             //閲嶆柊鍚屾鎸夐挳
             function set_ResCnz() {
                 var HBillno2 = $('#HBillno2').val();
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
index a06f20a..ffbb5fc 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
@@ -764,11 +764,11 @@
                                         var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺;                           //鏁伴噺
                                         rowdataEntry.push(
                                             {
-                                                "HMaterID": dataArray[i].hmaterid
+                                                "HMaterID": dataArray[i].HMaterID
                                                 , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
                                                 , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
                                                 , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
-                                                , "HUnitID": dataArray[i].hunitid
+                                                , "HUnitID": dataArray[i].HUnitID
                                                 , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
                                                 , "HQty": dealDoubleToFixed(HQty, 1)
                                                 , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
@@ -1281,7 +1281,7 @@
             function changeHPrice() {
                 //#region 瀛愯〃 鏁版嵁妫�楠�
                 for (var i = 0; i < option.data.length; i++) {
-                    if (option.data[i]["HMaterID"] == "0") {
+                    if (option.data[i]["HMaterID"] == "0" || option.data[i]["HMaterID"] == "" || option.data[i]["HMaterID"] == undefined) {
                         layer.msg("绗�" + (i + 1) + "琛岋細鐗╂枡鏈�夋嫨锛�");
                         return false;
                     } else {
@@ -1907,7 +1907,7 @@
                                             , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
                                             , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
                                             , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
-                                            , "HUnitID": dataArray[i].hunitid
+                                            , "HUnitID": dataArray[i].HUnitID
                                             , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
                                             , "HQty": dealDoubleToFixed(HQty, 1)
                                             , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
@@ -2376,7 +2376,7 @@
 
                         , "HDeptID": dataArray[0].HDeptID
                         , "HDeptName": dataArray[0].閮ㄩ棬
-                        , "HMangerID": dataArray[0].hmanagerid
+                        , "HMangerID": dataArray[0].HManagerID
                         , "HMangerName": dataArray[0].涓荤
                         , "HEmpID": dataArray[0].HEmpID
                         , "HEmpName": dataArray[0].涓氬姟鍛�
@@ -2396,11 +2396,11 @@
                     for (var i = 0; i < dataArray.length; i++) {
                         rowdata.push(
                             {
-                                "HMaterID": dataArray[i].hmaterid
+                                "HMaterID": dataArray[i].HMaterID
                                 , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
                                 , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
                                 , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
-                                , "HUnitID": dataArray[i].hunitid
+                                , "HUnitID": dataArray[i].HUnitID
                                 , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
                                 , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
                                 , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
@@ -3390,7 +3390,7 @@
 
                     , "HDeptID": dataArray[0].HDeptID
                     , "HDeptName": dataArray[0].閮ㄩ棬
-                    , "HMangerID": dataArray[0].hmanagerid
+                    , "HMangerID": dataArray[0].HManagerID
                     , "HMangerName": dataArray[0].涓荤
                     , "HEmpID": dataArray[0].HEmpID
                     , "HEmpName": dataArray[0].涓氬姟鍛�
@@ -3410,46 +3410,51 @@
                 
                 //瀛愯〃  璧嬪��
                 var rowdataEntry = [];
-                for (var i = 0; i < dataArray.length; i++) {
-                    var HQty = dataArray[i].鏁伴噺 * 1 - dataArray[i].鍏宠仈鏁伴噺;
-                    rowdataEntry.push(
-                        {
-                            "HMaterID": dataArray[i].hmaterid
-                            , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
-                            , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
-                            , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
-                            , "HUnitID": dataArray[i].hunitid
-                            , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
-                            , "HQty": dealDoubleToFixed(HQty, 1)
-                            , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
-                            , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                            , 'HDiscountRate': "1"                                                     //
-                            , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                            , "HTaxRate": dataArray[i].绋庣巼
-                            , 'HTaxMoney': "0"                                                         //
-                            , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
-                            , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
-                            , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
-                            , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
-                            , "HRemark": ""
+                try {
+                    for (var i = 0; i < dataArray.length; i++) {
+                        var HQty = dataArray[i].鏁伴噺 * 1 - dataArray[i].鍏宠仈鏁伴噺;
+                        rowdataEntry.push(
+                            {
+                                "HMaterID": dataArray[i].HMaterID
+                                , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+                                , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+                                , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+                                , "HUnitID": dataArray[i].HUnitID
+                                , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+                                , "HQty": dealDoubleToFixed(HQty, 1)
+                                , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+                                , 'HDiscountRate': "1"                                                     //
+                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+                                , "HTaxRate": dataArray[i].绋庣巼
+                                , 'HTaxMoney': "0"                                                         //
+                                , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
+                                , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
+                                , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
+                                , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
+                                , "HRemark": ""
 
-                            , "HSourceInterID": dataArray[i].hmainid
-                            , "HSourceEntryID": dataArray[i].hsubid
-                            , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
-                            , "HSourceBillType": dataArray[i].HBillType
-                            , "HRelationQty": "0"
-                            , "HRelationMoney": "0"
+                                , "HSourceInterID": dataArray[i].hmainid
+                                , "HSourceEntryID": dataArray[i].hsubid
+                                , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+                                , "HSourceBillType": dataArray[i].HBillType
+                                , "HRelationQty": "0"
+                                , "HRelationMoney": "0"
 
-                            , 'HPOOrderInterID': "0"
-                            , 'HPOOrderEntryID': "0"
-                            , 'HPOOrderBillNo': ""
+                                , 'HPOOrderInterID': "0"
+                                , 'HPOOrderEntryID': "0"
+                                , 'HPOOrderBillNo': ""
 
-                            , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
-                            , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
-                            , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
-                            , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
-                        }
-                    );
+                                , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+                                , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
+                                , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
+                                , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
+                            }
+                        );
+                    }
+                }
+                catch (error) {
+                    layer.alert(error.Message, { icon: 5 });
                 }
 
                 optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
@@ -3539,7 +3544,7 @@
                     async: false,   //鏄惁寮�鍚紓姝�
                     type: "GET",   //璇锋眰绫诲瀷
                     data: {   //瀹氫箟鍙戦�佸埌鏈嶅姟鍣ㄧ殑鏁版嵁
-                        "HMaterID": HMaterID     //  灏唄materid浣滀负璇锋眰鍙傛暟鍙戦��
+                        "HMaterID": HMaterID     //  灏咹MaterID浣滀负璇锋眰鍙傛暟鍙戦��
                     },
                     success: function (result) {   // 褰撹姹傛垚鍔熸椂锛屾墽琛岃繖涓嚱鏁�
                         if (result.code == 1) { // 濡傛灉鏈嶅姟鍣ㄨ繑鍥炵殑鏁版嵁涓殑`code瀛楁绛変簬1锛岃繖鍙兘琛ㄧず瀹℃牳鎿嶄綔鎴愬姛鎵ц
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
index a0a6128..ab6095f 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
@@ -178,6 +178,7 @@
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_view"><i class="layui-icon layui-icon-form"></i>娴忚</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BatchAudit" id="BatchAudit"><i class="layui-icon layui-icon-radio"></i>鎵归噺瀹℃牳</button>
@@ -280,6 +281,10 @@
                         break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
+                        break;
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export();
                         break;
                     //鍌績鎸夐挳
                     case 'get_HHasten': get_HHasten();
@@ -595,7 +600,7 @@
                             option.cols = [col];
                             option.data = data1.data;
                             laypage.render(optionPage);
-                            table.render(option);
+                            ins= table.render(option);
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
                             if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
@@ -875,6 +880,196 @@
             }
             //#endregion
 
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                //var ModRightNameCheck = "Gy_RoutingBillList_ExportExcel";
+                //var wait = layer.load();
+                var data = getExportData();
+                data.forEach((item) => {
+                    for (let itemobj in item) {
+                        if (item[itemobj] == null) {
+                            item[itemobj] = "";
+                        }
+                        if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                            item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                        }
+                    }
+                });
+                table.exportFile(ins.config.id, data, "xls");
+                //閫昏緫瀹℃牳鏂规硶
+                //$.ajax({
+                //    type: "GET",
+                //    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                //    async: true,
+                //    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                //    success: function (result) {
+
+                //        var data = getExportData();
+                //        data.forEach((item) => {
+                //            for (let itemobj in item) {
+                //                if (item[itemobj] == null) {
+                //                    item[itemobj] = "";
+                //                }
+                //                if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                //                    item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                //                }
+                //            }
+                //        });
+                //        if (result.count == 1) {
+                //            table.exportFile(ins.config.id, data, "xls");
+                //            layer.close(wait);
+                //        } else {
+                //            layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+                //            layer.close(wait);
+                //        }
+                //    }, error: function () {
+                //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                //        layer.close(wait);
+                //    }
+                //});
+            }
+            //#endregion
+
+            //#region 鑾峰彇瀵煎嚭鏁版嵁
+            function getExportData() {
+                var data;//瀵煎嚭鐨勬暟鎹�
+                var ajaxLoad = layer.load();
+                //鑾峰彇鐧诲綍璐︽埛瀵瑰簲鑱屽憳鍚嶇О
+                var HUserName = getHEmpByHUserName();
+                if (HUserName != "" && HUserName != null) {
+                    sWhere += " and (娲惧崟浜� = '" + HUserName + "' or 鎺ュ崟浜� = '" + HUserName + "' or 鎶勯�佷汉 like '%" + HUserName + "%') ";
+                }
+
+                var HOrgID = "";
+                var HBillNo = $("#HBillNo").val();  //鍗曟嵁鍙�
+                var HProNumber = $("#HProNumber").val();//椤圭洰浠g爜
+                var HName = $("#HName").val();//宸ヤ綔鍚嶇О
+                var HBillStatus = $("#HBillStatus").val();//鍗曟嵁鐘舵��
+                var HReceiveEmp = $("#HReceiveEmp").val();//鎺ュ崟浜�
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
+
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (ColName1 != 0 && Comparator1 != 0) {
+                    var com1 = "";
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like'%" + ColContent1 + "%'";
+                            break;
+                        case "8":
+                            com1 = "like'%" + ColContent1 + "'";
+                            break;
+                        case "9":
+                            com1 = "like'" + ColContent1 + "%'";
+                            break;
+                        case "10":
+                            com1 = "not like'%" + ColContent1 + "%'";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    var com2 = "";
+                    switch (Comparator2) {
+                        case "7":
+                            com2 = "like'%" + ColContent2 + "%'";
+                            break;
+                        case "8":
+                            com2 = "like'%" + ColContent2 + "'";
+                            break;
+                        case "9":
+                            com2 = "like'" + ColContent2 + "%'";
+                            break;
+                        case "10":
+                            com2 = "not like'%" + ColContent2 + "%'";
+                            break;
+                        default:
+                            com2 = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
+                if (addSWhereByOpenType()) {
+                    HOrgID = $("#HOrgID").val();//缁勭粐
+                }
+                else {
+                    HOrgID = $("#HOrgID").val();//缁勭粐
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HProNumber) {
+                    sWhere += " and 椤圭洰浠g爜 like '%" + HProNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 浠诲姟鍚嶇О like '%" + HName + "%'";
+                }
+                if (HOrgID) {
+                    sWhere += " and HOrgID = '" + HOrgID + "'";
+                }
+                if (HBillStatus) {
+                    sWhere += " and 鍗曟嵁鐘舵�� like '%" + HBillStatus + "%'";
+                }
+                if (HReceiveEmp) {
+                    sWhere += " and 鎺ュ崟浜� like '%" + HReceiveEmp + "%'";
+                }
+                //鏌ヨ璇彞
+                $.ajax({
+                    url: GetWEBURL() + '/PM_WorkTaskBill/list',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            data = data1.data;//鍒楀瓧娈垫暟鎹�
+                            layer.close(ajaxLoad);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                sWhere = "";
+                return data;
+
+            }
+            //#endregion
+
+
             //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
             function set_CheckBill(num) {
                 var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index 576797e..5556ea2 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -213,11 +213,12 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>椹冲洖</button>
                                 <!--<button type="button" class="layui-btn layui-btn-sm"   lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
-            <button type="button" class="layui-btn layui-btn-sm"   lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>-->
+    <button type="button" class="layui-btn layui-btn-sm"   lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>-->
                                 <!--<button type="button" class="layui-btn layui-btn-sm"   lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
-            <button type="button" class="layui-btn layui-btn-sm"   lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>-->
+    <button type="button" class="layui-btn layui-btn-sm"   lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_BarCodeNote" id="get_BarCodeNote"><i class="layui-icon layui-icon-refresh-3"></i>鏉$爜鏄庣粏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_LookDown" id="get_LookDown"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_LookDown_ReceivableBill" id="get_LookDown_ReceivableBill"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡(搴旀敹鍗�)</button>
                                 <button type="button" class="layui-btn layui-btn-sm" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -395,6 +396,10 @@
                     //涓嬫煡
                     case 'get_LookDown':
                         set_LookDown();
+                        break;
+                    //涓嬫煡
+                    case 'get_LookDown_ReceivableBill':
+                        set_LookDownReceivableBill();
                         break;
                     //鎵撳嵃
                     case 'btn-print': get_PrintReport();
@@ -1712,6 +1717,35 @@
             }
             //#endregion
 
+            //#region 涓嬫煡搴旀敹鍗�
+            function set_LookDownReceivableBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '涓嬫煡搴旀敹鍗�'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_GeneralLookDown.html?linterid=' + hID + '&HModName=Xs_ReceivableBillList'
+                        , resize: false,
+                        end: function () {
+                            
+                        }
+                        , cancel: function () {
+
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
             //#region 鎵撳嵃
             function get_PrintReport() {
                 var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index cb2a817..a307dc2 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -206,6 +206,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_LookDown_PayableBill" id="get_LookDown_PayableBill"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡(搴斾粯鍗�)</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BarCodeDetail" id="BarCodeDetail"><i class="layui-icon layui-icon-form"></i>鏉$爜鏄庣粏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushPayableBills" id="btn-PushPayableBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(搴斾粯鍗�)</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
@@ -728,6 +729,10 @@
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
                         break;
+                    //涓嬫煡搴斾粯鍗�
+                    case 'get_LookDown_PayableBill':
+                        set_LookDown_PayableBill();
+                        break;
                     //鎵撳嵃
                     case 'btn-print':
                         get_PrintReport();
@@ -980,6 +985,35 @@
             }
             //#endregion
 
+            //#region 涓嬫煡搴斾粯鍗�
+            function set_LookDown_PayableBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '涓嬫煡搴斾粯鍗�'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_GeneralLookDown.html?linterid=' + hID + '&HModName=Cg_PayableBillList'
+                        , resize: false,
+                        end: function () {
+
+                        }
+                        , cancel: function () {
+
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
             //#region 鐐瑰嚮琛岄�変腑楂樹寒
             table.on('row(mainTable)', function (obj) {
                 //閫変腑琛屾敼鍙橀鑹�

--
Gitblit v1.9.1