1

duhe

2023-07-10 190d8a5621ed23969515a303c7691c8be6d32ef1

1

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

@@ -4266,7 +4266,7 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/项目管理/业绩指标/PM_YearEmployeeMoneyBill.html">
      <publishTime>07/10/2023 09:38:43</publishTime>
      <publishTime>07/10/2023 18:52:03</publishTime>
    </File>
    <File Include="views/项目管理/业绩指标/PM_YearEmployeeMoneyBillList.html">
      <publishTime>07/10/2023 09:34:06</publishTime>
@@ -4284,7 +4284,7 @@
      <publishTime>07/10/2023 16:01:26</publishTime>
    </File>
    <File Include="views/项目管理/工程项目/PM_ProjectBill.html">
      <publishTime>07/10/2023 15:32:04</publishTime>
      <publishTime>07/10/2023 19:38:50</publishTime>
    </File>
    <File Include="views/项目管理/工程项目/PM_ProjectBillList.html">
      <publishTime>07/09/2023 13:47:48</publishTime>

 WebTM/views/ÏîÄ¿¹ÜÀí/Òµ¼¨Ö¸±ê/PM_YearEmployeeMoneyBill.html

@@ -171,7 +171,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">修改人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HUpDater" id="hupdater" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HUpdater" id="HUpdater" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -192,7 +192,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">修改日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HUpDaterDate" id="hupdatedate" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HUpdaterDate" id="HUpdaterDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -276,6 +276,8 @@

            //模块名
            var HModName = "PM_YearEmployeeMoneyBill";
            //记录组织的值
            var HOrgIDBar = 0;
            //获取参数
            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑
@@ -435,7 +437,10 @@
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HOrgID").append(Organization);
                            $("#HOrgID").val(sessionStorage["OrganizationID"])
                            if (OperationType == 1) {
                                HOrgIDBar = sessionStorage["OrganizationID"];
                            }
                            $("#HOrgID").val(HOrgIDBar);
                            form.render('select');
                        }
                        layer.closeAll("loading");
@@ -506,6 +511,13 @@
            function set_AddNew(data) {
                //获取组织数据
                data.field.HPRDORGID = sessionStorage["OrganizationID"];//组织
                //若为编辑-保存，则更新修改人和修改时间
                if (OperationType == 3) {
                    data.field.HUpdater = sessionStorage["HUserName"];
                    data.field.HUpdaterDate = Format(new Date(), "yyyy-MM-dd");
                    $("#HUpdater").val(sessionStorage["HUserName"]);
                    $("#HUpdaterDate").val(Format(new Date(), "yyyy-MM-dd"));
                }
                //获取表头数据并序列化
                var sMainStr = JSON.stringify(data.field);              //主表数据

@@ -578,6 +590,9 @@
                            , "HBackerDate": tableMain[0]["HBackerDate"] == null ? "" : Format(new Date(tableMain[0]["HBackerDate"]), "yyyy-MM-dd")
                            , "HBackRemark": tableMain[0]["HBackRemark"]
                        });

                        //组织的值HOrgID变化，重新渲染
                        HOrgIDBar = tableMain[0]["HOrgID"];
                    }
                })
            }

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

@@ -399,7 +399,18 @@
        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del1">删除</a>
    </script>

    <!--里程碑-->
    <script type="text/html" id="HIsKey">
        <div class="layui-input-block" style="margin-left: 20px;">
            <input type="checkbox" name="HIsKey" lay-filter="HIsKey" id="HIsKey{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
        </div>
    </script>
    <!--项目经理-->
    <script type="text/html" id="HIsPM">
        <div class="layui-input-block" style="margin-left: 20px;">
            <input type="checkbox" name="HIsPM" lay-filter="HIsPM" id="HIsPM{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
        </div>
    </script>
    <script>

        layui.config({
@@ -420,6 +431,8 @@
            //表格渲染参数
            var option = {};            //项目阶段表渲染参数
            var option1 = {};           //项目成员表渲染参数
            //记录组织的值
            var HOrgIDBar = 0;
            //获取参数
            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑
@@ -533,6 +546,32 @@

            //#endregion

            //#region å¤é€‰æ¡† é€‰ä¸­/取消 è§¦å‘事件
            //#region é‡Œç¨‹ç¢‘
            form.on('checkbox(HIsKey)', function (data) {
                //获取下拉框选中的值
                var elem = data.othis.parents('tr');
                var dataindex = elem.attr("data-index");
                $.each(option.data, function (index, value) {
                    if (value.LAY_TABLE_INDEX == dataindex) {
                        value.HIsKey = data.elem.checked;//把选中下拉框id值赋值给表格缓存
                    }
                });
            });
            //#endregion

            //#region é¡¹ç›®ç»ç†
            form.on('checkbox(HIsPM)', function (data) {
                var elem = data.othis.parents('tr');
                var dataindex = elem.attr("data-index");
                $.each(option1.data, function (index, value) {
                    if (value.LAY_TABLE_INDEX == dataindex) {
                        value.HIsPM = data.elem.checked;//把选中下拉框id值赋值给表格缓存
                    }
                });
            });
            //#endregion
            //#endregion

            //#region æ“ä½œæŒ‰é’®è§¦å‘事件
            //#region ä¿å­˜æäº¤
@@ -594,7 +633,7 @@
                    , 'HStageNote': ''
                    , 'HPMGoodsID': '0'
                    , 'HPMGoodsName': ''
                    , 'HIsKey': '0'
                    , 'HIsKey': false
                    , 'HRate': '0'
                    , 'HEmpID': '0'
                    , 'HEmpName': ''
@@ -653,7 +692,7 @@
                    "RowID": (table.cache["mainTable1"].length + 1) * 10
                    , 'HEmployeeID': '0'
                    , 'HEmployeeName': ''
                    , 'HIsPM': '0'
                    , 'HIsPM': false
                    , 'HRate': '0'
                    , 'HPlanAvgMoney': '0'
                    , 'HPlanCountMoney': '0'
@@ -747,7 +786,7 @@
            })
            //#endregion

            

            //
            form.on('submit(Cancel)', function () {
                //sessionStorage["SourceFlag"] = false;
@@ -791,7 +830,10 @@
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HOrgID").append(Organization);
                            $("#HOrgID").val(sessionStorage["OrganizationID"])
                            if (OperationType == 1) {
                                HOrgIDBar = sessionStorage["OrganizationID"];
                            }
                            $("#HOrgID").val(HOrgIDBar);
                            form.render('select');
                        }
                        layer.closeAll("loading");
@@ -845,10 +887,10 @@
                        , { field: 'RowID', title: '行号', hide: true }                                                   //行标识，用于下一行、上一行识别所在行
                        , { field: 'HProjectStageID', title: '项目阶段ID', hide: true }
                        , { field: 'HProjectStageName', title: '项目阶段', edit: 'text', event: "HProjectStageName" }     //f7
                        , { field: 'HStageNote', title: '项目详细内容', edit: 'text' }
                        , { field: 'HStageNote', title: '项目详细内容' }
                        , { field: 'HPMGoodsID', title: '相关交付物ID', hide: true }
                        , { field: 'HPMGoodsName', title: '相关交付物', edit: 'text', event: "HPMGoodsName" }            //f7
                        , { field: 'HIsKey', title: '里程碑', edit: 'text' }
                        , { field: 'HIsKey', title: '里程碑', templet: "#HIsKey" }
                        , { field: 'HRate', title: '业绩占比', edit: 'text' }
                        , { field: 'HEmpID', title: '阶段负责人ID', hide: true }
                        , { field: 'HEmpName', title: '阶段负责人', edit: 'text', event: "HEmpName" }                    //f7
@@ -869,7 +911,7 @@
                        , 'HStageNote': ''
                        , 'HPMGoodsID': '0'
                        , 'HPMGoodsName': ''
                        , 'HIsKey': '0'
                        , 'HIsKey': false
                        , 'HRate': '0'
                        , 'HEmpID': '0'
                        , 'HEmpName': ''
@@ -898,7 +940,7 @@
                        , { field: 'RowID', title: '行号', hide: true }                                                   //行标识，用于下一行、上一行识别所在行
                        , { field: 'HEmployeeID', title: '项目成员ID', hide: true }
                        , { field: 'HEmployeeName', title: '项目成员', edit: 'text', event: "HEmployeeName" }     //f7
                        , { field: 'HIsPM', title: '是否项目经理', edit: 'text' }
                        , { field: 'HIsPM', title: '是否项目经理', templet: "#HIsPM" }
                        , { field: 'HRate', title: '项目占比', edit: 'text' }
                        , { field: 'HPlanAvgMoney', title: '预计分配业绩', edit: 'text' }
                        , { field: 'HPlanCountMoney', title: '预计提成', edit: 'text' }
@@ -911,7 +953,7 @@
                        "RowID": 10
                        , 'HEmployeeID': '0'
                        , 'HEmployeeName': ''
                        , 'HIsPM': '0'
                        , 'HIsPM': false
                        , 'HRate': '0'
                        , 'HPlanAvgMoney': '0'
                        , 'HPlanCountMoney': '0'
@@ -1122,7 +1164,7 @@
                //获取表头数据并序列化
                var sMainStr = JSON.stringify(data.field);              //主表数据
                //项目阶段表、项目成员表数据序列化
                var sSubStr = JSON.stringify(num);                      
                var sSubStr = JSON.stringify(num);
                var sSubStr1 = JSON.stringify(num1);

                //拼接序列化的数据
@@ -1213,18 +1255,27 @@
                            , "HDepDays": tableMain[0]["HDepDays"]
                            , "HLastMoney": tableMain[0]["HLastMoney"]
                        });
                        //组织的值HOrgID变化，重新渲染
                        HOrgIDBar = tableMain[0]["HOrgID"];

                        //子表  èµ‹å€¼
                        for (var i = 0; i < tableSub.length; i++) {
                            tableSub[i].HIsKey = (tableSub[i].HIsKey) ? 1 : 0;
                        }
                        for (var i = 0; i < tableSub_Emp.length; i++) {
                            tableSub_Emp[i].HIsPM = (tableSub_Emp[i].HIsPM) ? 1 : 0;
                        }
                        option.data = tableSub;
                        table.render(option);
                        //对子表中的复选框进行选中
                        for (var i = 0; i < tableSub.length; i++) {
                            if (tableSub[i].HIsKey) {
                                $('#HIsKey' + (i + 1)).attr("checked", true);
                            }
                        }
                        form.render('checkbox');
                        option1.data = tableSub_Emp;
                        table.render(option1);
                        //对子表中的项目经理复选框进行选中
                        for (var i = 0; i < tableSub_Emp.length; i++) {
                            if (tableSub_Emp[i].HIsPM) {
                                $('#HIsPM' + (i + 1)).attr("checked", true);
                            }
                        }
                        form.render('checkbox');
                    }
                })
            }
@@ -1663,6 +1714,7 @@
                                    obj.update({
                                        "HProjectStageID": checkStatus.data[0].HItemID
                                        , "HProjectStageName": checkStatus.data[0].HName
                                        , "HStageNote": checkStatus.data[0].HStageNote
                                    })
                                    layer.close(index);//关闭弹窗
                                }
@@ -1775,7 +1827,7 @@
                                }
                            })
                        }
                        


                        obj.event = "";
                        return false;