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

yangle

2023-09-04 3c39d419f2bb7b3c9912a211a07c1365a88eb1c8

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBillList.html

@@ -109,7 +109,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>反作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ProjectReport"><i class="layui-icon layui-icon-radio"></i>下推(阶段汇报)</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_WorkTaskReport"><i class="layui-icon layui-icon-radio"></i>下推(任务汇报)</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_WorkTask"><i class="layui-icon layui-icon-radio"></i>下推(工作任务)</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>禁用</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>反禁用</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
@@ -200,9 +200,9 @@
                    case 'set_ProjectReport':
                        set_ProjectReport();
                        break;
                    //下推(任务汇报)
                    case 'set_WorkTaskReport':
                        set_WorkTaskReport();
                    //下推(工作任务)
                    case 'set_WorkTask':
                        set_WorkTask();
                        break;
                    ////禁用按钮
                    //case 'btn-Stop':
@@ -263,9 +263,14 @@
            function set_ClearBill() {
                //初始化表格
                set_InitGrid();
                //查询
                get_FastQuery(1);
                //初始化组织
                Organ();
                //查询
                if (addSWhereByOpenType()) {                        //addSWhereByOpenType()方法判断是否其它页面打开本页面，若是则处理过滤条件，并返回true
                    get_FastQuery(2);
                } else {
                    get_FastQuery(1);
                }
            }
            //#endregion

@@ -288,6 +293,7 @@
                //获取登录页组织列
                $.ajax({
                    type: "get",
                    async: false,
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    success: function (result) {
                        var Organization = "";
@@ -730,21 +736,21 @@
            }
            //#endregion

            //#region ä¸‹æŽ¨(任务汇报)
            function set_WorkTaskReport() {
            //#region ä¸‹æŽ¨(工作任务)
            function set_WorkTask() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var InterID = data[0].HInterID.toString();
                var HProjectStageID = data[0].HProjectStageID;
                var HInterID = data[0].HInterID.toString();
                var HEntryID = data[0].HEntryID.toString();
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].HInterID.toString();
                    layer.open({
                        type: 2
                        , skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '任务汇报-下推'
                        , title: '工作任务-下推'
                        , shift: 0//弹出动画
                        , content: '../../项目管理/工作任务/PM_WorkTaskReportBill.html?OperationType=4&linterid=' + InterID + '&HSouceBillType=' + '&HProjectStageID=' + HProjectStageID
                        , content: '../../项目管理/工作任务/PM_WorkTaskBill.html?OperationType=4&linterid=' + HInterID + '&HSouceBillType=' + '&HEntryID=' + HEntryID
                        , btn: ['确定'],
                        // æŒ‰é’®1 çš„回调
                        btn1: function (index, layero, that) {
@@ -754,12 +760,10 @@
                    })
                }
                else {
                    layer.msg('请选择一行数据审核！');
                    layer.msg('请选择一行数据下推！');
                }
                
            }
            //#endregion


            //#region éšè—åˆ—设置
            function get_HideColumn() {
@@ -893,6 +897,34 @@
            }
            //#endregion

            //#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 addSWhereByOpenType() {
                //获取参数
                var params = getUrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var HOrgID = params[params[1]];
                if (openType == 2) {
                    sWhere += " and ISNULL(关闭人,'') = '' and ISNULL(作废人,'') = '' ";
                    $("#HOrgID").val(HOrgID);
                    form.render("select");
                    return true;
                }
                return false;
            }
            //#endregion

        });

            //#endregion