MES-WEB-LayUI.git

			@@ -15,10 +15,11 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<style>
			/.main-btn {/ /å¤´é¨ä¸»æé®/
			/padding: 0 2px;/ /è°æ´æé®å·¦å³ç©ºéå¤§å°/
			/*height: 30px;
			/padding: 0 2px;/ /è°æ´æé®å·¦å³ç©ºéå¤§å°/
			/*height: 30px;
			line-height: 30px;
			}*/

			@@ -36,7 +37,7 @@
			margin-right: -15px;
			}

			/* .layui-form-item .layui-inline {
			/* .layui-form-item .layui-inline {
			margin-top: 0px;
			margin-bottom: 5px;
			margin-right: 0px;
			@@ -133,6 +134,15 @@
			<label class="layui-form-label">æ±ç<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<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>
			@@ -412,6 +422,7 @@
			//æ¨¡åå
			var HModName = "Xs_SeOrderBill";
			var HBillType = "1401";
			var HEarnestRateTemp = "50";

			//è·åé¡µé¢è·³è½¬åæ°
			var params = get_UrlVars();
			@@ -424,6 +435,13 @@

			//#region å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			get_LoginIs();

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

			//#region å¤æå¹¶è®¾ç½®æä½ç±»åãé¡µé¢åå§å
			@@ -535,7 +553,7 @@
			});
			//#endregion

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

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

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

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

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

			//#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);

			if (HEarnestRate != 0) {
			HEarnestRateTemp = HEarnestRate;
			}
			});
			//#endregion
			//#endregion
			@@ -1028,9 +1058,10 @@
			, { 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' }
			, { field: 'HTaxRate', title: 'ç¨ç%', width: 100, edit: 'text' }
			, { field: 'HTaxPrice', title: 'å«ç¨åä»·', width: 100, edit: 'text' }
			, { field: 'HMoney', title: 'éé¢', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			, { field: 'HlineTotal', title: 'ä»·ç¨åè®¡', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			@@ -1038,7 +1069,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 }
			@@ -1102,7 +1132,7 @@
			setSelectHisStockGoodsByTableRender();

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

			@@ -1126,6 +1156,9 @@
			//åå§åå¹¶åè®¾ç½®ï¼åè¡¨1
			set_InitGrid();
			DisPlay_HideColumn();

			//æ ¹æ®æ¯å¦ååºåè·åå®éæ¯ä¾
			setHEarnestRateByHisStockGoods();
			}
			//#endregion

			@@ -1158,6 +1191,7 @@
			, "HCurID": data.HCurID
			, "HCurName": data.å¸å«
			, "HExRate": data.æ±ç
			, "HEarnestRate": data.å®éæ¯ä¾
			, "HManagerID": data.HManagerID
			, "HManagerName": data.ä¸»ç®¡
			, "HSellSID": data.HSellSID
			@@ -1215,7 +1249,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]["å¼ç¥¨æ°é"],
			@@ -1234,11 +1268,17 @@

			table.render(option);

			//è·åä¸´æ¶å®éæ¯ä¾
			HEarnestRateTemp = data.å®éæ¯ä¾ + "" == "0" ? "50" : data.å®éæ¯ä¾ + "";

			//å·æ°è¡¨æ ¼åæ¶æ ¹æ®optionä¸HisStockGoodså¼è®¾ç½®ä¸æåè¡¨
			setSelectHisStockGoodsByTableRender();

			//æ ¹æ®æ¯å¦ååºåè·åå®éæ¯ä¾
			setHEarnestRateByHisStockGoods();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val() * 1);
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			@@ -1464,10 +1504,12 @@
			if (OperationType == 1 \|\| OperationType == 2) {
			refSav = "Add";
			data.field.HChangeDate = new Date();
			data.field.HSTOCKORGID = data.field.HOrgID;
			}
			if (OperationType == 3) {
			refSav = "Update";
			data.field.HChangeDate = new Date();
			data.field.HSTOCKORGID = data.field.HOrgID;
			}

			//è¥ä¸ºç¼è¾-ä¿åï¼åæ´æ°ä¿®æ¹äººåä¿®æ¹æ¶é´
			@@ -1742,6 +1784,13 @@

			//#region å¨æ«å°¾å¢å ä¸è¡
			function btnAddLine(NewRow) {
			if (option.data.length > 0) {
			NewRow.HisStockGoods = option.data[0]["HisStockGoods"];
			} else {
			NewRow.HisStockGoods = "false";
			}


			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];
			table.render(option);
			@@ -1749,8 +1798,11 @@
			//å·æ°è¡¨æ ¼åæ¶æ ¹æ®optionä¸HisStockGoodså¼è®¾ç½®ä¸æåè¡¨
			setSelectHisStockGoodsByTableRender();

			//æ ¹æ®æ¯å¦ååºåè·åå®éæ¯ä¾
			//setHEarnestRateByHisStockGoods();

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

			//#region å¨æå®è¡ä¸æå¥ä¸è¡
			function btnInsertLine(NewRow) {
			if (option.data.length > 0) {
			NewRow.HisStockGoods = option.data[0]["HisStockGoods"];
			} else {
			NewRow.HisStockGoods = "false";
			}

			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			@@ -1776,8 +1834,11 @@
			//å·æ°è¡¨æ ¼åæ¶æ ¹æ®optionä¸HisStockGoodså¼è®¾ç½®ä¸æåè¡¨
			setSelectHisStockGoodsByTableRender();

			//æ ¹æ®æ¯å¦ååºåè·åå®éæ¯ä¾
			//setHEarnestRateByHisStockGoods();

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

			//æ ¹æ®æ¯å¦ååºåè·åå®éæ¯ä¾
			//setHEarnestRateByHisStockGoods();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val() * 1);
			}
			}
			//#endregion
			@@ -1836,8 +1900,11 @@
			//å·æ°è¡¨æ ¼åæ¶æ ¹æ®optionä¸HisStockGoodså¼è®¾ç½®ä¸æåè¡¨
			setSelectHisStockGoodsByTableRender();

			//æ ¹æ®æ¯å¦ååºåè·åå®éæ¯ä¾
			//setHEarnestRateByHisStockGoods();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val() * 1);
			break;
			}
			}
			@@ -1873,8 +1940,11 @@
			//å·æ°è¡¨æ ¼åæ¶æ ¹æ®optionä¸HisStockGoodså¼è®¾ç½®ä¸æåè¡¨
			setSelectHisStockGoodsByTableRender();

			//æ ¹æ®æ¯å¦ååºåè·åå®éæ¯ä¾
			//setHEarnestRateByHisStockGoods();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val() * 1);
			break;
			}
			}
			@@ -1904,8 +1974,11 @@
			//å·æ°è¡¨æ ¼åæ¶æ ¹æ®optionä¸HisStockGoodså¼è®¾ç½®ä¸æåè¡¨
			setSelectHisStockGoodsByTableRender();

			//æ ¹æ®æ¯å¦ååºåè·åå®éæ¯ä¾
			setHEarnestRateByHisStockGoods();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			set_HBillMoney($("#HEarnestRate").val() * 1);
			layer.close(index);
			}
			});
			@@ -1919,9 +1992,15 @@
			var elem = data.othis.parents('tr');
			var dataindex = elem.attr("data-index");
			$.each(option.data, function (index, value) {
			if (value.LAY_TABLE_INDEX == dataindex) {
			value.HisStockGoods = data.value;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			}
			value.HisStockGoods = data.value;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			//å·æ°è¡¨æ ¼åæ¶æ ¹æ®optionä¸HisStockGoodså¼è®¾ç½®ä¸æåè¡¨
			setSelectHisStockGoodsByTableRender();

			//æ ¹æ®æ¯å¦ååºåè·åå®éæ¯ä¾
			setHEarnestRateByHisStockGoods();

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

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

			layer.close(index);//å³éå¼¹çª
			}
			@@ -2300,12 +2379,47 @@
			//#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(HBillMoney * 0.5);


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

			//#region æ ¹æ®æ¯å¦ååºåè·åå®éæ¯ä¾
			function setHEarnestRateByHisStockGoods() {
			if (option.data.length > 0 && option.data[0]["HisStockGoods"] == "true") {
			var HEarnestRateList = '<option value="0" selected="selected" >0%</option>';

			$("#HEarnestRate").empty();
			$("#HEarnestRate").append(HEarnestRateList);
			form.render('select');
			} else if (option.data.length > 0 && option.data[0]["HisStockGoods"] == "false") {
			var HEarnestRateList = '<option value="50" selected="selected" >50%</option>';
			HEarnestRateList += '<option value="100" >100%</option>';

			$("#HEarnestRate").empty();
			$("#HEarnestRate").append(HEarnestRateList);
			/form.render('select');/
			$("#HEarnestRate").val(HEarnestRateTemp);
			form.render('select');
			} else {
			var HEarnestRateList = '<option value="50" selected="selected" >50%</option>';
			HEarnestRateList += '<option value="100" >100%</option>';

			$("#HEarnestRate").empty();
			$("#HEarnestRate").append(HEarnestRateList);
			//form.render('select');
			$("#HEarnestRate").val(HEarnestRateTemp);
			form.render('select');
			}
			}
			//#endregion

			@@ -2335,7 +2449,7 @@
			//#region å·æ°è¡¨æ ¼åæ¶æ ¹æ®optionä¸HisStockGoodså¼è®¾ç½®ä¸æåè¡¨
			function setSelectHisStockGoodsByTableRender() {
			for (var i = 1; i <= option.data.length; i++) {
			$('#HisStockGoods' + i + '').find("option[value='" + option.data[i - 1].HisStockGoods + "']").attr("selected", true);
			$('#HisStockGoods' + i + '').val(option.data[i - 1].HisStockGoods);
			}
			form.render('select');
			}