MES-WEB-LayUI.git

			@@ -16,7 +16,6 @@
			</style>
			</head>
			<body>

			<div id="layout1" class="layui-fluid">
			<div class="layui-row layui-col-space15">
			<div class="layui-col-md12">
			@@ -26,17 +25,15 @@
			<div class="layui-btn-group">
			<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">ä¿å</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">éåº</button>

			</div>

			</div>
			<div class="layui-card-body">
			<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
			<!--<ul class="layui-tab-title">
			<li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
			<!--<li>å¶ä»ä¿¡æ¯</li>-->
			<!--</ul>-->
			<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>
			</ul>
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<div class="layui-form-item">
			@@ -51,7 +48,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æ</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HDate" id="HDate" autocomplete="off" type="date">
			<input class="layui-input" name="HDate" id="HDate" autocomplete="off" type="date">
			</div>
			</div>
			<div class="layui-inline">
			@@ -150,6 +147,76 @@
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-input-inline" style="width:300px;">
			<textarea placeholder="è¯·è¾å¥å¤æ³¨" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
			</div>
			</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>
			@@ -402,7 +469,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../åºç¡èµæ/åºç¡èµæ/Gy_ConkReasonList.html', 'yes'],
			content: ['../åºç¡èµæ/åºç¡èµæ/Gy_ConkReasonList.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -513,7 +580,7 @@
			var data = result.data.h_v_Sb_EquipConkBookBillList_Edit[0];
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HBillNo": data.åæ®å·
			, "HDate": Format(data.æ¥æ)
			, "HDate": Format(data.æ¥æ, "yyyy-MM-dd")
			, "HInnerBillNo": data.åé¨åæ®å·
			, "HDeptID": data.HDeptID //ä½¿ç¨é¨é¨ID
			, "HDeptName": data.é¨é¨åç§° //ä½¿ç¨é¨é¨åç§°
			@@ -525,12 +592,21 @@
			, "HEquipName": data.è®¾å¤åç§° //è®¾å¤åç§°
			, "HConkTypeID": data.HConkTypeID //æéç±»å«ID
			, "HConkTypeName": data.æéç±»å« //æéç±»å«
			, "HConkBeginDate": Format(data.åçæ¥æ) //æéåçæ¥æ
			, "HConkBeginDate": Format(data.åçæ¥æ, "yyyy-MM-dd") //æéåçæ¥æ
			, "HExplanation": data.æéæè¿° //æè¦
			, "HLev": data.ç´§æ¥ç¨åº¦ //å¤æ³¨
			, "HReason": data.æéåå åæåé¢é²æªæ½ //å¤æ³¨
			, "HRemark": 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")
			});

			} else {
			@@ -553,7 +629,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true
			, content: ['../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, content: ['../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -667,7 +743,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) {

			@@ -705,7 +781,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_ConkType.html', 'yes'],
			content: ['../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_ConkType.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {