外部单位-样式调整

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -196,14 +196,16 @@ public class ActTaskController extends BaseController {
 						}else {
 							a.setAssigneeName(UserUtils.get(list.get(list.size()-1).getCreateBy().getId()).getName());
 						}
-						if (activityProcess.getProcessKey().equals("reject")){
-							a.setAssigneeName(UserUtils.get(activityProcess.getUpdateBy().getId()).getName());
-						}
 						if("销假申请".equals(activityProcess.getRemarks())||"续假申请".equals(activityProcess.getRemarks())){
 							a.setTaskName("开始");
 						}else{
 							a.setTaskName("重申|撤销");
 						}
+						if (activityProcess.getProcessKey().equals("reject")){
+							a.setTaskName("意见反馈");
+							a.setRoleName("意见反馈人");
+							a.setAssigneeName(UserUtils.get(activityProcess.getUpdateBy().getId()).getName());
+						}
 					}else if (activityProcess.getActivity().getUser()!=null && StringUtils.isNotBlank(activityProcess.getActivity().getUser().getId())){
 						String id = activityProcess.getActivity().getUser().getId();
 						if ("1".equals(id)){
@@ -356,6 +358,10 @@ public class ActTaskController extends BaseController {
 						}else if("wjbc".equals(role.getEnname()) && !activityProcess.getCreateBy().getId().equals(activityProcess.getUpdateBy().getId())){
 							a.setRoleName("提资需求补充人");
 							a.setAssigneeName(UserUtils.get(lists.get(lists.size() - 1).getUpdateBy().getId()).getName());
+						}else if("wjbc".equals(role.getEnname()) && activityProcess.getCreateBy().getId().equals(activityProcess.getUpdateBy().getId())){
+							a.setRoleName("提资需求补充人");
+						}else if("yjfk".equals(role.getEnname())){
+							a.setRoleName("意见反馈人");
 						}else {
 							if (role.getEnname().contains(buffer)){
 								SysRoleActivity r = systemService.getRoleActivityByEnname(role.getEnname());

src/main/java/com/jeeplus/modules/externalUnit/service/ExternalUnitFeedbackService.java

@@ -618,7 +618,7 @@ public class ExternalUnitFeedbackService extends CrudService<ExternalUnitFeedbac
                     str = "项目-"+feedback.getProject().getName()+"-发起人:"+userName+"意见反馈申请被驳回，请重新申请";
                     WorkProjectNotify notify = new WorkProjectNotify();
                     notify.setNotifyId(feedback.getId());
-                    notify.setAuditor(UserUtils.getUser().getId());
+//                    notify.setAuditor(UserUtils.getUser().getId());
                     userList = workProjectNotifyService.readByNotifyId(notify);
                     workProjectNotifyService
                             .save(UtilNotify

src/main/java/com/jeeplus/modules/externalUnit/web/ExternalUnitFeedbackController.java

@@ -196,12 +196,13 @@ public class ExternalUnitFeedbackController extends BaseController {
             feedback.setCompanyId(UserUtils.getSelectCompany().getId());
             feedback.setOfficeId(UserUtils.getSelectOffice().getId());
             feedbackService.saveBranch(feedback, variables,processInstanceId);
-
+            map.put("str","申请成功！");
         }catch (Exception e){
 
             logger.error("Exception e:"+e);
+            map.put("str","申请失败！");
         }
-        map.put("str","申请成功！");
+
         return map;
 
     }

src/main/webapp/webpage/modules/externalUnit/capitalDemandFormAdd.jsp

@@ -80,20 +80,24 @@
 						<form:input readonly="true" path="project.buildPlace" placeholder="请输入建设地点" htmlEscape="false"  class="form-control layui-input required"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">创建人：</label>
 					<div class="layui-input-block">
 						<form:input path="project.createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
 						<form:hidden path="project.createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label ">项目备注：</label>
 					<div class="layui-input-block">
-						<form:textarea disabled="true" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea disabled="true" cssStyle="background: #f1f1f1" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+
+			</div>
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>基本信息</h2></div>
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label"><span class="require-item">*</span>审核人：</label>
 					<div class="layui-input-block">
 						<form:select path="examiner" cssClass="form-control required judgment simple-select">
@@ -104,7 +108,7 @@
 						</form:select>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label "><span class="require-item">*</span>备注：</label>
 					<div class="layui-input-block">
 						<form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>

src/main/webapp/webpage/modules/externalUnit/capitalDemandFormAudit.jsp

@@ -156,29 +156,29 @@
 						<form:input readonly="true" path="project.buildPlace" placeholder="请输入建设地点" htmlEscape="false"  class="form-control layui-input required"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">创建人：</label>
 					<div class="layui-input-block">
 						<form:input path="project.createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
 						<form:hidden path="project.createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label ">项目备注：</label>
 					<div class="layui-input-block">
-						<form:textarea disabled="true" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea disabled="true" cssStyle="background: #f1f1f1" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+
+			</div>
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>基本信息</h2></div>
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label "><span class="require-item">*</span>备注：</label>
 					<div class="layui-input-block">
 						<form:textarea placeholder="请输入备注" readonly="true" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required judgment"/>
 					</div>
 				</div>
-
-
-			</div>
-			<div class="form-group layui-row first">
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">是否转办：</label>
 					<div class="layui-input-block">
@@ -187,7 +187,7 @@
 					</div>
 				</div>
 				<div id="zbr">
-					<div class="layui-item layui-col-sm6 lw7">
+					<div class="layui-item layui-col-sm6 lw6">
 
 						<label class="layui-form-label">转办人：</label>
 						<div class="layui-input-block">

src/main/webapp/webpage/modules/externalUnit/capitalDemandFormModify.jsp

@@ -79,20 +79,24 @@
 						<form:input readonly="true" path="project.buildPlace" placeholder="请输入建设地点" htmlEscape="false"  class="form-control layui-input required"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">创建人：</label>
 					<div class="layui-input-block">
 						<form:input path="project.createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
 						<form:hidden path="project.createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label ">项目备注：</label>
 					<div class="layui-input-block">
-						<form:textarea disabled="true" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea disabled="true" cssStyle="background: #f1f1f1" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+
+			</div>
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>基本信息</h2></div>
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label"><span class="require-item">*</span>审核人：</label>
 					<div class="layui-input-block">
 						<form:select path="examiner" cssClass="form-control simple-select required judgment">
@@ -103,7 +107,7 @@
 						</form:select>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label "><span class="require-item">*</span>备注：</label>
 					<div class="layui-input-block">
 						<form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required judgment"/>

src/main/webapp/webpage/modules/externalUnit/capitalDemandFormView.jsp

@@ -17,7 +17,11 @@
 	<script src="${ctxStatic}/layer-v2.3/layui/xmSelect.js" charset="utf-8"></script>
 
 
-
+	<style>
+		textarea[disabled] {
+			background-color: #f1f1f1; /* 浅灰色背景 */
+		}
+	</style>
 
 	<script type="text/javascript">
 		var validateForm;
@@ -154,27 +158,29 @@
 						<form:input readonly="true" path="project.buildPlace" placeholder="请输入建设地点" htmlEscape="false"  class="form-control layui-input required"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">创建人：</label>
 					<div class="layui-input-block">
 						<form:input path="project.createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
 						<form:hidden path="project.createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label ">项目备注：</label>
 					<div class="layui-input-block">
-						<form:textarea disabled="true" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea disabled="true" cssStyle="background: #f1f1f1"  placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control custom-textarea"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+
+			</div>
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>基本信息</h2></div>
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label "><span class="require-item">*</span>备注：</label>
 					<div class="layui-input-block">
-						<form:textarea placeholder="请输入备注" readonly="true" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required judgment"/>
+						<form:textarea  disabled="true" placeholder="请输入备注" readonly="true" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required judgment"/>
 					</div>
 				</div>
-
-
 			</div>
 			<div class="form-group-label"><h2>文件管理</h2></div>
 			<div class="layui-item nav-btns">

src/main/webapp/webpage/modules/externalUnit/externalUnitCapitalDemandList.jsp

@@ -343,6 +343,7 @@
 					,"createName":"${demand.createBy.name}"
 					,"status":"${demand.status}"
 					,"remarks":"${demand.remarks}"
+					,"procId":"${demand.processInstanceId}"
 					,"projectName":"<c:out value="${demand.project.name}" escapeXml="true"/>"
 					,"packTime":"<fmt:formatDate value="${demand.createDate}" pattern="yyyy-MM-dd"/>"
 					<c:choose><c:when test="${flag == '1' or fns:getUser().id == demand.createBy.id}">

src/main/webapp/webpage/modules/externalUnit/externalUnitFeedbackList.jsp

@@ -111,6 +111,54 @@
 			});
 
 		}
+		function openDialog(title,url,width,height,target,formId,tableId){
+			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,
+				maxmin: false, //开启最大化最小化按钮
+				content: url ,
+				skin:"two-btns",
+				btn: ['送审','关闭'],
+				btn1: 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}/externalUnit/feedback/saveAudit");//表单提交成功后，从服务器返回的url在当前tab中展示--%>
+					<%--var $document = iframeWin.contentWindow.document;--%>
+
+					<%--formSubmit2($document,formId,index,tableId);--%>
+					if(iframeWin.contentWindow.doSubmit(2) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){
+							top.layer.close(index)
+							setTimeout(function(){
+								$("#searchForm").resetForm();
+							}, 100);
+						}, 100);//延时0.1秒，对应360 7.1版本bug
+
+					}else {
+						return false;
+					}
+				},
+				btn3: function(index){
+				}
+			});
+
+		}
 		function formSubmit2($document,inputForm,index,tableId){
 
 			var validateForm = $($document.getElementById(inputForm)).validate({
@@ -314,13 +362,14 @@
 					,"projectId":"${feedback.projectId}"
 					,"createName":"${feedback.createBy.name}"
 					,"status":"${feedback.status}"
+					,"procId":"${feedback.processInstanceId}"
 					,"remarks":"${feedback.remarks}"
 					,"projectName":"<c:out value="${feedback.project.name}" escapeXml="true"/>"
 					,"packTime":"<fmt:formatDate value="${feedback.createDate}" pattern="yyyy-MM-dd"/>"
 					<c:choose><c:when test="${flag == '1' or fns:getUser().id == feedback.createBy.id}">
 					,"candel":	<c:choose><c:when test="${(feedback.status == 1 || feedback.status == 3) && fns:getUser().id == feedback.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-					<c:if test="${(feedback.status == 1) && fns:getUser().id == feedback.createBy.id}">,"canedit":"1"</c:if>
-					<c:if test="${(feedback.status == 3 or feedback.status == 4) && fns:getUser().id == feedback.createBy.id}">,"canedits":"1"</c:if>
+					<c:if test="${(feedback.status == 3 or feedback.status == 1) && fns:getUser().id == feedback.createBy.id}">,"canedit":"1"</c:if>
+					<c:if test="${(feedback.status == 4) && fns:getUser().id == feedback.createBy.id}">,"canedits":"1"</c:if>
 					,"cancancel":<c:choose><c:when test="${feedback.status == 2 && fns:getUser().id == feedback.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					</c:when>
 					<c:otherwise>

src/main/webapp/webpage/modules/externalUnit/feedbackFormAdd.jsp

@@ -115,26 +115,30 @@
 						<form:input readonly="true" path="project.buildPlace" placeholder="请输入建设地点" htmlEscape="false"  class="form-control layui-input "/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">创建人：</label>
 					<div class="layui-input-block">
 						<form:input path="project.createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
 						<form:hidden path="project.createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label ">备注：</label>
 					<div class="layui-input-block">
-						<form:textarea disabled="true" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea disabled="true" cssStyle="background: #f1f1f1" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+
+			</div>
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>基本信息</h2></div>
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label"><span class="require-item">*</span>审核人：</label>
 					<div class="layui-input-block">
 						<div id="shr" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label ">备注：</label>
 					<div class="layui-input-block">
 						<form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>

src/main/webapp/webpage/modules/externalUnit/feedbackFormAudit.jsp

@@ -115,26 +115,29 @@
 						<form:input readonly="true" path="project.buildPlace" placeholder="请输入建设地点" htmlEscape="false"  class="form-control layui-input "/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">创建人：</label>
 					<div class="layui-input-block">
 						<form:input path="project.createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
 						<form:hidden path="project.createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label ">备注：</label>
 					<div class="layui-input-block">
-						<form:textarea disabled="true" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea disabled="true" cssStyle="background: #f1f1f1" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+			</div>
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>基本信息</h2></div>
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label"><span class="require-item">*</span>审核人：</label>
 					<div class="layui-input-block">
 						<div id="shr" style="pointer-events: none; background-color: #fff" class="xm-select-demo" tabindex="0"  contenteditable="true"></div>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label ">备注：</label>
 					<div class="layui-input-block">
 						<form:textarea readonly="true" placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>

src/main/webapp/webpage/modules/externalUnit/feedbackFormModify.jsp

@@ -115,33 +115,36 @@
 						<form:input readonly="true" path="project.buildPlace" placeholder="请输入建设地点" htmlEscape="false"  class="form-control layui-input "/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">创建人：</label>
 					<div class="layui-input-block">
 						<form:input path="project.createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
 						<form:hidden path="project.createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label ">备注：</label>
 					<div class="layui-input-block">
-						<form:textarea disabled="true" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea disabled="true" cssStyle="background: #f1f1f1" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+			</div>
+			<div  class="form-group layui-row first">
+				<div class="form-group-label"><h2>基本信息</h2></div>
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label"><span class="require-item">*</span>审核人：</label>
 					<div class="layui-input-block">
 						<div id="shr" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label ">备注：</label>
 					<div class="layui-input-block">
 						<form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</div>
 				</div>
 				<c:if test="${feedback.status == '4'}">
-					<div class="layui-item layui-col-sm12 lw7 with-textarea">
+					<div class="layui-item layui-col-sm12 lw6 with-textarea">
 						<label class="layui-form-label ">驳回意见：</label>
 						<div class="layui-input-block">
 							<form:textarea placeholder="请输入驳回意见" readonly="true" path="applyView" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
@@ -149,11 +152,13 @@
 					</div>
 				</c:if>
 			</div>
+
 			<div class="form-group-label"><h2>文件管理</h2></div>
 			<div class="layui-item nav-btns">
 				<a id="attachment_btn_conciliationRecords" class="nav-btn nav-btn-add" title="上传文件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
 
 			</div>
+
 			<div id="addFile_exterFeedback" style="display: none" class="upload-progress">
 				<span id="fileName_exterFeedback"></span>
 				<b><span id="baifenbi_exterFeedback"></span></b>

src/main/webapp/webpage/modules/externalUnit/feedbackFormView.jsp

@@ -112,26 +112,30 @@
 						<form:input readonly="true" path="project.buildPlace" placeholder="请输入建设地点" htmlEscape="false"  class="form-control layui-input "/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">创建人：</label>
 					<div class="layui-input-block">
 						<form:input path="project.createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
 						<form:hidden path="project.createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label ">备注：</label>
 					<div class="layui-input-block">
-						<form:textarea disabled="true" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea disabled="true" cssStyle="background: #f1f1f1" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+
+			</div>
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>基本信息</h2></div>
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label"><span class="require-item">*</span>审核人：</label>
 					<div class="layui-input-block">
 						<div id="shr" style="pointer-events: none; background-color: #fff" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label ">备注：</label>
 					<div class="layui-input-block">
 						<form:textarea disabled="true" placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>