附件页面展示修改

src/main/java/com/jeeplus/modules/projectAccessory/service/ProjectAccessoryRelationService.java

@@ -139,6 +139,9 @@ public class ProjectAccessoryRelationService extends TreeService<ProjectAccessor
      */
 	@Transactional(readOnly = false)
 	public void save(ProjectAccessoryRelationInfo projectTemplateInfo) {
+	    if(null == projectTemplateInfo.getRequiredStage()){
+            projectTemplateInfo.setRequiredStage(3);
+        }
         //根据条件进行新增或修改处理
         if (StringUtils.isNotBlank(projectTemplateInfo.getId())){
             projectTemplateInfo.preUpdate();

src/main/webapp/webpage/modules/projectAccessory/projectAccessoryRelation/projectAccessoryRelationForm.jsp

@@ -69,9 +69,9 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 ">
-					<label class="layui-form-label"><span class="require-item">*</span>必填阶段：</label>
+					<label class="layui-form-label">必填阶段：</label>
 					<div class="layui-input-block">
-						<form:select path="requiredStage" cssClass="form-control required simple-select">
+						<form:select path="requiredStage" cssClass="form-control simple-select">
 							<form:option value="" label=""/>
 							<form:options items="${fns:getMainDictList('attachment_required_stage_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordAudit.jsp

@@ -231,8 +231,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -283,8 +283,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -336,8 +336,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordModifyApply.jsp

@@ -13,28 +13,9 @@
 				var boolFlag = true;
 				for(var i=0; i<leng; i++) {
 					var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
-					if(numberStr != undefined && numberStr !=null && numberStr !=''){
-						$.ajax({
-							type: 'post',
-							url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',
-							data: {"attachmentId":numberStr,"projectId":projectId},
-							dataType: "json",
-							async: false
-						}).success(function (result) {
-							if(result == 0){
-								boolFlag = false;
-								top.layer.msg("请上传报告文件！", {icon: 0});
-								return false;
-							}
-						}).error(function () {
-							top.layer.msg("文件载入失败！");
-						});
-					}
-				}
-				if(boolFlag){
-					var gistdata = $("#file_gistdata tr").length;
-					for(var i=0; i<gistdata; i++) {
-						var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
+					var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
+					var name = $("#file_attachment tr").eq(i).find("td:eq(2)").html();
+					if(second == 1){
 						if(numberStr != undefined && numberStr !=null && numberStr !=''){
 							$.ajax({
 								type: 'post',
@@ -45,7 +26,7 @@
 							}).success(function (result) {
 								if(result == 0){
 									boolFlag = false;
-									top.layer.msg("请上传依据性文件！", {icon: 0});
+									top.layer.msg("请上传报告文件！", {icon: 0});
 									return false;
 								}
 							}).error(function () {
@@ -55,25 +36,54 @@
 					}
 				}
 				if(boolFlag){
+					var gistdata = $("#file_gistdata tr").length;
+					for(var i=0; i<gistdata; i++) {
+						var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
+						var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
+						if(second == 1){
+							if(numberStr != undefined && numberStr !=null && numberStr !=''){
+								$.ajax({
+									type: 'post',
+									url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',
+									data: {"attachmentId":numberStr,"projectId":projectId},
+									dataType: "json",
+									async: false
+								}).success(function (result) {
+									if(result == 0){
+										boolFlag = false;
+										top.layer.msg("请上传依据性文件！", {icon: 0});
+										return false;
+									}
+								}).error(function () {
+									top.layer.msg("文件载入失败！");
+								});
+							}
+						}
+					}
+				}
+				if(boolFlag){
 					var other = $("#file_other tr").length;
 					for(var i=0; i<other; i++) {
 						var numberStr = $("#file_other tr").eq(i).find("td:first").html();
-						if(numberStr != undefined && numberStr !=null && numberStr !=''){
-							$.ajax({
-								type: 'post',
-								url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',
-								data: {"attachmentId":numberStr,"projectId":projectId},
-								dataType: "json",
-								async: false
-							}).success(function (result) {
-								if(result == 0){
-									boolFlag = false;
-									top.layer.msg("请上传其他文件！", {icon: 0});
-									return false;
-								}
-							}).error(function () {
-								top.layer.msg("文件载入失败！");
-							});
+						var second = $("#file_other tr").eq(i).find("td:eq(1)").html();
+						if(second == 1){
+							if(numberStr != undefined && numberStr !=null && numberStr !=''){
+								$.ajax({
+									type: 'post',
+									url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',
+									data: {"attachmentId":numberStr,"projectId":projectId},
+									dataType: "json",
+									async: false
+								}).success(function (result) {
+									if(result == 0){
+										boolFlag = false;
+										top.layer.msg("请上传其他文件！", {icon: 0});
+										return false;
+									}
+								}).error(function () {
+									top.layer.msg("文件载入失败！");
+								});
+							}
 						}
 					}
 				}
@@ -305,8 +315,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -315,6 +325,7 @@
 						<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
 							<tr>
 								<td style="display:none">${fileAttachment.id}</td>
+								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<td>${fileAttachment.attachName}</td>
 								<td>${fileAttachment.attachLength}</td>
 								<td>${fileAttachment.attachTypes}</td>
@@ -354,8 +365,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -365,6 +376,7 @@
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
+								<td style="display:none">${fileGistdata.mustFlag}</td>
 								<td>${fileGistdata.attachName}</td>
 								<td>${fileGistdata.attachLength}</td>
 								<td>${fileGistdata.attachTypes}</td>
@@ -404,8 +416,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -415,6 +427,7 @@
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
+								<td style="display:none">${fileOther.mustFlag}</td>
 								<td>${fileOther.attachName}</td>
 								<td>${fileOther.attachLength}</td>
 								<td>${fileOther.attachTypes}</td>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordForm.jsp

@@ -309,8 +309,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -320,7 +320,14 @@
 							<tr>
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
-								<td>${fileAttachment.attachName}</td>
+								<c:choose>
+									<c:when test="${fileAttachment.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileAttachment.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileAttachment.attachLength}</td>
 								<td>${fileAttachment.attachTypes}</td>
 								<td>
@@ -390,8 +397,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -401,8 +408,15 @@
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
-										<td style="display:none">${fileGistdata.mustFlag}</td>
-								<td>${fileGistdata.attachName}</td>
+								<td style="display:none">${fileGistdata.mustFlag}</td>
+								<c:choose>
+									<c:when test="${fileGistdata.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileGistdata.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileGistdata.attachLength}</td>
 								<td>${fileGistdata.attachTypes}</td>
 								<td>
@@ -472,8 +486,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -483,8 +497,15 @@
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-								<td>${fileOther.attachName}</td>
+								<td style="display:none">${fileOther.mustFlag}</td>
+								<c:choose>
+									<c:when test="${fileOther.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileOther.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileOther.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileOther.attachLength}</td>
 								<td>${fileOther.attachTypes}</td>
 								<td>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordModify.jsp

@@ -341,8 +341,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -352,7 +352,14 @@
 							<tr>
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
-								<td>${fileAttachment.attachName}</td>
+								<c:choose>
+									<c:when test="${fileAttachment.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileAttachment.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileAttachment.attachLength}</td>
 								<td>${fileAttachment.attachTypes}</td>
 								<td>
@@ -422,8 +429,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -433,8 +440,15 @@
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
-										<td style="display:none">${fileGistdata.mustFlag}</td>
-								<td>${fileGistdata.attachName}</td>
+								<td style="display:none">${fileGistdata.mustFlag}</td>
+								<c:choose>
+									<c:when test="${fileGistdata.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileGistdata.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileGistdata.attachLength}</td>
 								<td>${fileGistdata.attachTypes}</td>
 								<td>
@@ -504,8 +518,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -515,8 +529,15 @@
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-								<td>${fileOther.attachName}</td>
+								<td style="display:none">${fileOther.mustFlag}</td>
+								<c:choose>
+									<c:when test="${fileOther.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileOther.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileOther.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileOther.attachLength}</td>
 								<td>${fileOther.attachTypes}</td>
 								<td>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordView.jsp

@@ -157,14 +157,162 @@
 				</div>
 			</div>
 		</div>
+		<div class="form-group layui-row">
+			<div class="form-group-label"><h2>报告文件</h2></div>
+			<div id="addFile_attachment" style="display: none" class="upload-progress">
+				<span id="fileName_attachment" ></span>
+				<span id="_attachment" ></span>
+				<b><span id="baifenbi_attachment" ></span></b>
+				<div class="progress">
+					<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
+					</div>
+				</div>
+			</div>
+			<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
+			<span id="attachment_title"></span>
+			<div class="layui-item layui-col-xs12" style="padding:0 16px;">
+				<table id="upTable" class="table table-bordered table-condensed details">
+					<thead>
+					<tr>
+						<%-- <th>序号</th>--%>
+						<th>电子件名称</th>
+						<th width="100px">最大容量(M)</th>
+						<th width="18%">类型限制</th>
+						<th>文件名</th>
+						<th width="150px">操作</th>
+					</tr>
+					</thead>
+					<tbody id="file_attachment">
+					<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
+						<tr>
+							<td style="display:none">${fileAttachment.id}</td>
+							<td>${fileAttachment.attachName}</td>
+							<td>${fileAttachment.attachLength}</td>
+							<td>${fileAttachment.attachTypes}</td>
+							<td>
+								<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
+									<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
+								</c:forEach>
+							</td>
+							<td class="op-td">
+								<div class="op-btn-box" >
+									<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+								</div>
+							</td>
+						</tr>
+					</c:forEach>
+					</tbody>
+				</table>
+			</div>
+		</div>
 
 		<div class="form-group layui-row">
+			<div class="form-group-label"><h2>依据性资料</h2></div>
+			<div id="addFile_gistdata" style="display: none" class="upload-progress">
+				<span id="fileName_gistdata" ></span>
+				<span id="_gistdata" ></span>
+				<b><span id="baifenbi_gistdata" ></span></b>
+				<div class="progress">
+					<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
+					</div>
+				</div>
+			</div>
+			<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
+			<span id="gistdata_title"></span>
+			<div class="layui-item layui-col-xs12" style="padding:0 16px;">
+				<table id="gistdata_upTable" class="table table-bordered table-condensed details">
+					<thead>
+					<tr>
+						<%-- <th>序号</th>--%>
+						<th>电子件名称</th>
+						<th width="100px">最大容量(M)</th>
+						<th width="18%">类型限制</th>
+						<th>文件名</th>
+						<th width="150px">操作</th>
+					</tr>
+					</thead>
+					<tbody id="file_gistdata">
+					<c:forEach items="${projectReportRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
+						<tr>
+								<%-- <td>${status.index + 1}</td>--%>
+							<td style="display:none">${fileGistdata.id}</td>
+							<td>${fileGistdata.attachName}</td>
+							<td>${fileGistdata.attachLength}</td>
+							<td>${fileGistdata.attachTypes}</td>
+							<td>
+								<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
+									<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
+								</c:forEach>
+							</td>
+							<td class="op-td">
+								<div class="op-btn-box" >
+									<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+								</div>
+							</td>
+						</tr>
+					</c:forEach>
+					</tbody>
+				</table>
+			</div>
+		</div>
+
+		<div class="form-group layui-row">
+			<div class="form-group-label"><h2>其他文件</h2></div>
+			<div id="addFile_other" style="display: none" class="upload-progress">
+				<span id="fileName_other" ></span>
+				<span id="_other" ></span>
+				<b><span id="baifenbi_other" ></span></b>
+				<div class="progress">
+					<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
+					</div>
+				</div>
+			</div>
+			<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
+			<span id="other_title"></span>
+			<div class="layui-item layui-col-xs12" style="padding:0 16px;">
+				<table id="upTable_other" class="table table-bordered table-condensed details">
+					<thead>
+					<tr>
+						<%-- <th>序号</th>--%>
+						<th>电子件名称</th>
+						<th width="100px">最大容量(M)</th>
+						<th width="18%">类型限制</th>
+						<th>文件名</th>
+						<th width="150px">操作</th>
+					</tr>
+					</thead>
+					<tbody id="file_other">
+					<c:forEach items="${projectReportRecord.fileOtherList}" var = "fileOther" varStatus="status">
+						<tr>
+								<%-- <td>${status.index + 1}</td>--%>
+							<td style="display:none">${fileOther.id}</td>
+							<td>${fileOther.attachName}</td>
+							<td>${fileOther.attachLength}</td>
+							<td>${fileOther.attachTypes}</td>
+							<td>
+								<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
+									<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
+								</c:forEach>
+							</td>
+							<td class="op-td">
+								<div class="op-btn-box" >
+									<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+								</div>
+							</td>
+						</tr>
+					</c:forEach>
+					</tbody>
+				</table>
+			</div>
+		</div>
+
+		<%--<div class="form-group layui-row">
 			<div class="form-group-label"><h2>附件信息列表</h2></div>
 
 			<div class="layui-item layui-col-xs12 form-table-container">
 				<table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
 			</div>
-		</div>
+		</div>--%>
 
 		<%--<div class="form-group layui-row">
 			<div class="form-group-label"><h2>附件信息</h2></div>
@@ -222,6 +370,130 @@
 <script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 <script src="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.js" charset="utf-8"></script>
 <script>
+	function openBill2(title,url,width,height,target,formId,tableId){
+		var rows = $(this).parent().prevAll().length + 1;
+		var frameIndex = parent.layer.getFrameIndex(window.name);
+		var urls = url+"&index="+frameIndex;
+		if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+			width='auto';
+			height='auto';
+		}else{//如果是PC端，根据用户设置的width和height显示。
+
+		}
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			skin:"two-btns",
+			maxmin: false, //开启最大化最小化按钮
+			content: urls ,
+			btn: ['确定','关闭'],
+			yes: function(index, layero){
+				var body = top.layer.getChildFrame('body', index);
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var inputForm = body.find('#inputForm');
+				var top_iframe;
+				if(target){
+					top_iframe = target;//如果指定了iframe，则在改frame中跳转
+				}else{
+					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+				}
+				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+				inputForm.attr("action","${ctx}/projectAccessory/projectAccessory/saveWorkAttachment");//表单提交成功后，从服务器返回的url在当前tab中展示
+				var $document = iframeWin.contentWindow.document;
+
+				formSubmit2($document,formId,index,tableId);
+
+			},
+			cancel: function(index){
+			}
+		});
+	}
+	function formSubmit2($document,inputForm,index,tableId){
+
+		var validateForm = $($document.getElementById(inputForm)).validate({
+			submitHandler: function(form){
+				loading('正在提交，请稍等...');
+				form.submit();
+			},
+			errorContainer: "#messageBox",
+			errorPlacement: function(error, element) {
+				$($document.getElementById("#messageBox")).text("输入有误，请先更正。");
+				if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+					error.appendTo(element.parent().parent());
+				} else {
+					error.insertAfter(element);
+				}
+			}
+		});
+		if(validateForm.form()){
+			$($document.getElementById(inputForm)).ajaxSubmit({
+				success:function(data) {
+					var d = data;
+					//输出提示信息
+					if(d.str.length>0){
+						parent.layer.msg(d.str,{icon:1});
+					}
+					$("#"+tableId).load(location.href + " #"+tableId);
+					//关闭当前页
+					top.layer.close(index)
+				}
+			});
+		}
+	}
+
+	function formAttachment(title,url,width,height,target,formId){
+		var rows = $(this).parent().prevAll().length + 1;
+		var frameIndex = parent.layer.getFrameIndex(window.name);
+		var urls = url;
+		if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+			width='auto';
+			height='auto';
+		}else{//如果是PC端，根据用户设置的width和height显示。
+
+		}
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			skin:"two-btns",
+			maxmin: false, //开启最大化最小化按钮
+			content: urls ,
+			btn: ['确定','关闭'],
+			yes: function(index, layero){
+				var body = top.layer.getChildFrame('body', index);
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var inputForm = body.find('#inputForm');
+				var top_iframe;
+				if(target){
+					top_iframe = target;//如果指定了iframe，则在改frame中跳转
+				}else{
+					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+				}
+				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+				inputForm.attr("action","${ctx}/projectAccessory/projectAccessory/saveWorkAttachment");//表单提交成功后，从服务器返回的url在当前tab中展示
+				var $document = iframeWin.contentWindow.document;
+				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var item = iframeWin.getSelectedItem();
+				setValuee(item);
+
+			},
+			cancel: function(index){
+			}
+		});
+	}
+	function setValuee(obj){
+		for(var i=0;i<obj.length;i++){
+			var idArr = $("#file_attachment tr:visible .clientId");
+			if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
+				addRowBaseData("#workBaseDataList",workBaseDataRowIdx,workBaseDataTpl,obj[i]);
+				$("#workBaseDataList"+workBaseDataRowIdx+"_nature").html("引用");
+				workBaseDataRowIdx=workBaseDataRowIdx+1;
+			}
+		}
+	}
+</script>
+<%--<script>
 	/*使用模块加载的方式 加载文件*/
 	layui.config({
 		base: '${ctx}/resoueces/css/layui/module/'
@@ -374,6 +646,6 @@
 			});
 		}
 	}
-</script>
+</script>--%>
 </body>
 </html>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportForm.jsp

@@ -577,8 +577,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 									<th>电子件名称</th>
-									<th>最大容量(M)</th>
-									<th>类型限制</th>
+									<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 									<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -588,7 +588,14 @@
 							<tr>
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
-								<td>${fileAttachment.attachName}</td>
+								<c:choose>
+									<c:when test="${fileAttachment.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileAttachment.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileAttachment.attachLength}</td>
 								<td>${fileAttachment.attachTypes}</td>
 								<td>
@@ -658,8 +665,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 									<th>电子件名称</th>
-									<th>最大容量(M)</th>
-									<th>类型限制</th>
+									<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 									<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -669,8 +676,15 @@
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
-										<td style="display:none">${fileGistdata.mustFlag}</td>
-								<td>${fileGistdata.attachName}</td>
+								<td style="display:none">${fileGistdata.mustFlag}</td>
+								<c:choose>
+									<c:when test="${fileGistdata.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileGistdata.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileGistdata.attachLength}</td>
 								<td>${fileGistdata.attachTypes}</td>
 								<td>
@@ -740,8 +754,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 									<th>电子件名称</th>
-									<th>最大容量(M)</th>
-									<th>类型限制</th>
+									<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 									<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -751,8 +765,15 @@
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-								<td>${fileOther.attachName}</td>
+								<td style="display:none">${fileOther.mustFlag}</td>
+								<c:choose>
+									<c:when test="${fileOther.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileOther.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileOther.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileOther.attachLength}</td>
 								<td>${fileOther.attachTypes}</td>
 								<td>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportModify.jsp

@@ -561,8 +561,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -573,7 +573,14 @@
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
-								<td>${fileAttachment.attachName}</td>
+								<c:choose>
+									<c:when test="${fileAttachment.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileAttachment.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileAttachment.attachLength}</td>
 								<td>${fileAttachment.attachTypes}</td>
 								<td>
@@ -643,8 +650,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -655,7 +662,14 @@
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
 								<td style="display:none">${fileGistdata.mustFlag}</td>
-								<td>${fileGistdata.attachName}</td>
+								<c:choose>
+									<c:when test="${fileOther.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileGistdata.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileGistdata.attachLength}</td>
 								<td>${fileGistdata.attachTypes}</td>
 								<td>
@@ -725,8 +739,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -736,8 +750,15 @@
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-								<td>${fileOther.attachName}</td>
+								<td style="display:none">${fileOther.mustFlag}</td>
+								<c:choose>
+									<c:when test="${fileOther.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileOther.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileOther.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileOther.attachLength}</td>
 								<td>${fileOther.attachTypes}</td>
 								<td>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportView.jsp

@@ -108,8 +108,8 @@
 					<thead>
 					<tr>
 						<th>电子件名称</th>
-						<th>最大容量(M)</th>
-						<th>类型限制</th>
+						<th width="100px">最大容量(M)</th>
+						<th width="18%">类型限制</th>
 						<th>文件名</th>
 						<th width="150px">操作</th>
 					</tr>
@@ -155,8 +155,8 @@
 					<thead>
 					<tr>
 						<th>电子件名称</th>
-						<th>最大容量(M)</th>
-						<th>类型限制</th>
+						<th width="100px">最大容量(M)</th>
+						<th width="18%">类型限制</th>
 						<th>文件名</th>
 						<th width="150px">操作</th>
 					</tr>
@@ -202,8 +202,8 @@
 					<thead>
 					<tr>
 						<th>电子件名称</th>
-						<th>最大容量(M)</th>
-						<th>类型限制</th>
+						<th width="100px">最大容量(M)</th>
+						<th width="18%">类型限制</th>
 						<th>文件名</th>
 						<th width="150px">操作</th>
 					</tr>

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordForm.jsp

@@ -310,8 +310,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -321,7 +321,14 @@
 							<tr>
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
-								<td>${fileAttachment.attachName}</td>
+								<c:choose>
+									<c:when test="${fileAttachment.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileAttachment.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileAttachment.attachLength}</td>
 								<td>${fileAttachment.attachTypes}</td>
 								<td>
@@ -391,8 +398,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -402,8 +409,15 @@
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
-										<td style="display:none">${fileGistdata.mustFlag}</td>
-								<td>${fileGistdata.attachName}</td>
+								<td style="display:none">${fileGistdata.mustFlag}</td>
+								<c:choose>
+									<c:when test="${fileGistdata.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileGistdata.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileGistdata.attachLength}</td>
 								<td>${fileGistdata.attachTypes}</td>
 								<td>
@@ -473,8 +487,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -484,8 +498,15 @@
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-								<td>${fileOther.attachName}</td>
+								<td style="display:none">${fileOther.mustFlag}</td>
+								<c:choose>
+									<c:when test="${fileOther.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileOther.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileOther.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileOther.attachLength}</td>
 								<td>${fileOther.attachTypes}</td>
 								<td>

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordModify.jsp

@@ -341,8 +341,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -352,7 +352,14 @@
 							<tr>
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
-								<td>${fileAttachment.attachName}</td>
+								<c:choose>
+									<c:when test="${fileAttachment.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileAttachment.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileAttachment.attachLength}</td>
 								<td>${fileAttachment.attachTypes}</td>
 								<td>
@@ -422,8 +429,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -433,8 +440,15 @@
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
-										<td style="display:none">${fileGistdata.mustFlag}</td>
-								<td>${fileGistdata.attachName}</td>
+								<td style="display:none">${fileGistdata.mustFlag}</td>
+								<c:choose>
+									<c:when test="${fileGistdata.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileGistdata.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileGistdata.attachLength}</td>
 								<td>${fileGistdata.attachTypes}</td>
 								<td>
@@ -504,8 +518,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -515,8 +529,15 @@
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-								<td>${fileOther.attachName}</td>
+								<td style="display:none">${fileOther.mustFlag}</td>
+								<c:choose>
+									<c:when test="${fileOther.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileOther.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileOther.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileOther.attachLength}</td>
 								<td>${fileOther.attachTypes}</td>
 								<td>

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordView.jsp

@@ -177,8 +177,8 @@
 					<tr>
 						<%-- <th>序号</th>--%>
 						<th>电子件名称</th>
-						<th>最大容量(M)</th>
-						<th>类型限制</th>
+						<th width="100px">最大容量(M)</th>
+						<th width="18%">类型限制</th>
 						<th>文件名</th>
 						<th width="150px">操作</th>
 					</tr>
@@ -226,8 +226,8 @@
 					<tr>
 						<%-- <th>序号</th>--%>
 						<th>电子件名称</th>
-						<th>最大容量(M)</th>
-						<th>类型限制</th>
+						<th width="100px">最大容量(M)</th>
+						<th width="18%">类型限制</th>
 						<th>文件名</th>
 						<th width="150px">操作</th>
 					</tr>
@@ -276,8 +276,8 @@
 					<tr>
 						<%-- <th>序号</th>--%>
 						<th>电子件名称</th>
-						<th>最大容量(M)</th>
-						<th>类型限制</th>
+						<th width="100px">最大容量(M)</th>
+						<th width="18%">类型限制</th>
 						<th>文件名</th>
 						<th width="150px">操作</th>
 					</tr>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageAudit.jsp

@@ -212,8 +212,8 @@
 						<thead>
 						<tr>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -259,8 +259,8 @@
 						<thead>
 						<tr>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -306,8 +306,8 @@
 						<thead>
 						<tr>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify.jsp

@@ -14,28 +14,9 @@
                 var boolFlag = true;
                 for(var i=0; i<leng; i++) {
                     var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
-                    if(numberStr != undefined && numberStr !=null && numberStr !=''){
-                        $.ajax({
-                            type: 'post',
-                            url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',
-                            data: {"attachmentId":numberStr,"projectId":projectId},
-                            dataType: "json",
-                            async: false
-                        }).success(function (result) {
-                            if(result == 0){
-                                boolFlag = false;
-                                top.layer.msg("请上传报告文件！", {icon: 0});
-                                return false;
-                            }
-                        }).error(function () {
-                            top.layer.msg("文件载入失败！");
-                        });
-                    }
-                }
-                if(boolFlag){
-                    var gistdata = $("#file_gistdata tr").length;
-                    for(var i=0; i<gistdata; i++) {
-                        var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
+                    var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
+                    var name = $("#file_attachment tr").eq(i).find("td:eq(2)").html();
+                    if(second == 1){
                         if(numberStr != undefined && numberStr !=null && numberStr !=''){
                             $.ajax({
                                 type: 'post',
@@ -46,7 +27,7 @@
                             }).success(function (result) {
                                 if(result == 0){
                                     boolFlag = false;
-                                    top.layer.msg("请上传依据性文件！", {icon: 0});
+                                    top.layer.msg("请上传报告文件！", {icon: 0});
                                     return false;
                                 }
                             }).error(function () {
@@ -56,25 +37,54 @@
                     }
                 }
                 if(boolFlag){
+                    var gistdata = $("#file_gistdata tr").length;
+                    for(var i=0; i<gistdata; i++) {
+                        var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
+                        var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
+                        if(second == 1){
+                            if(numberStr != undefined && numberStr !=null && numberStr !=''){
+                                $.ajax({
+                                    type: 'post',
+                                    url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',
+                                    data: {"attachmentId":numberStr,"projectId":projectId},
+                                    dataType: "json",
+                                    async: false
+                                }).success(function (result) {
+                                    if(result == 0){
+                                        boolFlag = false;
+                                        top.layer.msg("请上传依据性文件！", {icon: 0});
+                                        return false;
+                                    }
+                                }).error(function () {
+                                    top.layer.msg("文件载入失败！");
+                                });
+                            }
+                        }
+                    }
+                }
+                if(boolFlag){
                     var other = $("#file_other tr").length;
                     for(var i=0; i<other; i++) {
                         var numberStr = $("#file_other tr").eq(i).find("td:first").html();
-                        if(numberStr != undefined && numberStr !=null && numberStr !=''){
-                            $.ajax({
-                                type: 'post',
-                                url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',
-                                data: {"attachmentId":numberStr,"projectId":projectId},
-                                dataType: "json",
-                                async: false
-                            }).success(function (result) {
-                                if(result == 0){
-                                    boolFlag = false;
-                                    top.layer.msg("请上传其他文件！", {icon: 0});
-                                    return false;
-                                }
-                            }).error(function () {
-                                top.layer.msg("文件载入失败！");
-                            });
+                        var second = $("#file_other tr").eq(i).find("td:eq(1)").html();
+                        if(second == 1){
+                            if(numberStr != undefined && numberStr !=null && numberStr !=''){
+                                $.ajax({
+                                    type: 'post',
+                                    url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',
+                                    data: {"attachmentId":numberStr,"projectId":projectId},
+                                    dataType: "json",
+                                    async: false
+                                }).success(function (result) {
+                                    if(result == 0){
+                                        boolFlag = false;
+                                        top.layer.msg("请上传其他文件！", {icon: 0});
+                                        return false;
+                                    }
+                                }).error(function () {
+                                    top.layer.msg("文件载入失败！");
+                                });
+                            }
                         }
                     }
                 }
@@ -354,8 +364,8 @@
                         <thead>
                         <tr>
                             <th>电子件名称</th>
-                            <th>最大容量(M)</th>
-                            <th>类型限制</th>
+                            <th width="100px">最大容量(M)</th>
+                            <th width="18%">类型限制</th>
                             <th>文件名</th>
                             <th width="150px">操作</th>
                         </tr>
@@ -364,6 +374,7 @@
                         <c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
                                 <tr>
                                     <td style="display:none">${fileAttachment.id}</td>
+                                    <td style="display:none">${fileAttachment.mustFlag}</td>
                                     <td>${fileAttachment.attachName}</td>
                                     <td>${fileAttachment.attachLength}</td>
                                     <td>${fileAttachment.attachTypes}</td>
@@ -401,8 +412,8 @@
                         <thead>
                         <tr>
                             <th>电子件名称</th>
-                            <th>最大容量(M)</th>
-                            <th>类型限制</th>
+                            <th width="100px">最大容量(M)</th>
+                            <th width="18%">类型限制</th>
                             <th>文件名</th>
                             <th width="150px">操作</th>
                         </tr>
@@ -411,6 +422,7 @@
                         <c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
                                 <tr>
                                     <td style="display:none">${fileGistdata.id}</td>
+                                    <td style="display:none">${fileGistdata.mustFlag}</td>
                                     <td>${fileGistdata.attachName}</td>
                                     <td>${fileGistdata.attachLength}</td>
                                     <td>${fileGistdata.attachTypes}</td>
@@ -448,8 +460,8 @@
                         <thead>
                         <tr>
                             <th>电子件名称</th>
-                            <th>最大容量(M)</th>
-                            <th>类型限制</th>
+                            <th width="100px">最大容量(M)</th>
+                            <th width="18%">类型限制</th>
                             <th>文件名</th>
                             <th width="150px">操作</th>
                         </tr>
@@ -458,6 +470,7 @@
                         <c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
                                 <tr>
                                     <td style="display:none">${fileOther.id}</td>
+                                    <td style="display:none">${fileOther.mustFlag}</td>
                                     <td>${fileOther.attachName}</td>
                                     <td>${fileOther.attachLength}</td>
                                     <td>${fileOther.attachTypes}</td>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView.jsp

@@ -108,8 +108,8 @@
 						<thead>
 						<tr>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -155,8 +155,8 @@
 						<thead>
 						<tr>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -202,8 +202,8 @@
 						<thead>
 						<tr>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm.jsp

@@ -579,8 +579,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -590,7 +590,15 @@
 							<tr>
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
-								<td>${fileAttachment.attachName}</td>
+								<c:choose>
+									<c:when test="${fileAttachment.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileAttachment.attachName}</td>
+									</c:otherwise>
+								</c:choose>
+
 								<td>${fileAttachment.attachLength}</td>
 								<td>${fileAttachment.attachTypes}</td>
 								<td>
@@ -661,8 +669,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -672,8 +680,15 @@
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
-										<td style="display:none">${fileGistdata.mustFlag}</td>
-								<td>${fileGistdata.attachName}</td>
+								<td style="display:none">${fileGistdata.mustFlag}</td>
+								<c:choose>
+									<c:when test="${fileGistdata.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileGistdata.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileGistdata.attachLength}</td>
 								<td>${fileGistdata.attachTypes}</td>
 								<td>
@@ -743,8 +758,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -754,8 +769,15 @@
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-								<td>${fileOther.attachName}</td>
+								<td style="display:none">${fileOther.mustFlag}</td>
+								<c:choose>
+									<c:when test="${fileOther.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileOther.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileOther.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileOther.attachLength}</td>
 								<td>${fileOther.attachTypes}</td>
 								<td>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportModify.jsp

@@ -561,8 +561,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -573,7 +573,14 @@
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
-								<td>${fileAttachment.attachName}</td>
+								<c:choose>
+									<c:when test="${fileAttachment.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileAttachment.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileAttachment.attachLength}</td>
 								<td>${fileAttachment.attachTypes}</td>
 								<td>
@@ -643,8 +650,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -654,8 +661,15 @@
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
-										<td style="display:none">${fileGistdata.mustFlag}</td>
-								<td>${fileGistdata.attachName}</td>
+								<td style="display:none">${fileGistdata.mustFlag}</td>
+								<c:choose>
+									<c:when test="${fileGistdata.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileGistdata.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileGistdata.attachLength}</td>
 								<td>${fileGistdata.attachTypes}</td>
 								<td>
@@ -725,8 +739,8 @@
 						<tr>
 								<%-- <th>序号</th>--%>
 							<th>电子件名称</th>
-							<th>最大容量(M)</th>
-							<th>类型限制</th>
+							<th width="100px">最大容量(M)</th>
+							<th width="18%">类型限制</th>
 							<th>文件名</th>
 							<th width="150px">操作</th>
 						</tr>
@@ -736,8 +750,15 @@
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-								<td>${fileOther.attachName}</td>
+								<td style="display:none">${fileOther.mustFlag}</td>
+								<c:choose>
+									<c:when test="${fileOther.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileOther.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<td>${fileOther.attachName}</td>
+									</c:otherwise>
+								</c:choose>
 								<td>${fileOther.attachLength}</td>
 								<td>${fileOther.attachTypes}</td>
 								<td>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportView.jsp

@@ -108,8 +108,8 @@
 					<thead>
 					<tr>
 						<th>电子件名称</th>
-						<th>最大容量(M)</th>
-						<th>类型限制</th>
+						<th width="100px">最大容量(M)</th>
+						<th width="18%">类型限制</th>
 						<th>文件名</th>
 						<th width="150px">操作</th>
 					</tr>
@@ -155,8 +155,8 @@
 					<thead>
 					<tr>
 						<th>电子件名称</th>
-						<th>最大容量(M)</th>
-						<th>类型限制</th>
+						<th width="100px">最大容量(M)</th>
+						<th width="18%">类型限制</th>
 						<th>文件名</th>
 						<th width="150px">操作</th>
 					</tr>
@@ -202,8 +202,8 @@
 					<thead>
 					<tr>
 						<th>电子件名称</th>
-						<th>最大容量(M)</th>
-						<th>类型限制</th>
+						<th width="100px">最大容量(M)</th>
+						<th width="18%">类型限制</th>
 						<th>文件名</th>
 						<th width="150px">操作</th>
 					</tr>