工程项目 任务安装费，附属费，考核费，工费 增加双加返回，项目费用增加双击返回

zrg

2025-04-08 558e737c771dc112bf05dc86d008be78d4cadc28

工程项目  任务安装费，附属费，考核费，工费 增加双加返回，项目费用增加双击返回

 WebTM/Properties/PublishProfiles/LAYUI.pubxml.user

Diff too large

 WebTM/WebTM.csproj

@@ -415,6 +415,9 @@
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CheckNoteItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_EnvironmentTestItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PiPe.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PiPeMaterial.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ProjectMoneyClass.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_TechnologyParameterType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_MaintainLev.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_CheckItem_Excel.html" />
@@ -426,6 +429,9 @@
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QCCheckClass_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QualityStd_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BadPhenomena_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PiPe.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PiPeMaterial.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ProjectMoneyClass.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_SupType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CheckNoteItem_Excel.html" />

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_ProjectMoneyClass.html

@@ -331,19 +331,10 @@
                data.push(obj.data);
                parent.GetProjectMoneyValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                 btnrowDouble(obj);
                parent.layer.close(index);
            });
            //#endregion

        
            function btnrowDouble(obj) {
                var index = parent.layer.getFrameIndex(window.name);
                var data = obj.data;
               //返回方法
                parent.GetProjectMoneyValue(data);
                parent.layer.close(index);
            }

            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
            // åˆå§‹åŒ–界面
            function set_ClearBill() {

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

@@ -122,30 +122,8 @@
                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate"  id="HDate" style="padding-left: 80px;">
                                            </div>
                                        </div>
                                    </div>
                                    </div>                                 
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">开始日期<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">结束日期<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 125px; width: 195px;">
                                                <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">项目经理<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HPMEmpName" name="HPMEmpName" id="HPMEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HPMEmpID" id="HPMEmpID" lay-verify="HPMEmpID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPMEmp" id="btnSearchHPMEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">客户<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
@@ -155,25 +133,7 @@
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">结算方<!--<label style="color:red"> * </label>--></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HPayCusName" name="HPayCusName" id="HPayCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HPayCusID" id="HPayCusID" lay-verify="HPayCusID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPayCus" id="btnSearchHPayCus" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </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;">
                                                <input type="text" class="layui-input" lay-verify="HLastMoney" name="HLastMoney" id="HLastMoney" value="0">
                                            </div>
                                        </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;">
@@ -642,7 +602,47 @@
                                        </div>
                                    </div>
                                    <div class="layui-row">

                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">开始日期<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">结束日期<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 125px; width: 195px;">
                                                <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">项目经理<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HPMEmpName" name="HPMEmpName" id="HPMEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HPMEmpID" id="HPMEmpID" lay-verify="HPMEmpID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPMEmp" id="btnSearchHPMEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">结算方<!--<label style="color:red"> * </label>--></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HPayCusName" name="HPayCusName" id="HPayCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HPayCusID" id="HPayCusID" lay-verify="HPayCusID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPayCus" id="btnSearchHPayCus" 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">
                                            <label class="layui-form-label" style="width: 85px;">结算金额</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HLastMoney" name="HLastMoney" id="HLastMoney" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">建设单位</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
@@ -2461,6 +2461,12 @@
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function () {
                        if (typeof (TaskData.HItemID) != undefined) {
                            getGy_ProjectMoney(1, TaskData.HItemID);
                        }
                        TaskData = [];
                    }
                })
            }
            //#endregion
@@ -2488,6 +2494,12 @@
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function () {
                        if (typeof (TaskData.HItemID) != undefined) {
                            getGy_ProjectMoney(2, TaskData.HItemID);
                        }
                        TaskData = [];
                    }
                })
            }
            //#endregion
@@ -2516,6 +2528,12 @@
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function () {
                        if (typeof (TaskData.HItemID) != undefined) {
                            getGy_ProjectMoney(3, TaskData.HItemID);
                        }
                        TaskData = [];
                    }
                })
            }
            //#endregion
@@ -2544,6 +2562,12 @@
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function () {
                        if (typeof (TaskData.HItemID) != undefined) {                         
                            getGy_ProjectMoney(4, TaskData.HItemID);
                        }
                        TaskData = [];
                    }
                })
            }
            //#endregion
@@ -2583,7 +2607,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '职员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?type=HEmp', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?type=HMaterEmp', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        //按钮【按钮一】的回调
@@ -2687,6 +2711,8 @@
                            $("#HTaskClassID").val(TaskData.HItemID);
                            $("#HTaskClassName").val(TaskData.任务类别名称);
                            $("#HTaskClassNumber").val(TaskData.任务类别代码);
                            //更新项目代码
                            GetHProjectNumber();
                        }
                        TaskData = [];
                    }
@@ -2726,6 +2752,8 @@
                        if (typeof (TaskData.HItemID) != undefined) {
                            $("#HTaskClassEntryID").val(TaskData.HItemID);
                            $("#HTaskClassEntryName").val(TaskData.任务类别名称);
                            //更新项目代码
                            GetHProjectNumber();
                        }
                        TaskData = [];
                    }
@@ -4016,6 +4044,9 @@
                $("#HPayCusName").val(obj[0].客户名称);//客户名称
            }
        }
        function GetProjectMoneyValue(obj) {
            TaskData = obj[0];
        }
        //任务类别
        function GetTaskClassValue(obj) {
            TaskData = obj[0];
@@ -4055,6 +4086,12 @@
        function GetHEmpListValue(obj) {
            $("#HTaskWorkEmp").val(obj.职员名称);
        }

        //受理人
        function GetHMaterEmpValue(obj) {
            $("#HReceEmp").val(obj[0].职员名称);
        }

        //管径
        function GetPiPeValue(obj) {
            $("#HPipeDiameter").val(obj[0].管径名称);//管径名称

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

@@ -718,9 +718,11 @@
                else {
                    HOrgID = $("#HOrgID").val();//组织
                }
                if (HDeptID !=0) {
                    sWhere += " and HDeptID = '" + HDeptID + "'";
                }
                if (HBillSubType == "任务类") {
                    if (HDeptID != 0) {
                        sWhere += " and HDeptID = '" + HDeptID + "'";
                    }
                }                
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }