MES-WEB-LayUI.git

			@@ -46,7 +46,7 @@
			<label class="layui-form-label">æ¥æé´é</label>
			<div class="layui-input-block">
			<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
			lay-filter="HInitTimeCycle" style="width:190px;">
			lay-filter="HInitTimeCycle" style="width:190px;">
			</select>
			</div>
			</div>
			@@ -54,34 +54,43 @@
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
			style="width:190px;">
			style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
			style="width:190px;">
			style="width:190px;">
			</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="HBillNo"
			id="HBillNo" style="width:190px;">
			id="HBillNo" style="width:190px;">
			</div>
			</div>

			<div class="layui-inline">
			<label class="layui-form-label">ç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<select name="HUSEORGID" id="HUSEORGID" class=" ForFilteringSchemes" lay-verify="HUSEORGID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
			lay-filter="btnSearch" id="btnSearch">
			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>
			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>
			id="HFilterScheme_Now"></div>
			</div>
			<div class="layui-colla-content">
			<div class="layui-row" style="margin-top:5px">
			@@ -89,29 +98,33 @@
			<label class="layui-form-label">ä¸å¡å</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes"
			name="HEmpName" id="HEmpName" style="width:190px;">
			name="HEmpName" id="HEmpName" style="width:190px;">
			</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="HSupName" id="HSupName" style="width:190px;">
			name="HSupName" id="HSupName" style="width:190px;">
			</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="HBillno2" id="HBillno2" style="width:190px;">
			name="HBillno2" id="HBillno2" 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>
			lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">
			éæ°åæ¥
			</button>

			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
			lay-filter="btnResCnzManual" id="btnResCnzManual"
			style="padding:0 5px">æå·¥åæ¥</button>
			lay-filter="btnResCnzManual" id="btnResCnzManual"
			style="padding:0 5px">
			æå·¥åæ¥
			</button>
			</div>
			<div class="layui-inline">
			<div class="layui-row" style="margin-top:5px">
			@@ -119,13 +132,13 @@
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" class="ForFilteringSchemes"
			lay-filter="ColName" style="width:190px;">
			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;">
			lay-filter="Comparator" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			@@ -145,7 +158,7 @@
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value=""
			name="ColContent" id="ColContent">
			name="ColContent" id="ColContent">
			</div>
			</div>

			@@ -154,13 +167,13 @@
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" class="ForFilteringSchemes"
			lay-filter="ColName1" style="width:190px;">
			lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
			class="ForFilteringSchemes" style="width:190px;">
			class="ForFilteringSchemes" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			@@ -180,7 +193,7 @@
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value=""
			name="ColContent1" id="ColContent1">
			name="ColContent1" id="ColContent1">
			</div>
			</div>

			@@ -189,13 +202,13 @@
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" class="ForFilteringSchemes"
			lay-filter="ColName2" style="width:190px;">
			lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
			class="ForFilteringSchemes" style="width:190px;">
			class="ForFilteringSchemes" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			@@ -215,7 +228,7 @@
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value=""
			name="ColContent2" id="ColContent2">
			name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			@@ -247,6 +260,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" 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" style="display:none;" lay-event="push_POStockInCheckBill" id="push_POStockInCheckBill"><i class="layui-icon layui-icon-set"></i>ä¸æ¨(æ¥ææ£éªå)</button>
			</div>
			</script>
			<table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
			@@ -427,6 +441,11 @@
			get_ResCnzManual(layer, HBillType, get_FastQuery)
			})

			//ä¸æ¨æ¥ææ£éªå
			form.on("submit(push_POStockInCheckBill)", function(data){
			push_POStockInCheckBill()
			})

			table.on('tool(mainTable)', function (obj) {
			var data = obj.data;
			if (obj.event == 'åæ®å·') {
			@@ -501,6 +520,8 @@

			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();

			Organ();
			}
			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			@@ -616,7 +637,28 @@
			}
			});
			}

			//#region è·åç»ç»
			function Organ() {
			//è·åç»å½é¡µç»ç»å
			$.ajax({
			type: "get",
			async: false,
			url: GetWEBURL() + "/Web/GetOrganizations",
			success: function (result) {
			var Organization = "";
			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>';
			}
			$("#HUSEORGID").append(Organization);
			$("#HUSEORGID").val(sessionStorage["OrganizationID"])
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}
			//æ¥è¯¢åè¡¨æ°æ®
			function get_DisplaySub(obj) {
			var datas = obj; //è·å¾å½åè¡æ°æ®
			@@ -1115,6 +1157,7 @@
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HEmpName = $("#HEmpName").val();
			var HSupName = $("#HSupName").val();//ä¾åºå
			var HUSEORGID = $("#HUSEORGID").val();//zuzhi
			//ä»»æåæ®µè¿æ»¤
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			@@ -1211,7 +1254,9 @@
			sWhere += " and ä¾åºå like '%" + HSupName + "%'";

			}

			if (HUSEORGID) {
			sWhere += " and ç»ç» like '%" + HUSEORGID + "%'";
			}

			sWhere += addSWhereByOpenType();
			//æ·»å æ¥è¯¢æ¡ä»¶ï¼æ ¹æ®å½åç»å½ç¨æ·å³èèåè¿åæ°æ®
			@@ -1323,7 +1368,9 @@
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 1; i++) {
			var dataCols = dataCol[i].split('\|');
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;