MES-WEB-LayUI.git

			@@ -753,6 +753,7 @@
			});
			}
			////#endregion

			//#region å¼¹çªéæ©æ¹æ³
			//#region éæ©éè´é¨é¨
			function get_checkDept() {
			@@ -1023,6 +1024,7 @@
			var value = obj.value //å¾å°ä¿®æ¹åçå¼
			, data = obj.data //å¾å°æå¨è¡ææé®å¼
			, field = obj.field; //å¾å°åæ®µ
			//#endregion

			switch (field) {
			case "HQty": //æ°é
			@@ -1043,17 +1045,22 @@
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = value * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HMoney = (HPrice * HQty).toFixed(2) //éé¢=æ°é*åä»·


			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty
			, HPrice: HPrice
			, HMoney: HMoney
			, HTaxMoney: HTaxMoney
			, HlineTotal: HlineTotal
			, HlineTotalBB: HlineTotalBB
			});
			/* table.render(option);*/
			break;
			case "HPrice": //åä»·
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -1063,7 +1070,6 @@
			obj.update({
			HPrice: oldText
			});
			/* table.render(option);*/

			layer.msg("åä»·è¯·è¾å¥å¤§äº0çæ°å!");
			return;
			@@ -1072,41 +1078,105 @@
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = value * 1;
			var HMoney = (HPrice * HQty).toFixed(2) //éé¢=æ°é*åä»·

			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HDiscountRate = obj.data.HDiscountRate * 1; //ææ£ç
			var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4)); //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty
			, HPrice: HPrice
			, HMoney: HMoney
			, HTaxMoney: HTaxMoney
			, HlineTotal: HlineTotal
			, HTaxPrice, HTaxPrice
			, HRelTaxPrice: HRelTaxPrice
			, HlineTotalBB: HlineTotalBB
			});
			break;
			case "HMoney": //éé¢
			case "HTaxRate": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			if (!ref.test(temp) \|\| temp == 0) {
			if (!ref.test(temp)) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HMoney: oldText
			HTaxRate: oldText
			});
			/* table.render(option);*/

			layer.msg("éé¢è¯·è¾å¥å¤§äº0çæ°å!");
			layer.msg("ç¨çè¯·è¾å¥ä¸å°äº0çæ°å!");
			return;
			}


			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			var HQty = obj.data.HQty * 1; //æ°é
			var HMoney = value * 1;
			var HPrice = (HMoney / HQty).toFixed(2); //åä»·=éé¢/æ°é
			var HPrice = obj.data.HPrice * 1;
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //ç¨é¢=éé¢*ç¨ç
			var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HDiscountRate = obj.data.HDiscountRate * 1; //ææ£ç
			var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4)); //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HTaxRate: HTaxRate * 100
			, HQty: HQty
			, HPrice: HPrice
			, HMoney: HMoney
			, HTaxMoney: HTaxMoney
			, HTaxPrice: HTaxPrice
			, HlineTotal: HlineTotal
			, HTaxPrice, HTaxPrice
			, HRelTaxPrice: HRelTaxPrice
			, HlineTotalBB: HlineTotalBB
			});
			break;
			case "HDiscountRate": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			if (!ref.test(temp)) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HDiscountRate: oldText
			});

			layer.msg("ææ£çè¯·è¾å¥ä¸å°äº0çæ°å!");
			return;
			}


			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = obj.data.HPrice * 1;
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //ç¨é¢=éé¢*ç¨ç
			var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HDiscountRate = obj.data.HDiscountRate * 1; //ææ£ç
			var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4)); //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç


			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty
			HTaxRate: HTaxRate * 100
			, HQty: HQty
			, HPrice: HPrice
			, HMoney: HMoney
			, HTaxMoney: HTaxMoney
			, HTaxPrice: HTaxPrice
			, HDiscountRate: HDiscountRate
			, HRelTaxPrice: HRelTaxPrice
			});
			break;
			table.render(option);
			@@ -1163,15 +1233,15 @@
			, "HInnerBillNo": data.åé¨åæ®å·

			, "HMaker": data.å¶åäºº
			, "HMakeDate": data.å¶åæ¥æ == null ? "" : Format(new Date(data.å¶åæ¥æ), "yyyy-MM-dd")
			, "HMakeDate": data.å¶åæ¥æ == null ? "" : Format(new Date(data.å¶åæ¥æ), "yyyy-MM-dd HH:mm:ss")
			, "HUpDater": data.ä¿®æ¹äºº
			, "HUpDateDate": data.ä¿®æ¹æ¥æ == null ? "" : Format(new Date(data.ä¿®æ¹æ¥æ), "yyyy-MM-dd")
			, "HUpDateDate": data.ä¿®æ¹æ¥æ == null ? "" : Format(new Date(data.ä¿®æ¹æ¥æ), "yyyy-MM-dd HH:mm:ss")
			, "HChecker": data.å®¡æ ¸äºº
			, "HCheckDate": data.å®¡æ ¸æ¥æ == null ? "" : Format(new Date(data.å®¡æ ¸æ¥æ), "yyyy-MM-dd")
			, "HCheckDate": data.å®¡æ ¸æ¥æ == null ? "" : Format(new Date(data.å®¡æ ¸æ¥æ), "yyyy-MM-dd HH:mm:ss")
			, "HCloseMan": data.å³éäºº
			, "HCloseDate": data.å³éæ¥æ == null ? "" : Format(new Date(data.å³éæ¥æ), "yyyy-MM-dd")
			, "HCloseDate": data.å³éæ¥æ == null ? "" : Format(new Date(data.å³éæ¥æ), "yyyy-MM-dd HH:mm:ss")
			, "HDeleteMan": data.ä½åºäºº
			, "HDeleteDate": data.ä½åºæ¥æ == null ? "" : Format(new Date(data.ä½åºæ¥æ), "yyyy-MM-dd")
			, "HDeleteDate": data.ä½åºæ¥æ == null ? "" : Format(new Date(data.ä½åºæ¥æ), "yyyy-MM-dd HH:mm:ss")
			});

			HOrgIDBar = 0;
			@@ -1231,6 +1301,8 @@
			}
			});
			}


			//#endregion

			//#region ä¸æ¨é¡µé¢åå§å
			@@ -1274,7 +1346,7 @@
			, "HMangerID": dataArray[0].HManagerID
			, "HMangerName": dataArray[0].ä¸»ç®¡
			, "HEmpID": dataArray[0].HEmpID
			, "HEmpName": dataArray[0].ä¸å¡å
			, "HEmpName": dataArray[0].éè´å
			, "HSupID": dataArray[0].HSupID
			, "HSupName": dataArray[0].ä¾åºå
			, "HCurID": dataArray[0].HCurID
			@@ -1300,15 +1372,15 @@
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, 'HDiscountRate': dataArray[i].ææ£ç //
			, 'HRelTaxPrice': dataArray[i].å®éå«ç¨åä»·
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': "0" //
			, 'HTaxMoney': dataArray[i].ç¨é¢ //
			, "HMoney": dealDoubleToFixed(dataArray[i].éé¢, 2)
			, 'HMoneyBB': dealDoubleToFixed(dataArray[i].éé¢ * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(dataArray[i].ä»·ç¨åè®¡, 2)
			, 'HlineTotalBB': dealDoubleToFixed(dataArray[i].ä»·ç¨åè®¡ * dataArray[0].æ±ç, 2)
			, "HRemark": ""
			, "HRemark": dataArray[i].HRemark

			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			@@ -1355,14 +1427,12 @@
			, "HManagerID": dataArray[0].hmanagerid
			, "HMangerName": dataArray[0].ä¸»ç®¡
			, "HEmpID": dataArray[0].HEmpID
			, "HEmpName": dataArray[0].ä¸å¡å
			, "HSupID": dataArray[0].hsupid
			, "HEmpName": dataArray[0].éè´å
			, "HSupID": dataArray[0].HSupID
			, "HSupName": dataArray[0].ä¾åºå
			, "HCurID": dataArray[0].HCurID
			, "HCurName": dataArray[0].å¸å«
			, "HExRate": dataArray[0].æ±ç
			, "HSSID": "0"
			, "HSSName": ""
			, "HPSStyleID": dataArray[0].HPSStyleID
			, "HPSStyleSName": dataArray[0].éè´æ¹å¼
			});
			@@ -1378,18 +1448,18 @@
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].hunitid
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HQty": dealDoubleToFixed(dataArray[i].å®æ¶æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			/, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)/
			, 'HDiscountRate': "0" //
			, "HTaxPrice": dataArray[i].å«ç¨åä»·
			, 'HDiscountRate': dataArray[i].ææ£ç //
			, 'HRelTaxPrice': "0"
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': "0" //
			, "HMoney": dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""
			, "HMoney": dataArray[i].éé¢
			, 'HMoneyBB': dataArray[i].æ¬ä½å¸éé¢
			, 'HlineTotal': dataArray[i].ä»·ç¨åè®¡
			, 'HlineTotalBB': dataArray[i].æ¬ä½å¸ä»·ç¨åè®¡
			, "HRemark":""

			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			@@ -1402,10 +1472,10 @@
			, 'HPOOrderEntryID': "0"
			, 'HPOOrderBillNo': ""

			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
			, "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
			, "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].æºååå· : ""
			//, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}
			@@ -2050,7 +2120,7 @@
			, "HMangerName": dataArray[0].ä¸»ç®¡
			, "HEmpID": dataArray[0].HEmpID
			, "HEmpName": dataArray[0].ä¸å¡å
			, "HSupID": dataArray[0].hsupid
			, "HSupID": dataArray[0].HSupID
			, "HSupName": dataArray[0].ä¾åºå
			, "HCurID": dataArray[0].HCurID
			, "HCurName": dataArray[0].å¸å«