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>
			@@ -26,6 +27,7 @@
			}
			</style>
			</head>

			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			@@ -42,20 +44,30 @@
			<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 name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
			lay-filter="HInitTimeCycle" style="width:190px;">
			</select>
			</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="HBeginDate" style="width:190px;">
			<input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
			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;">
			<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
			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;">
			</div>
			</div>
			<div class="layui-inline">
			@@ -66,28 +78,27 @@
			</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="HBillNo" id="HBillNo" 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="HProjectNumber" id="HProjectNumber" style="width:190px;">
			</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-row">
			<!--æ¾ç¤ºå½åè¿æ»¤æ¹æ¡-->
			<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>
			<div class="layui-inline" style="display:none;">
			<label class="layui-form-label">é¡¹ç®ç¼å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber"
			id="HProjectNumber" style="width:190px;">
			</div>
			</div>

			<div class="layui-colla-content">
			<div class="layui-inline">
			<div class="layui-inline">
			@@ -97,19 +108,22 @@
			<div class="layui-inline">
			<label class="layui-form-label">ä¾åºå</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HSupID" id="HSupID" style="width:190px;">
			<input type="text" class="layui-input ForFilteringSchemes" name="HSupID"
			id="HSupID" 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="HDeptID" id="HDeptID" style="width:190px;">
			<input type="text" class="layui-input ForFilteringSchemes" name="HDeptID"
			id="HDeptID" 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="HMangerID" id="HMangerID" style="width:190px;">
			<input type="text" class="layui-input ForFilteringSchemes" name="HMangerID"
			id="HMangerID" style="width:190px;">
			</div>
			</div>
			</div>
			@@ -118,19 +132,25 @@
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" class="ForFilteringSchemes" style="width:190px;">
			<select name="ColName" id="ColName" lay-filter="ColName"
			class="ForFilteringSchemes" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
			<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="<=">
			<=< /option>
			<option value="<">
			<< /option>
			<option value="<>">
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			@@ -138,26 +158,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: 10px; margin-bottom: 10px ">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤1</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
			<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" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
			<select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
			class="ForFilteringSchemes" 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="<=">
			<=< /option>
			<option value="<">
			<< /option>
			<option value="<>">
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			@@ -165,26 +192,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: 10px; margin-bottom: 10px ">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤2</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
			<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" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
			<select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
			class="ForFilteringSchemes" 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="<=">
			<=< /option>
			<option value="<">
			<< /option>
			<option value="<>">
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			@@ -192,7 +226,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>
			@@ -202,12 +237,18 @@
			<div id="page" style="position: relative; bottom: 0;"></div>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="Add"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="Add"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>ææ°åæ´</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_LookDown_PayableBill" id="get_LookDown_PayableBill"><i class="layui-icon layui-icon-refresh-3"></i>ä¸æ¥(åºä»å)</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BarCodeDetail" id="BarCodeDetail"><i class="layui-icon layui-icon-form"></i>æ¡ç æç»</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-PackStockDetail" lay-event="btn-PackStockDetail"><i class="layui-icon layui-icon-form"></i>åè£å®¹å¨åºå¥åºæç»</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushPayableBills" id="btn-PushPayableBills"><i class="layui-icon layui-icon-delete"></i>å¤è¡ä¸æ¨(åºä»å)</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushPOStockInBackBills" id="btn-PushPOStockInBackBills"><i class="layui-icon layui-icon-delete"></i>å¤è¡ä¸æ¨(éè´éæå)</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushPOStockInChangeBills" id="btn-PushPOStockInChangeBills"><i class="layui-icon layui-icon-delete"></i>å¤è¡ä¸æ¨(éè´è°ä»·å)</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushPoInStockCheckBill" id="btn-PushPoInStockCheckBill"><i class="layui-icon layui-icon-delete"></i>ä¸æ¨(æ¥ææ£éªå)</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>åèµ·å®¡æ¹</button>
			@@ -222,6 +263,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="Drop"><i class="layui-icon layui-icon-radio"></i>ä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="DeDrop"><i class="layui-icon layui-icon-radio"></i>åä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			@@ -258,15 +300,16 @@
			var sWhere = "";
			var option = [];
			var HModName = "Kf_POStockInBillList";

			var HBillSubType = "";
			var ins;
			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "1201";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
			var HPageTitle = get_PageTitle(HModuleType) \|\| document.title;
			//#endregion
			var titleData = ["hmainid", "hsupid", "hsecmanagerid", "hkeeperid", "HDeptID", "hsubid", "hmaterid", "hunitid", "hwhid"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			//#region ãè¿æ»¤æ¹æ¡ã
			//#region ãè¿æ»¤æ¹æ¡ã

			//è¿æ»¤æ¡ä»¶çclassç±»
			var HClassTag = "ForFilteringSchemes";
			@@ -292,7 +335,7 @@
			set_ClearQuery();
			optionPage.curr = 1;
			get_FastQuery();


			});
			//#endregion

			@@ -300,7 +343,7 @@
			form.on('submit(btnSearch)', function (data) {
			optionPage.curr = 1;
			get_FastQuery(table, option, 2);


			});
			//#endregion

			@@ -323,7 +366,7 @@
			}
			});



			//#endregion è¾å¥æ¡åè½¦çå¬
			$('input[type="text"]').on('keydown', function (event) {
			if (event.keyCode == 13) {
			@@ -373,14 +416,13 @@
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//åå§åé¡µå¤§å°
			DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
			// DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery(table, option,2);

			get_FastQuery(table, option, 2);

			//éèå¾éåæ®µ
			DisPlay_HideColumn();
			// DisPlay_HideColumn();
			//ä»»æåæ®µè¿æ»¤ä¸ææ¡åå§å
			ColFilter();

			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();
			@@ -388,7 +430,7 @@
			}
			//#endregion
			//#region åå§åè¡¨æ ¼æ¹æ³


			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			@@ -404,7 +446,7 @@
			}
			, cols: [[
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡è¡' }
			,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 160, sort: true }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 160, sort: true }
			, { field: 'ç¶æ', title: 'ç¶æ', width: 100, sort: true }
			@@ -427,10 +469,10 @@
			, { field: 'hunitid', title: 'hunitid', width: 200, hide: true, sort: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 200, sort: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 200, sort: true }
			, { field: 'å®æ¶æ°é', title: 'å®æ¶æ°é', width: 200, sort: true, totalRow: true}
			, { field: 'å³èæ°é', title: 'å³èæ°é', width: 200, sort: true, totalRow: true}
			, { field: 'åä»·', title: 'åä»·', width: 200, sort: true, totalRow: true}
			, { field: 'éé¢', title: 'éé¢', width: 200, sort: true, totalRow: true}
			, { field: 'å®æ¶æ°é', title: 'å®æ¶æ°é', width: 200, sort: true, totalRow: true }
			, { field: 'å³èæ°é', title: 'å³èæ°é', width: 200, sort: true, totalRow: true }
			, { field: 'åä»·', title: 'åä»·', width: 200, sort: true, totalRow: true }
			, { field: 'éé¢', title: 'éé¢', width: 200, sort: true, totalRow: true }
			, { field: 'hwhid', title: 'hwhid', width: 200, hide: true, sort: true }
			, { field: 'HWHID', title: 'HWHID', hide: true, sort: true }
			, { field: 'æ¶æä»åºä»£ç ', title: 'æ¶æä»åºä»£ç ', width: 150, sort: true }
			@@ -451,7 +493,7 @@
			, { field: 'å³éäºº', title: 'å³éäºº', width: 100, sort: true }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 120, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'è¡å³éäºº', title: 'è¡å³éäºº', width: 125, sort: true }
			, { field: 'è¡å³éæ¥æ', title: 'è¡å³éæ¥æ', width: 200, templet: "<div>{{d.è¡å³éäºº == ''?'':layui.util.toDateString(d.è¡å³éæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'è¡å³éæ¥æ', title: 'è¡å³éæ¥æ', width: 200, templet: "<div>{{d.è¡å³éäºº == ''?'':layui.util.toDateString(d.è¡å³éæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 100, sort: true }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 120, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }

			@@ -495,8 +537,8 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../éªæ¶å¥åº/å¤è´å¥åº/Add_Edit_Kf_POStockInBillList.html?OperationType=3&linterid=' + linterid +'&HSouceBillType=0&closeType=1' //è®¾ç½® iframe ç URLï¼URL ä¸åå«äºæ¥è¯¢åæ°ï¼æ¥è°ç¨æéè¦çå¼

			, content: '../../éªæ¶å¥åº/å¤è´å¥åº/Add_Edit_Kf_POStockInBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1' //è®¾ç½® iframe ç URLï¼URL ä¸åå«äºæ¥è¯¢åæ°ï¼æ¥è°ç¨æéè¦çå¼

			, resize: false, //æ¯å¦åè®¸ç¨æ·è°æ´å¼¹åºå¤§å°
			end: function () { //å½å³éæ¶è°ç¨
			get_FastQuery(table, option);
			@@ -507,7 +549,7 @@
			})
			}
			});
			//#endregion
			//#endregion

			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			function get_Display(sWhere) {
			@@ -520,7 +562,7 @@
			if (data1.count == 1) {
			var data = [];//ååæ®µæ°æ®
			var col = [];
			var totalArray = [];
			var totalArray = ["åºæ¶æ°é", "å®æ¶æ°é", "å³èæ°é", "éé¢", "éè´éé¢", "å«ç¨éé¢"];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {//å¾ªåºéåæ°ç»
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//ä»æ¯ä¸ªå¯¹è±¡ä¸æåæ°æ®
			@@ -539,7 +581,8 @@
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·'
			, event: 'åæ®å·', templet: function (d) {
			return '<span style="color: blue;">' + d.åæ®å· + '</span>'
			}, style: 'cursor: pointer;' });
			}, style: 'cursor: pointer;'
			});
			} else {
			switch (data[i].Type) {
			//int
			@@ -602,7 +645,7 @@
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			var data = [];//ååæ®µæ°æ®
			var col = [];
			var totalArray = [];
			var totalArray = ["åºæ¶æ°é", "å®æ¶æ°é", "å³èæ°é", "éé¢", "éè´éé¢", "å«ç¨éé¢"];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			@@ -645,7 +688,12 @@
			laypage.render(optionPage);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			ins = table.render(option);

			if ($("#ColName option").length < 1) {
			ColFilter();
			// get_DefaultModule();//å è½½æ¹æ¡
			}
			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "1201";
			@@ -681,7 +729,7 @@
			shift: 2,
			area: ['100%', '100%'],
			maxmin: true,
			content: '../../éªæ¶å¥åº/å¤è´å¥åº/Add_Edit_Kf_POStockInBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
			content: '../../éªæ¶å¥åº/å¤è´å¥åº/Add_Edit_Kf_POStockInBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1&HBillSubType=' + HBillSubType,
			end: function () {
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			$("#btnSearch").trigger('click');
			@@ -709,7 +757,7 @@
			, resize: false,
			end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			$("#btnSearch").click();
			}
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			@@ -721,12 +769,18 @@
			}

			break;

			//ææ°åæ´æé®
			case "btn-tally": set_PalletChange();
			break;
			//å é¤æé®
			case 'btn-Delete': set_DeleteBill();
			break;
			//å·æ°
			case 'get_Refresh': get_Refresh();
			break;
			//ä¸æ¥åºä»å
			case 'get_LookDown_PayableBill':
			set_LookDown_PayableBill();
			break;
			//æå°
			case 'btn-print':
			@@ -736,7 +790,15 @@
			case 'btn-PushPayableBills':
			set_PushPayableBills();
			break;
			//å®¡æ ¸
			//å¤è¡ä¸æ¨(éè´éæå)
			case 'btn-PushPOStockInBackBills':
			set_PushPOStockInBackBills();
			break;
			//å¤è¡ä¸æ¨(éè´è°ä»·å)
			case 'btn-PushPOStockInChangeBills':
			set_PushPOStockInChangeBills();
			break;
			//å®¡æ ¸
			case 'set_CheckBill': set_CheckBill(0);
			break;
			//åå®¡æ ¸
			@@ -779,11 +841,17 @@
			case 'btn-DeDrop':
			set_DropBill(2);
			break;
			//å¯¼åºæé®
			case 'btn_Export': btn_Export();
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			//æ¡ç æç»
			case 'btn-BarCodeDetail': get_BarCodeDetail();
			break;
			//åè£å®¹å¨åºå¥åºæç»
			case "btn-PackStockDetail": get_PackStockDetail();
			break;
			//æé®è®¾ç½®
			case 'set_HideButton':
			@@ -799,6 +867,9 @@
			break;
			//è¯»åæ¹æ¡
			case 'set_ReadScheme': set_ReadScheme();
			break;
			// ä¸æ¨ æ¥ææ£éªå
			case 'btn-PushPoInStockCheckBill': set_PushPoInStockCheckBill();
			break;
			};
			});
			@@ -826,7 +897,13 @@
			}

			//#region å¿«éè¿æ»¤
			function get_FastQuery(table, option,number) {
			function get_FastQuery(table, option, number) {
			//å¤ææ¯å¦æå¯¼å¥æéï¼å¦ææåå°æ»è£è½¦é´ä¹åçæ¥è®¡åå·¥åä½åº
			if (!set_ModCheck("Kf_POStockInBillQuery")) {
			layer.msg("æ æéï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}

			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val();//åæ®å·
			@@ -834,7 +911,7 @@
			var HSupID = $("#HSupID").val();
			var HDeptID = $("#HDeptID").val();
			var HMangerID = $("#HMangerID").val();


			//ä»»æåæ®µè¿æ»¤
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			@@ -973,10 +1050,137 @@
			}
			//#endregion

			//#region ææ°åæ´
			function set_PalletChange() {
			var checkStatus = table.checkStatus('mainTable');
			var data = checkStatus.data;

			if (data.length !== 1) {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®è¿è¡ææ°åæ´ï¼');
			return;
			}
			var rowData = data[0];
			// è·åå½åææ°
			var currentPallet = rowData.ææ° ;

			// èªå®ä¹å¼¹çªåå®¹
			var content = '<div style="padding: 20px;">' +
			'<div class="layui-form-item">' +
			'<label class="layui-form-label">å½åææ°</label>' +
			'<div class="layui-input-block">' +
			'<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
			'</div>' +
			'</div>' +
			'<div class="layui-form-item">' +
			'<label class="layui-form-label">æ°ææ°</label>' +
			'<div class="layui-input-block">' +
			'<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="è¯·è¾å¥æ£æ´æ°" min="1" step="1">' +
			'</div>' +
			'</div>' +
			'<div class="layui-form-item" style="color: #999; font-size: 12px;">æç¤ºï¼ææ°å¿é¡»ä¸ºæ´æ°ï¼å¤§äº0ï¼</div>' +
			'</div>';

			layer.open({
			type: 1,
			title: 'ææ°åæ´',
			area: ['400px', '300px'],
			content: content,
			btn: ['ä¿å', 'åæ¶'],
			btnAlign: 'c',
			yes: function (index, layero) {
			var newValue = $('#newPalletValue').val();
			var newPallet = parseInt(newValue);

			// éªè¯è¾å¥
			if (!newValue) {
			layer.msg('è¯·è¾å¥ææ°ï¼', { icon: 2 });
			$('#newPalletValue').focus();
			return false;
			}

			if (isNaN(newPallet)) {
			layer.msg('è¯·è¾å¥ææçæ°åï¼', { icon: 2 });
			$('#newPalletValue').focus();
			return false;
			}

			if (newPallet.toString() !== newValue) {
			layer.msg('ææ°ä¸è½ä¸ºå°æ°ï¼', { icon: 2 });
			$('#newPalletValue').focus();
			return false;
			}


			// ä¿åæ°æ®
			layer.load();
			$.ajax({
			url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
			type: 'POST',
			data: {
			hmainid: rowData.hmainid,
			hsubid: rowData.hsubid \|\| 0,
			newPallet: newPallet,
			operator: sessionStorage["HUserName"]
			},
			success: function (result) {
			layer.closeAll('loading');
			if (result.count == 1) {
			layer.msg('ææ°åæ´æåï¼', { icon: 1 });
			layer.close(index);

			window.$("#btnSearch").click();
			} else {
			layer.msg('ä¿åå¤±è´¥ï¼' + result.Message, { icon: 5 });
			}
			},
			error: function () {
			layer.closeAll('loading');
			layer.msg('è¯·æ±å¤±è´¥ï¼', { icon: 5 });
			}
			});
			},
			success: function (layero, index) {
			// è®¾ç½®è¾å¥æ¡ç¦ç¹
			$('#newPalletValue').focus().select();
			}
			});
			}

			//#endregion

			//#region å·æ°
			function get_Refresh() {
			//set_ClearQuery();
			get_DisplayPage(sWhere);
			}
			//#endregion

			//#region ä¸æ¥åºä»å
			function set_LookDown_PayableBill() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var hID = data[0].hmainid.toString();
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ä¸æ¥åºä»å'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../åºç¡èµæ/éç¨åºç¡èµæ/Gy_GeneralLookDown.html?linterid=' + hID + '&HModName=Cg_PayableBillList'
			, resize: false,
			end: function () {

			}
			, cancel: function () {

			}
			})
			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼');
			}
			}
			//#endregion

			@@ -1001,7 +1205,7 @@
			})
			//#endregion

			//æå°
			//æå°
			function get_PrintReport() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			@@ -1051,7 +1255,7 @@
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			window.location.reload();
			window.$("#btnSearch").click();
			});

			} else {
			@@ -1066,7 +1270,7 @@
			} else {
			layer.msg('è¯¥æ¡æ°æ®ä¸æ¯åå»ºç¶æ,æ æ³å é¤ï¼');
			}


			})
			}
			else {
			@@ -1142,6 +1346,118 @@
			}
			//#endregion

			//#region å¤è¡ä¸æ¨ï¼éè´éæåï¼
			function set_PushPOStockInBackBills() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (data.length > 0) {
			var dataArray = [];
			var HCusName = data[0].ä¾åºå;
			var HEmpName = data[0].ä¸å¡å;
			for (var i = 0; i < data.length; i++) {
			var temp = {
			"hmainid": data[i].hmainid
			, "hsubid": data[i].hsubid
			, "HBillStatus": data[i].ç¶æ
			, "HSourceBillType": "1201"
			}
			dataArray.push(temp);
			if (data[i].ç¶æ != "å·²å®¡æ ¸") {
			var err = "ä¸æ¨å¤±è´¥!åæ®ã" + data[i].åæ®å· + "ãçç¶æä¸ºâ" + data[0].ç¶æ + "â,ä¸åè®¸ä¸æ¨ï¼";
			layer.alert(err, { icon: 5 });
			return;
			}

			if (data[i].ä¾åºå != HCusName) {
			layer.msg("ä¸æ¨å¤±è´¥!å·²ç»éä¸çè®°å½ä¸åå¨ä¸åä¾åºå!");
			return;
			}
			if (data[i].ä¸å¡å != HEmpName) {
			layer.msg("ä¸æ¨å¤±è´¥!å·²ç»éä¸çè®°å½ä¸åå¨ä¸åä¸å¡å!");
			return;
			}
			}

			var datajson = {
			"data": dataArray
			};

			var url = encodeURI('../../éªæ¶å¥åº/å¤è´å¥åº/Kf_POStockInBackBill_Add_Up.html?OperationType=4&linterid=0&HSouceBillType=1201&res=' + JSON.stringify(datajson))
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'éè´å¥åºå-å¤è¡ä¸æ¨éè´éæå'
			, shift: 0//å¼¹åºå¨ç»
			, content: url
			, btn: [],
			// æé®1 çåè°
			end: function (index, layero, that) {
			//å·æ°é¡µé¢
			$("#btnSearch").trigger('click');
			}
			})
			} else {
			layer.msg('è¯·éæ©æ°æ®ä¸æ¨ï¼');
			}
			}
			//#endregion

			//#region å¤è¡ä¸æ¨ï¼éè´è°ä»·åï¼
			function set_PushPOStockInChangeBills() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (data.length > 0) {
			var dataArray = [];
			var HBillNo = data[0].åæ®å·;
			for (var i = 0; i < data.length; i++) {
			var temp = {
			"hmainid": data[i].hmainid
			, "hsubid": data[i].hsubid
			, "HBillStatus": data[i].ç¶æ
			, "HSourceBillType": "1201"
			}
			dataArray.push(temp);
			if (data[i].ç¶æ != "å·²å®¡æ ¸") {
			var err = "ä¸æ¨å¤±è´¥!åæ®ã" + data[i].åæ®å· + "ãçç¶æä¸ºâ" + data[0].ç¶æ + "â,ä¸åè®¸ä¸æ¨ï¼";
			layer.alert(err, { icon: 5 });
			return;
			}

			//if (data[i].è¡ç¶æ == "å·²å³é") {
			// layer.msg("ä¸æ¨å¤±è´¥!åæ®å·ã" + data[i].åæ®å· + "ãä¸éä¸çè®°å½ä¸åå¨å·²å³éç¶æçè®°å½!");
			// return;
			//}

			if (data[i].åæ®å· != HBillNo) {
			layer.msg("ä¸æ¨å¤±è´¥!å·²ç»éä¸çè®°å½å½å±ä¸ååæ®!");
			return;
			}
			}

			var datajson = {
			"data": dataArray
			};

			var url = encodeURI('../../éè´ç®¡ç/éè´è°ä»·å/Cg_POStockInChangeBill.html?OperationType=4&linterid=0&HSouceBillType=1201&res=' + JSON.stringify(datajson));

			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'éè´è°ä»·å-å¤è¡ä¸æ¨éè´è°ä»·å'
			, shift: 0//å¼¹åºå¨ç»
			, content: url
			, btn: ['ç¡®å®']
			// æé®1 çåè°
			, end: function (index, layero, that) {
			//å·æ°é¡µé¢
			$("#btnSearch").trigger('click');
			}
			})
			} else {
			layer.msg('è¯·éæ©æ°æ®ä¸æ¨ï¼');
			}
			}
			//#endregion

			//#region åå®¡æ ¸/å®¡æ ¸æ°æ®
			function set_CheckBill(num) {
			@@ -1463,7 +1779,7 @@
			, btn: ["ç¡®å®", "åæ¶"]
			, end: function () {
			//å·æ°é¡µé¢,
			//location.reload();
			//$("#btnSearch").click();
			}
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			@@ -1475,6 +1791,210 @@
			}
			}
			//#endregion

			//#region åè£å®¹å¨åºå¥åºæç»
			function get_PackStockDetail() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var HInterID = data[0].hmainid;
			var HBillType = '1201';
			var HBillNo = data[0]["åæ®å·"];

			layer.open({
			type: 2
			, area: ['90%', '90%']
			, title: 'åè£å®¹å¨åºå¥åºæç»'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../åè£åºå¥åºæç»/Kf_PackStockDetailQuery.html?HInterID=' + HInterID + '&HBillType=' + HBillType + '&HBillNo=' + HBillNo
			, resize: false
			, btn: ["ç¡®å®", "åæ¶"]
			, end: function () {
			//å·æ°é¡µé¢,
			//$("#btnSearch").click();
			}
			, cancel: function () {
			}
			})

			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼');
			}
			}
			//#endregion


			//æéå¤å®
			function set_ModCheck(ModRightNameCheck) {
			var Permission = false;
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: false,
			data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			Permission = true;
			} else {
			layer.alert("å½åæ¨¡åæ²¡ææ¥è¯¢æé!", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			return Permission;
			}

			//#region å¯¼åºExecel
			function btn_Export() {
			if (!set_ModCheck("Kf_POStockInBill_ExportExcel")) {
			return
			}

			var data;
			//è®¾ç½®sWhere
			var ajaxLoad = layer.load();
			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HProjectNumber = $("#HProjectNumber").val(); //é¡¹ç®ç¼å·
			var HSupID = $("#HSupID").val();
			var HDeptID = $("#HDeptID").val();
			var HMangerID = $("#HMangerID").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 (Comparator) {
			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 = "" + Comparator2 + "'" + ColContent2 + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}
			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			}
			if (HDate1) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			if (HProjectNumber) {
			sWhere += " and é¡¹ç®ä»£ç like '%" + HProjectNumber + "%'";
			}
			if (HSupID) {
			sWhere += " and ä¾åºå like '%" + HSupID + "%'";
			}
			if (HDeptID) {
			sWhere += " and é¨é¨ like '%" + HDeptID + "%'";
			}
			if (HMangerID) {
			sWhere += " and è´è´£äºº like '%" + HMangerID + "%'";
			}
			sWhere += addSWhereByOpenType();
			$.ajax({
			url: GetWEBURL() + '/Kf_POStockInBill/list',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			data = data1.data
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.Message, { icon: 5 });
			}
			},
			error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			sWhere = "";
			data.forEach((item) => {
			for (let itemobj in item) {
			if (item[itemobj] == null) {
			item[itemobj] = "";
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});

			table.exportFile(ins.config.id, data, "xls");
			}
			//#endregion

			//éèåè®¾ç½®
			function get_HideColumn() {
			@@ -1513,6 +2033,28 @@
			})
			}

			//ä¸æ¨ æ¥ææ£éªå
			function set_PushPoInStockCheckBill() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			debugger
			// ä¸æ¨ æ¥ææ£éªå
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "æ¥ææ£éªå" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["100%", "100%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../è´¨éç®¡ç/æ¥ææ£éªå/QC_Add_Edit_POStockInCheckBillList.html?OperationType=2&linterid=' + data[0].hmainid + '&HSouceBillType=' + data[0].HBillType + '&HICMOEntryID=&HEntryID=' + data[0].hsubid, "yes"]
			})
			} else {
			layer.msg("è¯·éæ©ä¸è¡ä¸æ¨!!!", { time: 1 * 1000, icon: 1 })
			}
			}

			//æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			@@ -1525,7 +2067,7 @@


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["hmainid", "hsupid", "hsecmanagerid", "hkeeperid", "HDeptID", "hsubid", "hmaterid", "hunitid","hwhid"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["hmainid", "hsupid", "hsecmanagerid", "hkeeperid", "HDeptID", "hsubid", "hmaterid", "hunitid", "hwhid"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			dataCol = data1.data[0].HGridString.split(',');
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			@@ -1602,9 +2144,9 @@
			option.cols[0][i]["sort"] = false;
			}
			}
			table.render(option);
			ins = table.render(option);
			} else {
			table.render(option);
			ins = table.render(option);
			}
			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			@@ -1636,14 +2178,30 @@
			var params = getUrlVars();
			var openType = params[params[0]]; //ä»åæ°ä¸è·å æå¼æ¹å¼ 1ç´æ¥æå¼ 2å¶å®é¡µé¢éè¿éæ©æé®æå¼
			var HOrgID = params[params[1]];

			HBillSubType = getParams("HBillSubType");
			var addSWhere = "";

			if (openType == 2) {
			addSWhere = " and ç¶æ = 'å·²å®¡æ ¸' and è¡ç¶æ = '' and HOrgID = " + HOrgID;
			}
			if (HBillSubType == "å·¥ç¨ç±»") {
			addSWhere += "and HBillSubType='å·¥ç¨ç±»'"
			} else if (HBillSubType == "ä»»å¡ç±»") {
			addSWhere += "and HBillSubType='ä»»å¡ç±»'"
			}
			return addSWhere;
			}
			//å°urlåæ°ä¸çä¸æä¹±ç éæ°è½¬æ¢æä¸æ
			function getParams(key) {
			var reg = new RegExp("(^\|&)" + key + "=([^&]*)(&\|$)");
			//å¦æå°åæ ä¸åºç°ä¸æåè¿è¡ç¼ç
			var r = encodeURI(window.location.search).substr(1).match(reg);
			if (r != null) {
			//å°ä¸æç¼ç çåç¬¦éæ°åæä¸æ
			return decodeURI(unescape(r[2]));
			}
			return "";
			};
			//#endregion


			@@ -1667,8 +2225,8 @@

			//#region åå§æ¥æé´é ä¸æåè¡¨
			function setSelect_HInitTimeCycle() {
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
			var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©"];
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29, 180, 365];
			var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©", "è¿åå¹´", "è¿ä¸å¹´"];

			var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >ä»»æé´é</option>';
			for (var i = 0; i < valueList.length; i++) {
			@@ -1725,7 +2283,7 @@


			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			// get_FastQuery();
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);
			@@ -1740,7 +2298,7 @@
			document.getElementById("HFilterScheme_Now").style.display = "none";
			//æ§è¡æ¥è¯¢æ¹æ³
			//get_FastQuery()
			//form.render("select");
			form.render("select");
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			@@ -1909,14 +2467,14 @@

			//#endregion
			//#endregion






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

			//#region ãè¿æ»¤æ¹æ¡è¿åæ°æ®ã
			//#region ãè¿æ»¤æ¹æ¡è¿åæ°æ®ã
			function HFilterScheme(obj) //è¿åè¿æ»¤æ¹æ¡
			{
			var HInterID = obj[0].hmainid;
			@@ -1954,11 +2512,12 @@
			});
			}
			//#endregion





			</script>

			</body>
			</html>

			</html>