MES-WEB-LayUI.git

			@@ -14,6 +14,7 @@
			<script src="../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../layuiadmin/PubCustom.js"></script>
			<script src="../../layuiadmin/PageTitle.js"></script>
			<script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<style type="text/css">
			.layui-form-label {
			width: 95px;
			@@ -47,6 +48,7 @@
			<ul class="layui-tab-title">
			<li class="layui-this">åºæ¬ä¿¡æ¯</li>
			<li>éä»¶ä¿¡æ¯</li>
			<li>å¶åä¿¡æ¯</li>
			</ul>
			<h1 style="text-align: center; padding: 10px 0;"><b>è®¾å¤ç¹æ£è®°å½å</b></h1>
			<div class="layui-tab-content">
			@@ -195,6 +197,76 @@
			</div>
			</div>
			</div>
			<!--å¶åä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item">
			<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="HMaker" id="HMaker" 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="HChecker" id="HChecker" 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="HCloseMan" id="HCloseMan" 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="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
			</div>
			</div>

			</div>
			<div class="layui-form-item">
			<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 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="HCheckDate" id="HCheckDate" 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="HCloseDate" id="HCloseDate" 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="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -327,7 +399,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true
			, content: ['../è®¾å¤ç®¡ç/è®¾å¤æ¡£æ¡/Gy_EquipFileMainList.html', 'yes']
			, content: ['../è®¾å¤ç®¡ç/è®¾å¤æ¡£æ¡/Gy_EquipFileMainList.html?openType=2', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -363,7 +435,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true
			, content: ['../åºç¡èµæ/çäº§åºç¡èµæ/Gy_ShiftsList.html', 'yes']
			, content: ['../åºç¡èµæ/çäº§åºç¡èµæ/Gy_ShiftsList.html?openType=2', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -442,7 +514,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../è®¾å¤ç®¡ç/è®¾å¤è§ç¨å/Sb_EquipDotCheckRuleList.html', 'yes'],
			content: ['../è®¾å¤ç®¡ç/è®¾å¤è§ç¨å/Sb_EquipDotCheckRuleList.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -551,7 +623,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../è®¾å¤ç®¡ç/Sb_EquipDotCheckPlanBillList.html', 'yes'],
			content: ['../è®¾å¤ç®¡ç/Sb_EquipDotCheckPlanBillList.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -1020,7 +1092,7 @@
			async: false,
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data.h_v_Sb_EquipDotCheckBillList[0];
			var data = result.data.h_v_Sb_EquipDotCheckBill_Edit2[0];
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HBillNo": data.åæ®å·
			, "HDate": formatDate(data.æ¥æ)
			@@ -1040,6 +1112,16 @@
			, "HDotCheckNote": data.ç¹æ£æ°æ® //ç¹æ£æ°æ®
			, "HShiftsID": data.HShiftsID //
			, "HShiftsName": data.çæ¬¡åç§° //çæ¬¡åç§°
			, "HMaker": data.å¶åäºº
			, "HMakeDate": data.å¶åæ¥æ == null ? "" : Format(new Date(data.å¶åæ¥æ), "yyyy-MM-dd")
			, "HChecker": data.å®¡æ ¸äºº
			, "HCheckDate": data.å®¡æ ¸æ¥æ == null ? "" : Format(new Date(data.å®¡æ ¸æ¥æ), "yyyy-MM-dd")
			, "HUpDater": data.ä¿®æ¹äºº
			, "HUpDateDate": data.ä¿®æ¹æ¥æ == null ? "" : Format(new Date(data.ä¿®æ¹æ¥æ), "yyyy-MM-dd")
			, "HCloseMan": data.å³éäºº
			, "HCloseDate": data.å³éæ¥æ == null ? "" : Format(new Date(data.å³éæ¥æ), "yyyy-MM-dd")
			, "HDeleteMan": data.ä½åºäºº
			, "HDeleteDate": data.ä½åºæ¥æ == null ? "" : Format(new Date(data.ä½åºæ¥æ), "yyyy-MM-dd")
			//, "HLastResult": data.æç»ç»è®º == "åæ ¼" ? "OK" : "NG" //æç»ç»è®º
			});