MES-WEB-LayUI.git

			@@ -43,7 +43,7 @@
			<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>
			</ul>
			<div class="layui-tab-content">
			<!--åºæ¬ä¿¡æ¯-->
			@@ -86,8 +86,8 @@
			<div class="layui-inline">
			<label class="layui-form-label">çäº§çæ¬¡:</label>
			<div class="layui-input-inline">
			<input type="text" name="HWorkShiftName" id="HWorkShiftName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HWorkShiftID" id="HWorkShiftID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HWorkShiftName" id="HWorkShiftName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
			<input type="hidden" name="HWorkShiftID" id="HWorkShiftID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkShiftList" id="HWorkShiftLists" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -500,7 +500,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_WorkShiftList.html?type=HWorkShifts&OperationType=2', 'yes'],
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_WorkShiftList.html?type=HWorkShifts', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -628,8 +628,8 @@
			, { field: 'HMaterName', title: 'ç©æåç§°', event: "HMaterName", style: 'background-color: #f9f9f9;' } //f7
			, { field: 'HModel', title: 'è§æ ¼åå·', style: 'background-color: #f9f9f9;' }
			, { field: 'HUnitID', title: 'HUnitID', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HUnitName', title: 'è®¡éåä½', edit: 'text', event: "HUnitName", style: 'background-color: #f9f9f9;' }//f7
			, { field: 'HQty', title: 'è¿æ ·æ°é', edit: 'text', style: 'background-color: #f9f9f9;' }
			, { field: 'HUnitName', title: 'è®¡éåä½', event: "HUnitName", style: 'background-color: #f9f9f9;' }//f7
			, { field: 'HQty', title: 'è¿æ ·æ°é', edit: 'text' }
			, { field: 'HICMOInterID', title: 'HICMOInterID', hide: true,style: 'background-color: #f9f9f9;' }
			, { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HICMOBillNo', title: 'ä»»å¡åå·', style: 'background-color: #f9f9f9;' }
			@@ -727,7 +727,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'åéé¨é¨è¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -756,7 +756,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html', 'yes'],
			content: ['../../../views/åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -862,6 +862,16 @@
			, "HProcName": data[0]["å·¥åº"]
			, "HEmp": data[0]["HEmp"]
			, "HEmpName": data[0]["è¿æ ·å"]
			, "HMaker": data[0]["å¶åäºº"]
			, "HMakeDate": data[0]["å¶åæ¥æ"] == null ? "" : Format(new Date(data[0]["å¶åæ¥æ"]), "yyyy-MM-dd")
			, "HUpDater": data[0]["ä¿®æ¹äºº"]
			, "HUpDateDate": data[0]["ä¿®æ¹æ¥æ"] == null ? "" : Format(new Date(data[0]["ä¿®æ¹æ¥æ"]), "yyyy-MM-dd")
			, "HChecker": data[0]["å®¡æ ¸äºº"]
			, "HCheckDate": data[0]["å®¡æ ¸æ¥æ"] == null ? "" : Format(new Date(data[0]["å®¡æ ¸æ¥æ"]), "yyyy-MM-dd")
			, "HCloseMan": data[0]["å³éäºº"]
			, "HCloseDate": data[0]["å³éæ¥æ"] == null ? "" : Format(new Date(data[0]["å³éæ¥æ"]), "yyyy-MM-dd")
			, "HDeleteMan": data[0]["ä½åºäºº"]
			, "HDeleteDate": data[0]["ä½åºæ¥æ"] == null ? "" : Format(new Date(data[0]["ä½åºæ¥æ"]), "yyyy-MM-dd")
			});
			//ç»ç»çå¼HOrgIDååï¼éæ°æ¸²æ
			HOrgIDBar1 = data[0]["HSourceOrgID"];
			@@ -1028,7 +1038,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1072,7 +1082,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html?Type=HUnitList', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1138,6 +1148,11 @@
			$("#HEmpName").val(obj[0].èååç§°);
			$("#HEmp").val(obj[0].HItemID);
			}
			//è¿åå·¥åº
			function GetProcessValue(obj) { //è¿åå·¥åº
			$("#HProcName").val(obj[0].å·¥åºåç§°);
			$("#HProcID").val(obj[0].HItemID);
			}
			</script>
			</body>
			</html>