1

duhe

2023-07-09 cb4717375f0524ff7c28fc73f453e6b53b7f5afb

1

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

@@ -18,10 +18,10 @@
      <publishTime>01/28/2016 14:22:24</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>07/09/2023 11:16:30</publishTime>
      <publishTime>07/09/2023 13:48:31</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>07/09/2023 11:16:30</publishTime>
      <publishTime>07/09/2023 13:48:31</publishTime>
    </File>
    <File Include="HtmlPage1.html">
      <publishTime>04/11/2023 16:34:42</publishTime>
@@ -4272,10 +4272,16 @@
      <publishTime>07/08/2023 23:52:28</publishTime>
    </File>
    <File Include="views/项目管理/工作任务/PM_WorkTaskReportBill.html">
      <publishTime>07/09/2023 13:12:46</publishTime>
      <publishTime>07/09/2023 14:18:56</publishTime>
    </File>
    <File Include="views/项目管理/工作任务/PM_WorkTaskReportBillList.html">
      <publishTime>07/09/2023 11:43:49</publishTime>
    </File>
    <File Include="views/项目管理/工程项目/PM_ProjectBill.html">
      <publishTime>07/09/2023 14:39:58</publishTime>
    </File>
    <File Include="views/项目管理/工程项目/PM_ProjectBillList.html">
      <publishTime>07/09/2023 13:47:48</publishTime>
    </File>
    <File Include="views/项目管理/工程项目/PM_ProjectReportBill.html">
      <publishTime>07/09/2023 00:33:17</publishTime>
@@ -4284,7 +4290,7 @@
      <publishTime>07/08/2023 23:54:41</publishTime>
    </File>
    <File Include="views/项目管理/项目阶段/Add_Edit_Gy_ProjectStage.html">
      <publishTime>07/06/2023 13:26:15</publishTime>
      <publishTime>07/09/2023 14:28:24</publishTime>
    </File>
    <File Include="views/项目管理/项目阶段/Gy_ProjectStage.html">
      <publishTime>07/08/2023 11:32:20</publishTime>
@@ -4292,8 +4298,11 @@
    <File Include="views/项目管理/项目阶段/Gy_ProjectStageList.html">
      <publishTime>07/06/2023 09:17:28</publishTime>
    </File>
    <File Include="views/项目管理/项目阶段/PM_ProjectReportBill.html">
      <publishTime>07/09/2023 13:40:25</publishTime>
    </File>
    <File Include="views/项目管理/项目阶段/PM_ProjectStageBill.html">
      <publishTime>07/09/2023 02:00:24</publishTime>
      <publishTime>07/09/2023 14:38:06</publishTime>
    </File>
    <File Include="views/项目管理/项目阶段/PM_ProjectStageBillList.html">
      <publishTime>07/09/2023 02:05:17</publishTime>

 WebTM/WebTM.csproj

@@ -1252,8 +1252,8 @@
    <Content Include="views\项目管理\工作任务\PM_WorkTaskReportBill.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskBillList.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskBill.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectReportBill.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectReportBillList.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectBill.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectBillList.html" />
    <Content Include="views\项目管理\项目阶段\Add_Edit_Gy_ProjectStage.html" />
    <Content Include="views\项目管理\项目阶段\Gy_ProjectStage.html" />
    <Content Include="views\项目管理\项目阶段\PM_ProjectStageBillList.html" />

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

@@ -827,6 +827,11 @@
                    layer.msg("单据号不能为空!");
                    return false;
                }

                if ($("#HReportEmpName").val() == "") {
                    layer.msg("汇报人未选择!");
                    return false;
                }
                //#endregion

                //#region é¡¹ç›®é˜¶æ®µè¡¨æ•°æ®æ£€éªŒ

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

File was renamed from WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectReportBill.html
@@ -416,7 +416,7 @@
                , element = layui.element;

            //模块名
            var HModName = "Gy_ProjectReportBill";
            var HModName = "Gy_ProjectBill";
            //表格渲染参数
            var option = {};            //项目阶段表渲染参数
            var option1 = {};           //项目成员表渲染参数
@@ -1215,6 +1215,12 @@
                        });

                        //子表  èµ‹å€¼
                        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);
                        option1.data = tableSub_Emp;
@@ -1386,7 +1392,7 @@
                        }

                        //业绩占比格式检验
                        var HRate = option.data[i]["HRate"];
                        var HRate = option.data[i]["HRate"] + "";
                        if (HRate.substring(HRate.length - 1, HRate.length) == ".") {
                            layer.msg("业绩占比末尾不能为.！");
                            return;
@@ -1397,13 +1403,13 @@
                                return;
                            }
                        }
                        //里程碑内容检验
                        if (option.data[i]["HIsKey"] != "1" && option.data[i]["HIsKey"] != "0") {
                            layer.msg("里程碑请输入0或1！");
                        }
                        ////里程碑内容检验
                        //if (option.data[i]["HIsKey"] != "1" && option.data[i]["HIsKey"] != "0") {
                        //    layer.msg("里程碑请输入0或1！");
                        //}

                        //预计人天格式检验
                        var HWorkDays = option.data[i]["HWorkDays"];
                        var HWorkDays = option.data[i]["HWorkDays"] + "";
                        if (HWorkDays.substring(HWorkDays.length - 1, HWorkDays.length) == ".") {
                            layer.msg("预计人天末尾不能为.！");
                            return;
@@ -1449,7 +1455,7 @@
                        }

                        //项目占比格式检验
                        var HRate = option1.data[i]["HRate"];
                        var HRate = option1.data[i]["HRate"] + "";
                        if (HRate.substring(HRate.length - 1, HRate.length) == ".") {
                            layer.msg("第" + (i + 1) + "行：项目占比末尾不能为.！");
                            return;
@@ -1460,13 +1466,13 @@
                                return;
                            }
                        }
                        //是否项目经理检验
                        if (option1.data[i]["HIsPM"] != "1" && option1.data[i]["HIsPM"] != "0") {
                            layer.msg("第" + (i + 1) + "行：是否项目经理请输入0或1！");
                        }
                        ////是否项目经理检验
                        //if (option1.data[i]["HIsPM"] != "1" && option1.data[i]["HIsPM"] != "0") {
                        //    layer.msg("第" + (i + 1) + "行：是否项目经理请输入0或1！");
                        //}

                        //预计分配业绩格式检验
                        var HPlanAvgMoney = option1.data[i]["HPlanAvgMoney"];
                        var HPlanAvgMoney = option1.data[i]["HPlanAvgMoney"] + "";
                        if (HPlanAvgMoney.substring(HPlanAvgMoney.length - 1, HPlanAvgMoney.length) == ".") {
                            layer.msg("第" + (i + 1) + "行：预计分配业绩末尾不能为.！");
                            return;
@@ -1479,7 +1485,7 @@
                        }

                        //预计提成格式检验
                        var HPlanCountMoney = option1.data[i]["HPlanCountMoney"];
                        var HPlanCountMoney = option1.data[i]["HPlanCountMoney"] + "";
                        if (HPlanCountMoney.substring(HPlanCountMoney.length - 1, HPlanCountMoney.length) == ".") {
                            layer.msg("第" + (i + 1) + "行：预计提成末尾不能为.！");
                            return;

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

File was renamed from WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectReportBillList.html
@@ -132,7 +132,7 @@
                , laydate = layui.laydate
            var option = [];
            var sWhere = "";
            var HModName = "PM_ProjectReportBillList";
            var HModName = "PM_ProjectBillList";

            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID","HProcessID_K3","HUSEORGID"];
@@ -416,7 +416,7 @@
                    , area: ['100%', '100%']
                    , title: '工程项目列表-新增'
                    , shift: 0//弹出动画
                    , content: '../../项目管理/工程项目/PM_ProjectReportBill.html?OperationType=1&linterid=0&HSouceBillType='
                    , content: '../../项目管理/工程项目/PM_ProjectBill.html?OperationType=1&linterid=0&HSouceBillType='
                    ,btn: ['确定'],
                    // æŒ‰é’®1 çš„回调
                    btn1: function (index, layero, that) {
@@ -439,7 +439,7 @@
                        , area: ['100%', '100%']
                        , title: '工程项目列表-编辑'
                        , shift: 0//弹出动画
                        , content: '../../项目管理/工程项目/PM_ProjectReportBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , content: '../../项目管理/工程项目/PM_ProjectBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , btn: ['确定'],
                        // æŒ‰é’®1 çš„回调
                        btn1: function (index, layero, that) {

 WebTM/views/ÏîÄ¿¹ÜÀí/ÏîÄ¿½×¶Î/Add_Edit_Gy_ProjectStage.html

@@ -220,7 +220,11 @@

            //退出按钮
            form.on('submit(Cancel)', function () {
                Pub_Close(1);
                if (params[1] != null) {
                    Pub_Close(1);
                } else if (params[1] == null) {
                    Pub_Close(2);
                }
            })
            //保存按钮
            form.on('submit(set_SaveBill)', function (data) {

 WebTM/views/ÏîÄ¿¹ÜÀí/ÏîÄ¿½×¶Î/PM_ProjectStageBill.html

@@ -664,6 +664,9 @@
                        });

                        //子表  èµ‹å€¼
                        for (var i = 0; i < tableSub.length; i++) {
                            tableSub[i].HIsKey = (tableSub[i].HIsKey) ? 1 : 0;
                        }
                        option.data = tableSub;
                        table.render(option);
                    }
@@ -798,7 +801,7 @@
                        }

                        //业绩占比格式检验
                        var HRate = option.data[i]["HRate"];
                        var HRate = option.data[i]["HRate"] + "";
                        if (HRate.substring(HRate.length - 1, HRate.length) == ".") {
                            layer.msg("业绩占比末尾不能为.！");
                            return;