From 2574cf03f4653ca5538e04e533ddb28766892cd7 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 04 三月 2025 16:39:18 +0800
Subject: [PATCH] 采购价格资料

---
 WebTM/views/基础资料/基础资料/Gy_MatePriceSup.html     |  298 +++++++++++++-------------------
 WebTM/views/基础资料/基础资料/Gy_MatePriceSupEdit.html |  226 ++++++++++++++++++++++--
 2 files changed, 326 insertions(+), 198 deletions(-)

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..111ec7b 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" />
+                                                    </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,21 +214,19 @@
         //#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) {
-
+            $("#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"));
         }
         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();
 
@@ -216,7 +253,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 +265,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 +282,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 +294,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) { }
@@ -294,6 +333,108 @@
                 }
                 , 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
@@ -352,17 +493,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 +513,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 +543,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

--
Gitblit v1.9.1