MES-WEB-LayUI.git

			@@ -234,25 +234,11 @@
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹äºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºäºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¶åæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å®¡æ ¸æ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			@@ -265,18 +251,32 @@
			<input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹äºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºäºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹æ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -668,11 +668,11 @@
			, "HMaker": data.å¶åäºº
			, "HChecker": data.å®¡æ ¸äºº
			, "HCloseMan": data.å³éäºº
			, "HMakeDate": data.å¶åæ¥æ
			, "HCheckDate": data.å®¡æ ¸æ¥æ
			, "HCloseDate": data.å³éæ¥æ
			, "HUpDateDate": data.ä¿®æ¹æ¥æ
			, "HDeleteDate": data.ä½åºæ¥æ
			, "HMakeDate": data.å¶åæ¥æ == null ? "" : Pub_Format(data.å¶åæ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HCheckDate": data.å®¡æ ¸æ¥æ == null ? "" : Pub_Format(data.å®¡æ ¸æ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HCloseDate": data.å³éæ¥æ == null ? "" : Pub_Format(data.å³éæ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HUpDateDate": data.ä¿®æ¹æ¥æ == null ? "" : Pub_Format(data.ä¿®æ¹æ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HDeleteDate": data.ä½åºæ¥æ == null ? "" : Pub_Format(data.ä½åºæ¥æ, "yyyy-MM-dd hh:mm:ss")
			});

			//åè¡¨ èµå¼
			@@ -884,14 +884,15 @@
			if (HSourceBillData == null) {
			layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i + 1) + "è¡ï¼æªæ¥è¯¢å°æºååæ®!", { icon: 5 });
			return;
			} else if (HSourceBillData.ç¶æ != "å·²å®¡æ ¸") {
			var err = "ä¿åå¤±è´¥!åå ï¼ç¬¬" + (i + 1) + "è¡-æºååæ®ç¶æä¸ºâ" + HSourceBillData.ç¶æ + "âï¼ä¸åè®¸ä¿åï¼";
			layer.alert(err, { icon: 5 });
			return;
			} else if (HSourceBillData.è¡ç¶æ == "å·²å³é") {
			layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i + 1) + "è¡ï¼è¯¥è¡è®°å½è¡ç¶æä¸º'å·²å³é'ç¶æ!", { icon: 5 });
			return;
			}
			//else if (HSourceBillData.ç¶æ != "å·²å®¡æ ¸") {
			// var err = "ä¿åå¤±è´¥!åå ï¼ç¬¬" + (i + 1) + "è¡-æºååæ®ç¶æä¸ºâ" + HSourceBillData.ç¶æ + "âï¼ä¸åè®¸ä¿åï¼";
			// layer.alert(err, { icon: 5 });
			// return;
			//} else if (HSourceBillData.è¡ç¶æ == "å·²å³é") {
			// layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i + 1) + "è¡ï¼è¯¥è¡è®°å½è¡ç¶æä¸º'å·²å³é'ç¶æ!", { icon: 5 });
			// return;
			//}
			} else {
			return;
			}
			@@ -987,16 +988,16 @@
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HWHID": dataArray[i].HWHID
			, "éæä»åº": dataArray[i].éæä»åº
			, "éæä»åº": dataArray[i].ä»åº
			, "HSPID": dataArray[i].HSPID
			, "ä»ä½åç§°": dataArray[i].ä»ä½åç§°
			, "HSecUnitID": dataArray[i].HSecUnitID
			, "è¾å©åä½": dataArray[i].è¾å©åä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': dataArray[i].ææ£ç //
			, 'HRelTaxPrice': "0"
			/, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)/
			/, 'HDiscountRate': dataArray[i].ææ£ç/ //
			/, 'HRelTaxPrice': "0"/
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': dataArray[i].ç¨é¢ //
			, "HMoney": dealDoubleToFixed(dataArray[i].éé¢, 2)
			@@ -1021,7 +1022,8 @@
			);
			}
			option.data = rowdata;
			table.render(option);
			table.render(option);
			OperationType = 1;//è®¾ç½®æä½ç±»åä¸ºæ°å¢
			}

			//#endregion
			@@ -1053,10 +1055,10 @@
			layer.msg("è¯·éæ©ä»åºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HManagerName").val() == 0) {
			layer.msg("è¯·éæ©ä¸»ç®¡ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			//if ($("#HManagerName").val() == 0) {
			// layer.msg("è¯·éæ©ä¸»ç®¡ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			//åè¡¨æ°æ®æ£éªç®åè¡¨åéªè¯
			//åç»å¯ç¨å¤ä¸ªæ°ç»åå¨ååæ©å±
			for (var i = 0; i < option.data.length; i++) {
			@@ -1065,7 +1067,7 @@
			}
			var rowData = option.data[i];
			for (var col of Object.keys(rowData)) {
			if (rowData[col] == "0" && col != "LAY_TABLE_INDEX") {
			if (rowData[col] == "0" && (col == "HQty" \|\| col == "HMaterID" \|\| col == "HUnitID")) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼" + col + "ä¸è½ä¸º0ï¼");
			return;
			}
			@@ -1516,7 +1518,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html?Type=Warehouse', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1533,12 +1535,15 @@
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			obj.update({
			"HWHID": OptionData.HItemID
			, "éæä»åº": OptionData.ä»åºåç§°
			})
			}
			, end: function () {
			if (typeof (OptionData[0].HItemID) != undefined) {
			obj.update({
			"HWHID": OptionData[0].HItemID
			, "éæä»åº": OptionData[0].ä»åºåç§°
			})
			}
			OptionData = "";
			}
			})
			}
			//éæä»ä½
			@@ -1740,7 +1745,7 @@
			if (obj.event === 'del') {
			layer.confirm('ççå é¤è¡åï¼', function (index) {
			console.log("ç´¢å¼ä¸º:" + rowIndex);
			if (rowIndex === '0') {
			if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
			layer.msg('é¦è¡æ æ³å é¤ï¼ï¼ï¼');
			} else {
			obj.del();
			@@ -2109,7 +2114,11 @@
			$("#HManagerName").val(obj[0].èååç§°);
			$("#HManagerID").val(obj[0].HItemID);
			}

			function GetGyCur(obj) {
			$("#HCurName").val(obj.è´§å¸åç§°);
			$("#HCurID").val(obj.HItemID);
			$("#HExRate").val(obj.æ±ç);
			}
			//åå»è¿åç©æ
			function GetGyMaterial(data) {
			OptionData = data