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

zhangrg

2024-01-02 00a88abf340904065aa7882c7555fc7b65164f5e

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskBillList.html

@@ -796,6 +796,7 @@
                if (data.length != 0) {
                    //layer.confirm("确认要下推吗?", function (index) {
                    var dataArray = [];
                    var sHBillStatus = "";  //单据状态
                    for (var i = 0; i < data.length; i++) {
                        var temp = {
                            "HProjectID": data[i].HProjectID
@@ -811,28 +812,35 @@
                            , "HSourceBillType": data[i].单据类型
                        }
                        dataArray.push(temp);
                    }

                    var datajson = {
                        "data": dataArray
                    };

                    var url = encodeURI('../../项目管理/工作任务/PM_WorkTaskReportBill.html?OperationType=4&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');
                        if (data[i].HBillStatus != 2) {
                            sHBillStatus = "1";
                        }
                    })
                    //})
                    }
                    //判断所选行中是否存在单据状态不为已审核状态的数据
                    if (sHBillStatus == "1") {
                        layer.msg('所选择工作任务存在单据状态不为已审核的行，不允许下推！');
                    }
                    else {
                        var datajson = {
                            "data": dataArray
                        };

                        var url = encodeURI('../../项目管理/工作任务/PM_WorkTaskReportBill.html?OperationType=4&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('请选择数据下推！');
                }
@@ -990,7 +998,7 @@
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var HOrgID = params[params[1]];
                if (openType == 2) {
                    sWhere += " and HBillStatus<3 and ISNULL(关闭人,'') = '' and ISNULL(作废人,'') = '' ";
                    sWhere += " and HBillStatus=2 ";
                    $("#HOrgID").val(HOrgID);
                    form.render("select");
                    return true;