MES-WEB-LayUI.git

			@@ -264,13 +264,18 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥åºåå®¹</label>
			<div class="layui-input-inline" style="width:300px;height:15px">
			<textarea placeholder="è¯·è¾å¥æ¥åºåå®¹" class="layui-textarea" name="HBadNote" id="HBadNote"></textarea>
			<label class="layui-form-label">éæµç±»å:</label>
			<div class="layui-input-inline">
			<select name="TestType" lay-filter="TestType" id="TestType">
			<option value="é¦æ£">é¦æ£</option>
			<option value="å·¡æ£">å·¡æ£</option>
			<option value="æªæ£">æªæ£</option>
			<option value="å®éª">å®éª</option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">äº§ååé1:</label>
			<div class="layui-input-inline">
			@@ -287,6 +292,12 @@
			<label class="layui-form-label">äº§ååé3:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HProdWeight3" lay-verify="HProdWeight3" id="HProdWeight3" value="0" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">éæµåå®¹</label>
			<div class="layui-input-inline" style="width:300px;height:15px">
			<textarea placeholder="è¯·è¾å¥éæµåå®¹" class="layui-textarea" name="HBadNote" id="HBadNote"></textarea>
			</div>
			</div>
			</div>
			@@ -438,19 +449,27 @@
			//è®°å½ç»ç»çå¼
			var HOrgIDBar = 0;
			var HOrgIDBar1 = 0;
			var HCenterID = "";
			//å¤ææä½ç±»å
			if (OperationType == 1) {//æ æºå
			$("#HCheckEmp").val(sessionStorage["HEmpID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½åID
			$("#HCheckEmpName").val(sessionStorage["HEmpName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½å
			$("#HGroupID").val(sessionStorage["HGroupID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»ID
			$("#HGroupName").val(sessionStorage["HGroup"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»
			$("#HDeptID").val(sessionStorage["HDeptID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºé¨é¨ID
			$("#HDeptName").val(sessionStorage["HDept"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºé¨é¨
			HCenterID = sessionStorage["HWorkCenterID"]; //æ ¹æ®ç»å½ç¨æ·å¸¦åºå·¥ä½ä¸å¿ID
			set_AddFNew();
			get_HWorkShift();
			}
			else if (OperationType == 2) {//ææºå
			$("#HCheckEmp").val(sessionStorage["HEmpID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½åID
			$("#HCheckEmpName").val(sessionStorage["HEmpName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½å
			$("#HGroupID").val(sessionStorage["HGroupID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»ID
			$("#HGroupName").val(sessionStorage["HGroup"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»
			$("#HDeptID").val(sessionStorage["HDeptID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºé¨é¨ID
			$("#HDeptName").val(sessionStorage["HDept"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºé¨é¨
			HCenterID = sessionStorage["HWorkCenterID"]; //æ ¹æ®ç»å½ç¨æ·å¸¦åºå·¥ä½ä¸å¿ID
			set_AddNew();
			}
			else if (OperationType == 3) {//ç¼è¾
			@@ -530,7 +549,7 @@
			{
			type: "GET",
			url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetQC_TakeSampleCheckBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			async: false,
			data: {
			"HSourceInterID": HSourceInterID,
			"HSourceEntryID": HSourceEntryID,
			@@ -567,6 +586,9 @@
			$("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //çäº§è®¢ååID
			$("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //çäº§è®¢å
			$("#HICMOQty").val(LoadData[0].HICMOPlanQty); //çäº§è®¢åæ°é
			HCenterID = LoadData[0].HCenterID == null ? sessionStorage["HWorkCenterID"] : LoadData[0].HCenterID;//å·¥ä½ä¸å¿id
			//è·åçæ¬¡
			get_HWorkShift()
			}
			else {
			layer.alert(data.Message, { icon: 5 });
			@@ -626,6 +648,7 @@
			, "HProdWeight1": data[0]["äº§ååé1"] //äº§ååé1
			, "HProdWeight2": data[0]["äº§ååé2"] //äº§ååé2
			, "HProdWeight3": data[0]["äº§ååé3"] //äº§ååé3
			, "TestType": data[0]["éæµç±»å"] //éæµç±»å
			, "HGroupID": data[0]["HGroupID"] //çç»ID
			, "HGroupName": data[0]["çäº§çç»"] //çç»åç§°
			, "HShiftsID": data[0]["HShiftsID"] //çæ¬¡ID
			@@ -749,7 +772,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -789,7 +812,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html', 'yes'],
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html?Htype=&openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -903,7 +926,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_ShiftsList.html?type=HShifts', 'yes'],
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_WorkShiftList.html?type=HWorkShifts', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -914,7 +937,7 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HShiftsName").val(checkStatus.data[0].çæ¬¡åç§°);
			$("#HShiftsID").val(checkStatus.data[0].HItemID);
			$("#HShiftsID").val(checkStatus.data[0].HInterID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -941,7 +964,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) {

			@@ -1070,6 +1093,32 @@
			}
			//#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;
			$("#HShiftsID").val(LoadData[0].HInterID); //å½åå·¥åºID
			$("#HShiftsName").val(LoadData[0].çæ¬¡); //å½åå·¥åº
			}
			else {
			layer.alert(data.Message, { icon: 5 });
			}
			},
			error: function (err) {
			layer.alert(err, { icon: 5 });
			}
			});
			}

			//ä»¥ä¸ä¸ºlayuiæ¨¡å
			});
			@@ -1143,9 +1192,9 @@
			$("#HGroupID").val(obj[0].HItemID);
			}
			//çæ¬¡
			function GetHShiftsValue(obj) {
			function GetHWorkShiftsValue(obj) {
			$("#HShiftsName").val(obj[0].çæ¬¡åç§°);
			$("#HShiftsID").val(obj[0].HItemID);
			$("#HShiftsID").val(obj[0].HInterID);
			}

			function GetSwipeCardStart(obj) {