MES-WEB-LayUI.git

			@@ -10,7 +10,8 @@
			<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
			<script src="../../layuiadmin/layui/layui.js"></script>
			<script src="../../layuiadmin/HideButton.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../layuiadmin/PageTitle.js"></script>

			<style type="text/css">
			input.layui-input.layui-unselect {
			@@ -108,6 +109,60 @@
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -192,6 +247,13 @@
			var option1 = [];
			var option2 = [];
			var HModName = "Sb_EquipMaintainBillList";

			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "3901";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
			//#endregion

			var titleData = ["hmainid", "åæ®ç±»å", "è¡¨å¤´å¤æ³¨", "éä»¶ä»£ç ", "hsubid", "è¡å³éäºº", "è¡¨ä½å¤æ³¨", "å¶åäºº", "ä¿®æ¹äºº", "ä½åºæ¥æ", "æºåä¸»åç ", "æºåååç ", "HEquipID", "åé¨åæ®å·", "HMaterID", "åä½ID", "è´è´£äººID", "HBillType"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//#region ãè¿æ»¤æ¹æ¡ã

			@@ -278,29 +340,6 @@
			};
			});

			//ç¹å»ä¸»è¡¨å¸¦åºä»è¡¨æ°æ®
			table.on('row(mainTable)', function (obj) { //æ³¨ï¼tool æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
			var datas = obj.data; //è·å¾å½åè¡æ°æ®
			var linterid = datas.hmainid;
			$.ajax({
			url: GetWEBURL() + 'Sb_EquipMaintainBill/Sb_EquipMaintainBillListProjectDetaiNew',
			type: "GET",
			data: { "HInterID": linterid },
			success: function (data1) {
			if (data1.count == 1) {
			option1.data = data1.list[0];
			table1.render(option1);
			option2.data = data1.list[1];
			table2.render(option2);
			} else {
			layer.alert("è·åå¤±è´¥", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			}
			});
			});

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			@@ -323,7 +362,7 @@
			//åå§åè¡¨æ ¼(åè¡¨2)
			set_InitGrid2();
			//æ¥è¯¢
			get_Display(sWhere);
			//get_Display(sWhere);
			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();
			}
			@@ -334,11 +373,12 @@
			, toolbar: '#toolbarDemo'
			, height: '400'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡è¡'}
			, { field: 'hmainid', title: 'hmainid', hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 160, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 160 }
			@@ -354,26 +394,26 @@
			, { field: 'éä»¶ä»£ç ', title: 'éä»¶ä»£ç ', width: 115, hide: true }
			, { field: 'éä»¶åç§°', title: 'éä»¶åç§°', width: 200 }
			, { field: 'åä½åç§°', title: 'åä½åç§°', width: 200 }
			, { field: 'å®éç¨é', title: 'å®éç¨é', width: 200 }
			, { field: 'æ åç¨é', title: 'æ åç¨é', width: 200 }
			, { field: 'å®éç¨é', title: 'å®éç¨é', width: 200, totalRow: true}
			, { field: 'æ åç¨é', title: 'æ åç¨é', width: 200 , totalRow: true}
			, { field: 'è´è´£äºº', title: 'è´è´£äºº', width: 200 }
			, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 200 }
			, { field: 'å³èæ°é', title: 'å³èæ°é', width: 200 }
			, { field: 'å³èéé¢', title: 'å³èéé¢', width: 200 }
			, { field: 'å³èæ°é', title: 'å³èæ°é', width: 200 , totalRow: true}
			, { field: 'å³èéé¢', title: 'å³èéé¢', width: 200, totalRow: true}
			, { field: 'è¡å³éäºº', title: 'è¡å³éäºº', width: 115, hide: true }
			, { field: 'å³éç±»å', title: 'å³éç±»å', width: 200 }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 200, hide: true }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 115, hide: true }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 200 }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 200, hide: true }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 115, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 115, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 200 }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200 }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 115, hide: true }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>"}
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 200 }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 115, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd')}}</div>", hide: true }
			, { field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 200, hide: true }
			, { field: 'æºåååç ', title: 'æºåååç ', width: 200, hide: true }
			, { field: 'æºååå·', title: 'æºååå·', width: 200 }
			@@ -382,6 +422,48 @@
			]]
			}
			}

			//#region ç¹å»è¡éä¸é«äº®
			table.on('row(mainTable)', function (obj) {
			//éä¸è¡æ¹åé¢è²
			var flag = !obj.tr.find(':checkbox:first').prop('checked');
			obj.tr.find(':checkbox').prop('checked', flag);
			if (flag) {
			obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //è®¾ç½®å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			} else {
			obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
			}
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.mainTable, function (i, l) {
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = flag;
			}
			});

			var datas = obj.data; //è·å¾å½åè¡æ°æ®
			var linterid = datas.hmainid;
			$.ajax({
			url: GetWEBURL() + 'Sb_EquipMaintainBill/Sb_EquipMaintainBillListProjectDetaiNew',
			type: "GET",
			data: { "HInterID": linterid },
			success: function (data1) {
			if (data1.count == 1) {
			option1.data = data1.list[0];
			table1.render(option1);
			option2.data = data1.list[1];
			table2.render(option2);
			} else {
			layer.alert("è·åå¤±è´¥", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			}
			});
			})
			//#endregion

			//åå§åè¡¨æ ¼(åè¡¨1)
			function set_InitGrid1() {
			var ajaxLoad = layer.load();
			@@ -390,6 +472,7 @@
			//, toolbar: '#toolbarDemo'
			, height: '350'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			@@ -418,6 +501,7 @@
			elem: '#mainTable2'
			//, toolbar: '#toolbarDemo'
			, height: '350'
			, totalRow: true
			, page: true
			, cellMinWidth: 90
			, limit: 50
			@@ -435,8 +519,8 @@
			//, { field: 'HManagerID', title: 'è´è´£äººID', width: 200, hide: true }
			//, { field: 'HManagerNumber', title: 'è´è´£äººä»£ç ', width: 200 }
			//, { field: 'HManagerName', title: 'è´è´£äºº', width: 200 }
			, { field: 'HQty', title: 'å®éç¨é', width: 200 }
			, { field: 'HQtyMust', title: 'æ åç¨é', width: 200 }
			, { field: 'HQty', title: 'å®éç¨é', width: 200, totalRow: true}
			, { field: 'HQtyMust', title: 'æ åç¨é', width: 200, totalRow: true }
			, { field: 'HRemark', title: 'å¤æ³¨', width: 200 }
			]]
			};
			@@ -449,6 +533,7 @@
			var ajaxLoad = layer.load();
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			//h_v_Sc_EquipMaintain
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL() + '/Sb_EquipMaintainBill/GetEquipMaintainBillList',
			type: "GET",
			@@ -461,9 +546,14 @@
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			//è·åä¸éè¦æ¾ç¤ºçåï¼Hå¼å¤´çåä¸æ¾ç¤ºï¼
			var patrn = new RegExp(/^h/i);
			if (patrn.test(data1.list[key].ColmCols)) {
			titleData[key] = data1.list[key].ColmCols;
			}
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡è¡' });
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, titleData) > -1 ) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			@@ -474,6 +564,13 @@
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			case 'long':
			case 'Int32':
			case 'Int64':
			case 'double':
			case 'Decimal':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			@@ -488,6 +585,7 @@
			, data: data1.data
			, height: 550
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			@@ -499,7 +597,6 @@

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "3901";
			@@ -528,7 +625,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ°å¢è®¾å¤ä¿å»è®°å½å ',
			title: 'æ°å¢' + HPageTitle,
			closeBtn: false,
			shift: 2,
			area: ['100%', '100%'],
			@@ -552,7 +649,7 @@
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ç¼è¾è®¾å¤ä¿å»è®°å½å '
			, title: 'ç¼è¾' + HPageTitle
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			@@ -656,6 +753,7 @@
			data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			get_FastQuery();
			layer.msg(result.Message, { icon: 1 });
			layer.close(wait);
			} else {
			@@ -715,6 +813,13 @@
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();

			var ColName1 = $("#ColName1").val();//å¤éæ¡
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();
			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			@@ -735,6 +840,48 @@
			break;
			}
			sWhere += " and " + ColName + " " + com;
			}
			if (ColName1 != 0 && Comparator1 != 0) {
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			}
			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			@@ -762,12 +909,18 @@
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			form.render('select');
			sWhere = "";
			$("#btnSearch").click();
			}

			//åææ¾ç¤ºä¸ææ¡
			//#region åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			@@ -777,8 +930,13 @@
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//#endregion

			//éèåè®¾ç½®
			function get_HideColumn() {