MES-WEB-LayUI.git

			@@ -63,18 +63,28 @@
			<span>æ´å¤</span>
			</div>
			</div>
			<div class="layui-inline">
			<!--<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 ForFilteringSchemes" name="HBillNo" id="HBillNo">
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">å®¢æ·<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
			<input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" id="HCusList" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<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>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%; display:none;">
			<div class="layui-row" style="margin-top:5px;display:none;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			@@ -101,7 +111,7 @@
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-row" style="margin-top: 5px; display: none;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			@@ -128,7 +138,7 @@
			<input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-row" style="margin-top: 5px; display: none;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			@@ -168,6 +178,15 @@
			</div>
			<div class="layui-col-xs12 layui-col-md6">
			<h1 style="text-align: center; padding: 10px 0;"><b>å¾æ ¸éåè¡¨</b></h1>
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			</div>
			</div>
			</div>
			</div>
			<table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
			<script type="text/html" id="toolbarDemo1">
			<div class="layui-btn-container">
			@@ -221,6 +240,42 @@
			//#region é¡µé¢åå§å
			set_ClearBill();
			//#endregion
			//#endregion

			//#region éæ©å®¢æ·æé®
			form.on('submit(HCusList)', function () {
			get_checkCus();
			});

			//#region å®¢æ·éæ©é¡µé¢
			function get_checkCus() {
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'å®¢æ·åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_CustomerList.html', '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('è¯·éæ©æ°æ®');
			}

			$("#HCusID").val(checkStatus.data[0].HItemID);
			$("#HCusName").val(checkStatus.data[0].HName);

			document.getElementById("HCusList").disabled = true;
			document.getElementById("HCusList").style.color = "white";

			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			}
			//#endregion
			//#endregion

			//#region åè¡¨1ï¼ç¹å»è¡éä¸é«äº®
			@@ -407,7 +462,7 @@
			if (data.length == 1) {
			var ajaxLoad = layer.load();
			var hmaindid = data[0].hmainid;
			var sql = "delete from Xs_SellOutBillList_Sec where HMainSourceInterID = " + hmaindid;
			var sql = "delete from Xs_SellOutBillList_Sec where HMainSourceInterID = " + hmaindid + " and ISNULL(HSecEmp,'') = ''";
			var ModRightNameCheck = "";
			$.ajax({
			url: GetWEBURL() + '/CommonModel/commonMethod',
			@@ -571,7 +626,7 @@
			//, limits: [50, 500, 5000, 50000]
			, totalRow: true
			, cellMinWidth: 120
			, height: 400
			, height: 'full-100'
			, cols: [[
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', style: 'background-color: #f9f9f9;' }
			@@ -618,7 +673,7 @@
			//, limits: [50, 500, 5000, 50000]
			, totalRow: true
			, cellMinWidth: 120
			, height: 400
			, height: 'full-100'
			, cols: [[
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', style: 'background-color: #f9f9f9;' }
			@@ -652,7 +707,7 @@
			function set_ClearBill() {
			get_InitGrid();

			get_FastQuery();
			//get_FastQuery();
			get_FastQuery1();

			DisPlay_HideColumn();
			@@ -732,7 +787,9 @@
			//}

			var HOrgID = sessionStorage["OrganizationID"];
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			//var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HCusID = $("#HCusID").val();
			var HCusName = $("#HCusName").val();

			//ä»»æåæ®µè¿æ»¤
			var ColName = $("#ColName").val();//å¤éæ¡
			@@ -811,8 +868,14 @@
			sWhere += " and " + ColName2 + " " + com2;
			}

			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			//if (HBillNo) {
			// sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			//}

			if (HCusName) {
			sWhere += " and å®¢æ· like '" + HCusName + "'";
			} else {
			sWhere += " and 1=0 ";
			}

			if (HOrgID) {