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

duhe

2025-02-11 2669d87e2ec277f7695266d703b9cff6d3455769

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

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

@@ -91,6 +91,7 @@
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
@@ -180,6 +181,9 @@
                        break;
                    case 'btn-Delete':
                        set_DeleteBill();
                        break;
                    //刷新
                    case 'btn_Refresh': get_FastQuery();
                        break;
                    //保存方案
                    case 'set_SaveScheme': set_SaveScheme();
@@ -564,6 +568,10 @@
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                        ,end: function () {
                            //刷新页面,
                            get_FastQuery(table, option);
                        }
                    })

                } else {

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

@@ -793,6 +793,16 @@
                        PicUpload();
                    }
                });

                $("#HAge").val(0);
                $("#HGradDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
                $("#HInComDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
                $("#HInsuranceDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
                $("#HContractEDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
                $("#HContractBDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
                $("#HContractYear").val(0);
                $("#HDimissionDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
                $("#HStayCardEDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
            }
            else if (OperationType == 3) {//编辑
                $("#HItemID").val(linterid);//修改时主表ID
@@ -813,15 +823,7 @@
            }
            //$("#HGradDate").val(Format(2022-11-06, "yyyy-MM-dd"));

            $("#HAge").val(0);
            $("#HGradDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HInComDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HInsuranceDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HContractEDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HContractBDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HContractYear").val(0);
            $("#HDimissionDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HStayCardEDate").val(Format(9999-13-01, "yyyy-MM-dd"));
       
        //#endregion


@@ -958,7 +960,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '工种列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../../views/基础资料/工资基础资料/Gy_WorkTypeList.html', 'yes']
                    , content: ['../../../views/基础资料/工资基础资料/Gy_WorkTypeList.html?Type=HWorkType', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -983,7 +985,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '核算方式列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../../views/基础资料/工资基础资料/Gy_ClassTimePrjList.html', 'yes']
                    , content: ['../../../views/基础资料/工资基础资料/Gy_ClassTimePrjList.html?Type=HClassTimePrj', 'yes']
                    //, content: ['../../../views/Baseset/基础资料/Gy_ClassTimePrjGroupList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
@@ -1063,7 +1065,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '班组列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/工资基础资料/Gy_Group.html', 'yes']
                    , content: ['../../基础资料/工资基础资料/Gy_Group.html?Type=HGroup', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1681,6 +1683,63 @@
        }
        //#endregion

        //#region è¿”回职务
        function GetDutyValue(obj) {  //返回职务
            $("#HDutyName").val(obj[0].职务);
            $("#HDutyID").val(obj[0].hitemid);
            $("#HDutyNumber").val(obj[0].组织架构代码);
        }
        //#endregion

        //#region è¿”回宿舍
        function GetHDormNameValue(obj) {  //返回宿舍
            $("#HDormName").val(obj[0].HName);
            $("#HDormID").val(obj[0].HItemID);
            $("#HDormNumber").val(obj[0].HNumber);
        }
        //#endregion

        //#region è¿”回工种
        function GetHWorkTypeValue(obj) {  //返回工种
            console.log(obj)
            $("#HWorkTypeName").val(obj[0].工种名称);
            $("#HWorkTypeID").val(obj[0].HItemID);
            $("#HWorkTypeNumber").val(obj[0].工种代码);
        }
        //#endregion

        //#region è¿”回核算方式
        function GetHClassTimePrjValue(obj) {  //返回核算方式
            $("#HCTPrjName").val(obj[0].核算方式名称);
            $("#HCTPrjID").val(obj[0].HItemID);
            $("#HCTPrjNumber").val(obj[0].核算方式代码);
        }
        //#endregion

        //#region è¿”回部门
        function GetHDeptNameValue(obj) {  //返回部门
            console.log(obj)
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
            $("#HDeptNumber").val(obj[0].部门代码);
        }
        //#endregion

        //#region è¿”回岗位
        function GetGyPostValue(obj) {  //返回岗位
            $("#HPostName").val(obj[0].岗位名称);
            $("#HPostID").val(obj[0].HItemID);
            $("#HPostNumber").val(obj[0].岗位代码);
        }
            //#endregion

        //班组
        function GetHGroupValue(obj) {
            $("#HGroupName").val(obj[0].班组名称);
            $("#HGroupID").val(obj[0].HItemID);
            $("#HGroupNumber").val(obj[0].班组代码);
        }
    </script>

</body>
</html>

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

@@ -312,14 +312,14 @@
            //代码回车方法
            $('#HNumber').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    get_FastQuery();
                    get_FastQuery(2);
                }
            });

            //名称回车方法
            $('#HName').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    get_FastQuery();
                    get_FastQuery(2);
                }
            });

@@ -684,7 +684,7 @@
                if (HOrgID) {
                    sWhere += " and HUSEORGID = '" + HOrgID + "'";
                }
                sWhere += " and ç¦ç”¨æ ‡è®° != 'Y'";
                sWhere += addSWhereByOpenType();
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -720,6 +720,9 @@
                    , title: '工作中心-新增'
                    , shift: 0//弹出动画
                    , content: '../公用基础资料/Gy_WorkCenter_Add_Edit.html?OperationType=1&linterid=&HSouceBillType='
                    ,end: function () {
                        get_FastQuery(2);
                    }
                })
            }
            //#endregion
@@ -738,6 +741,9 @@
                        , title: '工作中心-编辑'
                        , shift: 0//弹出动画
                        , content: '../公用基础资料/Gy_WorkCenter_Add_Edit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , end: function () {
                            get_FastQuery(2);
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
@@ -908,7 +914,7 @@
            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
                get_Display(sWhere);
                get_FastQuery(2);
            }
            //#endregion

@@ -1092,7 +1098,7 @@
                                }
                            }
                            //查询
                            get_FastQuery();
                            get_FastQuery(2);
                            form.render("select");
                        } else {
                            //当前用户没有设置默认的过滤方案
@@ -1267,8 +1273,34 @@
            }

            //#endregion

            //#region åˆ¤æ–­æ˜¯ç›´æŽ¥æ‰“开页面还是其它页面通过选择按钮打开，并显示相应数据
            function addSWhereByOpenType() {
                //获取参数
                var params = getUrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                if (typeof (openType) != "undefined") {
                    return " and ç¦ç”¨æ ‡è®° != 'Y'";
                }
                return "";
            }
            //#endregion
            //以上是layui模块
        });

        //#region èŽ·å–参数
        function getUrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            for (var i = 0; i < hashes.length; i++) {
                hash = hashes[i].split('=');
                vars.push(hash[0]);
                vars[hash[0]] = hash[1];
            }
            return vars;
        }
         //#endregion

        //#region ã€è¿‡æ»¤æ–¹æ¡ˆè¿”回数据】
        function HFilterScheme(obj)  //返回过滤方案
        {

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group.html

@@ -659,6 +659,7 @@
                if (HOrgID) {
                    sWhere += " and HUSEORGID = '" + HOrgID + "'";
                }
                sWhere += addSWhereByOpenType();
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -714,6 +715,9 @@
                    , title: '生产班组-新增'
                    , shift: 0//弹出动画
                    , content: '../工资基础资料/Gy_Group_Add_Edit.html?OperationType=1&linterid=&HSouceBillType='
                    , end: function () {
                        get_FastQuery(2);
                    }
                })
            }
            //#endregion
@@ -731,6 +735,9 @@
                        , title: '生产班组-编辑'
                        , shift: 0//弹出动画
                        , content: '../工资基础资料/Gy_Group_Add_Edit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , end: function () {
                            get_FastQuery(2);
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
@@ -1217,6 +1224,18 @@

            //#endregion

            //#region åˆ¤æ–­æ˜¯ç›´æŽ¥æ‰“开页面还是其它页面通过选择按钮打开，并显示相应数据
            function addSWhereByOpenType() {
                //获取参数
                var params = get_UrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式
                if (typeof (openType) != "undefined") {
                    return " and ç¦ç”¨æ ‡è®° != 'Y'";
                }
                return "";
            }
            //#endregion

            //#endregion
            //以上是layui模块
        });

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group_Add_Edit.html

@@ -526,6 +526,16 @@

            //以上是layui模块
        });
        function GetHDeptNameValue(obj) {
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
            $("#HDeptNumber").val(obj[0].部门代码);
        }
        function GetProcessValue(obj) {
            $("#HProcName").val(obj[0].工序名称);
            $("#HProcID").val(obj[0].HItemID);
            $("#HProcNumber").val(obj[0].工序代码);
        }
    </script>
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Process.html

@@ -64,7 +64,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">工作中心*</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HWorkCenterName" id="HWorkCenterName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                <input type="text" name="HWorkCenterName" id="HWorkCenterName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" autocomplete="off">
                                                <input type="hidden" name="HWorkCenterID" id="HWorkCenterID" value="0">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkCenterID-BT" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -374,7 +374,7 @@
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        }).use(['index', 'form', 'laydate', 'table', 'element', 'tableSelect'], function () {

            //#region å…¬ç”¨å˜é‡
            var $ = layui.$
@@ -382,7 +382,8 @@
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element;
                , element = layui.element
                , tableSelect = layui.tableSelect;
            var date = new Date();
            var day = date.getDate();
            var month = date.getMonth() + 1;
@@ -493,6 +494,51 @@
            form.on('submit(HWorkCenterID-BT)', function () {
                get_checkWorkCenter();
            });

            //工作中心输入框
            tableSelect.render({
                elem: '#HWorkCenterName',//输入框dom选择
                searchKey: '工作中心名称,工作中心代码',//查询的列名
                sWhere: " and ç¦ç”¨æ ‡è®° != 'Y' and HUSEORGID = '100038' ",//table搜索sWhere条件 //默认筛选项
                ajaxSelect: function (sWhere) {
                    var data = '';
                    $.ajax({
                        url: GetWEBURL() + '/Gy_WorkCenter/list',
                        type: "GET",
                        data: { "sWhere": sWhere, "user": '翁涛涛' },
                        async: false,
                        success: function (data1) {
                            if (data1.count == 1) {
                                data = data1.data
                            }
                        },
                        error: function () {
                            layer.alert('获取列表失败！', { icon: 15, title: '通信错误' });
                        }
                    });
                    return data;
                },//设置前端分页时可以设置的
                table: {
                    //url: GetWEBURL() + 'Gy_Supplier/page',
                    //where: { user: '翁涛涛', Organization: '浙江智云迈思' },
                    cols: [[
                        { type: 'radio', fixed: 'left' },//需要加这个fixed属性不然点击checkbox会触发行点击导致无法正确点击
                        //{ field: 'HItemID', title: 'HItemID' },
                        { field: '工作中心名称', title: '工作中心名称' },
                        { field: '工作中心代码', title: '工作中心代码' },
                    ]],
                    page: true,
                    limit: 5,
                    limits: [5]
                },
                done: function (elem, data) {
                    if (data != []) {
                        $("#HWorkCenterName").val(data.data[0]['工作中心名称']);
                        $("#HWorkCenterID").val(data.data[0]['HItemID']);
                    }

                }
            })

            //选择工段按钮
            form.on('submit(HProcMulID-BT)', function () {
@@ -610,7 +656,7 @@
                                , "HFixPrice": data.班产定额
                                , "HLevel": data.等级
                                , "HProcMulName": data.工段名称
                                , "HProcMulID": data.HProMulID
                                , "HProcMulID": data.工段ID
                                , "HBarCodeForBase": data.条形码
                                , "HHelpCode": data.助记码
                                , "HDeptName": data.部门
@@ -816,7 +862,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '工作中心列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_WorkCenter.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_WorkCenter.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1156,6 +1202,15 @@
            $("#HProcMulName").val(obj[0].工段名称);
            $("#HProcMulID").val(obj[0].HItemID);
        }
        function GetWorkCenterValue(obj) {
            $("#HWorkCenterName").val(obj[0].工作中心名称);
            $("#HWorkCenterID").val(obj[0].HItemID);
        }
        function GetHDeptNameValue(obj) {
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
            $("#HDeptNumber").val(obj[0].部门代码);
        }
    </script>
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Source.html

@@ -60,7 +60,7 @@
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">工作中心*</label>
                                        <div class="layui-input-inline">
                                            <input type="text" name="HCenter" id="HCenter" class="layui-input" value="" style="float:left;width:150px; background-color:#efefef4d;" readonly>
                                            <input type="text" name="HCenter" id="HCenter" class="layui-input" value="" style="float:left;width:150px; background-color:#efefef4d;">
                                            <input type="hidden" name="HCenterID" id="HCenterID" value="0">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkingProcedure-BT" style="width:40px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -229,7 +229,7 @@
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        }).use(['index', 'form', 'laydate', 'table', 'element', 'tableSelect'], function () {

        //#region å…¬ç”¨å˜é‡
            var $ = layui.$
@@ -237,7 +237,8 @@
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element;
                , element = layui.element
                , tableSelect = layui.tableSelect;
            var date = new Date();
            var day = date.getDate();
            var month = date.getMonth() + 1;
@@ -312,6 +313,51 @@
            form.on('submit(HWorkingProcedure-BT)', function () {
                get_checkWorkCenter();
            });

            //工作中心输入框
            tableSelect.render({
                elem: '#HCenter',//输入框dom选择
                searchKey: '工作中心名称,工作中心代码',//查询的列名
                sWhere: " and ç¦ç”¨æ ‡è®° != 'Y' and HUSEORGID = '100038' ",//table搜索sWhere条件 //默认筛选项
                ajaxSelect: function (sWhere) {
                    var data = '';
                    $.ajax({
                        url: GetWEBURL() + '/Gy_WorkCenter/list',
                        type: "GET",
                        data: { "sWhere": sWhere, "user": '翁涛涛' },
                        async: false,
                        success: function (data1) {
                            if (data1.count == 1) {
                                data = data1.data
                            }
                        },
                        error: function () {
                            layer.alert('获取列表失败！', { icon: 15, title: '通信错误' });
                        }
                    });
                    return data;
                },//设置前端分页时可以设置的
                table: {
                    //url: GetWEBURL() + 'Gy_Supplier/page',
                    //where: { user: '翁涛涛', Organization: '浙江智云迈思' },
                    cols: [[
                        { type: 'radio', fixed: 'left' },//需要加这个fixed属性不然点击checkbox会触发行点击导致无法正确点击
                        //{ field: 'HItemID', title: 'HItemID' },
                        { field: '工作中心名称', title: '工作中心名称' },
                        { field: '工作中心代码', title: '工作中心代码' },
                    ]],
                    page: true,
                    limit: 5,
                    limits: [5]
                },
                done: function (elem, data) {
                    if (data != []) {
                        $("#HCenter").val(data.data[0]['工作中心名称']);
                        $("#HCenterID").val(data.data[0]['HItemID']);
                    }

                }
            })

            //选择班组按钮
            form.on('submit(ProductionTeam-BT)', function () {
@@ -627,7 +673,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '班组列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/工资基础资料/Gy_Group.html', 'yes']
                    , content: ['../../基础资料/工资基础资料/Gy_Group.html?Type=HGroup', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -655,7 +701,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes'],
                    content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HEmp', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

@@ -689,6 +735,27 @@

        //以上是layui模块
        });
        function GetWorkCenterValue(obj) {
            $("#HCenter").val(obj[0].工作中心名称);
            $("#HCenterID").val(obj[0].HItemID);
        }
        function GetHEmpValue(obj) {
            $("#HEmpName").val(obj[0].职员名称);
            $("#HEmpID").val(obj[0].HItemID);
        }
        function GetHDeptNameValue(obj) {
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
        }
        function GetProcessValue(obj) {
            $("#HProcName").val(obj[0].工序名称);
            $("#HProcID").val(obj[0].HItemID);
            $("#HProcNumber").val(obj[0].工序代码);
        }
        function GetHGroupValue(obj) {
            $("#HGroup").val(obj[0].班组名称);
            $("#HGroupID").val(obj[0].HItemID);
        }
    </script>
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Process.html

@@ -670,6 +670,9 @@
                    , title: '工序列表-新增'
                    , shift: 0//弹出动画
                    , content: '../生产基础资料/Add_Edit_Gy_Process.html?OperationType=1&linterid=&HSouceBillType='
                    , end: function () {
                        get_FastQuery(2);
                    }
                })
            }
            //#endregion
@@ -687,6 +690,9 @@
                        , title: '工序列表-编辑'
                        , shift: 0//弹出动画
                        , content: '../生产基础资料/Add_Edit_Gy_Process.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        ,end: function () {
                            get_FastQuery(2);
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Source.html

@@ -307,9 +307,10 @@

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery(2);
                //存储条件
                get_WriteConfigFile();
                get_FastQuery(2);
                
            });
            //#endregion

@@ -596,6 +597,9 @@
                        , title: '生产资源-编辑'
                        , shift: 0//弹出动画
                        , content: '../生产基础资料/Add_Edit_Gy_Source.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , end: function () {
                            get_FastQuery(2);
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
@@ -804,6 +808,7 @@
                if (HOrgID) {
                    sWhere += " and HUSEORGID = '" + HOrgID + "'";
                }
                sWhere += addSWhereByOpenType();
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -838,6 +843,9 @@
                    , title: '生产资源-新增'
                    , shift: 0//弹出动画
                    , content: '../生产基础资料/Add_Edit_Gy_Source.html?OperationType=1&linterid=&HSouceBillType='
                    , end: function () {
                        get_FastQuery(2);
                    }
                })
            }
            //#endregion
@@ -845,7 +853,7 @@
            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
                get_FastQuery(1);
                get_FastQuery(2);
            }
            //#endregion

@@ -1056,6 +1064,17 @@
            }
            //#endregion

            //#region åˆ¤æ–­æ˜¯ç›´æŽ¥æ‰“开页面还是其它页面通过选择按钮打开，并显示相应数据
            function addSWhereByOpenType() {
                //获取参数
                var params = get_UrlVars();
                var openType = params[params[1]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                if (typeof (openType) != "undefined") {
                    return " and ç¦ç”¨æ ‡è®° != 'Y'";
                }
                return "";
            }
            //#endregion

            function get_UrlVars() {
                var vars = [], hash;

 WebTM/views/Éú²ú¹ÜÀí/Éú²úͶÁϵ¥/Sc_PPBomBillList.html

@@ -212,15 +212,15 @@
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>-->
                                                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <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-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -432,7 +432,7 @@
                                        </div>
                                        <div class="layui-inline">
                                            <div class="layui-input-block" style="margin-left: 185px;">
                                                <input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="转工序">
                                                <input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="转工序" disabled="disabled">
                                                <input type="hidden" value="1" name="IsProNo" id="IsProNo" lay-verify="IsProNo">
                                            </div>
                                        </div>
@@ -1832,9 +1832,9 @@
                    var wait = layer.load();
                    var HInterID = $("#HInterID").val();
                    $.ajax({
                        url: GetWEBURL() + '/Gy_RoutingBill/AuditGy_RoutingBill',
                        url: GetWEBURL() + '/Gy_RoutingBill/CheckGy_RoutingBill',
                        type: "GET",
                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                        data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"], "HBillSubType": "3301"},
                        success: function (result) {
                            if (result.count == 1) {
                                //检查是否具备启用默认工艺路线的权限，存在，则弹窗提问
@@ -1888,11 +1888,12 @@
            //反审核
            function set_AbandonCheck() {
                layer.confirm("确认要反审核吗?", function (index) {
                    var HInterID = $("#HInterID").val();
                    var wait = layer.load();
                    $.ajax({
                        url: GetWEBURL() + '/Gy_RoutingBill/AuditGy_RoutingBill',
                        url: GetWEBURL() + '/Gy_RoutingBill/CheckGy_RoutingBill',
                        type: "GET",
                        data: { "HInterID": $("#HInterID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
                        data: { "HInterID": HInterID, "Type": 2, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 });
@@ -1912,11 +1913,12 @@
            //关闭
            function set_CloseBill() {
                layer.confirm("确认要关闭吗?", function (index) {
                    var HInterID = $("#HInterID").val();
                    var wait = layer.load();
                    $.ajax({
                        url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill',
                        url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
                        type: "GET",
                        data: { "HInterID": $("#HInterID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                        data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"], "HBillSubType": "" },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 });
@@ -1936,11 +1938,12 @@
            //反关闭
            function set_CancelCloseBill() {
                layer.confirm("确认要反关闭吗?", function (index) {
                    var HInterID = $("#HInterID").val();
                    var wait = layer.load();
                    $.ajax({
                        url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill',
                        url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
                        type: "GET",
                        data: { "HInterID": $("#HInterID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
                        data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"], "HBillSubType": "" },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 });
@@ -2059,6 +2062,7 @@

            //#region å¤åˆ¶
            function set_Copy() {
                $('#btnSave').removeClass("layui-btn-disabled").attr("disabled", false);
                //制单人
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#hmakers").val(sessionStorage["HUserName"]);

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillCloseList.html

@@ -421,9 +421,9 @@
                        soulTable.render(this);
                    }
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                       /*{ type: 'checkbox', fixed: 'left' }*/
                        /*    { field: 'hmainid', title: 'hmainid', width: 110 }*/
                        , { field: '单据号', title: '单据号', sort: true, width: 165 }
                        { field: '单据号', title: '单据号', sort: true, width: 165 }
                        , { field: '工艺名称', title: '工艺名称', width: 170, sort: true }
                        , { field: '物料代码', title: '物料代码', width: 160, sort: true }
                        , { field: '物料名称', title: '物料名称', width: 160, sort: true }
@@ -765,7 +765,7 @@
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计'  });
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计', hide: true });
                            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) {
@@ -1036,7 +1036,7 @@
            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
                get_DisplayPage(sWhere);
                get_FastQuery();
            }

            //启用默认

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html

@@ -1132,7 +1132,7 @@
                    , content: '../工艺路线/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=3301&linteridSub=-1'
                    , end: function () {
                        //刷新页面,
                        location.reload();
                        get_FastQuery(2);
                    }
                })
            }
@@ -1149,7 +1149,7 @@
                    , content: '../工艺路线/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=SUB&linteridSub=-1'
                    , end: function () {
                        //刷新页面,
                        location.reload();
                        get_FastQuery(2);
                    }
                })
            }
@@ -1171,7 +1171,7 @@
                        , content: '../工艺路线/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=3301'
                        , end: function () {
                            //刷新页面,
                            location.reload();
                            get_FastQuery(2);
                        }
                    })
                } else {
@@ -1203,7 +1203,7 @@
                                            //关闭当前frame
                                            layer.close(wait);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                            get_FastQuery(2);
                                        });
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
@@ -1314,7 +1314,7 @@
                        , content: '../工艺路线/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=3301'
                        , end: function () {
                            //刷新页面,
                            location.reload();
                            get_FastQuery(2);
                        }
                    })
                } else {
@@ -1324,8 +1324,8 @@

            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
                get_DisplayPage(sWhere);
                
                get_FastQuery(2);
            }

            //启用默认
@@ -1333,7 +1333,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;

                if (data.length == 1) {
                if (data.length == 1 && data[0].状态!="关闭") {
                    layer.confirm("确认要启用该工艺路线为物料默认工艺路线吗?", function (index) {
                        var wait = layer.load();
                        var HInterID = data[0].hmainid;
@@ -1357,7 +1357,7 @@
                        });
                    })
                } else {
                    layer.msg("请选择一条数据!");
                    layer.msg("请选择一条未关闭的数据!");
                }
            }

@@ -1365,7 +1365,7 @@
            function set_closeOtherRoute() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1 && checkStatus.data[0]["审核人"]=="") {
                if (checkStatus.data.length === 1 && data[0].状态 != "关闭") {
                    var hmainid = data[0].hmainid.toString();
                    var HName = data[0]["工艺名称"].toString();
                    var HMaterID = data[0]["HMaterID"].toString();
@@ -1523,6 +1523,14 @@
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                            , end: function () {
                                ////修改为功后刷新界面
                                //if (get_needClose_Bar == 0) {
                                $("#btnSearch").trigger('click');
                                //} else if (get_needClose_Bar == 1) {
                                //    $("#get_needClose").trigger('click');
                                //}
                            }
                        });
                    })
                }