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

yangle

2023-09-12 3d614a2e23e9fec2054ff73c70bcfcafc07d49fc

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

@@ -341,16 +341,20 @@
                ////禁用组织选项
                //$("#HOrgID").attr("disabled", true);
                //生成并设置主表的内码和单据号
                createBillNo();
                //初始化制单人和制单时间
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化项目阶段表
                get_InitGrid();
                //下推-页面设置
                set_WorkTaskReport();
                //createBillNo();
                ////汇报人初始化
                //getHEmpByHUserName();


                ////初始化制单人和制单时间
                //$("#HMaker").val(sessionStorage["HUserName"]);
                //$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
                ////初始化日期
                //$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                ////初始化项目阶段表
                //get_InitGrid();
                ////下推-页面设置
                //set_WorkTaskReport();
            }
            //#endregion

@@ -429,6 +433,7 @@
                var NewRow =
                {
                    "RowID": (table.cache["mainTable"].length + 1) * 10
                    , "HProjectID": "0"
                    , 'HProNumber': ''
                    , 'HProjectStageID': '0'
                    , 'HProjectStageName': ''
@@ -439,6 +444,10 @@
                    , 'HReportNote': ''
                    , 'HAdv': ''
                    , 'HRemarkSub': ''
                    , "HSourceInterID": "0"
                    , "HSourceEntryID": "0"
                    , "HSourceBillNo": ""
                    , "HSourceBillType": ""
                };
                switch (obj.event) {
                    case 'btn-AddLine':
@@ -604,6 +613,7 @@
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { type: 'numbers', title: '序号', style: 'background-color: #f9f9f9;' }
                        , { field: 'RowID', title: '行号', hide: true, style: 'background-color: #f9f9f9;' }                                                   //行标识，用于下一行、上一行识别所在行
                        , { field: 'HProjectID', title: '项目ID', hide: true, style: 'background-color: #f9f9f9;' }
                        , { field: 'HProNumber', title: '项目代码', style: 'background-color: #f9f9f9;'}
                        , { field: 'HProjectStageID', title: '项目阶段ID', hide: true, style: 'background-color: #f9f9f9;' }
                        , { field: 'HProjectStageName', title: '项目阶段', style: 'background-color: #f9f9f9;' }     //f7
@@ -614,6 +624,10 @@
                        , { field: 'HReportNote', title: '汇报内容', edit: 'text' }
                        , { field: 'HAdv', title: '优化建议', edit: 'text' }
                        , { field: 'HRemarkSub', title: '备注', edit: 'text' }
                        , { field: 'HSourceInterID', title: '源单内码', hide: true, style: 'background-color: #f9f9f9;' }     //f7
                        , { field: 'HSourceEntryID', title: '源单子内码', hide: true, style: 'background-color: #f9f9f9;' }     //f7
                        , { field: 'HSourceBillNo', title: '源单单号', hide: true, style: 'background-color: #f9f9f9;' }     //f7
                        , { field: 'HSourceBillType', title: '源单类型', hide: true, style: 'background-color: #f9f9f9;' }     //f7
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                    ]]
                }
@@ -621,6 +635,7 @@
                var rowdata = [
                    {
                        "RowID": 10
                        , "HProjectID": "0"
                        , 'HProNumber': ''
                        , 'HProjectStageID': '0'
                        , 'HProjectStageName': ''
@@ -631,6 +646,10 @@
                        , 'HReportNote': ''
                        , 'HAdv': ''
                        , 'HRemarkSub': ''
                        , "HSourceInterID": "0"
                        , "HSourceEntryID": "0"
                        , "HSourceBillNo": ""
                        , "HSourceBillType": ""
                    }
                ];
                option.data = rowdata;
@@ -929,6 +948,13 @@
                var num = [];
                for (var i = 0; i < option.data.length; i++) {
                    if (option.data[i] != "") {
                        //项目非空检验
                        if (option.data[i]["HProjectID"] == "0") {
                            layer.msg("第" + (i + 1) + "行:项目不能为空!");
                            return false;
                        }


                        //项目阶段非空检验
                        if (option.data[i]["HProjectStageID"] == "0") {
                            layer.msg("第" + (i + 1) + "行:项目阶段不能为空!");
@@ -960,7 +986,7 @@
                //#region å­è¡¨å…³é”®å­—段重复检验
                var num = [];
                for (var i = 0; i < option.data.length; i++) {
                    temp = option.data[i]["HProNumber"] + "|" + option.data[i]["HProjectStageID"] + "|" + option.data[i]["HName"];
                    temp = option.data[i]["HProjectID"] + "|" + option.data[i]["HProjectStageID"] + "|" + option.data[i]["HName"];
                    if ($.inArray(temp, num) != -1) {
                        layer.msg("第" + (i + 1) + "行：项目代码、项目阶段、任务名称重复，请重新选择！");
                        return false;
@@ -1130,9 +1156,14 @@
                                            "HName": checkStatus.data[0].任务名称
                                            , "HTaskNote": checkStatus.data[0].任务描述
                                            , "HType": checkStatus.data[0].任务类型
                                            , "HProjectID": checkStatus.data[0].HProjectID
                                            , "HProNumber": checkStatus.data[0].项目代码
                                            , "HProjectStageID": checkStatus.data[0].HProjectStageID
                                            , "HProjectStageName": checkStatus.data[0].项目阶段
                                            , "HSourceInterID": checkStatus.data[0].HInterID
                                            , "HSourceEntryID": checkStatus.data[0].HEntryID
                                            , "HSourceBillNo": checkStatus.data[0].单据号
                                            , "HSourceBillType": checkStatus.data[0].单据类型
                                        })
                                    } else {
                                        layer.msg("该任务已关闭，请重新选择!");
@@ -1194,7 +1225,7 @@
                    success: function (data1) {
                        if (data1.data.length != 0) {
                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["行号","项目阶段ID"];//不需要显示的字段 å¯æ‰©å±•
                            var titleData = ["行号","项目阶段ID","源单内码", "源单子内码", "源单单号", "源单类型"];//不需要显示的字段 å¯æ‰©å±•

                            dataCol = data1.data[0].HGridString.split(',');