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

chenhaozhe

2025-09-24 17993abe49cebdb93cec2cf9fda3ff7711c3ddca

 WebTM/views/¹¤×ʹÜÀí/¿¼Çڻ㱨µ¥/Pay_WorkTimesBillEdit.html

@@ -574,7 +574,7 @@
                        , { field: 'HWorkTypeID', title: 'HWorkTypeID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
                        , { field: 'HWorkTypeNumber', title: '工种代码', width: 100, edit: 'text', event: "HWorkTypeNumber" }         //F7
                        , { field: 'HWorkTypeName', title: '工种名称', width: 100, style: 'background-color:#efefef4d;' }
                        , { field: 'HPayMoney', title: '小时工资', width: 100, edit: 'text' }
                        , { field: 'HPayMoney', title: '小时工资', width: 100 }
                        , { field: 'HMoney', title: '工资', width: 100,totalRow: true }
                        , { field: 'HRemark', title: '备注', width: 100, edit: 'text' }
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 70 }
@@ -705,6 +705,7 @@
                            layer.confirm('列表中已经存在职员,是否要覆盖？', { icon: 3, title: '提示' }, function (index) {
                                set_InitGrid();     //初始化子表
                                GetEmployee();      //根据班组返回职员信息
                                DisPlay_HideColumn();//列设置
                                layer.close(index); //关闭弹窗  å®ƒèŽ·å–的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                            });
                        }
@@ -1298,7 +1299,7 @@
                                        , "HWorkTypeNumber": OptionData.工种代码
                                        , "HWorkTypeName": OptionData.工种名称
                                        , "HPayMoney": OptionData.小时工资
                                        , "HMoney": (obj.data["HBaseTimes"] == "" ? 0 : obj.data["HBaseTimes"])* OptionData.小时工资
                                        , "HMoney": (obj.data["HBaseTimes"] == "" ? 0 : (obj.data["HBaseTimes"]) * OptionData.小时工资).toFixed(4)
                                    })
                                }
                            })
@@ -1526,8 +1527,8 @@
                        var HAMTimes = HBaseTimes / 2;                                      //上午工时
                        var HPMTimes = HBaseTimes / 2;                                      //下午工时
                        var HPayMoney = isNaN(obj.data.HPayMoney) ? 0 : obj.data.HPayMoney; //小时工资
                        var HMoney = HPayMoney * HBaseTimes;                                //工资=小时工资*基本工时

                        var HMoney = (HPayMoney * HBaseTimes).toFixed(4);                                //工资=小时工资*基本工时
                        debugger
                        //同步更新表格和缓存对应的值
                        obj.update({
                            HBaseTimes: HBaseTimes