Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

chenhaozhe

2025-06-26 226b08b8a5f3ecab663d6b0e02b48c3e16e644e0

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

@@ -49,15 +49,16 @@
                                <div class="layui-inline" style="margin-left:5px;">
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">职员代码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>
                               

                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">职员代码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
                                        </div>
                                    </div>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
@@ -147,6 +148,7 @@
                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-form"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
@@ -218,8 +220,7 @@

           //加载数据到网格
            //根据页面的打开方式，判断过滤条件是否需要进行额外的添加
            addSWhereByOpenType();
            get_Display(sWhere);
            get_FastQuery();
            

        //#endregion
@@ -234,6 +235,9 @@
                    //新增按钮
                    case 'btn-Add':
                        set_AddNew();
                        break;
                    //复制
                    case 'set_Copy': set_Copy();
                        break;
                    case 'btn-Edit':
                        set_ShowBill();
@@ -310,6 +314,31 @@
                    }
                });
            })

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '职员代码') {
                    var linterid = data.HItemID.toString();
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '职员设置-编辑'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../公用基础资料/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , resize: false
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                        , end: function () {
                            //刷新页面,
                            get_FastQuery(table, option);
                        }
                    })
                }
            });

            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
@@ -506,7 +535,11 @@
                }

                //根据页面的打开方式，判断过滤条件是否需要进行额外的添加
                addSWhereByOpenType();
                if (addSWhereByOpenType()) {
                    sWhere += "  order by éƒ¨é—¨ä»£ç "
                } else {
                    sWhere += "  order by èŒå‘˜ä»£ç "
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -554,7 +587,7 @@
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Gy_Employee/list',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization  },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]  },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
@@ -569,6 +602,12 @@
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '职员代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '职员代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.职员代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
@@ -664,6 +703,34 @@

                    }
                });
            }
            //#endregion

            //#region å¤åˆ¶
            function set_Copy() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '复制-职员设置'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../公用基础资料/Gy_Employee_Add_Edit_.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }
            //#endregion

@@ -965,24 +1032,27 @@
            function addSWhereByOpenType() {
                //获取参数
                var params = getUrlVars();
                var openType = params[params[1]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var HOrgID = params[params[2]];
                var DeptName = params[params[3]];
                if ( openType == "2") {
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var HOrgID = params[params[1]];
                var DeptName = params[params[2]];
                if (typeof (openType) != "undefined") {
                    sWhere += " and ç¦ç”¨æ ‡è®° = ''and å®¡æ ¸äºº !='' ";
                    DeptName = decodeURI(DeptName);//对URI è¿›è¡Œè§£ç 
                    if (DeptName != "undefined") {
                        sWhere += " and éƒ¨é—¨åç§° = '" + DeptName+"' ";
                        sWhere += " and éƒ¨é—¨åç§° = '" + DeptName + "' ";
                    }
                    if (typeof (HOrgID) != "undefined") {
                        Organ(HOrgID);
                    }
                    
                    return true;
                } else {
                    return false;
                }


            }
            //#endregion
            
            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘

            //获取当前用户的默认过滤方案