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

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

@@ -200,7 +200,7 @@
 
 	#simple_new_menu {
 		height: 36px;
-		margin-left：-20px;
+		margin-left:-20px;
 	}
 
 	#simple_new_menu ul li {
@@ -344,7 +344,7 @@
 			</tr>
 		<tr>
 			<td colspan="3">
-			变更为：<input type="text" readonly="readonly"  style="display:inline-table " class="form-control" readonly="readonly" name="xqymc" id ="xqymc" value="">
+			变更为：<input type="text" readonly="readonly"  style="display:inline-table;width: 75% " class="form-control" readonly="readonly" name="xqymc" id ="xqymc" value="">
 			</td>
 		</tr>
 		<tr>
@@ -357,7 +357,7 @@
 		</tr>
 		<tr>
 			<td colspan="3">
-			变更为：<input type="text" readonly="readonly" class="form-control"  style="display:inline-table " name="xbgdz" id ="xbgdz" value="">
+			变更为：<input type="text" readonly="readonly" class="form-control"  style="display:inline-table;width: 75% " name="xbgdz" id ="xbgdz" value="">
 			</td>
 		</tr>
 		<tr>
@@ -370,7 +370,7 @@
 		</tr>
 		<tr>
 			<td colspan="3">
-			变更为：<input type="text" readonly="readonly" name="xfddbr"  style="display:inline-table " class="form-control" id ="xfddbr" value="">
+			变更为：<input type="text" readonly="readonly" name="xfddbr"  style="display:inline-table;width: 75%" class="form-control" id ="xfddbr" value="" >
 			</td>
 		</tr>
 		<tr>
@@ -382,7 +382,7 @@
 			</td>
 		</tr>
 		<tr >
-			<td colspan="3" style="position:relative;">变更为：<input type="text"  style="display:inline-table " class="form-control" readonly="readonly" name="xjydy" id="xjydy" value="">
+			<td colspan="3" style="position:relative;">变更为：<input type="text"  style="display:inline-table;width: 75% " class="form-control" readonly="readonly" name="xjydy" id="xjydy" value="">
 			<a id="selJydy" class="btn btn-primary btn-sm" class="form-control" style="display:none;float: right;position:absolute;right:5px;top:5px;" href="#" onclick="xkzbg.detail.jydyxz()">选择经营范围</a>
 			</td>
 		</tr>
@@ -400,7 +400,7 @@
 			<!--<textarea class="form-control" style="display:inline-table "  readonly="readonly" name="yqt" id="yqt" value=""></textarea>  --></td>
 		</tr>
 		<tr>
-			<td colspan="3">变更为：<textarea class="form-control" style="display:inline-table "  readonly="readonly" name="xqt" id="xqt" ></textarea></td>
+			<td colspan="3">变更为：<textarea class="form-control" style="display:inline-table;width: 75% "  readonly="readonly" name="xqt" id="xqt" ></textarea></td>
 		</tr>
 		<tr>
 			<th colspan="2">提交材料清单：</th>
@@ -450,7 +450,7 @@
 		<tr>
 			<th colspan="2">申请人：&nbsp;</th>
 			<td><input type="text" class="form-control"readonly="readonly"  value="${sqr }"></td>
-			<th>申请时间：&nbsp;</th>
+			<th>申请日期：&nbsp;</th>
 			<td><input type="text" class="form-control" style="width:61%" readonly="readonly"  value="${fn:substring(sqsj,0,10)}"></td>
 		</tr>
 	</table>
@@ -551,7 +551,7 @@
 		<div  id="buttons">
   	<a class="btn btn-default btn-sm" href="#" onclick="xkzbg.detail.savejydy()">
   <i></i> 
-           新增</a>
+           保存</a>
             <a class="btn btn-default btn-sm" href="#"  onclick="xkzbg.detail.guanbipop()">
   <i></i> 
            关闭</a>
@@ -616,7 +616,7 @@
 										</tr>
 										<tr>
 											<th>经营人名称：</th>
-											<td colspan="5"><input type="text" class="form-control"
+											<td colspan="7"><input type="text" class="form-control"
 												value="${gkjyr.gkjyr}" id="gkjyr" name="gkjyr" maxlength="200"
 												style="width: 99%"></td>
 										</tr>

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

@@ -86,7 +86,7 @@
 
 #simple_new_menu {
 	height: 36px;
-	margin-left：-20px;
+	margin-left:-20px;
 }
 
 #simple_new_menu ul li {
@@ -361,7 +361,7 @@
 		<tr>
 			<th colspan="2">申请人：&nbsp;</th>
 			<td><input type="text" class="form-control"readonly="readonly"  value="${record.sqr }"></td>
-			<th>申请时间：&nbsp;</th>
+			<th>申请日期：&nbsp;</th>
 			<td><input type="text" class="form-control" readonly="readonly" style="width:61%" value="${fn:substring(record.sqrq,0,10)}"></td>
 		</tr>
 	</table>
@@ -462,7 +462,7 @@
 		<div  id="buttons">
   	<a class="btn btn-default btn-sm" href="#" onclick="xkzbg.detail.savejydy()">
   <i></i> 
-           新增</a>
+           保存</a>
             <a class="btn btn-default btn-sm" href="#"  onclick="xkzbg.detail.guanbipop()">
   <i></i> 
            关闭</a>
@@ -526,7 +526,7 @@
 										</tr>
 										<tr>
 											<th>经营人名称：</th>
-											<td colspan="5"><input type="text" class="form-control"
+											<td colspan="7"><input type="text" class="form-control"
 												value="${gkjyr.gkjyr}" id="gkjyr" name="gkjyr" maxlength="200"
 												style="width: 99%"></td>
 										</tr>

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

@@ -142,7 +142,12 @@
 							</td> 
 							<td>${xkz.lxr }</td>
 							<td>${xkz.dh }</td>
-							<td>${xkz.currentname }</td>
+							<c:if test="${not empty xkz.currentname}">
+								<td>${xkz.currentname }</td>
+							</c:if>
+							<c:if test="${empty xkz.currentname}">
+								<td>未提交</td>
+							</c:if>
 							<td class="operatetd">
 								<a class="btn btn-default btn-xs" href="#" onclick="xkzbg.main.view('${xkz.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 

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

@@ -86,7 +86,7 @@
 
 #simple_new_menu {
 	height: 36px;
-	margin-left：-20px;
+	margin-left:-20px;
 }
 
 #simple_new_menu ul li {
@@ -291,7 +291,7 @@
 		<tr>
 			<th colspan="2">申请人：&nbsp;</th>
 			<td>${record.sqr }</td>
-			<th>申请时间：&nbsp;</th>
+			<th>申请日期：&nbsp;</th>
 			<td>${fn:substring(record.sqrq,0,10)}</td>
 		</tr>
 		<c:if test="${opflag == null && flag != 'audit' }">
@@ -302,7 +302,7 @@
 		<tr>
 			<th colspan="2">材料审查人：&nbsp;</th>
 			<td>${record.clscjbr }</td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td>${fn:substring(record.clscrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -312,7 +312,7 @@
 		<tr>
 			<th colspan="2">核查经办人：&nbsp;</th>
 			<td>${record.hcjbr }
-			<th>核查经办时间：&nbsp;</th>
+			<th>核查经办日期：&nbsp;</th>
 			<td>${fn:substring(record.hcrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -322,7 +322,7 @@
 		<tr>
 			<th colspan="2">复核经办人：&nbsp;</th>
 			<td>${record.fhjbr }</td>
-			<th>复核经办时间：&nbsp;</th>
+			<th>复核经办日期：&nbsp;</th>
 			<td >${fn:substring(record.fhrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -332,7 +332,7 @@
 		<tr>
 			<th colspan="2">审批经办人：&nbsp;</th>
 			<td >${record.spry }</td>
-			<th>审批经办时间：&nbsp;</th>
+			<th>审批经办日期：&nbsp;</th>
 			<td >${fn:substring(record.sprq,0,10)}</td>
 		</tr>
 		</c:if>
@@ -344,7 +344,7 @@
 		<tr>
 			<th colspan="2">材料审查人：&nbsp;</th>
 			<td><input class="form-control" type="text" readonly="readonly" name ="clscjbr" id="clscjbr" value="${ry }"></td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td><input class="form-control" type="text" readonly="readonly" name ="clscrq" id="clscrq" value="${fn:substring(sj,0,10)}"></td>
 		</tr>
 		</c:if>
@@ -356,7 +356,7 @@
 		<tr>
 			<th colspan="2">材料审查人：&nbsp;</th>
 			<td>${record.clscjbr }</td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td>${fn:substring(record.clscrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -366,7 +366,7 @@
 		<tr>
 			<th colspan="2">核查经办人：&nbsp;</th>
 			<td ><input class="form-control" type="text" readonly="readonly" name ="hcjbr" id="hcjbr" value="${ry }"></td>
-			<th>核查经办时间：&nbsp;</th>
+			<th>核查经办日期：&nbsp;</th>
 			<td ><input class="form-control" type="text" readonly="readonly" name ="hcrq" id="hcrq" value="${fn:substring(sj,0,10)}"></td>
 		</tr>
 		</c:if>
@@ -378,7 +378,7 @@
 		<tr>
 			<th colspan="2">材料审查人：&nbsp;</th>
 			<td>${record.clscjbr }</td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td>${fn:substring(record.clscrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -388,7 +388,7 @@
 		<tr>
 			<th colspan="2">核查经办人：&nbsp;</th>
 			<td>${record.hcjbr }</td>
-			<th >核查经办时间：&nbsp;</th>
+			<th >核查经办日期：&nbsp;</th>
 			<td>${fn:substring(record.hcrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -398,7 +398,7 @@
 		<tr>
 			<th colspan="2">复核经办人：&nbsp;</th>
 			<td><input class="form-control" type="text" readonly="readonly" name ="fhjbr" id="fhjbr" value="${ry }"></td>
-			<th>复核经办时间：&nbsp;</th>
+			<th>复核经办日期：&nbsp;</th>
 			<td><input class="form-control" type="text" readonly="readonly" name ="fhrq" id="fhrq" value="${fn:substring(sj,0,10)}"></td>
 		</tr>
 		</c:if>
@@ -410,7 +410,7 @@
 		<tr>
 			<th colspan="2">材料审查人：&nbsp;</th>
 			<td>${record.clscjbr }</td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td>${fn:substring(record.clscrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -420,7 +420,7 @@
 		<tr>
 			<th colspan="2">核查经办人：&nbsp;</th>
 			<td>${record.hcjbr }
-			<th>核查经办时间：&nbsp;</th>
+			<th>核查经办日期：&nbsp;</th>
 			<td>${fn:substring(record.hcrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -430,7 +430,7 @@
 		<tr>
 			<th colspan="2">复核经办人：&nbsp;</th>
 			<td>${record.fhjbr }</td>
-			<th>复核经办时间：&nbsp;</th>
+			<th>复核经办日期：&nbsp;</th>
 			<td>${fn:substring(record.fhrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -440,7 +440,7 @@
 		<tr>
 			<th colspan="2">审批经办人：&nbsp;</th>
 			<td><input class="form-control" type="text" readonly="readonly" name ="spyr" id="spry" value="${ry}"></td>
-			<th>审批经办时间：&nbsp;</th>
+			<th>审批经办日期：&nbsp;</th>
 			<td><input class="form-control" type="text" readonly="readonly" name ="hcrq" id="hcrq" value="${fn:substring(sj,0,10)}"></td>
 		</tr>
 		</c:if>
@@ -517,7 +517,7 @@
 									</tr>
 									<tr>
 										<th>经营人名称：</th>
-										<td colspan="5">${gkjyrxx.gkjyr}
+										<td colspan="7">${gkjyrxx.gkjyr}
 										</td>
 									</tr>
 									<tr>

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

@@ -196,7 +196,7 @@
 
 #simple_new_menu {
 	height: 36px;
-	margin-left：-20px;
+	margin-left:-20px;
 }
 
 #simple_new_menu ul li {
@@ -361,7 +361,7 @@
 									<th>申请人：&nbsp;</th>
 									<td><input type="text" class="form-control" style="width: 57%"
 										readonly="readonly" value="${sqr }"></td>
-									<th>申请时间：&nbsp;</th>
+									<th>申请日期：&nbsp;</th>
 									<td><input type="text" class="form-control" style="width: 57%"
 										readonly="readonly" value="${fn:substring(sqsj,0,10)}"></td>
 								</tr>
@@ -456,7 +456,7 @@
 					</form>
 					<div id="buttons" style="margin-bottom: 10px;">
 						<a class="btn btn-default btn-sm" href="#"
-							onclick="xkzsq.detail.savejydy()"> <i></i> 新增
+							onclick="xkzsq.detail.savejydy()"> <i></i> 保存
 						</a> <a class="btn btn-default btn-sm" href="#"
 							onclick="xkzsq.detail.guanbipop()"> <i></i> 关闭
 						</a>
@@ -520,7 +520,7 @@
 										</tr>
 										<tr>
 											<th>经营人名称：</th>
-											<td colspan="5"><input type="text" class="form-control"
+											<td colspan="7"><input type="text" class="form-control"
 												value="${gkjyr.gkjyr}" id="gkjyr" name="gkjyr" maxlength="200"
 												style="width: 99%"></td>
 										</tr>

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

@@ -88,7 +88,7 @@
 
 #simple_new_menu {
 	height: 36px;
-	margin-left：-20px;
+	margin-left:-20px;
 }
 
 #simple_new_menu ul li {
@@ -280,7 +280,7 @@
 		<tr>
 			<th>申请人：&nbsp;</th>
 			<td ><input type="text" class="form-control" readonly="readonly"  value="${record.sqr }"></td>
-			<th>申请时间：&nbsp;</th>
+			<th>申请日期：&nbsp;</th>
 			<td ><input type="text" class="form-control" readonly="readonly" style="width: 69%"  value="${fn:substring(record.sqrq,0,10)}"></td>
 		</tr>
 	</table>
@@ -386,7 +386,7 @@
 		<div  id="buttons">
   	<a class="btn btn-default btn-sm" href="#" onclick="xkzsq.detail.savejydy()">
   <i></i> 
-           新增</a>
+           保存</a>
             <a class="btn btn-default btn-sm" href="#"  onclick="xkzsq.detail.guanbipop()">
   <i></i> 
            关闭</a>

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

@@ -135,7 +135,12 @@
 							<td>${xkz.fddbr }</td>
 							<td>${xkz.lxr }</td>
 							<td>${xkz.lxdh }</td>
-							<td>${xkz.currentname }</td>
+							<c:if test="${not empty xkz.currentname}">
+								<td>${xkz.currentname }</td>
+							</c:if>
+							<c:if test="${empty xkz.currentname}">
+								<td>未提交</td>
+							</c:if>
 							<td class="operatetd">
 								<a class="btn btn-default btn-xs" href="#" onclick="xkzsq.main.view('${xkz.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 

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

@@ -88,7 +88,7 @@
 
 #simple_new_menu {
 	height: 36px;
-	margin-left：-20px;
+	margin-left:-20px;
 }
 
 #simple_new_menu ul li {
@@ -188,17 +188,15 @@
 		</tr>
 		<tr>
 			<th>经营地域：&nbsp;</th>
-			<td colspan="3">
-			${jyfwstr }
-			</td>
+			<td colspan="3" style="text-indent: 0px;">${jyfwstr }</td>
 		</tr>
 		<tr>
-			<th>法定代表 人：&nbsp;</th>
-			<td>
+			<th >法定代表人：&nbsp;</th>
+			<td >
 				${record.fddbr }
 			</td>
-			<th>联系电话：&nbsp;</th>
-			<td>
+			<th style="width: 18%">联系电话：&nbsp;</th>
+			<td >	
 				${record.lxdh }
 			</td>
 		</tr>
@@ -214,7 +212,7 @@
 		</tr>
 		<tr>
 			<th>申请从事的港口经营业务种类：&nbsp;</th>
-			<td colspan="3">
+			<td colspan="3" style="text-indent: 0px;">
 			
 				${ jylzstr}
 			</td>
@@ -246,7 +244,7 @@
 		<tr>
 			<th>申请人：&nbsp;</th>
 			<td>${record.sqr }</td>
-			<th>申请时间：&nbsp;</th>
+			<th>申请日期：&nbsp;</th>
 			<td>${fn:substring(record.sqrq,0,10)}</td>
 		</tr>
 		<c:if test="${opflag == null && flag != 'audit' }">
@@ -257,7 +255,7 @@
 		<tr>
 			<th>材料审查人：&nbsp;</th>
 			<td>${record.clscjbr }</td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td>${fn:substring(record.clscrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -267,7 +265,7 @@
 		<tr>
 			<th>现场核查经办人：&nbsp;</th>
 			<td>${record.xchcry }
-			<th>现场核查经办时间：&nbsp;</th>
+			<th>现场核查经办日期：&nbsp;</th>
 			<td>${fn:substring(record.xchcrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -277,7 +275,7 @@
 		<tr>
 			<th>复核经办人：&nbsp;</th>
 			<td>${record.fhjbr }</td>
-			<th>复核经办时间：&nbsp;</th>
+			<th>复核经办日期：&nbsp;</th>
 			<td>${fn:substring(record.fhrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -287,7 +285,7 @@
 		<tr>
 			<th>审批经办人：&nbsp;</th>
 			<td>${record.spry }</td>
-			<th>审批经办时间：&nbsp;</th>
+			<th>审批经办日期：&nbsp;</th>
 			<td>${fn:substring(record.sprq,0,10)}</td>
 		</tr>
 		</c:if>
@@ -299,7 +297,7 @@
 		<tr>
 			<th>材料审查人：&nbsp;</th>
 			<td><input type="text" class="form-control" readonly="readonly" name ="clscjbr" id="clscjbr" value="${ry }"></td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td><input type="text" class="form-control" readonly="readonly" name ="clscrq" id="clscrq" value="${fn:substring(sj,0,10)}"></td>
 		</tr>
 		</c:if>
@@ -311,7 +309,7 @@
 		<tr>
 			<th>材料审查人：&nbsp;</th>
 			<td>${record.clscjbr }</td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td>${fn:substring(record.clscrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -321,7 +319,7 @@
 		<tr>
 			<th>现场核查经办人：&nbsp;</th>
 			<td><input type="text" class="form-control" readonly="readonly" name ="xchcry" id="xchcry" value="${ry }"></td>
-			<th>现场核查经办时间</th>
+			<th>现场核查经办日期</th>
 			<td><input type="text" class="form-control" readonly="readonly" name ="xchcrq" id="xchcrq" value="${fn:substring(sj,0,10)}"></td>
 		</tr>
 		</c:if>
@@ -333,7 +331,7 @@
 		<tr>
 			<th>材料审查人：&nbsp;</th>
 			<td>${record.clscjbr }</td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td>${fn:substring(record.clscrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -343,7 +341,7 @@
 		<tr>
 			<th>核查经办人：&nbsp;</th>
 			<td>${record.xchcry }</td>
-			<th>核查经办时间：&nbsp;</th>
+			<th>核查经办日期：&nbsp;</th>
 			<td>${fn:substring(record.xchcrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -353,7 +351,7 @@
 		<tr>
 			<th>复核经办人：&nbsp;</th>
 			<td><input type="text" class="form-control" readonly="readonly" name ="fhjbr" id="fhjbr" value="${ry }"></td>
-			<th>复核经办时间：&nbsp;</th>
+			<th>复核经办日期：&nbsp;</th>
 			<td><input type="text" class="form-control" readonly="readonly" name ="fhrq" id="fhrq" value="${fn:substring(sj,0,10)}"></td>
 		</tr>
 		</c:if>
@@ -365,7 +363,7 @@
 		<tr>
 			<th>材料审查人：&nbsp;</th>
 			<td>${record.clscjbr }</td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td>${fn:substring(record.clscrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -375,7 +373,7 @@
 		<tr>
 			<th>核查经办人：&nbsp;</th>
 			<td>${record.xchcry }
-			<th>核查经办时间：&nbsp;</th>
+			<th>核查经办日期：&nbsp;</th>
 			<td>${fn:substring(record.xchcrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -385,7 +383,7 @@
 		<tr>
 			<th>复核经办人：&nbsp;</th>
 			<td>${record.fhjbr }</td>
-			<th>复核经办时间：&nbsp;</th>
+			<th>复核经办日期：&nbsp;</th>
 			<td>${fn:substring(record.fhrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -395,7 +393,7 @@
 		<tr>
 			<th>审批经办人：&nbsp;</th>
 			<td><input type="text" class="form-control" readonly="readonly" name ="spry" id="spry" value="${ry}"></td>
-			<th>审批经办时间：&nbsp;</th>
+			<th>审批经办日期：&nbsp;</th>
 			<td><input type="text" class="form-control" readonly="readonly" name ="spjbrq" id="spjbrq" value="${fn:substring(sj,0,10)}"></td>
 		</tr>
 		</c:if>
@@ -470,10 +468,8 @@
 									</tr>
 									<tr>
 										<th>经营人名称：</th>
-										<td colspan="5">${gkjyrxx.gkjyr}
+										<td colspan="7">${gkjyrxx.gkjyr}
 										</td>
-										<th>企业性质：</th>
-										<td>${gkjyrxx.qyxz}</td>
 									</tr>
 									<tr>
 										<th>办公地址：</th>

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

@@ -191,7 +191,7 @@
 
 #simple_new_menu {
 	height: 36px;
-	margin-left：-20px;
+	margin-left:-20px;
 }
 
 #simple_new_menu ul li {
@@ -399,7 +399,7 @@
 		<tr>
 			<th>申请人：&nbsp;</th>
 			<td ><input class="form-control" type="text" readonly="readonly"  value="${sqr }"></td>
-			<th>申请时间：&nbsp;</th>
+			<th>申请日期：&nbsp;</th>
 			<td ><input class="form-control" type="text" style="width: 52%" readonly="readonly"  value="${fn:substring(sqsj,0,10)}"></td>
 		</tr>
 	</table>
@@ -477,7 +477,7 @@
 										</tr>
 										<tr>
 											<th>经营人名称：</th>
-											<td colspan="5"><input type="text" class="form-control"
+											<td colspan="7"><input type="text" class="form-control"
 												value="${gkjyr.gkjyr}" id="gkjyr" name="gkjyr" maxlength="200"
 												style="width: 99%"></td>
 										</tr>
@@ -1002,7 +1002,7 @@
 		<div  id="buttons">
   	<a class="btn btn-default btn-sm" href="#" onclick="xkzyx.detail.savejydy()">
   <i></i> 
-           新增</a>
+           保存</a>
             <a class="btn btn-default btn-sm" href="#"  onclick="xkzyx.detail.guanbipop()">
   <i></i> 
            关闭</a>

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

@@ -78,7 +78,7 @@
 
 #simple_new_menu {
 	height: 36px;
-	margin-left：-20px;
+	margin-left:-20px;
 }
 
 #simple_new_menu ul li {
@@ -300,7 +300,7 @@
 		<tr>
 			<th>申请人：&nbsp;</th>
 			<td ><input class="form-control" type="text" readonly="readonly"  value="${record.sqr }"></td>
-			<th>申请时间：&nbsp;</th>
+			<th>申请日期：&nbsp;</th>
 			<td ><input class="form-control" style="width: 52%"  type="text" readonly="readonly"  value="${fn:substring(record.sqrq,0,10)}"></td>
 		</tr>
 	</table>
@@ -388,7 +388,7 @@
 										</tr>
 										<tr>
 											<th>经营人名称：</th>
-											<td colspan="5"><input type="text" class="form-control"
+											<td colspan="7"><input type="text" class="form-control"
 												value="${gkjyr.gkjyr}" id="gkjyr" name="gkjyr" maxlength="200"
 												style="width: 99%"></td>
 										</tr>
@@ -872,7 +872,7 @@
 		<div  id="buttons">
   	<a class="btn btn-default btn-sm" href="#" onclick="xkzyx.detail.savejydy()">
   <i></i> 
-           新增</a>
+           保存</a>
             <a class="btn btn-default btn-sm" href="#"  onclick="xkzyx.detail.guanbipop()">
   <i></i> 
            关闭</a>

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

@@ -123,7 +123,12 @@
 							<td>${xkz.fddbr }</td>
 							<td>${xkz.lxr }</td>
 							<td>${xkz.lxdh }</td>
-							<td>${xkz.currentname }</td>
+							<c:if test="${not empty xkz.currentname}">
+								<td>${xkz.currentname }</td>
+							</c:if>
+							<c:if test="${empty xkz.currentname}">
+								<td>未提交</td>
+							</c:if>
 							<td class="operatetd">
 								<a class="btn btn-default btn-xs" href="#" onclick="xkzyx.main.view('${xkz.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 

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

@@ -77,7 +77,7 @@
 
 #simple_new_menu {
 	height: 36px;
-	margin-left：-20px;
+	margin-left:-20px;
 }
 
 #simple_new_menu ul li {
@@ -188,17 +188,17 @@
 		
 		<tr>
 			<th>经营范围：&nbsp;</th>
-			<td colspan="3" >
+			<td colspan="3" style="text-indent: 0px;">
 				${jyfwstr }
 			</td>
 		</tr>
 		<tr>
-			<th>法定代表人：&nbsp;</th>
-			<td width="30%">
+			<th style="width: 18%">法定代表人：&nbsp;</th>
+			<td>
 				${record.fddbr }
 			</td>
-			<th>联系人：&nbsp;</th>
-			<td width="30%">
+			<th style="width: 18%">联系人：&nbsp;</th>
+			<td style="width: 30%">
 				${record.lxr }
 			</td>
 			
@@ -216,7 +216,7 @@
 		
 		<tr>
 			<th>经营地域：&nbsp;</th>
-			<td colspan="3">
+			<td colspan="3" style="text-indent: 0px;">
 				${jydystr }
 			</td>
 		</tr>
@@ -276,7 +276,7 @@
 		<tr>
 			<th>申请人：&nbsp;</th>
 			<td >${record.sqr }</td>
-			<th>申请时间：&nbsp;</th>
+			<th>申请日期：&nbsp;</th>
 			<td>${fn:substring(record.sqrq,0,10)}</td>
 		</tr>
 		<c:if test="${opflag == null && flag != 'audit' }">
@@ -287,7 +287,7 @@
 		<tr>
 			<th>材料审查人：&nbsp;</th>
 			<td >${record.clscjbr }</td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td>${fn:substring(record.clscrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -297,7 +297,7 @@
 		<tr>
 			<th>核查经办人：&nbsp;</th>
 			<td >${record.hcjbr }
-			<th>核查经办时间：&nbsp;</th>
+			<th>核查经办日期：&nbsp;</th>
 			<td >${fn:substring(record.hcjbrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -307,7 +307,7 @@
 		<tr>
 			<th>复核经办人：&nbsp;</th>
 			<td >${record.fhjbr }</td>
-			<th>复核经办时间：&nbsp;</th>
+			<th>复核经办日期：&nbsp;</th>
 			<td >${fn:substring(record.fhrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -317,7 +317,7 @@
 		<tr>
 			<th>审批经办人：&nbsp;</th>
 			<td >${record.spjbr }</td>
-			<th>审批经办时间：&nbsp;</th>
+			<th>审批经办日期：&nbsp;</th>
 			<td>${fn:substring(record.hcjbrq,0,10)}</td>
 		</tr>
 		</c:if>
@@ -329,7 +329,7 @@
 		<tr>
 			<th>材料审查人：&nbsp;</th>
 			<td ><input class="form-control" type="text" readonly="readonly" name ="clscjbr" id="clscjbr" value="${ry }"></td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td ><input class="form-control" type="text" readonly="readonly" name ="clscrq" id="clscrq" value="${fn:substring(sj,0,10)}"></td>
 		</tr>
 		</c:if>
@@ -341,7 +341,7 @@
 		<tr>
 			<th>材料审查人：&nbsp;</th>
 			<td>${record.clscjbr }</td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td>${fn:substring(record.clscrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -351,7 +351,7 @@
 		<tr>
 			<th>核查经办人：&nbsp;</th>
 			<td><input class="form-control" type="text" readonly="readonly" name ="hcjbr" id="hcjbr" value="${ry }"></td>
-			<th>核查经办时间：&nbsp;</th>
+			<th>核查经办日期：&nbsp;</th>
 			<td><input class="form-control" type="text" readonly="readonly" name ="hcjbrq" id="hcjbrq" value="${fn:substring(sj,0,10)}"></td>
 		</tr>
 		</c:if>
@@ -363,7 +363,7 @@
 		<tr>
 			<th>材料审查人：&nbsp;</th>
 			<td>${record.clscjbr }</td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td>${fn:substring(record.clscrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -373,7 +373,7 @@
 		<tr>
 			<th>核查经办人：&nbsp;</th>
 			<td>${record.hcjbr }</td>
-			<th>核查经办时间：&nbsp;</th>
+			<th>核查经办日期：&nbsp;</th>
 			<td>${fn:substring(record.hcjbrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -383,7 +383,7 @@
 		<tr>
 			<th>复核经办人：&nbsp;</th>
 			<td><input class="form-control" type="text" readonly="readonly" name ="fhjbr" id="fhjbr" value="${ry }"></td>
-			<th>复核经办时间：&nbsp;</th>
+			<th>复核经办日期：&nbsp;</th>
 			<td><input class="form-control" type="text" readonly="readonly" name ="fhrq" id="fhrq" value="${fn:substring(sj,0,10)}"></td>
 		</tr>
 		</c:if>
@@ -395,7 +395,7 @@
 		<tr>
 			<th>材料审查人：&nbsp;</th>
 			<td>${record.clscjbr }</td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td>${fn:substring(record.clscrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -405,7 +405,7 @@
 		<tr>
 			<th>核查经办人：&nbsp;</th>
 			<td>${record.hcjbr }
-			<th>核查经办时间：&nbsp;</th>
+			<th>核查经办日期：&nbsp;</th>
 			<td>${fn:substring(record.hcjbrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -415,7 +415,7 @@
 		<tr>
 			<th>复核经办人：&nbsp;</th>
 			<td>${record.fhjbr }</td>
-			<th>复核经办时间：&nbsp;</th>
+			<th>复核经办日期：&nbsp;</th>
 			<td>${fn:substring(record.fhrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -425,7 +425,7 @@
 		<tr>
 			<th>审批经办人：&nbsp;</th>
 			<td><input class="form-control" type="text" readonly="readonly" name ="spjbr" id="spjbr" value="${ry}"></td>
-			<th>审批经办时间：&nbsp;</th>
+			<th>审批经办日期：&nbsp;</th>
 			<td><input class="form-control" type="text" readonly="readonly" name ="hcjbrq" id="hcjbrq" value="${fn:substring(sj,0,10)}"></td>
 		</tr>
 		</c:if>
@@ -504,7 +504,7 @@
 									</tr>
 									<tr>
 										<th>经营人名称：</th>
-										<td colspan="5">${gkjyrxx.gkjyr}
+										<td colspan="7">${gkjyrxx.gkjyr}
 										</td>
 									</tr>
 									<tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxaddmain.jsp

@@ -188,7 +188,7 @@
 
 #simple_new_menu {
 	height: 36px;
-	margin-left：-20px;
+	margin-left:-20px;
 }
 
 #simple_new_menu ul li {
@@ -388,7 +388,7 @@
 		<tr>
 			<th>申请人：&nbsp;</th>
 			<td><input class="form-control" type="text" readonly="readonly"  value="${sqr }"></td>
-			<th>申请时间：&nbsp;</th>
+			<th>申请日期：&nbsp;</th>
 			<td><input class="form-control" type="text" readonly="readonly"  value="${fn:substring(sqsj,0,10)}" style="width: 72%"></td>
 		</tr>
 	</table>
@@ -467,7 +467,7 @@
 										</tr>
 										<tr>
 											<th>经营人名称：</th>
-											<td colspan="5"><input type="text" class="form-control"
+											<td colspan="7"><input type="text" class="form-control"
 												value="${gkjyr.gkjyr}" id="gkjyr" name="gkjyr" maxlength="200"
 												style="width: 99%"></td>
 										</tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxeditmain.jsp

@@ -78,7 +78,7 @@
 
 #simple_new_menu {
 	height: 36px;
-	margin-left：-20px;
+	margin-left:-20px;
 }
 
 #simple_new_menu ul li {
@@ -278,7 +278,7 @@
 		<tr>
 			<th>申请人：&nbsp;</th>
 			<td><input class="form-control" type="text" readonly="readonly"  value="${record.sqr }"></td>
-			<th>申请时间：&nbsp;</th>
+			<th>申请日期：&nbsp;</th>
 			<td><input class="form-control" type="text" readonly="readonly"  value="${fn:substring(record.sqrq,0,10)}"></td>
 		</tr>
 	</table>
@@ -362,7 +362,7 @@
 										</tr>
 										<tr>
 											<th>经营人名称：</th>
-											<td colspan="5"><input type="text" class="form-control"
+											<td colspan="7"><input type="text" class="form-control"
 												value="${gkjyr.gkjyr}" id="gkjyr" name="gkjyr" maxlength="200"
 												style="width: 99%"></td>
 										</tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxmain.jsp

@@ -124,7 +124,12 @@
 							<td>${xkz.fddbr }</td>
 							<td>${xkz.lxr }</td>
 							<td>${xkz.lxdh }</td>
-							<td>${xkz.currentname }</td>
+							<c:if test="${not empty xkz.currentname}">
+								<td>${xkz.currentname }</td>
+							</c:if>
+							<c:if test="${empty xkz.currentname}">
+								<td>未提交</td>
+							</c:if>
 							<td class="operatetd">
 								<a class="btn btn-default btn-xs" href="#" onclick="xkzzx.main.view('${xkz.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxviewmain.jsp

@@ -77,7 +77,7 @@
 
 #simple_new_menu {
 	height: 36px;
-	margin-left：-20px;
+	margin-left:-20px;
 }
 
 #simple_new_menu ul li {
@@ -188,17 +188,17 @@
 		
 		<tr>
 			<th>经营范围：&nbsp;</th>
-			<td colspan="3" >
+			<td colspan="3" style="text-indent: 0px;">
 				<span id="jydyadd">${jydystr }</span>
 			</td>
 		</tr>
 		<tr>
-			<th>法定代表人：&nbsp;</th>
-			<td>
+			<th style="width: 18%">法定代表人：&nbsp;</th>
+			<td >
 				${record.fddbr }
 			</td>
-			<th>联系人：&nbsp;</th>
-			<td>
+			<th style="width: 18%">联系人：&nbsp;</th>
+			<td style="width: 30%">
 				${record.lxr }
 			</td>
 		</tr>
@@ -214,7 +214,7 @@
 		</tr>
 		<tr>
 			<th>经营地域：&nbsp;</th>
-			<td colspan="3">
+			<td colspan="3" style="text-indent: 0px;">
 			${jyfwstr }
 				
 			</td>
@@ -266,7 +266,7 @@
 		<tr>
 			<th>申请人：&nbsp;</th>
 			<td>${record.sqr }</td>
-			<th>申请时间：&nbsp;</th>
+			<th>申请日期：&nbsp;</th>
 			<td>${fn:substring(record.sqrq,0,10)}</td>
 		</tr>
 		<c:if test="${opflag == null && flag != 'audit'}">
@@ -277,7 +277,7 @@
 		<tr>
 			<th>材料审查人：&nbsp;</th>
 			<td>${record.clscjbr }</td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td>${fn:substring(record.clscrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -287,7 +287,7 @@
 		<tr>
 			<th>核查经办人：&nbsp;</th>
 			<td >${record.hcjbr }
-			<th>核查经办时间：&nbsp;</th>
+			<th>核查经办日期：&nbsp;</th>
 			<td >${fn:substring(record.hcjbrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -297,7 +297,7 @@
 		<tr>
 			<th>复核经办人：&nbsp;</th>
 			<td >${record.fhjbr }</td>
-			<th>复核经办时间：&nbsp;</th>
+			<th>复核经办日期：&nbsp;</th>
 			<td >${fn:substring(record.fhrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -307,7 +307,7 @@
 		<tr>
 			<th>审批经办人：&nbsp;</th>
 			<td >${record.spjbr }</td>
-			<th>审批经办时间：&nbsp;</th>
+			<th>审批经办日期：&nbsp;</th>
 			<td >${fn:substring(record.hcjbrq,0,10)}</td>
 		</tr>
 		</c:if>
@@ -319,7 +319,7 @@
 		<tr>
 			<th>材料审查人：&nbsp;</th>
 			<td ><input type="text" class="form-control" readonly="readonly" name ="clscjbr" id="clscjbr" value="${ry }"></td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td ><input type="text" class="form-control" readonly="readonly" name ="clscrq" id="clscrq" value="${fn:substring(sj,0,10)}"></td>
 		</tr>
 		</c:if>
@@ -331,7 +331,7 @@
 		<tr>
 			<th>材料审查人：&nbsp;</th>
 			<td >${record.clscjbr }</td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td >${fn:substring(record.clscrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -341,7 +341,7 @@
 		<tr>
 			<th>核查经办人：&nbsp;</th>
 			<td ><input type="text" class="form-control" readonly="readonly" name ="hcjbr" id="hcjbr" value="${ry }"></td>
-			<th>核查经办时间：&nbsp;</th>
+			<th>核查经办日期：&nbsp;</th>
 			<td ><input type="text" class="form-control" readonly="readonly" name ="hcjbrq" id="hcjbrq" value="${fn:substring(sj,0,10)}"></td>
 		</tr>
 		</c:if>
@@ -353,7 +353,7 @@
 		<tr>
 			<th>材料审查人：&nbsp;</th>
 			<td colspan="2">${record.clscjbr }</td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td colspan="2">${fn:substring(record.clscrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -363,7 +363,7 @@
 		<tr>
 			<th>核查经办人：&nbsp;</th>
 			<td colspan="2">${record.hcjbr }</td>
-			<th>核查经办时间：&nbsp;</th>
+			<th>核查经办日期：&nbsp;</th>
 			<td colspan="2">${fn:substring(record.hcjbrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -373,7 +373,7 @@
 		<tr>
 			<th>复核经办人：&nbsp;</th>
 			<td><input type="text" class="form-control" readonly="readonly" name ="fhjbr" id="fhjbr" value="${ry }"></td>
-			<th>复核经办时间：&nbsp;</th>
+			<th>复核经办日期：&nbsp;</th>
 			<td><input type="text" class="form-control" readonly="readonly" name ="fhrq" id="fhrq" value="${fn:substring(sj,0,10)}"></td>
 		</tr>
 		</c:if>
@@ -385,7 +385,7 @@
 		<tr>
 			<th>材料审查人：&nbsp;</th>
 			<td >${record.clscjbr }</td>
-			<th>材料审查时间：&nbsp;</th>
+			<th>材料审查日期：&nbsp;</th>
 			<td >${fn:substring(record.clscrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -395,7 +395,7 @@
 		<tr>
 			<th>核查经办人：&nbsp;</th>
 			<td >${record.hcjbr }
-			<th>核查经办时间：&nbsp;</th>
+			<th>核查经办日期：&nbsp;</th>
 			<td >${fn:substring(record.hcjbrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -405,7 +405,7 @@
 		<tr>
 			<th>复核经办人：&nbsp;</th>
 			<td >${record.fhjbr }</td>
-			<th>复核经办时间：&nbsp;</th>
+			<th>复核经办日期：&nbsp;</th>
 			<td >${fn:substring(record.fhrq,0,10)}</td>
 		</tr>
 		<tr>
@@ -415,7 +415,7 @@
 		<tr>
 			<th>审批经办人：&nbsp;</th>
 			<td ><input type="text" class="form-control" readonly="readonly" name ="spjbr" id="spjbr" value="${ry}"></td>
-			<th>审批经办时间：&nbsp;</th>
+			<th>审批经办日期：&nbsp;</th>
 			<td><input type="text" class="form-control" readonly="readonly" name ="hcjbrq" id="hcjbrq" value="${fn:substring(sj,0,10)}"></td>
 		</tr>
 		</c:if>
@@ -494,7 +494,7 @@
 									</tr>
 									<tr>
 										<th>经营人名称：</th>
-										<td colspan="5">${gkjyrxx.gkjyr}
+										<td colspan="7">${gkjyrxx.gkjyr}
 										</td>
 									</tr>
 									<tr>
@@ -533,10 +533,10 @@
 									</tr> --%>
 									<tr>
 										<th>法定代表人<br>姓名：</th>
-										<td colspan="2">${gkjyrxx.fddbr}
+										<td colspan="3">${gkjyrxx.fddbr}
 										</td>
 										<th>联系电话：</th>
-										<td colspan="2">${gkjyrxx.lxdh}
+										<td colspan="3">${gkjyrxx.lxdh}
 										</td>
 										<th>传真：</th>
 										<td>${gkjyrxx.cz}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java

@@ -728,8 +728,8 @@ public class XkzsqCtl extends BaseWebCtl {
 				if (str != null && str.endsWith(",")) {
 					str = str.substring(0, str.length() - 1);
 				}
-				jyfwstr = jyfwstr + str + ")<br/>";
-				jylzstr += str + jydy + "<br/>";
+				jyfwstr = jyfwstr + str + ");<br/>";
+				jylzstr += str + jydy + ";<br/>";
 				jyfwids.add(entity.getJyfwid());
 				xkzsq.setJydyids(jds);
 			}