MES-WEB-LayUI.git

			@@ -394,6 +394,7 @@
			, "HPMTimes": result.data[i].HPMTimes
			, "HAMTimes": result.data[i].HAMTimes
			, 'HBaseTimes': result.data[i].HBaseTimes
			, 'HBaseTimes_Sec': result.data[i].HBaseTimes_Sec
			, 'HBaseDays': result.data[i].HBaseDays
			, 'HOverTimes': result.data[i].HOverTimes
			, 'HOverDays': result.data[i].HOverDays
			@@ -477,6 +478,7 @@
			, "HPMTimes": result.data[i].HPMTimes
			, "HAMTimes": result.data[i].HAMTimes
			, 'HBaseTimes': result.data[i].HBaseTimes
			, 'HBaseTimes_Sec': result.data[i].HBaseTimes_Sec
			, 'HBaseDays': result.data[i].HBaseDays
			, 'HOverTimes': result.data[i].HOverTimes
			, 'HOverDays': result.data[i].HOverDays
			@@ -534,7 +536,7 @@
			, toolbar: '#toolbarDemo'
			, totalRow: true
			, limit: 500
			, height: 500
			, height: 'full-250'
			, loading: false
			, cols: [[
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			@@ -546,6 +548,7 @@
			, { field: 'HAMTimes', title: 'ä¸åå·¥æ¶', width: 100, edit: 'text', totalRow: true }
			, { field: 'HPMTimes', title: 'ä¸åå·¥æ¶', width: 100, edit: 'text', totalRow: true }
			, { field: 'HBaseTimes', title: 'åºæ¬å·¥æ¶', width: 100, edit: 'text', totalRow: true, event: "HBaseTimes" }
			, { field: 'HBaseTimes_Sec', title: 'è®¡æ¶å·¥æ¶', width: 100, edit: 'text', totalRow: true, event: "HBaseTimes_Sec" }
			, { field: 'HBaseDays', title: 'åºæ¬å¤©æ°', width: 100, edit: 'text', totalRow: true }
			, { field: 'HOverTimes', title: 'å çå·¥æ¶', width: 100, edit: 'text', totalRow: true }
			, { field: 'HOverDays', title: 'å çå¤©æ°', width: 100, edit: 'text', totalRow: true }
			@@ -571,8 +574,8 @@
			, { 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: 'HMoney', title: 'å·¥èµ', width: 100, edit: 'text', totalRow: true }
			, { 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 }
			]]
			@@ -586,6 +589,7 @@
			, "HPMTimes": "0"
			, "HAMTimes": "0"
			, "HBaseTimes": "0"
			, "HBaseTimes_Sec": "0"
			, "HBaseDays": "0"
			, "HOverTimes": "0"
			, "HOverDays": "0"
			@@ -701,6 +705,7 @@
			layer.confirm('åè¡¨ä¸å·²ç»åå¨èå,æ¯å¦è¦è¦çï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			set_InitGrid(); //åå§ååè¡¨
			GetEmployee(); //æ ¹æ®çç»è¿åèåä¿¡æ¯
			DisPlay_HideColumn();//åè®¾ç½®
			layer.close(index); //å³éå¼¹çª å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			});
			}
			@@ -735,6 +740,7 @@
			, "HPMTimes": "0"
			, "HAMTimes": "0"
			, "HBaseTimes": "0"
			, "HBaseTimes_Sec": "0"
			, "HBaseDays": "0"
			, "HOverTimes": "0"
			, "HOverDays": "0"
			@@ -799,6 +805,7 @@
			, "HPMTimes": "0"
			, "HAMTimes": "0"
			, "HBaseTimes": "0"
			, "HBaseTimes_Sec": "0"
			, "HBaseDays": "0"
			, "HOverTimes": "0"
			, "HOverDays": "0"
			@@ -1038,6 +1045,10 @@
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			@@ -1281,12 +1292,14 @@
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			console.log(obj.data["HBaseTimes"]);
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HWorkTypeID": OptionData.HItemID
			, "HWorkTypeNumber": OptionData.å·¥ç§ä»£ç
			, "HWorkTypeName": OptionData.å·¥ç§åç§°
			, "HPayMoney": OptionData.å°æ¶å·¥èµ
			, "HMoney": (obj.data["HBaseTimes"] == "" ? 0 : (obj.data["HBaseTimes"]) * OptionData.å°æ¶å·¥èµ).toFixed(4)
			})
			}
			})
			@@ -1367,6 +1380,37 @@
			option.data[i].HAMTimes = HAMTimes;
			option.data[i].HPMTimes = HPMTimes;
			option.data[i].HMoney = HMoney;
			}
			table.render(option);
			//å·æ°è®¾ç½®å¤éæ¡ç¶æ
			CheckedSet_tableSub();
			}

			//è®¡æ¶å·¥æ¶
			if (obj.event == "HBaseTimes_Sec") {
			var oldText = table.cache["mainTable"][rowIndex].HBaseTimes_Sec;
			var value = e.target.value; //å¾å°ä¿®æ¹åçå¼

			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			if (!ref.test(temp) \|\| temp == 0) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			option.data[rowIndex].HBaseTimes_Sec = oldText;
			table.render(option);
			//å·æ°è®¾ç½®å¤éæ¡ç¶æ
			CheckedSet_tableSub();

			layer.msg("æè¾å¥å¼å¿é¡»ä¸ºå¤§äº0çæ°å!");
			return;
			}


			for (var i = rowIndex * 1; i < option.data.length; i++) {
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HBaseTimes_Sec = isNaN(value) ? 0 : value * 1; //è®¡æ¶å·¥æ¶

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			option.data[i].HBaseTimes_Sec = HBaseTimes_Sec;
			}
			table.render(option);
			//å·æ°è®¾ç½®å¤éæ¡ç¶æ
			@@ -1483,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