工作任务 增加 字段 任务状态 ，需求及问题清单内码，需求及问题清单号,工作任务里 增加 字段： 订单等级（紧急、普通、优化项目）、增加 催促次数 的...

zrg

2024-02-02 ebc5cb37642bc43d7d98366c2e28e50a5fd84dc5

工作任务 增加 字段 任务状态 ，需求及问题清单内码，需求及问题清单号,工作任务里 增加 字段： 订单等级（紧急、普通、优化项目）、增加 催促次数 的字段；单据列表里 也把 这2个字段 显示出来

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

@@ -197,6 +197,23 @@
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">订单等级</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <select name="HOrderLevID" id="HOrderLevID" lay-filter="HOrderLevID" style="width:120px;">
                                                </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" value="0" 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;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -446,6 +463,10 @@

                //文件选择初始化
                PicUpload();

                //初始化订单等级
                HOrderLev();

            }
            //else if (OperationType == 2) {                                      //复制
            //    //禁用组织选项
@@ -463,7 +484,10 @@
            //        }
            //    });
            //}
            else if (OperationType == 3) {//如果修改则走下面 new                                        //编辑
            else if (OperationType == 3) {//如果修改则走下面 new     
                //初始化订单等级
                HOrderLev();
                //编辑
                ////禁用组织选项
                //$("#HOrgID").attr("disabled", true);
                //初始化项目阶段表
@@ -473,6 +497,7 @@
                PicUpload();
                //展示已上传的文件
                getFileList_loaded();
             
            } else if (OperationType == 4 && HProjectStageID != null) {                     //下推
                ////禁用组织选项
                //$("#HOrgID").attr("disabled", true);
@@ -495,12 +520,15 @@
                set_WorkTaskReport();
                //文件选择初始化
                PicUpload();
                //初始化订单等级
                HOrderLev();
            }
            //#endregion

            //#region åˆå§‹åŒ–组织
            Organ();
            //#endregion
            

            //#endregion

@@ -638,6 +666,42 @@
                    }
                })
            }
            //#endregion

            //#region èŽ·å–订单等级
            function HOrderLev() {
                //获取订单等级
                var Order = '';
                $.ajax({
                    type: "get",
                    async: false,
                    url: GetWEBURL() + "/PM_WorkTaskBill/getOrder",
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                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");
                    }
                })
            }
            //#endregion


            //#region èŽ·å–催促次数 
            document.getElementById('btnSearchHHasten').addEventListener('click', function () {
                var input = document.getElementById('HHasten');
                input.value = parseInt(input.value) + 1;
            });

            //#endregion

            //#region èŽ·å–参数
@@ -1063,6 +1127,8 @@
                            , "HCopyEmp": tableMain[0]["HCopyEmp"]
                            , "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

@@ -129,8 +129,8 @@
                                <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_ShowBill_dh"><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="btn-Begin"><i class="layui-icon layui-icon-radio"></i>开始任务</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cancel-Begin"><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>
                                <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>
@@ -171,7 +171,7 @@
            var HModName = "PM_WorkTaskBillList";

            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HInterID", "HProjectStageID", "HOrgID", "HEntryID", "HProjectID", "HBillStatus"];
            var titleData = ["HInterID", "HProjectStageID", "HOrgID", "HEntryID", "HProjectID", "HBillStatus", "HOrderLevID"];
            //#endregion

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘
@@ -251,14 +251,14 @@
                    case 'set_ShowBill_dh':
                        set_ShowBill_dh();
                        break;
                    ////禁用按钮
                    //case 'btn-Stop':
                    //    set_De_Stop(0);
                    //    break;
                    ////反禁用按钮
                    //case 'btn-DeStop':
                    //    set_De_Stop(1);
                    //    break;
                    //开始任务按钮
                    case 'btn-Begin':
                        set_Begin(0);
                        break;
                    //撤销任务按钮
                    case 'btn-Cancel-Begin':
                        set_Begin(1);
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;
@@ -820,6 +820,42 @@
            }
            //#endregion

            //#region å¼€å§‹ä»»åŠ¡/撤销开始数据
            function set_Begin(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].HInterID.toString();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/PM_WorkTaskBill/BeginPM_WorkTaskBill", //方法所在页面和方法名
                        data: { "HInterID": InterID, "Type": num, "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);
                                    //修改为功后刷新界面
                                    $("#btnSearch").trigger('click');
                                });

                            } 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')

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

@@ -24,19 +24,19 @@
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group"
                    <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="padding: 10px; ">
                    <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_LookDown" lay-filter="btn_LookDown">引出</button>
                    <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">预览</button>
                    <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">打印</button>
                    <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_report" lay-filter="btn_report">汇报</button>
                        <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_report" lay-filter="btn_report">下推任务汇报</button>
                    <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">退出</button>
                    </div>
                    <div class="layui-tab layui-tab-card" style="margin-top:20px;" lay-filter="tab-TabTest">
                    <div class="layui-tab layui-tab-card" style="margin-top:20px;" >
                    <ul class="layui-tab-title">
                    <li lay-id="1" class="layui-this">未完成</li>
                    <li lay-id="2">正在进行</li>
                    <li lay-id="3">已完成</li>
                            <li  class="layui-this">未完成</li>
                            <li>正在进行</li>
                            <li>已完成</li>
                    </ul>
                    <div class="layui-tab-content">
                    <div class="layui-tab-item layui-show">
@@ -83,8 +83,8 @@
            var option_finish = ""; //已完成
            var option_proc = ""; //正在进行
            var ins;
            var TableTab = "mainTable_notcomplete";  //初始化页面时默认为 â€œæœªå®Œæˆâ€ é¡µç­¾
            var cur_title = "未完成"; //当前选中页签
            //var TableTab = "mainTable_notcomplete";  //初始化页面时默认为 â€œæœªå®Œæˆâ€ é¡µç­¾
            //var cur_title = "未完成"; //当前选中页签
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -116,22 +116,6 @@
            form.on('submit(get_Exit)', function (data) {
                Pub_Close(2);
            });

            

            
            //监听当前处于哪一个页签，传 HModName å€¼
            element.on('tab(tab-TabTest)', function (data) {
                HMaterInfo = table.cache['mainTable'];
                cur_title = data.elem.context.innerText;
                if (cur_title == "未完成") {
                    TableTab = "mainTable_notcomplete";
                } else if (cur_title == "已完成") {
                    TableTab = "mainTable_finish";
                } else if (cur_title == "正在进行") {
                    TableTab = "mainTable_proc";
                }
            })
            //#endregion

            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法
@@ -298,46 +282,52 @@

            //#region å¯¼å‡ºExecel
            function get_Export() {

                table.exportFile(ins.config.id, option_notcomplete.data, "xls");
                var data = option_notcomplete.data
                data.forEach((item) => {
                    // å¦‚果某个字段的值太长，需要去除换行符
                    if (item.任务描述.length > 0) {  // å‡è®¾å­—段名为field
                        item.任务描述 = item.任务描述.replace(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
            }
                });
                table.exportFile(ins.config.id, data, "xls");
            }
            //#endregion

            //#region æ±‡æŠ¥
            function get_report() {
                var checkStatus = table.checkStatus("mainTable_proc")
                    , data = checkStatus.data;
                var activeTab = getActiveTab();

                if (activeTab == "未完成") {
                    var checkStatus = table.checkStatus('mainTable_notcomplete')
                        , data = checkStatus.data;
                } else if (activeTab == "已完成") {
                    var checkStatus = table.checkStatus('mainTable_finish')
                        , data = checkStatus.data;
                } else if (activeTab == "正在进行") {
                    var checkStatus = table.checkStatus('mainTable_proc')
                        , data = checkStatus.data;
                }
               
                var HInterID = data[0].HInterID;
                var HEntryID = data[0].HEntryID;
                if (data.length == 1) {
                    layer.open({
                        type: 2,
                        skin: 'layui-layer-rim', //加上边框
                        title: '新增产量汇报单',
                        closeBtn: 1,
                        shift: 2,
                        area: ['100%', '100%'],
                        maxmin: true,
                        content: '../../生产管理/产量汇报单/Sc_Add_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
                        end: function () {

                        },
                        success: function (dom, index) {
                            var deliverData = [];
                            deliverData.push({
                                "HBillType": data[0].单据类型,
                                "HSourceInterID": data[0].HInterID,
                                "HSourceEntryID": data[0].源单子内码,
                                "HSourceBillNo": data[0].源单单号,
                                "HSourceBillType": data[0].源单类型
                            });

                            //通过索引获取到当前iframe弹出层
                            var iframe = window['layui-layer-iframe' + index];
                            //调用iframe弹出层内的方法
                            iframe.edit(deliverData);
                        },
                    });
                } else {
                    layer.msg('请在 æ­£åœ¨ç”Ÿäº§ é¡µç­¾ä¸­é€‰æ‹©ä¸€è¡Œæ•°æ®å¼€å·¥ï¼');
                        type: 2
                        , skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '工作任务-下推'
                        , shift: 0//弹出动画
                        , content: '../../项目管理/工作任务/PM_WorkTaskReportBill.html?OperationType=2&linterid=' + HInterID + '&HSouceBillType='
                        , btn: ['确定'],
                        // æŒ‰é’®1 çš„回调
                        btn1: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
                        }
                    })
                }
                else {
                    layer.msg('请选择一行数据下推！');
                }                  
            }
            //#endregion
@@ -393,6 +383,20 @@
            }
            //#endregion         

            // èŽ·å–标签
            function getActiveTab() {
                var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
                var activeTab;
                for (var i = 0; i < tabs.length; i++) {
                    if (tabs[i].classList.contains("layui-this")) {
                        activeTab = tabs[i].innerText;
                        break;
                    }
                }
                return activeTab;

            }

            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";

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

@@ -291,7 +291,8 @@
            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑
            var linterid = params[params[1]]; //从参数中获取 å•æ®å†…码
            var HProjectStageID = params[params[3]]; //阶段内码
            var HEntryID = params[params[3]]; //从参数中获取 å•æ®å†…码
            //var HProjectStageID = params[params[3]]; //阶段内码

            //#endregion

@@ -326,23 +327,27 @@
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化项目阶段表
                get_InitGrid();
                
            }
            //else if (OperationType == 2) {                                      //复制
            else if (OperationType == 2) {      //我的任务模块下推
            //    //禁用组织选项
            //    //$("#HOrgID").attr("disabled", true);
            //    RoadBillMain(linterid);
            //    $.ajax({
            //        url: GetWEBURL() + "/Web/GetMAXNum",
            //        type: "GET",
            //        async: false,
            //        data: { "HBillType": '4750' },
            //        success: function (d) {
            //            $("#HInterID").val(d.data[0].HInterID);
            //            $("#HBillNo").val(d.data[0].HBillNo);
            //            $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
            //        }
            //    });
            //}
                //$("#HOrgID").attr("disabled", true);
                //生成并设置主表的内码和单据号
                createBillNo();
                //汇报人初始化
                getHEmpByHUserName();

                //初始化制单人和制单时间
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));

                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化项目阶段表
                get_InitGrid();

                get_Display();
            }
            else if (OperationType == 3) {//如果修改则走下面 new                                        //编辑
                ////禁用组织选项
                //$("#HOrgID").attr("disabled", true);
@@ -367,6 +372,7 @@
                get_InitGrid();
                //下推-页面设置
                set_WorkTaskReport();
            
            }
            //#endregion

@@ -590,7 +596,7 @@
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HOrgID").append(Organization);
                            if (OperationType == 1 || OperationType == 4) {
                            if (OperationType == 1 || OperationType == 4 || OperationType == 2) {
                                HOrgIDBar = sessionStorage["OrganizationID"];
                            }
                            $("#HOrgID").val(HOrgIDBar);
@@ -757,6 +763,7 @@
                        num.push(table.cache["mainTable"][i])
                    }
                }
              
                //获取组织数据
                data.field.HPRDORGID = sessionStorage["OrganizationID"];//组织
                //若为编辑-保存，则更新修改人和修改时间
@@ -786,6 +793,8 @@
                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                            layer.close(index);
                            layer.msg("提交成功");
                            var datas = num;
                            UpdateState(datas);
                        }
                        else {
                            layer.close(index);
@@ -799,6 +808,40 @@
                });
            }
            //#endregion


            //循环子表数据,查看是否完成,完成就更新状态为已结束
            function UpdateState(datas) {
                var data = datas;
                for (var i = 0; i < data.length; i++) {
                    if (data[i].HFinishFlag == true) {
                        var InterID = data[i].HSourceInterID;
                        var nums = 2;
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/PM_WorkTaskBill/BeginPM_WorkTaskBill", //方法所在页面和方法名
                            data: { "HInterID": InterID, "Type": nums, "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);
                                        //修改为功后刷新界面
                                        $("#btnSearch").trigger('click');
                                    });

                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                            }
                        });
                    }
                }
            }

            //#region ç¼–辑 é¡µé¢èµ‹å€¼
            function RoadBillMain(linterid)//加载表头
@@ -1280,6 +1323,49 @@
            }
            //#endregion

            //#region æŸ¥è¯¢  æˆ‘的任务下推查询数据
            function get_Display() {
                var ajaxLoad = layer.load();

                $.ajax({
                    url: GetWEBURL() + '/PM_WorkTaskBill/XTList',
                    type: "GET",
                    async: false,
                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            var rowdata = [];
                            for (var i = 0; i < data1.data.length; i++) {
                                rowdata.push(
                                    {
                                        "HName": data1.data[i].任务名称
                                        , "HTaskNote": data1.data[i].任务描述
                                        , "HType": data1.data[i].任务类型
                                        , "HProjectID": data1.data[i].HProjectID
                                        , "HProNumber": data1.data[i].项目代码
                                        , "HProjectStageID": data1.data[i].HProjectStageID
                                        , "HProjectStageName": data1.data[i].项目阶段
                                        , "HSourceInterID": data1.data[i].HInterID
                                        , "HSourceEntryID": data1.data[i].HEntryID
                                        , "HSourceBillNo": data1.data[i].单据号
                                        , "HSourceBillType": data1.data[i].单据类型
                                        , "HRelTimes": data1.data[i].已耗用工时
                                    });
                            }
                            option.data = rowdata;
                            table.render(option);
                            CheckedSet_tableSub();
                            form.render('select');
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });

            }
            //#endregion

            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";

 WebTM/views/ÏîÄ¿¹ÜÀí/±¨±í·ÖÎö/PM_ProjectBillMainMy.html

@@ -485,6 +485,7 @@
            //#endregion



            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";