MES-WEB-LayUI.git

			@@ -1,5 +1,6 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">

			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>ç©æè®¾ç½®</title>
			@@ -21,11 +22,12 @@
			<script src="../../../layuiadmin/SetColumn.js"></script>
			<style>
			/æ ç¶å¾ç¹å»é«äº®åè²/
			.layui-tree-set-active > .layui-tree-entry .layui-tree-main {
			.layui-tree-set-active>.layui-tree-entry .layui-tree-main {
			background: #aef0f7;
			}
			</style>
			</head>

			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			@@ -42,72 +44,88 @@
			<div class="layui-inline">
			<label class="layui-form-label">ç©æä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
			<input type="text" class="layui-input ForFilteringSchemes" name="HNumber"
			id="HNumber">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æåç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
			<input type="text" class="layui-input ForFilteringSchemes" name="HName"
			id="HName">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">é¡¹ç®å·</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
			<select name="HProject" id="HProject" class=" ForFilteringSchemes"
			lay-verify="HProject">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
			lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
			lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

			<!--æ¾ç¤ºå½åè¿æ»¤æ¹æ¡-->
			<div class="layui-inline" style="margin-left:5px;">
			<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
			<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
			id="HFilterScheme_Now"></div>
			</div>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<label class="layui-form-label">ç©æä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
			<input type="text" class="layui-input ForFilteringSchemes"
			name="HNumber2" id="HNumber2" style="width:190px;">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
			lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ç»åç§°</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HOrgID" id="HOrgID" class=" ForFilteringSchemes" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HOrgID" id="HOrgID" class=" ForFilteringSchemes"
			lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è§æ ¼åå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HModel" id="HModel">
			<input type="text" class="layui-input ForFilteringSchemes" name="HModel"
			id="HModel">
			</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="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
			<select name="ColName" id="ColName" lay-filter="ColName"
			style="width:190px;" class="ForFilteringSchemes">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
			<select name="Comparator" id="Comparator" lay-filter="Comparator"
			style="width:190px;" class="ForFilteringSchemes">
			<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="<=">
			<=< /option>
			<option value="<">
			<< /option>
			<option value="<>">
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			@@ -115,26 +133,33 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			<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;" class="ForFilteringSchemes">
			<select name="ColName1" id="ColName1" lay-filter="ColName1"
			style="width:190px;" class="ForFilteringSchemes">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;" class="ForFilteringSchemes">
			<select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
			style="width:190px;" class="ForFilteringSchemes">
			<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="<=">
			<=< /option>
			<option value="<">
			<< /option>
			<option value="<>">
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			@@ -142,26 +167,33 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			<input type="text" class="layui-input ForFilteringSchemes" 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;" class="ForFilteringSchemes">
			<select name="ColName2" id="ColName2" lay-filter="ColName2"
			style="width:190px;" class="ForFilteringSchemes">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;" class="ForFilteringSchemes">
			<select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
			style="width:190px;" class="ForFilteringSchemes">
			<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="<=">
			<=< /option>
			<option value="<">
			<< /option>
			<option value="<>">
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			@@ -169,7 +201,8 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			<input type="text" class="layui-input ForFilteringSchemes" value=""
			name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			@@ -181,10 +214,10 @@
			<div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
			<div id="TreeTable" class="demo-tree demo-tree-box" style="width:99.5%;height:calc(50vh);"></div>
			<div style="width:99.5%;height:calc(35vh);position: relative;">-->
			<!--//è½®æå¾-->
			<!--<div class="layui-carousel" id="test1" style="position:absolute;">-->
			<!--éæåº¦ opacity: 0.2-->
			<!--<div carousel-item id="file">
			<!--//è½®æå¾-->
			<!--<div class="layui-carousel" id="test1" style="position:absolute;">-->
			<!--éæåº¦ opacity: 0.2-->
			<!--<div carousel-item id="file">

			</div>
			</div>
			@@ -197,7 +230,7 @@
			</div>
			</div>-->
			<!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
			<script type="text/html" id="toolbarDemo" >
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layuiiconlayuiicontips"></i>é¢è§</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>å¯¼å¥</button>
			@@ -216,6 +249,8 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_QueryCondition" id="set_QueryCondition"><i class="layui-icon layui-icon-set"></i>é«çº§è¿æ»¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>ä¿åæ¹æ¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>è¯»åæ¹æ¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-correct" id="btn-correct"><i class="layui-icon layui-icon-edit"></i>æ¹æ¹</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-correct2" id="btn-correct2"><i class="layui-icon layui-icon-edit"></i>æ¹æ¹(æ¹æ¡2)</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			@@ -223,7 +258,8 @@
			</form>
			<div class="layui-row" style="padding:10px 0">
			<div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
			<div id="TreeTable" class="demo-tree demo-tree-box" style="width:99.5%;height:calc(45vh);overflow-y:auto"></div>
			<div id="TreeTable" class="demo-tree demo-tree-box"
			style="width:99.5%;height:calc(45vh);overflow-y:auto"></div>
			<div style="width:99.5%;height:calc(35vh);position: relative;">
			<!--//è½®æå¾-->
			<div class="layui-carousel" id="test1" style="position:absolute;">
			@@ -235,8 +271,8 @@
			</div>
			</div>
			<div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 75%">
			<div >
			<table class="" id="mainTable" lay-filter="mainTable" ></table>
			<div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			</div>
			<div id="page" style="position:relative;bottom:0;"></div>
			</div>
			@@ -264,7 +300,7 @@
			, laydate = layui.laydate
			, tree = layui.tree
			, carousel = layui.carousel
			var sWhere = " and 1=0";
			var sWhere = " and 1=1";
			var sql = "";
			var option = [];
			var Organization = sessionStorage["Organization"];
			@@ -272,7 +308,7 @@
			var HBillType = "Gy_Material";
			var HModName = "Gy_Material";
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HItemID", "HUnitID", "HParentID", "HUSEORGID", "HMinPickQty", "HEndFlag", "HStopFlag","éæ©","sorderid"];
			var titleData = ["HItemID", "HUnitID", "HParentID", "HUSEORGID", "HMinPickQty", "HEndFlag", "HStopFlag", "éæ©", "sorderid"];

			var ins; //ç¨äºå¯¼åºexcel
			var HMaterTypeID = 0; //ç©æåç±»èç¹id
			@@ -377,6 +413,11 @@
			//è¯»åæ¹æ¡
			case 'set_ReadScheme': set_ReadScheme();
			break;
			// æ¹æ¹
			case 'btn-correct': set_correct();
			break;
			case 'btn-correct2': set_correct2();
			break;
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn(HModName, sessionStorage["HUserName"], option, optionPage, get_FastQuery);
			@@ -401,7 +442,7 @@
			} else {
			get_FastQuery();
			}


			//$("#btnSearch").click();
			});
			//#endregion
			@@ -441,10 +482,10 @@
			btnrowDouble(obj);
			})

			function btnrowDouble(obj) {
			function btnrowDouble(obj) {
			var index = parent.layer.getFrameIndex(window.name);
			var data = obj.data;
			//è¿åæ¹æ³
			//è¿åæ¹æ³
			parent.GetGyMaterial(data);
			parent.layer.close(index);
			}
			@@ -510,12 +551,12 @@

			//#region åå»è¿åæ°æ®
			//table.on('rowDouble(mainTable)', function (obj) {
			// var data = [];
			// data.push(obj.data);
			// parent.GetMaterValue(data);
			// var index = parent.layer.getFrameIndex(window.name);
			// parent.layer.close(index);
			// });
			// var data = [];
			// data.push(obj.data);
			// parent.GetMaterValue(data);
			// var index = parent.layer.getFrameIndex(window.name);
			// parent.layer.close(index);
			// });
			//#endregion

			//#region æ¬é¡µé¢è¢«è°ç¨çæææ¹æ³
			@@ -535,8 +576,7 @@
			//è·åé¡¹ç®å·
			Get_HProject();
			get_FastQuery()
			//è¿æ»¤æ¹æ¡
			get_DefaultModule()

			}
			//#endregion

			@@ -547,7 +587,7 @@
			, toolbar: '#toolbarDemo'
			, height: 'full-150'
			, page: false
			, limit: 50
			, limit: 50
			, done: function (res, curr, count) {
			var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
			var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
			@@ -643,7 +683,7 @@
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL() + '/Gy_Material/list',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization},
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization },
			success: function (data1) {
			if (data1.count != 0) {
			var data = [];
			@@ -706,7 +746,7 @@
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
			success: function (data1) {
			option.limit = size;//æ¹åè¡¨æ ¼é¡µå¤§å°
			if (data1.code==1) {
			if (data1.code == 1) {
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			var data = [];
			var col = [];
			@@ -748,11 +788,13 @@

			ins = table.render(option);
			laypage.render(optionPage);



			layer.close(ajaxLoad);
			if ($("#ColName option").length < 1) {
			ColFilter();
			//è¿æ»¤æ¹æ¡
			get_DefaultModule()
			}
			Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			@@ -946,7 +988,7 @@
			function set_DeleteBill() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			if (checkStatus.data.length === 1 && data[0].å®¡æ ¸äºº === "") {
			var ItemID = data[0].HItemID.toString();
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			var wait = layer.load();
			@@ -954,7 +996,7 @@
			$.ajax({
			url: GetWEBURL() + 'Gy_Material/Delete',
			type: "GET",
			data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
			data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			console.log('gouba' + result);
			if (result.count == 1) {
			@@ -979,7 +1021,7 @@
			})
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
			layer.msg('è¯·éæ©ä¸è¡æªå®¡æ ¸æ°æ®å é¤ï¼');
			}
			}
			//#endregion
			@@ -1104,7 +1146,7 @@
			}
			});
			}


			}
			//#endregion

			@@ -1149,7 +1191,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../å¬ç¨åºç¡èµæ/Add_Edit_Gy_Material.html?hID=' + hID +"&OperationType=2"
			, content: '../å¬ç¨åºç¡èµæ/Add_Edit_Gy_Material.html?hID=' + hID + "&OperationType=2"
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			@@ -1351,7 +1393,7 @@
			}
			//#endregion




			//é«çº§è¿æ»¤
			function set_QueryCondition() {
			@@ -1369,7 +1411,7 @@
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç

			var HModBillName = "h_v_Gy_MaterialList";//çäºè¯¥åè¡¨çè§å¾
			var HModBillName = "h_v_Gy_MaterialList";//çäºè¯¥åè¡¨çè§å¾

			contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_QueryCondition.html?HModName=' + HModBillName + '&colName=' + colName;

			@@ -1409,7 +1451,7 @@
			})
			}



			//#region åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			@@ -1475,7 +1517,10 @@
			} else if (openType2 == "SeOrder") {
			sWhere += " and ç©æå±æ§='èªå¶' "
			}
			Organ(HOrgID);
			if (typeof (HOrgID) != "undefined") {
			Organ(HOrgID);
			}

			}
			}
			//#endregion
			@@ -1517,7 +1562,7 @@
			document.getElementById("HFilterScheme_Now").style.display = "none";
			//æ§è¡æ¥è¯¢æ¹æ³
			//æ¥è¯¢
			get_FastQuery();
			//get_FastQuery();
			form.render("select");
			}
			}, error: function () {
			@@ -1525,6 +1570,33 @@
			}
			});
			}
			//#region æ¹æ¹
			function set_correct() {
			// window.open("./Gy_MaterialCorrection.html", "_blank")
			layer.open({
			type: 2,
			content: '../å¬ç¨åºç¡èµæ/Gy_MaterialCorrection.html',
			area: ['100%', '100%'], // åå§å®½é«
			maxmin: true,
			success: function (layero, index) {

			}
			});

			}

			function set_correct2() {
			layer.open({
			type: 2,
			content: '../å¬ç¨åºç¡èµæ/Gy_MaterialCorrection2.html',
			area: ['100%', '100%'], // åå§å®½é«
			maxmin: true,
			success: function (layero, index) {

			}
			});
			}
			//#endregion

			//ä¿åæ¹æ¡
			function set_SaveScheme() {
			@@ -1687,7 +1759,7 @@

			//#endregion
			});
			//#endregion
			//#endregion

			function GetDataCol(data) {
			GetDataCols = data;
			@@ -1755,4 +1827,5 @@
			</script>

			</body>

			</html>