LongShan-LayUI.git

			@@ -27,65 +27,61 @@
			<span>æ´å¤</span>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">è§æ ¼åå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HModel" id="HModel">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¸å¡ç¶æ</label>
			<div class="layui-input-block">
			<select name="HStatus" id="HStatus" lay-verify="required" lay-search class="layui-input">
			<!-- <option value="å¨é¨">å¨é¨</option>-->
			<option value="å¼å·¥">å¼å·¥</option>
			<option value="è®¡å">è®¡å</option>
			<option value="è®¡åç¡®è®¤">è®¡åç¡®è®¤</option>
			<option value="ä¸è¾¾">ä¸è¾¾</option>

			<option value="0">å¨é¨</option>
			<option value="å®å·¥">å®å·¥</option>
			<option value="ç»æ¡">ç»æ¡</option>
			</select>

			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¯å¦ä¸æ¨çææµè½¬å¡</label>
			<div class="layui-input-block" style="margin-top:10px">
			<select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input">
			<!-- <option value="å¨é¨">å¨é¨</option>-->
			<option value="å¨é¨">å¨é¨</option>
			<option value="å·²ä¸æ¨">å·²ä¸æ¨</option>
			<option value="æªä¸æ¨" selected="selected">æªä¸æ¨</option>
			</select>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è§æ ¼åå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HModel" id="HModel">
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">çäº§è½¦é´</label>
			<div class="layui-input-block">
			<select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
			<div class="layui-inline">
			<label class="layui-form-label">ä¸å¡ç¶æ</label>
			<div class="layui-input-block">
			<select name="HStatus" id="HStatus" lay-verify="required" lay-search class="layui-input">
			<!-- <option value="å¨é¨">å¨é¨</option>-->
			<option value="å¼å·¥">å¼å·¥</option>
			<option value="è®¡å">è®¡å</option>
			<option value="è®¡åç¡®è®¤">è®¡åç¡®è®¤</option>
			<option value="ä¸è¾¾">ä¸è¾¾</option>

			<!--å¨ææ¸²æè½¦é´-->
			</select>
			</div>
			<option value="0">å¨é¨</option>
			<option value="å®å·¥">å®å·¥</option>
			<option value="ç»æ¡">ç»æ¡</option>
			</select>

			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
			</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>
			<div class="layui-inline">
			<label class="layui-form-label">æ¯å¦ä¸æ¨çææµè½¬å¡</label>
			<div class="layui-input-block" style="margin-top:10px">
			<select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input">
			<!-- <option value="å¨é¨">å¨é¨</option>-->
			<option value="å¨é¨">å¨é¨</option>
			<option value="å·²ä¸æ¨">å·²ä¸æ¨</option>
			<option value="æªä¸æ¨" selected="selected">æªä¸æ¨</option>
			</select>
			</div>
			</div>
			<div class="layui-inline" style="margin-left:80px;">
			<label class="layui-form-label">çäº§è½¦é´</label>
			<div class="layui-input-block">
			<select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">

			<!--å¨ææ¸²æè½¦é´-->
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
			</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">
			<div class="layui-row">
			<div class="layui-row" style="display:none;">
			<div class="layui-inline">
			<label class="layui-form-label">åæ®ç±»å</label>
			<div class="layui-input-block">
			@@ -104,7 +100,7 @@
			<input type="text" class="layui-input" name="HERPID" id="HERPID">
			</div>
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			@@ -126,6 +122,7 @@
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			<option value="11">ä¸ºç©º</option>
			</select>
			</div>
			<div class="layui-inline">
			@@ -160,11 +157,11 @@
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ä¸æ¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>æ´¾å·¥åçæ</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill_pl"><i class="layui-icon layui-icon-form"></i>æ¹éä¸æ¨</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill_pl"><i class="layui-icon layui-icon-form"></i>æ¹éä¸æ¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_copy"><i class="layui-icon layui-icon-form"></i>å¤å¶</button>
			@@ -176,7 +173,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-file-b"></i>Excelå¯¼å¥</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get-print"><i class="layui-icon layui-icon-print"></i>æå°</button>-->
			</div>
			</script>
			</form>
			@@ -435,12 +432,13 @@
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ', width: 160 }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 160 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 215 }
			, { field: 'ç¶æ', title: 'ç¶æ', sort: true, width: 170 }
			, { field: 'å¯ä¸ID', title: 'å¯ä¸ID', sort: true, width: 170 }
			, { field: 'æ¯å¦ä¸æ¨çææµè½¬å¡', title: 'æ¯å¦ä¸æ¨çææµè½¬å¡', sort: true, width: 170 }
			, { field: 'çäº§è½¦é´ä»£ç ', title: 'çäº§è½¦é´ä»£ç ', width: 115 }
			, { field: 'å·¥èºè·¯çº¿ä»£ç ', title: 'å·¥èºè·¯çº¿ä»£ç '}
			, { field: 'çäº§è½¦é´', title: 'çäº§è½¦é´', width: 115 }
			, { field: 'çäº§ä»»å¡åæ°é', title: 'çäº§è®¢åæ°é', width: 115, totalRow: true }
			, { field: 'ç¶æ', title: 'ç¶æ', sort: true, width: 170 }
			//, { field: 'å¯ä¸ID', title: 'å¯ä¸ID', sort: true, width: 170 }
			, { field: 'æ¯å¦ä¸æ¨çææµè½¬å¡', title: 'æ¯å¦ä¸æ¨çææµè½¬å¡', sort: true, width: 170 }
			, { field: 'çäº§è½¦é´ä»£ç ', title: 'çäº§è½¦é´ä»£ç ', width: 115 }
			, { field: 'åè£æ è¯ä»£ç ', title: 'åè£æ è¯ä»£ç ', width: 115 }
			, { field: 'åè£æ è¯', title: 'åè£æ è¯', width: 115 }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 115 }
			@@ -449,10 +447,10 @@
			, { field: 'è®¡åå®å·¥æ¥æ', title: 'è®¡åå®å·¥æ¥æ' }
			, { field: 'æè¿å¼å·¥æ¥æ', title: 'æè¿å¼å·¥æ¥æ' }
			, { field: 'æè¿å®å·¥æ¥æ', title: 'æè¿å®å·¥æ¥æ' }
			, { field: 'é½å¥æ°é', title: 'é½å¥æ°é' }
			, { field: 'è®¡åçäº§æ°é', title: 'è®¡åçäº§æ°é' }
			, { field: 'å³èæ°é', title: 'å³èæ°é' }
			, { field: 'æªå³èæ°é', title: 'æªå³èæ°é' }
			//, { field: 'é½å¥æ°é', title: 'é½å¥æ°é' }
			//, { field: 'è®¡åçäº§æ°é', title: 'è®¡åçäº§æ°é' }
			//, { field: 'å³èæ°é', title: 'å³èæ°é' }
			//, { field: 'æªå³èæ°é', title: 'æªå³èæ°é' }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨' }
			, { field: 'å¶åäºº', title: 'å¶åäºº' }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ' }
			@@ -470,7 +468,7 @@
			, { field: 'éå®è®¢åç¼å·', title: 'éå®è®¢åç¼å·', sort: true, width: 200 }
			, { field: 'éå®ç©æåç§°', title: 'éå®ç©æåç§°', sort: true, width: 200 }
			, { field: 'åè£æ¹å¼', title: 'åè£æ¹å¼', sort: true, width: 150 }
			, { field: 'éå®æ°é', title: 'éå®æ°é', sort: true, width: 150 }
			//, { field: 'éå®æ°é', title: 'éå®æ°é', sort: true, width: 150 }
			, { field: 'éå®è®¢åèç³»äºº', title: 'éå®è®¢åèç³»äºº', sort: true, width: 150 }
			, { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', sort: true, width: 150 }
			//, { field: 'è®¢åè·è¸ªå·', title: 'è®¢åè·è¸ªå·', sort: true, width: 120, hide: true }
			@@ -489,7 +487,6 @@
			//, { field: 'hbomid', title: 'hbomid' , hide: true}
			//, { field: 'BOMåç¼ç ', title: 'BOMåç¼ç ', hide: true }
			//, { field: 'HRoutingInterID', title: 'HRoutingInterID' , hide: true}
			, { field: 'å·¥èºè·¯çº¿ä»£ç ', title: 'å·¥èºè·¯çº¿ä»£ç '}
			, { field: 'å·¥èºè·¯çº¿', title: 'å·¥èºè·¯çº¿'}
			//, { field: 'hsubid', title: 'hsubid' , hide: true}
			//, { field: 'æºååå·', title: 'æºååå·', hide: true}
			@@ -565,6 +562,9 @@
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			break;
			case "11":
			com = " is null";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			@@ -681,7 +681,7 @@
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'å·¥åºæµè½¬å¡-ç¼è¾'
			, title: 'å·¥åºæ´¾å·¥å-ç¼è¾'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../../è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/Sc_ProcessExchangeBill.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID+'&HSouceBillType=3772'
			})
			@@ -1027,7 +1027,7 @@


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["hmainid", "HEntryID", "ä½åºäºº", "ä½åºæ¥æ", "éå®è®¢åæ¥æ", "è®¢åè·è¸ªå·", "HDeptID", "HMaterID", "hunitid", "hempid", "ä¸å¡åä»£ç ", "ä¸å¡å", "hcusid", "å®¢æ·ä»£ç ", "å®¢æ·", "HCenterID", "å·¥ä½ä¸å¿ä»£ç ", "å·¥ä½ä¸å¿", "hbomid", "BOMåç¼ç ", "HRoutingInterID", "å·¥èºè·¯çº¿ä»£ç ", "å·¥èºè·¯çº¿", "hsubid", "æºååå·", "æºåä¸»åç ", "æºåååç ", "è¡å³éäºº", "å³éç±»å", "åæ®ç±»å", "è®¡åè·è¸ªå·"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["hmainid", "HEntryID", "ä½åºäºº", "ä½åºæ¥æ", "éå®è®¢åæ¥æ", "è®¢åè·è¸ªå·", "HDeptID", "HMaterID", "hunitid", "hempid", "ä¸å¡åä»£ç ", "ä¸å¡å", "hcusid", "å®¢æ·ä»£ç ", "å®¢æ·", "HCenterID", "å·¥ä½ä¸å¿ä»£ç ", "å·¥ä½ä¸å¿", "hbomid", "BOMåç¼ç ", "HRoutingInterID", "å·¥èºè·¯çº¿ä»£ç ", "å·¥èºè·¯çº¿", "hsubid", "æºååå·", "æºåä¸»åç ", "æºåååç ", "è¡å³éäºº", "å³éç±»å", "åæ®ç±»å", "è®¡åè·è¸ªå·","å¯ä¸ID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			dataCol = data1.data[0].HGridString.split(',');

			@@ -1042,6 +1042,27 @@
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];

			switch (option.cols[0][i + 1]["field"]) {
			case 'æ¥æ':
			option.cols[0][i + 1]["width"] = 115;
			break;
			case 'åæ®å·':
			option.cols[0][i + 1]["width"] = 160;
			break;
			case 'äº§åä»£ç ':
			option.cols[0][i + 1]["width"] = 150;
			break;
			case 'äº§ååç§°':
			option.cols[0][i + 1]["width"] = 200;
			break;
			case 'è§æ ¼åå·':
			option.cols[0][i + 1]["width"] = 190;
			break;
			case 'çäº§è½¦é´':
			option.cols[0][i + 1]["width"] = 145;
			break;
			}
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {