MES-WEB-LayUI.git

			@@ -12,6 +12,7 @@
			<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/xm-select.js"></script>
			<!--<script src="../../../layuiadmin/soulTable.slim.js"></script>--> <!--æ é¢çéä¸è½å¼ç¨æ¤jsæä»¶-->
			</head>
			<body>
			@@ -48,6 +49,13 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æé´é</label>
			<div class="layui-input-block">
			<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
			</select>
			</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="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 58px;width:160px;">
			@@ -68,9 +76,12 @@
			<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="HORGID" id="HORGID" lay-verify="HORGID">
			<!--<select name="HORGID" id="HORGID" lay-verify="HORGID">-->
			<!--å¨ææ¸²æç»ç»-->
			</select>
			<!--</select>-->
			<div id="demo1">

			</div>
			</div>
			</div>
			<div class="layui-inline">
			@@ -102,88 +113,88 @@
			</div>
			</div>
			<!--<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" 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 ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" 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 ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>
			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>-->
			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>-->

			</div>
			</div>
			@@ -242,6 +253,26 @@
			//#endregion

			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

			//#region æ¥æé´éä¸æåè¡¨çå¬
			form.on('select(HInitTimeCycle)', function (data) {
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			if (HInitTimeCycle != -1) {
			//$('#HDate').prop('disabled', true);
			//$('#HDate1').prop('disabled', true);

			$("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate()), "yyyy-MM-dd"));//æ¬ ææ¥æ
			$("#HEndDate").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//è³

			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			} else {
			//$('#HDate').prop('disabled', false);
			//$('#HDate1').prop('disabled', false);
			}
			});
			//#endregion

			//#region äº§åç¼ç
			form.on('submit(btnHMATERIALID)', function (data) {
			@@ -416,9 +447,13 @@

			//#region åå§åçé¢
			function set_ClearBill() {
			//åå§åæ¥æé´éãå¼å§æ¥æãç»ææ¥æ
			setSelect_HInitTimeCycle();
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//åå§åæ¥æ
			$("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//æææ¥æ
			$("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 7), "yyyy-MM-dd"));//è³
			$("#HEndDate").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//è³
			//çäº§ç»ç»å è½½
			Organ();
			//åå§åè¡¨æ ¼
			@@ -438,8 +473,9 @@
			, page: true
			, cellMinWidth: 90
			, totalRow: true
			, limit: 1000
			, limits: [50, 500,1000, 5000, 20000]
			, limit: 50
			, limits: [50, 500, 1000, 5000]
			, title:"é½å¥æ¥è¡¨"
			//, loading: false
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			@@ -458,8 +494,12 @@
			, { field: 'æ¥è®¡åæ°é', title: 'æ¥è®¡åæ°é', sort: true, totalRow: true, filter: true }
			, { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', sort: true, filter: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', sort: true, filter: true }
			, { field: 'ç©æè§æ ¼åå·', title: 'ç©æè§æ ¼åå·', sort: true, filter: true }
			, { field: 'ç©æå±æ§', title: 'ç©æå±æ§', sort: true, filter: true }
			, { field: 'ç©æè§æ ¼åå·', title: 'ç©æè§æ ¼åå·', sort: true, filter: true }
			, { field: 'åä½ç¨é', title: 'åä½ç¨é', sort: true, filter: true }
			, { field: 'ä¾è´§è½¦é´ä»£ç ', title: 'ä¾è´§è½¦é´ä»£ç ', sort: true, filter: true }
			, { field: 'ä¾è´§è½¦é´', title: 'ä¾è´§è½¦é´', sort: true, filter: true }
			, { field: 'ç©æå±æ§', title: 'ç©æå±æ§', sort: true, filter: true }
			, { field: 'ä»åºåç§°', title: 'ä»åºåç§°', sort: true, filter: true }
			, { field: 'è®¡ååææ°é', title: 'è®¡ååææ°é', sort: true, totalRow: true, filter: true }
			, { field: 'é½å¥æ°é', title: 'é½å¥æ°é', sort: true, totalRow: true, filter: true }
			, { field: 'ç¼ºææ°é', title: 'ç¼ºææ°é', sort: true, totalRow: true, filter: true }
			@@ -480,22 +520,34 @@
			function Organ() {
			//è·åç»å½é¡µç»ç»å
			var Organization = '';
			var selectDataList = [];
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Web/GetOrganizations",
			async: false,
			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>';
			/Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';/
			//ä¸æå¤éæ¡æ°æ®åå§å
			var selectData = { name: data[i].Name, value: data[i].ID };
			selectDataList.push(selectData);
			}
			$("#HORGID").append(Organization);
			$("#HORGID").val(sessionStorage["OrganizationID"])
			//$("#HORGID").append(Organization);
			//$("#HORGID").val(sessionStorage["OrganizationID"]);
			var demo1 = xmSelect.render({
			el: '#demo1',
			language: 'zn',
			/initValue: [sessionStorage["OrganizationID"]],///é»è®¤éé¡¹
			data: selectDataList
			})
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})

			}

			//#region æ¥è¯¢
			@@ -530,7 +582,14 @@
			function getExportData() {
			var data;//å¯¼åºçæ°æ®
			var ajaxLoad = layer.load();
			var HORGID = $("#HORGID").val();//ç»ç»
			var HORGID = "";//ç»ç»
			var xmList = xmSelect.get('#demo1', true);//è·åéæ©æ¡å®ä¾
			var xmValueStr = xmList.getValue("valueStr")//è·åå¼åç¬¦ä¸²
			if (xmValueStr == "") {
			HORGID = "'0'"//æ²¡éæ©ç»ç»åå¨é¨ç»ç»
			} else {
			HORGID = "'" + xmValueStr + "'"
			}
			var HMATERIALID = $("#HMATERIALID").val();//ç©æ/äº§å
			var HDeptID = $("#HDeptID").val();//çäº§è½¦é´
			var HSCZYID = $("#HSCZYID").val();//çäº§èµæº
			@@ -540,80 +599,6 @@
			var HEndDate = $("#HEndDate").val();//è³
			var HMaterAtt = $("#HMaterAtt").val();//ç©æå±æ§

			var ColName = $("#ColName").val();//å¤éæ¡
			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) {
			case "7":
			com = "like'%" + ColContent + "%'";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			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 (HBeginDate > HEndDate) {
			layer.close(ajaxLoad);
			@@ -650,7 +635,14 @@
			item[itemobj] = "";
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			if (itemobj == "è®¢åäº¤æ") {
			item[itemobj] = item[itemobj].toString().split('T')[0];
			}
			if (itemobj == "æ¥è®¡åæ¥æ") {
			item[itemobj] = item[itemobj].toString().split('T')[0];
			}
			}
			});
			@@ -675,11 +667,18 @@
			//#region å¿«éè¿æ»¤
			function get_FastQuery(number) {
			var HORGID = "";
			if (number == 1) {
			HORGID = sessionStorage["OrganizationID"];
			}
			else {
			HORGID = $("#HORGID").val();//ç»ç»
			//if (number == 1) {
			// HORGID = sessionStorage["OrganizationID"];
			//}
			//else {
			// HORGID = $("#HORGID").val();//ç»ç»
			//}
			var xmList = xmSelect.get('#demo1', true);//è·åéæ©æ¡å®ä¾
			var xmValueStr = xmList.getValue("valueStr")//è·åå¼åç¬¦ä¸²
			if (xmValueStr == "") {
			HORGID = "'0'"
			} else {
			HORGID = "'" + xmValueStr + "'"
			}
			var HMATERIALID = $("#HMATERIALID").val();//ç©æ/äº§å
			var HDeptID = $("#HDeptID").val();//çäº§è½¦é´
			@@ -689,81 +688,6 @@
			var HBeginDate = $("#HBeginDate").val();//æææ¥æ
			var HEndDate = $("#HEndDate").val();//è³
			var HMaterAtt = $("#HMaterAtt").val();//ç©æå±æ§

			var ColName = $("#ColName").val();//å¤éæ¡
			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) {
			case "7":
			com = "like'%" + ColContent + "%'";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			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 (HBeginDate > HEndDate) {
			return layer.msg("å¼å§æ¥æä¸è½å°äºç»ææ¥æ!");
			@@ -791,7 +715,7 @@

			//#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
			function set_ClearQuery() {
			$("#HORGID").val(sessionStorage["OrganizationID"]);//ç»ç»

			$("#HMATERIALID").val(0);//ç©æ/äº§å
			$("#HMATERIALNAME").val("");
			$("#HDeptID").val(0);//çäº§è½¦é´
			@@ -800,17 +724,8 @@
			$("#HSCZYName").val("");
			$("#HXQD").val("");//éæ±åå·
			$("#HMOBILLNO").val("");//çäº§è®¢åå·
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//æææ¥æ
			$("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 7), "yyyy-MM-dd"));//è³
			$("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 30), "yyyy-MM-dd"));//è³
			$("#HMaterAtt").val("");
			form.render('select');
			sWhere = "";
			@@ -909,6 +824,24 @@
			form.render('select');
			}

			//#region åå§æ¥æé´é ä¸æåè¡¨
			function setSelect_HInitTimeCycle() {
			var valueList = [7,30, 45, 60];
			var titleList = ["è¿7å¤©","è¿ä¸æ", "è¿45å¤©", "è¿60å¤©"];

			var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >ä»»æé´é</option>';
			for (var i = 0; i < valueList.length; i++) {
			HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
			}

			$("#HInitTimeCycle").empty();
			$("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
			form.render('select');

			$("#HInitTimeCycle").val("30");
			}
			//#endregion

			//#region éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";