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

yangle

2023-09-04 3c39d419f2bb7b3c9912a211a07c1365a88eb1c8

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

@@ -296,17 +296,15 @@
            //DisPlay_HideColumn();
            //#endregion

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

            //#region åˆ¤æ–­å¹¶è®¾ç½®æ“ä½œç±»åž‹ã€é¡µé¢åˆå§‹åŒ–
            if (OperationType == null || OperationType == 1) {                            //新增
                //禁用组织选项
                $("#HOrgID").attr("disabled", true);
                ////禁用组织选项
                //$("#HOrgID").attr("disabled", true);
                OperationType = 1;
                //生成并设置主表的内码和单据号
                createBillNo();
                //汇报人初始化
                getHEmpByHUserName();

                //初始化制单人和制单时间
                $("#HMaker").val(sessionStorage["HUserName"]);
@@ -334,14 +332,14 @@
            //    });
            //}
            else if (OperationType == 3) {//如果修改则走下面 new                                        //编辑
                //禁用组织选项
                $("#HOrgID").attr("disabled", true);
                ////禁用组织选项
                //$("#HOrgID").attr("disabled", true);
                //初始化项目阶段表
                get_InitGrid();
                RoadBillMain(linterid);
            } else if (OperationType == 4 && HProjectStageID != null) {
                //禁用组织选项
                $("#HOrgID").attr("disabled", true);
            } else if (OperationType == 4 && HProjectStageID != null) {                     //下推
                ////禁用组织选项
                //$("#HOrgID").attr("disabled", true);
                //生成并设置主表的内码和单据号
                createBillNo();
                //初始化制单人和制单时间
@@ -354,6 +352,10 @@
                //下推-页面设置
                set_WorkTaskReport();
            }
            //#endregion

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

            //#region åˆå§‹åŒ–表格
@@ -638,13 +640,14 @@

            //#region æ±‡æŠ¥äººé€‰æ‹©é¡µé¢
            function get_checkSearchHReportEmp() {
                var HOrgID = $("#HOrgID").val();
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '员工表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_EmployeeList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -654,9 +657,9 @@
                        }
                        //获取数据
                        $("#HReportEmpID").val(checkStatus.data[0].HItemID);//客户id
                        $("#HReportEmpName").val(checkStatus.data[0].HName);//客户名称
                        $("#HReportEmpName").val(checkStatus.data[0].职员名称);//客户名称
                        if ($("#HReportEmpName").val() == "") {
                            $("#HReportEmpName").val(checkStatus.data[0].HNumber);
                            $("#HReportEmpName").val(checkStatus.data[0].职员代码);
                        }
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
@@ -1099,6 +1102,7 @@
                            })
                        }
                        if (obj.event == "HName") {
                            var HOrgID = $("#HOrgID").val();
                            //工作任务代码
                            //打开工作任务小窗体
                            layer.open({
@@ -1109,7 +1113,7 @@
                                , shift: 2                                          //弹出动画
                                , area: ["90%", "90%"]                              //窗体大小
                                , maxmin: true                                      //设置最大最小按钮是否显示
                                , content: ["../../项目管理/工作任务/PM_WorkTaskBillList.html", "yes"]
                                , content: ['../../项目管理/工作任务/PM_WorkTaskBillList.html?openType=2&HOrgID=' + HOrgID, "yes"]
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -1263,6 +1267,33 @@
            }
            //#endregion

            //#region æ ¹æ®ç™»å½•è´¦æˆ·èŽ·å–相应职员
            function getHEmpByHUserName() {
                var Czybm = sessionStorage["Czybm"];

                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/PM_WorkTaskReportBill/getHEmpByHUserName',
                    type: "GET",
                    data: { "Czybm": Czybm, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            var HReportEmpID = result.data[0]["HEmpID"];
                            var HReportEmpName = result.data[0]["HEmpName"];
                            $("#HReportEmpID").val(HReportEmpID);
                            $("#HReportEmpName").val(HReportEmpName);
                            layer.close(wait);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                            layer.close(wait);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                        layer.close(wait);
                    }
                });
            }
            //#endregion
            //#endregion