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

yangle

2024-07-16 77dafdec8a67e456ec1ee88ae556882be2dc774c

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

@@ -193,10 +193,11 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></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-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></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-audit"><i class="layui-icon layui-icon-repeat"></i>审核</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>反审核</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
@@ -274,6 +275,9 @@
                        break;
                    //编辑
                    case 'set_ShowBill': set_ShowBill();
                        break;
                    //多行下推
                    case 'btn-ProcPriceRequestBills': set_ProcPriceRequestBills();
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
@@ -658,7 +662,7 @@
                                    temp = result[i]["单据号"];
                                } else {
                                    var initIndex = $.inArray("单据号", colList);
                                    var lastIndex = $.inArray("工序号", colList);
                                    var lastIndex = $.inArray("hsubid", colList);
                                    for (var j = initIndex; j < lastIndex; j++) {
                                        var fieldName = colList[j];
                                        result[i][fieldName] = "";
@@ -914,6 +918,52 @@
            }
            //#endregion

            //#region å¤šè¡Œä¸‹æŽ¨ï¼ˆé‡‡è´­å…¥åº“单）
            function set_ProcPriceRequestBills() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length > 0) {
                    var dataArray = [];
                    for (var i = 0; i < data.length; i++) {
                        var temp = {
                            "hmainid": data[i].hmainid
                            , "hsubid": data[i].hsubid
                        }
                        dataArray.push(temp);
                        //if (data[i].状态 != "审核") {
                        //    var err = "下推失败!单据【" + data[i].单据号 + "】的状态为“" + data[0].状态 + "”,不允许下推！";
                        //    layer.alert(err, { icon: 5 });
                        //    return;
                        //}
                        //if (data[i].行状态 != "") {
                        //    var err = "下推失败!单据【" + data[i].单据号 + "】的状态为“" + data[0].行状态 + "”,不允许下推！";
                        //    layer.alert(err, { icon: 5 });
                        //    return;
                        //}
                    }

                    var datajson = {
                        "data": dataArray
                    };
                    var url = encodeURI('../../工资管理/定额申请/Pay_ProcPriceRequestBill.html?OperationType=4&linterid=0&HSouceBillType=3301&res=' + JSON.stringify(datajson))
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '工艺路线-多行下推定额申请单'
                        , shift: 0//弹出动画
                        , content: url
                        , btn: [],
                        // æŒ‰é’®1 çš„回调
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
                        }
                    })
                } else {
                    layer.msg('请选择数据下推！');
                }
            }
            //#endregion
            //复制
            function set_Copy() {
                var checkStatus = table.checkStatus('mainTable')