MES-WEB-LayUI.git

			@@ -85,6 +85,24 @@
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 120px">ä¸è¯ç±»åï¼</label>
			<div class="layui-input-inline">
			<input type="text" name="HBadTypeName" id="HBadTypeName" lay-verify="HBadTypeName" readonly="readonly" autocomplete="off" class="layui-input" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HBadType-BT" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn " style="margin-left:-9px"></i>
			</button>
			<input id="HBadTypeID" name="HBadTypeID" type="hidden" />
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 120px">ä¸è¯ç±»åä»£ç ï¼</label>
			<div class="layui-input-inline">
			<input type="text" name="HBadTypeNumber" id="HBadTypeNumber" lay-verify="HBadTypeNumber" readonly="readonly" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<label class="layui-form-label"> ç¦ç¨æ å¿:</label>
			<div class="layui-input-inline">
			<!--<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true">-->
			@@ -160,7 +178,7 @@
			var isEndCheck = document.getElementById("HStopflag").checked;
			isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//å°æ°ç»åå¹¶æåç¬¦ä¸²

			var sMainStr = JSON.stringify(data.field);
			var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
			if (AllowLoadData()) {
			$.ajax(
			{
			@@ -208,7 +226,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_DepartmentList.html', 'yes'],
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -218,9 +236,9 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HDepName").val(checkStatus.data[0].HName);
			$("#HDepName").val(checkStatus.data[0].é¨é¨åç§°);
			$("#HDeptID").val(checkStatus.data[0].HItemID);
			$("#HDeptNumber").val(checkStatus.data[0].HNumber);
			$("#HDeptNumber").val(checkStatus.data[0].é¨é¨ä»£ç );
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -235,16 +253,17 @@
			}
			})
			});
			//éæ©é»è®¤å·¥åº
			form.on('submit(HProc-BT)', function () {//éæ©å·¥åº

			//éæ©é»è®¤ä¸è¯ç±»å
			form.on('submit(HBadType-BT)', function () {//éæ©é¨é¨
			layer.open({
			type: 2
			, area: ['80%', '80%']
			, title: 'å·¥åºåè¡¨'
			, title: 'ä¸è¯ç±»ååè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			//, maxmin: true //åè®¸å¨å±æå°å
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_ProcList.html', 'yes'],
			, content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_BadType.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -254,7 +273,44 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HProcName").val(checkStatus.data[0].å·¥åº);
			$("#HBadTypeName").val(checkStatus.data[0].ä¸è¯ç±»ååç§°);
			$("#HBadTypeID").val(checkStatus.data[0].HItemID);
			$("#HBadTypeNumber").val(checkStatus.data[0].ä¸è¯ç±»åä»£ç );
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			},
			success: function (layero, index) {

			}
			})
			});

			//éæ©é»è®¤å·¥åº
			form.on('submit(HProc-BT)', function () {//éæ©å·¥åº
			layer.open({
			type: 2
			, area: ['80%', '80%']
			, title: 'å·¥åºåè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			//, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html', '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('è¯·éæ©æ°æ®');
			}
			$("#HProcName").val(checkStatus.data[0].å·¥åºåç§°);
			$("#HProcID").val(checkStatus.data[0].HItemID);
			$("#HProcNumber").val(checkStatus.data[0].å·¥åºä»£ç );
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			@@ -322,6 +378,9 @@
			$("#HProcName").val(data.å·¥åºåç§°);//é»è®¤å·¥åº
			$("#HProcID").val(data.å·¥åºID);//å·¥åºID
			$("#HProcNumber").val(data.å·¥åºä»£ç );//å·¥åºä»£ç
			$("#HBadTypeName").val(data.ä¸è¯ç±»å);//é»è®¤ä¸è¯ç±»å
			$("#HBadTypeID").val(data.HBadTypeID);//ä¸è¯ç±»åID
			$("#HBadTypeNumber").val(data.ä¸è¯ç±»åä»£ç );//ä¸è¯ç±»åä»£ç
			$("#HRemark").val(data.å¤æ³¨);//å¤æ³¨
			$("input[name='HStopflag']").attr("checked", data.ç¦ç¨æ è®°);//true:éä¸ false:ä¸éä¸
			layui.form.render();//å®æ¶æ¸²æéä¸åä¸éä¸çæ ·å¼,æå¥½æ·»å è¿å¥è¯
			@@ -344,13 +403,17 @@
			layer.msg("è¯·éæ©é»è®¤é¨é¨", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			if ($("#HDepName").val() == '') {

			if ($("#HProcName").val() == '') {
			layer.msg("è¯·éæ©é»è®¤å·¥åº", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			else {
			return true;

			if ($("#HBadTypeNumber").val() == '') {
			layer.msg("è¯·éæ©é»è®¤ä¸è¯ç±»å", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			return true;
			}
			//
			function f_alert(sMsg) {