MES-WEB-LayUI.git

			@@ -59,7 +59,8 @@
			<h1 style="text-align: center; padding: 10px 0;"><b>éè´å¥åºå</b></h1>
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;" class="layui-this">åºæ¬ä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">å¶åä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">å¶ä»ä¿¡æ¯</li>
			<li lay-id="3" style="padding:1px;">å¶åä¿¡æ¯</li>
			</ul>
			<div class="layui-tab-content">
			<!--åºæ¬ä¿¡æ¯-->
			@@ -81,25 +82,17 @@
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">åé¨åæ®å·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
			</div>
			</div>


			</div>
			<div class="layui-row">
			<div class="layui-col-xs8 layui-inline">
			<label class="layui-form-label">ä¾åºå<label style="color:red"> * </label></label>
			<div class="layui-input-inline" style="width:750px">
			<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:700px;">
			<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value=0 style="float:left;width:700px;">
			<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;">
			<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>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä»åº<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			@@ -110,8 +103,6 @@
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">éªæ¶å</label>
			<div class="layui-input-inline">
			@@ -132,6 +123,9 @@
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">

			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¸å¡å</label>
			<div class="layui-input-inline">
			@@ -142,8 +136,6 @@
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">æºåç±»å</label>
			<div class="layui-input-inline">
			@@ -162,30 +154,19 @@
			</button>
			</div>
			<!--<label class="layui-form-label">éåå·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="Box2" id="Box2" autocomplete="off">
			</div>-->
			<div class="layui-input-inline">
			<input class="layui-input" name="Box2" id="Box2" autocomplete="off">
			</div>-->
			</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="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;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>


			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<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;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			@@ -206,21 +187,50 @@
			<input class="layui-input" name="HProjectName" id="HProjectName" style="background-color:#efefef4d;" readonly autocomplete="off">
			</div>
			</div>

			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<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;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>

			</div>
			<!--<div class="layui-row">

			<div class="layui-col-xs7 layui-inline">
			<label class="layui-form-label">æè¦</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
			</div>
			</div>
			</div>-->
			<div class="layui-col-xs7 layui-inline">
			<label class="layui-form-label">æè¦</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
			</div>
			</div>
			</div>-->
			<div class="layui-row">
			<div class="layui-col-xs7 layui-inline">
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
			</div>
			</div>

			</div>
			</div>
			</div>

			<!--å¶ä»ä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">åé¨åæ®å·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline" style="margin-left: 135px;">
			@@ -240,7 +250,6 @@
			</div>
			</div>
			</div>


			<!--å¶åä¿¡æ¯-->
			<div class="layui-tab-item">
			@@ -267,20 +276,6 @@
			</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="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
			@@ -298,18 +293,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>
			@@ -1159,11 +1168,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")

			});
			//åè¡¨ èµå¼
			@@ -2256,10 +2265,18 @@
			if (checkStatus.data.length == 0) {
			return layer.msg("è¯·è³å°éæ©ä¸æ¡æ°æ®!");
			}

			var HSupID = $("#HSupID").val();//å¤æä¾åºå
			if (HSupID == 0 \|\| HSupID == '') {
			HSupID = checkStatus.data[0]["HSupID"];
			}
			//è·åæ¶æéç¥åä»£ç
			var ProcessNumber = [];
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (checkStatus.data[i]["HSupID"] != HSupID) {
			layer.msg("ä¸æ¨å¤±è´¥!å·²ç»éä¸çè®°å½ä¸åå¨ä¸åä¾åºå!");
			layer.close(index);//å³éå¼¹çª
			return;
			}
			ProcessNumber.push(checkStatus.data[i]);
			}

			@@ -2362,14 +2379,15 @@
			//è¡åå é¤
			function set_GridDelete(obj) {
			var data = obj.data;
			var rowIndex = $(obj.tr).attr("data-index");
			var rowIndex = $(obj.tr).attr("data-index");//è·åè¡ç´¢å¼
			if (obj.event === 'del') {
			layer.confirm('ççå é¤è¡åï¼', function (index) {
			console.log("ç´¢å¼ä¸º:" + rowIndex);
			if (rowIndex === '0') {
			layer.msg('é¦è¡æ æ³å é¤ï¼ï¼ï¼');
			} else {
			obj.del();
			obj.del();//åå é¤
			table.cache["mainTable"].splice(rowIndex, 1); //â¡å½»åºç§»é¤åç´ ï¼ä»ç¼åéç§»é¤è¿ä¸è¡
			option.data = table.cache["mainTable"];//å°æ°æ®ç»å®å°dataä¸
			table.reload(option);
			layer.close(index);
			@@ -2453,9 +2471,9 @@
			res = result.data;
			//layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			}, error: function () {
			}, error: function (err) {
			res = "none";
			layer.alert("åçéè¯¯!", { icon: 5 });
			layer.alert("åçéè¯¯!"+err, { icon: 5 });
			}
			});
			return res;
			@@ -2504,9 +2522,9 @@
			res = result.data;
			//layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			}, error: function () {
			}, error: function (err) {
			res = "none";
			layer.alert("åçéè¯¯!", { icon: 5 });
			layer.alert("åçéè¯¯!" + err, { icon: 5 });
			}
			});
			return res;
			@@ -2629,10 +2647,10 @@
			var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			var temp = "";

			if ($("#HWHID").val() == 0) {
			layer.msg("è¯·éæ©ä»åºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			//if ($("#HWHID").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;
			@@ -2649,22 +2667,22 @@
			// 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;
			}
			//if ($("#HDeptID").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 ($("#HPSStyleID").val() == 0) {
			layer.msg("è¯·éæ©éè´æ¹å¼ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HSSID").val() == 0) {
			layer.msg("è¯·éæ©ç»ç®æ¹å¼ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			//if ($("#HPSStyleID").val() == 0) {
			// layer.msg("è¯·éæ©éè´æ¹å¼ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			//if ($("#HSSID").val() == 0) {
			// layer.msg("è¯·éæ©ç»ç®æ¹å¼ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			//#region åè¡¨ æ°æ®æ£éª
			for (var i = 0; i < option.data.length; i++) {