MES-WEB-LayUI.git

			@@ -33,7 +33,7 @@
			<div class="layui-card-body">
			<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
			<!--<ul class="layui-tab-title">
			<li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
			<li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
			<!--<li>å¶ä»ä¿¡æ¯</li>-->
			<!--</ul>-->
			<h1 style="text-align:center;"><b>è®¾å¤ä¿å»è®¡åå</b></h1>
			@@ -200,7 +200,7 @@
			var option1 = [];//éä»¶
			var sBillType = "3902";
			var TabRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };//ä¿å»
			var TabRow1 = { "HMaterID": 0, "HMaterCode":"", "HMaterName":"", "HUnitID": 0, "HUnitCode": "","HUnitName":"", "HQty": "", "HRemark": "" };//éä»¶
			var TabRow1 = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" };//éä»¶
			//#endregion


			@@ -313,34 +313,34 @@
			var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
			var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1;
			//if (AllowLoadData(sSubStr, sSubStr1)) {
			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "/Sb_EquipMaintainPlanBill/SaveEquipMaintainPlanBillList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "msg": sMainSub },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
			$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
			var index = parent.layer.getFrameIndex(window.name); //åå¾å°å½åiframeå±çç´¢å¼
			parent.layer.close(index); //åæ§è¡å³é Â Â Â Â Â Â Â Â Â Â
			});
			}
			else {

			f_alert(data.Message);
			console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
			}
			layer.closeAll("loading");
			},
			error: function (err) {

			f_alert("éè¯¯:" + err);
			console.log("Reason" + sMainStr);
			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "/Sb_EquipMaintainPlanBill/SaveEquipMaintainPlanBillList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "msg": sMainSub },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
			$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
			var index = parent.layer.getFrameIndex(window.name); //åå¾å°å½åiframeå±çç´¢å¼
			parent.layer.close(index); //åæ§è¡å³é Â Â Â Â Â Â Â Â Â Â
			});
			}
			});
			else {

			f_alert(data.Message);
			console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
			}
			layer.closeAll("loading");
			},
			error: function (err) {

			f_alert("éè¯¯:" + err);
			console.log("Reason" + sMainStr);
			}
			});
			//}
			});
			//éåº
			@@ -421,6 +421,9 @@
			, { field: 'HUnitID', title: 'åä½ID', edit: 'text', hide: true }
			, { field: 'HUnitNumber', title: 'åä½ä»£ç ', edit: 'text', event: "HUnitCode" }
			, { field: 'HUnitName', title: 'åä½åç§°', edit: 'text', event: "" }
			, { field: 'HManagerID', title: 'è´è´£äººID', edit: 'text', hide: true }
			, { field: 'HManagerNumber', title: 'è´è´£äººä»£ç ', edit: 'text', event: 'HManagerNumber' }
			, { field: 'HManagerName', title: 'è´è´£äºº', edit: 'text' }
			, { field: 'HQty', title: 'ç¨é', edit: 'text' }
			, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 150 }
			@@ -494,7 +497,7 @@
			"HBillNo": data.åæ®å·
			, "HDate": formatDate(data.æ¥æ)
			, "HInnerBillNo": data.åé¨åæ®å·
			,"HEquipID":data.è®¾å¤ID
			, "HEquipID": data.è®¾å¤ID
			, "HEquipName": data.è®¾å¤åç§° //è®¾å¤åç§°
			, "HBeginDate": formatDate(data.å¼å§æ¥æ) //å¼å§æ¥æ
			, "HEndDate": formatDate(data.ç»ææ¥æ) //ç»ææ¥æ
			@@ -517,7 +520,7 @@
			$("#HInterID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
			//ç¼è¾å è½½æ°æ®
			$.ajax({
			url: GetWEBURL() + 'Sb_EquipMaintainPlanBill/Sb_EquipMaintainBillListProjectDetaiNew',
			url: GetWEBURL() + 'Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBillListProjectDetaiNew',
			type: "GET",
			data: { "HInterID": linterid },
			success: function (result) {
			@@ -726,8 +729,7 @@
			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			if (event.key == "F7") {
			//åä½ä»£ç
			if (obj.event === 'HUnitCode')
			{
			if (obj.event === 'HUnitCode') {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			@@ -749,7 +751,7 @@
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HUnitID: checkStatus.data[0].HItemID,
			HUnitCode: checkStatus.data[0].HNumber,
			HUnitNumber: checkStatus.data[0].HNumber,
			HUnitName: checkStatus.data[0].HName
			});
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			@@ -785,7 +787,7 @@
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HMaterID: checkStatus.data[0].HItemID,
			HMaterCode: checkStatus.data[0].HNumber,
			HMaterNumber: checkStatus.data[0].HNumber,
			HMaterName: checkStatus.data[0].HName
			});
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			@@ -795,6 +797,46 @@
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			}
			});
			}
			//è´è´£äººä¿¡æ¯
			if (obj.event === 'HManagerNumber') {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'è´£ä»»äººåè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../PublicPage/UserInformation.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('è¯·éæ©æ°æ®');
			}

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HManagerID: checkStatus.data[0].HItemID,
			HManagerNumber: checkStatus.data[0].HNumber,
			HManagerName: checkStatus.data[0].HName
			});

			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			}
			});
			}
			@@ -834,7 +876,7 @@
			return false;
			}
			if (sSubStr[i].HManagerNumber == "") {
			layer.msg("ä¿å»é¡¹æç»è®°å½ç¬¬" + (i + 1) + "è¡,è´£ä»»äººä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("ä¿å»é¡¹æç»è®°å½ç¬¬" + (i + 1) + "è¡,è´è´£äººä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}

			@@ -847,15 +889,18 @@
			if (typeof (sSubStr1) != "undefined" && typeof (sSubStr1) != "") {
			sSubStr1 = JSON.parse(sSubStr1);
			for (var i = 0; i < sSubStr1.length; i++) {
			if (sSubStr1[i].HMaterCode == "") {
			if (sSubStr1[i].HMaterNumber == "") {
			layer.msg("éä»¶é¡¹æç»è®°å½ç¬¬" + (i + 1) + "è¡,éä»¶ä»£ç ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			if (sSubStr1[i].HUnitCode == "") {
			if (sSubStr1[i].HUnitNumber == "") {
			layer.msg("éä»¶é¡¹æç»è®°å½ç¬¬" + (i + 1) + "è¡,åä½ä»£ç ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}

			if (sSubStr[i].HManagerNumber == "") {
			layer.msg("ä¿å»é¡¹æç»è®°å½ç¬¬" + (i + 1) + "è¡,è´è´£äººä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			}
			}
			else {