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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjadd.jsp

@@ -86,22 +86,22 @@
  <input type="hidden" class="form-control"  name="fjids" id="fjids">
  <input type="hidden" id="userids"	name="userids"/>
  <input type="hidden" class="form-control"  name="roleCode" id="roleCode" value="${roleCode }">
-					<table class="apply" cellpadding="0" cellspacing="0">
+					<table class="apply" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 					<tr>
 							<th><span class="needwrite">*</span>项目编码：&nbsp;</th>
-							<td colspan="4">
+							<td colspan="3">
 								<input type="text" style="width: 92.5%;"  class="form-control" name="xmbm">
 							</td>
 						</tr>
 						<tr>
 							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
-							<td colspan="4">
+							<td colspan="3">
 								<input type="text" style="width: 92.5%;" class="form-control"  name="xmmc">
 							</td>
 						</tr>
 						<tr>
 							<th><span class="needwrite">*</span>所属单位：&nbsp;</th>
-							<td colspan="4" style="position:relative;">
+							<td colspan="3" style="position:relative;">
 								<input type="text" style="width: 92.5%;" readonly="readonly" class="form-control"  id ="jyrmc" value ="${jyr.gkjyr }">
 								<input type="hidden" class="form-control" name="ssjyrid" id ="jyrid"  value ="${jyr.id }">
 								<c:if test="${jyr.id == null }">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjedit.jsp

@@ -80,22 +80,22 @@
  <input type="hidden" id="fhbz"  value="${fhbz }">	
  <input type="hidden" id="userids"	name="userids"/>
   <input type="hidden" class="form-control"  name="roleCode" id="roleCode" value="${roleCode }">
-					<table class="apply3" cellpadding="0" cellspacing="0">
+					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 					<tr>
 							<th><span class="needwrite">*</span>项目编码：&nbsp;</th>
-							<td colspan="4">
-								<input type="text" style="width: 92.5%;" class="form-control" name="xmbm" value="${record.xmbm }">
+							<td colspan="3">
+								<input type="text" style="width: 92.5%;" readonly class="form-control" name="xmbm" value="${record.xmbm }">
 							</td>
 						</tr>
 						<tr>
 							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
-							<td colspan="4" >
-								<input type="text" style="width: 92.5%;" class="form-control" name="xmmc" value="${record.xmmc }">
+							<td colspan="3" >
+								<input type="text" style="width: 92.5%;" readonly class="form-control" name="xmmc" value="${record.xmmc }">
 							</td>
 						</tr>
 						<tr>
 							<th><span class="needwrite">*</span>所属单位：&nbsp;</th>
-							<td colspan="4" style="position:relative;">
+							<td colspan="3" style="position:relative;">
 								<input type="text" style="width: 92.5%;" readonly="readonly" class="form-control"  id ="jyrmc" value ="${jyr.gkjyr }">
 								<input type="hidden" class="form-control" name="ssjyrid" id ="jyrid" value ="${jyr.id }">
 								<c:if test="${jyr.id == null }">
@@ -211,9 +211,9 @@
 							<td colspan="3">
 								<table style="width: 100%">
 									<tr>
-										<td style="width: 2%">序号</td>
-										<td style="width: 15%">材料名称</td>
-										<td style="width: 15%">上传附件名称</td>
+										<td style="width: 5%">序号</td>
+										<td style="width: 30%">材料名称</td>
+										<td style="width: 30%">上传附件名称</td>
 										<td style="width: 15%">批文单位</td>
 										<td style="width: 10%">文号</td>
 										<td style="width: 10%">批文时间</td>
@@ -263,10 +263,10 @@
 								
 									<c:forEach items="${qtfjlist}" var="qtfj" varStatus="status">
 										<tr>
-											<td>${status.index+3}</td>
+											<td>${status.index+4}</td>
 											<td>其他附件</td>
 											<td><a class="main_title"
-												href='/jsjy/accessory/download?id=${qtfj.fjid }'>${qtfj.fjmc }</a></td>
+												href='${app}/accessory/download?id=${qtfj.fjid }'>${qtfj.fjmc }</a></td>
 											<td>${qtfj.fbdw }</td>
 											<td>${qtfj.wjh }</td>
 											<td>${qtfj.fbsj }</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjview.jsp

@@ -83,18 +83,18 @@
 						type="hidden" id="roleKey" name="roleKey" value="" /> <input
 						type="hidden" id="yj" name="yj" /> <input type="hidden"
 						id="accids" name="accids" />
-					<table class="apply3" cellpadding="0" cellspacing="0">
+					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 						<tr>
 							<th>项目编码：&nbsp;</th>
-							<td colspan="4">${record.xmbm }</td>
+							<td colspan="3">${record.xmbm }</td>
 						</tr>
 						<tr>
 							<th>项目名称：&nbsp;</th>
-							<td colspan="4">${record.xmmc }</td>
+							<td colspan="3">${record.xmmc }</td>
 						</tr>
 						<tr>
 							<th>所属单位：&nbsp;</th>
-							<td colspan="4">${jyr.gkjyr }</td>
+							<td colspan="3">${jyr.gkjyr }</td>
 						</tr>
 						<tr>
 							<th>所在地：&nbsp;</th>
@@ -157,9 +157,9 @@
 							<td colspan="3">
 								<table style="width: 100%">
 									<tr>
-										<td style="width: 4%">序号</td>
-										<td style="width: 23%">材料名称</td>
-										<td style="width: 23%">上传附件名称</td>
+										<td style="width: 5%">序号</td>
+										<td style="width: 20%">材料名称</td>
+										<td style="width: 20%">上传附件名称</td>
 										<td style="width: 15%">批文单位</td>
 										<td style="width: 15%">文号</td>
 										<td style="width: 10%">批文时间</td>
@@ -322,10 +322,10 @@
 									</tr>
 									<c:forEach items="${qtfjlist}" var="qtfj" varStatus="status">
 										<tr>
-											<td>${status.index+3}</td>
+											<td>${status.index+9}</td>
 											<td>其他附件</td>
 											<td><a class="main_title"
-												href='/jsjy/accessory/download?id=${qtfj.fjid }'>${qtfj.fjmc }</a></td>
+												href='${app}/accessory/download?id=${qtfj.fjid }'>${qtfj.fjmc }</a></td>
 											<td>${qtfj.fbdw }</td>
 											<td>${qtfj.wjh }</td>
 											<td>${qtfj.fbsj }</td>

gkjsjy/trunk/WebContent/static/sql/oracle/table/update.sql

@@ -1648,3 +1648,5 @@ alter table GK_OPERATION_JSJY_TASK add sfth CHAR(1);
 
 alter table GK_BASIC_JSJY_GKJS_XMXXGL modify bwyt VARCHAR2(100);
 
+alter table GK_OPERATION_JSJY_JSJDCBSJ modify bwyt VARCHAR2(100);
+

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl.java

@@ -355,7 +355,7 @@ public class JsjdglCtl extends BaseWebCtl {
 			xmxxglService.save(entity);
 		} else {
 			wr.setSuccess(false);
-			wr.setMessage("转报失败");
+			wr.setMessage("转报省级失败");
 		}
 		return wr;
 	}