工作周总结隐藏一个字段,工作任务列表增加催促按钮与编辑回显订单等级,工作任务去掉催促
4个文件已修改
131 ■■■■■ 已修改文件
WebTM/views/项目管理/周计划/PM_WorkReportWeekBillMain.html 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/项目管理/周计划/PM_WorkReportWeekBillMainList.html 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/项目管理/工作任务/PM_WorkTaskBill.html 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/项目管理/工作任务/PM_WorkTaskBillList.html 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/ÏîÄ¿¹ÜÀí/Öܼƻ®/PM_WorkReportWeekBillMain.html
@@ -59,7 +59,7 @@
                                        <div class="layui-input-block" style="margin-left: 77px; width:270px;">
                                            <input type="text" class="layui-input" lay-verify="HPlanEmpName" name="HPlanEmpName" id="HPlanEmpName" style="background-color:#efefef4d; width:180px; display: inline-block;" readonly>
                                            <input type="hidden" name="HReportEmpID" id="HReportEmpID" lay-verify="HReportEmpID" value="0">
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPlanEmp" id="btnSearchHPlanEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="btnSearchHPlanEmp" lay-filter="btnSearchHPlanEmp" id="btnSearchHPlanEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>
                                        </div>
@@ -295,7 +295,6 @@
                //初始化组织
                Organ();
                //生成并设置主表的内码和单据号
                createBillNo();
@@ -311,6 +310,8 @@
                //根据登录账户初始化查询总结人工时
                getHUserNameHours();
                ////禁用组织选项
                //$("#HOrgID").attr("disabled", true);
@@ -320,11 +321,19 @@
                
              
            }
            else if (OperationType == 3) {                                                 //编辑
            else if (OperationType == 3) {
                //编辑
                //禁用按钮
                var num = 1;
                HfBtn(num);
                //初始化组织
                Organ();
                //初始化年和周、开始日期、结束日期
                Init_selectYearAndWeek();
                set_EditForm(linterid);
            }
            //#endregion
@@ -783,22 +792,22 @@
                    success: function (result) {
                        if (result.code == 1) {
                            data = result.data;
                            $('#btnSearchHPlanEmp').addClass("layui-btn-disabled").attr("disabled", true);
                            //主表 èµ‹å€¼
                            form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HInterID": data[0]["HInterID"]
                                , "HBillNo": data[0]["单据号"]
                                , "HYear": data[0]["å¹´"]
                                , "HPeriod": data[0]["月"]
                                , "HWeek": data[0]["周"]
                                , "HDate": Format(new Date(data[0]["日期"]), "yyyy-MM-dd")
                                , "HPlanTimes": data[0]["计划工时"]
                                , "HUseTimes": data[0]["消耗工时"]
                                , "HRelUseTimes": data[0]["有效工时"]
                                , "HDelayTasks": data[0]["延期任务"]
                                , "HFineTasks": data[0]["超前任务"]
                                , "HFinishRate": data[0]["达成率"]
                                , "HBeginDate": Format(new Date(data[0]["HBeginDate"]), "yyyy-MM-dd")
                                , "HEndDate": Format(new Date(data[0]["HEndDate"]), "yyyy-MM-dd")
                                , "HFinishRate": data[0]["达成率"]+'%'
                                , "HBeginDate": Format(new Date(data[0]["开始日期"]), "yyyy-MM-dd")
                                , "HEndDate": Format(new Date(data[0]["结束日期"]), "yyyy-MM-dd")
                                , "HReportEmpID": data[0]["HReportEmpID"] == null ? 0 : data[0]["HReportEmpID"]
                                , "HPlanEmpName": data[0]["总结人"]
                                , "HRemark": data[0]["备注"]
@@ -827,7 +836,7 @@
            }
            //#endregion
            //#region å®¡æ ¸ åå®¡æ ¸ å…³é—­ åå…³é—­
WebTM/views/ÏîÄ¿¹ÜÀí/Öܼƻ®/PM_WorkReportWeekBillMainList.html
@@ -136,7 +136,7 @@
            var HModName = "h_v_PM_WorkReportWeekBillMainList";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HInterID", "HReportEmpID"];
            var titleData = ["HInterID", "HReportEmpID","HOrgID"];
            //#endregion
@@ -286,7 +286,7 @@
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/PM_WorkTaskWeekBill/PM_WorkReportWeekBillMainList',
                    url: GetWEBURL() + '/PM_WorkTaskWeekBill/PM_WorkReportWeekBillList',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
@@ -422,7 +422,7 @@
                    // æŒ‰é’®1 çš„回调
                    end: function (index, layero, that) {
                        //刷新页面
                        $("#btnSearch").trigger('click');
                        get_FastQuery();
                    }
                })
            }
@@ -445,7 +445,7 @@
                        // æŒ‰é’®1 çš„回调
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
                            get_FastQuery();
                        }
                    })
                } else {
@@ -465,7 +465,7 @@
                        var wait = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + 'PM_WorkTaskWeekBill/delete',
                            url: GetWEBURL() + 'PM_WorkTaskWeekBill/PM_WorkReportWeekBillMainDelete',
                            type: "GET",
                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
@@ -477,8 +477,9 @@
                                        //关闭当前frame
                                        layer.close(wait);
                                        //修改为功后刷新界面
                                        w$("#btnSearch").trigger('click');
                                    });
                                    get_FastQuery();
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
@@ -499,7 +500,7 @@
            //#region åˆ·æ–°
            function get_Refresh() {
                $("#btnSearch").trigger('click');
                get_FastQuery();
            }
            //#endregion
@@ -520,6 +521,7 @@
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                    get_FastQuery();
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
@@ -549,6 +551,7 @@
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                    get_FastQuery();
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
@@ -579,6 +582,7 @@
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                    get_FastQuery();
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
@@ -609,6 +613,7 @@
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                    get_FastQuery();
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskBill.html
@@ -204,16 +204,6 @@
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">催促次数</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HHasten" name="HHasten" id="HHasten"  style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly >
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHHasten" id="btnSearchHHasten" style="padding: 0 10px;float: right;margin-right: 3px; " value="0">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -442,6 +432,8 @@
            //#region ä»»åŠ¡ç±»åž‹ç±»åž‹ä¸‹æ‹‰æ¡†æ˜¾ç¤º
            ColFilter();
            //#endregion
            //初始化订单等级
            HOrderLev();
            //#region åˆ¤æ–­å¹¶è®¾ç½®æ“ä½œç±»åž‹ã€é¡µé¢åˆå§‹åŒ–
            if (OperationType == null || OperationType == 1) {                            //新增
@@ -464,8 +456,7 @@
                //文件选择初始化
                PicUpload();
                //初始化订单等级
                HOrderLev();
            }
            //else if (OperationType == 2) {                                      //复制
@@ -489,6 +480,9 @@
                //编辑
                ////禁用组织选项
                //$("#HOrgID").attr("disabled", true);
                //初始化项目阶段表
                RoadBillMain(linterid);
@@ -496,8 +490,7 @@
                PicUpload();
                //展示已上传的文件
                getFileList_loaded();
                //初始化订单等级
                HOrderLev();
             
            } else if (OperationType == 4 && HProjectStageID != null) {                     //下推
                ////禁用组织选项
@@ -521,8 +514,7 @@
                set_WorkTaskReport();
                //文件选择初始化
                PicUpload();
                //初始化订单等级
                HOrderLev();
            }
            //#endregion
@@ -684,10 +676,7 @@
                                Order += '<option  style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
                            }
                            $("#HOrderLevID ").append(Order);
                            //if (OperationType == 1) {
                            //    HOrgIDBar = sessionStorage["OrganizationID"];
                            //}
                            //$("#HOrderLevID ").val(HOrgIDBar);
                            form.render('select');
                        }
                        layer.closeAll("loading");
@@ -697,12 +686,7 @@
            //#endregion
            //#region èŽ·å–å‚¬ä¿ƒæ¬¡æ•°
            document.getElementById('btnSearchHHasten').addEventListener('click', function () {
                var input = document.getElementById('HHasten');
                input.value = parseInt(input.value) + 1;
            });
            //#endregion
            //#region èŽ·å–å‚æ•°
@@ -1057,8 +1041,8 @@
            function set_AddNew(data) {
                //获取组织数据
                data.field.HPRDORGID = sessionStorage["OrganizationID"];//组织
                if (data.field.HHasten == "") {
                    data.field.HHasten = 0;
                if (data.field.HOrderLevID == "") {
                    data.field.HOrderLevID = 0;
                }
                //若为编辑-保存,则更新修改人和修改时间
                if (OperationType == 3) {
@@ -1132,7 +1116,6 @@
                            , "HRemark": tableMain[0]["HRemark"]
                            , "HOrgID": tableMain[0]["HOrgID"]
                            , "HOrderLevID": tableMain[0]["HOrderLevID"]
                            , "HHasten": tableMain[0]["HHasten"]
                            , "HMainSourceInterID": tableMain[0]["HMainSourceInterID"]
                            , "HMainSourceEntryID": tableMain[0]["HMainSourceEntryID"]
WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskBillList.html
@@ -135,6 +135,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>保存方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HHasten"><i class="layui-icon layui-icon-logout"></i>催促次数按钮</button>
                            </div>
                        </script>
                    </form>
@@ -213,9 +214,9 @@
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
                    ////浏览
                    //case 'get_view': get_view();
                    //    break;
                    //催促按钮
                    case 'get_HHasten': get_HHasten();
                        break;
                    //审核按钮
                    case 'btn-Audit':
                        set_CheckBill(1);
@@ -856,6 +857,43 @@
            }
            //#endregion
            //#region å‚¬ä¿ƒæ¬¡æ•°
            function get_HHasten() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].HInterID.toString();
                    var HHasten = data[0].催促次数 == undefined ? 0 : data[0].催促次数 ;
                    var HHastens = HHasten + 1;
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/PM_WorkTaskBill/UpdateHHasten", //方法所在页面和方法名
                        data: { "HInterID": InterID, "HHasten": HHastens, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                });
                                get_FastQuery(1);
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('请选择一行数据审核!');
                }
            }
            //#endregion
            //#region å¤šè¡Œä¸‹æŽ¨
            function set_ShowBill_dh() {
                var checkStatus = table.checkStatus('mainTable')