MES-WEB-LayUI.git

			@@ -15,25 +15,36 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<style type="text/css">
			/*.layui-form-item .layui-inline {
			margin-right: 0;
			<style>
			.main-btn { /å¤´é¨ä¸»æé®/
			padding: 0 2px; /è°æ´æé®å·¦å³ç©ºéå¤§å°/
			height: 30px;
			line-height: 30px;
			}

			html {
			background-color: white;
			color: white;
			.btn-title {
			font-size: 16px;
			}

			/* é²æ¢ä¸ææ¡çä¸æåè¡¨è¢«éè---å¿é¡»è®¾ç½®--- */
			.layui-table-cell {
			overflow: visible !important;
			}

			/* ä½¿å¾ä¸ææ¡ä¸ååæ ¼åå¥½åé */
			td .layui-form-select {
			margin-top: -10px;
			margin-left: -15px;
			margin-right: -15px;
			}*/
			}

			.layui-form-item .layui-inline {
			margin-top: 0px;
			margin-bottom: 5px;
			margin-right: 0px;
			}

			.layui-form-label {
			width: 25%;
			}
			</style>
			</head>
			<body>
			@@ -158,7 +169,7 @@
			</div>
			</div>
			</div>


			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">å¤æ³¨</label>
			@@ -366,7 +377,13 @@
			<script type="text/html" id="barDemo">
			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>
			</script>

			<!--è¡ä¸æéæ©(æ¯å¦ååºå)-->
			<script type="text/html" id="HisStockGoods">
			<select name="HisStockGoods" lay-filter="HisStockGoods" id="HisStockGoods{{d.LAY_TABLE_INDEX+1}}">
			<option value="false">å¦</option>
			<option value="true">æ¯</option>
			</select>
			</script>
			<script>
			//#region æå æ³¨é
			//#endregion
			@@ -406,7 +423,7 @@

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

			//#region å¤æå¹¶è®¾ç½®æä½ç±»åãé¡µé¢åå§å
			if (OperationType == null \|\| OperationType == 1) { //æ°å¢
			@@ -450,7 +467,7 @@
			//DisPlay_HideColumn();
			//#endregion
			//#endregion


			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç
			//#region å¼¹çªéæ©è§¦åäºä»¶
			//#region éæ©éå®åæé®
			@@ -469,7 +486,7 @@
			form.on('submit(HSellSList)', function () {
			get_checkSellS();
			});
			//#endregion
			//#endregion

			//#region éæ©ç»ç®æ¹å¼æé®
			form.on('submit(HSSList)', function () {
			@@ -481,7 +498,7 @@
			form.on('submit(HCurList)', function () {
			get_checkCur();
			});
			//#endregion
			//#endregion

			//#region éæ©éå®é¨é¨æé®
			form.on('submit(HDeptList)', function () {
			@@ -562,6 +579,7 @@
			"HlineTotal": "0",
			"HlineTotalBB": "0",
			"HDate": Format(new Date(), 'yyyy-MM-dd'),
			"HisStockGoods": "false",
			"HOutStockQty": "0",
			"HInvoiceQty": "0",
			"HRemark": "",
			@@ -603,7 +621,7 @@
			var field = $(this).data('field');
			laydate.render({
			elem: this.firstChild
			, show: true //ç´æ¥æ¾ç¤º
			, show: true //ç´æ¥æ¾ç¤º
			, closeStop: this
			, done: function (nowDate) {
			//æ¶é´éæ©å®æï¼è¡æ°æ®æ´æ°
			@@ -639,6 +657,9 @@
			});
			table.render(option);

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

			layer.msg("æ°éè¯·è¾å¥å¤§äº0çæ°å!");
			return;
			}
			@@ -651,7 +672,7 @@
			/var HDiscountRate = obj.data.HDiscountRate 1; //ææ£ç*/
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			/var HRelTaxPrice = HTaxPrice HDiscountRate; //å®éå«ç¨åä»·=å«ç¨åä»·ææ£ç/
			//ææ£é¢ = å«ç¨åä»· * (1 - ææ£ç) * æ°é
			//ææ£é¢ = å«ç¨åä»· * (1 - ææ£ç) * æ°é
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			@@ -674,6 +695,10 @@
			, HlineTotal: HlineTotal
			});
			table.render(option);

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

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			break;
			@@ -686,6 +711,9 @@
			HPrice: oldText
			});
			table.render(option);

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

			layer.msg("åä»·è¯·è¾å¥å¤§äº0çæ°å!");
			return;
			@@ -722,6 +750,10 @@
			, HlineTotal: HlineTotal
			});
			table.render(option);

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

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			break;
			@@ -734,6 +766,9 @@
			HTaxRate: oldText
			});
			table.render(option);

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

			layer.msg("ç¨çè¯·è¾å¥ä¸å°äº0çæ°å!");
			return;
			@@ -770,6 +805,10 @@
			, HlineTotal: HlineTotal
			});
			table.render(option);

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

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			break;
			@@ -783,6 +822,9 @@
			});
			table.render(option);

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

			layer.msg("å«ç¨åæ®è¯·è¾å¥ä¸å°äº0çæ°å!");
			return;
			}
			@@ -791,9 +833,9 @@
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			var HTaxPrice = value * 1; //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HPrice = HTaxPrice / (1 + HTaxRate); //åä»·=å«ç¨åæ®/(1+ç¨ç)


			/var HDiscountRate = obj.data.HDiscountRate 1; //ææ£ç*/


			/var HRelTaxPrice = HTaxPrice HDiscountRate; //å®éå«ç¨åä»·=å«ç¨åä»·ææ£ç/
			//ææ£é¢ = å«ç¨åä»· * (1 - ææ£ç) * æ°é
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			@@ -818,6 +860,10 @@
			, HlineTotal: HlineTotal
			});
			table.render(option);

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

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			break;
			@@ -985,6 +1031,7 @@
			, { 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 }
			@@ -994,6 +1041,21 @@
			, { field: 'HInvoiceQty', title: 'å¼ç¥¨æ°é', width: 100, edit: 'text', hide: true }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			, done: function (res, curr, count) {
			option.data = res.data;
			//å»æä¸ææ¡å¤±ç¦äºä»¶å¦åå¨ä¸ææ¡éè¾å¥å¼
			$('.layui-form-select').find('input').unbind("blur");
			//è¡¨æ ¼éè½½åæ¾ä¸ææ¡éçæ°æ®
			$('tr').each(function (e) {
			var $cr = $(this);
			var dataIndex = $cr.attr("data-index");
			$.each(option.data, function (index, value) {
			if (value.LAY_TNDEX == dataIndex) {
			$cr.find('input').val(value.HisStockGoods);
			}
			});
			});
			}
			}

			var rowdata = [{
			@@ -1017,6 +1079,7 @@
			"HlineTotal": "0",
			"HlineTotalBB": "0",
			"HDate": Format(new Date(),'yyyy-MM-dd'),
			"HisStockGoods": "false",
			"HOutStockQty": "0",
			"HInvoiceQty": "0",
			"HRemark": "",
			@@ -1027,6 +1090,9 @@

			option.data = rowdata;
			table.render(option);

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

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			@@ -1054,7 +1120,7 @@
			set_InitGrid();
			DisPlay_HideColumn();
			}
			//#endregion
			//#endregion

			//#region ç¼è¾é¡µé¢åå§å
			function RoadBillMain(linterid) {
			@@ -1142,6 +1208,7 @@
			"HTaxMoney": result.data[i]["ç¨é¢"],
			"HlineTotal": dealDoubleToFixed(result.data[i]["ä»·ç¨åè®¡"], 2),
			"HlineTotalBB": result.data[i]["æ¬ä½å¸ä»·ç¨åè®¡"],
			"HisStockGoods": result.data[i]["æ¯å¦ååºå"]=="Y"?true:false,
			"HDate": formatDate(result.data[i]["äº¤è´§æ¥æ"]),
			"HOutStockQty": result.data[i]["åºåºæ°é"],
			"HInvoiceQty": result.data[i]["å¼ç¥¨æ°é"],
			@@ -1160,6 +1227,9 @@

			table.render(option);

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

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			layer.close(ajaxLoad);
			@@ -1175,6 +1245,7 @@
			}
			//#endregion

			//#region è¡¨å¤´éæ©æ¹æ³
			//#region éå®åéæ©é¡µé¢
			function get_checkEmp() {
			layer.open({
			@@ -1377,6 +1448,7 @@
			})
			}
			//#endregion
			//#endregion

			//#region ä¿åæ¹æ³
			function set_SaveBill(data) {
			@@ -1491,7 +1563,7 @@
			// return false;
			//}




			//if ($("#HPayCusID").val() == "0") {
			// layer.msg("ç»ç®æ¹æªéæ©!");
			@@ -1503,7 +1575,7 @@
			// return false;
			//}



			//#endregion

			//#region åè¡¨ æ°æ®æ£éª
			@@ -1580,11 +1652,11 @@
			return false;
			}










			////ææ£çæ ¼å¼æ ¡éª
			//temp = option.data[i]["HDiscountRate"] + "";
			@@ -1606,7 +1678,7 @@
			// return false;
			//}




			//ç¨é¢æ ¼å¼æ ¡éª
			//temp = option.data[i]["HTaxMoney"] + "";
			@@ -1618,7 +1690,7 @@
			// return false;
			//}




			////æ¬ä½å¸ä»·ç¨åè®¡æ ¼å¼æ ¡éª
			//temp = option.data[i]["HlineTotalBB"] + "";
			@@ -1666,6 +1738,10 @@
			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];
			table.render(option);

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

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			//rows++;
			@@ -1689,6 +1765,10 @@
			}
			option.data = tables;
			table.render(option);

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

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			} else {
			@@ -1715,6 +1795,10 @@
			option.data[option.data.length - 1].HWeight = "0";

			table.render(option);//å°æ°æ®æ¸²æå°è¡¨æ ¼ä¸

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

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			}
			@@ -1741,6 +1825,10 @@
			option.data[i - 1] = data[0];
			option.data[i] = tables[0];
			table.render(option);

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

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			break;
			@@ -1774,6 +1862,10 @@
			option.data[i + 1] = data[0];
			option.data[i] = tables[0];
			table.render(option);

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

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			break;
			@@ -1801,6 +1893,10 @@
			oldData.splice(obj.tr.data('index'), 1);
			option.data = oldData;
			table.render(option);

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

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();
			layer.close(index);
			@@ -1808,6 +1904,19 @@
			});
			}
			}
			//#endregion

			//#region è¡¨æ ¼è¡éæ©å¤çï¼æ¯å¦ååºåï¼
			form.on('select(HisStockGoods)', function (data) {
			//è·åä¸ææ¡éä¸çå¼
			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å¼èµå¼ç»è¡¨æ ¼ç¼å
			}
			});
			});
			//#endregion

			//#region è¡åå¿«æ·é®çé
			@@ -1896,6 +2005,10 @@

			}
			table.render(option);

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

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney();

			@@ -2079,8 +2192,15 @@
			}
			}
			table.render(option);

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

			} else {
			table.render(option);

			//å·æ°è¡¨æ ¼åæ¶æ ¹æ®optionä¸HisStockGoodså¼è®¾ç½®ä¸æåè¡¨
			setSelectHisStockGoodsByTableRender();
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			@@ -2202,6 +2322,15 @@
			}
			});
			return HSourceBillData;
			}
			//#endregion

			//#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);
			}
			form.render('select');
			}
			//#endregion
			//#endregion
			@@ -2373,7 +2502,7 @@
			}
			}
			}
			//#endregion
			//#endregion
			</script>
			</body>
			</html>