MES-WEB-LayUI.git

			@@ -5,13 +5,14 @@
			<title>é½å¥æ¥è¡¨</title>
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<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/soulTable.slim.js"></script>
			<!--<script src="../../../layuiadmin/soulTable.slim.js"></script>--> <!--æ é¢çéä¸è½å¼ç¨æ¤jsæä»¶-->
			</head>
			<body>
			<div class="layui-fluid">
			@@ -24,14 +25,6 @@
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			</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="HORGID" id="HORGID" lay-verify="HORGID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<div class="layui-inline">
			@@ -48,17 +41,45 @@
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">çäº§è½¦é´</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="hidden" class="layui-input" lay-verify="HDeptID" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="text" class="layui-input" lay-verify="DeptNAME" name="DeptNAME" id="DeptNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="text" class="layui-input" lay-verify="DeptNAME" name="DeptNAME" id="DeptNAME" value="" style="width: 60%;display: inline-block;">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</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;">
			</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="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 58px;width:160px;">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">æ¥è¯¢</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">éç½®</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnExport" id="btnExport">å¯¼åº</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="bthHideColumn" id="bthHideColumn">åè®¾ç½®</button>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin: 10px 0 10px;">
			<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>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">çäº§èµæº</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			@@ -81,89 +102,95 @@
			<input type="text" class="layui-input" name="HMOBILLNO" id="HMOBILLNO">
			</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 class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æå±æ§</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMaterAtt" id="HMaterAtt">
			</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-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>
			@@ -181,10 +208,18 @@
			var treeCkData = { id: 0 };
			var TagId = "";
			var TagParentId = "";

			//#region ææ¬æ¡è¾å¥æç´¢ç¸å³æ°æ®-åé
			var childPage = null; //è·ååçªå£å¯¹è±¡ï¼ç¨äºæä½åçªå£çåéåæ¹æ³
			var currRowIndex = 0; //ç¨äºå®ä½åçªå£å½åéä¸çè¡
			var childData = null; //ç¨äºè·ååçªå£è¿åçæ°æ®
			//#endregion

			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			soulTable: '../ext/soulTable'
			}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable'], function () {
			//#region å¬ç¨åé
			var $ = layui.$
			@@ -202,6 +237,8 @@
			var sWhere = "";
			var option = [];
			var ins; //ç¨äºå¯¼åºexcel
			var HModName = "ReportMOMaterReadysBillList";
			var titleData = [];
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -212,6 +249,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) {
			@@ -249,12 +306,150 @@
			});
			//#endregion

			//#region åè®¾ç½®æé®
			form.on('submit(bthHideColumn)', function (data) {
			get_HideColumn();
			});
			//#endregion


			//#region ææ¬æ¡çå¬
			$(document).ready(function () {
			//#region æ ¹æ®ç©æä»£ç è·åç©æåºç¡èµæçéå¼¹çª
			//æ ¹æ®åç´ IDå¯¹åç´ è¿è¡çå¬=============================================================================
			$("#DeptNAME").on('keydown', function (data) {
			//================================================================================================
			var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
			if ($.inArray(event.key, errKeys) == -1) { //å¦ææä¸çé®ä½ä¸æ¯ æ¹åé®ï¼åå·æ°å¼¹çªä¸çæ°æ®
			if (childPage == null) { //å¤æå½ååçªå£æ¯å¦å·²ç»æå¼ï¼è¥æªæå¡ï¼åæå¼é¡µé¢ï¼å¹¶è·ååçªå£çå¯¹è±¡
			var offset = $(this).offset(); //è·åè§¦åäºä»¶çåç´ çä½ç½®ï¼ç¨äºå®ä½åçªå£æå¼çä½ç½®
			var innerHeight = window.innerHeight;
			var top = offset.top + 0.05 * innerHeight;
			var left = offset.left;
			if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
			top = top - 0.3 * innerHeight - 0.05 * innerHeight;
			}
			layer.open({
			type: 2 //å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['25%', '30%'] //å¤§å°
			, shadeClose: true //ç¹å»é®ç½©æ¶å³éå¼¹çª
			, offset: [top, left]
			, title: false //ä¸æ¾ç¤ºæ é¢æ
			//, title: 'é¡¹ç®è´¹ç¨åè¡¨' //æ é¢
			, shift: 2 //å¼¹åºå¨ç»
			, closeBtn: 0 //ç¦ç¨å³éæé®
			, content: ["../../åºç¡èµæ/éç¨åºç¡èµæ/Gy_CommonBaseDataCheck.html?OperationType=2", "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('è¯·éæ©æ°æ®');
			}

			var HIDValue = "";
			var HNameValue = "";
			for (var i = 0; i < checkStatus.data.length; i++) {
			HIDValue += checkStatus.data[i].HItemID + ",";
			HNameValue += checkStatus.data[i].é¨é¨åç§° + ",";
			}

			//å»é¤æ«å°¾éå·
			HIDValue = HIDValue.substring(0, HIDValue.length - 1);
			HNameValue = HNameValue.substring(0, HNameValue.length - 1);
			$("#HDeptID").val(HIDValue);
			$("#DeptNAME").val(HNameValue);
			//è·åæ°æ®

			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			, success: function (layero, index) {
			setTimeout(function () {
			//ä¿®æ¹ï¼æ ¹æ®ææ¬æ¡æ°æ®ï¼ç¼åæ¥è¯¢è¯å¥================================================================================================
			var value = $("#DeptNAME").val().replace(/'/g, ""); //è·åææ¬æ¡ææ°å¼
			currRowIndex = 0;
			var tableView = "h_v_Gy_DepartmentList";
			var childSWhere = "select top(10) HItemID,é¨é¨ä»£ç ,é¨é¨åç§° from " + tableView + " where 1=1 and ç»ç»åç§° = '" + sessionStorage["Organization"] + "' and (é¨é¨ä»£ç like '%" + value + "%' or é¨é¨åç§° like '%" + value + "%') order by é¨é¨ä»£ç desc";
			childPage.getData(childSWhere, tableView);
			//===================================================================================================================================
			}, 200);
			}
			, end: function () {
			childPage = null;
			currRowIndex = 0;
			if (childData != null) {
			//æ ¹æ®å¼¹çªè¿åæ°æ®è®¾ç½®ææ¬æ¡æ°æ®=================================================================================================
			//è·åæ°æ®
			$("#HDeptID").val(childData.HItemID);//è½¦é´id
			$("#DeptNAME").val(childData.é¨é¨åç§°);//è½¦é´åç§°
			//===============================================================================================================================

			childData = null;
			}
			}
			});
			} else {
			setTimeout(function () {
			//ä¿®æ¹ï¼æ ¹æ®ææ¬æ¡æ°æ®ï¼ç¼åæ¥è¯¢è¯å¥================================================================================================
			var value = $("#DeptNAME").val().replace(/'/g, ""); //è·åææ¬æ¡ææ°å¼
			currRowIndex = 0;
			var tableView = "h_v_Gy_DepartmentList";
			var childSWhere = "select top(10) HItemID,é¨é¨ä»£ç ,é¨é¨åç§° from " + tableView + " where 1=1 and ç»ç»åç§° = '" + sessionStorage["Organization"] + "' and (é¨é¨ä»£ç like '%" + value + "%' or é¨é¨åç§° like '%" + value + "%') order by é¨é¨ä»£ç desc";
			childPage.getData(childSWhere, tableView);
			//=================================================================================================================================
			}, 200);
			}
			} else { //å¦ææä¸çé®ä½æ¯ æ¹åé®ï¼åè°æ´çªå£ä¸ éä¸è¡ çä½ç½®
			if (event.key == "ArrowUp") {
			currRowIndex--;
			childPage.setSelectedRow(currRowIndex);
			} else if (event.key == "ArrowDown") {
			currRowIndex++;
			childPage.setSelectedRow(currRowIndex);
			} else if (event.key == "Enter") {
			//æå¨å¤±ç¦
			var element = document.getElementById("HMaterNumber");
			element.blur();

			childPage.getSelectedData(currRowIndex);

			if (childData != null) {
			//æ ¹æ®å¼¹çªè¿åæ°æ®è®¾ç½®ææ¬æ¡æ°æ®=================================================================================================
			//è·åæ°æ®
			$("#HDeptID").val(childData.HItemID);//è½¦é´id
			$("#DeptNAME").val(childData.é¨é¨åç§°);//è½¦é´åç§°
			//===============================================================================================================================

			childData = null;
			}


			childPage = null;
			currRowIndex = 0;
			childData = null;
			}
			}
			});
			//#endregion
			});
			//#endregion


			//#endregion

			//#region æ¬é¡µé¢è¢«è°ç¨çæææ¹æ³

			//#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().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//è³
			//çäº§ç»ç»å è½½
			Organ();
			//åå§åè¡¨æ ¼
			@@ -276,36 +471,41 @@
			, totalRow: true
			, limit: 1000
			, limits: [50, 500,1000, 5000, 20000]
			, loading: false
			//, loading: false
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'ç»ç»åç§°', title: 'ç»ç»åç§°', width: 120, sort: true, filter: true }
			, { field: 'çäº§è½¦é´åç§°', title: 'çäº§è½¦é´åç§°', sort: true, filter: true }
			, { field: 'çäº§èµæºåç§°', title: 'çäº§èµæºåç§°', width: 100, sort: true, filter: true }
			, { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', sort: true, filter: true }
			, { field: 'å®¢æ·è®¢åå·', title: 'å®¢æ·è®¢åå·', sort: true, filter: true }
			, { field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', sort: true, filter: true }
			, { field: 'FCOLUMN9', title: 'çµå/åç/åºæ¿', sort: true, filter: true }
			, { field: 'è®¢åäº¤æ', title: 'è®¢åäº¤æ', templet: "<div>{{d.è®¢åäº¤æ ==null ?'':layui.util.toDateString(d.è®¢åäº¤æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } }
			, { field: 'äº§åç¼ç ', title: 'äº§åç¼ç ', sort: true, filter: true }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', sort: true, filter: true }
			, { field: 'äº§åè§æ ¼åå·', title: 'äº§åè§æ ¼åå·', sort: true, filter: true }
			, { field: 'æ¥è®¡åæ¥æ', title: 'æ¥è®¡åæ¥æ', templet: "<div>{{d.æ¥è®¡åæ¥æ ==null ?'':layui.util.toDateString(d.æ¥è®¡åæ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } }
			, { 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, totalRow: 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 }
			, { field: 'å³æ¶åºåæ°é', title: 'å³æ¶åºåæ°é', sort: true, totalRow: true, filter: true }
			, { field: 'å ç¨æ°é', title: 'å ç¨æ°é', sort: true, totalRow: true, filter: true }
			, { field: 'é¢ç¨å ç¨æ°é', title: 'é¢ç¨å ç¨æ°é', sort: true, totalRow: true, filter: true }
			, { field: 'ææ éè´è®¢å', title: 'ææ éè´è®¢å', sort: true, filter: true }
			]]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'ç»ç»åç§°', title: 'ç»ç»åç§°', width: 120, sort: true }
			, { field: 'çäº§è½¦é´åç§°', title: 'çäº§è½¦é´åç§°', sort: true }
			, { field: 'çäº§èµæºåç§°', title: 'çäº§èµæºåç§°', width: 100, sort: true }
			, { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', sort: true }
			, { field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', sort: true }
			, { field: 'FCOLUMN9', title: 'çµå/åç/åºæ¿', sort: true }
			, { field: 'è®¢åäº¤æ', title: 'è®¢åäº¤æ', templet: "<div>{{d.è®¢åäº¤æ ==null ?'':layui.util.toDateString(d.è®¢åäº¤æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'äº§åç¼ç ', title: 'äº§åç¼ç ', sort: true }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', sort: true }
			, { field: 'äº§åè§æ ¼åå·', title: 'äº§åè§æ ¼åå·', sort: true }
			, { field: 'æ¥è®¡åæ¥æ', title: 'æ¥è®¡åæ¥æ', templet: "<div>{{d.æ¥è®¡åæ¥æ ==null ?'':layui.util.toDateString(d.æ¥è®¡åæ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'æ¥è®¡åæ°é', title: 'æ¥è®¡åæ°é', sort: true, totalRow: true}
			, { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', sort: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', sort: true }
			, { field: 'ç©æè§æ ¼åå·', title: 'ç©æè§æ ¼åå·', sort: true }
			, { field: 'è®¡ååææ°é', title: 'è®¡ååææ°é', sort: true, totalRow: true }
			, { field: 'é½å¥æ°é', title: 'é½å¥æ°é', sort: true, totalRow: true}
			, { field: 'ç¼ºææ°é', title: 'ç¼ºææ°é', sort: true, totalRow: true }
			, { field: 'å¯ç¨æ°é', title: 'å¯ç¨æ°é', sort: true, totalRow: true }
			, { field: 'å³æ¶åºåæ°é', title: 'å³æ¶åºåæ°é', sort: true, totalRow: true }
			, { field: 'å ç¨æ°é', title: 'å ç¨æ°é', sort: true, totalRow: true }
			, { field: 'é¢ç¨å ç¨æ°é', title: 'é¢ç¨å ç¨æ°é', sort: true, totalRow: true}
			, { field: 'ææ éè´è®¢å', title: 'ææ éè´è®¢å', sort: true }
			]]
			};
			}
			//#endregion
			@@ -338,11 +538,14 @@
			$.ajax({
			url: GetWEBURL() + '/JIT_Complete/ReportMOMaterReadysBillList',
			type: "GET",
			data: { "sWhere": sWhere },//, "user": sessionStorage["HUserName"]
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },//, "user": sessionStorage["HUserName"]
			success: function (result) {
			if (result.count == 1) {
			option.data = result.data;
			table.render(option);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			@@ -367,7 +570,10 @@
			var HSCZYID = $("#HSCZYID").val();//çäº§èµæº
			var HXQD = $("#HXQD").val();//éæ±åå·
			var HMOBILLNO = $("#HMOBILLNO").val();//çäº§è®¢åå·

			var HBeginDate = $("#HBeginDate").val();//æææ¥æ
			var HEndDate = $("#HEndDate").val();//è³
			var HMaterAtt = $("#HMaterAtt").val();//ç©æå±æ§

			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			@@ -442,6 +648,16 @@
			}
			sWhere += " and " + ColName2 + " " + com2;
			}

			if (HBeginDate > HEndDate) {
			layer.close(ajaxLoad);
			return layer.msg("å¼å§æ¥æä¸è½å°äºç»ææ¥æ!");
			}

			if (HBeginDate != null && HEndDate != null) {
			sWhere += " and HDate between ''" + HBeginDate + "'' and ''" + HEndDate + "'' ";
			}

			sWhere = {
			HORGID: HORGID
			, HMATERIALID: HMATERIALID
			@@ -449,18 +665,18 @@
			, HSCZYID: HSCZYID
			, HXQD: HXQD
			, HMOBILLNO: HMOBILLNO
			, HBeginDate: HBeginDate
			, HEndDate: HEndDate
			, HMaterAtt: HMaterAtt
			}


			$.ajax({
			url: GetWEBURL() + '/JIT_Complete/ReportMOMaterReadysBillList',
			type: "GET",
			data: { "sWhere": JSON.stringify(sWhere) },//, "user": sessionStorage["HUserName"]
			data: { "sWhere": JSON.stringify(sWhere), "user": sessionStorage["HUserName"] },//, "user": sessionStorage["HUserName"]
			success: function (result) {
			if (result.count == 1) {
			data = result.data;

			option.data = data;
			ins = table.render(option);

			data.forEach((item) => {
			for (let itemobj in item) {
			@@ -469,11 +685,12 @@
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});

			table.exportFile(ins.config.id, data, "xls");
			table.exportFile('mainTable', data, "xls");

			layer.close(ajaxLoad);
			} else {
			@@ -504,6 +721,9 @@
			var HSCZYID = $("#HSCZYID").val();//çäº§èµæº
			var HXQD = $("#HXQD").val();//éæ±åå·
			var HMOBILLNO = $("#HMOBILLNO").val();//çäº§è®¢åå·
			var HBeginDate = $("#HBeginDate").val();//æææ¥æ
			var HEndDate = $("#HEndDate").val();//è³
			var HMaterAtt = $("#HMaterAtt").val();//ç©æå±æ§

			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			@@ -579,6 +799,15 @@
			}
			sWhere += " and " + ColName2 + " " + com2;
			}

			if (HBeginDate > HEndDate) {
			return layer.msg("å¼å§æ¥æä¸è½å°äºç»ææ¥æ!");
			}

			if (HBeginDate != null && HEndDate != null) {
			sWhere += " and HDate between ''" + HBeginDate + "'' and ''" + HEndDate + "'' ";
			}

			sWhere = {
			HORGID: HORGID
			, HMATERIALID: HMATERIALID
			@@ -586,6 +815,9 @@
			, HSCZYID: HSCZYID
			, HXQD: HXQD
			, HMOBILLNO: HMOBILLNO
			, HBeginDate: HBeginDate
			, HEndDate: HEndDate
			, HMaterAtt: HMaterAtt
			}
			get_Display(JSON.stringify(sWhere));
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			@@ -612,6 +844,9 @@
			$("#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() + 30), "yyyy-MM-dd"));//è³
			$("#HMaterAtt").val("");
			form.render('select');
			sWhere = "";
			}
			@@ -709,6 +944,157 @@
			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 = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["field"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			var urlLen = urlStr.split('/');
			for (var i = 0; i < urlLen.length - 4; i++) {
			contentUrl += "../";
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç

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

			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: [contentUrl, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			//#endregion

			//#region æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {
			titleData = [];
			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var newCols = [[]];//å¯¹åºæ°æ®åºåé¡ºåºcol
			newCols[0].push(option.cols[0][0]);//æ¾å¥ç¬¬ä¸ä¸ªcheckbox
			dataCol = data1.data[0].HGridString.split(',');
			//åè®¾ç½®åæ°ä¸é¡µé¢åæ°æ¯å¦ä¸è´
			if (dataCol.length == option.cols[0].length - 1) {
			//éåå¯»æ¾åè®¾ç½®å¯¹åºåæé¡ºåºæå¥
			for (var j = 0; j < option.cols[0].length - 1; j++) {
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			var dataCols = dataCol[j].split('\|');
			//éæ©ä¸datacolsç¸åºåè¿è¡ä¿®æ¹
			if (option.cols[0][i + 1]["field"] == dataCols[5]) {
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//ç»è®¡å
			if (dataCols[6] == 1) {
			option.cols[0][i + 1]["totalRow"] = true;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			newCols[0].push(option.cols[0][i + 1]);
			}
			}
			}
			//éåå¾ªç¯åå¤æå¯¹åºåæ°æ¯å¦ä¸è´
			if (dataCol.length == newCols[0].length - 1) {
			option.cols = newCols;
			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			}
			}
			table.render(option);
			} else {
			table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//#endregion

			//#endregion
			//ä»¥ä¸æ¯layuiæ¨¡å
			});