From 56c961f28d306c94b13e86d77ba366b09b82af3c Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 10 三月 2025 13:19:03 +0800
Subject: [PATCH] 1

---
 WebTM/views/基础资料/基础资料/Gy_MatePriceCusEdit.html      |  576 +++++++++++
 WebTM/views/基础资料/基础资料/Gy_MatePriceSup.html          |  298 ++---
 WebTM/views/领料发货/销售出库/Kf_SellOutBill.html           |   27 
 WebTM/views/基础资料/基础资料/Gy_MatePriceCus.html          |  545 ++++++++++
 WebTM/views/基础资料/基础资料/Gy_MatePriceSupEdit.html      |  233 ++++
 WebTM/views/基础资料/销售基础资料/Gy_MateNumRelationList.html |  734 ++++++++++++++
 WebTM/views/生产管理/宝工排产/JIT_DayPlanPlatForm.html      |    2 
 WebTM/WebTM.csproj                                  |    4 
 WebTM/views/基础资料/销售基础资料/Gy_MateNumRelation.html     |  536 ++++++++++
 9 files changed, 2,747 insertions(+), 208 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 9a1f0d2..5adf478 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -462,6 +462,8 @@
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassList.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonList_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClass_Excel.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceCus.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceCusEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheck_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Repair_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Maintain_Excel.html" />
@@ -483,6 +485,8 @@
     <Content Include="views\鍩虹璧勬枡\閫氱敤鍩虹璧勬枡\Gy_CommonBaseDataCheck.html" />
     <Content Include="views\鍩虹璧勬枡\閫氱敤鍩虹璧勬枡\Gy_GeneralLookDown.html" />
     <Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier_Excel.html" />
+    <Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_MateNumRelation.html" />
+    <Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_MateNumRelationList.html" />
     <Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_GridView_Hide_New.html" />
     <Content Include="views\宸ヨ祫绠$悊\瀹氶鐢宠\Pay_ProcPriceRequestBillCheckQuery.html" />
     <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫鎶ヨ〃\Pay_PayrollReportByKD.html" />
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceCus.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceCus.html"
new file mode 100644
index 0000000..f2149cc
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceCus.html"
@@ -0,0 +1,545 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>閿�鍞环鏍煎垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐗╂枡缂栫爜</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName">
+                                    </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>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <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>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:10px;">
+                                        <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" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
+                                                    <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="7">鍖呭惈</option>
+                                                    <option value="8">宸﹀寘鍚�</option>
+                                                    <option value="9">鍙冲寘鍚�</option>
+                                                    <option value="10">涓嶅寘鍚�</option>
+                                                </select>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit" id="audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+    <script src="../../../layuiadmin/QueryScheme.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            var sWhere = "";
+
+            var option = [];
+            var Organization = sessionStorage["Organization"];
+            var HModName = "Gy_MatePriceCus";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID", "HUSEORGID", "HCREATEORGID", "鐖剁骇ID", "HMaterID", "HUnitID", "HRelationID"];
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            window.HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "閿�鍞环鏍煎垪琛�";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+            //#endregion
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板鎸夐挳
+                    case 'btn-Add':
+                        set_AddNew();
+                        break;
+                    case 'btn-Edit':
+                        set_ShowBill();
+                        break;
+                    case 'btn-Delete':
+                        set_DeleteBill();
+                        break;
+                    //瀹℃牳
+                    case 'btn-audit': set_CheckBillAll(0);
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-Faudit': set_CheckBillAll(1);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme(get_FastQuery);
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme(get_FastQuery);
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-Close':
+                        parent.layui.admin.events.closeThisTabs();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //杈撳叆妗嗗洖杞︽柟娉�
+            $('input').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    get_FastQuery();
+                }
+            });
+            //#endregion
+
+            //#endregion
+
+            //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鍒濆鍖栭〉澶у皬
+                DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], option);
+                //鏌ヨ
+                get_FastQuery();
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule(get_FastQuery);
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-100'
+                    , page: true
+                    , limits: [50, 500, 5000, 50000]
+                    , limit: 50
+                    , cellMinWidth: 90
+                };
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HMaterNumber").val("");
+                $("#HMaterName").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                form.render('select');
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var wait = layer.load();//閬僵
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_MatePriceCus/MatePriceCusList',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            option.cols = [col];
+                            option.data = data1.data;
+
+                            //鍒楄缃�
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
+                            table.render(option)
+                            layer.close(ajaxLoad);
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                            //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 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HMaterNumber = $("#HMaterNumber").val();
+                var HMaterName = $("#HMaterName").val();
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").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 (HMaterNumber) {
+                    sWhere += " and 鐗╂枡浠g爜 like '%" + HMaterNumber + "%'";
+                }
+                if (HMaterName) {
+                    sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var ItemID = data[0].HItemID.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //#region 閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'Gy_MatePriceCus/Delete',
+                            type: "GET",
+                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
+                            success: function (result) {
+                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                get_FastQuery();
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+            //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板閿�鍞环鏍�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鍩虹璧勬枡/Gy_MatePriceCusEdit.html?OperationType=1',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        get_FastQuery(table, option);
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 缂栬緫鍗曟嵁
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫閿�鍞环鏍�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍩虹璧勬枡/Gy_MatePriceCusEdit.html?OperationType=3&hID=' + hID
+                        , resize: false
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            get_FastQuery(table, option);
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region  鎵归噺瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
+            function set_CheckBillAll(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length != 0) {
+                    var uniqueIds = [...new Set(data.map(obj => obj.HItemID))];//灏嗗璞℃暟缁刬d鎻愬彇鍘婚噸
+                    var queryString = uniqueIds.join(",");//灏唅ds鍙樻垚鏁扮粍
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_MatePriceCus/CheckAll",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "ids": queryString, "Type": num, "HMaker": 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);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+                            } else {
+                                layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨鏁版嵁瀹℃牳锛�');
+
+                }
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 鎺掑簭鍚庨�夋嫨
+            table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+                table.reload('mainTable', {
+                    initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+                    , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+                        field: obj.field //鎺掑簭瀛楁   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                        , order: obj.type //鎺掑簭鏂瑰紡   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                    }
+                });
+                option.data = layui.table.cache["mainTable"];
+                table.render(option);
+                ////鍒锋柊鎸夐挳鏄剧ず
+                //Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+            });
+            //#endregion
+
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+        });
+            //#endregion
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceCusEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceCusEdit.html"
new file mode 100644
index 0000000..6f09f14
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceCusEdit.html"
@@ -0,0 +1,576 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫閿�鍞环鏍煎垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style type="text/css">
+        .layui-form-label {
+            width: 85px;
+        }
+
+        .layui-form-item .layui-input-inline {
+            width: 50%;
+        }
+
+        .layui-inline {
+            width: 290px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-right: 0px;
+        }
+    </style>
+</head>
+<body>
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                            </div>
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <ul class="layui-tab-title">
+                                    <li class="layui-this">鍩烘湰淇℃伅</li>
+                                </ul>
+                                <h1 style="text-align:center;"><b>閿�鍞环鏍�</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item" style="padding-top: 10px;">
+                                            <div class="layui-row">
+                                                <!--<div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">浠g爜</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber" >
+                                                        <input id="HItemID" name="HItemID" value="0" type="hidden" />
+                                                        <input id="HMakeEmp" name="HMakeEmp" value="" type="hidden" />
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">鍚嶇О</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HName" id="HName" >
+                                                    </div>
+                                                </div>-->
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">鍗曚环</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input id="HItemID" name="HItemID" value="0" type="hidden" />
+                                                        <input id="HMaker" name="HMaker" value="" type="hidden" />
+                                                        <input type="text" class="layui-input" name="HPrice" id="HPrice" value="0">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HRemark" id="HRemark">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" readonly name="HMaterNumber" id="HMaterNumber" class="layui-input" value="" style="float: left; width: 135px;">
+                                                        <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" id="HMaterList" style="width:40px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HMaterName" id="HMaterName" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HModel" id="HModel" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍗曚綅</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" readonly name="HUnitName" id="HUnitName" class="layui-input" value="" style="float: left; width: 135px;">
+                                                        <input type="hidden" name="HUnitID" id="HUnitID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitList" id="HUnitList" style="width:40px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">甯佸埆</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" readonly name="HCurName" id="HCurName" class="layui-input" value="" style="float: left; width: 135px;">
+                                                        <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" id="HCurList" style="width:40px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍏宠仈瀵硅薄</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" readonly name="HRelationName" id="HRelationName" class="layui-input" value="" style="float: left; width: 135px;">
+                                                        <input type="hidden" name="HRelationID" id="HRelationID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HRelationList" id="HRelationList" style="width:40px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鏂规绫诲瀷</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <select name="HType" id="HType" lay-verify="HType" >
+                                                            <option value="鐗╂枡+瀹㈡埛" selected>鐗╂枡+瀹㈡埛</option>
+                                                            <option value="鐗╂枡+瀹㈡埛澶х被">鐗╂枡+瀹㈡埛澶х被</option>
+                                                            <option value="鐗╂枡+渚涘簲鍟�">鐗╂枡+渚涘簲鍟�</option>
+                                                            <option value="鐗╂枡+渚涘簲鍟嗗ぇ绫�">鐗╂枡+渚涘簲鍟嗗ぇ绫�</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="date" class="layui-input" name="HBeginDate" id="HBeginDate">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">缁撴潫鏃ユ湡</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="date" class="layui-input" name="HEndDate" id="HEndDate">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">寮�濮嬫暟閲�</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HBeginQty" id="HBeginQty" value="0">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">缁撴潫鏁伴噺</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HEndQty" id="HEndQty" value="0">
+                                                    </div>
+                                                </div>
+                                                <!--<div class="layui-inline">
+        <label class="layui-form-label" style="width: 85px;">鍒涘缓鏃ユ湡</label>
+        <div class="layui-input-block" style="margin-left: 120px;">
+            <input type="date" class="layui-input" name="HMakeDate" id="HMakeDate">
+        </div>
+    </div>-->
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+
+<script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        var params = getUrlVars();
+        var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+        var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+        //鍒ゆ柇鏄惁鏂板
+        if (linterid == null || linterid == 0) {
+            set_ClearBill()
+        }
+        else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+            //绂佺敤缁勭粐閫夐」
+            RoadBillMain(linterid);
+        }
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //淇濆瓨鎻愪氦
+        form.on('submit(Saver)', function (data) {//鎻愪氦
+            set_AddNew(data);
+        });
+
+        //閫�鍑�
+        form.on('submit(Exit)', function (data) {
+            Pub_Close(1);
+        });
+
+        //閫夋嫨鍗曚綅
+        form.on('submit(HUnitList)', function () {
+            layer.open({
+                type: 2
+                , area: ['90%', '90%']//澶у皬
+                , title: '鍗曚綅鍒楄〃'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+                , resize: false
+                , cancel: function () {
+                    //$(".layui-btn").removeClass("layui-btn-disabled");
+                }
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HUnitName").val(data[0].璁¢噺鍗曚綅鍚嶇О);
+                    $("#HUnitID").val(data[0].HItemID);
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        });
+
+        //閫夋嫨鐗╂枡
+        form.on('submit(HMaterList)', function () {
+            layer.open({
+                type: 2
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐗╂枡鍒楄〃'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+                , resize: false
+                , cancel: function () {
+                    //$(".layui-btn").removeClass("layui-btn-disabled");
+                }
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                    $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
+                    $("#HModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
+                    $("#HMaterID").val(checkStatus.data[0].HItemID);
+                    $("#HUnitID").val(checkStatus.data[0].HUnitID);
+                    $("#HUnitName").val(checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О);
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        });
+
+        //閫夋嫨甯佸埆
+        form.on('submit(HCurList)', function () {
+            layer.open({
+                type: 2
+                , area: ['90%', '90%']//澶у皬
+                , title: '甯佸埆鍒楄〃'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html', 'yes']
+                , resize: false
+                , cancel: function () {
+                    //$(".layui-btn").removeClass("layui-btn-disabled");
+                }
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HCurName").val(checkStatus.data[0].璐у竵鍚嶇О);
+                    $("#HCurID").val(checkStatus.data[0].HItemID);
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        });
+
+        //閫夋嫨鍏宠仈瀵硅薄
+        form.on('submit(HRelationList)', function () {
+            if ($("#HType").val() == "鐗╂枡+瀹㈡埛") {
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '瀹㈡埛鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html', 'yes']
+                    , resize: false
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HRelationName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);
+                        $("#HRelationID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            } else if ($("#HType").val() == "鐗╂枡+瀹㈡埛澶х被") {
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '瀹㈡埛鍒嗙被鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CusType.html', 'yes']
+                    , resize: false
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HRelationName").val(checkStatus.data[0].瀹㈡埛鍒嗙被鍚嶇О);
+                        $("#HRelationID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            else if ($("#HType").val() == "鐗╂枡+渚涘簲鍟�") {
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '渚涘簲鍟嗗垪琛�'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', 'yes']
+                    , resize: false
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HRelationName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+                        $("#HRelationID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            else if ($("#HType").val() == "鐗╂枡+渚涘簲鍟嗗ぇ绫�") {
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '渚涘簲鍟嗗垎绫诲垪琛�'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_SupType.html', 'yes']
+                    , resize: false
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HRelationName").val(checkStatus.data[0].渚涘簲鍟嗗垎绫诲悕绉�);
+                        $("#HRelationID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            else {
+
+            }
+        });
+
+        //#endregion
+
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+        // 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+
+            $("#HMaker").val(sessionStorage["HUserName"]);
+            $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+            /*$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));*/
+            $("#HEndDate").val(Format(new Date(Date.now() + 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+        }
+
+
+        //淇濆瓨HMaker
+        function set_AddNew(data) {
+
+            var HPrice = $('#HPrice').val();
+            if (HPrice.substring(HPrice.length - 1, HPrice.length) == ".") {
+                layer.msg("鍗曚环鐨勭粨灏句笉鑳芥槸.锛�");
+                return;
+            } else {
+                var ref = /^[0-9]+\.?[0-9]*$/;
+                if (!ref.test(HPrice)) {
+                    layer.msg("鍗曚环璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                    return;
+                }
+            }
+
+            var sMainStr = JSON.stringify(data.field);
+            var sMainSub = sMainStr  + ";" + sessionStorage["HUserName"];
+
+            var index = layer.load();
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/Gy_MatePriceCus/MatePriceCusEdit",
+                async: true,
+                data: { "msg": sMainSub },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) {
+                        $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+                        layer.close(index);
+                        layer.msg("鎻愪氦鎴愬姛");
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
+        //缂栬緫 椤甸潰璧嬪��
+        function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+        {
+            $.ajax({
+                url: GetWEBURL() + "/Gy_MatePriceCus/cx",
+                type: "GET",
+                async: false,
+                data: { "HItemID": linterid, "user": sessionStorage["HUserName"]},
+                success: function (d) {
+                    //涓昏〃
+                    form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                        "HItemID": d.data[0].HItemID
+                        //, "HNumber": d.data[0].缂栫爜
+                        //, "HName": d.data[0].鍚嶇О
+                        , "HPrice": d.data[0].鍗曚环
+                        , "HMaterID": d.data[0].HMaterID
+                        , "HMaterNumber": d.data[0].鐗╂枡浠g爜
+                        , "HMaterName": d.data[0].鐗╂枡鍚嶇О
+                        , "HModel": d.data[0].瑙勬牸鍨嬪彿
+                        , "HUnitID": d.data[0].HUnitID
+                        , "HUnitName": d.data[0].璁¢噺鍗曚綅
+                        , "HCurID": d.data[0].HCurID
+                        , "HCurName": d.data[0].甯佸埆
+                        , "HBeginDate": formatDate(d.data[0].寮�濮嬫棩鏈�)
+                        , "HEndDate": formatDate(d.data[0].缁撴潫鏃ユ湡)
+                        , "HType": d.data[0].鏂规绫诲瀷 == "" ? "鐗╂枡+瀹㈡埛" : d.data[0].鏂规绫诲瀷
+                        , "HRelationID": d.data[0].HRelationID
+                        , "HRelationName": d.data[0].鍏宠仈鍚嶇О
+                        , "HBeginQty": d.data[0].寮�濮嬫暟閲�
+                        , "HEndQty": d.data[0].缁撴潫鏁伴噺
+                        , "HRemark": d.data[0].澶囨敞
+                    });
+                    form.render('checkbox');
+                    form.render('select');
+                }
+            })
+        }
+
+        //鑾峰彇鍙傛暟
+        function getUrlVars() {
+            var vars = [], hash;
+            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+            for (var i = 0; i < hashes.length; i++) {
+                hash = hashes[i].split('=');
+                vars.push(hash[0]);
+                vars[hash[0]] = hash[1];
+            }
+            return vars;
+        }
+
+        //#endregion
+
+    });
+    function GetHCusNameValue(obj)  //杩斿洖瀹㈡埛
+    {
+        $("#HRelationName").val(obj[0].瀹㈡埛鍚嶇О);
+        $("#HRelationID").val(obj[0].HItemID);
+    }
+    function GetHSupNameValue(obj)  //杩斿洖渚涘簲鍟�
+    {
+        $("#HRelationName").val(obj[0].渚涘簲鍟嗗悕绉�);
+        $("#HRelationID").val(obj[0].HItemID);
+    }
+    //鍙屽嚮杩斿洖璁¢噺鍗曚綅
+    function GetUnitValue(data) {
+        $("#HUnitName").val(data[0].璁¢噺鍗曚綅鍚嶇О);
+        $("#HUnitID").val(data[0].HItemID);
+    }
+    function GetGyMaterial(data) {
+        $("#HMaterName").val(data.鐗╂枡鍚嶇О);
+        $("#HMaterNumber").val(data.鐗╂枡浠g爜);
+        $("#HModel").val(data.瑙勬牸鍨嬪彿);
+        $("#HMaterID").val(data.HItemID);
+        $("#HUnitID").val(data.HUnitID);
+        $("#HUnitName").val(data.璁¢噺鍗曚綅鍚嶇О);
+    }
+    //鍙屽嚮杩斿洖璐у竵
+    function GetGyCur(data) {
+        $("#HCurName").val(data.璐у竵鍚嶇О);
+        $("#HCurID").val(data.HItemID);
+    }
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSup.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSup.html"
index 4affb18..f8b3b88 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSup.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSup.html"
@@ -26,31 +26,35 @@
                                 <div class="layui-inline">
                                     <label class="layui-form-label">缂栫爜</label>
                                     <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
                                     </div>
                                 </div>
-                                <!--<div class="layui-inline">
+                                <div class="layui-inline">
                                     <label class="layui-form-label">鍚嶇О</label>
                                     <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
                                     </div>
-                                </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>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <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>
                                 <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                     <div class="layui-row" style="margin-top:10px;">
                                         <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" lay-filter="ColName" style="width:190px;">
+                                                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
                                                     </select>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
                                                     <option value="0" selected="selected"></option>
                                                     <option value="=">=</option>
                                                     <option value=">=">>=</option>
@@ -65,7 +69,7 @@
                                                 </select>
                                             </div>
                                             <div class="layui-inline">
-                                                <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                             </div>
                                         </div>
                                     </div>
@@ -78,8 +82,12 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit" id="audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
@@ -92,6 +100,9 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+    <script src="../../../layuiadmin/QueryScheme.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -113,7 +124,20 @@
             var Organization = sessionStorage["Organization"];
             var HModName = "Gy_MatePriceSup";
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            var titleData = ["HItemID", "HUSEORGID", "HCREATEORGID", "鐖剁骇ID","HMaterID","HUnitID","HRelationID"];
+            var titleData = ["HItemID", "HUSEORGID", "HCREATEORGID", "鐖剁骇ID", "HMaterID", "HUnitID", "HRelationID"];
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            window.HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "閲囪喘浠锋牸鍒楄〃";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+            //#endregion
+
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -138,6 +162,22 @@
                     case 'btn-Delete':
                         set_DeleteBill();
                         break;
+                    //瀹℃牳
+                    case 'btn-audit': set_CheckBillAll(0);
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-Faudit': set_CheckBillAll(1);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme(get_FastQuery);
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme(get_FastQuery);
+                        break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
                         break;
@@ -159,30 +199,16 @@
             });
             //#endregion
 
-            //#region 鐐瑰嚮琛岄�変腑楂樹寒
-            table.on('row(mainTable)', function (obj) {
-                //閫変腑琛屾敼鍙橀鑹�
-                var flag = !obj.tr.find(':checkbox:first').prop('checked');
-                obj.tr.find(':checkbox').prop('checked', flag);
-                if (flag) {
-                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
-                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
-                } else {
-                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
-                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
-                }
-                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
-                layui.each(table.cache.mainTable, function (i, l) {
-                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
-                        l.LAY_CHECKED = flag;
-                    }
-                });
-            })
-            //#endregion
-
             //#region 鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
                 get_FastQuery();
+            });
+
+            //杈撳叆妗嗗洖杞︽柟娉�
+            $('input').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    get_FastQuery();
+                }
             });
             //#endregion
 
@@ -194,8 +220,12 @@
             function set_ClearBill() {
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
+                //鍒濆鍖栭〉澶у皬
+                DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], option);
                 //鏌ヨ
-                get_Display(sWhere);
+                get_FastQuery();
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule(get_FastQuery);
             }
             //#endregion
 
@@ -204,7 +234,7 @@
                 option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
-                    , height: 500
+                    , height: 'full-100'
                     , page: true
                     , limits: [50, 500, 5000, 50000]
                     , limit: 50
@@ -259,23 +289,12 @@
                                 }
                             }
 
-                            //鍔ㄦ�佹樉绀哄垪鍚�
-                            option = {
-                                elem: '#mainTable'
-                                , toolbar: '#toolbarDemo'
-                                , cols: [col]
-                                , data: data1.data
-                                , height: 'full-80'
-                                , page: true
-                                , limits: [50, 500, 5000, 50000]
-                                , limit: 50
-                                , cellMinWidth: 90
-                            }
-                            table.render(option);
+                            option.cols = [col];
+                            option.data = data1.data;
 
-                            //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
-
+                            //鍒楄缃�
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
+                            table.render(option)
                             layer.close(ajaxLoad);
                             if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                 ColFilter();
@@ -322,11 +341,11 @@
                     sWhere += " and " + ColName + " " + com;
                 }
                 if (HNumber) {
-                    sWhere += " and 閲囪喘浠锋牸璧勬枡浠g爜 like '%" + HNumber + "%'";
+                    sWhere += " and 缂栫爜 like '%" + HNumber + "%'";
                 }
-                //if (HName) {
-                //    sWhere += " and 閲囪喘浠锋牸鍚嶇О like '%" + HName + "%'";
-                //}
+                if (HName) {
+                    sWhere += " and 鍚嶇О like '%" + HName + "%'";
+                }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
@@ -381,7 +400,7 @@
                     shift: 2,
                     area: ['100%', '100%'],
                     maxmin: true,
-                    content: '../鍩虹璧勬枡/Gy_MatePriceSupEdit.html',
+                    content: '../鍩虹璧勬枡/Gy_MatePriceSupEdit.html?OperationType=1',
                     end: function () {
                         //鍒锋柊椤甸潰,
                         get_FastQuery(table, option);
@@ -407,7 +426,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../鍩虹璧勬枡/Gy_MatePriceSupEdit.html?hID=' + hID
+                        , content: '../鍩虹璧勬枡/Gy_MatePriceSupEdit.html?OperationType=3&hID=' + hID
                         , resize: false
                         , cancel: function () {
                             //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -424,130 +443,47 @@
             }
             //#endregion
 
+            //#region  鎵归噺瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
+            function set_CheckBillAll(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length != 0) {
+                    var uniqueIds = [...new Set(data.map(obj => obj.HItemID))];//灏嗗璞℃暟缁刬d鎻愬彇鍘婚噸
+                    var queryString = uniqueIds.join(",");//灏唅ds鍙樻垚鏁扮粍
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_MatePriceSup/CheckAll",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "ids": queryString, "Type": num, "HMaker": 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);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+                            } else {
+                                layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨鏁版嵁瀹℃牳锛�');
+
+                }
+            }
+            //#endregion
+
             //#region 鍒锋柊
             function get_Refresh() {
                 set_ClearQuery();
                 get_Display(sWhere);
-            }
-            //#endregion
-
-            //#region 闅愯棌鍒楄缃�
-            function get_HideColumn() {
-                var colName = "";
-                var contentUrl = "";
-                for (var i = 1; i < option.cols[0].length - 1; i++) {
-                    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_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
-                layer.open({
-                    type: 2
-                    , skin: "layui-layer-rim" //鍔犱笂杈规
-                    , title: "闅愯棌鍒楄缃�"  //鏍囬
-                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                    , shift: 2 //寮瑰嚭鍔ㄧ敾
-                    , area: ["50%", "90%"] //绐椾綋澶у皬
-                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: [contentUrl, "yes"]
-                    , btn: ["纭畾", "鍙栨秷"]
-                    , btn1: function (index, laero) {
-                        //鍒锋柊琛ㄦ牸鏁版嵁
-                        DisPlay_HideColumn();
-                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                        layer.close(index);//鍏抽棴寮圭獥
-                    }
-                })
-            }
-            //#endregion
-
-            //#region 鏄剧ず鍒楁暟鎹�
-            function DisPlay_HideColumn() {
-                $.ajax({
-                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
-                    type: "GET",
-                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
-                    success: function (data1) {
-                        if (data1.data.length != 0) {
-                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                           /* var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
-
-                            dataCol = data1.data[0].HGridString.split(',');
-
-                            for (var i = 0; i < option.cols[0].length - 2; i++) {
-                                if (dataCol[i]) {
-                                    var dataCols = dataCol[i].split('|');
-                                }
-                                //闅愯棌鍒�
-                                if (dataCols[1] == 1) {
-                                    option.cols[0][i + 1]["hide"] = true;
-                                }
-                                //璁剧疆鍒楀
-                                if (dataCols[3] > 0) {
-                                    option.cols[0][i + 1]["width"] = dataCols[3];
-                                }
-                                //璁剧疆鍐呭瀛椾綋澶у皬
-                                if (data1.data[0].HFontSize != 0) {
-                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
-                                } else {
-                                    option.cols[0][i + 1]["style"] = "font-size:100%";
-                                }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
-                                //鏄剧ず鍒�
-                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
-                                    option.cols[0][i + 1]["hide"] = false;
-                                }
-                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
-                                switch (dataCols[2]) {
-                                    case "L":
-                                        option.cols[0][i + 1]["align"] = "left";
-                                        break;
-                                    case "M":
-                                        option.cols[0][i + 1]["align"] = "center";
-                                        break;
-                                    case "R":
-                                        option.cols[0][i + 1]["align"] = "right";
-                                        break;
-                                }
-                            }
-
-                            //鍙栨秷鍐荤粨鍒�
-                            for (var i = 1; i < option.cols[0].length - 1; i++) {
-                                if (option.cols[0][i]["fixed"] != null) {
-                                    option.cols[0][i]["fixed"] = null;
-                                }
-                                else {
-                                    break;
-                                }
-                            }
-                            //鍐荤粨鍒�
-                            if (data1.data[0].HFixCols != 0) {
-                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
-                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
-                                        data1.data[0].HFixCols += 1;
-                                    }
-                                    option.cols[0][i + 1]["fixed"] = "left";
-                                }
-                            }
-                            table.render(option);
-                        } else {
-                            table.render(option);
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                })
             }
             //#endregion
 
@@ -572,6 +508,22 @@
             })
             //#endregion
 
+            //#region 鎺掑簭鍚庨�夋嫨
+            table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+                table.reload('mainTable', {
+                    initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+                    , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+                        field: obj.field //鎺掑簭瀛楁   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                        , order: obj.type //鎺掑簭鏂瑰紡   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                    }
+                });
+                option.data = layui.table.cache["mainTable"];
+                table.render(option);
+                ////鍒锋柊鎸夐挳鏄剧ず
+                //Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+            });
+            //#endregion
+
             //#region 鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSupEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSupEdit.html"
index 810ac78..eb8f564 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSupEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSupEdit.html"
@@ -57,9 +57,15 @@
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label" style="width: 85px;">浠g爜</label>
                                                     <div class="layui-input-block" style="margin-left: 120px;">
-                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber" readonly>
+                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber" >
                                                         <input id="HItemID" name="HItemID" value="0" type="hidden" />
-                                                        <input id="HMakeEmp" name="HMakeEmp" value="" type="hidden" />
+                                                        <input id="HMaker" name="HMaker" value="" type="hidden" />
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">鍚嶇О</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HName" id="HName" >
                                                     </div>
                                                 </div>
                                                 <div class="layui-inline">
@@ -98,8 +104,6 @@
                                                         <input type="text" class="layui-input" name="HModel" id="HModel" autocomplete="off">
                                                     </div>
                                                 </div>
-                                            </div>
-                                            <div class="layui-row">
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label">鍗曚綅</label>
                                                     <div class="layui-input-block">
@@ -110,6 +114,8 @@
                                                         </button>
                                                     </div>
                                                 </div>
+                                            </div>
+                                            <div class="layui-row">
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label">甯佸埆</label>
                                                     <div class="layui-input-block">
@@ -120,14 +126,35 @@
                                                         </button>
                                                     </div>
                                                 </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍏宠仈瀵硅薄</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" readonly name="HRelationName" id="HRelationName" class="layui-input" value="" style="float: left; width: 135px;">
+                                                        <input type="hidden" name="HRelationID" id="HRelationID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HRelationList" id="HRelationList" style="width:40px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鏂规绫诲瀷</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <select name="HType" id="HType" lay-verify="HType" >
+                                                            <option value="鐗╂枡+瀹㈡埛" selected>鐗╂枡+瀹㈡埛</option>
+                                                            <option value="鐗╂枡+瀹㈡埛澶х被">鐗╂枡+瀹㈡埛澶х被</option>
+                                                            <option value="鐗╂枡+渚涘簲鍟�">鐗╂枡+渚涘簲鍟�</option>
+                                                            <option value="鐗╂枡+渚涘簲鍟嗗ぇ绫�">鐗╂枡+渚涘簲鍟嗗ぇ绫�</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
                                             </div>
-                                            <div class="layui-row" hidden>
+                                            <div class="layui-row">
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
                                                     <div class="layui-input-block" style="margin-left: 120px;">
                                                         <input type="date" class="layui-input" name="HBeginDate" id="HBeginDate">
                                                     </div>
-                                                </div>                                                
+                                                </div>
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label" style="width: 85px;">缁撴潫鏃ユ湡</label>
                                                     <div class="layui-input-block" style="margin-left: 120px;">
@@ -135,11 +162,23 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-inline">
-                                                    <label class="layui-form-label" style="width: 85px;">鍒涘缓鏃ユ湡</label>
+                                                    <label class="layui-form-label" style="width: 85px;">寮�濮嬫暟閲�</label>
                                                     <div class="layui-input-block" style="margin-left: 120px;">
-                                                        <input type="date" class="layui-input" name="HMakeDate" id="HMakeDate">
+                                                        <input type="text" class="layui-input" name="HBeginQty" id="HBeginQty" value="0">
                                                     </div>
                                                 </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">缁撴潫鏁伴噺</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HEndQty" id="HEndQty" value="0">
+                                                    </div>
+                                                </div>
+                                                <!--<div class="layui-inline">
+        <label class="layui-form-label" style="width: 85px;">鍒涘缓鏃ユ湡</label>
+        <div class="layui-input-block" style="margin-left: 120px;">
+            <input type="date" class="layui-input" name="HMakeDate" id="HMakeDate">
+        </div>
+    </div>-->
                                             </div>
                                         </div>
                                     </div>
@@ -175,23 +214,17 @@
         //#region 杩涘叆椤甸潰鍗冲姞杞�
 
         var params = getUrlVars();
-        //var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
-        var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+        var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+        var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
 
         //鍒ゆ柇鏄惁鏂板
         if (linterid == null || linterid == 0) {
-
+            set_ClearBill();
         }
         else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
             //绂佺敤缁勭粐閫夐」
             RoadBillMain(linterid);
         }
-
-        $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
-        $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
-        $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-
-        set_ClearBill();
 
         //#endregion
 
@@ -216,7 +249,7 @@
                 , shade: 0.6 //閬僵閫忔槑搴�
                 , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
                 , resize: false
                 , cancel: function () {
                     //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -228,8 +261,8 @@
                     if (checkStatus.data.length === 0) {
                         return layer.msg('璇烽�夋嫨鏁版嵁');
                     }
-                    $("#HUnitName").val(checkStatus.data[0].HName);
-                    $("#HUnitID").val(checkStatus.data[0].HItemID);
+                    $("#HUnitName").val(data[0].璁¢噺鍗曚綅鍚嶇О);
+                    $("#HUnitID").val(data[0].HItemID);
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
@@ -245,7 +278,7 @@
                 , shade: 0.6 //閬僵閫忔槑搴�
                 , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                 , resize: false
                 , cancel: function () {
                     //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -257,10 +290,12 @@
                     if (checkStatus.data.length === 0) {
                         return layer.msg('璇烽�夋嫨鏁版嵁');
                     }
-                    $("#HMaterName").val(checkStatus.data[0].HName);
-                    $("#HMaterNumber").val(checkStatus.data[0].HNumber);
-                    $("#HModel").val(checkStatus.data[0].HModel);
+                    $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                    $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
+                    $("#HModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
                     $("#HMaterID").val(checkStatus.data[0].HItemID);
+                    $("#HUnitID").val(checkStatus.data[0].HUnitID);
+                    $("#HUnitName").val(checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О);
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
@@ -296,13 +331,118 @@
             })
         });
 
+        //閫夋嫨鍏宠仈瀵硅薄
+        form.on('submit(HRelationList)', function () {
+            if ($("#HType").val() == "鐗╂枡+瀹㈡埛") {
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '瀹㈡埛鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html', 'yes']
+                    , resize: false
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HRelationName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);
+                        $("#HRelationID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            } else if ($("#HType").val() == "鐗╂枡+瀹㈡埛澶х被") {
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '瀹㈡埛鍒嗙被鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CusType.html', 'yes']
+                    , resize: false
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HRelationName").val(checkStatus.data[0].瀹㈡埛鍒嗙被鍚嶇О);
+                        $("#HRelationID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            else if ($("#HType").val() == "鐗╂枡+渚涘簲鍟�") {
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '渚涘簲鍟嗗垪琛�'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', 'yes']
+                    , resize: false
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HRelationName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+                        $("#HRelationID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            else if ($("#HType").val() == "鐗╂枡+渚涘簲鍟嗗ぇ绫�") {
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '渚涘簲鍟嗗垎绫诲垪琛�'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_SupType.html', 'yes']
+                    , resize: false
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HRelationName").val(checkStatus.data[0].渚涘簲鍟嗗垎绫诲悕绉�);
+                        $("#HRelationID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            else {
+
+            }
+        });
+
         //#endregion
 
         //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
 
         // 鍒濆鍖栫晫闈�
         function set_ClearBill() {
-            $("#HMakeEmp").val(sessionStorage["HUserName"]);
+            $("#HMaker").val(sessionStorage["HUserName"]);
+            $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+            /*$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));*/
+            $("#HEndDate").val(Format(new Date(Date.now() + 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
         }
 
 
@@ -352,17 +492,17 @@
         //缂栬緫 椤甸潰璧嬪��
         function RoadBillMain(linterid)//鍔犺浇琛ㄥご
         {
-            var sWhere = " and HItemID='" + linterid + "'";
             $.ajax({
-                url: GetWEBURL() + "/Gy_MatePriceSup/MatePriceSupList",
+                url: GetWEBURL() + "/Gy_MatePriceSup/cx",
                 type: "GET",
                 async: false,
-                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]},
+                data: { "HItemID": linterid, "user": sessionStorage["HUserName"]},
                 success: function (d) {
                     //涓昏〃
                     form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                         "HItemID": d.data[0].HItemID
-                        , "HNumber": d.data[0].閲囪喘浠锋牸璧勬枡浠g爜
+                        , "HNumber": d.data[0].缂栫爜
+                        , "HName": d.data[0].鍚嶇О
                         , "HPrice": d.data[0].鍗曚环
                         , "HMaterID": d.data[0].HMaterID
                         , "HMaterNumber": d.data[0].鐗╂枡浠g爜
@@ -372,6 +512,13 @@
                         , "HUnitName": d.data[0].璁¢噺鍗曚綅
                         , "HCurID": d.data[0].HCurID
                         , "HCurName": d.data[0].甯佸埆
+                        , "HBeginDate": formatDate(d.data[0].寮�濮嬫棩鏈�)
+                        , "HEndDate": formatDate(d.data[0].缁撴潫鏃ユ湡)
+                        , "HType": d.data[0].鏂规绫诲瀷 == "" ? "鐗╂枡+瀹㈡埛" : d.data[0].鏂规绫诲瀷
+                        , "HRelationID": d.data[0].HRelationID
+                        , "HRelationName": d.data[0].鍏宠仈鍚嶇О
+                        , "HBeginQty": d.data[0].寮�濮嬫暟閲�
+                        , "HEndQty": d.data[0].缁撴潫鏁伴噺
                         , "HRemark": d.data[0].澶囨敞
                     });
                     form.render('checkbox');
@@ -395,4 +542,32 @@
         //#endregion
 
     });
+    function GetHCusNameValue(obj)  //杩斿洖瀹㈡埛
+    {
+        $("#HRelationName").val(obj[0].瀹㈡埛鍚嶇О);
+        $("#HRelationID").val(obj[0].HItemID);
+    }
+    function GetHSupNameValue(obj)  //杩斿洖渚涘簲鍟�
+    {
+        $("#HRelationName").val(obj[0].渚涘簲鍟嗗悕绉�);
+        $("#HRelationID").val(obj[0].HItemID);
+    }
+    //鍙屽嚮杩斿洖璁¢噺鍗曚綅
+    function GetUnitValue(data) {
+        $("#HUnitName").val(data[0].璁¢噺鍗曚綅鍚嶇О);
+        $("#HUnitID").val(data[0].HItemID);
+    }
+    function GetGyMaterial(data) {
+        $("#HMaterName").val(data.鐗╂枡鍚嶇О);
+        $("#HMaterNumber").val(data.鐗╂枡浠g爜);
+        $("#HModel").val(data.瑙勬牸鍨嬪彿);
+        $("#HMaterID").val(data.HItemID);
+        $("#HUnitID").val(data.HUnitID);
+        $("#HUnitName").val(data.璁¢噺鍗曚綅鍚嶇О);
+    }
+    //鍙屽嚮杩斿洖璐у竵
+    function GetGyCur(data) {
+        $("#HCurName").val(data.璐у竵鍚嶇О);
+        $("#HCurID").val(data.HItemID);
+    }
 </script>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateNumRelation.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateNumRelation.html"
new file mode 100644
index 0000000..fccd988
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateNumRelation.html"
@@ -0,0 +1,536 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>瀹㈡埛鐗╂枡瀵瑰簲琛�</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <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/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+    <style type="text/css">
+        /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            float: left;
+            display: block;
+            padding: 9px 15px;
+            width: 31px;
+            font-weight: 400;
+            line-height: 20px;
+            text-align: left;
+        }
+    </style>
+</head>
+<body>
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                            </div>
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">瀹㈡埛</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HCusName" id="HCusName" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="xuhao">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+    //鑾峰彇鍙傛暟
+    var params = get_UrlVars();
+    if (typeof (params[params[0]]) == "undefined") {
+        var OperationType = 1;//鎿嶄綔绫诲瀷
+        var closeType = 2;  //鍏抽棴绫诲瀷
+    } else {
+        var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+        var linterid = params[params[1]];//婧愬崟id
+        var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+    }
+    var OptionData;
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        //#region 鍏叡鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , laydate = layui.laydate
+            , element = layui.element;
+        //鏌ヨ鏉′欢
+        var HModName = "Gy_MateNumRelationEdit";
+        var option = [];
+        TabRow = { "HItemID": 0, "HCusRelationNumber": "", "HCusRelationName": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "" };
+        //#endregion
+
+
+        //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+        //鍒濆鍖栬〃鏍�
+        set_InitGrid();
+
+        //鍒ゆ柇鎿嶄綔绫诲瀷
+        if (OperationType == 1) {//鏃犳簮鏂板
+            //鏃犳簮鏂板
+            set_AddFNew();
+        }
+        else if (OperationType == 3) {//缂栬緫
+            RoadBillMain(linterid);
+            /*set_EditFromGrid(linterid);*/
+        }
+        else {
+            layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+        }
+        DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
+        //#endregion
+
+        //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
+        //澶村伐鍏锋爮
+        table.on('toolbar(mainTable)', function (obj) {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;;
+            var AddRow = table.cache['mainTable'];
+            var NewRow = TabRow;
+            switch (obj.event) {
+                //鏂板涓�琛�
+                case 'btn-AddLine': btnAddLine(NewRow);
+                    break;
+                //澶嶅埗涓�琛�
+                case 'btn-CopyLine': btnCopyLine(data);
+                    break;
+                //鍒楄缃�
+                case 'set_HideColumn':
+                    get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
+                    break;
+            }
+        });
+
+        //#region 鐐瑰嚮琛岄�変腑楂樹寒
+        table.on('row(mainTable)', function (obj) {
+            //閫変腑琛屾敼鍙橀鑹�
+            var flag = !obj.tr.find(':checkbox:first').prop('checked');
+            obj.tr.find(':checkbox').prop('checked', flag);
+            if (flag) {
+                obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+            } else {
+                obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+            }
+            //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+            layui.each(table.cache.mainTable, function (i, l) {
+                if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                    l.LAY_CHECKED = flag;
+                }
+            });
+        })
+            //#endregion
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            set_GridDelete(obj);   //琛屽唴鍒犻櫎
+            set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+        });
+        //瀹㈡埛淇℃伅寮圭獥
+        form.on('submit(HCusList)', function () {
+            //椤甸潰灞�-鑷畾涔�
+            layer.open({
+                type: 2,
+                skin: 'layui-layer-rim', //鍔犱笂杈规
+                title: '瀹㈡埛鍒楄〃',
+                closeBtn: 1,
+                shift: 2,
+                area: ['80%', '80%'],
+                maxmin: true,
+                content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html', 'yes'],
+                btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {
+
+                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);
+                    $("#HCusID").val(checkStatus.data[0].HItemID);
+                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                },
+                end: function () {
+                    $.ajax({
+                        url: GetWEBURL() + "/Gy_MateNumRelation/cx",
+                        type: "GET",
+                        data: { "HCusID": $("#HCusID").val() },
+                        success: function (data) {
+                            if (data.data != null && data.data != "") {
+                                //瀛愯〃  璧嬪��
+                                subdata = data.data
+                                var rowdata = [];
+                                for (var i = 0; i < subdata.length; i++) {
+                                    rowdata.push(
+                                        {
+                                            "HItemID": subdata[i].HItemID, "HCusRelationNumber": subdata[i].瀹㈡埛瀵瑰簲鐗╂枡浠g爜, "HCusRelationName": subdata[i].瀹㈡埛瀵瑰簲鐗╂枡鍚嶇О, "HMaterID": subdata[i].HMaterID, "HMaterNumber": subdata[i].鐗╂枡浠g爜, "HMaterName": subdata[i].鐗╂枡鍚嶇О, "HMaterModel": subdata[i].瑙勬牸鍨嬪彿
+                                        }
+                                    )
+                                }
+                                option.data = rowdata;
+                                table.render(option);
+                            }
+                            else {
+                                table.reload("mainTable", {});
+                                table.reload('mainTable', { data: [] });
+                            }
+                        }
+                    });
+                }
+            });
+        });
+
+        //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+        function set_GridCellCheck(obj) {
+            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                if (event.key == "F7") {
+                    //閮ㄩ棬
+                    if (obj.event === 'HNumber') {
+                        //椤甸潰灞�-鑷畾涔�
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '鐗╂枡鍒楄〃',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['80%', '80%'],
+                            maxmin: true,
+                            content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + sessionStorage["OrganizationID"], 'yes'],
+                            btn: ['纭畾', '鍙栨秷']
+                            , btn1: function (index, layero) {
+
+                                //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                if (checkStatus.data.length === 0) {
+                                    return layer.msg('璇烽�夋嫨鏁版嵁');
+                                }
+                                OptionData = checkStatus.data[0];  //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+                                //閫変腑澶氳鏃�
+                                if (checkStatus.data.length > 1) {
+                                    var rowIndex = $(obj.tr).attr("data-index") * 1;  //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
+                                    for (var i = 0; i < checkStatus.data.length; i++) {  //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害  鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
+                                        if (rowIndex + i >= option.data.length) {           //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
+                                            var NewRow = { "HItemID": 0, "HCusRelationNumber": "", "HCusRelationName": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "" };// 鍒涘缓涓�涓柊鐨勫寘鍚暟缁�   鍏跺垵濮嬪�间负绌烘垨鑰�0  鎴栬�呮槸鏃堕棿鏍煎紡
+
+                                            table.cache["mainTable"].push(NewRow);    //鍒涘缓鏂扮殑鍖呭惈鏁扮粍  浼犲叆table.cache["mainTable"]鏁扮粍
+                                            option.data = table.cache["mainTable"];  //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
+
+                                            table.render(option);//娓叉煋鐣岄潰
+                                        }
+                                        option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID;  //灏唎ption.data鏁扮粍涓搴旇鐨凥MaterID灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                        option.data[rowIndex + i].HMaterNumber = checkStatus.data[i].鐗╂枡浠g爜; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡浠g爜 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                        option.data[rowIndex + i].HMaterName = checkStatus.data[i].鐗╂枡鍚嶇О; //灏唎ption.data鏁扮粍涓搴旇鐨�  鐗╂枡鍚嶇О  灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                        option.data[rowIndex + i].HMaterModel = checkStatus.data[i].瑙勬牸鍨嬪彿; //灏唎ption.data鏁扮粍涓搴旇鐨�  瑙勬牸鍨嬪彿  灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                    }
+                                    table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
+                                }
+
+                                layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                            }
+                            , btn2: function (index, layero) {
+                                //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                            },
+                            end: function () {
+                                if (typeof (OptionData.HItemID) != "undefined") {
+                                    obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+                                        "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+                                        , "HMaterNumber": OptionData.鐗╂枡浠g爜
+                                        , "HMaterName": OptionData.鐗╂枡鍚嶇О
+                                        , "HMaterModel": OptionData.瑙勬牸鍨嬪彿
+                                    })
+                                }
+                                OptionData = {};
+                            }
+                        });
+                    }
+
+                    obj.event = "";
+                    return false;
+                }
+            })
+        }
+
+        //淇濆瓨
+        form.on('submit(Saver)', function (data) {
+            if ($("#HCusName").val() == "") {
+                layer.msg("瀹㈡埛涓嶈兘涓虹┖锛�");
+                return false;
+            }
+            var HCusID = $("#HCusID").val();  //鑾峰彇閫夋嫨鐨勭敤鎴风紪鐮�
+            //debugger;
+            var sSubStr = JSON.stringify(table.cache['mainTable']);
+            if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+            {
+                return false;
+            }
+            var list = [];
+            for (var i = 0; i < JSON.parse(sSubStr).length; i++) {
+                list.push(JSON.parse(sSubStr)[i].HCusRelationNumber)
+            }
+            if (isAllEqual(list)) {
+                layer.msg("鏈夐噸澶嶇殑淇℃伅锛�");
+                return false;
+            }
+
+            var sMainSub = sSubStr + ';' + HCusID + ';' + sessionStorage["HUserName"];
+            $.ajax(
+                {
+                    type: "POST",
+                    url: GetWEBURL() + "/Gy_MateNumRelation/SaveGy_MateNumRelation", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "msg": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                            });
+                        }
+                        else {
+
+                            layer.alert(data.Message);
+                            console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+
+                        layer.alert("閿欒:" + err);
+                        console.log("Reason" + sMainStr);
+                    }
+                });
+        });
+
+        //#region 閫�鍑烘寜閽�
+        form.on('submit(Exit)', function () {
+            if (params[1] != null) {
+                Pub_Close(1);
+            } else if (params[1] == null) {
+                Pub_Close(2);
+            }
+        })
+            //#endregion
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夋柟娉�
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            columns = [
+                { type: 'checkbox', fixed: 'left' }
+                , { templet: '#xuhao', field: 'HItemID', title: '搴忓彿', fixed: 'left' }
+                , { field: 'HItemID', title: 'HItemID', edit: 'text', hide: true }
+                , { field: 'HCusRelationNumber', title: '瀹㈡埛瀵瑰簲鐗╂枡浠g爜', edit: 'text' }
+                , { field: 'HCusRelationName', title: '瀹㈡埛瀵瑰簲鐗╂枡鍚嶇О', edit: 'text' }
+                , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', edit: 'text', event: 'HNumber' }
+                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О' }
+                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
+                , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+            ];
+            option = {
+                id: 'mainTable'
+                , elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , page: false
+                , cellMinWidth: 120
+                , height: 680
+                , cols: [columns]
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , done: function (res, curr, count) {
+                }
+            };
+        }
+        //鏃犳簮鍗曟柊澧�
+        function set_AddFNew() {
+            option.data = [TabRow];
+            table.render(option);
+        }
+        //#region 缂栬緫椤甸潰鍒濆鍖�
+        function RoadBillMain(linterid) {
+            $.ajax({
+                url: GetWEBURL() + "/Gy_MateNumRelation/cx",
+                type: "GET",
+                data: { "HCusID": linterid },
+                success: function (data) {
+                    if (data.data != null && data.data != "") {
+
+                        $("#HCusID").val(data.data[0].HCusID);
+                        $("#HCusName").val(data.data[0].瀹㈡埛鍚嶇О);
+
+                        //瀛愯〃  璧嬪��
+                        subdata = data.data
+                        var rowdata = [];
+                        for (var i = 0; i < subdata.length; i++) {
+                            rowdata.push(
+                                {
+                                    "HItemID": subdata[i].HItemID, "HCusRelationNumber": subdata[i].瀹㈡埛瀵瑰簲鐗╂枡浠g爜, "HCusRelationName": subdata[i].瀹㈡埛瀵瑰簲鐗╂枡鍚嶇О, "HMaterID": subdata[i].HMaterID, "HMaterNumber": subdata[i].鐗╂枡浠g爜, "HMaterName": subdata[i].鐗╂枡鍚嶇О, "HMaterModel": subdata[i].瑙勬牸鍨嬪彿
+                                }
+                            )
+                        }
+                        option.data = rowdata;
+                        table.render(option);
+                    }
+                    else {
+                        table.reload("mainTable", {});
+                        table.reload('mainTable', { data: [] });
+                    }
+                }
+            });
+        }
+            //#endregion
+
+        //澧炲姞涓�琛�
+        function btnAddLine(NewRow) {
+            table.cache["mainTable"].push(NewRow);//灏哊ewRow瀵硅薄娣诲姞鍒皌able.cache["mainTable"]鏁扮粍涓�,  鏁扮粍瀛樺偍浜嗚〃鏍肩殑鎵�鏈夎鏁版嵁
+            option.data = table.cache["mainTable"];//鏇存柊option.data涓烘柊鐨勬暟鎹暟缁勬樉绀哄埌琛ㄦ牸涓�  //灏嗘暟鎹粦瀹氬埌data涓�
+
+            table.render(option);  //娓叉煋琛ㄦ牸
+        }
+        //澶嶅埗涓�琛�
+        function btnCopyLine(data) {
+            var copydata = JSON.stringify(data);
+            if (data.length <= 0) {
+                layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+            }
+            else if (data.length > 1) {
+                layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+            }
+            else {
+                var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+            }
+        }
+        // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+        function set_GridDelete(obj) {
+            var data = obj.data;
+            var rowIndex = $(obj.tr).attr("data-index");
+            if (obj.event === 'del') {
+                layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                    var oldData = table.cache["mainTable"];
+                    oldData.splice(obj.tr.data('index'), 1);
+                    table.reload('mainTable', { data: oldData });
+                    layer.close(index);
+                });
+            }
+        }
+        //#region 鍒ゆ柇鏁版嵁鏁扮粍涓殑鍊兼槸鍚︾浉鍚�
+        function isAllEqual(list) {
+            var s = list.join(",") + ",";
+            for (var i = 0; i < list.length; i++) {
+                if (s.replace(list[i] + ",", "").indexOf(list[i] + ",") > -1) {
+                    return true;
+                }
+            }
+        }
+        //#region 闈炵┖楠岃瘉
+        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+            var Result = true;
+            if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+            //if ($("#HCusID").val() == 0 || $("#HCusID").val() == "") {
+            //    return Result = false;
+            //}
+            if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                sSubStr = JSON.parse(sSubStr);
+                for (var i = 0; i < sSubStr.length; i++) {
+                    if (sSubStr[i].HMaterID == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                    if (sSubStr[i].HCusRelationNumber == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛岋紝瀹㈡埛瀵瑰簲鐗╂枡浠g爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                    if (sSubStr[i].HCusRelationName == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,瀹㈡埛瀵瑰簲鐗╂枡鍚嶇О涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                }
+            }
+            else {
+                return Result = true;
+            }
+            return Result;
+        }
+        
+    });
+    function GetHCusNameValue(obj)  //杩斿洖瀹㈡埛
+    {
+        $("#HCusName").val(obj[0].瀹㈡埛鍚嶇О);
+        $("#HCusID").val(obj[0].HItemID);
+    }
+    //鍙屽嚮杩斿洖鐗╂枡
+    function GetGyMaterial(data) {
+        OptionData = data
+    }
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateNumRelationList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateNumRelationList.html"
new file mode 100644
index 0000000..142f19a
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateNumRelationList.html"
@@ -0,0 +1,734 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>瀹㈡埛鐗╂枡瀵瑰簲琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <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/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/QueryScheme.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">瀹㈡埛瀵瑰簲鐗╂枡浠g爜</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HCusRelationNumber" id="HCusRelationNumber" 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="HCusRelationName" id="HCusRelationName" 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="HCusName" id="HCusName" style="width:190px;">
+                                    </div>
+                                </div>
+                                <!--<div class="layui-inline">
+        <label class="layui-form-label">鐘舵��</label>
+        <div class="layui-input-block">
+            <select name="HStatus" lay-filter="HStatus" style="width:190px;" class="ForFilteringSchemes" id="HStatus">
+                <option value="-1" selected="selected">鍏ㄩ儴</option>
+                <option value="0">鏈鏍�</option>
+                <option value="1">宸插鏍�</option>
+                <option value="2">宸插叧闂�</option>
+            </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;">
+                                    </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;">
+                                    </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>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <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>
+                                <div class="layui-colla-content">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <div class="layui-inline">
+                                                <span>鍏朵粬鏉′欢></span>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <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" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
+                                                <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="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <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="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;" class="ForFilteringSchemes">
+                                                <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="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <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="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;" class="ForFilteringSchemes">
+                                                <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="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <div id="page"></div>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <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-print" id="print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit" id="audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="Faudit"><i class="layui-icon layui-icon-refresh"></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="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script type="text/javascript">
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , soulTable = layui.soulTable
+
+            var Organization = sessionStorage["Organization"];
+
+            var optionPage = [];
+            var HModName = "Gy_MateNumRelationList"
+            /*var HBillType = "3801";*/
+            /*var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id*/
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            window.HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "瀹㈡埛鐗╂枡瀵瑰簲琛�";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+            //#endregion
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鍒濆鍖栭〉澶у皬
+            DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], option);
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_FastQuery();
+            //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+            get_DefaultModule(get_FastQuery);
+            //#endregion
+
+            //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板鎸夐挳
+                    case 'btn-Add': set_AddNew();
+                        break;
+                    //缂栬緫鎸夐挳
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //鍒犻櫎鎸夐挳
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //瀹℃牳
+                    case 'btn-audit': set_CheckBillAll(0);
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-Faudit': set_CheckBillAll(1);
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': set_Refresh();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    ////鎸夐挳璁剧疆
+                    //case 'set_HideButton':
+                    //    get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                    //    break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme(get_FastQuery);
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme(get_FastQuery);
+                        break;
+                    //閫�鍑�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+                get_FastQuery();
+                
+            });
+            //鍒锋柊
+            function set_Refresh() {
+                $("#btnSearch").click();
+            }
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+               get_FastQuery();
+                
+            });
+            //杈撳叆妗嗗洖杞︽柟娉�
+            $('input').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    get_FastQuery();
+                }
+            });
+            //#endregion
+
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , cellMinWidth: 120
+                    , totalRow: true
+                    , limit: 50
+                    , height: 'full-50'
+                    , cols: []
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                };
+            }
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_MateNumRelation/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];//鍒楀瓧娈垫暟鎹�
+                            var col = [];
+                            var totalArray = [];
+                            var titleData = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'HItemID') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒�
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+                                } else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+                                        }, style: 'cursor: pointer;'
+                                    });
+                                } else if (data[i].name == '褰撳墠瀹℃牳椤圭洰') {//娣诲姞瓒呴摼鎺�
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, 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: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+                            option.cols = [col];
+                            option.data = data1.data;
+                            //鍒楄缃�
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
+                            ColFilter();
+                            table.render(option);
+                            layer.close(wait);
+                        } else {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(wait);
+                            //layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板瀹㈡埛鐗╂枡瀵瑰簲琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_MateNumRelation.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        get_FastQuery();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+            //缂栬緫鍗曟嵁
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HCusID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../閿�鍞熀纭�璧勬枡/Gy_MateNumRelation.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+                        , resize: false,
+                        end: function () {
+                            get_FastQuery(table, option);
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Gy_MateNumRelation/Delete", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HItemID": 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);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        $("#btnSearch").click();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                                layer.close(wait);
+                            }, error: function () {
+                                layer.close(wait);
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            //#region  鎵归噺瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
+            function set_CheckBillAll(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length != 0) {
+                    var uniqueIds = [...new Set(data.map(obj => obj.HItemID))];//灏嗗璞℃暟缁刬d鎻愬彇鍘婚噸
+                    var queryString =uniqueIds.join(",");//灏唅ds鍙樻垚鏁扮粍
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_MateNumRelation/CheckAll",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "ids": queryString, "Type": num, "HMaker": 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);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+                            } else {
+                                layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                   layer.msg('璇烽�夋嫨鏁版嵁瀹℃牳锛�');
+
+                }
+            }
+            //#endregion
+
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 鎺掑簭鍚庨�夋嫨
+            table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+                table.reload('mainTable', {
+                    initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+                    , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+                        field: obj.field //鎺掑簭瀛楁   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                        , order: obj.type //鎺掑簭鏂瑰紡   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                    }
+                });
+                option.data = layui.table.cache["mainTable"];
+                table.render(option);
+                ////鍒锋柊鎸夐挳鏄剧ず
+                //Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+            });
+            //#endregion
+
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HCusRelationNumber = $("#HCusRelationNumber").val();   
+                var HCusRelationName = $("#HCusRelationName").val();   
+                var HCusName = $("#HCusName").val();   
+                var HMaterNumber = $("#HMaterNumber").val();   //鐗╂枡浠g爜    
+                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 (HBeginDate) {
+                    sWhere += " and CONVERT(varchar(100),鍒涘缓鏃堕棿, 23) >= '" + HBeginDate + "'";
+                }
+                if (HEndDate) {
+                    sWhere += " and CONVERT(varchar(100),鍒涘缓鏃堕棿, 23) <= '" + HEndDate + "'";
+                }
+                if (HCusRelationNumber) {
+                    sWhere += " and 瀹㈡埛瀵瑰簲鐗╂枡浠g爜 like '%" + HCusRelationNumber + "%'";
+                }
+                if (HCusRelationName) {
+                    sWhere += " and 瀹㈡埛瀵瑰簲鐗╂枡鍚嶇О like '%" + HCusRelationName + "%'";
+                }
+                if (HCusName) {
+                    sWhere += " and 瀹㈡埛鍚嶇О like '%" + HCusName + "%'";
+                }
+                if (HMaterNumber) {
+                    sWhere += " and 鐗╂枡浠g爜 like '%" + HMaterNumber + "%'";
+                }
+                
+                //get_Display(sWhere);
+                get_Display(sWhere);
+
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+            }
+           
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HCusRelationName").val("");
+                $("#HCusRelationNumber").val("");
+                $("#HCusName").val("");
+                $("#HMaterNumber").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                form.render('select');
+                sWhere = "";
+                get_DisplayPage(sWhere);
+            }
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index 6a4e7e2..df3c7ba 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -914,7 +914,7 @@
                     }
                 }
                 if (HYxjQty > 0) {
-                    layer.confirm('褰撳墠鎺掍骇椤甸潰瀛樺湪浼樺厛绾т负0鐨勭敓浜ц鍗曪紝鏄惁缁х画杩涜鎺掍骇锛�', {
+                    layer.confirm('褰撳墠鎺掍骇椤甸潰瀛樺湪浼樺厛绾т负0鐨勭敓浜ц鍗曪紝鏄惁缁х画杩涜淇濆瓨锛�', {
                         title: "鎿嶄綔鎻愮ず",
                         icon: 0,
                         btn: ['纭', '鍙栨秷']
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_SellOutBill.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_SellOutBill.html"
index 3ef5fa1..6072b42 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_SellOutBill.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_SellOutBill.html"
@@ -1613,10 +1613,15 @@
                             var data = data1.data[0];
                             //$("#HSupID").val(data.HSupID);
                             //$("#HSupName").val(data.HSupName);
-                            $("#HWHID").val(data.HWHID);
-                            $("#HWHName").val(data.HWHName);
-                            //鏍规嵁瀹㈡埛甯﹀嚭姹囩巼绛変俊鎭�
-                            getCustomerByCusID(data.HCusID);
+                            if (typeof (data.HWhID) != undefined || typeof (data.HWHName) != undefined) {
+                                $("#HWHID").val(data.HWhID);
+                                $("#HWHName").val(data.HWHName);
+                                //鏍规嵁瀹㈡埛甯﹀嚭姹囩巼绛変俊鎭�
+                                getCustomerByCusID(data.HCusID);
+                            } else {
+                                layer.alert("鏁版嵁搴撴病鏈変粨搴撳瓧娈佃妫�鏌�!", { icon: 5 });
+                            }
+                            
                         }
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -3161,7 +3166,8 @@
                         //鐗╂枡
                         if (obj.event == "HMaterID") {
                             var HOrgID = $("#HOrgID").val();
-
+                            var HWHID = $("#HWHID").val();
+                            var HWHName = $("#HWHName").val();
                             layer.open({
                                 type: 2
                                 , skin: "layui-layer-rim" //鍔犱笂杈规
@@ -3339,6 +3345,17 @@
                                         }
                                         HDataTemp = {};
                                     }
+
+                                    if (option.data.length > 0) {
+                                        for (var i = 0; i < option.data.length; i++) {
+                                            if (option.data[i]["HWHID"] == 0 && HWHID != 0) {
+                                                option.data[i]["HWHID"] = HWHID;
+                                                option.data[i]["鍙戣揣浠撳簱"] = HWHName;
+                                            }
+                                        }
+                                        table.render(option);
+                                    }
+
                                 }
                             })
                         }

--
Gitblit v1.9.1