MES-WEB-LayUI.git

			@@ -68,7 +68,7 @@
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">æ¥æ</label>
			<label class="layui-form-label">æ¥æ<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
			</div>
			@@ -81,18 +81,18 @@
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¾åºå</label>
			<div class="layui-input-inline">
			<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
			<div class="layui-col-xs4 layui-inline" style="width: 542px">
			<label class="layui-form-label">ä¾åºå<label style="color:red"> * </label></label>
			<div class="layui-input-inline" style="width: 420px">
			<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:380px;">
			<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 380px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä»ç®¡å</label>
			<label class="layui-form-label">ä»ç®¡å<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
			@@ -102,7 +102,7 @@
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">è´è´£äºº</label>
			<label class="layui-form-label">è´è´£äºº<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
			@@ -114,7 +114,7 @@
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">è°å¥ä»åº</label>
			<label class="layui-form-label">è°å¥ä»åº<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
			@@ -124,7 +124,7 @@
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">è°åºä»åº</label>
			<label class="layui-form-label">è°åºä»åº<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value="0" style="float:left;width:150px;">
			@@ -134,7 +134,7 @@
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">éªæ¶</label>
			<label class="layui-form-label">éªæ¶<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
			@@ -146,7 +146,7 @@
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¿ç®¡å</label>
			<label class="layui-form-label">ä¿ç®¡å<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
			@@ -156,7 +156,7 @@
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">é¨é¨</label>
			<label class="layui-form-label">é¨é¨<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
			@@ -332,6 +332,27 @@
			/* $("#HSSDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ç®æ¹å¼*/
			}
			});
			//é¡µé¢åå§åå è½½
			$("#HDeptID").val(sessionStorage["HDeptID"]);
			$("#HDeptName").val(sessionStorage["HDept"]);

			//æ ¹æ®å½åç»å½ç¨æ·çé¨é¨ è·å ä¸»ç®¡
			if ($("#HDeptID").val() != 0) {
			$.ajax({
			url: GetWEBURL() + "Gy_Department/list",
			async: false,
			type: "GET",
			data: {
			"sWhere": "and HItemID = '" + $("#HDeptID").val() + "'", "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]
			},
			success: function (result) {
			$("#HManagerID").val(result.data[0].HEmpID);
			$("#HManagerName").val(result.data[0].è´è´£äºº);
			}, error: function () {
			layer.alert("åçéè¯¯!", { icon: 5 });
			}
			});
			}
			} else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			$("#HInterID").val(linterid);
			RoadBillMain(linterid);
			@@ -540,65 +561,65 @@
			},
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data[0];
			var data = result.data;
			allVal = result.data[0];
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HBillNo": data.åæ®å·
			, "HDate": formatDate(data.æ¥æ)
			"HBillNo": data[0].åæ®å·
			, "HDate": formatDate(data[0].æ¥æ)
			/, "HSSDate": formatDate(data.ç»ç®æ¥æ)/
			//, "HInnerBillNo": data.åé¨åæ®å·
			, "HAddress": data.äº¤è´§å°ç¹
			, "HDeptName": data.é¨é¨
			, "HDeptID": data.HDeptID
			, "HSupID": data.HSupID
			, "HSupName": data.ä¾åºå
			, "HEmpID": data.HEmpID
			, "HEmpName": data.ä»ç®¡å
			, "HCurID": data.HCurID
			, "HCurName": data.å¸å«
			, "HExRate": data.æ±ç
			, "HWHID": data.HWHID
			, "HWHName": data.è°å¥ä»åº
			, "HSCWHID": data.HSCWHID
			, "HSCWHName": data.è°åºä»åº
			, "HManagerName": data.è´è´£äºº
			, "HManagerID": data.HManagerID
			, "HSecManagerID": data.HSecManagerID
			, "HSecManagerName": data.éªæ¶
			, "HKeeperID": data.HKeeperID
			, "HKeeperName": data.ä¿ç®¡å
			, "HPSStyleID": data.HPSStyleID
			, "HPSStyleName": data.éè´æ¹å¼
			, "HSSID": data.HSSID
			, "HSSName": data.ç»ç®æ¹å¼
			, "HLinkMan": data.èç³»äºº
			, "HLinkPhone": data.èç³»çµè¯
			, "HInnerBillNo": data.è¾å©åæ®µ
			, "HRemark": data.è¡¨å¤´å¤æ³¨
			, "HMaker": data.å¶åäºº
			, "HMakeDate": data.å¶åæ¥æ
			, "HUpDater": data.ä¿®æ¹äºº
			, "HUpDateDate": data.ä¿®æ¹æ¥æ
			, "HChecker": data.å®¡æ ¸äºº
			, "HCheckDate": data.å®¡æ ¸æ¥æ
			, "HCloseMan": data.å³éäºº
			, "HCloseDate": data.å³éæ¥æ
			, "HDeleteMan": data.ä½åºäºº
			, "HDeleteDate": data.ä½åºæ¥æ
			, "HAddress": data[0].äº¤è´§å°ç¹
			, "HDeptName": data[0].é¨é¨
			, "HDeptID": data[0].HDeptID
			, "HSupID": data[0].HSupID
			, "HSupName": data[0].ä¾åºå
			, "HEmpID": data[0].HEmpID
			, "HEmpName": data[0].ä»ç®¡å
			, "HCurID": data[0].HCurID
			, "HCurName": data[0].å¸å«
			, "HExRate": data[0].æ±ç
			, "HWHID": data[0].HWHID
			, "HWHName": data[0].è°å¥ä»åº
			, "HSCWHID": data[0].HSCWHID
			, "HSCWHName": data[0].è°åºä»åº
			, "HManagerName": data[0].è´è´£äºº
			, "HManagerID": data[0].HManagerID
			, "HSecManagerID": data[0].HSecManagerID
			, "HSecManagerName": data[0].éªæ¶
			, "HKeeperID": data[0].HKeeperID
			, "HKeeperName": data[0].ä¿ç®¡å
			, "HPSStyleID": data[0].HPSStyleID
			, "HPSStyleName": data[0].éè´æ¹å¼
			, "HSSID": data[0].HSSID
			, "HSSName": data[0].ç»ç®æ¹å¼
			, "HLinkMan": data[0].èç³»äºº
			, "HLinkPhone": data[0].èç³»çµè¯
			, "HInnerBillNo": data[0].è¾å©åæ®µ
			, "HRemark": data[0].è¡¨å¤´å¤æ³¨
			, "HMaker": data[0].å¶åäºº
			, "HMakeDate": data[0].å¶åæ¥æ
			, "HUpDater": data[0].ä¿®æ¹äºº
			, "HUpDateDate": data[0].ä¿®æ¹æ¥æ
			, "HChecker": data[0].å®¡æ ¸äºº
			, "HCheckDate": data[0].å®¡æ ¸æ¥æ
			, "HCloseMan": data[0].å³éäºº
			, "HCloseDate": data[0].å³éæ¥æ
			, "HDeleteMan": data[0].ä½åºäºº
			, "HDeleteDate": data[0].ä½åºæ¥æ
			});

			//åè¡¨ èµå¼
			var rowdata = [];
			for (var i = 0; i < 1; i++) {
			for (var i = 0; i < data.length; i++) {
			rowdata.push(
			{
			"HMaterID": data.HMaterID, "ç©æä»£ç ": data.ç©æä»£ç , "ç©æåç§°": data.ç©æåç§°
			, "è§æ ¼åå·": data.è§æ ¼åå·, "HUnitID": data.HUnitID
			, "è®¡éåä½": data.è®¡éåä½, "HQtyMust": data.HQtyMust, "HQtyMust": data.åºæ¶æ°é, "HQty": data.å®æ¶æ°é, "HRemark": data.è¡¨ä½å¤æ³¨
			, "HPrice": data.åä»·, "HMoney": data.éé¢, "HOrderPrice": data.éè´éé¢, "HWHID": data.HWHID, "è°å¥ä»åº": data.è°å¥ä»åº, "HSCWHID": data.HSCWHID, "è°åºä»åº": data.è°åºä»åº, "HTaxRate": data.ç¨ç
			, "HTaxMoney": data.éé¢ * data.ç¨ç, "HlineTotal": data.éé¢ + data.ç¨é¢, "HlineTotalBB": (data.éé¢ + data.ç¨é¢) * data.æ±ç
			, "HTaxPrice": data.å«ç¨åä»·, "HDiscountRate": data.ææ£ç, "HRelTaxPrice": data.å®éå«ç¨åä»·
			, "HDate": Format(new Date(data.äº¤è´§æ¥æ), "yyyy-MM-dd"),"HBatchNo":data.æ¹æ¬¡
			"HMaterID": data[i].HMaterID, "ç©æä»£ç ": data[i].ç©æä»£ç , "ç©æåç§°": data[i].ç©æåç§°
			, "è§æ ¼åå·": data[i].è§æ ¼åå·, "HUnitID": data[i].HUnitID
			, "è®¡éåä½": data[i].è®¡éåä½, "HQtyMust": data[i].HQtyMust, "HQtyMust": data[i].åºæ¶æ°é, "HQty": data[i].å®æ¶æ°é, "HRemark": data[i].è¡¨ä½å¤æ³¨
			, "HPrice": data[i].åä»·, "HMoney": data[i].éé¢, "HOrderPrice": data[i].éè´éé¢, "HWHID": data[i].HWHID, "è°å¥ä»åº": data[i].è°å¥ä»åº, "HSCWHID": data[i].HSCWHID, "è°åºä»åº": data[i].è°åºä»åº, "HTaxRate": data[i].ç¨ç
			, "HTaxMoney": data[i].éé¢ * data[i].ç¨ç, "HlineTotal": data[i].éé¢ + data[i].ç¨é¢, "HlineTotalBB": (data[i].éé¢ + data.ç¨é¢) * data[i].æ±ç
			, "HTaxPrice": data[i].å«ç¨åä»·, "HDiscountRate": data[i].ææ£ç, "HRelTaxPrice": data[i].å®éå«ç¨åä»·
			, "HDate": Format(new Date(data[i].äº¤è´§æ¥æ), "yyyy-MM-dd"), "HBatchNo": data[i].æ¹æ¬¡
			}
			)
			}
			@@ -626,13 +647,34 @@
			layer.msg("è¯·éæ©è°å¥ä»åºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}

			if ($("#HSCWHID").val() == 0) {
			layer.msg("è¯·éæ©è°åºä»åºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}


			if ($("#HManagerID").val() == 0) {
			layer.msg("è¯·éæ©è´è´£äººï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HSecManagerID").val() == 0) {
			layer.msg("è¯·éæ©éªæ¶äººï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HEmpID").val() == 0) {
			layer.msg("è¯·éæ©ä»ç®¡åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HKeeperID ").val() == 0) {
			layer.msg("è¯·éæ©ä¿ç®¡åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HSupID").val() == 0) {
			layer.msg("è¯·éæ©ä¾åºåï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HDeptID").val() == 0) {
			layer.msg("è¯·éæ©é¨é¨ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			var num = [];
			for (var i = 0; i < table.cache["mainTable"].length; i++) {
			if (table.cache["mainTable"][i] != "") {
			@@ -711,17 +753,14 @@
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			if (OptionData.length>0) {
			obj.update({
			"HMaterID": OptionData.HItemID
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			})
			OptionData = [];
			}
			obj.update({
			"HMaterID": OptionData.HItemID
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			})

			}
			})
			@@ -736,7 +775,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -756,8 +795,8 @@
			, end: function () {
			if (OptionData.length > 0) {
			obj.update({
			"HUnitID": OptionData.HItemID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			"HUnitID": OptionData[0].HItemID
			, "è®¡éåä½": OptionData[0].è®¡éåä½åç§°
			})
			OptionData = [];
			}
			@@ -832,13 +871,13 @@
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			if (OptionData.length > 0) {
			obj.update({
			"HWHID": OptionData.HItemID
			, "è°å¥ä»åº": OptionData.ä»åºåç§°
			})
			OptionData = [];
			}
			//if (OptionData.length > 0) {
			// OptionData = [];
			//}
			obj.update({
			"HWHID": OptionData.HItemID
			, "è°å¥ä»åº": OptionData.ä»åºåç§°
			})

			}
			})
			@@ -871,13 +910,13 @@
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			if (OptionData.length > 0) {
			obj.update({
			"HSCWHID": OptionData.HItemID
			, "è°åºä»åº": OptionData.ä»åºåç§°
			})
			OptionData = [];
			}
			//if (OptionData.length > 0) {
			// OptionData = [];
			//}
			obj.update({
			"HSCWHID": OptionData.HItemID
			, "è°åºä»åº": OptionData.ä»åºåç§°
			})


			}
			@@ -907,7 +946,7 @@
			});
			}
			}

			//ä»ç®¡å
			function get_checkEmp() {
			layer.open({
			type: 2//å¼¹çªç±»å
			@@ -930,7 +969,7 @@
			, btn2: function (index, layero) { }
			})
			}

			//ä¾åºå
			function get_checkSup() {
			layer.open({
			type: 2//å¼¹çªç±»å
			@@ -953,7 +992,7 @@
			, btn2: function (index, layero) { }
			})
			}

			//éªæ¶äºº
			function get_checkSecManager() {
			layer.open({
			type: 2//å¼¹çªç±»å
			@@ -976,7 +1015,7 @@
			, btn2: function (index, layero) { }
			})
			}

			//é¨é¨
			function get_checkDept() {
			layer.open({
			type: 2//å¼¹çªç±»å
			@@ -999,7 +1038,7 @@
			, btn2: function (index, layero) { }
			})
			}

			//è´è´£äºº
			function get_checkManager() {
			layer.open({
			type: 2//å¼¹çªç±»å
			@@ -1022,7 +1061,7 @@
			, btn2: function (index, layero) { }
			})
			}

			//ä¿ç®¡å
			function get_checkKeeper() {
			layer.open({
			type: 2//å¼¹çªç±»å
			@@ -1045,6 +1084,7 @@
			, btn2: function (index, layero) { }
			})
			}
			//è°å¥ä»åº
			function get_checkWH() {
			layer.open({
			type: 2//å¼¹çªç±»å
			@@ -1067,7 +1107,7 @@
			, btn2: function (index, layero) { }
			})
			}

			//è°åºä»åº
			function get_checkSCWH() {
			layer.open({
			type: 2//å¼¹çªç±»å
			@@ -1127,12 +1167,30 @@
			{
			$("#HWHName").val(obj[0].ä»åºåç§°);
			$("#HWHID").val(obj[0].HItemID);
			if (option.data.length > 0) {
			for (var i = 0; i < option.data.length; i++) {
			if (option.data[i]["HWHID"] == 0) {
			option.data[i]["HWHID"] = obj[0].HItemID;
			option.data[i]["è°å¥ä»åº"] = obj[0].ä»åºåç§°;
			}
			}
			}
			layui.table.render(option);
			}


			function GetHSCWHValue(obj) //è¿åè°åºä»åº
			{
			$("#HSCWHName").val(obj[0].ä»åºåç§°);
			$("#HSCWHID").val(obj[0].HItemID);
			$("#HSCWHID").val(obj[0].HItemID);
			if (option.data.length > 0) {
			for (var i = 0; i < option.data.length; i++) {
			if (option.data[i]["HSCWHID"] == 0) {
			option.data[i]["HSCWHID"] = obj[0].HItemID;
			option.data[i]["è°åºä»åº"] = obj[0].ä»åºåç§°;
			}
			}
			}
			layui.table.render(option);
			}

			function GetHDeptNameValue(obj) //è¿åé¨é¨
			@@ -1155,10 +1213,10 @@

			//åå»è¿åç©æ
			function GetGyMaterial(data) {
			OptionData = data
			OptionData = data;
			}
			//åå»è¿åè®¡éåä½
			function GetGyUnit(data) {
			function GetAuxiliaryUnitValue(data) {
			OptionData = data
			}