MES-WEB-LayUI.git

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

送测登记台账,增加超链接,增加人员履历报表,报表跳转工艺参数根据传入参数进行筛选,技能考核增加事业部字段

zrg

2024-10-18 01f011755efdd6a210d086bb57827396630feda0

送测登记台账,增加超链接,增加人员履历报表,报表跳转工艺参数根据传入参数进行筛选,技能考核增加事业部字段

9个文件已修改

1个文件已添加

	WebTM/WebTM.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/人事管理/人员履历/HR_PersonnelResumeList.html	324 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterList.html	91 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/技能考核/HR_EmployeeSkillExamBill.html	41 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/质量报表/QC_EquipMentCollectionTechParam.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/质量报表/QC_RegistrationForTestingReport.html	98 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/质量报表/QC_SkillExamMonthSumReport.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/质量报表/SB_TechnologyParameterList.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -315,6 +315,7 @@
    <Content Include="views\WMSæ«ç æ¨¡å\éå®åºåº\Kf_SellOutBillList_PDA.html" />
    <Content Include="views\WMSæ«ç æ¨¡å\éå®åºåº\Kf_SellOutBillList_QiaoYi_PDA.html" />
    <Content Include="views\WMSæ«ç æ¨¡å\éå®åºåº\Kf_SellOutBill_QiaoYi_PDA.html" />
    <Content Include="views\äººäºç®¡ç\äººåå±¥å\HR_PersonnelResumeList.html" />
    <Content Include="views\äººäºç®¡ç\å¼å¸¸åé¦å\OA_ErrMsgBackBillList_PDA.html" />
    <Content Include="views\äººäºç®¡ç\å¼å¸¸åé¦å\OA_ErrMsgBackBill_PDA.html" />
    <Content Include="views\ä»åç®¡ç\ä¸ç¹ç§åæ«ç è®°å½å\WMS_CusBarCodeCheckBillList.html" />

 WebTM/views/ÈËÊÂ¹ÜÀí/ÈËÔ±ÂÄÀú/HR_PersonnelResumeList.html

New file
@@ -0,0 +1,324 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>äººåå±¥å</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <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/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/grwebapp.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>

</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>æ´å¤</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">èåä»£ç </label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
                                    </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 ForFilteringSchemes" name="HName" id="HName">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn-Close" id="btn-Close" style="padding:0 5px">éåº</button>
                            </div>
                        </div>
                    <div class="layui-tab layui-tab-card" style="margin-top:20px;" >
                        <ul class="layui-tab-title">
                            <li class="layui-this">èåä¿¡æ¯</li>
                            <li>æè½ççº§</li>
                            <li>èæ ¸è®°å½</li>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                <!--èåä¿¡æ¯-->
                                <table class="layui-hide" id="mainTable_people" lay-filter="mainTable_people"></table>
                            </div>
                            <div class="layui-tab-item">
                                <!--æè½ççº§-->
                                <table class="layui-hide" id="mainTable_skill" lay-filter="mainTable_skill"></table>
                            </div>
                            <div class="layui-tab-item">
                                <!--èæ ¸è®°å½-->
                                <table class="layui-hide" id="mainTable_examine" lay-filter="mainTable_examine"></table>
                            </div>
                        </div>
                    </div>
                    <script type="text/html" id="toolbarDemo">
                       
                    </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
            //#region å¬å±åé
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
                , soulTable = layui.soulTable
            var sWhere = "";
            var Number = "";
            var Name = "";
            var option_people = "";  //èåä¿¡æ¯
            var option_examine = ""; //èæ ¸è®°å½
            var option_skill = ""; //æè½ççº§
            var ins;
            var params = get_UrlVars();        
            var OperationType = params[params[0]] == null ? 1 : params[params[0]];  //1ä¸ºç´æ¥åè¡¨æ¨¡åæå¼  2ä¸ºä»å¶ä»æ¨¡åæå¼åºç¡èµæåè¡¨
            Number = params[params[1]] == null ? "" : params[params[1]];  //ä»£ç 
            Name = params[params[2]] == null ? "" : params[params[2]];  //åç§°
            Number = decodeURI(Number);
            Name = decodeURI(Name);
            //#endregion

            //#region è¿å¥é¡µé¢å³å è½½

            //
            var HModName = "HR_PersonnelResumeList";
            //ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å± ï¼æä¸»å¯¼çï¼
            var titleData = [""];
            //åå§åçé¢
            set_ClearBill();
            //#endregion

            //#region å¤´å·¥å·æ äºä»¶
            //æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });
            // éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            // éåºæé®
            form.on('submit(btn-Close)', function (data) {
                if (OperationType==2) {
                    Pub_Close(1);
                } else{
                    Pub_Close(2);
                }
               
            });
            //#endregion

            //#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³
            function set_ClearBill() {
                //åå§åèåä¿¡æ¯åè¡¨
                set_InitGrid_people();
                //åå§åæè½ççº§
                set_InitGrid_skill();
                //åå§åèæ ¸è®°å½åè¡¨
                set_InitGrid_examine();
                //æ¥è¯¢
                get_FastQuery();
            }

            //#region å¿«éè¿æ»¤
            function get_FastQuery() {
                var HNumber = $("#HNumber").val() != "" ? "" : Number;
                var HName = $("#HName").val() != "" ? "" : Name;
                sWhere = {
                    HNumber: HNumber,
                    HName: HName
                }
                get_Display(JSON.stringify(sWhere));
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            }
            //#endregion

            //#region éç½®å¿«éæ¥è¯¢
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                $("#btnSearch").click();              
                form.render('select');
                sWhere = "";
            }
            //#endregion

            //åå§åèåä¿¡æ¯åè¡¨
            function set_InitGrid_people() {
                option_people = {
                    elem: '#mainTable_people'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , totalRow: true
                    , height: 300
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: []
                };
                //table.render(option);
            }

            //åå§åèæ ¸è®°å½åè¡¨
            function set_InitGrid_examine() {
                option_examine = {
                    elem: '#mainTable_examine'
                    , page: false
                    , height: 500
                    , totalRow: true
                    , cellMinWidth: 90
                    , limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
                    , cols: []
                };
            }

            //åå§åæ£å¨ç»§ç»åè¡¨
            function set_InitGrid_skill() {
                option_skill = {
                    elem: '#mainTable_skill'
                    , page: false
                    , height: 500
                    , totalRow: true
                    , cellMinWidth: 90
                    , limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
                    , cols: []
                };
            }
            

            //#region æ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();

                $.ajax({
                    url: GetWEBURL() + '/HR_PersonnelResumeController/GetHR_PersonnelResumeList',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere},
                    success: function (data1) {
                        if (data1.count == 1) {  
                            var Listcol = [];
                            for (var i = 0; i < data1.list.length; i++) {
                                var data = [];
                                //ç»ç©ºçæ°ç»èµå¼
                                for (var key in data1.list[i].Columns) {
                                    data.push({ "id": data1.list[i].Columns[key].ColmCols, "name": data1.list[i].Columns[key].ColmCols, "Type": data1.list[i].Columns[key].ColmType });
                                }
                                var col = [];
                                col.push({ type: 'checkbox', fixed: 'left' });
                                for (var j = 0; j < data.length; j++) {
                                    if ($.inArray(data[j].name, titleData) > -1) {
                                        col.push({ field: data[j].id, title: data[j].name, align: 'center', hide: true }); //éèidå
                                    }                                   
                                    else {
                                        switch (data[j].Type) {
                                            //int
                                            case 'DateTime':
                                                col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, templet: "<div>{{d." + data[j].name + " ==null ?'':layui.util.toDateString(d." + data[j].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                                break;
                                            default:
                                                col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: data[j].name });
                                        }
                                    }
                                }
                                Listcol.push(col);
                            }

                            //å¨ææ¾ç¤ºåå
                            option_people = {
                                elem: '#mainTable_people'
                                , toolbar: '#toolbarDemo'
                                , cols: [Listcol[0]]
                                , data: data1.data.h_p_HR_PersonnelResumeReport
                                , height: 'full-80'
                                , page: true
                                , totalRow: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            table.render(option_people);
                            ins = table.render(option_people);

                            option_examine = {
                                elem: '#mainTable_examine'
                                , toolbar: '#toolbarDemo'
                                , cols: [Listcol[1]]
                                , data: data1.data.h_p_HR_PersonnelResumeReport1
                                , height: 'full-80'
                                , page: true
                                , totalRow: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            table.render(option_examine);

                            option_skill = {
                                elem: '#mainTable_skill'
                                , toolbar: '#toolbarDemo'
                                , cols: [Listcol[2]]
                                , data: data1.data.h_p_HR_PersonnelResumeReport2
                                , height: 'full-80'
                                , page: true
                                , totalRow: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            table.render(option_skill);                           

                            layer.close(ajaxLoad);                          
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });

            }
            //#endregion
                                     

            //ä»¥ä¸æ¯layuiæ¨¡å
        });
    </script>
</body>
</html>

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

@@ -115,6 +115,8 @@
                , laydate = layui.laydate
            var sWhere = "";
            var option = [];
            var HProcName = "";
            var HMaterName = "";
            var Organization = sessionStorage["Organization"]
            var HModName = "Gy_TechnologyParameterList";
            //ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
@@ -122,6 +124,11 @@
            var params = get_UrlVars();
            var Type = params[params[0]] == null ? "HTechParam" : params[params[0]];
            var OperationType = params[params[1]] == null ? 1 : params[params[1]];  //1ä¸ºç´æ¥åè¡¨æ¨¡åæå¼  2ä¸ºä»å¶ä»æ¨¡åæå¼åºç¡èµæåè¡¨
            var HEquipNumber = params[params[2]] == null ? "" : params[params[2]];  //è®¾å¤
             HProcName = params[params[3]] == null ? "" : params[params[3]];  //å·¥åº
             HMaterName = params[params[4]] == null ? "" : params[params[4]];  //ç©æ
            HProcName = decodeURI(HProcName);
            HMaterName = decodeURI(HMaterName);
            //#endregion

            //#region ãè¿æ»¤æ¹æ¡ã
@@ -142,7 +149,17 @@
            set_InitGrid();

            //å è½½æ°æ®å°ç½æ ¼
            get_Display(sWhere);
            if (OperationType == 2) {
                sWhere = {
                    HEquipNumber: HEquipNumber,
                    HProcName: HProcName,
                    HMaterName: HMaterName
                }
                get_Display1(JSON.stringify(sWhere));
            } else {
                get_Display(sWhere);
            }
           
            
            //#endregion

@@ -391,6 +408,78 @@
                layer.close(wait);
            }
            //#endregion

            //#region å¶ä»é¡µé¢èªå¨è¿æ»¤å·¥èºåæ°   ç©æ+å·¥åº+è®¾å¤
            function get_Display1(sWhere) {
                var wait = layer.load();//é®ç½©
                var ajaxLoad = layer.load();
                //å è½½æ°æ®å°ç½æ ¼
                $.ajax({
                    url: GetWEBURL() + '/Gy_TechnologyParameter/list1',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            //ç»ç©ºçæ°ç»èµå¼
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //å¨ææ¾ç¤ºåå
                            option = {
                                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);

                            //å·æ°è¡¨æ ¼æ°æ®
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);

                            if ($("#ColName option").length < 1) {
                                ColFilter();                               
                            }
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                layer.close(wait);
            }
            //#endregion

            //#region æ°å¢
            function set_AddNew() {
                layer.open({

 WebTM/views/¹¤×Ê¹ÜÀí/¼¼ÄÜ¿¼ºË/HR_EmployeeSkillExamBill.html

@@ -138,6 +138,14 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">äºä¸é¨<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 128px; width: 185px;">
                                                <select name="HDivisionID" id="HDivisionID" lay-verify="HDivisionID">
                                                    <!--å¨ææ¸²æç»ç»-->
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">å¤æ³¨</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
@@ -291,6 +299,7 @@
            var option = {};
            //è®°å½ç»ç»çå¼
            var HOrgIDBar = 0;
            var HDivisionIDBar = 0;
            //è·ååæ°
            var params = getUrlVars();
            var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å  1æ·»å  ä¿å  2å¤å¶  3 ç¼è¾
@@ -335,7 +344,7 @@

                //çæå¹¶è®¾ç½®ä¸»è¡¨çåç ååæ®å·
                createBillNo();

                
                //åå§åå¶åäººåå¶åæ¶é´
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -354,7 +363,7 @@

            //åå§åç»ç»
            Organ();

            GetGy_Division();//è·åäºä¸é¨
            //#endregion

            //#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç
@@ -785,6 +794,33 @@
            }
            //#endregion

            //#region è·åäºä¸é¨
            function GetGy_Division() {
                //è·åäºä¸é¨HDivisionIDBar
                var HDivisionList = '';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HDivisionList += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
                            }
                            $("#HDivisionID").append(HDivisionList);                           
                            $("#HDivisionID").val(HDivisionIDBar);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion


            //#region ä¿åHMaker
            function set_AddNew(data) {
                //è·ååè¡¨æ°æ®
@@ -895,6 +931,7 @@

                        //ç»ç»çå¼HOrgIDååï¼éæ°æ¸²æ
                        HOrgIDBar = data[0]["HOrgID"];
                        HDivisionIDBar = data[0]["HDivisionID"];
                        //åè¡¨  èµå¼

                        var rowdata = [];

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_EquipMentCollectionTechParam.html

@@ -303,6 +303,7 @@
                });
                layer.close(index);
            }

            //å¿«éæ¥è¯¢
            function get_FastQuery() {
                var HEquipNumber = $("#HEquipNumber").val();
@@ -326,6 +327,7 @@
                }
               
            }

            //éç½®å¿«éæ¥è¯¢
            function set_ClearQuery() {
                $("#HEquipNumber").val("");
@@ -348,6 +350,7 @@

                sWhere = "";
            }

            //å·æ°
            function get_Refresh() {
                $("#btnSearch").trigger('click');
@@ -619,6 +622,7 @@

            //å·¥èºåæ°
            form.on('submit(btnHTechParam)', function () {
                var HEquipNumber = $("#HEquipNumber").val();
                //é¡µé¢å±-èªå®ä¹
                layer.open({
                    type: 2,
@@ -628,7 +632,7 @@
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_TechnologyParameterList.html', 'yes'],
                    content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_TechnologyParameterList.html?type=HTechParam&OperationType=2&HEquipNumber=' + HEquipNumber + '', 'yes'],
                    btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {


 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_FiveMenOneRingList.html

@@ -794,7 +794,7 @@
                    }
                    
                } else if (obj.event == 'èå') {
                    var linterid = data.èåid;
                    var HName = data.èå;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
@@ -803,7 +803,7 @@
                        , shade: 0.6 //é®ç½©éæåº¦
                        , maxmin: true //åè®¸å¨å±æå°å
                        , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                        , content: '../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                        , content: '../../äººäºç®¡ç/äººåå±¥å/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName+''
                        , resize: false,
                        end: function () {
                        }
@@ -977,7 +977,7 @@
                        }
                    })
                } else if (obj.event == 'èå') {
                    var linterid = data.èåid;
                    var HName = data.èå;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
@@ -986,7 +986,7 @@
                        , shade: 0.6 //é®ç½©éæåº¦
                        , maxmin: true //åè®¸å¨å±æå°å
                        , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                        , content: '../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                        , content: '../../äººäºç®¡ç/äººåå±¥å/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + ''
                        , resize: false,
                        end: function () {
                        }
@@ -1017,7 +1017,7 @@
                        }
                    })
                } else if (obj.event == 'èå') {
                    var linterid = data.èåid;
                    var HName = data.èå;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
@@ -1026,7 +1026,7 @@
                        , shade: 0.6 //é®ç½©éæåº¦
                        , maxmin: true //åè®¸å¨å±æå°å
                        , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                        , content: '../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                        , content: '../../äººäºç®¡ç/äººåå±¥å/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + ''
                        , resize: false,
                        end: function () {
                        }
@@ -1057,7 +1057,7 @@
                        }
                    })
                } else if (obj.event == 'èå') {
                    var linterid = data.èåid;
                    var HName = data.èå;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
@@ -1066,7 +1066,7 @@
                        , shade: 0.6 //é®ç½©éæåº¦
                        , maxmin: true //åè®¸å¨å±æå°å
                        , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                        , content: '../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                        , content: '../../äººäºç®¡ç/äººåå±¥å/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + ''
                        , resize: false,
                        end: function () {
                        }
@@ -1239,7 +1239,7 @@
                        })
                    }                   
                } else if (obj.event == 'èå') {
                    var linterid = data.èåid;
                    var HName = data.èå;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
@@ -1248,7 +1248,7 @@
                        , shade: 0.6 //é®ç½©éæåº¦
                        , maxmin: true //åè®¸å¨å±æå°å
                        , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                        , content: '../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                        , content: '../../äººäºç®¡ç/äººåå±¥å/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + ''
                        , resize: false,
                        end: function () {
                        }

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_RegistrationForTestingReport.html

@@ -117,7 +117,7 @@
        base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
    }).extend({
        index: 'lib/index', //ä¸»å¥å£æ¨¡å
    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {

        //#region å¬å±åé
        var $ = layui.$
@@ -216,20 +216,20 @@

            var columns = [];
            columns.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
            columns.push({ field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 180});
            columns.push({ field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 180 });
            columns.push({ field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', sort: true, width: 180 });
            columns.push({ field: 'ç©æ', title: 'ç©æ', sort: true, width: 110 });
            columns.push({ field: 'å·¥åº', title: 'å·¥åº', sort: true, width: 110 });
            columns.push({ field: 'æ¹æ¬¡å·', title: 'æ¹æ¬¡å·', sort: true, width: 110 });
            columns.push({ field: '(1)äº§ååé/g', title: '(1)äº§ååé/g', sort: true, totalRow: true, width: 140});
            columns.push({ field: '(2)äº§ååé/g', title: '(2)äº§ååé/g', sort: true, totalRow: true, width: 140});
            columns.push({ field: '(3)äº§ååé/g', title: '(3)äº§ååé/g', sort: true, totalRow: true, width: 140});
            columns.push({ field: 'éæµåå®¹', title: 'éæµåå®¹', sort: true, width: 110});
            columns.push({ field: 'éæµæ°é', title: 'éæµæ°é', sort: true, totalRow: true, width: 110});
            columns.push({ field: 'éæµæ¶é´', title: 'éæµæ¶é´', sort: true, width: 180});
            columns.push({ field: 'å¤å®ç»æ', title: 'å¤å®ç»æ', sort: true, width: 110});
            columns.push({ field: 'åæ¶æ°é', title: 'åæ¶æ°é', sort: true, totalRow: true, width: 110});
            columns.push({ field: 'åæ¶æ¶é´', title: 'åæ¶æ¶é´', sort: true, width: 180});
            columns.push({ field: '(1)äº§ååé/g', title: '(1)äº§ååé/g', sort: true, totalRow: true, width: 140 });
            columns.push({ field: '(2)äº§ååé/g', title: '(2)äº§ååé/g', sort: true, totalRow: true, width: 140 });
            columns.push({ field: '(3)äº§ååé/g', title: '(3)äº§ååé/g', sort: true, totalRow: true, width: 140 });
            columns.push({ field: 'éæµåå®¹', title: 'éæµåå®¹', sort: true, width: 110 });
            columns.push({ field: 'éæµæ°é', title: 'éæµæ°é', sort: true, totalRow: true, width: 110 });
            columns.push({ field: 'éæµæ¶é´', title: 'éæµæ¶é´', sort: true, width: 180 });
            columns.push({ field: 'å¤å®ç»æ', title: 'å¤å®ç»æ', sort: true, width: 110 });
            columns.push({ field: 'åæ¶æ°é', title: 'åæ¶æ°é', sort: true, totalRow: true, width: 110 });
            columns.push({ field: 'åæ¶æ¶é´', title: 'åæ¶æ¶é´', sort: true, width: 180 });
            option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo1'
@@ -238,7 +238,7 @@
                //, cellMinWidth: 'auto'
                , totalRow: true
                , limit: 500
                , data:[]
                , data: []
                , limits: [50, 500, 5000, 20000]
                //, done: function (res, curr, count) {
                //    soulTable.render(this);
@@ -272,6 +272,13 @@
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
                                }
                                else if (data[i].name == 'æ£éªååå·') {//æ·»å è¶é¾æ¥
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'æ£éªååå·', templet: function (d) {
                                            return '<span style="color: blue;">' + d.æ£éªååå· + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
@@ -311,7 +318,7 @@
                            option.data = data1.data
                        }

                  

                        table.render(option);

                        //å·æ°è¡¨æ ¼æ°æ®
@@ -343,10 +350,10 @@
            var HProject = $("#HProject").val();//é¡¹ç®å·
            var HBatchWork = $("#HBatchWork").val();//æ¯å¦éäº§
            var HDivisionName = $("#HDivisionName").val();//äºä¸é¨
        

            sWhere = {
                HBeginDate: HBeginDate
                ,HEndDate: HEndDate
                , HEndDate: HEndDate
                , HMaterID: HMaterID
                , HBatchNo: HBatchNo
                , HProject: HProject
@@ -422,6 +429,67 @@
        //#endregion


        table.on('tool(mainTable)', function (obj) {
            var data = obj.data;
            if (obj.event == 'æ£éªååå·') {
                const HBillNo = data.æ£éªååå·.substring(0, 2);
                var linterid = data.HInterID;
                if (HBillNo == "SJ") {
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: 'æ¥çé¦ä»¶æ£éªå'
                        , closeBtn: 1
                        , shade: 0.6 //é®ç½©éæåº¦
                        , maxmin: true //åè®¸å¨å±æå°å
                        , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                        , content: '../é¦ä»¶æ£éªå/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                        , resize: false,
                        end: function () {
                        }
                        , cancel: function () {
                        }
                    })
                }
                else if (HBillNo == "XJ") {
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: 'æ¥çå·¡æ£è®°å½å'
                        , closeBtn: 1
                        , shade: 0.6 //é®ç½©éæåº¦
                        , maxmin: true //åè®¸å¨å±æå°å
                        , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                        , content: '../å·¡æ£è®°å½å/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                        , resize: false,
                        end: function () {
                        }
                        , cancel: function () {
                        }
                    })
                }
                else if (HBillNo == "GX") {
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: 'æ¥çæ«æ£æ£éªå'
                        , closeBtn: 1
                        , shade: 0.6 //é®ç½©éæåº¦
                        , maxmin: true //åè®¸å¨å±æå°å
                        , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                        , content: '../å·¥åºæ£éªå/QC_ProcessCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                        , resize: false,
                        end: function () {
                        }
                        , cancel: function () {
                        }
                    })
                }
            }
        });
    


        //éèåè®¾ç½®
        function get_HideColumn() {
            var colName = "";

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_SkillExamMonthSumReport.html

@@ -41,7 +41,7 @@
                                        <input name="HDate" id="HDate" autocomplete="off" class="layui-input ForFilteringSchemes">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                <div class="layui-inline" style="display:none">
                                    <label class="layui-form-label">é¨é¨</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HDeptName" id="HDeptName" lay-verify="HDeptName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/SB_TechnologyParameterList.html

@@ -74,6 +74,7 @@
                                            <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="HEquipName" id="HEquipName" value="" readonly>
                                                <input type="hidden" class="layui-input" name="HEquipNumber" id="HEquipNumber" value="" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -602,6 +603,9 @@

            //å·¥èºåæ°
            form.on('submit(btnHTechParam)', function () {
                var HMaterName = $("#HMaterName").val();
                var HProcName = $("#HProcName").val();
                var HEquipNumber = $("#HEquipNumber").val();
                //é¡µé¢å±-èªå®ä¹
                layer.open({
                    type: 2,
@@ -611,7 +615,7 @@
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_TechnologyParameterList.html', 'yes'],
                    content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_TechnologyParameterList.html?type=HTechParam&OperationType=2&HEquipNumber=' + HEquipNumber + '&HProcName=' + HProcName + '&HMaterName=' + HMaterName + '', 'yes'],
                    btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {

@@ -650,7 +654,7 @@
                        if (result.count == 1) {
                            var data = result.data;
                            $("#HEquipName").val(data[0]["HName"]);

                            $("#HEquipNumber").val(data[0]["HEquipFileNumber"]);
                        } else {
                            layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                        }
@@ -676,6 +680,7 @@
                            $("#HProcName").val(data[0]["å·¥åºåç§°"]);
                            $("#HMaterName").val(data[0]["ç©æåç§°"]);
                            $("#HEquipName").val(data[0]["è®¾å¤åç§°"]);
                            $("#HEquipName").val(data[0]["è®¾å¤åç§°"]);

                        } else {
                            layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷×ª¿¨/Sc_ProcessExchangeBill.html

@@ -2258,7 +2258,7 @@
                    "HQty": 0, "HSNCtrl": "false", "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
                    "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
                    "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
                    "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
                    "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0,"HSourceID":0
                }];
                table.render(option);
            }

			@@ -315,6 +315,7 @@
			<Content Include="views\WMSæ«ç æ¨¡å\éå®åºåº\Kf_SellOutBillList_PDA.html" />
			<Content Include="views\WMSæ«ç æ¨¡å\éå®åºåº\Kf_SellOutBillList_QiaoYi_PDA.html" />
			<Content Include="views\WMSæ«ç æ¨¡å\éå®åºåº\Kf_SellOutBill_QiaoYi_PDA.html" />
			<Content Include="views\äººäºç®¡ç\äººåå±¥å\HR_PersonnelResumeList.html" />
			<Content Include="views\äººäºç®¡ç\å¼å¸¸åé¦å\OA_ErrMsgBackBillList_PDA.html" />
			<Content Include="views\äººäºç®¡ç\å¼å¸¸åé¦å\OA_ErrMsgBackBill_PDA.html" />
			<Content Include="views\ä»åç®¡ç\ä¸ç¹ç§åæ«ç è®°å½å\WMS_CusBarCodeCheckBillList.html" />

New file
			@@ -0,0 +1,324 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>äººåå±¥å</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<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/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/grwebapp.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>

			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">èåä»£ç </label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
			</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 ForFilteringSchemes" name="HName" id="HName">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn-Close" id="btn-Close" style="padding:0 5px">éåº</button>
			</div>
			</div>
			<div class="layui-tab layui-tab-card" style="margin-top:20px;" >
			<ul class="layui-tab-title">
			<li class="layui-this">èåä¿¡æ¯</li>
			<li>æè½ççº§</li>
			<li>èæ ¸è®°å½</li>
			</ul>
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<!--èåä¿¡æ¯-->
			<table class="layui-hide" id="mainTable_people" lay-filter="mainTable_people"></table>
			</div>
			<div class="layui-tab-item">
			<!--æè½ççº§-->
			<table class="layui-hide" id="mainTable_skill" lay-filter="mainTable_skill"></table>
			</div>
			<div class="layui-tab-item">
			<!--èæ ¸è®°å½-->
			<table class="layui-hide" id="mainTable_examine" lay-filter="mainTable_examine"></table>
			</div>
			</div>
			</div>
			<script type="text/html" id="toolbarDemo">

			</script>
			</form>
			</div>
			</div>
			</div>
			</div>
			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
			//#region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			, util = layui.util
			, soulTable = layui.soulTable
			var sWhere = "";
			var Number = "";
			var Name = "";
			var option_people = ""; //èåä¿¡æ¯
			var option_examine = ""; //èæ ¸è®°å½
			var option_skill = ""; //æè½ççº§
			var ins;
			var params = get_UrlVars();
			var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //1ä¸ºç´æ¥åè¡¨æ¨¡åæå¼ 2ä¸ºä»å¶ä»æ¨¡åæå¼åºç¡èµæåè¡¨
			Number = params[params[1]] == null ? "" : params[params[1]]; //ä»£ç
			Name = params[params[2]] == null ? "" : params[params[2]]; //åç§°
			Number = decodeURI(Number);
			Name = decodeURI(Name);
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½

			//
			var HModName = "HR_PersonnelResumeList";
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å± ï¼æä¸»å¯¼çï¼
			var titleData = [""];
			//åå§åçé¢
			set_ClearBill();
			//#endregion

			//#region å¤´å·¥å·æ äºä»¶
			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery();
			});
			// éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			});
			// éåºæé®
			form.on('submit(btn-Close)', function (data) {
			if (OperationType==2) {
			Pub_Close(1);
			} else{
			Pub_Close(2);
			}

			});
			//#endregion

			//#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³
			function set_ClearBill() {
			//åå§åèåä¿¡æ¯åè¡¨
			set_InitGrid_people();
			//åå§åæè½ççº§
			set_InitGrid_skill();
			//åå§åèæ ¸è®°å½åè¡¨
			set_InitGrid_examine();
			//æ¥è¯¢
			get_FastQuery();
			}

			//#region å¿«éè¿æ»¤
			function get_FastQuery() {
			var HNumber = $("#HNumber").val() != "" ? "" : Number;
			var HName = $("#HName").val() != "" ? "" : Name;
			sWhere = {
			HNumber: HNumber,
			HName: HName
			}
			get_Display(JSON.stringify(sWhere));
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			//#endregion

			//#region éç½®å¿«éæ¥è¯¢
			function set_ClearQuery() {
			$("#HNumber").val("");
			$("#HName").val("");
			$("#btnSearch").click();
			form.render('select');
			sWhere = "";
			}
			//#endregion

			//åå§åèåä¿¡æ¯åè¡¨
			function set_InitGrid_people() {
			option_people = {
			elem: '#mainTable_people'
			, toolbar: '#toolbarDemo'
			, page: true
			, totalRow: true
			, height: 300
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: []
			};
			//table.render(option);
			}

			//åå§åèæ ¸è®°å½åè¡¨
			function set_InitGrid_examine() {
			option_examine = {
			elem: '#mainTable_examine'
			, page: false
			, height: 500
			, totalRow: true
			, cellMinWidth: 90
			, limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
			, cols: []
			};
			}

			//åå§åæ£å¨ç»§ç»åè¡¨
			function set_InitGrid_skill() {
			option_skill = {
			elem: '#mainTable_skill'
			, page: false
			, height: 500
			, totalRow: true
			, cellMinWidth: 90
			, limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
			, cols: []
			};
			}


			//#region æ¥è¯¢
			function get_Display(sWhere) {
			var ajaxLoad = layer.load();

			$.ajax({
			url: GetWEBURL() + '/HR_PersonnelResumeController/GetHR_PersonnelResumeList',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere},
			success: function (data1) {
			if (data1.count == 1) {
			var Listcol = [];
			for (var i = 0; i < data1.list.length; i++) {
			var data = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list[i].Columns) {
			data.push({ "id": data1.list[i].Columns[key].ColmCols, "name": data1.list[i].Columns[key].ColmCols, "Type": data1.list[i].Columns[key].ColmType });
			}
			var col = [];
			col.push({ type: 'checkbox', fixed: 'left' });
			for (var j = 0; j < data.length; j++) {
			if ($.inArray(data[j].name, titleData) > -1) {
			col.push({ field: data[j].id, title: data[j].name, align: 'center', hide: true }); //éèidå
			}
			else {
			switch (data[j].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, templet: "<div>{{d." + data[j].name + " ==null ?'':layui.util.toDateString(d." + data[j].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: data[j].name });
			}
			}
			}
			Listcol.push(col);
			}

			//å¨ææ¾ç¤ºåå
			option_people = {
			elem: '#mainTable_people'
			, toolbar: '#toolbarDemo'
			, cols: [Listcol[0]]
			, data: data1.data.h_p_HR_PersonnelResumeReport
			, height: 'full-80'
			, page: true
			, totalRow: true
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			, cellMinWidth: 90
			}
			table.render(option_people);
			ins = table.render(option_people);

			option_examine = {
			elem: '#mainTable_examine'
			, toolbar: '#toolbarDemo'
			, cols: [Listcol[1]]
			, data: data1.data.h_p_HR_PersonnelResumeReport1
			, height: 'full-80'
			, page: true
			, totalRow: true
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			, cellMinWidth: 90
			}
			table.render(option_examine);

			option_skill = {
			elem: '#mainTable_skill'
			, toolbar: '#toolbarDemo'
			, cols: [Listcol[2]]
			, data: data1.data.h_p_HR_PersonnelResumeReport2
			, height: 'full-80'
			, page: true
			, totalRow: true
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			, cellMinWidth: 90
			}
			table.render(option_skill);

			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});

			}
			//#endregion


			//ä»¥ä¸æ¯layuiæ¨¡å
			});
			</script>
			</body>
			</html>

			@@ -115,6 +115,8 @@
			, laydate = layui.laydate
			var sWhere = "";
			var option = [];
			var HProcName = "";
			var HMaterName = "";
			var Organization = sessionStorage["Organization"]
			var HModName = "Gy_TechnologyParameterList";
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			@@ -122,6 +124,11 @@
			var params = get_UrlVars();
			var Type = params[params[0]] == null ? "HTechParam" : params[params[0]];
			var OperationType = params[params[1]] == null ? 1 : params[params[1]]; //1ä¸ºç´æ¥åè¡¨æ¨¡åæå¼ 2ä¸ºä»å¶ä»æ¨¡åæå¼åºç¡èµæåè¡¨
			var HEquipNumber = params[params[2]] == null ? "" : params[params[2]]; //è®¾å¤
			HProcName = params[params[3]] == null ? "" : params[params[3]]; //å·¥åº
			HMaterName = params[params[4]] == null ? "" : params[params[4]]; //ç©æ
			HProcName = decodeURI(HProcName);
			HMaterName = decodeURI(HMaterName);
			//#endregion

			//#region ãè¿æ»¤æ¹æ¡ã
			@@ -142,7 +149,17 @@
			set_InitGrid();

			//å è½½æ°æ®å°ç½æ ¼
			get_Display(sWhere);
			if (OperationType == 2) {
			sWhere = {
			HEquipNumber: HEquipNumber,
			HProcName: HProcName,
			HMaterName: HMaterName
			}
			get_Display1(JSON.stringify(sWhere));
			} else {
			get_Display(sWhere);
			}


			//#endregion

			@@ -391,6 +408,78 @@
			layer.close(wait);
			}
			//#endregion

			//#region å¶ä»é¡µé¢èªå¨è¿æ»¤å·¥èºåæ° ç©æ+å·¥åº+è®¾å¤
			function get_Display1(sWhere) {
			var wait = layer.load();//é®ç½©
			var ajaxLoad = layer.load();
			//å è½½æ°æ®å°ç½æ ¼
			$.ajax({
			url: GetWEBURL() + '/Gy_TechnologyParameter/list1',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization },
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}

			//å¨ææ¾ç¤ºåå
			option = {
			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);

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);

			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			layer.close(wait);
			}
			//#endregion

			//#region æ°å¢
			function set_AddNew() {
			layer.open({

			@@ -138,6 +138,14 @@
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">äºä¸é¨<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 128px; width: 185px;">
			<select name="HDivisionID" id="HDivisionID" lay-verify="HDivisionID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¤æ³¨</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
			<input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
			@@ -291,6 +299,7 @@
			var option = {};
			//è®°å½ç»ç»çå¼
			var HOrgIDBar = 0;
			var HDivisionIDBar = 0;
			//è·ååæ°
			var params = getUrlVars();
			var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å 1æ·»å ä¿å 2å¤å¶ 3 ç¼è¾
			@@ -335,7 +344,7 @@

			//çæå¹¶è®¾ç½®ä¸»è¡¨çåç ååæ®å·
			createBillNo();


			//åå§åå¶åäººåå¶åæ¶é´
			$("#HMaker").val(sessionStorage["HUserName"]);
			$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
			@@ -354,7 +363,7 @@

			//åå§åç»ç»
			Organ();

			GetGy_Division();//è·åäºä¸é¨
			//#endregion

			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç
			@@ -785,6 +794,33 @@
			}
			//#endregion

			//#region è·åäºä¸é¨
			function GetGy_Division() {
			//è·åäºä¸é¨HDivisionIDBar
			var HDivisionList = '';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
			async: false,
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			HDivisionList += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
			}
			$("#HDivisionID").append(HDivisionList);
			$("#HDivisionID").val(HDivisionIDBar);
			form.render('select');

			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion


			//#region ä¿åHMaker
			function set_AddNew(data) {
			//è·ååè¡¨æ°æ®
			@@ -895,6 +931,7 @@

			//ç»ç»çå¼HOrgIDååï¼éæ°æ¸²æ
			HOrgIDBar = data[0]["HOrgID"];
			HDivisionIDBar = data[0]["HDivisionID"];
			//åè¡¨ èµå¼

			var rowdata = [];

			@@ -303,6 +303,7 @@
			});
			layer.close(index);
			}

			//å¿«éæ¥è¯¢
			function get_FastQuery() {
			var HEquipNumber = $("#HEquipNumber").val();
			@@ -326,6 +327,7 @@
			}

			}

			//éç½®å¿«éæ¥è¯¢
			function set_ClearQuery() {
			$("#HEquipNumber").val("");
			@@ -348,6 +350,7 @@

			sWhere = "";
			}

			//å·æ°
			function get_Refresh() {
			$("#btnSearch").trigger('click');
			@@ -619,6 +622,7 @@

			//å·¥èºåæ°
			form.on('submit(btnHTechParam)', function () {
			var HEquipNumber = $("#HEquipNumber").val();
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			@@ -628,7 +632,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_TechnologyParameterList.html', 'yes'],
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_TechnologyParameterList.html?type=HTechParam&OperationType=2&HEquipNumber=' + HEquipNumber + '', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -794,7 +794,7 @@
			}

			} else if (obj.event == 'èå') {
			var linterid = data.èåid;
			var HName = data.èå;
			layer.open({
			type: 2
			, area: ['100%', '100%']
			@@ -803,7 +803,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
			, content: '../../äººäºç®¡ç/äººåå±¥å/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName+''
			, resize: false,
			end: function () {
			}
			@@ -977,7 +977,7 @@
			}
			})
			} else if (obj.event == 'èå') {
			var linterid = data.èåid;
			var HName = data.èå;
			layer.open({
			type: 2
			, area: ['100%', '100%']
			@@ -986,7 +986,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
			, content: '../../äººäºç®¡ç/äººåå±¥å/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + ''
			, resize: false,
			end: function () {
			}
			@@ -1017,7 +1017,7 @@
			}
			})
			} else if (obj.event == 'èå') {
			var linterid = data.èåid;
			var HName = data.èå;
			layer.open({
			type: 2
			, area: ['100%', '100%']
			@@ -1026,7 +1026,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
			, content: '../../äººäºç®¡ç/äººåå±¥å/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + ''
			, resize: false,
			end: function () {
			}
			@@ -1057,7 +1057,7 @@
			}
			})
			} else if (obj.event == 'èå') {
			var linterid = data.èåid;
			var HName = data.èå;
			layer.open({
			type: 2
			, area: ['100%', '100%']
			@@ -1066,7 +1066,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
			, content: '../../äººäºç®¡ç/äººåå±¥å/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + ''
			, resize: false,
			end: function () {
			}
			@@ -1239,7 +1239,7 @@
			})
			}
			} else if (obj.event == 'èå') {
			var linterid = data.èåid;
			var HName = data.èå;
			layer.open({
			type: 2
			, area: ['100%', '100%']
			@@ -1248,7 +1248,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
			, content: '../../äººäºç®¡ç/äººåå±¥å/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + ''
			, resize: false,
			end: function () {
			}

			@@ -117,7 +117,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {

			//#region å¬å±åé
			var $ = layui.$
			@@ -216,20 +216,20 @@

			var columns = [];
			columns.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			columns.push({ field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 180});
			columns.push({ field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 180 });
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', sort: true, width: 180 });
			columns.push({ field: 'ç©æ', title: 'ç©æ', sort: true, width: 110 });
			columns.push({ field: 'å·¥åº', title: 'å·¥åº', sort: true, width: 110 });
			columns.push({ field: 'æ¹æ¬¡å·', title: 'æ¹æ¬¡å·', sort: true, width: 110 });
			columns.push({ field: '(1)äº§ååé/g', title: '(1)äº§ååé/g', sort: true, totalRow: true, width: 140});
			columns.push({ field: '(2)äº§ååé/g', title: '(2)äº§ååé/g', sort: true, totalRow: true, width: 140});
			columns.push({ field: '(3)äº§ååé/g', title: '(3)äº§ååé/g', sort: true, totalRow: true, width: 140});
			columns.push({ field: 'éæµåå®¹', title: 'éæµåå®¹', sort: true, width: 110});
			columns.push({ field: 'éæµæ°é', title: 'éæµæ°é', sort: true, totalRow: true, width: 110});
			columns.push({ field: 'éæµæ¶é´', title: 'éæµæ¶é´', sort: true, width: 180});
			columns.push({ field: 'å¤å®ç»æ', title: 'å¤å®ç»æ', sort: true, width: 110});
			columns.push({ field: 'åæ¶æ°é', title: 'åæ¶æ°é', sort: true, totalRow: true, width: 110});
			columns.push({ field: 'åæ¶æ¶é´', title: 'åæ¶æ¶é´', sort: true, width: 180});
			columns.push({ field: '(1)äº§ååé/g', title: '(1)äº§ååé/g', sort: true, totalRow: true, width: 140 });
			columns.push({ field: '(2)äº§ååé/g', title: '(2)äº§ååé/g', sort: true, totalRow: true, width: 140 });
			columns.push({ field: '(3)äº§ååé/g', title: '(3)äº§ååé/g', sort: true, totalRow: true, width: 140 });
			columns.push({ field: 'éæµåå®¹', title: 'éæµåå®¹', sort: true, width: 110 });
			columns.push({ field: 'éæµæ°é', title: 'éæµæ°é', sort: true, totalRow: true, width: 110 });
			columns.push({ field: 'éæµæ¶é´', title: 'éæµæ¶é´', sort: true, width: 180 });
			columns.push({ field: 'å¤å®ç»æ', title: 'å¤å®ç»æ', sort: true, width: 110 });
			columns.push({ field: 'åæ¶æ°é', title: 'åæ¶æ°é', sort: true, totalRow: true, width: 110 });
			columns.push({ field: 'åæ¶æ¶é´', title: 'åæ¶æ¶é´', sort: true, width: 180 });
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo1'
			@@ -238,7 +238,7 @@
			//, cellMinWidth: 'auto'
			, totalRow: true
			, limit: 500
			, data:[]
			, data: []
			, limits: [50, 500, 5000, 20000]
			//, done: function (res, curr, count) {
			// soulTable.render(this);
			@@ -272,6 +272,13 @@
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if (data[i].name == 'æ£éªååå·') {//æ·»å è¶é¾æ¥
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'æ£éªååå·', templet: function (d) {
			return '<span style="color: blue;">' + d.æ£éªååå· + '</span>'
			}, style: 'cursor: pointer;'
			});
			}
			else {
			switch (data[i].Type) {
			@@ -311,7 +318,7 @@
			option.data = data1.data
			}



			table.render(option);

			//å·æ°è¡¨æ ¼æ°æ®
			@@ -343,10 +350,10 @@
			var HProject = $("#HProject").val();//é¡¹ç®å·
			var HBatchWork = $("#HBatchWork").val();//æ¯å¦éäº§
			var HDivisionName = $("#HDivisionName").val();//äºä¸é¨


			sWhere = {
			HBeginDate: HBeginDate
			,HEndDate: HEndDate
			, HEndDate: HEndDate
			, HMaterID: HMaterID
			, HBatchNo: HBatchNo
			, HProject: HProject
			@@ -422,6 +429,67 @@
			//#endregion


			table.on('tool(mainTable)', function (obj) {
			var data = obj.data;
			if (obj.event == 'æ£éªååå·') {
			const HBillNo = data.æ£éªååå·.substring(0, 2);
			var linterid = data.HInterID;
			if (HBillNo == "SJ") {
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'æ¥çé¦ä»¶æ£éªå'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../é¦ä»¶æ£éªå/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
			, resize: false,
			end: function () {
			}
			, cancel: function () {
			}
			})
			}
			else if (HBillNo == "XJ") {
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'æ¥çå·¡æ£è®°å½å'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../å·¡æ£è®°å½å/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
			, resize: false,
			end: function () {
			}
			, cancel: function () {
			}
			})
			}
			else if (HBillNo == "GX") {
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'æ¥çæ«æ£æ£éªå'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../å·¥åºæ£éªå/QC_ProcessCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
			, resize: false,
			end: function () {
			}
			, cancel: function () {
			}
			})
			}
			}
			});



			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";

			@@ -41,7 +41,7 @@
			<input name="HDate" id="HDate" autocomplete="off" class="layui-input ForFilteringSchemes">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-inline" style="display:none">
			<label class="layui-form-label">é¨é¨</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HDeptName" id="HDeptName" lay-verify="HDeptName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>

			@@ -74,6 +74,7 @@
			<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="HEquipName" id="HEquipName" value="" readonly>
			<input type="hidden" class="layui-input" name="HEquipNumber" id="HEquipNumber" value="" readonly>
			</div>
			</div>
			<div class="layui-inline">
			@@ -602,6 +603,9 @@

			//å·¥èºåæ°
			form.on('submit(btnHTechParam)', function () {
			var HMaterName = $("#HMaterName").val();
			var HProcName = $("#HProcName").val();
			var HEquipNumber = $("#HEquipNumber").val();
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			@@ -611,7 +615,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_TechnologyParameterList.html', 'yes'],
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_TechnologyParameterList.html?type=HTechParam&OperationType=2&HEquipNumber=' + HEquipNumber + '&HProcName=' + HProcName + '&HMaterName=' + HMaterName + '', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -650,7 +654,7 @@
			if (result.count == 1) {
			var data = result.data;
			$("#HEquipName").val(data[0]["HName"]);

			$("#HEquipNumber").val(data[0]["HEquipFileNumber"]);
			} else {
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			@@ -676,6 +680,7 @@
			$("#HProcName").val(data[0]["å·¥åºåç§°"]);
			$("#HMaterName").val(data[0]["ç©æåç§°"]);
			$("#HEquipName").val(data[0]["è®¾å¤åç§°"]);
			$("#HEquipName").val(data[0]["è®¾å¤åç§°"]);

			} else {
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });

			@@ -2258,7 +2258,7 @@
			"HQty": 0, "HSNCtrl": "false", "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
			"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
			"HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
			"HRoutingBillMainID": 0, "HRoutingBillEntryID": 0,"HSourceID":0
			}];
			table.render(option);
			}