MES-WEB-LayUI.git

parent: 64299191 | 补丁 | 提交 | ignore whitespace

pzy

2024-08-26 6c15622369ffff568463a55f37d7df4106da963c

物料列表项目字段

10个文件已修改

1个文件已添加

	WebTM/WebTM.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/WebTM.csproj.user	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/Scripts/webConfig.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/Baseset/基础资料/Gy_HProjectGroup.html	105 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/home/console.html	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html	70 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/采购基础资料/Gy_Supplier.html	37 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/销售基础资料/Gy_Customer.html	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/销售基础资料/Gy_Customer_Edit.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -173,6 +173,7 @@
    <Content Include="views\Baseset\åºç¡èµæ\Gy_TechnologyParameterList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_TechParameterUnitList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_StockPlaceListNew.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_HProjectGroup.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_UnitGroup.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_CustomerListNew.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_WarehouseListNew.html" />

 WebTM/WebTM.csproj.user

@@ -1,9 +1,9 @@
ï»¿<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\vs\é¡¹ç®ä»£ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -6,7 +6,7 @@
    //var WEBURL = "http://localhost/API/";             //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨ä¹æ¬å°éç½®
   /* var WEBURL = "http://localhost:8082/API/"; */   //æè´ºæ¬å°éç½®
     /*var WEBURL = "http://localhost/API/";   //æ½æµæ¸¸æ¬å°éç½®  */
     WEBURL = "http://localhost/API/";   //æ½æµæ¸¸æ¬å°éç½®  
    //var WEBURL = "http://localhost:8082/API/";    //æè´ºæ¬å°éç½®
    /*var WEBURL = "http://localhost/API/";*/    //æ½æµæ¸¸æ¬å°éç½®  
    /*var WEBURL = "http://localhost:8082/API/";    //æè´ºæ¬å°éç½®*/

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_HProjectGroup.html

New file
@@ -0,0 +1,105 @@
ï»¿<!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.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">
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card">
            <!--<div class="layui-card-header"></div>-->
            <div class="layui-card-body" style="padding: 15px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">è¿æ»¤å</label>
                            <div class="layui-input-inline">
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="è¯·è¾å¥è¿æ»¤å" class="layui-input">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">å¿«éæ¥è¯¢</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">è¿å</button>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <table class="layui-hide" id="mainTable"></table>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;

            form.on('submit(HQuery)', function () {//éæ©åä½
                RoadQuery($('#Value').val());
            });

            form.on('submit(FH)', function () {//éæ©åä½
                var checkStatus = table.checkStatus('mainTable')
                 , data = checkStatus.data;
                parent.GetHProjectGroupNameValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });

            RoadQuery($('#Value').val());

            table.render({
              elem: '#mainTable'
              , data: []
              , cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢

              , cols: [[
                  { type: 'radio' }
              , { field: 'HInterID', width: 150, title: 'åä½ç»ID', hide: true }
              , { field: 'é¡¹ç®ä»£ç ', width: 150, title: 'é¡¹ç®ä»£ç ' }
                  , { field: 'é¡¹ç®ç»', width: 150, title: 'é¡¹ç®ç»', sort: true }
              ]]
                , page: true
                , limits: [50, 500, 5000, 50000],
                limit: 50
            });

            ///å è½½æ¾ç¤ºæ°æ®
            function RoadQuery(Where) {
                var Value = Where;
                if (Value == null) {
                    Value = '';
                }
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "Gy_Material/GetProjectGroupList_Json",
                    async: true,
                    data: { "Unit": Value },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , loading: false
                            , done: function (index, res) {

                            }
                        });
                    },
                    error: function (result) {
                        console.log(result);
                        //layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
                    }
                });
            };
        });
    </script>

</body>
</html>

 WebTM/views/home/console.html

@@ -411,6 +411,13 @@
                                        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: 75 });
                                            break;
                                        case 'String':
                                            if (data[i].id == 'ç´§æ¥ç¨åº¦') {
                                                col.push({
                                                    field: data[i].id, title: data[i].name, alert: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == '0' ? 'ç´§æ¥': 'æ®é'}}</div>", width: 70``
                                                });
                                                break;
                                             }
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 90 });
                                    }

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Add_Edit_Gy_Material.html

@@ -332,8 +332,8 @@
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HSecUnitRate" lay-verify="HSecUnitRate" id="HSecUnitRate" autocomplete="off" value="0">
                                                        <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT">
                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                        </button>-->
                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                </button>-->
                                                        <!--<input id="HDormID" name="HDormID" type="hidden" />-->
                                                    </div>
                                                </div>
@@ -432,9 +432,9 @@
                                            </div>
                                            <div class="layui-inline">
                                                <!--<label class="layui-form-label"> è®¡éåä½ç»ï¼</label>
                <div class="layui-input-inline">
                    <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
                </div>-->
        <div class="layui-input-inline">
            <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
        </div>-->
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">è®¡éåä½ç»</label>
                                                    <div class="layui-input-inline">
@@ -493,13 +493,24 @@
                                                </div>
                                            </div>

                                            <div class="layui-inline">
                                                <label class="layui-form-label">é¡¹ç®</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" readonly name="HProjectName" id="HProjectName" class="layui-input" value="" style="float: left; width: 100px;">
                                                    <input type="hidden" name="HProjectBillMainID" id="HProjectBillMainID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HProjectGroupList" id="HProjectGroupList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
                                                </div>
                                            </div>

                                            <div class="layui-row">

                                                <div class="layui-inline">
                                                    <!--<label class="layui-form-label"> è¾å©è®¡éåä½ï¼</label>
                    <div class="layui-input-inline">
                        <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
                    </div>-->
            <div class="layui-input-inline">
                <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
            </div>-->
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">è¾å©è®¡éåä½</label>
                                                        <div class="layui-input-inline">
@@ -958,7 +969,6 @@
                //æ¬å°åå¨
                localStorage.setItem("Add_Edit_Gy_Material", JSON.stringify(data));
            }


            //ç¼è¾ç¶ææ¶ï¼æ ¹æ®åç ï¼è·åä¿¡æ¯å¹¶åå¥çé¢
            function RoadBillMain(hID)//å è½½è¡¨å¤´
@@ -1425,9 +1435,7 @@

            function f_alert(sMsg) {
                layer.alert(sMsg, { icon: 5 });

            }


            form.on('submit(Exit)', function (data) {//éåº
                var index = parent.layer.getFrameIndex(window.name); //åå¾å°å½åiframeå±çç´¢å¼
@@ -1568,7 +1576,6 @@
                })
            });


            //éæ©è¾å©è®¡éåä½
            form.on('submit(HSecUnitList)', function () {//éæ©å®¿è
                $("#UnitType").val(2);
@@ -1599,7 +1606,6 @@
                })
            });


            //éæ©è®¡éåä½ç»
            form.on('submit(HUnitGroupList)', function () {//éæ©è®¡éåä½ç»
                layer.open({
@@ -1623,6 +1629,37 @@
                        }
                        $("#HUnitGroupName").val(checkStatus.data[0].è®¡éåä½ç»);
                        $("#HUnitGroupID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) { }
                })
            });

            //éæ©é¡¹ç®
            form.on('submit(HProjectGroupList)', function () {
                layer.open({
                    type: 2
                    , area: ['60%', '90%']//å¤§å°
                    , title: 'è®¡éåä½ç»åè¡¨'
                    , shade: 0.6 //é®ç½©éæåº¦
                    , maxmin: true //åè®¸å¨å±æå°å
                    , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                    , content: ['../../../views/Baseset/åºç¡èµæ/Gy_HProjectGroup.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çelem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        console.log(checkStatus.data[0].é¡¹ç®ç»);
                        console.log(checkStatus.data[0].HInterID);
                        $("#HProjectName").val(checkStatus.data[0].é¡¹ç®ç»);
                        $("#HProjectBillMainID ").val(checkStatus.data[0].HInterID);
                        layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) { }
@@ -1942,6 +1979,13 @@
            $("#HUnitGroupName").val(obj[0].è®¡éåä½ç»);
            $("#HUnitGroupID").val(obj[0].HItemID);
        }

        //è¿åé¡¹ç®ç»
        function GetHProjectGroupNameValue(obj) {
            $("#HProjectName").val(obj[0].é¡¹ç®ç»);
            $("#HProjectBillMainID").val(obj[0].HInterID);
        }

        //è¿åè®¡éåä½
        function GetHUnitNameValue(obj) {
            if ($("#UnitType").val() == 1) {

 WebTM/views/»ù´¡×ÊÁÏ/²É¹º»ù´¡×ÊÁÏ/Gy_Supplier.html

@@ -5,6 +5,7 @@
    <title>ä¾åºåè®¾ç½®</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
    <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">
@@ -171,6 +172,7 @@
            var params = getUrlVars();
            var Type = params[params[0]];
            var HSupTypeID = 0;
            var HSupClsName = '';
            //#endregion

            //#region ãè¿æ»¤æ¹æ¡ã
@@ -240,22 +242,22 @@
                        break;
                };
            });

            //éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });

            //æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });

            //#region éæ°åæ¥æé®
            form.on('submit(btnResCnz)', function (data) {
                set_ResCnz();
            });
            //#endregion
            //#endregion



       //#region åå»è¿åæ°æ®
            table.on('rowDouble(mainTable)', function (obj) {
@@ -300,6 +302,7 @@
                //æ ç¶å¾çæ
                get_Display_Tree();
            }

            //åå§åè¡¨æ ¼
            function set_InitGrid() {
                option = {
@@ -323,6 +326,7 @@
                    //]]
                };
            }

            //æ¥è¯¢
            function get_Display(sWhere) {
                var index = layer.load(0, { shade: false });
@@ -397,7 +401,6 @@
                layer.close(index);
            }


            //#region ç¹å»è¡éä¸é«äº®
            table.on('row(mainTable)', function (obj) {
                //éä¸è¡æ¹åé¢è²
@@ -457,6 +460,7 @@
                get_Display(sWhere);
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            }

            // éç½®æé®
            function set_ClearQuery() {
                $("#HNumber").val("");
@@ -469,6 +473,7 @@

                sWhere = "";
            }

            //éæ°åæ¥æé®
            function set_ResCnz() {
                var HNumber2 = $('#HNumber2').val();
@@ -496,6 +501,7 @@
                    }
                });
            }

            // å é¤æé®
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
@@ -531,6 +537,7 @@
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
                }
            }

            // ä¿®æ¹æé®
            function set_ShowBill() {
                var checkStatus = table.checkStatus('mainTable')
@@ -542,10 +549,11 @@
                    , shade: 0.6 //é®ç½©éæåº¦
                    , maxmin: false //åè®¸å¨å±æå°å
                    , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                    , content: ['../éè´åºç¡èµæ/Gy_Supplier_Edit.html?OperationType=3&linterid=' + checkStatus.data[0].HItemID + '&HSouceBillType=']
                    , content: ['../éè´åºç¡èµæ/Gy_Supplier_Edit.html?OperationType=3&linterid=' + checkStatus.data[0].HItemID]
                    , resize: false
                })
            }

            //æ°å¢æé®
            function set_AddNew() {
                layer.open({
@@ -581,7 +589,7 @@
                        shift: 2,
                        area: ['100%', '100%'],
                        maxmin: true,
                        content: '../éè´åºç¡èµæ/Gy_Supplier_Edit.html?OperationType=2&HSupTypeID=' + HSupTypeID,
                        content: '../éè´åºç¡èµæ/Gy_Supplier_Edit.html?OperationType=2&linterid=0&HSupTypeID=' + HSupTypeID + '&HSupClsName=' + encodeURIComponent(HSupClsName),
                        end: function () {
                            //å·æ°é¡µé¢,
                            get_FastQuery(table, option);
@@ -594,7 +602,6 @@

            }
            //#endregion


            //#region åå®¡æ ¸/å®¡æ ¸æ°æ®
            function set_CheckBill(num) {
@@ -668,7 +675,6 @@
            }
            //#endregion


            // æ ç¶å¾æ¥è¯¢
            function get_Display_Tree() {
                var ajaxLoad = layer.load();
@@ -698,7 +704,7 @@
                for (var i = 0; i < data.length; i++) {
                    // å¤ææ¯å¦åå¨åèå
                    if (data[i].children != null && data[i].children.length > 0) {
                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
                        liStr += '{"title": "' + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
                        // éåè·ååèå
                        for (var k = 0; k < data[i].children.length; k++) {
                            liStr += getChildMenu(data[i].children[k], 0);
@@ -706,7 +712,7 @@
                        liStr = liStr.substring(0, liStr.length - 1);
                        liStr += ']},';
                    } else {
                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
                        liStr += '{"title": "' + data[i].title + '", "id": "' + data[i].id + '"},';
                    }
                };
                liStr = liStr.substring(0, liStr.length - 1);
@@ -726,9 +732,10 @@
                            HSupTypeID = 0;
                        } else if (data.id == "0") {
                            sql = "";
                            HMaterTypeID = 0;
                            HSupTypeID = 0;
                        } else {
                            sql = " and HSupTypeID = '" + data.id + "' ";
                            HSupClsName = data.title;
                            HSupTypeID = data.id;
                        }
                        get_Display(sql);
@@ -741,7 +748,7 @@
                num++;
                var subStr = '';
                if (subMenu.children != null && subMenu.children.length > 0) {
                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
                    subStr += '{"title": "' + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
                    for (var j = 0; j < subMenu.children.length; j++) {
                        subStr += getChildMenu(subMenu.children[j], num);
                        if (j + 1 == subMenu.children.length) {
@@ -750,11 +757,10 @@
                    }
                    subStr += ']},';
                } else {
                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
                    subStr += '{"title": "'+ subMenu.title + '", "id": "' + subMenu.id + '"},';
                }
                return subStr;
            }

            //#endregion

            //#region éèåè®¾ç½®
@@ -791,6 +797,7 @@
                    }
                })
            }

            //#endregion
            //#region æ¾ç¤ºåæ°æ®
            function DisPlay_HideColumn() {
@@ -900,7 +907,6 @@
                $("#ColName").append(Organization);
                form.render('select');
            }

            //#endregion

            //#region ãè¿æ»¤æ¹æ¡ã
@@ -1111,6 +1117,7 @@
            //#endregion
            //ä»¥ä¸æ¯layuiæ¨¡å
        });

        //#region ãè¿æ»¤æ¹æ¡è¿åæ°æ®ã
        function HFilterScheme(obj)  //è¿åè¿æ»¤æ¹æ¡
        {

 WebTM/views/»ù´¡×ÊÁÏ/²É¹º»ù´¡×ÊÁÏ/Gy_Supplier_Edit.html

@@ -5,6 +5,7 @@
    <title>ä¾åºååºç¡èµæ</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
    <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">
@@ -20,6 +21,7 @@
        .layui-form-item .layui-inline {
            margin-right: 0px;
        }

        .layui-input, .layui-textarea {
            width: 124%;
        }
@@ -377,7 +379,6 @@
        } else {
            var OperationType = params[params[0]];//æä½ç±»å
            var linterid = params[params[1]];//æºåid
            var HSouceBillType = params[params[2]];//æºåç±»å
        }

        layui.config({
@@ -412,10 +413,13 @@

            else if (OperationType == 2) {//æ°å¢æµæ°´å·
                setInitHCurName()
                var HSupTypeID = params[params[1]];//ç±»åid
                var HSupTypeID = params[params[2]];//ç±»åid
                var HSupClsName = params[params[3]];//ç±»ååç§°
                console.log(HSupClsName)
                setHNumber(HSupTypeID);
                $("#HNumber").attr("readonly", true);

                $("#HNumber").attr("readonly", false);
                $("#HSupTypeID").val(HSupTypeID);
                $("#HSupClsName").val(decodeURIComponent(HSupClsName));
                //åå§åè¡¨
                get_InitGrid();
            }
@@ -522,6 +526,7 @@
                    }
                });
            });

            //éæ©éè´æ¹å¼æé®
            form.on('submit(btnSearchPss)', function () {
                layer.open({
@@ -545,6 +550,7 @@
                    , btn2: function (index, layero) { }
                })
            });

            //é»è®¤è´§å¸å¼¹çª
            form.on('submit(btnCurrency)', function () {
                //é¡µé¢å±-èªå®ä¹
@@ -649,6 +655,7 @@
                    }
                });
            });

            //ä¿å
            form.on('submit(Saver)', function (data) {//æäº¤
                var ModRightNameAdd = 'Gy_Supplier_Edit';
@@ -724,6 +731,7 @@
                    }
                }
            });

            //éåº
            form.on('submit(Exit)', function () {
                if (linterid == undefined) {
@@ -735,10 +743,12 @@
                    Pub_Close(1);
                }
            });

            //å®¡æ ¸
            form.on('submit(Check)', function () {

            });

            //æå°Printing
            form.on("submit(print)", function (data) {
                layer.alert("ææ¯æå°æé®ï¼åæ®ä¸»IDæ¯ï¼" + linterid);
@@ -746,21 +756,23 @@
                window.open("HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");

            });

            //æ°å¢
            form.on('submit(Add)', function () {
                window.location.reload();
                $("#HCreator").val(sessionStorage["HUserName"]);//åå»ºäºº
            });

            //åå»ºç»ç»
            form.on('submit(HCreateOrgID_BT)', function () {
                HCreateOrgID_BT();
            });

            //ä½¿ç¨ç»ç»
            form.on('submit(HUseOrgID_BT)', function () {
                HUseOrgID_BT();
            });
            //#endregion


            //#region æ¤é¡µé¢æææ¹æ³
            //åå§åé¡µé¢
@@ -796,6 +808,7 @@
                    }
                });
            }

            //æ°å¢è®¾ç½®é»è®¤ç¨çåè´§å¸
            function setInitHCurName() {
                var ajaxLoad = layer.load();
@@ -863,7 +876,7 @@

                var rowdata = [
                    {
                        "HPayType": ""
                          "HPayType": ""
                        , "HPayRate": "0"
                        , "HPayTime": "0"
                        , "HPayRemark": ""
@@ -873,7 +886,6 @@
                table.render(option);
            }
            //#endregion


            //ç¼è¾é¡µé¢å è½½
            function set_EditFromGrid() {
@@ -934,11 +946,13 @@
                    }
                });
            }

            //è¿åéªæ¶
            function GetHSecManagerValue(obj) {
                $("#HSecManager").val(obj[0].HName);
                $("#HSecManagerID").val(obj[0].HItemID);
            }

            //æ°æ®éªè¯
            function AllowLoadData() {


 WebTM/views/»ù´¡×ÊÁÏ/ÏúÊÛ»ù´¡×ÊÁÏ/Gy_Customer.html

@@ -202,6 +202,7 @@
            //ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å± ï¼å³èç¨æ·ï¼
            var titleData1 = ["HCusID"];
            var HCusTypeID = 0;
            var HCusClsName = '';
            var ins;                        //ç¨äºå¯¼åºexcel
            //#endregion
            //#region ãè¿æ»¤æ¹æ¡ã
@@ -775,7 +776,7 @@
                        shift: 2,
                        area: ['100%', '100%'],
                        maxmin: true,
                        content: '../éå®åºç¡èµæ/Gy_Customer_Edit.html?OperationType=2&HCusTypeID=' + HCusTypeID,
                        content: '../éå®åºç¡èµæ/Gy_Customer_Edit.html?OperationType=2&HCusTypeID=' + HCusTypeID + '&HCusClsName=' + encodeURIComponent(HCusClsName),
                        end: function () {
                            //å·æ°é¡µé¢,
                            get_FastQuery(table, option);
@@ -1121,7 +1122,7 @@
                for (var i = 0; i < data.length; i++) {
                    // å¤ææ¯å¦åå¨åèå
                    if (data[i].children != null && data[i].children.length > 0) {
                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
                        liStr += '{"title": "' + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
                        // éåè·ååèå
                        for (var k = 0; k < data[i].children.length; k++) {
                            liStr += getChildMenu(data[i].children[k], 0);
@@ -1129,7 +1130,7 @@
                        liStr = liStr.substring(0, liStr.length - 1);
                        liStr += ']},';
                    } else {
                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
                        liStr += '{"title": "'+ data[i].title + '", "id": "' + data[i].id + '"},';
                    }
                };
                liStr = liStr.substring(0, liStr.length - 1);
@@ -1153,6 +1154,7 @@
                        } else {
                            sql = " and HCusTypeID='" + data.id + "' ";
                            HCusTypeID = data.id;
                            HCusClsName = data.title;
                        }
                        get_Display(sql);
                    }
@@ -1164,7 +1166,7 @@
                num++;
                var subStr = '';
                if (subMenu.children != null && subMenu.children.length > 0) {
                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
                    subStr += '{"title": "'+ subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
                    for (var j = 0; j < subMenu.children.length; j++) {
                        subStr += getChildMenu(subMenu.children[j], num);
                        if (j + 1 == subMenu.children.length) {
@@ -1173,7 +1175,7 @@
                    }
                    subStr += ']},';
                } else {
                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
                    subStr += '{"title": "'+ subMenu.title + '", "id": "' + subMenu.id + '"},';
                }
                return subStr;
            }

 WebTM/views/»ù´¡×ÊÁÏ/ÏúÊÛ»ù´¡×ÊÁÏ/Gy_Customer_Edit.html

@@ -406,8 +406,10 @@

            else if (OperationType == 2) {//æµæ°´å·æ°å¢
                var HCusTypeID = params[params[1]];//ç±»åid
                var HCusClsName = params[params[2]]//ç±»ååç§°
                setHNumber(HCusTypeID);
                $("#HNumber").attr("readonly", true);
                $("#HNumber").attr("readonly", false);
                $("#HCusTypeName").val(decodeURIComponent(HCusClsName));
                //ç¦ç¨ç»ç»éé¡¹
                $("#HUSEORGID").attr("disabled", true);
                $("#HCreateOrgID").attr("disabled", true);

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html

@@ -281,6 +281,7 @@
                                <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-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Notice" id="Notice"><i class="layui-icon layui-icon-export"></i>éç¥</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fp" id="fp"><i class="layui-icon layui-icon-tips"></i>åé</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fb" id="fb"><i class="layui-icon layui-icon-tips"></i>åå¸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="back"><i class="layui-icon layui-icon-close-fill"></i>æ¤é</button>

			@@ -173,6 +173,7 @@
			<Content Include="views\Baseset\åºç¡èµæ\Gy_TechnologyParameterList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_TechParameterUnitList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_StockPlaceListNew.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_HProjectGroup.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_UnitGroup.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_CustomerListNew.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_WarehouseListNew.html" />

			@@ -1,9 +1,9 @@
			ï»¿<?xml version="1.0" encoding="utf-8"?>
			<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>D:\vs\é¡¹ç®ä»£ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
			<ProjectView>ProjectFiles</ProjectView>
			<LastActiveSolutionConfig>Debug\|Any CPU</LastActiveSolutionConfig>
			<LastActiveSolutionConfig>Release\|Any CPU</LastActiveSolutionConfig>
			<UseIISExpress>true</UseIISExpress>
			<Use64BitIISExpress />
			<IISExpressSSLPort />

			@@ -6,7 +6,7 @@
			//var WEBURL = "http://localhost/API/"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			/* var WEBURL = "http://localhost:8082/API/"; */ //æè´ºæ¬å°éç½®
			/var WEBURL = "http://localhost/API/"; //æ½æµæ¸¸æ¬å°éç½® /
			WEBURL = "http://localhost/API/"; //æ½æµæ¸¸æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°éç½®
			/var WEBURL = "http://localhost/API/";/ //æ½æµæ¸¸æ¬å°éç½®
			/var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°éç½®/

New file
			@@ -0,0 +1,105 @@
			ï»¿<!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.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">
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-card">
			<!--<div class="layui-card-header"></div>-->
			<div class="layui-card-body" style="padding: 15px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤å</label>
			<div class="layui-input-inline">
			<input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="è¯·è¾å¥è¿æ»¤å" class="layui-input">
			</div>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">å¿«éæ¥è¯¢</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">è¿å</button>
			</div>
			</div>
			</form>
			</div>
			</div>
			</div>
			<table class="layui-hide" id="mainTable"></table>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script>
			layui.use(['table', 'form', 'layer'], function () {
			var table = layui.table
			, form = layui.form
			, layer = layui.layer;

			form.on('submit(HQuery)', function () {//éæ©åä½
			RoadQuery($('#Value').val());
			});

			form.on('submit(FH)', function () {//éæ©åä½
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			parent.GetHProjectGroupNameValue(data);
			var index = parent.layer.getFrameIndex(window.name);
			parent.layer.close(index);
			});

			RoadQuery($('#Value').val());

			table.render({
			elem: '#mainTable'
			, data: []
			, cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢

			, cols: [[
			{ type: 'radio' }
			, { field: 'HInterID', width: 150, title: 'åä½ç»ID', hide: true }
			, { field: 'é¡¹ç®ä»£ç ', width: 150, title: 'é¡¹ç®ä»£ç ' }
			, { field: 'é¡¹ç®ç»', width: 150, title: 'é¡¹ç®ç»', sort: true }
			]]
			, page: true
			, limits: [50, 500, 5000, 50000],
			limit: 50
			});

			///å è½½æ¾ç¤ºæ°æ®
			function RoadQuery(Where) {
			var Value = Where;
			if (Value == null) {
			Value = '';
			}
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "Gy_Material/GetProjectGroupList_Json",
			async: true,
			data: { "Unit": Value },
			success: function (result) {
			ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
			table.reload('mainTable', {
			data: ajaxReturnData
			, height: 'full-10'
			, loading: false
			, done: function (index, res) {

			}
			});
			},
			error: function (result) {
			console.log(result);
			//layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
			}
			});
			};
			});
			</script>

			</body>
			</html>

			@@ -411,6 +411,13 @@
			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: 75 });
			break;
			case 'String':
			if (data[i].id == 'ç´§æ¥ç¨åº¦') {
			col.push({
			field: data[i].id, title: data[i].name, alert: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == '0' ? 'ç´§æ¥': 'æ®é'}}</div>", width: 70``
			});
			break;
			}
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 90 });
			}

			@@ -332,8 +332,8 @@
			<div class="layui-input-inline">
			<input class="layui-input" name="HSecUnitRate" lay-verify="HSecUnitRate" id="HSecUnitRate" autocomplete="off" value="0">
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>-->
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>-->
			<!--<input id="HDormID" name="HDormID" type="hidden" />-->
			</div>
			</div>
			@@ -432,9 +432,9 @@
			</div>
			<div class="layui-inline">
			<!--<label class="layui-form-label"> è®¡éåä½ç»ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
			</div>-->
			<div class="layui-input-inline">
			<input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">è®¡éåä½ç»</label>
			<div class="layui-input-inline">
			@@ -493,13 +493,24 @@
			</div>
			</div>

			<div class="layui-inline">
			<label class="layui-form-label">é¡¹ç®</label>
			<div class="layui-input-inline">
			<input type="text" readonly name="HProjectName" id="HProjectName" class="layui-input" value="" style="float: left; width: 100px;">
			<input type="hidden" name="HProjectBillMainID" id="HProjectBillMainID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HProjectGroupList" id="HProjectGroupList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>

			<div class="layui-row">

			<div class="layui-inline">
			<!--<label class="layui-form-label"> è¾å©è®¡éåä½ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
			</div>-->
			<div class="layui-input-inline">
			<input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">è¾å©è®¡éåä½</label>
			<div class="layui-input-inline">
			@@ -958,7 +969,6 @@
			//æ¬å°åå¨
			localStorage.setItem("Add_Edit_Gy_Material", JSON.stringify(data));
			}


			//ç¼è¾ç¶ææ¶ï¼æ ¹æ®åç ï¼è·åä¿¡æ¯å¹¶åå¥çé¢
			function RoadBillMain(hID)//å è½½è¡¨å¤´
			@@ -1425,9 +1435,7 @@

			function f_alert(sMsg) {
			layer.alert(sMsg, { icon: 5 });

			}


			form.on('submit(Exit)', function (data) {//éåº
			var index = parent.layer.getFrameIndex(window.name); //åå¾å°å½åiframeå±çç´¢å¼
			@@ -1568,7 +1576,6 @@
			})
			});


			//éæ©è¾å©è®¡éåä½
			form.on('submit(HSecUnitList)', function () {//éæ©å®¿è
			$("#UnitType").val(2);
			@@ -1599,7 +1606,6 @@
			})
			});


			//éæ©è®¡éåä½ç»
			form.on('submit(HUnitGroupList)', function () {//éæ©è®¡éåä½ç»
			layer.open({
			@@ -1623,6 +1629,37 @@
			}
			$("#HUnitGroupName").val(checkStatus.data[0].è®¡éåä½ç»);
			$("#HUnitGroupID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			});

			//éæ©é¡¹ç®
			form.on('submit(HProjectGroupList)', function () {
			layer.open({
			type: 2
			, area: ['60%', '90%']//å¤§å°
			, title: 'è®¡éåä½ç»åè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_HProjectGroup.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çelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			console.log(checkStatus.data[0].é¡¹ç®ç»);
			console.log(checkStatus.data[0].HInterID);
			$("#HProjectName").val(checkStatus.data[0].é¡¹ç®ç»);
			$("#HProjectBillMainID ").val(checkStatus.data[0].HInterID);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			@@ -1942,6 +1979,13 @@
			$("#HUnitGroupName").val(obj[0].è®¡éåä½ç»);
			$("#HUnitGroupID").val(obj[0].HItemID);
			}

			//è¿åé¡¹ç®ç»
			function GetHProjectGroupNameValue(obj) {
			$("#HProjectName").val(obj[0].é¡¹ç®ç»);
			$("#HProjectBillMainID").val(obj[0].HInterID);
			}

			//è¿åè®¡éåä½
			function GetHUnitNameValue(obj) {
			if ($("#UnitType").val() == 1) {

			@@ -5,6 +5,7 @@
			<title>ä¾åºåè®¾ç½®</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
			<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">
			@@ -171,6 +172,7 @@
			var params = getUrlVars();
			var Type = params[params[0]];
			var HSupTypeID = 0;
			var HSupClsName = '';
			//#endregion

			//#region ãè¿æ»¤æ¹æ¡ã
			@@ -240,22 +242,22 @@
			break;
			};
			});

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			});

			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery();
			});

			//#region éæ°åæ¥æé®
			form.on('submit(btnResCnz)', function (data) {
			set_ResCnz();
			});
			//#endregion
			//#endregion



			//#region åå»è¿åæ°æ®
			table.on('rowDouble(mainTable)', function (obj) {
			@@ -300,6 +302,7 @@
			//æ ç¶å¾çæ
			get_Display_Tree();
			}

			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			option = {
			@@ -323,6 +326,7 @@
			//]]
			};
			}

			//æ¥è¯¢
			function get_Display(sWhere) {
			var index = layer.load(0, { shade: false });
			@@ -397,7 +401,6 @@
			layer.close(index);
			}


			//#region ç¹å»è¡éä¸é«äº®
			table.on('row(mainTable)', function (obj) {
			//éä¸è¡æ¹åé¢è²
			@@ -457,6 +460,7 @@
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}

			// éç½®æé®
			function set_ClearQuery() {
			$("#HNumber").val("");
			@@ -469,6 +473,7 @@

			sWhere = "";
			}

			//éæ°åæ¥æé®
			function set_ResCnz() {
			var HNumber2 = $('#HNumber2').val();
			@@ -496,6 +501,7 @@
			}
			});
			}

			// å é¤æé®
			function set_DeleteBill() {
			var checkStatus = table.checkStatus('mainTable')
			@@ -531,6 +537,7 @@
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
			}
			}

			// ä¿®æ¹æé®
			function set_ShowBill() {
			var checkStatus = table.checkStatus('mainTable')
			@@ -542,10 +549,11 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../éè´åºç¡èµæ/Gy_Supplier_Edit.html?OperationType=3&linterid=' + checkStatus.data[0].HItemID + '&HSouceBillType=']
			, content: ['../éè´åºç¡èµæ/Gy_Supplier_Edit.html?OperationType=3&linterid=' + checkStatus.data[0].HItemID]
			, resize: false
			})
			}

			//æ°å¢æé®
			function set_AddNew() {
			layer.open({
			@@ -581,7 +589,7 @@
			shift: 2,
			area: ['100%', '100%'],
			maxmin: true,
			content: '../éè´åºç¡èµæ/Gy_Supplier_Edit.html?OperationType=2&HSupTypeID=' + HSupTypeID,
			content: '../éè´åºç¡èµæ/Gy_Supplier_Edit.html?OperationType=2&linterid=0&HSupTypeID=' + HSupTypeID + '&HSupClsName=' + encodeURIComponent(HSupClsName),
			end: function () {
			//å·æ°é¡µé¢,
			get_FastQuery(table, option);
			@@ -594,7 +602,6 @@

			}
			//#endregion


			//#region åå®¡æ ¸/å®¡æ ¸æ°æ®
			function set_CheckBill(num) {
			@@ -668,7 +675,6 @@
			}
			//#endregion


			// æ ç¶å¾æ¥è¯¢
			function get_Display_Tree() {
			var ajaxLoad = layer.load();
			@@ -698,7 +704,7 @@
			for (var i = 0; i < data.length; i++) {
			// å¤ææ¯å¦åå¨åèå
			if (data[i].children != null && data[i].children.length > 0) {
			liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
			liStr += '{"title": "' + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
			// éåè·ååèå
			for (var k = 0; k < data[i].children.length; k++) {
			liStr += getChildMenu(data[i].children[k], 0);
			@@ -706,7 +712,7 @@
			liStr = liStr.substring(0, liStr.length - 1);
			liStr += ']},';
			} else {
			liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
			liStr += '{"title": "' + data[i].title + '", "id": "' + data[i].id + '"},';
			}
			};
			liStr = liStr.substring(0, liStr.length - 1);
			@@ -726,9 +732,10 @@
			HSupTypeID = 0;
			} else if (data.id == "0") {
			sql = "";
			HMaterTypeID = 0;
			HSupTypeID = 0;
			} else {
			sql = " and HSupTypeID = '" + data.id + "' ";
			HSupClsName = data.title;
			HSupTypeID = data.id;
			}
			get_Display(sql);
			@@ -741,7 +748,7 @@
			num++;
			var subStr = '';
			if (subMenu.children != null && subMenu.children.length > 0) {
			subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
			subStr += '{"title": "' + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
			for (var j = 0; j < subMenu.children.length; j++) {
			subStr += getChildMenu(subMenu.children[j], num);
			if (j + 1 == subMenu.children.length) {
			@@ -750,11 +757,10 @@
			}
			subStr += ']},';
			} else {
			subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
			subStr += '{"title": "'+ subMenu.title + '", "id": "' + subMenu.id + '"},';
			}
			return subStr;
			}

			//#endregion

			//#region éèåè®¾ç½®
			@@ -791,6 +797,7 @@
			}
			})
			}

			//#endregion
			//#region æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			@@ -900,7 +907,6 @@
			$("#ColName").append(Organization);
			form.render('select');
			}

			//#endregion

			//#region ãè¿æ»¤æ¹æ¡ã
			@@ -1111,6 +1117,7 @@
			//#endregion
			//ä»¥ä¸æ¯layuiæ¨¡å
			});

			//#region ãè¿æ»¤æ¹æ¡è¿åæ°æ®ã
			function HFilterScheme(obj) //è¿åè¿æ»¤æ¹æ¡
			{

			@@ -5,6 +5,7 @@
			<title>ä¾åºååºç¡èµæ</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
			<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">
			@@ -20,6 +21,7 @@
			.layui-form-item .layui-inline {
			margin-right: 0px;
			}

			.layui-input, .layui-textarea {
			width: 124%;
			}
			@@ -377,7 +379,6 @@
			} else {
			var OperationType = params[params[0]];//æä½ç±»å
			var linterid = params[params[1]];//æºåid
			var HSouceBillType = params[params[2]];//æºåç±»å
			}

			layui.config({
			@@ -412,10 +413,13 @@

			else if (OperationType == 2) {//æ°å¢æµæ°´å·
			setInitHCurName()
			var HSupTypeID = params[params[1]];//ç±»åid
			var HSupTypeID = params[params[2]];//ç±»åid
			var HSupClsName = params[params[3]];//ç±»ååç§°
			console.log(HSupClsName)
			setHNumber(HSupTypeID);
			$("#HNumber").attr("readonly", true);

			$("#HNumber").attr("readonly", false);
			$("#HSupTypeID").val(HSupTypeID);
			$("#HSupClsName").val(decodeURIComponent(HSupClsName));
			//åå§åè¡¨
			get_InitGrid();
			}
			@@ -522,6 +526,7 @@
			}
			});
			});

			//éæ©éè´æ¹å¼æé®
			form.on('submit(btnSearchPss)', function () {
			layer.open({
			@@ -545,6 +550,7 @@
			, btn2: function (index, layero) { }
			})
			});

			//é»è®¤è´§å¸å¼¹çª
			form.on('submit(btnCurrency)', function () {
			//é¡µé¢å±-èªå®ä¹
			@@ -649,6 +655,7 @@
			}
			});
			});

			//ä¿å
			form.on('submit(Saver)', function (data) {//æäº¤
			var ModRightNameAdd = 'Gy_Supplier_Edit';
			@@ -724,6 +731,7 @@
			}
			}
			});

			//éåº
			form.on('submit(Exit)', function () {
			if (linterid == undefined) {
			@@ -735,10 +743,12 @@
			Pub_Close(1);
			}
			});

			//å®¡æ ¸
			form.on('submit(Check)', function () {

			});

			//æå°Printing
			form.on("submit(print)", function (data) {
			layer.alert("ææ¯æå°æé®ï¼åæ®ä¸»IDæ¯ï¼" + linterid);
			@@ -746,21 +756,23 @@
			window.open("HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");

			});

			//æ°å¢
			form.on('submit(Add)', function () {
			window.location.reload();
			$("#HCreator").val(sessionStorage["HUserName"]);//åå»ºäºº
			});

			//åå»ºç»ç»
			form.on('submit(HCreateOrgID_BT)', function () {
			HCreateOrgID_BT();
			});

			//ä½¿ç¨ç»ç»
			form.on('submit(HUseOrgID_BT)', function () {
			HUseOrgID_BT();
			});
			//#endregion


			//#region æ¤é¡µé¢æææ¹æ³
			//åå§åé¡µé¢
			@@ -796,6 +808,7 @@
			}
			});
			}

			//æ°å¢è®¾ç½®é»è®¤ç¨çåè´§å¸
			function setInitHCurName() {
			var ajaxLoad = layer.load();
			@@ -863,7 +876,7 @@

			var rowdata = [
			{
			"HPayType": ""
			"HPayType": ""
			, "HPayRate": "0"
			, "HPayTime": "0"
			, "HPayRemark": ""
			@@ -873,7 +886,6 @@
			table.render(option);
			}
			//#endregion


			//ç¼è¾é¡µé¢å è½½
			function set_EditFromGrid() {
			@@ -934,11 +946,13 @@
			}
			});
			}

			//è¿åéªæ¶
			function GetHSecManagerValue(obj) {
			$("#HSecManager").val(obj[0].HName);
			$("#HSecManagerID").val(obj[0].HItemID);
			}

			//æ°æ®éªè¯
			function AllowLoadData() {

			@@ -202,6 +202,7 @@
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å± ï¼å³èç¨æ·ï¼
			var titleData1 = ["HCusID"];
			var HCusTypeID = 0;
			var HCusClsName = '';
			var ins; //ç¨äºå¯¼åºexcel
			//#endregion
			//#region ãè¿æ»¤æ¹æ¡ã
			@@ -775,7 +776,7 @@
			shift: 2,
			area: ['100%', '100%'],
			maxmin: true,
			content: '../éå®åºç¡èµæ/Gy_Customer_Edit.html?OperationType=2&HCusTypeID=' + HCusTypeID,
			content: '../éå®åºç¡èµæ/Gy_Customer_Edit.html?OperationType=2&HCusTypeID=' + HCusTypeID + '&HCusClsName=' + encodeURIComponent(HCusClsName),
			end: function () {
			//å·æ°é¡µé¢,
			get_FastQuery(table, option);
			@@ -1121,7 +1122,7 @@
			for (var i = 0; i < data.length; i++) {
			// å¤ææ¯å¦åå¨åèå
			if (data[i].children != null && data[i].children.length > 0) {
			liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
			liStr += '{"title": "' + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
			// éåè·ååèå
			for (var k = 0; k < data[i].children.length; k++) {
			liStr += getChildMenu(data[i].children[k], 0);
			@@ -1129,7 +1130,7 @@
			liStr = liStr.substring(0, liStr.length - 1);
			liStr += ']},';
			} else {
			liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
			liStr += '{"title": "'+ data[i].title + '", "id": "' + data[i].id + '"},';
			}
			};
			liStr = liStr.substring(0, liStr.length - 1);
			@@ -1153,6 +1154,7 @@
			} else {
			sql = " and HCusTypeID='" + data.id + "' ";
			HCusTypeID = data.id;
			HCusClsName = data.title;
			}
			get_Display(sql);
			}
			@@ -1164,7 +1166,7 @@
			num++;
			var subStr = '';
			if (subMenu.children != null && subMenu.children.length > 0) {
			subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
			subStr += '{"title": "'+ subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
			for (var j = 0; j < subMenu.children.length; j++) {
			subStr += getChildMenu(subMenu.children[j], num);
			if (j + 1 == subMenu.children.length) {
			@@ -1173,7 +1175,7 @@
			}
			subStr += ']},';
			} else {
			subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
			subStr += '{"title": "'+ subMenu.title + '", "id": "' + subMenu.id + '"},';
			}
			return subStr;
			}

			@@ -406,8 +406,10 @@

			else if (OperationType == 2) {//æµæ°´å·æ°å¢
			var HCusTypeID = params[params[1]];//ç±»åid
			var HCusClsName = params[params[2]]//ç±»ååç§°
			setHNumber(HCusTypeID);
			$("#HNumber").attr("readonly", true);
			$("#HNumber").attr("readonly", false);
			$("#HCusTypeName").val(decodeURIComponent(HCusClsName));
			//ç¦ç¨ç»ç»éé¡¹
			$("#HUSEORGID").attr("disabled", true);
			$("#HCreateOrgID").attr("disabled", true);

			@@ -281,6 +281,7 @@
			<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-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Notice" id="Notice"><i class="layui-icon layui-icon-export"></i>éç¥</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fp" id="fp"><i class="layui-icon layui-icon-tips"></i>åé</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fb" id="fb"><i class="layui-icon layui-icon-tips"></i>åå¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="back"><i class="layui-icon layui-icon-close-fill"></i>æ¤é</button>