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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/xkzxxadd.jsp

@@ -102,16 +102,24 @@
 						<input type="text" class="form-control" id="fzjg" name="fzjg">
 					</td>
 					</tr>
+					
 					<tr>
+						<th><span class="needwrite">*</span>有效期起:&nbsp;</th>
+						<td >
+							<input class="Wdate" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})" name="yxqq">
+						</td>
 						<th><span class="needwrite">*</span>有效期至:&nbsp;</th>
 						<td >
-							<input class="Wdate" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'fzrq\')}'})" id="yxqz" name="yxqz">
+							<input class="Wdate" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})" name="yxqz">
 						</td>
+				<tr>
 						<th><span class="needwrite">*</span>发证日期:&nbsp;</th>
 						<td>
-							<input class="Wdate" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',maxDate:'#F{$dp.$D(\'yxqz\')}'})" id="fzrq" name="fzrq">
+							<input class="Wdate" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})" name="fzrq">
 						</td>
 					</tr>
+					
+				
 					<tr>
 						<th><span class="needwrite">*</span>许可证电子扫描件（正面）：&nbsp;</th>
 						<td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/xkzxxedit.jsp

@@ -110,6 +110,24 @@
 					</td>
 					</tr>
 					<tr>
+						<th><span class="needwrite">*</span>有效期起:&nbsp;</th>
+						<td >
+							<input class="Wdate" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})" name="yxqq"
+							value="${record.yxqqfmt}">
+						</td>
+						<th><span class="needwrite">*</span>有效期至:&nbsp;</th>
+						<td >
+							<input class="Wdate" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})" name="yxqz"
+							value="${record.yxqzfmt}">
+						</td>
+				<tr>
+						<th><span class="needwrite">*</span>发证日期:&nbsp;</th>
+						<td>
+							<input class="Wdate" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})" name="fzrq"
+							value="${record.fzrqfmt}">
+						</td>
+					</tr>
+				<%-- 	<tr>
 						<th><span class="needwrite">*</span>有效期至:&nbsp;</th>
 						<td >
 							<input class="Wdate" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'fzrq1\')}',onpicked:show1})" name="yxqz"
@@ -122,7 +140,7 @@
 							value="${record.fzrqfmt}">
 							<input type="hidden" value="${record.fzrq }" id="fzrq1">
 						</td>
-					</tr>
+					</tr> --%>
 					<tr>
 						<th><span class="needwrite">*</span>许可证电子扫描件（正面）：&nbsp;</th>
 						<td>

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/ctl/XkzxxCtl.java

@@ -861,6 +861,7 @@ public class XkzxxCtl extends BaseWebCtl {
 				xkzxx.setFzjg(code.getFzjg());
 				xkzxx.setYxqz(code.getYxqz());
 				xkzxx.setFzrq(code.getFzrq());
+				xkzxx.setYxqq(code.getYxqq());
 				xkzxx.setSfyx("1");
 				xkzxx.setIsflag("1");
 				xkzxx.setZmpicid(zmpicid);
@@ -928,6 +929,10 @@ public class XkzxxCtl extends BaseWebCtl {
 			String yxqz = DateTime.toString(xkzxx.getYxqz());
 			vo.setYxqzfmt(yxqz);
 		}
+		if (null != xkzxx.getYxqq()) {
+			String yxqq = DateTime.toString(xkzxx.getYxqq());
+			vo.setYxqqfmt(yxqq);
+		}
 		if (null != xkzxx.getFzrq()) {
 			String fzrq = DateTime.toString(xkzxx.getFzrq());
 			vo.setFzrqfmt(fzrq);