MES-WEB-LayUI.git

			@@ -136,6 +136,15 @@
			<input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å®éæ¯ä¾%</label>
			<div class="layui-input-inline">
			<select name="HEarnestRate" id="HEarnestRate" lay-filter="HEarnestRate" style="width: 180px; ">
			<option style="color:blue;" selected="selected" value="50">50%</option>
			<option style="color:blue;" value="100">100%</option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			@@ -427,10 +436,10 @@
			get_LoginIs();

			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "1401";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
			$("h1").html('<b>' + HPageTitle + '</b>');
			//var HModuleType = "1401";
			////éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			//var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
			//$("h1").html('<b>' + HPageTitle + '</b>');
			//#endregion
			//#endregion

			@@ -543,7 +552,7 @@
			});
			//#endregion

			//#region å®¡æ ¸æé®
			//#region åå®¡æ ¸æé®
			form.on('submit(set_AbandonCheck)', function (data) {
			set_CheckBill(1);
			});
			@@ -715,7 +724,7 @@
			setSelectHisStockGoodsByTableRender();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val()*1);
			break;
			case "HPrice": //åä»·
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -770,7 +779,7 @@
			setSelectHisStockGoodsByTableRender();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val() * 1);
			break;
			case "HTaxRate": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -825,7 +834,7 @@
			setSelectHisStockGoodsByTableRender();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val() * 1);
			break;
			case "HTaxPrice": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -880,7 +889,7 @@
			setSelectHisStockGoodsByTableRender();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val() * 1);
			break;
			default:
			}
			@@ -899,17 +908,25 @@

			//#region å¯ç¨ä½é¢æç¤ºä¿¡æ¯
			$("#tips-HAvailableBalance").on('click', function (data) {
			var tips_Message = "å¯ç¨é¢åº¦ = å®¢æ·ä½é¢ + ä¿¡ç¨é¢åº¦ - ï¼æ¬æéå®è®¢åæ»éé¢ * 0.5ï¼";
			var tips_Message = "å¯ç¨é¢åº¦ = å®¢æ·ä½é¢ + ä¿¡ç¨é¢åº¦ - ï¼æ¬æéå®è®¢åæ»éé¢ * å®éæ¯ä¾%ï¼";
			layer.alert(tips_Message, { icon: 0, btn: ['éåº'], time: 100000, offset: 't' });
			});
			//#endregion

			//#region éæ±éé¢
			$("#tips-HBillMoney").on('click', function (data) {
			var tips_Message = "éæ±éé¢ = ä»·ç¨åè®¡ * 0.5";
			var tips_Message = "éæ±éé¢ = ä»·ç¨åè®¡ * å®éæ¯ä¾%";
			layer.alert(tips_Message, { icon: 0, btn: ['éåº'], time: 100000, offset: 't' });
			});
			//#endregion
			});
			//#endregion

			//#region èµ éæ¯ä¾ä¸æåè¡¨çå¬
			form.on('select(HEarnestRate)', function (data) {
			//è¾å¥çéé¢åæ³ï¼éç®ææ£åéé¢
			var HEarnestRate = $("#HEarnestRate").val() * 1; //å®éæ¯ä¾%
			set_HBillMoney(HEarnestRate);
			});
			//#endregion
			//#endregion
			@@ -1036,6 +1053,7 @@
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100, style: 'background-color:#efefef4d;' }
			, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100, style: 'background-color:#efefef4d;' }//f7
			, { field: 'HisStockGoods', title: 'æ¯å¦ååºå', width: 120, templet: '#HisStockGoods' }
			, { field: 'HQty', title: 'æ°é', width: 100, totalRow: true, edit: 'text' }
			, { field: 'HPrice', title: 'åä»·', width: 100, edit: 'text' }
			, { field: 'HTaxRate', title: 'ç¨ç', width: 100, edit: 'text' }
			@@ -1046,7 +1064,6 @@
			, { field: 'HCusModel', title: 'å®¢æ·è§æ ¼åå·', width: 100, edit: 'text' }
			, { field: 'HCusMaterName', title: 'å®¢æ·ç©æåç§°', width: 100, edit: 'text' }
			, { field: 'HDate', title: 'äº¤è´§æ¥æ', event: "HDate", width: 120 }
			, { field: 'HisStockGoods', title: 'æ¯å¦ååºå', width: 120, templet: '#HisStockGoods' }
			, { field: 'HRemark', title: 'å¤æ³¨', width: 100, edit: 'text' }
			, { field: 'HDiscountRate', title: 'ææ£ç', width: 100, edit: 'text', hide: true }
			, { field: 'HRelTaxPrice', title: 'å®éå«ç¨åä»·', width: 110, hide: true }
			@@ -1110,7 +1127,7 @@
			setSelectHisStockGoodsByTableRender();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val() * 1);
			}
			//#endregion

			@@ -1166,6 +1183,7 @@
			, "HCurID": data.HCurID
			, "HCurName": data.å¸å«
			, "HExRate": data.æ±ç
			, "HEarnestRate": data.å®éæ¯ä¾
			, "HManagerID": data.HManagerID
			, "HManagerName": data.ä¸»ç®¡
			, "HSellSID": data.HSellSID
			@@ -1223,7 +1241,7 @@
			"HTaxMoney": result.data[i]["ç¨é¢"],
			"HlineTotal": dealDoubleToFixed(result.data[i]["ä»·ç¨åè®¡"], 2),
			"HlineTotalBB": result.data[i]["æ¬ä½å¸ä»·ç¨åè®¡"],
			"HisStockGoods": result.data[i]["æ¯å¦ååºå"]=="Y"?true:false,
			"HisStockGoods": result.data[i]["æ¯å¦ååºå"]=="Y"?"true":"false",
			"HDate": formatDate(result.data[i]["äº¤è´§æ¥æ"]),
			"HOutStockQty": result.data[i]["åºåºæ°é"],
			"HInvoiceQty": result.data[i]["å¼ç¥¨æ°é"],
			@@ -1246,7 +1264,7 @@
			setSelectHisStockGoodsByTableRender();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val() * 1);
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			@@ -1760,7 +1778,7 @@
			setSelectHisStockGoodsByTableRender();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val() * 1);
			//rows++;
			layer.msg('å¢å ä¸è¡æé®ï¼')
			}
			@@ -1787,7 +1805,7 @@
			setSelectHisStockGoodsByTableRender();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val() * 1);
			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼');
			}
			@@ -1817,7 +1835,7 @@
			setSelectHisStockGoodsByTableRender();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val() * 1);
			}
			}
			//#endregion
			@@ -1847,7 +1865,7 @@
			setSelectHisStockGoodsByTableRender();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val() * 1);
			break;
			}
			}
			@@ -1884,7 +1902,7 @@
			setSelectHisStockGoodsByTableRender();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val() * 1);
			break;
			}
			}
			@@ -1915,7 +1933,7 @@
			setSelectHisStockGoodsByTableRender();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val() * 1);
			layer.close(index);
			}
			});
			@@ -1931,6 +1949,8 @@
			$.each(option.data, function (index, value) {
			if (value.LAY_TABLE_INDEX == dataindex) {
			value.HisStockGoods = data.value;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney($("#HEarnestRate").val() * 1);
			}
			});
			});
			@@ -2027,7 +2047,7 @@
			setSelectHisStockGoodsByTableRender();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val() * 1);

			layer.close(index);//å³éå¼¹çª
			}
			@@ -2310,12 +2330,17 @@
			//#endregion

			//#region è®¾ç½®è¡¨å¤´æééé¢
			function set_HBillMoney() {
			function set_HBillMoney(HEarnestRate) {
			var HBillMoney = 0;
			for (var i = 0; i < option.data.length; i++) {
			HBillMoney += option.data[i]["HlineTotal"] * 1;
			if (option.data[i]["HisStockGoods"] == "false") {
			HBillMoney += option.data[i]["HlineTotal"] * 1;
			}
			}
			$("#HBillMoney").val(dealDoubleToFixed(HBillMoney * 0.5, 2));


			HEarnestRate = HEarnestRate * 0.01;
			$("#HBillMoney").val(dealDoubleToFixed(HBillMoney * HEarnestRate, 2));
			}
			//#endregion