MES-WEB-LayUI.git

			@@ -454,6 +454,8 @@
			, "HTypeSub": ""
			, "HMoney": "0"
			, "HTaxRate": "0"
			, "HQty": "0"
			, "HPrice": "0"
			, "HSumMoney": "0"
			};
			switch (obj.event) {
			@@ -517,116 +519,94 @@


			switch (field) {
			case "HMoney": //ä¸å«ç¨éé¢
			case "HQty": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			if (!ref.test(temp) \|\| temp == 0) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HMoney: oldText
			HQty: oldText
			});
			table.render(option);

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


			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HMoney = value * 1; //ä¸å«ç¨éé¢
			var HQty = value * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HTaxRate = obj.data.HTaxRate * 1; //ç¨ç
			var HSumMoney = HMoney * (1 + (HTaxRate * 0.01)); //æ»éé¢=ä¸å«ç¨éé¢(1+(ç¨ç0.01))
			var HSumMoney = HQty * HPrice * (1 + (HTaxRate * 0.01)); //æ»éé¢=æ°éåä»·(1+(ç¨ç*0.01))

			var HMoney = HQty * HPrice; //ä¸å«ç¨éé¢=æ°é*åæ®

			//è®¾ç½®æ°æ®å°æ°ä½æ°
			HMoney = dealDoubleToFixed(HMoney, 2);

			HQty = dealDoubleToFixed(HQty, 2);;
			HTaxRate = HTaxRate;
			HPrice = dealDoubleToFixed(HPrice, 2);;
			HSumMoney = dealDoubleToFixed(HSumMoney, 2);


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

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


			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HTaxRate = value * 1; //ç¨ç
			var HMoney = obj.data.HMoney * 1; //ä¸å«ç¨éé¢
			var HSumMoney = HMoney * (1 + (HTaxRate * 0.01)); //æ»éé¢=ä¸å«ç¨éé¢(1+(ç¨ç0.01))
			var HPrice = value * 1; //åä»·
			var HQty = obj.data.HQty * 1; //æ°é
			var HTaxRate = obj.data.HTaxRate * 1; //ç¨ç
			var HSumMoney = HPrice * HQty * (1 + (HTaxRate * 0.01)); //æ»éé¢=åä»·æ°é(1+(ç¨ç*0.01))

			var HMoney = HQty * HPrice; //ä¸å«ç¨éé¢=æ°é*åæ®

			//è®¾ç½®æ°æ®å°æ°ä½æ°
			HMoney = dealDoubleToFixed(HMoney, 2);

			HQty = dealDoubleToFixed(HQty, 2);;
			HTaxRate = HTaxRate;
			HPrice = dealDoubleToFixed(HPrice, 2);;
			HSumMoney = dealDoubleToFixed(HSumMoney, 2);



			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HMoney: HMoney
			HQty: HQty
			, HPrice: HPrice
			, HMoney: HMoney
			, HTaxRate: HTaxRate
			, HSumMoney: HSumMoney
			});
			break;
			case "HSumMoney": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			if (!ref.test(temp)) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HSumMoney: oldText
			});
			layer.msg("ç¨çè¯·è¾å¥ä¸å°äº0çæ°å!");
			return;
			}


			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HSumMoney = value * 1; //æ»éé¢

			var HTaxRate = obj.data.HTaxRate * 1; //ç¨ç
			var HMoney = HSumMoney / (1 + (HTaxRate * 0.01));




			//è®¾ç½®æ°æ®å°æ°ä½æ°
			HMoney = dealDoubleToFixed(HMoney, 2);

			HTaxRate = HTaxRate;
			HSumMoney = dealDoubleToFixed(HSumMoney, 2);

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HMoney: HMoney
			, HTaxRate: HTaxRate
			, HSumMoney: HSumMoney
			});
			default:
			}
			});
			//#endregion

			//#region è¡¨æ ¼è¡éæ©å¤çï¼æ¯å¦ååºåï¼
			//#region è¡¨æ ¼è¡éæ©å¤ç
			form.on('select(HTypeSub)', function (data) {
			//è·åä¸ææ¡éä¸çå¼
			var elem = data.othis.parents('tr');
			@@ -885,7 +865,9 @@
			, { field: 'HTypeSub', title: 'åç¥¨ç±»å', hide: true, templet: '#HTypeSub' }
			, { field: 'HMoney', title: 'ä¸å«ç¨éé¢', hide: true, edit: 'text', style: 'background-color: #f9f9f9;' }
			, { field: 'HTaxRate', title: 'ç¨ç', hide: true, edit: 'text', style: 'background-color: #f9f9f9;' }
			, { field: 'HSumMoney', title: 'æ»éé¢', edit: 'text', style: 'background-color: #f9f9f9;' }
			, { field: 'HQty', title: 'æ°é', edit: 'text', style: 'background-color: #f9f9f9;' }
			, { field: 'HPrice', title: 'åä»·', edit: 'text', style: 'background-color: #f9f9f9;' }
			, { field: 'HSumMoney', title: 'æ»éé¢', style: 'background-color: #f9f9f9;' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			]]
			}
			@@ -897,6 +879,8 @@
			, "HTypeSub": ""
			, "HMoney": "0"
			, "HTaxRate": "0"
			, "HQty": "0"
			, "HPrice": "0"
			, "HSumMoney": "0"
			}
			];
			@@ -973,19 +957,19 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'éå®é¨é¨åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			//, btn: ['ç¡®å®', 'åæ¶']
			//, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			// var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			// var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			// if (checkStatus.data.length === 0) {
			// return layer.msg('è¯·éæ©æ°æ®');
			// }
			// $("#HDeptName").val(checkStatus.data[0].HName);
			// $("#HDeptID").val(checkStatus.data[0].HItemID);
			// layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			//}
			//, btn2: function (index, layero) { }
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);
			$("#HDeptID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			}
			//#endregion
			@@ -998,19 +982,19 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'éå®ååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HEmp', 'yes']
			//, btn: ['ç¡®å®', 'åæ¶']
			//, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			// var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			// var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			// if (checkStatus.data.length === 0) {
			// return layer.msg('è¯·éæ©æ°æ®');
			// }
			// $("#HEmpName").val(checkStatus.data[0].HName);
			// $("#HEmpID").val(checkStatus.data[0].HItemID);
			// layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			//}
			//, btn2: function (index, layero) { }
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HEmpName").val(checkStatus.data[0].èååç§°);
			$("#HEmpID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			}
			//#endregion
			@@ -1049,7 +1033,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä¸å¡å®¢æ·åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_CustomerList.html', 'yes']
			, content: ['../../åºç¡èµæ/éå®åºç¡èµæ/Gy_Customer.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1058,7 +1042,7 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}

			$("#HCusName").val(checkStatus.data[0].HName);
			$("#HCusName").val(checkStatus.data[0].å®¢æ·åç§°);
			$("#HCusID").val(checkStatus.data[0].HItemID);
			var HCusID = $("#HCusID").val();
			getHTaxRateByCusID(HCusID);//æ ¹æ®å®¢æ·è·åå®¢æ·å¯¹åºç¨ç
			@@ -1116,6 +1100,11 @@

			//#region éç©ºéªè¯
			function AllowLoadData(data) {

			//æ°å¼æ ¼å¼æ ¡éªå·¥å·
			var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			var temp = "";

			//#region è¡¨å¤´æ°æ®æ£éª
			if ($("#HBillNo").val() == "") {
			layer.msg("åæ®å·ä¸è½ä¸ºç©º!");
			@@ -1133,37 +1122,38 @@
			layer.msg("å®¢æ·ä¸è½ä¸ºç©º!");
			return false;
			}
			//if ($("#HProjectMoneyID").val() == "0") {
			// layer.msg("è´¹ç¨é¡¹ç®æªéæ©!");
			// return false;
			//}
			//if ($("#HType").val() == "") {
			// layer.msg("åç¥¨ç±»åæªéæ©!");
			// return false;
			//}

			if ($("#HEmpID").val() == "0") {
			layer.msg("ç»æäººæªéæ©!");
			return false;
			}
			//if ($("#HMoney").val() == "0") {
			// layer.msg("ä¸å«ç¨éé¢ä¸è½ä¸ºé¶");
			// return false;
			//}
			//if ($("#HTaxRate").val() == "") {
			// layer.msg("ç¨çä¸è½ä¸ºç©º");
			// return false;
			//}
			//if ($("#HSumMoney").val() == "0") {
			// layer.msg("æ»éé¢ä¸è½ä¸ºé¶");
			// return false;
			//}
			//#endregion

			//#region åè¡¨æ ¡éª
			for (var i = 0; i < option.data.length; i++) {


			//è´¹ç¨é¡¹ç®æ ¡éª
			if (option.data[i].HProjectMoneyID == "0") {
			layer.msg("ç¬¬" + (i+1) + "è¡ï¼è¯·éæ©è´¹ç¨é¡¹ç®ï¼");
			return false;
			}

			//æ°éæ ¼å¼æ ¡éª
			temp = option.data[i]["HQty"] + "";
			if (temp == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼æ°éä¸è½ä¸º0ï¼");
			return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼æ°éè¯·è¾å¥å¤§äº0çæ°åï¼");
			return false;
			}

			//åä»·æ ¼å¼æ ¡éª
			temp = option.data[i]["HPrice"] + "";
			if (temp == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼åä»·ä¸è½ä¸º0ï¼");
			return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼åä»·è¯·è¾å¥å¤§äº0çæ°åï¼");
			return false;
			}

			@@ -1448,17 +1438,17 @@

			});

			function GetHDeptNameValue(obj) //è¿åé¨é¨
			{
			$("#HDeptName").val(obj[0].HName);
			$("#HDeptID").val(obj[0].HItemID);
			}
			//function GetHDeptNameValue(obj) //è¿åé¨é¨
			//{
			// $("#HDeptName").val(obj[0].HName);
			// $("#HDeptID").val(obj[0].HItemID);
			//}

			function GetHEmpValue(obj) //è¿åç»æäºº
			{
			$("#HEmpName").val(obj[0].HName);
			$("#HEmpID").val(obj[0].HItemID);
			}
			//function GetHEmpValue(obj) //è¿åç»æäºº
			//{
			// $("#HEmpName").val(obj[0].HName);
			// $("#HEmpID").val(obj[0].HItemID);
			//}

			//function GetHSupValue(obj) //è¿åå®¢æ·
			//{

	WebTM/WebTM.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/销售管理/其他应收单/YS_ReceiveOtherBillMain.html	210 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -267,6 +267,7 @@
			<Content Include="views\WMSæ«ç æ¨¡å\éå®åºåº\Kf_SellOutBill_QiaoYi_PDA.html" />
			<Content Include="views\äººäºç®¡ç\å¼å¸¸åé¦å\OA_ErrMsgBackBillList_PDA.html" />
			<Content Include="views\äººäºç®¡ç\å¼å¸¸åé¦å\OA_ErrMsgBackBill_PDA.html" />
			<Content Include="views\ä»åç®¡ç\åæ¥å¼è°å¥å\Fb_StepFoldinBillEdit.html" />
			<Content Include="views\ä»åç®¡ç\æ¡ç åºå\KF_PonderationBillMain_Temp.html" />
			<Content Include="views\ä»åç®¡ç\æ¡ç æ¥è¡¨\Kf_MaterOutInReport.html" />
			<Content Include="views\ä»åç®¡ç\æ¡ç æ¥è¡¨\Kf_ICInventory_Mater.html" />