git-svn-id: https://192.168.57.71/svn/jsgkj@1739 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrdetails.jsp

@@ -180,11 +180,11 @@
 									</tr>
 									<tr>
 										<th>行政区划：</th>
-										<td colspan="2">${gkjyrxx.xzqh}</td>
+										<td>${gkjyrxx.xzqh}</td>
 										<th>企业性质：</th>
-										<td colspan="2">${gkjyrxx.qyxzzw}</td>
+										<td>${gkjyrxx.qyxzzw}</td>
 										<th>主营货种：</th>
-										<td>${gkjyrxx.zyhz}
+										<td colspan="3">${gkjyrxx.zyhz}
 										</td>
 									</tr>
 									<tr>
@@ -236,6 +236,11 @@
 										</td>
 									</tr>
 									<tr>
+										<th>经营许可证号<br>编号：</th>
+										<td colspan="7">${gkjyrxx.gkjyxkzh}
+										</td>
+									</tr>
+									<tr>
 										<th>工商营业执照<br>编号：</th>
 										<td colspan="2">${gkjyrxx.gsyyzzbh}
 										</td>
@@ -286,7 +291,7 @@
 										
 									</tr>
 									<tr>
-										<th>码头泊位总数<br>（平方米）：</th>
+										<th>码头泊位总数（个）：</th>
 										<td colspan="2">${gkjyrxx.mtbwzs}</td>
 										<th>生产性泊位（个）：</th>
 										<td colspan="2">${gkjyrxx.scxbw}</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/jyradd.jsp

@@ -52,13 +52,13 @@
 						</tr>
 						<tr>
 							<th>行政区划：</th>
-							<td colspan="2">
+							<td>
 								<div id="xzqhsel"></div>
 							</td>
 							<th>企业性质：<!-- 行政区划： --></th>
-							<td colspan="2"><span id="qyxzsel"></span></td>
+							<td><span id="qyxzsel"></span></td>
 								<th>主营货种：</th>
-							<td><input type="text" class="form-control" name="zyhz" maxlength="200">
+							<td colspan="3"><input type="text" class="form-control" name="zyhz" maxlength="200">
 							</td>
 						</tr>
 						<tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/jyredit.jsp

@@ -56,13 +56,13 @@
 						<tr>
 							
 							<th>行政区划：</th>
-							<td colspan="2">
+							<td>
 								<div id="xzqhsel"></div>
 							</td>
 							<th>企业性质：<!-- 行政区划： --></th>
-							<td colspan="2"><span id="qyxzsel"></span></td>
+							<td><span id="qyxzsel"></span></td>
 							<th>主营货种：</th>
-							<td><input type="text" class="form-control" value="${gkjyr.zyhz}" name="zyhz" maxlength="200">
+							<td colspan="3"><input type="text" class="form-control" value="${gkjyr.zyhz}" name="zyhz" maxlength="200">
 							</td>
 						</tr>
 						<tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/jyrview.jsp

@@ -149,7 +149,7 @@
 						
 						</tr>
 						<tr>
-							<th>码头泊位总数<br>（平方米）：</th>
+							<th>码头泊位总数（个）：</th>
 							<td colspan="2">${gkjyr.mtbwzs}</td>
 							<th>生产性泊位（个）：</th>
 							<td colspan="2">${gkjyr.scxbw}</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/print.jsp

@@ -62,203 +62,214 @@ HKEY_Path="\\Software\\Microsoft\\Internet Explorer\\PageSetup\\";
             <div class="fwgl_ng_content" id="print">
             	<h1 align="center" style="font-size: 28px;font-family:方正小标宋简体;">港口经营人基本信息表</h1>
                 <table cellpadding="0" cellspacing="0" class="apply">
-					<tr style="display:none">
-						<th width="10%"></th>
-						<td width="15%"></td>
-						<th width="10%"></th>
-						<td width="15%"></td>
-						<th width="15%"></th>
-						<td width="10%"></td>
-						<th width="10%"></th>
-						<td width="15%"></td>
+					<tr>
+						<th width="10%">所在地：</th>
+						<td width="15%">${gkjyrxx.szdzw}</td>
+						<th width="10%">所在港口：</th>
+						<td width="15%">${gkjyrxx.szgkzw}</td>
+						<th width="10%">所在港区：</th>
+						<td width="15%">${gkjyrxx.szgqzw}</td>
+						<th width="10%">是否危货企业：</th>
+						<td width="15%">${gkjyrxx.sfwhqyzw}</td>
+						
 					</tr>
 					<tr>
-						<th>经营人名称&nbsp</th>
-						<td colspan="5">${gkjyrxx.gkjyr}
+						<th>行政区划：</th>
+						<td>${gkjyrxx.xzqh}</td>
+						<th>企业性质：</th>
+						<td>${gkjyrxx.qyxzzw}</td>
+						<th>主营货种：</th>
+						<td colspan="3">${gkjyrxx.zyhz}
 						</td>
-						<th>企业性质&nbsp</th>
-						<td>${gkjyrxx.qyxz}
+					</tr>
+					<tr>
+						<th>经营人名称：</th>
+						<td colspan="7">${gkjyrxx.gkjyr}
 						</td>
 					</tr>
+				
 					<tr>
-						<th>办公地址&nbsp</th>
+						<th>办公地址：</th>
 						<td colspan="5">${gkjyrxx.bgdz}
 						</td>
-						<th>邮政编码&nbsp</th>
+						<th>邮政编码：</th>
 						<td>${gkjyrxx.yzbm}
 						</td>
 						
 					</tr>
-					<tr>
-						<th>经营许可证号<br>编号&nbsp</th>
+					<%-- <tr>
+					<th>经营许可证号<br>编号：</th>
 						<td colspan="2">${gkjyrxx.gkjyxkzh}
 						</td>
-						<th>发证日期&nbsp</th>
+						<th>发证日期：</th>
 						<td colspan="2">
 							${gkjyrxx.fzrqstr}
-						</td>   
-						<th>发证机关&nbsp</th>
+							</td>   
+						<th>发证机关：</th>
 						<td>${gkjyrxx.fzjg}
 						</td>
 					</tr>
 					<tr>
-						<th>经营范围&nbsp</th>
+						<th>经营范围：</th>
 						<td colspan="7">${gkjyrxx.jyfw}
 						</td>
 					</tr>
 					<tr>
-						<th>经营区域&nbsp</th>
+						<th>经营区域：</th>
 						<td colspan="5">${gkjyrxx.jyqy}
 						</td>
-						<th>主营货种&nbsp</th>
-						<td>${gkjyrxx.zyhz}
-						</td>
-					</tr>
+					</tr> --%>
 					<tr>
-						<th>法定代表人<br>姓名&nbsp</th>
+						<th>法定代表人<br>姓名：</th>
 						<td colspan="2">${gkjyrxx.fddbr}
 						</td>
-						<th>联系电话&nbsp</th>
+						<th>联系电话：</th>
 						<td colspan="2">${gkjyrxx.lxdh}
 						</td>
-						<th>传真&nbsp</th>
+						<th>传真：</th>
 						<td>${gkjyrxx.cz}
 						</td>
 					</tr>
 					<tr>
-						<th>工商营业执照<br>编号&nbsp</th>
+						<th>经营许可证号<br>编号：</th>
+						<td colspan="7">${gkjyrxx.gkjyxkzh}
+						</td>
+					</tr>
+					<tr>
+						<th>工商营业执照<br>编号：</th>
 						<td colspan="2">${gkjyrxx.gsyyzzbh}
 						</td>
-						<th>投资总额&nbsp</th>
+						<th>投资总额（万元）：</th>
 						<td colspan="2">${gkjyrxx.tzze}
 						</td>
-						<th>注册资本&nbsp</th>
+						<th>注册资本（万元）：</th>
 						<td>${gkjyrxx.zczb}
 						</td>
 					</tr>
 					<tr>
-						<th>危险货物作业<br>附证编号&nbsp</th>
+						<th>危险货物作业<br>附证编号：</th>
 						<td colspan="5">${gkjyrxx.gkwxhwzyfzbh}</td>
-						<th >设施保安符合<br>证书编号&nbsp</th>
+						<th >设施保安符合<br>证书编号：</th>
 						<td>${gkjyrxx.gkssbafhzsbh}</td>
 					</tr>
 					<tr>
-						<th rowspan="3">从业人员数量&nbsp</th>
-						<td rowspan="3" colspan="2" style="text-align: right">${gkjyrxx.cyrysl}&nbsp人&nbsp</td>
-						<th>现场管理人员&nbsp</th>
-						<td colspan="2" style="text-align: right">${gkjyrxx.xcglrysl}&nbsp人&nbsp</td>
-						<th rowspan="3">参加培训<br>人员数量&nbsp</th>
-						<td style="text-align: right">${gkjyrxx.xcglpxrysl}&nbsp人&nbsp</td>
+						<th rowspan="3">从业人员数量<br>（人）：</th>
+						<td rowspan="3" colspan="2">${gkjyrxx.cyrysl}</td>
+						<th>现场管理人员（人）：</th>
+						<td colspan="2">${gkjyrxx.xcglrysl}</td>
+						<th rowspan="3">参加培训人员<br>数量（人）：</th>
+						<td>${gkjyrxx.xcglpxrysl}</td>
 					</tr>
 					<tr>
-						<th>专业技术人员&nbsp</th>
-						<td colspan="2" style="text-align: right">${gkjyrxx.zyjsrysl}&nbsp人&nbsp</td>
-						<td style="text-align: right">${gkjyrxx.zyjspxrysl}&nbsp人&nbsp</td>
+						<th>专业技术人员（人）：</th>
+						<td colspan="2">${gkjyrxx.zyjsrysl}</td>
+						<td>${gkjyrxx.zyjspxrysl}</td>
 					</tr>
 					<tr>
-						<th>现场作业人员&nbsp</th>
-						<td colspan="2" style="text-align: right">${gkjyrxx.xczyrysl}&nbsp人&nbsp</td>
-						<td style="text-align: right">${gkjyrxx.xczyrypxsl}&nbsp人&nbsp</td>
+						<th>现场作业人员（人）：</th>
+						<td colspan="2">${gkjyrxx.xczyrysl}</td>
+						<td>${gkjyrxx.xczyrypxsl}</td>
 					</tr>
 					<tr>
-						<th>房建设施<br>总面积&nbsp</th>
-						<td colspan="2" style="text-align: right">${gkjyrxx.fjsszmj}&nbsp平米&nbsp</td>
-						<th>有无产权证明&nbsp</th>
+						<th>房建设施总面积<br>（平方米）：</th>
+						<td colspan="2">${gkjyrxx.fjsszmj}</td>
+						<th>有无产权证明：</th>
 						<td colspan="2">${gkjyrxx.ywcqzmzw}</td>
-						<th>办公用房&nbsp</th>
-						<td style="text-align: right">${gkjyrxx.bgyfmj}&nbsp平米&nbsp</td>
+						<th>办公用房<br>（平方米）：</th>
+						<td>${gkjyrxx.bgyfmj}</td>
 					</tr>
 					<tr>
-						<th>岸线长度&nbsp</th>
-						<td colspan="2" style="text-align: right">${gkjyrxx.axcd}&nbsp米&nbsp</td>
-						<th>码头前沿河底高程&nbsp</th>
-						<td colspan="4" style="text-align: right">${gkjyrxx.mtqyhdgc}&nbsp米&nbsp</td>
+						<th>岸线长度（米）：</th>
+						<td colspan="2">${gkjyrxx.axcd}</td>
+						<th>码头前沿河底高程（米）：</th>
+						<td colspan="4">${gkjyrxx.mtqyhdgc}</td>
+						
 					</tr>
 					<tr>
-						<th>码头泊位总数&nbsp</th>
-						<td colspan="2" style="text-align: right">${gkjyrxx.mtbwzs}&nbsp平米&nbsp</td>
-						<th>生产性泊位&nbsp</th>
-						<td colspan="2" style="text-align: right">${gkjyrxx.scxbw}&nbsp个&nbsp</td>
-						<th>非生产性泊位&nbsp</th>
-						<td style="text-align: right">${gkjyrxx.fscxbw}&nbsp个&nbsp</td>
+						<th>码头泊位总数（个）：</th>
+						<td>${gkjyrxx.mtbwzs}</td>
+						<th>生产性泊位（个）：</th>
+						<td>${gkjyrxx.scxbw}</td>
+						<th>非生产性泊位（个）：</th>
+						<td colspan="3">${gkjyrxx.fscxbw}</td>
 					</tr>
 					<tr>
-						<th>最大靠泊能力&nbsp</th>
-						<td colspan="5" style="text-align: center">${gkjyrxx.zdkbnl}&nbsp万吨&nbsp</td>
-						<th>万吨级以上<br>泊位数量&nbsp</th>
-						<td style="text-align: right">${gkjyrxx.wdjysbwsl}&nbsp个&nbsp</td>
+						<th>最大靠泊能力<br>（万吨）：</th>
+						<td colspan="5">${gkjyrxx.zdkbnl}</td>
+						<th>万吨级以上泊位<br>数量（个）：</th>
+						<td>${gkjyrxx.wdjysbwsl}</td>
 					</tr>
 					<tr>
-						<th rowspan="2">码头结构型式&nbsp</th>
-						<td rowspan="2" colspan="2">${gkjyrxx.mtjgxs}</td>
-						<th>泊位总长度&nbsp</th>
-						<td colspan="4" style="text-align: right">${gkjyrxx.bwzcd}&nbsp米&nbsp</td>
+						<th rowspan="2">码头结构型式：</th>
+						<td rowspan="2" colspan="2">${gkjyrxx.mtjgxszw}</td>
+						<th>泊位总长度（米）：</th>
+						<td colspan="4">${gkjyrxx.bwzcd}</td>
 					</tr>
 					<tr>
-						<th>有无竣工验收<br>（证明）&nbsp</th>
+						<th>有无竣工验收<br>证明：</th>
 						<td colspan="4">${gkjyrxx.ywjgyszw}</td>
 					</tr>
 					<tr>
-						<th>设计年通过<br>能力&nbsp</th>
-						<td colspan="7" style="text-align: center">
-							${gkjyrxx.sjntgnl}&nbsp万吨，其中集装箱&nbsp&nbsp${gkjyrxx.jzx}&nbsp&nbsp万TEU&nbsp
+						<th>设计年通过能力<br>（万吨）：</th>
+						<td colspan="7">
+							${gkjyrxx.sjntgnl}，其中集装箱（万TEU）：${gkjyrxx.jzx}
 						</td>
 					</tr>
 					<tr>
-						<th rowspan="2">上年度总吞量&nbsp</th>
-						<td colspan="2" style="text-align: right">${gkjyrxx.sndzttl}&nbsp万吨&nbsp</td>
-						<th rowspan="2">其中外贸<br>总吞量&nbsp</th>
-						<td colspan="4" style="text-align: right">${gkjyrxx.sndwmttl}&nbsp万吨&nbsp</td>
+						<th rowspan="2">上年度总吞量<br>（万吨）：</th>
+						<td colspan="2">${gkjyrxx.sndzttl}<br>&nbsp集装箱（万TEU）：</td>
+						<th rowspan="2">其中外贸总吞量<br>（万吨）：</th>
+						<td colspan="4">${gkjyrxx.sndwmttl}<br>&nbsp集装箱（万TEU）：</td>
 					</tr>
 					<tr>
-						<td colspan="2" style="text-align: right">${gkjyrxx.sndzjzx}&nbsp万TEU&nbsp</td>
-						<td colspan="4" style="text-align: right">${gkjyrxx.sndwmjzx}&nbsp万TEU&nbsp</td>
+						<td colspan="2">${gkjyrxx.sndzjzx}</td>
+						<td colspan="4">${gkjyrxx.sndwmjzx}</td>
 					</tr>
 					<tr>
-						<th>陆域总面积&nbsp</th>
-						<td colspan="2" style="text-align: right">${gkjyrxx.lymj}&nbsp平米&nbsp</td>
-						<th>仓库总面积&nbsp</th>
-						<td colspan="2" style="text-align: right">${gkjyrxx.ckzmj}&nbsp平米&nbsp</td>
-						<th>堆场总面积&nbsp</th>
-						<td style="text-align: right">${gkjyrxx.tczmj}&nbsp平米&nbsp</td>
+						<th>陆域总面积<br>（平方米）：</th>
+						<td colspan="2">${gkjyrxx.lymj}</td>
+						<th>仓库总面积<br>（平方米）：</th>
+						<td colspan="2">${gkjyrxx.ckzmj}</td>
+						<th>堆场总面积<br>（平方米）：</th>
+						<td>${gkjyrxx.tczmj}</td>
 					</tr>
 					<tr>
-						<th rowspan="3">装卸设备&nbsp</th>
-						<td rowspan="3" colspan="2" style="text-align: right">${gkjyrxx.zxsbgs}&nbsp台&nbsp</td>
-						<th>其中门座吊机&nbsp</th>
-						<td colspan="2" style="text-align: right">${gkjyrxx.mzdjgs}&nbsp台&nbsp</td>
-						<th>轮胎起重机&nbsp</th>
-						<td style="text-align: right">${gkjyrxx.ltqzjgs}&nbsp台&nbsp</td>
+						<th rowspan="3">装卸设备（台）：</th>
+						<td rowspan="3" colspan="2">${gkjyrxx.zxsbgs}</td>
+						<th>其中门座吊机（台）：</th>
+						<td colspan="2">${gkjyrxx.mzdjgs}</td>
+						<th>轮胎起重机（台）：</th>
+						<td>${gkjyrxx.ltqzjgs}</td>
 					</tr>
 					<tr>
-						<th>固定吊机&nbsp</th>
-						<td colspan="2" style="text-align: right">${gkjyrxx.gddjgs}&nbsp台&nbsp</td>
-						<th>汽车起重机&nbsp</th>
-						<td style="text-align: right">${gkjyrxx.qcqzjgs}&nbsp台&nbsp</td>
+						<th>固定吊机（台）：</th>
+						<td colspan="2">${gkjyrxx.gddjgs}</td>
+						<th>汽车起重机（台）：</th>
+						<td>${gkjyrxx.qcqzjgs}</td>
 					</tr>
 					<tr>
-						<th>输送设备&nbsp</th>
-						<td colspan="2" style="text-align: right">${gkjyrxx.sssbgs}&nbsp台&nbsp</td>
-						<th>其他机械&nbsp</th>
-						<td style="text-align: right">${gkjyrxx.qtjxgs}&nbsp台&nbsp</td>
+						<th>输送设备（台）：</th>
+						<td colspan="2">${gkjyrxx.sssbgs}</td>
+						<th>其他机械（台）：</th>
+						<td>${gkjyrxx.qtjxgs}</td>
 					</tr>
 					<tr>
-						<th>港作船舶&nbsp</th>
-						<td colspan="2" style="text-align: right">${gkjyrxx.gzcbgs}&nbsp艘&nbsp</td>
-						<th>船舶总载重量&nbsp</th>
-						<td colspan="4" style="text-align: right">${gkjyrxx.cbzzzl}&nbsp万吨&nbsp</td>
+						<th>港作船舶（艘）：</th>
+						<td colspan="2">${gkjyrxx.gzcbgs}</td>
+						<th>船舶总载重量<br>（万吨）：</th>
+						<td colspan="4">${gkjyrxx.cbzzzl}</td>
 					</tr>
 					<tr>
-						<th>工艺管线长度&nbsp</th>
-						<td colspan="2" style="text-align: right">${gkjyrxx.gygxcd}&nbsp米&nbsp</td>
-						<th>铁路专用长度&nbsp</th>
-						<td colspan="4" style="text-align: right">${gkjyrxx.tlzyxcd}&nbsp米&nbsp</td>
+						<th>工艺管线长度（米）：</th>
+						<td colspan="2">${gkjyrxx.gygxcd}</td>
+						<th>铁路专用长度（米）：</th>
+						<td colspan="4">${gkjyrxx.tlzyxcd}</td>
 					</tr>
 					<tr>
-						<th>储罐数量&nbsp</th>
-						<td colspan="2" style="text-align: right">${gkjyrxx.cgsl}&nbsp个&nbsp</td>
-						<th>储罐总容量&nbsp</th>
-						<td colspan="4" style="text-align: right">${gkjyrxx.cgzrl}&nbsp立方米&nbsp</td>
+						<th>储罐数量（个）：</th>
+						<td colspan="2">${gkjyrxx.cgsl}</td>
+						<th>储罐总容量<br>（立方米）：</th>
+						<td colspan="4">${gkjyrxx.cgzrl}</td>
 					</tr>
 				</table>
             </div>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrxkzfz/xkzfzmain.jsp

@@ -37,6 +37,9 @@
 		    if(data6=='是'){
 		        data6='201';
 		    }
+		    if(data6=='否'){
+		        data6='202';
+		    }
 			location.href=$.app+"/xkzfz/exportExcelAll?ssjyr="+data1+"&szdid="+data2+"&szgkid="+data3+"&szgqid="+data4+"&fzsqh="+data5+"&fzsfyx="+data6+"&wxhwpm="+data7+"&fzsfdq="+data8;
 			$.alert({
        		    title: '提示',

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgaddmain.jsp

@@ -604,13 +604,13 @@
 										</tr>
 										<tr>
 											<th>行政区划: &nbsp;</th>
-											<td colspan="2">
+											<td>
 												<div id="xzqhsel"></div>
 											</td>
 											<th>企业性质：</th>
-											<td colspan="2"><span id="qyxzsel"></span></td>
+											<td><span id="qyxzsel"></span></td>
 											<th>主营货种: &nbsp;</th>
-											<td><input type="text" class="form-control"
+											<td colspan="3"><input type="text" class="form-control"
 												value="${gkjyr.zyhz}" name="zyhz" id="zyhz" maxlength="200"></td>
 											</td>
 										</tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgeditmain.jsp

@@ -514,13 +514,13 @@
 										</tr>
 										<tr>
 											<th>行政区划: &nbsp;</th>
-											<td colspan="2">
+											<td>
 												<div id="xzqhsel"></div>
 											</td>
 											<th>企业性质：</th>
-											<td colspan="2"><span id="qyxzsel"></span></td>
+											<td><span id="qyxzsel"></span></td>
 											<th>主营货种: &nbsp;</th>
-											<td><input type="text" class="form-control"
+											<td colspan="3"><input type="text" class="form-control"
 												value="${gkjyr.zyhz}" name="zyhz" id="zyhz" maxlength="200"></td>
 											</td>
 										</tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgviewmain.jsp

@@ -509,11 +509,11 @@
 									</tr>
 									<tr>
 										<th>行政区划: &nbsp;</th>
-										<td colspan="2">${gkjyrxx.xzqhzw}</td>
+										<td>${gkjyrxx.xzqhzw}</td>
 										<th>企业性质：</th>
-										<td colspan="2">${gkjyrxx.qyxzzw}</td>
+										<td>${gkjyrxx.qyxzzw}</td>
 										<th>主营货种: &nbsp;</th>
-										<td>${gkjyrxx.zyhz}</td>
+										<td colspan="3">${gkjyrxx.zyhz}</td>
 									</tr>
 									<tr>
 										<th>经营人名称：</th>
@@ -566,6 +566,11 @@
 										</td>
 									</tr>
 									<tr>
+										<th>经营许可证号<br>编号：</th>
+										<td colspan="7">${gkjyrxx.gkjyxkzh}
+										</td>
+									</tr>
+									<tr>
 										<th>工商营业执照<br>编号：</th>
 										<td colspan="2">${gkjyrxx.gsyyzzbh}
 										</td>
@@ -616,7 +621,7 @@
 										
 									</tr>
 									<tr>
-										<th>码头泊位总数<br>（平方米）：</th>
+										<th>码头泊位总数（个）：</th>
 										<td colspan="2">${gkjyrxx.mtbwzs}</td>
 										<th>生产性泊位（个）：</th>
 										<td colspan="2">${gkjyrxx.scxbw}</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/gkjyrdetails.jsp

@@ -123,6 +123,11 @@
 							</td>
 						</tr>
 						<tr>
+							<th>经营许可证号<br>编号：</th>
+							<td colspan="7">${gkjyrxx.gkjyxkzh}
+							</td>
+						</tr>
+						<tr>
 							<th>工商营业执照编号: &nbsp;</th>
 							<td colspan="2">${gkjyrxx.gsyyzzbh}
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqaddmain.jsp

@@ -508,13 +508,13 @@
 										</tr>
 										<tr>
 											<th>行政区划: &nbsp;</th>
-											<td colspan="2">
+											<td>
 												<div id="xzqhsel"></div>
 											</td>
 											<th>企业性质：</th>
-											<td colspan="2"><span id="qyxzsel"></span></td>
+											<td><span id="qyxzsel"></span></td>
 											<th>主营货种: &nbsp;</th>
-											<td><input type="text" class="form-control"
+											<td colspan="3"><input type="text" class="form-control"
 												value="${gkjyr.zyhz}" name="zyhz" id="zyhz" maxlength="200"></td>
 											</td>
 										</tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqeditmain.jsp

@@ -438,13 +438,13 @@
 										</tr>
 										<tr>
 											<th>行政区划: &nbsp;</th>
-											<td colspan="2">
+											<td>
 												<div id="xzqhsel"></div>
 											</td>
 											<th>企业性质：</th>
-											<td colspan="2"><span id="qyxzsel"></span></td>
+											<td><span id="qyxzsel"></span></td>
 											<th>主营货种: &nbsp;</th>
-											<td><input type="text" class="form-control"
+											<td colspan="3"><input type="text" class="form-control"
 												value="${gkjyr.zyhz}" name="zyhz" id="zyhz" maxlength="200"></td>
 											</td>
 										</tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqviewmain.jsp

@@ -460,11 +460,11 @@
 									</tr>
 									<tr>
 										<th>行政区划: &nbsp;</th>
-										<td colspan="2">${gkjyrxx.xzqhzw}</td>
+										<td>${gkjyrxx.xzqhzw}</td>
 										<th>企业性质：</th>
-										<td colspan="2">${gkjyrxx.qyxzzw}</td>
+										<td>${gkjyrxx.qyxzzw}</td>
 										<th>主营货种: &nbsp;</th>
-										<td>${gkjyrxx.zyhz}</td>
+										<td colspan="3">${gkjyrxx.zyhz}</td>
 									</tr>
 									<tr>
 										<th>经营人名称：</th>
@@ -517,6 +517,11 @@
 										</td>
 									</tr>
 									<tr>
+										<th>经营许可证号<br>编号：</th>
+										<td colspan="7">${gkjyrxx.gkjyxkzh}
+										</td>
+									</tr>
+									<tr>
 										<th>工商营业执照<br>编号：</th>
 										<td colspan="2">${gkjyrxx.gsyyzzbh}
 										</td>
@@ -567,7 +572,7 @@
 										
 									</tr>
 									<tr>
-										<th>码头泊位总数<br>（平方米）：</th>
+										<th>码头泊位总数（个）：</th>
 										<td colspan="2">${gkjyrxx.mtbwzs}</td>
 										<th>生产性泊位（个）：</th>
 										<td colspan="2">${gkjyrxx.scxbw}</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxaddmain.jsp

@@ -465,13 +465,13 @@
 										</tr>
 										<tr>
 											<th>行政区划: &nbsp;</th>
-											<td colspan="2">
+											<td>
 												<div id="xzqhsel"></div>
 											</td>
 											<th>企业性质：</th>
-											<td colspan="2"><span id="qyxzsel"></span></td>
+											<td><span id="qyxzsel"></span></td>
 											<th>主营货种: &nbsp;</th>
-											<td><input type="text" class="form-control"
+											<td colspan="3"><input type="text" class="form-control"
 												value="${gkjyr.zyhz}" name="zyhz" id="zyhz" maxlength="200"></td>
 											</td>
 										</tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxeditmain.jsp

@@ -376,13 +376,13 @@
 										</tr>
 										<tr>
 											<th>行政区划: &nbsp;</th>
-											<td colspan="2">
+											<td>
 												<div id="xzqhsel"></div>
 											</td>
 											<th>企业性质：</th>
-											<td colspan="2"><span id="qyxzsel"></span></td>
+											<td><span id="qyxzsel"></span></td>
 											<th>主营货种: &nbsp;</th>
-											<td><input type="text" class="form-control"
+											<td colspan="3"><input type="text" class="form-control"
 												value="${gkjyr.zyhz}" name="zyhz" id="zyhz" maxlength="200"></td>
 											</td>
 										</tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxviewmain.jsp

@@ -496,11 +496,11 @@
 									</tr>
 									<tr>
 										<th>行政区划: &nbsp;</th>
-										<td colspan="2">${gkjyrxx.xzqhzw}</td>
+										<td>${gkjyrxx.xzqhzw}</td>
 										<th>企业性质：</th>
-										<td colspan="2">${gkjyrxx.qyxzzw}</td>
+										<td>${gkjyrxx.qyxzzw}</td>
 										<th>主营货种: &nbsp;</th>
-										<td>${gkjyrxx.zyhz}</td>
+										<td colspan="3">${gkjyrxx.zyhz}</td>
 									</tr>
 									<tr>
 										<th>经营人名称：</th>
@@ -553,6 +553,11 @@
 										</td>
 									</tr>
 									<tr>
+										<th>经营许可证号<br>编号：</th>
+										<td colspan="7">${gkjyrxx.gkjyxkzh}
+										</td>
+									</tr>
+									<tr>
 										<th>工商营业执照<br>编号：</th>
 										<td colspan="2">${gkjyrxx.gsyyzzbh}
 										</td>
@@ -603,7 +608,7 @@
 										
 									</tr>
 									<tr>
-										<th>码头泊位总数<br>（平方米）：</th>
+										<th>码头泊位总数（个）：</th>
 										<td colspan="2">${gkjyrxx.mtbwzs}</td>
 										<th>生产性泊位（个）：</th>
 										<td colspan="2">${gkjyrxx.scxbw}</td>