MES-WEB-LayUI.git

			@@ -8,6 +8,13 @@
			<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<style type="text/css">
			.layui-form-label {
			width: 85px;
			@@ -38,8 +45,12 @@
			</div>
			</div>
			<div class="layui-card-body">
			<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			<h1 style="text-align:center;"><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">
			@@ -164,9 +175,93 @@
			<input type="checkbox" name="HStandard" id="HStandard" lay-skin="primary" title="" checked="">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px; ">ç»ç»<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			</div>
			</div>
			</div>
			<!--å¶ä»ä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item">
			<div class="layui-row">
			<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="HUpDater" id="HUpDater" 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>
			<div class="layui-row">
			<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="HMakerDate" id="HMakerDate" 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 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>
			<div class="layui-row">
			<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="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
			</div>
			</div>

			</div>
			<div class="layui-row">
			<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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>

			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			<div class="layui-tab-content">
			@@ -209,7 +304,7 @@
			<option value="2">éç¼ºé·</option>
			<option value="3">è½»ç¼ºé·</option>
			</select>
			</script>
			</script>
			<!--è¡ä¸æéæ©(ç¶æ)-->
			<script type="text/html" id="HStatus">
			<select name="HStatus" lay-filter="HStatus" id="HStatus{{d.LAY_TABLE_INDEX+1}}">
			@@ -227,11 +322,6 @@
			<input type="checkbox" value="{{d.HDestructInspect}}" lay-skin="primary" id="HDestructInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HDestructInspect" {{ d.HDestructInspect == 1 ? 'checked' : '' }}>
			</script>

			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script>
			//è·åé¡µé¢è·³è½¬åæ°
			var params = get_UrlVars();
			@@ -259,6 +349,8 @@
			, element = layui.element;
			var option;
			var sBillType = "3320";
			//è®°å½ç»ç»çå¼
			var HOrgIDBar = 0;
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -269,12 +361,51 @@
			if (OperationType == 1) {//æ æºå
			set_AddFNew();
			}
			else if (OperationType == 2) {//å¤å¶
			set_EditFromGrid();
			//è·åæå¤§åæ®å·
			get_MAXNum();
			//ç¦ç¨ç»ç»éé¡¹
			$('#HOrgID').attr("disabled", true);

			}
			else if (OperationType == 3) {//ç¼è¾

			set_EditFromGrid();
			}
			else {
			layer.alert("æªç¥æä½ç±»åï¼", { icon: 5 });
			}
			//#endregion

			//#region åå§åç»ç»
			Organ();
			//#endregion


			//#region è·åç»ç»
			function Organ() {
			//è·åç»å½é¡µç»ç»å
			var Organization = '';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Web/GetOrganizations",
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
			}
			$("#HOrgID").append(Organization);
			if (OperationType == 1) {
			HOrgIDBar = sessionStorage["OrganizationID"];
			}
			$("#HOrgID").val(HOrgIDBar);
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

			@@ -294,7 +425,7 @@
			, "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
			, "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
			, "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
			, "HControlUpperLimit": 0, "HControlLowerLimit":0
			, "HControlUpperLimit": 0, "HControlLowerLimit": 0, "HSampleCount": 0, "HSampleDayCount": 0
			};
			switch (obj.event) {
			//æ°å¢ä¸è¡
			@@ -983,6 +1114,8 @@
			, { field: 'HDownOffSetTxt', title: 'ä¸åå·®ææ¬', edit: 'text' }
			, { field: 'HControlUpperLimit', title: 'æ§å¶ä¸é', edit: 'text' }
			, { field: 'HControlLowerLimit', title: 'æ§å¶ä¸é', edit: 'text' }
			, { field: 'HSampleCount', title: 'æ ·æ¬æ°', edit: 'text' }
			, { field: 'HSampleDayCount', title: 'æ ·æ¬å¤©æ°', edit: 'text' }
			, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			];
			@@ -1041,6 +1174,8 @@

			//æ æºåæ°å¢
			function set_AddFNew() {
			//ç¦ç¨ç»ç»éé¡¹
			$('#HOrgID').attr("disabled", true);
			//è·åæå¤§åæ®å·
			get_MAXNum();
			option.data = [{
			@@ -1052,9 +1187,12 @@
			, "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
			, "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
			, "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
			, "HControlUpperLimit": 0, "HControlLowerLimit": 0
			, "HControlUpperLimit": 0, "HControlLowerLimit": 0, "HSampleCount": 0, "HSampleDayCount": 0
			}];
			table.render(option);
			//åå§åå¶åäººåå¶åæ¶é´
			$("#HMaker").val(sessionStorage["HUserName"]);
			$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
			}

			//ç¼è¾
			@@ -1070,7 +1208,7 @@
			, "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
			, "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
			, "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
			, "HControlUpperLimit": 0, "HControlLowerLimit": 0
			, "HControlUpperLimit": 0, "HControlLowerLimit": 0, "HSampleCount": 0, "HSampleDayCount": 0
			}];
			table.render(option);
			}
			@@ -1101,6 +1239,7 @@
			$.ajax({
			url: GetWEBURL() + "QC_Management/MES_QC_CheckProjectListCheckDetai",
			type: "GET",
			async: false,
			data: {
			"HID": linterid
			},
			@@ -1120,8 +1259,8 @@

			layui.form.render();//å®æ¶æ¸²æéä¸åä¸éä¸çæ ·å¼,æå¥½æ·»å è¿å¥è¯
			form.val("component-form-group", {
			"HBillNo": data.åæ®å·
			, "HInterID": data.hmainid
			"HBillNo": OperationType == 2 ? "" : data.åæ®å·
			, "HInterID": OperationType == 2 ? "" : data.hmainid
			, "HDate": formatDate(data.æ¥æ)
			, "HName": data.æ¹æ¡åç§°
			, "HMaterName": data.ç©æåç§°
			@@ -1142,9 +1281,20 @@
			, "HStandard": data.é»è®¤æ¹æ¡ == 1 ? true : false
			, "HSourceID": data.HSourceID
			, "HSourceName": data.çäº§èµæº
			, "HMaker": data.å¶åäºº
			, "HUpDater": data.ä¿®æ¹äºº
			, "HChecker": data.å®¡æ ¸äºº
			, "HMakerDate": data.å¶åæ¥æ == null ? "" : Format(new Date(data.å¶åæ¥æ), "yyyy-MM-dd")
			, "HUpDateDate": data.ä¿®æ¹æ¥æ == null ? "" : Format(new Date(data.ä¿®æ¹æ¥æ), "yyyy-MM-dd")
			, "HCheckDate": 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")

			});

			//ç»ç»çå¼HOrgIDååï¼éæ°æ¸²æ
			HOrgIDBar = sessionStorage["OrganizationID"];
			} else {
			layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			@@ -1230,7 +1380,7 @@
			"HDownLimitTxt": data[i].ä¸éå¼ææ¬, "HUpOffSetTxt": data[i].ä¸åå·®ææ¬, "HDownOffSetTxt": data[i].ä¸åå·®ææ¬,
			"HQualityStdName": data[i].è´¨éæ ååç§°, "HInspectMethodName": data[i].æ£éªæ¹æ³åç§°, "HInspectInstruMentName": data[i].æ£éªä»ªå¨åç§°,
			"HInspectBasisName": data[i].æ£éªä¾æ®åç§°, "HSampleSchemeName": data[i].åæ½æ ·æ¹æ¡åç§°
			, "HControlUpperLimit": data[i].æ§å¶ä¸é, "HControlLowerLimit": data[i].æ§å¶ä¸é
			, "HControlUpperLimit": data[i].æ§å¶ä¸é, "HControlLowerLimit": data[i].æ§å¶ä¸é, "HSampleCount": data[i].æ ·æ¬æ°, "HSampleDayCount": data[i].æ ·æ¬å¤©æ°
			});
			}

			@@ -1309,7 +1459,7 @@
			}
			if (option.data[i - 1].HKeyInspect) {
			$('#HKeyInspect' + i + '').attr("checked", true);
			}
			}
			}
			form.render('select');
			form.render('checkbox');
			@@ -1340,7 +1490,7 @@
			}
			if (option.data[i - 1].HKeyInspect) {
			$('#HKeyInspect' + i + '').attr("checked", true);
			}
			}
			}
			form.render('select');
			form.render('checkbox');