MES-WEB-LayUI.git

			@@ -110,7 +110,7 @@
			<div class="layui-input-inline">
			<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off">
			<input id="HInterID" name="HInterID" type="hidden" />
			<input id="HMaker" name="HMaker" type="hidden" /><!--å¶åäºº-->
			<!--<input id="HMaker" name="HMaker" type="hidden" />--><!--å¶åäºº-->
			</div>
			</div>
			<div class="layui-inline">
			@@ -123,7 +123,7 @@
			<label class="layui-form-label">å½åå·¥åº:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" disabled autocomplete="off">
			<input id="HProcID" name="HProcID" type="hidden" />
			<input id="HProcID" name="HProcID" value="0" type="hidden" />
			</div>
			</div>
			</div>
			@@ -132,7 +132,7 @@
			<label class="layui-form-label">äº§åä»£ç </label>
			<div class="layui-input-inline">
			<input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" id="HMaterList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -157,7 +157,7 @@
			<label class="layui-form-label">çäº§èµæº</label>
			<div class="layui-input-inline">
			<input type="text" name="HSourceName" id="HSourceName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HSourceID" id="HSourceID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HSourceID" id="HSourceID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceList" id="HSourceList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -167,15 +167,15 @@
			<label class="layui-form-label">çäº§è®¢å:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" autocomplete="off">
			<input id="HICMOInterID" name="HICMOInterID" type="hidden" />
			<input id="HICMOEntryID" name="HICMOEntryID" type="hidden" />
			<input id="HICMOInterID" name="HICMOInterID" type="hidden" value="0" />
			<input id="HICMOEntryID" name="HICMOEntryID" type="hidden" value="0" />
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æºååå·</label>
			<div class="layui-input-inline">
			<input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -196,10 +196,20 @@
			<input class="layui-input" name="HStopEndWorkTime" id="HStopEndWorkTime" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-inline" style="display:none">
			<label class="layui-form-label">æºåè¡å·:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HMainSourceEntryID" lay-verify="HMainSourceEntryID" id="HMainSourceEntryID" autocomplete="off" disabled>
			<input class="layui-input" name="HMainSourceEntryID" lay-verify="HMainSourceEntryID" id="HMainSourceEntryID" value="0" autocomplete="off" disabled>
			</div>
			</div>
			<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="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>
			</div>
			</div>
			</div>
			@@ -208,7 +218,7 @@
			<label class="layui-form-label">çäº§çç»:</label>
			<div class="layui-input-inline">
			<input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" id="HGroupList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -218,7 +228,7 @@
			<label class="layui-form-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="" style="float:left;width:150px;">
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" id="HEmpList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -228,7 +238,7 @@
			<label class="layui-form-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="" 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" id="HDeptList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -277,73 +287,74 @@
			</div>
			</div>
			</div>
			<div class="layui-tab-item">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">å¶åäºº:</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" disabled>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¿®æ¹äºº:</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" disabled>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å®¡æ ¸äºº:</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" disabled>
			</div>

			</div>
			<div class="layui-tab-item">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">å¶åäºº:</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" disabled>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">å¶åæ¥æ:</label>
			<div class="layui-input-inline">
			<input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¿®æ¹æ¥æ:</label>
			<div class="layui-input-inline">
			<input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å®¡æ ¸æ¥æ:</label>
			<div class="layui-input-inline">
			<input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¿®æ¹äºº:</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" disabled>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">å³éäºº:</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" disabled>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä½åºäºº:</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" disabled>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å®¡æ ¸äºº:</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" disabled>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">å³éæ¥æ:</label>
			<div class="layui-input-inline">
			<input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">å¶åæ¥æ:</label>
			<div class="layui-input-inline">
			<input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä½åºæ¥æ:</label>
			<div class="layui-input-inline">
			<input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¿®æ¹æ¥æ:</label>
			<div class="layui-input-inline">
			<input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å®¡æ ¸æ¥æ:</label>
			<div class="layui-input-inline">
			<input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">å³éäºº:</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" disabled>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä½åºäºº:</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" disabled>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">å³éæ¥æ:</label>
			<div class="layui-input-inline">
			<input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä½åºæ¥æ:</label>
			<div class="layui-input-inline">
			<input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
			</div>
			</div>
			</div>
			@@ -399,6 +410,7 @@
			, form = layui.form
			, laydate = layui.laydate
			, element = layui.element;
			var HCenterID = "0";
			//#endregion

			// #region é¡µé¢åå§å
			@@ -411,14 +423,20 @@
			$("#HEmpName").val(sessionStorage["HEmpName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½å
			$("#HGroupID").val(sessionStorage["HGroupID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»ID
			$("#HGroupName").val(sessionStorage["HGroup"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»
			HCenterID = sessionStorage["HWorkCenterID"]; //æ ¹æ®ç»å½ç¨æ·å¸¦åºå·¥ä½ä¸å¿ID
			set_AddFNew();
			//è·åå½åçæ¬¡
			get_HWorkShift();
			}
			else if (OperationType == 2) {//ææºå
			$("#HEmpID").val(sessionStorage["HEmpID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½åID
			$("#HEmpName").val(sessionStorage["HEmpName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½å
			$("#HGroupID").val(sessionStorage["HGroupID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»ID
			$("#HGroupName").val(sessionStorage["HGroup"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»
			HCenterID = sessionStorage["HWorkCenterID"]; //æ ¹æ®ç»å½ç¨æ·å¸¦åºå·¥ä½ä¸å¿ID
			set_AddNew();
			//è·åå½åçæ¬¡
			get_HWorkShift();
			}
			else if (OperationType == 3) {//ç¼è¾

			@@ -427,6 +445,7 @@
			else {
			layer.alert("æªç¥æä½ç±»åï¼", { icon: 5 });
			}

			//#endregion

			// #region é¡µé¢å è½½æææ¹æ³
			@@ -503,7 +522,7 @@
			{
			type: "GET",
			url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkFrom", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			async: false,
			data: {
			"HSourceInterID": HSourceInterID,
			"HSourceEntryID": HSourceEntryID,
			@@ -533,6 +552,7 @@
			$("#HICMOInterID").val(LoadData[0].HICMOInterID); //çäº§è®¢åID
			$("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //çäº§è®¢ååID
			$("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //çäº§è®¢å
			HCenterID = LoadData[0].HCenterID == null ? sessionStorage["HWorkCenterID"] : LoadData[0].HCenterID;//å·¥ä½ä¸å¿id
			}
			else {
			layer.alert(data.Message, { icon: 5 });
			@@ -992,6 +1012,46 @@
			});
			});

			//è¡¨å¤´ä¿¡æ¯çæ¬¡å¼¹çª
			form.on('submit(HWorkShiftList)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'çæ¬¡åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_WorkShiftList.html?type=HWorkShifts&OperationType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HWorkShiftName").val(checkStatus.data[0].çæ¬¡åç§°);
			$("#HWorkShiftID").val(checkStatus.data[0].HInterID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			},
			success: function (layero, index) {

			}
			});
			});



			function AllowLoadData() { //éç©ºéªè¯
			var Result = true;
			if ($("#HBillNo").val() == '' \|\| $("#HBillNo").val() == null) {
			@@ -1042,18 +1102,51 @@
			layer.msg("åå·¥ç±»åä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HStopReason").val() == '' \|\| $("#HStopReason").val() == null) {
			layer.msg("åå·¥åå ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			//if ($("#HStopReason").val() == '' \|\| $("#HStopReason").val() == null) {
			// layer.msg("åå·¥æè¿°ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return Result = false;
			//}
			return Result;
			}

			//#endregion

			//è·åçæ¬¡
			function get_HWorkShift() {
			var HDeptID = $("#HDeptID").val();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_ShiftsController/Get_HWorkShift", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: {
			"HDeptID": HDeptID,
			"HCenterID": HCenterID
			},
			success: function (data) {
			if (data.count == 1)// è¯´æéªè¯æåäºï¼
			{
			var LoadData = data.data;
			$("#HWorkShiftID").val(LoadData[0].HInterID); //å½åå·¥åºID
			$("#HWorkShiftName").val(LoadData[0].çæ¬¡); //å½åå·¥åº
			}
			else {
			layer.alert(data.Message, { icon: 5 });
			}
			},
			error: function (err) {
			layer.alert(err, { icon: 5 });
			}
			});
			}

			//ä»¥ä¸ä¸ºlayuiæ¨¡å
			});

			//çäº§çæ¬¡
			function GetHWorkShiftsValue(obj) {
			$("#HWorkShiftID").val(obj[0].HInterID); //å½åå·¥åºID
			$("#HWorkShiftName").val(obj[0].çæ¬¡åç§°); //å½åå·¥åº
			}

			function formatDate(date) {
			var d = new Date(date),
			month = '' + (d.getMonth() + 1),