样式修改

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectPlanService.java

@@ -61,8 +61,14 @@ public class ProjectPlanService extends CrudService<ProjectPlanDao, ProjectPlanI
             User userR = dao.getUserId(projectPlanInfo.getRemindId());
             projectPlanInfo.setRemindName(userR.getId());
             //获取完成人信息
-            User userF = dao.getUserId(projectPlanInfo.getFinishId().split(",")[0]);
-            projectPlanInfo.setFinishName(userF.getId());
+            User userF = new User();
+            if(StringUtils.isNotBlank(projectPlanInfo.getFinishId())){
+                userF = dao.getUserId(projectPlanInfo.getFinishId());
+                projectPlanInfo.setFinishName(userF.getId());
+            }else{
+                projectPlanInfo.setFinishName("");
+            }
+            //User userF = dao.getUserId(projectPlanInfo.getFinishId().split(",")[0]);
             //根据项目类型查询typeId
             /*String projectTypeId = dao.getProjectTypeName(projectPlanInfo.getProjectStage(),projectRecords.getProjectTypeId());
             projectPlanInfo.setProjectStage(projectTypeId);*/

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectPlanController.java

@@ -152,6 +152,10 @@ public class ProjectPlanController extends BaseController {
                         projectPlan.setRemindName(projectRecords.getProjectLeaders().get(0).getName());
                         projectPlan.setRemindId(projectRecords.getProjectLeaders().get(0).getId());
                     }
+                    //将项目等级人信息添加到完成人控件中
+                    User user = UserUtils.get(projectRecords.getCreateBy().getId());
+                    projectPlan.setFinishId(user.getId());
+                    projectPlan.setFinishName(user.getName());
                     projectPlanList.add(projectPlan);
                 }
             }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -529,9 +529,7 @@ public class RuralProjectMessageController extends BaseController {
                 }
 
             }
-        /*}*/projectcontent.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileAttachmentList()));
-        projectcontent.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileGistdataList()));
-        projectcontent.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileOtherList()));
+        /*}*/
 
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();
@@ -560,6 +558,9 @@ public class RuralProjectMessageController extends BaseController {
                     }
                 }
             }
+            projectcontent.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileAttachmentList()));
+            projectcontent.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileGistdataList()));
+            projectcontent.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileOtherList()));
             return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportView";
         }
         if (StringUtils.isNotBlank(projectcontentinfo.getView()) && projectcontentinfo.getView().contains("report")) {
@@ -567,7 +568,7 @@ public class RuralProjectMessageController extends BaseController {
                 Act act = getByAct(projectReportData.getProcessInstanceId());
                 projectReportData.setAct(act);
             }
-            return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportModify";
+            return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify";
         }
         return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm";
     }
@@ -1002,6 +1003,9 @@ public class RuralProjectMessageController extends BaseController {
 
 
         if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("view")){
+            projectReportRecord.setFileAttachmentList(projectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
+            projectReportRecord.setFileGistdataList(projectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
+            projectReportRecord.setFileOtherList(projectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
             return "modules/ruralprojectrecords/projectReportRecord/projectReportRecordView";
         }else if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("modiftApply")){
             ProcessInstance processInstance = actTaskService.getProcIns(projectReportRecord.getProcessInstanceId());

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -468,7 +468,7 @@ public class RuralProjectRecordsController extends BaseController {
 		if(workContractInfo==null){
 		    return workContractInfo;
         }
-		workContractInfo.setConstructionProjectTypeStr(DictUtils.getDictLabel(String.valueOf(workContractInfo.getConstructionProjectType()),"construction_project_type",""));
+		workContractInfo.setContractType(DictUtils.getMainDictLabel(String.valueOf(workContractInfo.getContractTypeDoc()),"contract_info_type",""));
 		if(workContractInfo.getWorkClientInfoList()!=null&&!workContractInfo.getWorkClientInfoList().isEmpty()){
             StringBuilder workClinetInfoIds = new StringBuilder();
             for (WorkClientInfo workClientInfo : workContractInfo.getWorkClientInfoList()) {
@@ -932,6 +932,38 @@ public class RuralProjectRecordsController extends BaseController {
 
 
 	/**
+	 * 文件上传查看页面
+	 * @param projectRecords
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping(value = "getAccessoryView")
+	public String getAccessoryView(RuralProjectRecords projectRecords, Model model) {
+		if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
+			projectRecords = projectRecordsService.getQueryProjectUsers(projectRecords.getId());
+			RuralProjectcontentinfo ruralProjectcontentinfo = projectRecordsService.formAccessory(projectRecords);
+			projectRecordsService.disposeData(ruralProjectcontentinfo);
+			//查询项目报告信息
+			ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
+			//如果项目报告不为空，则查询项目线上归档信息
+			if(null != projectReportData){
+				ProjectReportRecord projectReportRecord = ruralProjectMessageService.getProjectReportRecord(projectReportData.getId());
+				if(null != projectReportRecord){
+					model.addAttribute("projectId", projectRecords.getId());
+				}else{
+					model.addAttribute("projectId", "");
+				}
+			}
+			model.addAttribute("projectcontentinfo", ruralProjectcontentinfo);
+			model.addAttribute("projectRecords", projectRecords);
+		}else {
+			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+		}
+		return "modules/ruralprojectrecords/projectAccessoryView";
+	}
+
+
+	/**
 	 *查询成果文件树形信息
 	 */
 	@RequestMapping(value = "getOutcomeAccessoryInfo")

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -1873,9 +1873,6 @@ public class WorkProjectNotifyController extends BaseController {
 
 						}
 					//}
-					projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
-					projectcontentinfo.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
-					projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
 					projectcontentinfo.setHome("home");
 					model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
 					model.addAttribute("projectId", projectcontentinfo.getProject().getId());
@@ -1903,12 +1900,21 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("type", type);
 					model.addAttribute("list", workReviewAudits);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
+						projectcontentinfo.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
+						projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+						projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
+						projectcontentinfo.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
+						projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify";
 					} else {
+						projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
+						projectcontentinfo.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
+						projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView";
 					}
 				} else if (workProjectNotify.getType().equals("46")) {    //工作内容报告变更
@@ -2090,18 +2096,24 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 					//}
 
-					projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
-					projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
-					projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
 					model.addAttribute("projectReportRecord", projectReportRecord);
 					model.addAttribute("project", projectReportRecord.getReport().getProject());
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
+						projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
+						projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
 						return "modules/ruralprojectrecords/projectReportRecord/projectReportRecordView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/projectcontentinfo/projectReportRecordAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
+						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
+						projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
+						projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
 						return "modules/projectcontentinfo/projectReportRecordModifyApply";
 					} else {
+						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
+						projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
+						projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
 						return "modules/ruralprojectrecords/projectReportRecord/projectReportRecordView";
 
 					}

src/main/resources/mappings/modules/projectrecord/ProjectPlanDao.xml

@@ -62,16 +62,20 @@
 		update
   			project_plan_info
 		set
-		  update_by = #{updateBy.id},
-		  update_date = #{updateDate},
-		  remarks = #{remarks},
-		  del_flag = #{delFlag},
-		  project_id = #{projectId},
-		  project_stage = #{projectStage},
-		  begin_date = #{beginDate},
-		  end_date = #{endDate},
-		  remind_name = #{remindName},
-		  finish_name = #{finishName}
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			remarks = #{remarks},
+			del_flag = #{delFlag},
+			project_id = #{projectId},
+			project_stage = #{projectStage},
+			begin_date = #{beginDate},
+			end_date = #{endDate}
+			<if test="remindName != null and remindName != ''">
+			,remind_name = #{remindName}
+			</if>
+			<if test="finishName != null and finishName != ''">
+			,finish_name = #{finishName}
+			</if>
 		where id = #{id}
 	</update>
 

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -485,7 +485,7 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY a.contract_date DESC
+				ORDER BY a.update_date DESC
 			</otherwise>
 		</choose>
 	</select>

src/main/webapp/static/bos/bosupload.js

@@ -71,7 +71,7 @@ function multitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,div
                             var str = '' ;
                             var addFile = prefix+divId;
                             if (isContains("jpg,png,gif,bmp,jpeg",data.type)){
-                                str = '<img src="'+data1.url+'" width="50" height="50" title="'+data.attachmentName+'" onclick="openDialogView(\'预览\',\''+realPath+ '/a/sys/picturepreview/picturePreview?url=' +data1.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
+                                str = '<img src="'+data1.url+'" width="50" height="50" title="'+data.attachmentName+'" onclick="openDialogView(\'预览\',\'/a/sys/picturepreview/picturePreview?url=' +data1.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
                             }else if(isContains("pdf",data.type)){
                                 str = '<a class="attention-info" href="javascript:void(0)" title="'+data.attachmentName+'" onclick="preview(\'预览\',\''+data1.url+'\',\'90%\',\'90%\',\'1\')">'+data.attachmentName+'</a>';
                             }else {
@@ -144,7 +144,7 @@ function fBmultitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,d
                             var str = '' ;
                             var addFile = prefix+divId;
                             if (isContains("jpg,png,gif,bmp,jpeg",data.type)){
-                                str = '<img src="'+data1.url+'" width="50" height="50" title="'+data.attachmentName+'" onclick="openDialogView(\'预览\',\''+realPath+ '/a/sys/picturepreview/picturePreview?url=' +data1.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
+                                str = '<img src="'+data1.url+'" width="50" height="50" title="'+data.attachmentName+'" onclick="openDialogView(\'预览\',\'/a/sys/picturepreview/picturePreview?url=' +data1.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
                             }else if(isContains("pdf",data.type)){
                                 str = '<a class="attention-info" href="javascript:void(0)" title="'+data.attachmentName+'" onclick="preview(\'预览\',\''+data1.url+'\',\'90%\',\'90%\',\'1\')">'+data.attachmentName+'</a>';
                             }else {
@@ -199,7 +199,7 @@ function multitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,
                 $("#jindutiao"+divId).attr("style","width: "+p+"%");
                 $("#jindutiao"+divId).attr("aria-valuenow",p+"%");
                 $("#baifenbi"+divId).html(p+"%");
-                $("#fileName"+divId).html(name);
+                $("#fileName"+divId).html("上传进度：");
                 $.ajax({
                     type:'post',
                     url:returnUrl,
@@ -223,7 +223,7 @@ function multitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,
                             var str = '<tr class="trIdAdds">'+
                                 '<td class="text-center">' ;
                             if (isContains("jpg,png,gif,bmp,jpeg",data.type)){
-                                str = str +'<img src="'+data1.url+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+realPath+ '/a/sys/picturepreview/picturePreview?url=' +data1.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
+                                str = str +'<img src="'+data1.url+'" width="50" height="50" onclick="openDialogView(\'预览\',\'/a/sys/picturepreview/picturePreview?url=' +data1.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
                             }else if(isContains("pdf",data.type)){
                                 str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+data1.url+'\',\'90%\',\'90%\',\'1\')">'+data.attachmentName+'</a>';
                             }else {
@@ -380,7 +380,7 @@ function ftlMultitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divI
                 $("#jindutiao"+divId).attr("style","width: "+p+"%");
                 $("#jindutiao"+divId).attr("aria-valuenow",p+"%");
                 $("#baifenbi"+divId).html(p+"%");
-                $("#fileName"+divId).html(name);
+                $("#fileName"+divId).html("上传进度：");
 
 
                 $.ajax({
@@ -405,7 +405,7 @@ function ftlMultitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divI
                             var str = '<tr class="trIdAdds">'+
                                 '<td class="text-center">' ;
                             if (isContains("jpg,png,gif,bmp,jpeg",data.type)){
-                                str = str +'<img src="'+data1.url+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+realPath+ '/a/sys/picturepreview/picturePreview?url=' +data1.url+ '\',\'90%\',\'90%\')" alt="'+data1.name+'"/>';
+                                str = str +'<img src="'+data1.url+'" width="50" height="50" onclick="openDialogView(\'预览\',\'/a/sys/picturepreview/picturePreview?url=' +data1.url+ '\',\'90%\',\'90%\')" alt="'+data1.name+'"/>';
                             }else if(isContains("pdf",data.type)){
                                 str = str + '<a class="attention-info" href="javascript:void(0)" onclick="preview(\'预览\',\''+data1.url+'\',\'90%\',\'90%\',\'1\')">'+data1.name+'</a>';
                             }else {

src/main/webapp/static/common/jeeplus.js

@@ -446,7 +446,7 @@ function getCheckProjectState(id)
         case "2":result.label = "auditing";result.status="归档中";break;
         case "3":result.label = "cancel";result.status="撤回";break;
         case "4":result.label = "reject";result.status="驳回";break;
-        case "5":result.label = "signed";result.status="归档完成";break;
+        case "5":result.label = "signed";result.status="完成";break;
         case "7":result.label = "discarded";result.status="作废";result.action = false;break;
         case "8":result.label = "discarded";result.status="已删除";result.action = false;break;
         default:

src/main/webapp/static/common/js/common.js

@@ -78,9 +78,9 @@ function preview(title,url,width,height,type){
     }
     //var u = 'http://ow365.cn/?i=14411&furl='+url;
     if(url.indexOf("http://gangwan-app.oss-cn-hangzhou.aliyuncs.com")>-1) {
-        var u = 'https://view.officeapps.live.com/op/view.aspx?src='+encodeContent(url);
+        var u = 'https://view.officeapps.live.com/op/view.aspx?src='+encodeURIComponent(url);
     }else{
-        var u = 'https://view.officeapps.live.com/op/view.aspx?src='+encodeContent(url);
+        var u = 'https://view.officeapps.live.com/op/view.aspx?src='+encodeURIComponent(url);
     }
 
     function encodeContent(data){
@@ -91,7 +91,7 @@ function preview(title,url,width,height,type){
     }
 
     if(type == 1){
-        u = url;
+        u = 'http://www.xdocin.com/xdoc?_func=to&_format=html&_cache=true&_xdoc='+encodeURIComponent(url);
     }
     parent.layer.open({
         type: 2,

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

@@ -231,10 +231,10 @@
 				<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-hover list-table">
+					<table id="upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -271,10 +271,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileAttachment.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${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>
+
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -303,10 +303,10 @@
 				<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-hover list-table">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -344,10 +344,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileGistdata.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -378,10 +378,10 @@
 				<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-hover list-table">
+					<table id="upTable_other" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -419,10 +419,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileOther.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanForm.jsp

@@ -223,7 +223,6 @@
                                         <input id="projectPlanList{{idx}}_id" name="projectPlanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
                                         <input id="projectPlanList{{idx}}_delFlag" name="projectPlanList[{{idx}}].delFlag" type="hidden" value="0"/>
                                         <input id="projectPlanList{{idx}}_remindId" name="projectPlanList[{{idx}}].remindId" type="hidden" value="{{row.remindId}}"/>
-                                        <input id="projectPlanList{{idx}}_finishId" name="projectPlanList[{{idx}}].finishId" type="hidden" value="{{row.finishId}}"/>
                                     </td>
 
                                     <td width="60px">
@@ -246,7 +245,7 @@
                                     </td>
 
                                     <td>
-                                        <sys:treeselecttPlanUser id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" value="${projectRecords.leaderIds}" labelName="projectPlanList[{{idx}}].finishName" labelValue="{{row.finishName}}"
+                                        <sys:treeselecttPlanUser id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishId" value="{{row.finishId}}" labelName="projectPlanList[{{idx}}].finishName" labelValue="{{row.finishName}}"
                                          title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 

src/main/webapp/webpage/modules/ruralprojectrecords/projectAccessoryForm.jsp

@@ -410,11 +410,11 @@
 				<span id="attachment_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
 					<%--<table id="upTable" class="layui-table" lay-filter="permissionTable"></table>--%>
-					<table id="upTable" class="table table-bordered table-hover list-table">
+					<table id="upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -454,7 +454,7 @@
 												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -514,11 +514,11 @@
 				<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-hover list-table">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -559,7 +559,7 @@
 												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -618,11 +618,11 @@
 				<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-hover list-table">
+					<table id="upTable_other" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -663,7 +663,7 @@
 														<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 													</c:when>
 													<c:otherwise>
-														<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+														<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 													</c:otherwise>
 												</c:choose>
 											</div>

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

@@ -56,6 +56,7 @@
 			<c:if test="${not empty project.id}">
 				<li class="active"><a href="${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=${project.id}&view=view">项目线上归档信息</a></li>
 			</c:if>
+			<li><a href="${ctx}/ruralProject/ruralProjectRecords/getAccessoryView?id=${project.id}">附件信息</a></li>
 		</ul>
 	</div>
 	<div class="container view-form">
@@ -201,10 +202,10 @@
 			<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-hover list-table">
+				<table id="upTable" class="table table-bordered table-condensed details">
 					<thead>
 					<tr>
-						<th width="40%">文件类型</th>
+						<th width="55%">文件类型</th>
 						<th width="">文件名</th>
 						<th width="100px">操作</th>
 					</tr>
@@ -241,10 +242,10 @@
 								<div class="op-btn-box" >
 									<c:choose>
 										<c:when test="${fileAttachment.flag == 0}">
-											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${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>
+
 										</c:when>
 										<c:otherwise>
-											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 										</c:otherwise>
 									</c:choose>
 								</div>
@@ -270,10 +271,10 @@
 			<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-hover list-table">
+				<table id="gistdata_upTable" class="table table-bordered table-condensed details">
 					<thead>
 					<tr>
-						<th width="40%">文件类型</th>
+						<th width="55%">文件类型</th>
 						<th width="">文件名</th>
 						<th width="100px">操作</th>
 					</tr>
@@ -311,10 +312,10 @@
 								<div class="op-btn-box" >
 									<c:choose>
 										<c:when test="${fileGistdata.flag == 0}">
-											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 										</c:when>
 										<c:otherwise>
-											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 										</c:otherwise>
 									</c:choose>
 								</div>
@@ -342,10 +343,10 @@
 			<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-hover list-table">
+				<table id="upTable_other" class="table table-bordered table-condensed details">
 					<thead>
 					<tr>
-						<th width="40%">文件类型</th>
+						<th width="55%">文件类型</th>
 						<th width="">文件名</th>
 						<th width="100px">操作</th>
 					</tr>
@@ -383,10 +384,10 @@
 								<div class="op-btn-box" >
 									<c:choose>
 										<c:when test="${fileOther.flag == 0}">
-											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 										</c:when>
 										<c:otherwise>
-											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 										</c:otherwise>
 									</c:choose>
 								</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -233,7 +233,7 @@
                     formatNum($("#contractPrice"));
                     $("#contractClientName").val(data.client.name);
                     $("#contractClientId").val(data.client.id);
-                    $("#constructionProjectType").val(data.constructionProjectTypeStr);
+                    $("#constructionProjectType").val(data.contractType);
                     $("#linkmanId").val(data.workClinetInfoIds);
                     //清理之前的联系人
                     var newClientId  = data.client.id;
@@ -730,7 +730,7 @@
                    </div>--%>
                    <div id="divv3">
                        <div class="layui-item layui-col-sm6 lw7">
-                           <label class="layui-form-label">工程分类：</label>
+                           <label class="layui-form-label">合同类型：</label>
                            <div class="layui-input-block">
                                <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.constructionProjectTypeStr}"/>
                            </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsView.jsp

@@ -79,6 +79,7 @@
 			<c:if test="${not empty projectId}">
 				<li><a href="${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=${projectId}&view=view">项目线上归档信息</a></li>
 			</c:if>
+			<li><a href="${ctx}/ruralProject/ruralProjectRecords/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
 		</ul>
 	</div>
 	<div class="container view-form">
@@ -439,7 +440,7 @@
 				</div>
 			</div>
 
-			<div class="form-group layui-row">
+			<%--<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="upTable" class="table table-bordered table-condensed details">
@@ -466,18 +467,18 @@
 											<fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
 										</td>
 										<td class="op-td">
-												<%--<c:choose>--%>
-												<%--<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">--%>
-												<%--<div style="text-align: center">--%>
-												<%--<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
-												<%--</div>--%>
-												<%--</c:when>--%>
-												<%--<c:otherwise>--%>
-												<%--<div style="text-align: center">--%>
-												<%--<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
-												<%--</div>--%>
-												<%--</c:otherwise>--%>
-												<%--</c:choose>--%>
+												&lt;%&ndash;<c:choose>&ndash;%&gt;
+												&lt;%&ndash;<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">&ndash;%&gt;
+												&lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
+												&lt;%&ndash;<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
+												&lt;%&ndash;</div>&ndash;%&gt;
+												&lt;%&ndash;</c:when>&ndash;%&gt;
+												&lt;%&ndash;<c:otherwise>&ndash;%&gt;
+												&lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
+												&lt;%&ndash;<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
+												&lt;%&ndash;</div>&ndash;%&gt;
+												&lt;%&ndash;</c:otherwise>&ndash;%&gt;
+												&lt;%&ndash;</c:choose>&ndash;%&gt;
 											<div style="text-align: center" id="status_td_${index.index+1}">
 											</div>
 											<script>
@@ -498,7 +499,7 @@
 						</tbody>
 					</table>
 				</div>
-			</div>
+			</div>--%>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>项目计划列表</h2></div>
 				<div class="layui-item layui-col-sm12 lw7">

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

@@ -12,6 +12,12 @@
             if(validateForm.form()){
                 if(obj == 1) {
                     $("#flag").val("yes");
+                    var technicistRemarks = $("#technicistRemarks").val();
+                    var type = $("#type").val();
+                    if( type==4 && (undefined == technicistRemarks || null ==technicistRemarks || '' ==technicistRemarks)){
+						top.layer.msg("请填写专业咨询员审核意见！", {icon: 0});
+						return false;
+					}
                     /*if($("#taskDefKey").val()== "projectplan" && $(".trIdAdds").length==0){
                         top.layer.alert('请至少上传一个项目计划表或者实施方案文档！', {icon: 0});
                         return;
@@ -25,7 +31,9 @@
                 }
                 $("#inputForm").submit();
                 return true;
-            }
+            }else{
+				parent.layer.msg("信息未填写完整!", {icon: 5});
+			}
 
             return false;
         }
@@ -117,7 +125,7 @@
 			<form:hidden path="projectReportData.act.procDefId"/>
 			<form:hidden id="flag" path="projectReportData.act.flag"/>
 			<c:set var="status" value="${projectReportData.act.status}" />
-
+			<input type="hidden" id="type" value="${type}">
 
 			<sys:message content="${message}"/>
 			<div class="form-group layui-row first lw12">
@@ -340,7 +348,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row first lw12">
-				<div class="form-group-label"><h2>合同信息</h2></div>
+				<div class="form-group-label"><h2>报告信息</h2></div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">送审价(元)：</label>
 					<div class="layui-input-block with-icon">
@@ -453,9 +461,9 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm12 lw7 with-textarea">
-						<label class="layui-form-label double-line">专业咨询员审核意见：</label>
+						<label class="layui-form-label double-line"><span class="require-item">*</span>专业咨询员审核意见：</label>
 						<div class="layui-input-block">
-							<form:textarea path="projectReportData.technicistRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+							<form:textarea path="projectReportData.technicistRemarks" id="technicistRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
 						</div>
 					</div>
 				</c:if>
@@ -474,10 +482,10 @@
 				<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-hover list-table">
+					<table id="upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -514,10 +522,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileAttachment.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -542,10 +550,10 @@
 				<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-hover list-table">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -583,10 +591,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileGistdata.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -613,10 +621,10 @@
 				<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-hover list-table">
+					<table id="upTable_other" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -654,10 +662,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileOther.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>

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

@@ -510,7 +510,7 @@
                 </div>
             </div>
             <div class="form-group layui-row first lw12">
-                <div class="form-group-label"><h2>合同信息</h2></div>
+                <div class="form-group-label"><h2>报告信息</h2></div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
                     <div class="layui-input-block with-icon">
@@ -572,15 +572,15 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>工作开始日期：</label>
+                    <label class="layui-form-label">工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input laydate-icon required" readonly="readonly" id="startDate" name="projectOnRural.startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input laydate-icon" readonly="readonly" id="startDate" name="projectOnRural.startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>工作结束日期：</label>
+                    <label class="layui-form-label">工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input laydate-icon required" readonly="readonly" id="endingDate" name="projectOnRural.endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input laydate-icon" readonly="readonly" id="endingDate" name="projectOnRural.endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
             </div>
@@ -594,9 +594,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7 with-textarea">
-                    <label class="layui-form-label double-line">专业咨询员审核意见：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>专业咨询员审核意见：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -607,9 +607,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7 with-textarea">
-                    <label class="layui-form-label double-line">项目负责人审核意见：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>项目负责人审核意见：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
                     </div>
                 </div>
             </div>

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

@@ -262,7 +262,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row first lw12">
-				<div class="form-group-label"><h2>合同信息</h2></div>
+				<div class="form-group-label"><h2>报告信息</h2></div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">送审价(元)：</label>
 					<div class="layui-input-block with-icon">
@@ -389,10 +389,10 @@
 				<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-hover list-table">
+					<table id="upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -427,14 +427,16 @@
 								</td>
 								<td class="op-td" style="text-align:center;">
 									<div class="op-btn-box" >
-										<c:choose>
-											<c:when test="${fileAttachment.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-											</c:when>
-											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-											</c:otherwise>
-										</c:choose>
+										<div class="op-btn-box" >
+											<c:choose>
+												<c:when test="${fileAttachment.flag == 0}">
+
+												</c:when>
+												<c:otherwise>
+													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+												</c:otherwise>
+											</c:choose>
+										</div>
 									</div>
 								</td>
 							</tr>
@@ -457,10 +459,10 @@
 				<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-hover list-table">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -498,10 +500,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileGistdata.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -528,10 +530,10 @@
 				<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-hover list-table">
+					<table id="upTable_other" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="40%">文件类型</th>
+							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -569,10 +571,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileOther.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 											</c:otherwise>
 										</c:choose>
 									</div>

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

@@ -845,9 +845,9 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
-					<label class="layui-form-label double-line">专业咨询员审核意见：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>专业咨询员审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
@@ -858,9 +858,9 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
-					<label class="layui-form-label double-line">项目负责人审核意见：</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>项目负责人审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
 					</div>
 				</div>
 			</div>

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

@@ -488,10 +488,10 @@
 			<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-hover list-table">
+				<table id="upTable" class="table table-bordered table-condensed details">
 					<thead>
 					<tr>
-						<th width="40%">文件类型</th>
+						<th width="55%">文件类型</th>
 						<th width="">文件名</th>
 						<th width="100px">操作</th>
 					</tr>
@@ -556,10 +556,10 @@
 			<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-hover list-table">
+				<table id="gistdata_upTable" class="table table-bordered table-condensed details">
 					<thead>
 					<tr>
-						<th width="40%">文件类型</th>
+						<th width="55%">文件类型</th>
 						<th width="">文件名</th>
 						<th width="100px">操作</th>
 					</tr>
@@ -627,10 +627,10 @@
 			<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-hover list-table">
+				<table id="upTable_other" class="table table-bordered table-condensed details">
 					<thead>
 					<tr>
-						<th width="40%">文件类型</th>
+						<th width="55%">文件类型</th>
 						<th width="">文件名</th>
 						<th width="100px">操作</th>
 					</tr>

src/main/webapp/webpage/modules/ruralprojectrecords/subProjectInfo/subProjectInfoList.jsp

@@ -221,6 +221,7 @@
 			<li class="active"><a href="${ctx}/subProject/subProject/list?parentProId=${subProjectInfo.parentProId}&projectType=${subProjectInfo.projectType}">子项目列表</a></li>
 			<c:if test="${not empty projectId}">
 				<li><a href="${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=${projectId}&view=view">项目线上归档信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectRecords/getAccessoryView?id=${subProjectInfo.parentProId}">附件信息</a></li>
 			</c:if>
 		</ul>
 	</div>

src/main/webapp/webpage/modules/sys/gridselectContractDetail.jsp

@@ -106,7 +106,7 @@
 						</div>
 						<div id="moresees" style="clear:both;display:none;">
 							<div class="layui-item query athird" style="width:25%;">
-								<span class="layui-form-label">工程类别：</span>
+								<span class="layui-form-label">合同类型：</span>
 								<div class="layui-input-block">
 									<form:select path="contractTypeDoc" cssClass="form-control required simple-select">
 										<form:option value="" label=""/>
@@ -132,7 +132,7 @@
 						</c:forEach>--%>
 						<th width="20%">合同编号</th>
 						<th width="20%">合同名称</th>
-						<th width="15%">工程分类</th>
+						<th width="15%">合同类型</th>
 						<th width="20%">委托方</th>
 						<th width="15%">创建时间</th>
 						<th width="80">创建人</th>

src/main/webapp/webpage/modules/workclientinfo/workClientInfoForm.jsp

@@ -697,7 +697,7 @@
                         </tr>
                         </thead>
                         <tbody id="workClientLinkmanList">
-                        <c:forEach items="${workClientInfo.workClientLinkmanList}" var="workClientLinkman" varStatus="status">
+                        <%--<c:forEach items="${workClientInfo.workClientLinkmanList}" var="workClientLinkman" varStatus="status">
                             <tr>
                                    <td class="hide">
                                        <input id="workClientLinkmanList${status.index + 1}_id"
@@ -737,7 +737,7 @@
                                             class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>
                                    </td>
                             </tr>
-                        </c:forEach>
+                        </c:forEach>--%>
                         </tbody>
                     </table>
                     <script type="text/template" id="workClientLinkmanTpl">//<!--

src/main/webapp/webpage/modules/workclientinfo/workClientInfoFormTwo.jsp

@@ -431,14 +431,6 @@
             <input type="hidden" id="jobTypeStr" name="jobTypeStr" value="">
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>基本信息</h2></div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>拥有统一社会信用代码：</label>
-                    <div class="layui-input-block">&nbsp;&nbsp;
-                        <form:radiobutton id="hasUscc" class="usccClass i-checks" path="hasUscc" value="1" label="是" checked="true" />
-                        &nbsp;&nbsp;
-                        <form:radiobutton id="hasUscc" class="usccClass i-checks" path="hasUscc" value="2" label="否" />
-                    </div>
-                </div>
                 <div class="layui-item layui-col-sm6 lw7" id="search">
                     <label class="layui-form-label"><span class="require-item">*</span>客户名称：&nbsp;&nbsp;</label>
                     <div class="layui-input-block">
@@ -447,34 +439,35 @@
                         <span id="ph" style="color:#cc5965"></span>
                     </div>
                     <div id="fuzzyQuerySelect"
-                         style="z-index:1;display:none;background-color:white; position: relative; width:333px;left:120px; border: 1px solid gray;">
+                         style="z-index:1;display:none;background-color:white; position: absolute; width:333px;left:120px; border: 1px solid gray;">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>客户编号：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>拥有统一社会信用代码：</label>
+                    <div class="layui-input-block">&nbsp;&nbsp;
+                        <form:radiobutton id="hasUscc" class="usccClass i-checks" path="hasUscc" value="1" label="是" checked="true" />
+                        &nbsp;&nbsp;
+                        <form:radiobutton id="hasUscc" class="usccClass i-checks" path="hasUscc" value="2" label="否" />
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7 companyType_uscCode">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>
                     <div class="layui-input-block">
-                        <form:input path="number" id="number" htmlEscape="false" class="form-control layui-input" readonly="true"/>
+                        <form:input path="uscCode" htmlEscape="false" id="uscCode"   class="form-control required isUscCode layui-input"/>
+                        <input type="hidden" id="oldUscCode" value="${workClientInfo.uscCode}"/>
+                        <span id="uscPh" style="color:#cc5965"></span>
                     </div>
                 </div>
-
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>客户性质：</label>
                     <div class="layui-input-block">
                         <form:select path="companyType" class="form-control simple-select required" id="companyType">
                             <form:option value="" label="--请选择客户性质--"/>
                             <form:options items="${fns:getMainDictList('company_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7 companyType_uscCode">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>
-                    <div class="layui-input-block">
-                        <form:input path="uscCode" htmlEscape="false" id="uscCode" class="form-control required isUscCode layui-input"/>
-                        <input type="hidden" id="oldUscCode" value="${workClientInfo.uscCode}"/>
-                        <span id="uscPh" style="color:#cc5965"></span>
-                    </div>
-                </div>
+
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>所在行业：</label>
                     <div class="layui-input-block">
@@ -485,12 +478,18 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>所在地区：</label>
-                    <div class="layui-input-block with-icon">
-                        <sys:treeselect id="area" name="area.id" value="${workClientInfo.area.id}" labelName="area.name"
-                                        labelValue="${workClientInfo.area.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control required layui-input"
-                                        allowClear="true" notAllowSelectParent="false"/>
+                    <label class="layui-form-label"><span class="require-item">*</span>客户类型：</label>
+                    <div class="layui-input-block">
+                        <form:select path="clientType" id="clientType" class="form-control simple-select required">
+                            <form:option value="" label="--请选择客户类型--"/>
+                            <form:options items="${fns:getMainDictList('client_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>代表单位：</label>
+                    <div class="layui-input-block">
+                        <div id="jobType" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -513,19 +512,10 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>客户类型：</label>
-                    <div class="layui-input-block">
-                        <form:select path="clientType" id="clientType" class="form-control simple-select required">
-                            <form:option value="" label="--请选择客户类型--"/>
-                            <form:options items="${fns:getMainDictList('client_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>公司电话：</label>
                     <div class="layui-input-block">
-                        <form:input path="telephone" id="telephone" htmlEscape="false"
-                                    class="form-control isTel required layui-input"/>
+                        <form:input path="telephone" id="telephone" htmlEscape="false" maxlength="11"
+                                    class="form-control isTel layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -535,17 +525,20 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>代表单位：</label>
-                    <div class="layui-input-block">
-                        <div id="jobType" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
+                    <label class="layui-form-label"><span class="require-item">*</span>所在地区：</label>
+                    <div class="layui-input-block with-icon">
+                        <sys:treeselect id="area" name="area.id" value="${workClientInfo.area.id}" labelName="area.name"
+                                        labelValue="${workClientInfo.area.name}"
+                                        title="区域" url="/sys/area/treeData" cssClass="form-control required layui-input"
+                                        allowClear="true" notAllowSelectParent="false"/>
                     </div>
                 </div>
 
                 <div class="layui-item layui-col-sm12 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>注册地址：</label>
+                    <label class="layui-form-label">注册地址：</label>
                     <div class="layui-input-block">
                         <form:input path="registerAddress" id="registerAddress" htmlEscape="false"
-                                    class="form-control required layui-input"/>
+                                    class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7">
@@ -607,6 +600,7 @@
             </div>
 
 
+
             <%--<td class="companyType_orUnicode width-15 active"><label class="pull-right"><font color="red">*</font>组织机构代码或税务号：</label></td>
             <td class="companyType_orUnicode width-35">
                 <form:input path="orUnicode" htmlEscape="false"  class="form-control required"/>
@@ -693,27 +687,27 @@
                                    </td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_name"
                                               name="workClientLinkmanList[${status.index + 1}].name" type="text"
-                                              value="${workClientLinkman.name}" readonly class="form-control required"/></td>
+                                              value="${workClientLinkman.name}" class="form-control required"/></td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_office"
                                               name="workClientLinkmanList[${status.index + 1}].office" type="text"
-                                              value="${workClientLinkman.office}" readonly class="form-control "/></td>
+                                              value="${workClientLinkman.office}" class="form-control "/></td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_position"
                                               name="workClientLinkmanList[${status.index + 1}].position" type="text"
-                                              value="${workClientLinkman.position}" readonly class="form-control "/></td>
+                                              value="${workClientLinkman.position}" class="form-control "/></td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_qq"
                                               name="workClientLinkmanList[${status.index + 1}].qq"
-                                              type="text" value="${workClientLinkman.qq}" readonly class="form-control digits"/>
+                                              type="text" value="${workClientLinkman.qq}" class="form-control digits"/>
                                    </td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_linkMobile"
                                               name="workClientLinkmanList[${status.index + 1}].linkMobile" type="text"
-                                              value="${workClientLinkman.linkMobile}" readonly class="form-control isPhone"/></td>
+                                              value="${workClientLinkman.linkMobile}" class="form-control isPhone"/></td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_linkPhone"
                                               name="workClientLinkmanList[${status.index + 1}].linkPhone" type="text"
-                                              value="${workClientLinkman.linkPhone}" readonly class="form-control isTel"/></td>
+                                              value="${workClientLinkman.linkPhone}" class="form-control isTel"/></td>
                                    <td><input id="workClientLinkmanList{{idx}}_email"
                                               name="workClientLinkmanList[${status.index + 1}].email" type="text"
                                               value="${workClientLinkman.email}"
-                                              class="form-control email" readonly/></td>
+                                              class="form-control email"/></td>
                                    <td class="text-center op-td">
                                     <span class="op-btn op-btn-delete"
                                           onclick="delRow(this, '#workClientLinkmanList${status.index + 1}')"

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -468,7 +468,7 @@
                         <form:input path="bankCard" htmlEscape="false" minlength="16" maxlength="19" class="form-control layui-input digits"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw7">i
                     <label class="layui-form-label">婚姻状况：</label>
                     <div class="layui-input-block">
                         <form:select path="marriage" class="form-control simple-select">