MES-WEB-LayUI.git

parent: 28969145 | 补丁 | 提交 | ignore whitespace

王垚

2022-07-12 295f6bfa5526f20e24f2ad8baf51bcc876bf512a

nothing

3个文件已修改

	WebTM/views/Baseset/基础资料/Gy_EmployeeList.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillEdit_yqn.html	49 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillList_yqn.html	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_EmployeeList.html

@@ -101,6 +101,7 @@
                , { field: 'HItemID', width: 150, title: 'èåID', hide: true }
                , { field: 'HNumber', width: 150, title: 'èåä»£ç ' }
                , { field: 'HName', width: 150, title: 'èååç§°', sort: true }
                , { field: 'HEmpRate', width: 150, title: 'èåç³»æ°', sort: true }
              ]]
              , page: true
            });

 WebTM/views/¹¤×Ê¹ÜÀí/¿¼ÇÚ»ã±¨µ¥/Pay_WorkTimesBillEdit_yqn.html

@@ -412,6 +412,10 @@
                                            HEmpName: checkStatus.data[0].HName
                                            , HEmpID: checkStatus.data[0].HItemID
                                            , HEmpNumber: checkStatus.data[0].HNumber
                                            , HEmpRate: checkStatus.data[0].HEmpRate
                                            , HPMTimes: 0
                                            , HAMTimes: 0
                                            , HMoney: 0
                                        });
                                        layer.close(layer.index);
                                    }
@@ -487,25 +491,59 @@
                    //layer.msg('[ID: ' + data.id + '] ' + field + ' åæ®µæ´æ¹ä¸ºï¼' + value);

                    switch (field) {
                        case "HPMTimes":  //ä¸åå·¥æ¶
                        case "HEmpRate":  //èåç³»æ°
                            value = isNaN(value) ? 0 : value;
                            var HAvgMoney = $("#HAvgMoney").val();//å¹³åå·¥èµ
                            var HEmpRate = value;
                            var HPMTimes = Number(isNaN(data.HPMTimes) ? 0 : data.HPMTimes); //å·¥ä½å·¥æ¶
                            var HAMTimes = Number(isNaN(data.HAMTimes) ? 0 : data.HAMTimes); //æ åå·¥æ¶
                           
                            var HMoney;
                            if (HAMTimes == 0)
                                HMoney = 0;
                            else
                                HMoney = HAvgMoney * HEmpRate * HPMTimes / HAMTimes
                            //åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
                            obj.update({
                                HEmpRate: value,                  //ä¸åå·¥æ¶
                                HMoney: HMoney, //
                            });
                            break;
                        case "HPMTimes":  //å·¥ä½å·¥æ¶
                            value = isNaN(value) ? 0 : value;
                            var HAvgMoney = $("#HAvgMoney").val();//å¹³åå·¥èµ
                            var HEmpRate = Number(isNaN(data.HEmpRate) ? 0 : data.HEmpRate);
                            var HAMTimes = Number(isNaN(data.HAMTimes) ? 0 : data.HAMTimes); //æ åå·¥æ¶
                            var HPMTimes = value;//å¹³åå·¥èµ
                            //åºæ¬å·¥æ¶=ä¸åå·¥æ¶+ä¸åå·¥æ¶
                            var HBaseTimes = Number(isNaN(data.HAMTimes) ? 0 : data.HAMTimes) + Number(value);
                            //å·¥èµ=å°æ¶å·¥èµ*åºæ¬å·¥æ¶
                            var HMoney = Number(isNaN(data.HPayMoney) ? 0 : data.HPayMoney) * HBaseTimes;
                            var HMoney;
                            if (HAMTimes == 0)
                                HMoney = 0;
                            else
                                HMoney = HAvgMoney * HEmpRate * HPMTimes / HAMTimes
                            //åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
                            obj.update({
                                HPMTimes: value,                  //ä¸åå·¥æ¶
                                HBaseTimes: HBaseTimes,           //åºæ¬å·¥æ¶
                                HMoney: HMoney, //å·¥èµ
                                HMoney: HMoney, //
                            });
                            break;
                        case "HAMTimes":  //ä¸åå·¥æ¶
                        case "HAMTimes":  //æ åå·¥æ¶
                            value = isNaN(value) ? 0 : value;
                            var HAvgMoney = $("#HAvgMoney").val();//å¹³åå·¥èµ
                            var HEmpRate = Number(isNaN(data.HEmpRate) ? 0 : data.HEmpRate);
                            var HPMTimes = Number(isNaN(data.HPMTimes) ? 0 : data.HPMTimes); //å·¥ä½å·¥æ¶
                            var HAMTimes = value; //å·¥ä½å·¥æ¶
                            //åºæ¬å·¥æ¶=ä¸åå·¥æ¶+ä¸åå·¥æ¶
                            var HBaseTimes = Number(value) + Number(isNaN(data.HPMTimes) ? 0 : data.HPMTimes);
                            //å·¥èµ=å°æ¶å·¥èµ*åºæ¬å·¥æ¶
                            var HMoney = Number(isNaN(data.HPayMoney) ? 0 : data.HPayMoney) * HBaseTimes;
                            var HMoney;
                            if (value == 0)
                                HMoney = 0;
                            else
                                HMoney = HAvgMoney * HEmpRate * HPMTimes / HAMTimes
                            //åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
                            obj.update({
                                HAMTimes: value,                  //ä¸åå·¥æ¶
@@ -575,6 +613,7 @@
                                    , "HCloseDate": data.å³éæ¥æ
                                    , "HUpDateDate": data.ä¿®æ¹æ¥æ
                                    , "HDeleteDate": data.ä½åºæ¥æ
                                    , "HAvgMoney": data.HAvgMoney
                                });

                            } else {

 WebTM/views/¹¤×Ê¹ÜÀí/¿¼ÇÚ»ã±¨µ¥/Pay_WorkTimesBillList_yqn.html

@@ -149,19 +149,24 @@
                        , { field: 'hmainid', title: 'åæ®ID', hide: true }
                        , { field: 'æ¥æ', title: 'æ¥æ', width: 125, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'åæ®å·', title: 'åæ®å·', width: 195 }
                        , { field: 'HAvgMoney', title: 'å¹³åå·¥èµ', width: 120 }
                        //, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 110 }
                        //, { field: 'HGroupID', title: 'HGroupID', width: 200, hide: true }
                        //, { field: 'çç»ä»£ç ', title: 'çç»ä»£ç ', width: 125 }
                        //, { field: 'çç»', title: 'çç»', width: 125 }
                        //, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                        //, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 180 }
                        //, { field: 'é¨é¨', title: 'é¨é¨', width: 125 }
                        //, { field: 'æè¦', title: 'æè¦', width: 125 }
                        , { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 125 }
                        , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
                        , { field: 'HEmpNumber', title: 'èåä»£ç ', width: 180 }
                        , { field: 'HEmpName', title: 'èå', width: 125 }
                        //, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 110 }
                        , { field: 'HGroupID', title: 'HGroupID', width: 200, hide: true }
                        , { field: 'çç»ä»£ç ', title: 'çç»ä»£ç ', width: 125 }
                        , { field: 'çç»', title: 'çç»', width: 125 }
                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                        , { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 180 }
                        , { field: 'é¨é¨', title: 'é¨é¨', width: 125 }
                        , { field: 'æè¦', title: 'æè¦', width: 125 }
                        , { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 125 }
                        , { field: 'å³èæ°é', title: 'å³èæ°é', width: 125 }
                        , { field: 'èåç³»æ°', title: 'èåç³»æ°',  width: 100 }
                        , { field: 'ä¸å', title: 'å·¥ä½å·¥æ¶',  width: 100 }
                        , { field: 'ä¸å', title: 'æ åå·¥æ¶',  width: 100 }
                        , { field: 'HMoney', title: 'å·¥èµ', width: 100 }
                        //, { field: 'å³èæ°é', title: 'å³èæ°é', width: 125 }
                        , { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 125 }
                        , { field: 'å¶åäºº', title: 'å¶åäºº', width: 125 }
                        , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }

			@@ -101,6 +101,7 @@
			, { field: 'HItemID', width: 150, title: 'èåID', hide: true }
			, { field: 'HNumber', width: 150, title: 'èåä»£ç ' }
			, { field: 'HName', width: 150, title: 'èååç§°', sort: true }
			, { field: 'HEmpRate', width: 150, title: 'èåç³»æ°', sort: true }
			]]
			, page: true
			});

			@@ -412,6 +412,10 @@
			HEmpName: checkStatus.data[0].HName
			, HEmpID: checkStatus.data[0].HItemID
			, HEmpNumber: checkStatus.data[0].HNumber
			, HEmpRate: checkStatus.data[0].HEmpRate
			, HPMTimes: 0
			, HAMTimes: 0
			, HMoney: 0
			});
			layer.close(layer.index);
			}
			@@ -487,25 +491,59 @@
			//layer.msg('[ID: ' + data.id + '] ' + field + ' åæ®µæ´æ¹ä¸ºï¼' + value);

			switch (field) {
			case "HPMTimes": //ä¸åå·¥æ¶
			case "HEmpRate": //èåç³»æ°
			value = isNaN(value) ? 0 : value;
			var HAvgMoney = $("#HAvgMoney").val();//å¹³åå·¥èµ
			var HEmpRate = value;
			var HPMTimes = Number(isNaN(data.HPMTimes) ? 0 : data.HPMTimes); //å·¥ä½å·¥æ¶
			var HAMTimes = Number(isNaN(data.HAMTimes) ? 0 : data.HAMTimes); //æ åå·¥æ¶

			var HMoney;
			if (HAMTimes == 0)
			HMoney = 0;
			else
			HMoney = HAvgMoney * HEmpRate * HPMTimes / HAMTimes
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HEmpRate: value, //ä¸åå·¥æ¶
			HMoney: HMoney, //
			});
			break;
			case "HPMTimes": //å·¥ä½å·¥æ¶
			value = isNaN(value) ? 0 : value;
			var HAvgMoney = $("#HAvgMoney").val();//å¹³åå·¥èµ
			var HEmpRate = Number(isNaN(data.HEmpRate) ? 0 : data.HEmpRate);
			var HAMTimes = Number(isNaN(data.HAMTimes) ? 0 : data.HAMTimes); //æ åå·¥æ¶
			var HPMTimes = value;//å¹³åå·¥èµ
			//åºæ¬å·¥æ¶=ä¸åå·¥æ¶+ä¸åå·¥æ¶
			var HBaseTimes = Number(isNaN(data.HAMTimes) ? 0 : data.HAMTimes) + Number(value);
			//å·¥èµ=å°æ¶å·¥èµ*åºæ¬å·¥æ¶
			var HMoney = Number(isNaN(data.HPayMoney) ? 0 : data.HPayMoney) * HBaseTimes;
			var HMoney;
			if (HAMTimes == 0)
			HMoney = 0;
			else
			HMoney = HAvgMoney * HEmpRate * HPMTimes / HAMTimes
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HPMTimes: value, //ä¸åå·¥æ¶
			HBaseTimes: HBaseTimes, //åºæ¬å·¥æ¶
			HMoney: HMoney, //å·¥èµ
			HMoney: HMoney, //
			});
			break;
			case "HAMTimes": //ä¸åå·¥æ¶
			case "HAMTimes": //æ åå·¥æ¶
			value = isNaN(value) ? 0 : value;
			var HAvgMoney = $("#HAvgMoney").val();//å¹³åå·¥èµ
			var HEmpRate = Number(isNaN(data.HEmpRate) ? 0 : data.HEmpRate);
			var HPMTimes = Number(isNaN(data.HPMTimes) ? 0 : data.HPMTimes); //å·¥ä½å·¥æ¶
			var HAMTimes = value; //å·¥ä½å·¥æ¶
			//åºæ¬å·¥æ¶=ä¸åå·¥æ¶+ä¸åå·¥æ¶
			var HBaseTimes = Number(value) + Number(isNaN(data.HPMTimes) ? 0 : data.HPMTimes);
			//å·¥èµ=å°æ¶å·¥èµ*åºæ¬å·¥æ¶
			var HMoney = Number(isNaN(data.HPayMoney) ? 0 : data.HPayMoney) * HBaseTimes;
			var HMoney;
			if (value == 0)
			HMoney = 0;
			else
			HMoney = HAvgMoney * HEmpRate * HPMTimes / HAMTimes
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HAMTimes: value, //ä¸åå·¥æ¶
			@@ -575,6 +613,7 @@
			, "HCloseDate": data.å³éæ¥æ
			, "HUpDateDate": data.ä¿®æ¹æ¥æ
			, "HDeleteDate": data.ä½åºæ¥æ
			, "HAvgMoney": data.HAvgMoney
			});

			} else {

			@@ -149,19 +149,24 @@
			, { field: 'hmainid', title: 'åæ®ID', hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 125, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 195 }
			, { field: 'HAvgMoney', title: 'å¹³åå·¥èµ', width: 120 }
			//, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 110 }
			//, { field: 'HGroupID', title: 'HGroupID', width: 200, hide: true }
			//, { field: 'çç»ä»£ç ', title: 'çç»ä»£ç ', width: 125 }
			//, { field: 'çç»', title: 'çç»', width: 125 }
			//, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
			//, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 180 }
			//, { field: 'é¨é¨', title: 'é¨é¨', width: 125 }
			//, { field: 'æè¦', title: 'æè¦', width: 125 }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 125 }
			, { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
			, { field: 'HEmpNumber', title: 'èåä»£ç ', width: 180 }
			, { field: 'HEmpName', title: 'èå', width: 125 }
			//, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 110 }
			, { field: 'HGroupID', title: 'HGroupID', width: 200, hide: true }
			, { field: 'çç»ä»£ç ', title: 'çç»ä»£ç ', width: 125 }
			, { field: 'çç»', title: 'çç»', width: 125 }
			, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 180 }
			, { field: 'é¨é¨', title: 'é¨é¨', width: 125 }
			, { field: 'æè¦', title: 'æè¦', width: 125 }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 125 }
			, { field: 'å³èæ°é', title: 'å³èæ°é', width: 125 }
			, { field: 'èåç³»æ°', title: 'èåç³»æ°', width: 100 }
			, { field: 'ä¸å', title: 'å·¥ä½å·¥æ¶', width: 100 }
			, { field: 'ä¸å', title: 'æ åå·¥æ¶', width: 100 }
			, { field: 'HMoney', title: 'å·¥èµ', width: 100 }
			//, { field: 'å³èæ°é', title: 'å³èæ°é', width: 125 }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 125 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 125 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }