Merge remote-tracking branch 'wenku/master'

Conflicts:
	css/style.css

css/style.css

@@ -2957,6 +2957,7 @@ td a:hover.pirceEdit .colOrange {
 }
 .provinceName input{
 	margin:3px 5px 0 0;
+<<<<<<< HEAD
 }
 #safari_rememberDiv{
 	display: none
@@ -2968,4 +2969,6 @@ td a:hover.pirceEdit .colOrange {
 	position: absolute;
 	right:-115px;
 	top:-15px;
+=======
+>>>>>>> wenku/master
 }

dingeku - search.html

@@ -167,13 +167,76 @@
 </div>
 </div>
 <div class="wrapDinge">
-	<div class="dingeSearch">
+	<!-- <div class="dingeSearch">
 		<div class="searchItem">
 			<input type="text"><a class="dsearchBtn">搜索定额库</a>
 		</div>
+	</div> -->
+	<div class="dingeSearch">
+		<div class="searchMoreItem">
+			<form name="searchRation" action="/searchRation" method="get">
+				<dl>
+					<dt>按以下条件搜索</dt>
+					<dd><span>定额库</span>
+						<select name="lib" id="lib" onchange="setLibText()">
+							<option value="0">不限</option>
+													</select>
+					</dd>
+					<dd style="display:none;"><span>部位</span>
+						<select><option>不限</option></select>
+					</dd>
+					<dd><span>编号/名称</span>
+						<input type="text" class="inputWarp" name="keywork" value="土方">
+						<select style="width:90px" name="type">
+							<option value="0">模糊搜索</option>
+							<option value="1">匹配搜索</option>
+						</select>
+					</dd>
+					<dd><input type="submit" class="searchBtn" value="搜索"></dd>
+				</dl>
+			</form>
+		</div>
 	</div>
 		<div class="dingeSearchResult">
-			<h3>搜索&nbsp;<b class="colRed">搜索关键词</b>&nbsp;结果&nbsp;<b class="colRed">545</b>&nbsp;条记录</h3>
+			<h3>搜索&nbsp;<b class="colRed">搜索关键词</b>&nbsp;结果&nbsp;<b class="colRed">545</b>&nbsp;条记录</h3>	
+			<div class="dingeSearch">
+				<div class="provinceWrap">
+					<label class="provinceName"><input type="checkbox" name="" value="全国" />全国</label>
+					<label class="provinceName"><input type="checkbox" name="" value="北京" />北京</label>
+					<label class="provinceName"><input type="checkbox" name="" value="河南" />河南</label>
+					<label class="provinceName"><input type="checkbox" name="" value="山西" />山西</label>
+					<label class="provinceName"><input type="checkbox" name="" value="内蒙古" />内蒙古</label>
+					<label class="provinceName"><input type="checkbox" name="" value="吉林" />吉林</label>
+					<label class="provinceName"><input type="checkbox" name="" value="黑龙江" />黑龙江</label>
+					<label class="provinceName"><input type="checkbox" name="" value="江苏" />江苏</label>
+					<label class="provinceName"><input type="checkbox" name="" value="浙江" />浙江</label>
+					<label class="provinceName"><input type="checkbox" name="" value="安徽" />安徽</label>
+					<label class="provinceName"><input type="checkbox" name="" value="福建" />福建</label>
+					<label class="provinceName"><input type="checkbox" name="" value="江西" />江西</label>
+					<label class="provinceName"><input type="checkbox" name="" value="山东" />山东</label>
+					<label class="provinceName"><input type="checkbox" name="" value="河南" />河南</label>
+					<label class="provinceName"><input type="checkbox" name="" value="湖北" />湖北</label>
+					<label class="provinceName"><input type="checkbox" name="" value="湖南" />湖南</label>
+					<label class="provinceName"><input type="checkbox" name="" value="广东" />广东</label>
+					<label class="provinceName"><input type="checkbox" name="" value="广西" />广西</label>
+					<label class="provinceName"><input type="checkbox" name="" value="重庆" />重庆</label>
+					<label class="provinceName"><input type="checkbox" name="" value="四川" />四川</label>
+					<label class="provinceName"><input type="checkbox" name="" value="贵州" />贵州</label>
+					<label class="provinceName"><input type="checkbox" name="" value="云南" />云南</label>
+					<label class="provinceName"><input type="checkbox" name="" value="陕西" />陕西</label>
+					<label class="provinceName"><input type="checkbox" name="" value="甘肃" />甘肃</label>
+					<label class="provinceName"><input type="checkbox" name="" value="青海" />青海</label>
+					<label class="provinceName"><input type="checkbox" name="" value="宁夏" />宁夏</label>
+					<label class="provinceName"><input type="checkbox" name="" value="新疆" />新疆</label>
+				</div>
+				<!-- <div class="searchMoreItem">
+					<dl>
+						<dt>在结果中搜索：</dt>
+						<dd><span>省份</span><select name="lib" id="lib"><option value="0">省份</option></select></dd>
+						<dd><input type="submit" class="searchBtn" value="搜索"></dd>
+					</dl>
+				</div> -->
+			</div>
 			<table>
 				<tr><th style="width:20px"> </th><th>编号</th><th>名称</th><th>单位</th><th>定额基价</th><th>部位</th><th>文件名</th></tr>
 				<tr>