合同信息调整

src/main/java/com/jeeplus/modules/serialnum/service/SerialNumTplService.java

@@ -147,6 +147,60 @@ public class SerialNumTplService extends CrudService<SerialNumTplDao, SerialNumT
         }
 	}
 
+    @Transactional(readOnly = false,propagation = Propagation.REQUIRES_NEW)
+    public String genSerialNumNotNum(Office company, String bizCode) throws SerialGenException {
+        try {
+            String branchOffice = UserUtils.getSelectOffice().getBranchOffice();
+            if(StringUtils.isNotBlank(branchOffice)){
+                company = officeService.get(branchOffice);
+            }
+            if (company==null||StringUtils.isBlank(company.getId())){
+                throw new Exception("生成编号失败，公司信息不能为空");
+            }
+            Office office = officeService.get(company.getId());
+            if (StringUtils.isBlank(bizCode)){
+                throw new Exception("生成编号失败，业务类型不能为空");
+            }
+
+            SerialNumTpl numTpl = this.querySerialTpl(office, bizCode);
+            if (numTpl==null){
+//			    查询编号模板   {brspnm}DZ-{year}-{serialNum}
+                SerialNumTpl serialNumTpl = dao.queryByComAndBizCode("0", bizCode);
+                serialNumTpl.setCompany(company);
+                serialNumTpl.setSerialNum(0);
+                serialNumTpl.setId("");
+                serialNumTpl.setCreateBy(new User(UserUtils.getSelectCompany().getMaster()));
+                serialNumTpl.setId(IdGen.uuid());
+                dao.insert(serialNumTpl);
+                numTpl = serialNumTpl;
+            }
+            if (numTpl==null){
+                throw new Exception("生成编号失败，请先设置相关业务编号模板");
+            }
+            if ("0".equals(office.getParent().getId()))
+                office.setParent(null);
+            String year = DateUtils.formatDate(new Date(), "yyyy");
+            if(!year.equals(numTpl.getYearBuilt())){
+                dao.resetSerialNum(numTpl.getId(),numTpl.getYearBuilt(),year);
+            }
+            Map<String, String> map = new HashMap<>();
+            String serialTpl = numTpl.getSerialTpl();
+            int i =dao.updateSerialNum(numTpl);
+            if (i!=1){
+                throw new Exception("生成编号失败，请稍后重试");
+            }
+            String companyShortname = UserUtils.getSysParam("company_shortname", UserUtils.getUser());
+            map.put("spnm",StringUtils.isBlank(companyShortname)?"":companyShortname);
+            String branchShortname = UserUtils.getSysParam("branch_shortname", UserUtils.getUser());
+            map.put("brspnm", StringUtils.isBlank(branchShortname)?"":branchShortname);
+            map.put("year",year);
+            String serNum = StringUtils.renderString(serialTpl, map);
+            return serNum;
+        } catch (Exception e) {
+            throw  new SerialGenException(e.getMessage());
+        }
+    }
+
     private SerialNumTpl querySerialTpl(Office company, String bizCode) {
         SerialNumTpl numTpl = dao.queryByComAndBizCode(company.getId(), bizCode);
         if (numTpl==null&&company.getParent()!=null&&company.getParent().getId()!=null&&!"0".equals(company.getParent().getId())){

src/main/java/com/jeeplus/modules/workcontractinfo/dao/WorkContractInfoDao.java

@@ -62,4 +62,11 @@ public interface WorkContractInfoDao extends CrudDao<WorkContractInfo> {
     int countByOffice(String officeId);
 
     int updateStatus(WorkContractInfo workContractInfo);
+
+    /**
+     * 根据当前合同编号查询对应最后一条合同编号条数
+     * @param contractNum
+     * @return
+     */
+    String getContractLastNum(String contractNum);
 }

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -125,6 +125,9 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	private String opinion;   //判断
 	private String flagAdmin;   //判断admin
 	private String createUser;   //创建者信息
+	private List<String> chargeCriterionList;   //收费标准
+	private String chargeCriterion;   //收费标准Str
+	private String otherDetails;   //其他详情
 
 	public String getBeginInvestmentAmount() {
 		return beginInvestmentAmount;
@@ -936,4 +939,28 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setCreateUser(String createUser) {
 		this.createUser = createUser;
 	}
+
+	public List<String> getChargeCriterionList() {
+		return chargeCriterionList;
+	}
+
+	public void setChargeCriterionList(List<String> chargeCriterionList) {
+		this.chargeCriterionList = chargeCriterionList;
+	}
+
+	public String getOtherDetails() {
+		return otherDetails;
+	}
+
+	public void setOtherDetails(String otherDetails) {
+		this.otherDetails = otherDetails;
+	}
+
+	public String getChargeCriterion() {
+		return chargeCriterion;
+	}
+
+	public void setChargeCriterion(String chargeCriterion) {
+		this.chargeCriterion = chargeCriterion;
+	}
 }

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -522,6 +522,10 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 
 	@Transactional(readOnly = false)
 	public void save(WorkContractInfo workContractInfo) {
+		if(null != workContractInfo.getChargeCriterionList() && workContractInfo.getChargeCriterionList().size()>0){
+			String chargeCriterion = String.join(",", workContractInfo.getChargeCriterionList());
+			workContractInfo.setChargeCriterion(chargeCriterion);
+		}
 		super.save(workContractInfo);
 		for (WorkClientAttachment workClientAttachment : workContractInfo.getWorkAttachments()){
 			if (workClientAttachment.getId() == null){
@@ -606,7 +610,18 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			}
 		}
 		if (StringUtils.isBlank(workContractInfo.getContractNum())) {
-			workContractInfo.setContractNum(serialNumTplService.genSerialNum(UserUtils.get(workContractInfo.getCreateBy().getId()).getCompany(), WorkContractInfo.SERIAL_BIZCODE).replace("TYPE",contractType));
+			workContractInfo.setContractNum(serialNumTplService.genSerialNumNotNum(UserUtils.get(workContractInfo.getCreateBy().getId()).getCompany(), WorkContractInfo.SERIAL_BIZCODE).replace("TYPE",contractType));
+			//根据当前合同编号查询对应最后一条合同编号
+			String contractLastNumStr = dao.getContractLastNum(workContractInfo.getContractNum());
+			if(StringUtils.isNotBlank(contractLastNumStr)) {
+				//获取最新的后缀编号
+				Integer num = Integer.parseInt(contractLastNumStr.substring(workContractInfo.getContractNum().length(), contractLastNumStr.length())) + 1;
+				//更新合同编号
+				workContractInfo.setContractNum(workContractInfo.getContractNum() + String.format("%04d", num));
+			}else {
+				//更新合同编号
+				workContractInfo.setContractNum(workContractInfo.getContractNum() + String.format("%04d", 1));
+			}
 			long end2 = System.currentTimeMillis();
 			logger.info("合同送审-项目编码设置任务结束，共耗时：[" + (end2-begin) / 1000 + "]秒");
 		}
@@ -626,7 +641,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		}
 		workContractInfo.setContractState("2");
 		this.save(workContractInfo);
-		Office office = officeService.get(workContractInfo.getChargeCompany());
+		Office office = UserUtils.getUser().getOffice();
 		String str = "合同申请人：" + UserUtils.get(workContractInfo.getCreateBy().getId()).getName() + ",主委托方：" + workContractInfo.getClient().getName() + ",合同所属部门:"+office.getName();
 		String title = "合同名称:"+workContractInfo.getName();
 		identityService.setAuthenticatedUserId(workContractInfo.getCreateBy().getId());
@@ -881,7 +896,14 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 	 */
 	@Transactional(readOnly = false)
 	public String auditSave(WorkContractInfo workContractInfo,String [] status,List<User> auditUsers){
-		Office office = officeService.get(workContractInfo.getChargeCompany());
+		//判断收费标准是否存在
+		if(null!= workContractInfo.getChargeCriterionList() && workContractInfo.getChargeCriterionList().size()>0){
+			String chargeCriterion = String.join(",", workContractInfo.getChargeCriterionList());
+			workContractInfo.setChargeCriterion(chargeCriterion);
+		}
+
+		//Office office = officeService.get(workContractInfo.getChargeCompany());
+		Office office = UserUtils.getUser().getOffice();
 		String str = "合同申请人：" + UserUtils.get(workContractInfo.getCreateBy().getId()).getName() + ",主委托方：" + workContractInfo.getClient().getName() + ",合同所属部门:"+office.getName();
 		String title = "合同名称:"+workContractInfo.getName();
 		// 对不同环节的业务逻辑进行操作

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -399,7 +399,9 @@ public class WorkContractInfoController extends BaseController {
             workContractInfo.setChargeCompanyName(office.getTopCompany());
             workContractInfo.setRecordState("1");
         }
-
+        if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
+            workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
+        }
         model.addAttribute("workContractInfo", workContractInfo);
         return "modules/workcontractinfo/" + view;
     }
@@ -719,6 +721,9 @@ public class WorkContractInfoController extends BaseController {
            WorkBidProject workBidProject = workBidProjectService.get(workContractInfo.getProject().getId());
            workContractInfo.setProject(workBidProject);
        }
+        if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
+            workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
+        }
         //合同作废信息
         AlterInfo alterInfo = alterInfoService.getByContractInfo(workContractInfo);
         model.addAttribute("alterInfo",alterInfo);
@@ -952,9 +957,11 @@ public class WorkContractInfoController extends BaseController {
             workContractInfoService.save(t);//保存
             workContractInfoService.updateWorkContractInfo(workContractInfo);
             WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
-            workContractReview.setWorkAttachments(list2);
-            workContractReview.setContractName(workContractInfo.getName());
-            workContractReviewService.save(workContractReview);
+            if(workContractReview != null){
+                workContractReview.setWorkAttachments(list2);
+                workContractReview.setContractName(workContractInfo.getName());
+                workContractReviewService.save(workContractReview);
+            }
             addMessage(redirectAttributes, "暂存合同管理成功");
             return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
         }else{//新增表单保存
@@ -1105,7 +1112,7 @@ public class WorkContractInfoController extends BaseController {
     @RequestMapping(value = "delete")
     public String delete(WorkContractInfo workContractInfo, RedirectAttributes redirectAttributes) {
         workContractInfoService.delete(workContractInfo);
-        WorkProjectNotify notify = new WorkProjectNotify();
+        /*WorkProjectNotify notify = new WorkProjectNotify();
         notify.setNotifyId(workContractInfo.getId());
         workProjectNotifyService.readByNotifyId(notify);
         if (workContractInfo.getWorkAttachments().size() > 0) {
@@ -1122,8 +1129,8 @@ public class WorkContractInfoController extends BaseController {
             }
             String s = file.split(cons + "/")[1];
             workContractInfoService.deleteFile(s, workContractInfo.getId());
-        }
-        addMessage(redirectAttributes, "删除合同管理成功");
+        }*/
+        addMessage(redirectAttributes, "作废合同管理成功");
         return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
     }
     /**
@@ -1468,8 +1475,8 @@ public class WorkContractInfoController extends BaseController {
             List<User> users = null;
             if ("bmzr".equals(taskDefKey)){
                 users = UserUtils.getByProssType(workContractInfo.getProcessInstanceId(),2);
-                if (users==null )
-                    users = UserUtils.getByRoleActivityEnname("scyfglbzr",1,workContractInfo.getChargeCompany(),"2",workContractInfo.getCreateBy());
+                /*if (users==null )
+                    users = UserUtils.getByRoleActivityEnname("scyfglbzr",1,workContractInfo.getChargeCompany(),"2",workContractInfo.getCreateBy());*/
             }else if ("modifyApply".equals(taskDefKey)){
                 users = UserUtils.getByProssType(workContractInfo.getProcessInstanceId(),1);
             }

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

@@ -910,6 +910,9 @@ public class WorkProjectNotifyController extends BaseController {
 
 				} else if (workProjectNotify.getType().equals("16")) {    //合同管理
 					WorkContractInfo workContractInfo = workContractInfoService.get(workProjectNotify.getNotifyId());
+					if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
+						workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
+					}
 					workContractInfo.setHome("home");
 					workContractInfo.setAct(getByAct(workContractInfo.getProcessInstanceId()));
 					model.addAttribute("workContractInfo", workContractInfo);

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

@@ -130,7 +130,9 @@
 		a.completion_status AS "completionStatus",
 		a.common_flag AS "commonFlag",
 		a.office_id AS "officeId",
-		a.signature_status as "signatureStatus"
+		a.signature_status as "signatureStatus",
+		a.charge_criterion as "chargeCriterion",
+		a.other_details as "otherDetails"
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		WHERE a.id = #{id}
@@ -248,6 +250,8 @@
 		a.completion_status AS "completionStatus",
 		a.common_flag AS "commonFlag",
 		a.signature_status as "signatureStatus",
+		a.charge_criterion as "chargeCriterion",
+		a.other_details as "otherDetails",
 		ifnull(wcr.status,0) as "contrractRecordStatus",
 		ifnull(wcr.file_num,"") as "recordNum",
 		wcr.id as "contrractRecordId"
@@ -884,7 +888,9 @@
 			completion_status,
 			sort,
 			signature_status,
-			contract_num_path
+			contract_num_path,
+			charge_criterion,
+			other_details
 		) VALUES (
 			#{id},
 			#{project.id},
@@ -939,7 +945,9 @@
 			#{completionStatus},
 			#{sort},
 			#{signatureStatus},
-			#{contractNumPath}
+			#{contractNumPath},
+			#{chargeCriterion},
+			#{otherDetails}
 		)
 	</insert>
 	
@@ -993,7 +1001,9 @@
 			completion_status = #{completionStatus},
 			sort = #{sort},
 			signature_status=#{signatureStatus},
-			contract_num_path=#{contractNumPath}
+			contract_num_path=#{contractNumPath},
+			charge_criterion=#{chargeCriterion},
+			other_details=#{otherDetails}
 
 		WHERE id = #{id}
 	</update>
@@ -1012,7 +1022,8 @@
 	</update>
 	<!--物理删除-->
 	<update id="delete">
-		DELETE FROM work_contract_info
+		UPDATE work_contract_info SET
+			contract_state = 7
 		WHERE id = #{id}
 	</update>
 	
@@ -1257,4 +1268,8 @@
 		WHERE id = #{id}
 	</update>
 
+	<select id="getContractLastNum" resultType="java.lang.String">
+		select MAX(contract_num) from work_contract_info where contract_num like concat(#{contractNum},'%')
+	</select>
+
 </mapper>

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

@@ -403,15 +403,8 @@ function getAuditContractState(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 "6":result.label = "discarding";result.status="作废中";break;
-        case "7":result.label = "discarded";result.status="已作废";break;
-        case "8":result.label = "changing";result.status="变更中";break;
-        case "9":result.label = "changing";result.status="完成中";break;
-        case "10":result.label = "signed";result.status="已完成";break;
-        case "11":result.label = "changing";result.status="签章中";break;
-        case "12":result.label = "changing";result.status="拒签";break;
-        case "14":result.label = "changing";result.status="归档中";break;
+        case "5":result.label = "signed";result.status="登记完成";break;
+        case "7":result.label = "discarded";result.status="作废";result.action = false;break;
 
         default:
             result.label = "unknown";result.status="未知";break;

src/main/webapp/webpage/modules/workcontractinfo/workContractAudit.jsp

@@ -4,6 +4,8 @@
 <head>
 	<title>合同管理审批</title>
 	<meta name="decorator" content="default"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script type="text/javascript">
         var validateForm;
         function doSubmit(obj){
@@ -43,7 +45,7 @@
 <div class="single-form">
 	<div class="container">
 
-			<form:form id="inputForm" modelAttribute="workContractInfo" enctype="multipart/form-data" action="${ctx}/workcontractinfo/workContractInfo/saveAudit" method="post" class="form-horizontal">
+			<form:form id="inputForm" modelAttribute="workContractInfo" enctype="multipart/form-data" action="${ctx}/workcontractinfo/workContractInfo/saveAudit" method="post" class="form-horizontal layui-form">
 				<form:hidden path="id"/>
 			<form:hidden path="home"/>
 				<form:hidden path="act.taskId"/>
@@ -55,222 +57,95 @@
 
 				<c:set var="status" value="${workContractInfo.act.status}" />
 				<div class="tabs-container" style="margin-top: 20px;">
-					<%--<ul class="nav nav-tabs">
-                        <div class="layui-tab" id="tabDiv">
-                            <ul class="layui-tab-title" >
-                                <li class="active"><a data-toggle="tab" href="#tab-11"  aria-expanded="true">合同信息</a></li>
-&lt;%&ndash;                                <li ><a data-toggle="tab" href="#tab-22"  aria-expanded="false">合同评审信息</a></li>&ndash;%&gt;
-                            </ul>
-                        </div>
-					</ul>--%>
 					<div class="tab-content">
 						<div id="tab-11" class="tab-pane active">
 							<div class="form-group layui-row first lw9">
 								<div class="form-group-label"><h2>项目合同信息</h2></div>
-								<%--<c:if test="${workContractInfo.ext == 0}">
-									<div class="layui-item layui-col-sm6">
-										<label class="layui-form-label">合同来源：</label>
-										<div class="layui-input-block">
-											<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="投标项目"/>
-										</div>
-									</div>
-                                    <div class="layui-item layui-col-sm6">
-                                        <label class="layui-form-label lw9">合同编号：</label>
-                                        <div class="layui-input-block">
-                                            <div class="input-group">
-                                                <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.contractNum}"/>
-                                                <span class="input-group-btn">
-											<label class="form-status"><c:choose><c:when test="${ empty workContractInfo.contractState}">新添</c:when><c:otherwise>${fns:getDictLabel(workContractInfo.contractState, 'audit_completion_state','')}</c:otherwise>	</c:choose></label>
-										</span>
-                                            </div>
-                                        </div>
-                                    </div>
-									<div class="layui-item layui-col-sm6">
-										<label class="layui-form-label">投标项目：</label>
-										<div class="layui-input-block">
-											<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.project.projectName}"/>
-										</div>
-									</div>
-								</c:if>--%>
-								<c:if test="${workContractInfo.ext != 0}">
-									<%--<div class="layui-item layui-col-sm6">
-										<label class="layui-form-label">合同来源：</label>
-										<div class="layui-input-block">
-											<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="非投标项目"/>
-										</div>
-									</div>--%>
-                                    <div class="layui-item layui-col-sm6">
-                                        <label class="layui-form-label lw9">合同编号：</label>
-                                        <div class="layui-input-block">
-                                            <div class="input-group">
-                                                <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.contractNum}"/>
-                                                <span class="input-group-btn">
-											<label class="form-status"><c:choose><c:when test="${ empty workContractInfo.contractState}">新添</c:when><c:otherwise>${fns:getDictLabel(workContractInfo.contractState, 'audit_completion_state','')}</c:otherwise>	</c:choose></label>
-										</span>
-                                            </div>
-                                        </div>
-                                    </div>
-								</c:if>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label lw9">合同名称：</label>
-                                    <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.name}"/>
-                                    </div>
-                                </div>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label lw9">总合同名称：</label>
-                                    <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.totalContractName}"/>
-                                    </div>
-                                </div>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label lw9">所属部门：</label>
-                                    <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.chargeCompanyName}"/>
-                                    </div>
-                                </div>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label double-line"><span class="require-item">*</span>合 同 金 额 (元)预计金额：</label>
-                                    <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractInfo.contractPrice}" pattern="#,#00.00"/>"/>
-                                    </div>
-                                </div>
 
                                 <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label lw9">工程分类：</label>
+                                    <label class="layui-form-label ">客户名称：</label>
                                     <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractInfo.contractType, 'contract_type', '')}"/>
+                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
                                     </div>
                                 </div>
                                 <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label lw9">委托方：</label>
+                                    <label class="layui-form-label ">合同名称：</label>
                                     <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
+                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.name}"/>
                                     </div>
                                 </div>
+
                                 <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label lw9">签订日期：</label>
+                                    <label class="layui-form-label "><span class="require-item">*</span>签订日期：</label>
                                     <div class="layui-input-block">
                                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy年MM月dd日"/>"/>
                                     </div>
                                 </div>
                                 <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label lw9">合同生效日期：</label>
+                                    <label class="layui-form-label ">合同生效日期：</label>
                                     <div class="layui-input-block">
                                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.effectiveDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
                                     </div>
                                 </div>
                                 <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label lw9">合同终止日期：</label>
+                                    <label class="layui-form-label ">合同终止日期：</label>
                                     <div class="layui-input-block">
                                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.closingDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
                                     </div>
                                 </div>
                                 <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label lw9">对方合同编号：</label>
+                                    <label class="layui-form-label ">合同类型：</label>
                                     <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.anotherContractNum}"/>
+                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
                                     </div>
                                 </div>
                                 <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label  double-linelw9">工程投资额(万元)：</label>
+                                    <label class="layui-form-label double-line">合同金额(元)预计金额：</label>
                                     <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractInfo.investmentAmount}" pattern="#,#00.00"/>"/>
+                                        <input htmlEscape="false" id="contractPrice" readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractInfo.contractPrice}" pattern="#,#00.00"/>"/>
                                     </div>
+                                    <shiro:hasPermission name="workcontractinfo:workContractInfo:contractPrice">
+                                        <c:if test="${fns:getUser().office.id eq workContractInfo.officeId && workContractInfo.contractState < 10}">
+                                            <a onclick="openDialogre('修改合同金额', '${ctx}/workcontractinfo/workContractInfo/formContractPrice?id=${workContractInfo.id}','50%','300px',false,'inputForm')", class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-edit"></i> 修改</a>
+                                        </c:if>
+                                    </shiro:hasPermission>
                                 </div>
                                 <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label ">合同类型：</label>
+                                    <label class="layui-form-label ">对方合同编号：</label>
                                     <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.anotherContractNum}"/>
                                     </div>
                                 </div>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label ">创建时间：</label>
+                                <div class="layui-item layui-col-sm12">
+                                    <label class="layui-form-label">收费标准</label>
                                     <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.createDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
+                                        <form:checkboxes path="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
                                     </div>
                                 </div>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label lw9">归档状态：</label>
+                                <div class="layui-item layui-col-sm12">
+                                    <label class="layui-form-label ">其他详情：</label>
                                     <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getDictLabel(workContractInfo.recordState, 'record_state','')}"/>
+                                        <form:input path="otherDetails" readonly="true" htmlEscape="false" class="form-control layui-input"/>
                                     </div>
                                 </div>
-                                <div class="layui-item layui-col-sm12 with-textarea">
-                                    <label class="layui-form-label">付款摘要：</label>
+                                <%--<div class="layui-item layui-col-sm6">
+                                    <label class="layui-form-label ">创建时间：</label>
                                     <div class="layui-input-block">
-                                        <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.summaryPayment}</textarea>
+                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.createDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
                                     </div>
-                                </div>
+                                </div>--%>
                                 <div class="layui-item layui-col-sm12 with-textarea">
                                     <label class="layui-form-label">合同特别条款：</label>
                                     <div class="layui-input-block">
                                         <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.contractSpecial}</textarea>
                                     </div>
                                 </div>
-                               <%-- <div class="layui-item layui-col-sm12 with-textarea">
-                                    <label class="layui-form-label">合同类型说明：</label>
-                                    <div class="layui-input-block">
-                                        <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.contractTypeDoc}</textarea>
-                                    </div>
-                                </div>--%>
                                 <div class="layui-item layui-col-sm12 with-textarea">
                                     <label class="layui-form-label">备注：</label>
                                     <div class="layui-input-block">
                                         <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.remarks}</textarea>
                                     </div>
                                 </div>
-                                <%--<div class="layui-item layui-col-sm12 with-textarea">
-                                    <label class="layui-form-label">变更原因：</label>
-                                    <div class="layui-input-block">
-                                        <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.contractCategory}</textarea>
-                                    </div>
-                                </div>--%>
-                            </div>
-                            <div class="form-group layui-row">
-                                <div class="form-group-label"><h2>委托方列表</h2></div>
-                                <div class="layui-item layui-col-xs12 form-table-container" >
-                                    <table id="contentTable4" class="table table-bordered table-condensed no-bottom-margin details">
-                                        <thead>
-                                        <tr>
-                                            <th width="30%">委托方名称</th>
-                                            <th width="20%">客户性质</th>
-                                            <th width="20%">所属行业</th>
-                                            <th width="30%">所属地区</th>
-                                        </tr>
-                                        </thead>
-                                        <tbody id="workClientInfoList">
-                                        <c:if test="${not empty workContractInfo.workClientInfoList}">
-                                            <c:forEach items="${workContractInfo.workClientInfoList}" var="casePeopleNorm" varStatus="index">
-                                                <tr id="workClientInfoList${index.index}">
-                                                    <td class="hide">
-                                                        <input id="workClientInfoList${index.index}_id" name="workClientInfoList[${index.index}].id" type="hidden" value="${casePeopleNorm.id}"/>
-                                                    </td>
-                                                    <td>
-                                                            <%--<input id="workClientInfoList${index.index}_name" name="workClientInfoList[${index.index}].name" type="text" value="${casePeopleNorm.name}" readonly="true"   class="form-control "/>--%>
-                                                            ${casePeopleNorm.name}
-                                                    </td>
-                                                    <td>
-
-                                                            ${fns:getMainDictLabel(casePeopleNorm.companyType, 'company_type', '')}
-                                                    </td>
-                                                    <td>
-                                                            <%--<form:select id="workClientInfoList${index.index}_companyIndustry" path="workClientInfoList[${index.index}].companyIndustry" disabled="true" readonly="true" class="form-control">
-                                                                <form:option value="" label=""/>
-                                                                <form:options items="${fns:getMainDictList('company_industry')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                                            </form:select>--%>
-                                                            ${fns:getMainDictLabel(casePeopleNorm.companyIndustry, 'company_industry', '')}
-                                                    </td>
-                                                    <td>
-                                                            <%--<input id="workClientInfoList${index.index}_area" name="workClientInfoList[${index.index}].area.name" type="text" value="${casePeopleNorm.area.name}"  readonly="true"  class="form-control "/>--%>
-                                                            ${casePeopleNorm.area.name}
-                                                    </td>
-                                                </tr>
-                                            </c:forEach>
-                                        </c:if>
-                                        </tbody>
-                                    </table>
-                                </div>
                             </div>
                             <div class="form-group layui-row">
                                 <div class="form-group-label"><h2>合同附件表</h2></div>
@@ -354,6 +229,12 @@
             </div>
         </div>
     </div>
+    <script>
+        layui.use('form', function () {
+            var form = layui.form;
+            form.render();
+        });
+    </script>
 </div>
 </body>
 </html>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormAdd.jsp

@@ -4,6 +4,8 @@
 <head>
 	<title>合同管理管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
 	<style>
 		label.error{
@@ -16,8 +18,12 @@
         var count = 0;
         function doSubmit(obj){
             $("#contractPrice").val($("#contractPrice").val().replace(/\,/g, ""));
-            $("#investmentAmount").val($("#investmentAmount").val().replace(/\,/g, ""));
+            //$("#investmentAmount").val($("#investmentAmount").val().replace(/\,/g, ""));
             // 回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+			if($("#contractTypeDoc").val() == ""){
+				parent.layer.msg("请选择合同类型!", {icon: 5});
+				return false;
+			}
             if(validateForm.form()){
                 if(obj == 1){
                     //送审
@@ -45,6 +51,13 @@
             return false;
         }
         $(document).ready(function() {
+			var chargeCriterionH = $("#chargeCriterionH").val();
+			if(chargeCriterionH.indexOf("4")!=-1){
+				document.getElementById("otherDetails").readOnly=false
+			}else{
+				document.getElementById("otherDetails").readOnly=true
+				$("#otherDetails").val("");
+			}
             if($("#createDate").val()==null || $("#createDate").val()==''){
                 $("#createDate").val(getNowFormatDate());
             }
@@ -161,10 +174,10 @@
 
             var clientId = $("#clientId").val();
             console.log(id.val()+"-----------"+clientId);
-            if(id.val() == clientId){
+            /*if(id.val() == clientId){
 				top.layer.msg("委托方不允许删除",{icon:2});
                 return;
-            }
+            }*/
             if (id.val() == "") {
                 $(obj).parent().parent().remove();
             } else if (delFlag.val() == "0") {
@@ -428,7 +441,7 @@
                     //自动计算出结果并填充在相应的输入框中
                     var size = $("#workClientInfoList tr").length+count;
                     if(size == 0){
-                        addRow('#workClientInfoList', workClientInfoListRowIdx, workClientInfoListTpl);workClientInfoListRowIdx = workClientInfoListRowIdx + 1;
+                        /*addRow('#workClientInfoList', workClientInfoListRowIdx, workClientInfoListTpl);workClientInfoListRowIdx = workClientInfoListRowIdx + 1;
                         console.log("---------"+data.companyType+"---------"+data.companyIndustry+"---------"+data.areaName);
                         console.log("---------"+workClientInfoListRowIdx+"---------"+workClientInfoListTpl);
                         var row = workClientInfoListRowIdx - 1 ;
@@ -436,7 +449,7 @@
                         $("#"+"workClientInfoList"+row+"_name").val(d.name);
                         $("#"+"workClientInfoList"+row+"_companyType").val(d.companyType);
                         $("#"+"workClientInfoList"+row+"_companyIndustry").val(d.companyIndustry);
-                        $("#"+"workClientInfoList"+row+"_area").val(d.areaName);
+                        $("#"+"workClientInfoList"+row+"_area").val(d.areaName);*/
                     }else {
                         var num = 'alone';
                         for (var i = 0; i < size; i++) {
@@ -563,11 +576,12 @@
 <body>
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="workContractInfo" enctype="multipart/form-data"  action ="${ctx}/workcontractinfo/workContractInfo/save" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="workContractInfo" enctype="multipart/form-data"  action ="${ctx}/workcontractinfo/workContractInfo/save" method="post" class="form-horizontal layui-form">
 			<form:hidden path="id"/>
 			<%--创建人--%>
 			<form:hidden path="createBy.name" htmlEscape="false"  readonly="true" value="${fns:getUser().name}" class="form-control "/>
 			<input type="hidden" id="ext" name="ext" value="1">
+			<input type="hidden" id="chargeCriterionH" value="${workContractInfo.chargeCriterion}">
 			<div class="tabs-container">
 <%--				<div class="layui-tab" id="tabDiv">--%>
 <%--					<ul class="layui-tab-title" >--%>
@@ -589,31 +603,14 @@
 								</div>
 							</div>--%>
 							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">合同编号：</label>
-								<div class="layui-input-block">
-									<div class="input-group">
-										<form:input path="contractNum" id="contractNum" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
-										<span class="input-group-btn">
-											<label class="form-status"><c:choose><c:when test="${ empty workContractInfo.contractState}">新添</c:when><c:otherwise>${fns:getDictLabel(workContractInfo.contractState, 'audit_completion_state','')}</c:otherwise>	</c:choose></label>
-										</span>
-									</div>
-								</div>
-							</div>
-							<%--<div class="layui-item layui-col-sm6" id="tr1">
-								<label class="layui-form-label"><span class="require-item">*</span>投标项目：</label>
-								<div class="layui-input-block with-icon">
-									<input type="hidden" value="" id ="ids">
-									<sys:gridselectcallprojectt url="${ctx}/workinvoice/workInvoice/selectprojectt" id="project" name="project.id"  value="${workContractInfo.project.id}"  title="选择投标项目" labelName="workContractInfo.project.projectName"
-																labelValue="${workContractInfo.project.projectName}" cssClass="form-control required layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallprojectt>
+								<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>
+								<div class="layui-input-block with-icon" style="margin-right:95px;">
+									<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"
+														  labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
 
 								</div>
+								<a href="javascript:void(0)" onclick="openBill('新增客户管理', '${ctx}/workclientinfo/workClientInfo/form?param=2','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-plus"></i> 新增</a>
 							</div>
-							<div class="layui-item layui-col-sm6" id="tr2">
-								<label class="layui-form-label">投标编号：</label>
-								<div class="layui-input-block">
-									<form:input id ="pNumber" path="project.projectNumber" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
-								</div>
-							</div>--%>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
 								<div class="layui-input-block">
@@ -621,52 +618,15 @@
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">总合同名称：</label>
-								<div class="layui-input-block with-icon" style="margin-right:95px;">
-									<c:choose>
-										<c:when test="${workContractInfo.contractState == 4}">
-											<form:input path="totalContractName" htmlEscape="false" readonly="true"   class="form-control  layui-input"/>
-										</c:when>
-										<c:otherwise>
-											<sys:gridselectContract url="${ctx}/workcontractinfo/workContractInfo/selectcontract" type="" isTotal="1" id="totalContractId" name="totalContractId"  value="${workContractInfo.totalContractId}"  title="选择合同" labelName="workContractInfo.totalContractName"
-																	labelValue="${workContractInfo.totalContractName}" cssClass="form-control layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
-										</c:otherwise>
-									</c:choose>
-								</div>
-								<a href="javascript:void(0)" onclick="deleteContract()" class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="glyphicon glyphicon-share-alt"></i> 清空</a>
-							</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">
-									<sys:treeselect id="chargeCompany" name="chargeCompany" value="${workContractInfo.chargeCompany}" labelName="chargeCompanyName" labelValue="${workContractInfo.chargeCompanyName}"
-													title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label double-line"><span class="require-item">*</span>合 同 金 额 (元)预计金额：</label>
-								<div class="layui-input-block">
-									<form:input path="contractPrice" htmlEscape="false"     pattern="#.00" class="form-control required number  layui-input"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>签订日期：</label>
 								<div class="layui-input-block">
-									<input class="laydate-icondate layui-input form-control layer-date laydate-icon required" id="contractDate" name="contractDate" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
+									<input class="laydate-icondate layui-input form-control layer-date laydate-icon required" readonly="readonly" id="contractDate" name="contractDate" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
 								</div>
 							</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" style="margin-right:95px;">
-									<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"
-														  labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
-
-								</div>
-								<a href="javascript:void(0)" onclick="openBill('新增客户管理', '${ctx}/workclientinfo/workClientInfo/form?param=2','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-plus"></i> 新增</a>
-							</div>
-							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">合同生效日期：</label>
 								<div class="layui-input-block">
-									<input class="laydate-icondate form-control layui-input layer-date laydate-icon" id="effectiveDate" name="effectiveDate" value="<fmt:formatDate value="${workContractInfo.effectiveDate}" pattern="yyyy-MM-dd"/>">
+									<input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="effectiveDate" name="effectiveDate" value="<fmt:formatDate value="${workContractInfo.effectiveDate}" pattern="yyyy-MM-dd"/>">
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
@@ -675,62 +635,39 @@
 									<input class="laydate-icondate form-control layui-input layer-date laydate-icon" id="closingDate" name="closingDate" value="<fmt:formatDate value="${workContractInfo.closingDate}" pattern="yyyy-MM-dd"/>">
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label double-line"><span class="require-item">*</span>工程投资额(万元)：</label>
-								<div class="layui-input-block">
-									<form:input path="investmentAmount" htmlEscape="false" pattern="#.00"  class="form-control number required layui-input"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">对方合同编号：</label>
-								<div class="layui-input-block">
-									<form:input path="anotherContractNum" htmlEscape="false" class="form-control layui-input"/>
-								</div>
-							</div>
 							<div class="layui-item layui-col-sm6 ">
-								<label class="layui-form-label"><span class="require-item">*</span>工程分类：</label>
+								<label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>
 								<div class="layui-input-block">
-									<form:select path="contractType" cssClass="form-control required simple-select">
+									<form:select path="contractTypeDoc" cssClass="form-control required simple-select">
 										<form:option value="" label=""/>
-										<form:options items="${fns:getMainDictList('contract_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+										<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 									</form:select>
-									<style>
-										#contractType{
-											height:40px;
-											line-height: 40px;
-											-moz-box-sizing: border-box;
-											-webkit-box-sizing: border-box;
-											box-sizing: border-box;
-										}
-									</style>
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6 ">
-								<label class="layui-form-label">归档状态：</label>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额 (元)预计金额：</label>
 								<div class="layui-input-block">
-									<input htmlEscape="false" class="form-control layui-input" readonly="true" value="${fns:getDictLabel(workContractInfo.recordState, 'record_state','')}"/>
+									<form:input path="contractPrice" htmlEscape="false"     pattern="#.00" class="form-control required number  layui-input"/>
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6 ">
-								<label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">对方合同编号：</label>
 								<div class="layui-input-block">
-									<form:select path="contractTypeDoc" cssClass="form-control required simple-select">
-										<form:option value="" label=""/>
-										<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-									</form:select>
+									<form:input path="anotherContractNum" htmlEscape="false" class="form-control layui-input"/>
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">创建时间：</label>
+							<div class="layui-item layui-col-sm12">
+								<label class="layui-form-label">收费标准</label>
 								<div class="layui-input-block">
-									<input class="laydate-icondate form-control layui-input layer-date laydate-icon" id="createDate" name="createDate" value="<fmt:formatDate value="${workContractInfo.createDate}" pattern="yyyy-MM-dd"/>">
+									<form:checkboxes path="chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
 								</div>
 							</div>
 
-							<div class="layui-item layui-col-sm12 with-textarea">
-								<label class="layui-form-label ">付款摘要：</label>
+
+							<div class="layui-item layui-col-sm12">
+								<label class="layui-form-label ">其他详情：</label>
 								<div class="layui-input-block">
-									<form:textarea path="summaryPayment" id="summaryPayment" htmlEscape="false" maxlength="1000" rows="4"    class="form-control"/>
+									<form:input path="otherDetails" readonly="true" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm12 with-textarea">
@@ -739,12 +676,6 @@
 									<form:textarea path="contractSpecial" htmlEscape="false" rows="4" maxlength="1000"   class="form-control "/>
 								</div>
 							</div>
-							<%--<div class="layui-item layui-col-sm12 with-textarea">
-								<label class="layui-form-label ">合同类型说明：</label>
-								<div class="layui-input-block">
-									<form:textarea path="contractTypeDoc" id="contractTypeDoc" htmlEscape="false" rows="4"  maxlength="1000"  class="form-control "/>
-								</div>
-							</div>--%>
 							<div class="layui-item layui-col-sm12 with-textarea">
 								<label class="layui-form-label ">备注：</label>
 								<div class="layui-input-block">
@@ -752,7 +683,7 @@
 								</div>
 							</div>
 						</div>
-						<div class="form-group layui-row">
+						<%--<div class="form-group layui-row">
 							<div class="form-group-label"><h2><span class="require-item">*</span>委托方列表</h2></div>
 							<div class="layui-item nav-btns">
 								<a href="javascript:void(0)" onclick="openBill2('新增客户管理', '${ctx}/workclientinfo/workClientInfo/formType?param=1','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增客户</a>
@@ -838,7 +769,7 @@
 								</script>
 
 							</div>
-						</div>
+						</div>--%>
 						<div class="form-group layui-row">
 							<div class="form-group-label"><h2>合同附件信息</h2></div>
 							<div class="layui-item nav-btns">
@@ -906,201 +837,30 @@
 						</div>
 						<div class="form-group layui-row page-end"></div>
 					</div>
-<%--					<div id="tab-22" class="tab-pane">--%>
-<%--						<div class="form-group layui-row first lw14">--%>
-<%--							<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">--%>
-<%--									<form:input id="timeRequirements" path="workContractReview.timeRequirements" htmlEscape="false" maxlength="64"    class="form-control required layui-input"/>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label"><span class="require-item">*</span>特殊要求：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:input id="specialRequirements" path="workContractReview.specialRequirements" htmlEscape="false" maxlength="64"     class="form-control required layui-input"/>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>客户要求是否合法：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.isLegitimate" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="是"/>--%>
-<%--										<form:option value="0" label="否"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>客户诚信度的初步判断：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.credibility" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="低"/>--%>
-<%--										<form:option value="2" label="中"/>--%>
-<%--										<form:option value="0" label="高"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label"><span class="require-item">*</span>风险初步评价：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.preliminaryRiskAssessmen" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="低"/>--%>
-<%--										<form:option value="0" label="高"/>--%>
-<%--										<form:option value="2" label="中"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>被服务对象所处行业环境：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.serviceObjectIndustry" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="正常"/>--%>
-<%--										<form:option value="0" label="不正常"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>与服务有关的客户资料能否恰当获取：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.isProperAcquisition" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="是"/>--%>
-<%--										<form:option value="0" label="否"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>人员是否能专业胜任：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.isUserQualified" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="是"/>--%>
-<%--										<form:option value="0" label="否"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>是否需要借助外部专家力量：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.isExternalExpertPower" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="需要"/>--%>
-<%--										<form:option value="0" label="不需要"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>设备能否满足项目要求：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.isEquipmentMeetRequirements" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="是"/>--%>
-<%--										<form:option value="0" label="否"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>时间能否满足客户需求：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.isTimeMeetRequirements" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="是"/>--%>
-<%--										<form:option value="0" label="否"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm6">--%>
-<%--								<label class="layui-form-label double-line"><span class="require-item">*</span>合同是否可以签定：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:select path="workContractReview.isContractSignature" class="form-control simple-select required">--%>
-<%--										<form:option value="" label=""/>--%>
-<%--										<form:option value="1" label="是"/>--%>
-<%--										<form:option value="0" label="否"/>--%>
-<%--									</form:select>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="layui-item layui-col-sm12 with-textarea">--%>
-<%--								<label class="layui-form-label">备注信息：</label>--%>
-<%--								<div class="layui-input-block">--%>
-<%--									<form:textarea path="workContractReview.remarks" htmlEscape="false" rows="4"   maxlength="500" class="form-control"/>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--						</div>--%>
-<%--						<div class="form-group layui-row">--%>
-<%--                        <div class="form-group-label"><h2>合同评审附件信息</h2></div>--%>
-<%--                        <div class="layui-item nav-btns">--%>
-<%--                            <a id="attachment_review_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-<%--                        </div>--%>
-<%--                        <div id="addFile_attachment_review" style="display: none" class="upload-progress">--%>
-<%--                            <span id="fileName_attachment_review" ></span>--%>
-<%--                            <b><span id="baifenbi_attachment_review" ></span></b>--%>
-<%--                            <div class="progress">--%>
-<%--                                <div id="jindutiao_attachment_review" class="progress-bar" style="width: 0%" aria-valuenow="0">--%>
-<%--                                </div>--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
-<%--                        <input id="attachment_review_file" type="file" multiple="multiple" name="attachment_file" style="display: none;" onChange="if(this.value)insertTitleReview(this.value);"/>--%>
-<%--                        <span id="attachment_review_title"></span>--%>
-<%--                        <div class="layui-item layui-col-xs12" style="padding:0 16px;">--%>
-<%--                            <table id="listAttachmentReview" class="table table-bordered table-condensed details">--%>
-<%--                                <thead>--%>
-<%--                                <tr>--%>
-<%--                                        &lt;%&ndash; <th>序号</th>&ndash;%&gt;--%>
-<%--                                    <th>文件预览</th>--%>
-<%--                                    <th>上传人</th>--%>
-<%--                                    <th>上传时间</th>--%>
-<%--                                    <th width="180px">操作</th>--%>
-<%--                                </tr>--%>
-<%--                                </thead>--%>
-<%--                                <tbody id="file_attachment_review">--%>
-<%--                                <c:forEach items="${workContractInfo.workContractReview.workAttachments}" var = "workClientAttachment" varStatus="status">--%>
-<%--                                    <tr>--%>
-<%--                                            &lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;--%>
-<%--                                        <c:choose>--%>
-<%--                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')--%>
-<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')--%>
-<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')--%>
-<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')--%>
-<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">--%>
-<%--                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">--%>
-<%--                                            </c:when>--%>
-<%--                                            <c:otherwise>--%>
-<%--                                                <c:choose>--%>
-<%--                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">--%>
-<%--                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>--%>
-<%--                                                    </c:when>--%>
-<%--                                                    <c:otherwise>--%>
-<%--                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>--%>
-<%--                                                    </c:otherwise>--%>
-<%--                                                </c:choose>--%>
-<%--                                            </c:otherwise>--%>
-<%--                                        </c:choose>--%>
-<%--                                        <td>${workClientAttachment.createBy.name}</td>--%>
-<%--                                        <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>--%>
-<%--                                        <td class="op-td">--%>
-<%--                                            <div class="op-btn-box" >--%>
-<%--                                                <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>--%>
-<%--                                                <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
-<%--                                                    <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment_review')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-<%--                                                </c:if>--%>
-<%--                                            </div>--%>
-<%--                                        </td>--%>
-<%--                                    </tr>--%>
-<%--                                </c:forEach>--%>
-<%--                                </tbody>--%>
-<%--                            </table>--%>
-<%--                        </div>--%>
-<%--                    </div>--%>
-<%--						<div class="form-group layui-row page-end"></div>--%>
-<%--					</div>--%>
 				</div>
 			</div>
 		</form:form>
 	</div>
+	<script>
+		layui.use('form', function () {
+			var form = layui.form;
+			form.render();
+
+			//复选框监听器
+			form.on('checkbox(chargeCriterionList)', function(data){
+				var ids = [];
+				$("input[name='chargeCriterionList']:checked").each(function(i){
+					ids.push($(this).val())
+				})
+				if(ids.indexOf("4")!=-1){
+					document.getElementById("otherDetails").readOnly=false
+				}else{
+					document.getElementById("otherDetails").readOnly=true
+					$("#otherDetails").val("");
+				}
+			});
+		});
+	</script>
 </div>
 </body>
 </html>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormEdit.jsp

@@ -4,6 +4,8 @@
 <head>
 	<title>合同管理管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
 	<script type="text/javascript">
 		var validateForm;
@@ -11,7 +13,11 @@
         function doSubmit(obj){
             // 回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             $("#contractPrice").val($("#contractPrice").val().replace(/\,/g, ""));
-            $("#investmentAmount").val($("#investmentAmount").val().replace(/\,/g, ""));
+            /*$("#investmentAmount").val($("#investmentAmount").val().replace(/\,/g, ""));*/
+			if($("#contractTypeDoc").val() == ""){
+				parent.layer.msg("请选择合同类型!", {icon: 5});
+				return false;
+			}
             if(validateForm.form()){
                // if(obj == 1) {
                     $("#flag").val("yes");
@@ -27,6 +33,13 @@
             return false;
         }
 		$(document).ready(function() {
+			var chargeCriterionH = $("#chargeCriterionH").val();
+			if(chargeCriterionH.indexOf("4")!=-1){
+				document.getElementById("otherDetails").readOnly=false
+			}else{
+				document.getElementById("otherDetails").readOnly=true
+				$("#otherDetails").val("");
+			}
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
 					loading('正在提交，请稍等...');
@@ -513,7 +526,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
-	<form:form id="inputForm" modelAttribute="workContractInfo" enctype="multipart/form-data"  action ="${ctx}/workcontractinfo/workContractInfo/saveAudit" method="post" class="form-horizontal">
+	<form:form id="inputForm" modelAttribute="workContractInfo" enctype="multipart/form-data"  action ="${ctx}/workcontractinfo/workContractInfo/saveAudit" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 		<form:hidden path="home"/>
 		<form:hidden path="act.taskId"/>
@@ -523,6 +536,7 @@
 		<form:hidden path="act.procDefId"/>
 		<form:hidden id="flag" path="act.flag"/>
 		<form:hidden id="ext" path="ext"/>
+		<input type="hidden" id="chargeCriterionH" value="${workContractInfo.chargeCriterion}">
 	<form:hidden path="createBy.name" htmlEscape="false"  readonly="true" value="${fns:getUser().name}" class="form-control "/>
 
 		<c:set var="status" value="${workContractInfo.act.status}" />
@@ -537,41 +551,15 @@
 				<div id="tab-1" class="tab-pane active">
 					<div class="form-group layui-row first lw9">
 						<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">
-								<input type="radio" class="i-checks" name="ext" checked id="ext" value="0">
-								<label for="ext">投标项目</label>
-								<input type="radio" class="i-checks" name="ext" id="ext1" value="1">
-								<label for="ext1">非投标项目</label>
-							</div>
-						</div>--%>
 						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">合同编号：</label>
-                            <div class="layui-input-block">
-                                <div class="input-group">
-                                    <form:input path="contractNum" id="contractNum" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
-                                    <span class="input-group-btn">
-                                        <label class="form-status"><c:choose><c:when test="${ empty workContractInfo.contractState}">新添</c:when><c:otherwise>${fns:getDictLabel(workContractInfo.contractState, 'audit_completion_state','')}</c:otherwise>	</c:choose></label>
-                                    </span>
-                                </div>
-                            </div>
-						</div>
-						<%--<div class="layui-item layui-col-sm6" id="tr1">
-							<label class="layui-form-label"><span class="require-item">*</span>投标项目：</label>
-							<div class="layui-input-block with-icon">
-								<input type="hidden" value="" id ="ids">
-								<sys:gridselectcallprojectt url="${ctx}/workinvoice/workInvoice/selectprojectt" id="project" name="project.id"  value="${workContractInfo.project.id}"  title="选择投标项目" labelName="workContractInfo.project.projectName"
-															labelValue="${workContractInfo.project.projectName}" cssClass="form-control required layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallprojectt>
+							<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>
+							<div class="layui-input-block with-icon" style="margin-right:95px;">
+								<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"
+													  labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
 
 							</div>
+							<a href="javascript:void(0)" onclick="openBill('新增客户管理', '${ctx}/workclientinfo/workClientInfo/form?param=2','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-plus"></i> 新增</a>
 						</div>
-						<div class="layui-item layui-col-sm6" id="tr2">
-							<label class="layui-form-label">投标编号：</label>
-							<div class="layui-input-block">
-								<form:input id ="pNumber" path="project.projectNumber" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
-							</div>
-						</div>--%>
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
 							<div class="layui-input-block">
@@ -579,41 +567,12 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">总合同名称：</label>
-							<div class="layui-input-block with-icon">
-								<sys:gridselectContract url="${ctx}/workcontractinfo/workContractInfo/selectcontract" type="" isTotal="1" id="totalContractId" name="totalContractId"  value="${workContractInfo.totalContractId}"  title="选择合同" labelName="workContractInfo.totalContractName"
-														labelValue="${workContractInfo.totalContractName}" cssClass="form-control layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
-							</div>
-						</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">
-								<sys:treeselect id="chargeCompany" name="chargeCompany" value="${workContractInfo.chargeCompany}" labelName="chargeCompanyName" labelValue="${workContractInfo.chargeCompanyName}"
-												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label double-line"><span class="require-item">*</span>合 同 金 额 (元)预计金额：</label>
-							<div class="layui-input-block">
-								<form:input path="contractPrice" htmlEscape="false"     pattern="#.00" class="form-control required number  layui-input"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label"><span class="require-item">*</span>签订日期：</label>
 							<div class="layui-input-block">
 								<input class="laydate-icondate layui-input form-control layer-date laydate-icon required" id="contractDate" name="contractDate" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
 							</div>
 						</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" style="margin-right:95px;">
-								<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="client.id"  value="${workContractInfo.client.id}"  title="选择客户" labelName="client.name"
-													  labelValue="${workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
-
-							</div>
-							<a href="javascript:void(0)" onclick="openBill('新增客户管理', '${ctx}/workclientinfo/workClientInfo/form?param=2','90%','90%',false,'inputForm')" class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-plus"></i> 新增</a>
-						</div>
-						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">合同生效日期：</label>
 							<div class="layui-input-block">
 								<input class="laydate-icondate form-control layui-input layer-date laydate-icon" id="effectiveDate" name="effectiveDate" value="<fmt:formatDate value="${workContractInfo.effectiveDate}" pattern="yyyy-MM-dd"/>">
@@ -625,61 +584,37 @@
 								<input class="laydate-icondate form-control layui-input layer-date laydate-icon" id="closingDate" name="closingDate" value="<fmt:formatDate value="${workContractInfo.closingDate}" pattern="yyyy-MM-dd"/>">
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label double-line"><span class="require-item">*</span>工程投资额(万元)：</label>
-							<div class="layui-input-block">
-								<form:input path="investmentAmount" htmlEscape="false" pattern="#.00"  class="form-control number required layui-input"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">对方合同编号：</label>
-							<div class="layui-input-block">
-								<form:input path="anotherContractNum" htmlEscape="false" class="form-control layui-input"/>
-							</div>
-						</div>
 						<div class="layui-item layui-col-sm6 ">
-							<label class="layui-form-label"><span class="require-item">*</span>工程分类：</label>
+							<label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>
 							<div class="layui-input-block">
-								<form:select path="contractType" cssClass="form-control required simple-select">
+								<form:select path="contractTypeDoc" cssClass="form-control required simple-select">
 									<form:option value="" label=""/>
-									<form:options items="${fns:getMainDictList('contract_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+									<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
-								<style>
-									#contractType{
-										height:40px;
-										line-height: 40px;
-										-moz-box-sizing: border-box;
-										-webkit-box-sizing: border-box;
-										box-sizing: border-box;
-									}
-								</style>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6 ">
-							<label class="layui-form-label">归档状态：</label>
+						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额(元)预计金额：</label>
 							<div class="layui-input-block">
-								<input htmlEscape="false" class="form-control layui-input" readonly="true" value="${fns:getDictLabel(workContractInfo.recordState, 'record_state','')}"/>
+								<form:input path="contractPrice" htmlEscape="false"     pattern="#.00" class="form-control required number  layui-input"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6 ">
-							<label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>
+						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label">对方合同编号：</label>
 							<div class="layui-input-block">
-								<form:select path="contractTypeDoc" cssClass="form-control required simple-select">
-									<form:option value="" label=""/>
-									<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-								</form:select>
+								<form:input path="anotherContractNum" htmlEscape="false" class="form-control layui-input"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">创建时间：</label>
+						<div class="layui-item layui-col-sm12">
+							<label class="layui-form-label">收费标准</label>
 							<div class="layui-input-block">
-								<input class="laydate-icondate form-control layui-input layer-date laydate-icon" id="createDate" name="createDate" value="<fmt:formatDate value="${workContractInfo.createDate}" pattern="yyyy-MM-dd"/>">
+								<form:checkboxes path="chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm12 with-textarea">
-							<label class="layui-form-label ">付款摘要：</label>
+						<div class="layui-item layui-col-sm12">
+							<label class="layui-form-label ">其他详情：</label>
 							<div class="layui-input-block">
-								<form:textarea path="summaryPayment" id="summaryPayment" htmlEscape="false" rows="4"  maxlength="1000"  class="form-control"/>
+								<form:input path="otherDetails" readonly="true" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm12 with-textarea">
@@ -688,12 +623,6 @@
 								<form:textarea path="contractSpecial" htmlEscape="false" rows="4"  maxlength="1000"  class="form-control "/>
 							</div>
 						</div>
-						<%--<div class="layui-item layui-col-sm12 with-textarea">
-							<label class="layui-form-label ">合同类型说明：</label>
-							<div class="layui-input-block">
-								<form:textarea path="contractTypeDoc" id="contractTypeDoc" htmlEscape="false" rows="4"  maxlength="1000"  class="form-control "/>
-							</div>
-						</div>--%>
 						<div class="layui-item layui-col-sm12 with-textarea">
 							<label class="layui-form-label ">备注：</label>
 							<div class="layui-input-block">
@@ -701,7 +630,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="form-group layui-row">
+					<%--<div class="form-group layui-row">
 						<div class="form-group-label"><h2><span class="require-item">*</span>委托方列表</h2></div>
 						<div class="layui-item nav-btns">
 							<a href="javascript:void(0)" onclick="openBill2('新增客户管理', '${ctx}/workclientinfo/workClientInfo/form?param=2','95%','95%',false,'inputForm')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增客户</a>
@@ -713,7 +642,7 @@
 							<table id="contentTable1" class="table table-bordered table-condensed can-edit">
 								<thead>
 								<tr>
-									<%--<th width="80px">序号</th>--%>
+									&lt;%&ndash;<th width="80px">序号</th>&ndash;%&gt;
 									<th>委托方名称</th>
 									<th>客户性质</th>
 									<th>所属行业</th>
@@ -729,9 +658,9 @@
 												<input id="workClientInfoList${index.index}_id" name="workClientInfoList[${index.index}].id" type="hidden" value="${casePeopleNorm.id}" class="clientInfoId"/>
 												<input id="workClientInfoList${index.index}_delFlag" name="workClientInfoList[${index.index}].delFlag" type="hidden" value="0"/>
 											</td>
-											<%--<td>--%>
-												<%--<input type="text" value="${index.index + 1}" class="form-control" readonly="true"/>--%>
-											<%--</td>--%>
+											&lt;%&ndash;<td>&ndash;%&gt;
+												&lt;%&ndash;<input type="text" value="${index.index + 1}" class="form-control" readonly="true"/>&ndash;%&gt;
+											&lt;%&ndash;</td>&ndash;%&gt;
 											<td>
 												<input id="workClientInfoList${index.index}_name" name="workClientInfoList[${index.index}].name" type="text" value="${casePeopleNorm.name}" readonly="true"   class="form-control "/>
 											</td>
@@ -791,7 +720,7 @@
 
 
 					</div>
-				</div>
+				</div>--%>
 				<div class="form-group layui-row">
 					<div class="form-group-label"><h2>合同附件信息</h2></div>
 					<div class="layui-item nav-btns">
@@ -1026,6 +955,26 @@
 
 	</form:form>
 	</div>
+	<script>
+		layui.use('form', function () {
+			var form = layui.form;
+			form.render();
+
+			//复选框监听器
+			form.on('checkbox(chargeCriterionList)', function(data){
+				var ids = [];
+				$("input[name='chargeCriterionList']:checked").each(function(i){
+					ids.push($(this).val())
+				})
+				if(ids.indexOf("4")!=-1){
+					document.getElementById("otherDetails").readOnly=false
+				}else{
+					document.getElementById("otherDetails").readOnly=true
+					$("#otherDetails").val("");
+				}
+			});
+		});
+	</script>
 </div>
 
 

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -6,9 +6,6 @@
 	<meta name="decorator" content="default"/>
 	<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
 	<style>
-		.op-btn.op-btn-invalid{
-			background:#f0ad4e ;
-		}
 	</style>
 	<%@include file="/webpage/include/treetable.jsp" %>
 	<%--<style>--%>
@@ -546,23 +543,11 @@
 						</div>
 					</div>
 					<div class="layui-item query athird">
-						<label class="layui-form-label  double-line">合同金额(元)预计金额：</label>
+						<label class="layui-form-label  double-line">合同金额(元)：</label>
 						<div class="layui-input-block with-icon">
 							<form:input path="contractPrice" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 						</div>
 					</div>
-					<div class="layui-item query athird">
-						<label class="layui-form-label  double-line">工程投资额(万元)：</label>
-						<div class="layui-input-block">
-							<input id="beginInvestmentAmount" name="beginInvestmentAmount" type="text"  maxlength="20" class="form-control layui-input number query-group"
-								   value="${workContractListInfo.beginInvestmentAmount}"/>
-							</input>
-							<span class="group-sep">-</span>
-							<input id="endInvestmentAmount" name="endInvestmentAmount" type="text"  maxlength="20" class="form-control layui-input number query-group"
-								   value="${workContractListInfo.endInvestmentAmount}"/>
-							</input>
-						</div>
-					</div>
 				</div>
 				</form:form>
 			</div>
@@ -617,9 +602,6 @@
                 ,{field:'clientName',align:'center', title: '客户名称',minWidth:160,templet:function(d){
                         return "<a class=\"attention-info\" title=\""+d.clientName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看客户管理', '${ctx}/workclientinfo/workClientInfo/detail?id=" + d.clientId +"','95%', '95%')\">" + d.clientName + "</a>";
                     }}
-                ,{field:'clientType', align:'center',title: '工程分类', width:90,templet:function(d){
-                        return "<span title='"+ d.clientType +"'>" + d.clientType + "</span>";
-                    }}
                 ,{field:'contractPrice', align:'center',sort:true,title: '合同金额(元)',width:100,templet:function(d){
                         return "<span title='"+ d.contractPrice2 +"'>" + d.contractPrice2 + "</span>";
                     }}
@@ -693,19 +675,19 @@
 							}
 							if(d.candelete != undefined && d.candelete =="1")
 							{
-								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该合同记录吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该合同信息吗？', this.href)\" class=\"op-btn op-btn-invalid\"><i class=\"fa fa-trash-o\"></i> 作废</a>";
 							}
 							if(d.cancancel != undefined && d.cancancel =="1")
 							{
 								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/revoke?id="+ d.id +"&processInstanceId="+ d.processInstanceId +"\" onclick=\"return confirmx('确认要撤回该合同管理吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
 							}
 
-							if(d.canalterCom != undefined && d.canalterCom =="1")
+							/*if(d.canalterCom != undefined && d.canalterCom =="1")
 							{
 								<shiro:hasPermission name="workcontractinfo:workContractInfo:contractPrice">
 								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/saveCompletion?id=" + d.id + "\" onclick=\"return confirmx('确认要发起合同完成吗？', this.href)\"   class=\"op-btn op-btn-revert\"><i class=\"fa fa-edit\"></i> 完成</a>";
 								</shiro:hasPermission>
-							}
+							}*/
 							if(d.canalterComRevoke != undefined && d.canalterComRevoke =="1")
 							{
 								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/revokeCompletion?id="+ d.id +"\" onclick=\"return confirmx('确认要撤回该合同管理吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
@@ -713,7 +695,7 @@
 							if(d.canalterComDel != undefined && d.canalterComDel =="1")
 							{
 								<%--/* xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/saveCompletion?id=" + d.id + "\" onclick=\"return confirmx('确认要发起合同完成吗？', this.href)\"   class=\"op-btn op-btn-revert\"><i class=\"fa fa-edit\"></i> 完成</a>";*/--%>
-								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/deleteCompletion?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该合同完成吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/deleteCompletion?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该合同吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
 							}
 						} else if(d.contrractRecordStatus !="5"){
 							if(d.back != undefined && d.back =="1")
@@ -729,8 +711,8 @@
 								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('修改归档信息', '${ctx}/workcontractrecord/workContractRecord/form?id="+ d.contrractRecordId + "&tabId=3','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
 							if(d.caneditRecord3 != undefined && d.caneditRecord3 == "1")
 								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请归档', '${ctx}/workcontractrecord/workContractRecord/form?id=" + d.contrractRecordId + "&tabId=3','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
-							if(d.candeleteRecord != undefined && d.candeleteRecord == "1")
-								xml +="<a href=\"${ctx}/workcontractrecord/workContractRecord/delete?id=" + d.contrractRecordId + "\" onclick=\"return confirmx('确认要删除该合同归档申请吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+							/*if(d.candeleteRecord != undefined && d.candeleteRecord == "1")
+								xml +="<a href=\"${ctx}/workcontractrecord/workContractRecord/delete?id=" + d.contrractRecordId + "\" onclick=\"return confirmx('确认要删除该合同归档申请吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";*/
 						}
                         //合同借用
                         else if(d.contrractRecordStatus =="5"){

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoLookForm.jsp

@@ -5,6 +5,8 @@
 <head>
 	<title>合同管理管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script type="text/javascript">
         function openDialogre(title,url,width,height,target,formId){
             if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
@@ -112,7 +114,7 @@
 <body>
 <div class="single-form view-form">
 	<div class="container">
-	<form:form id="inputForm" modelAttribute="workContractInfo"  method="post" class="form-horizontal">
+	<form:form id="inputForm" modelAttribute="workContractInfo"  method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 
 		<div class="tabs-container">
@@ -120,91 +122,17 @@
 				<div id="tab-11" class="tab-pane active">
 					<div class="form-group layui-row first lw9">
 						<div class="form-group-label"><h2>项目合同信息</h2></div>
-						<%--<c:if test="${workContractInfo.ext == 0}">
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">合同来源：</label>
-								<div class="layui-input-block">
-									<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="投标项目"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label ">合同编号：</label>
-								<div class="layui-input-block">
-									<div class="input-group">
-										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.contractNum}"/>
-										<span class="input-group-btn">
-											<label class="form-status"><c:choose><c:when test="${ empty workContractInfo.contractState}">新添</c:when><c:otherwise>${fns:getDictLabel(workContractInfo.contractState, 'audit_completion_state','')}</c:otherwise>	</c:choose></label>
-										</span>
-									</div>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">投标项目：</label>
-								<div class="layui-input-block">
-									<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.project.projectName}"/>
-								</div>
-							</div>
-						</c:if>--%>
-						<c:if test="${workContractInfo.ext != 0}">
-							<%--<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">合同来源：</label>
-								<div class="layui-input-block">
-									<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="非投标项目"/>
-								</div>
-							</div>--%>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label ">合同编号：</label>
-								<div class="layui-input-block">
-									<div class="input-group">
-										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.contractNum}"/>
-										<span class="input-group-btn">
-											<label class="form-status"><c:choose><c:when test="${ empty workContractInfo.contractState}">新添</c:when><c:otherwise>${fns:getDictLabel(workContractInfo.contractState, 'audit_completion_state','')}</c:otherwise>	</c:choose></label>
-										</span>
-									</div>
-								</div>
-							</div>
-						</c:if>
-
 						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label ">合同名称：</label>
+							<label class="layui-form-label ">客户名称：</label>
 							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.name}"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">总合同名称：</label>
-							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.totalContractName}"/>
+								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
 							</div>
 						</div>
 
 						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label lw9">所属部门：</label>
-							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.chargeCompanyName}"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label double-line"><span class="require-item">*</span>合 同 金 额 (元)预计金额：</label>
-							<div class="layui-input-block">
-								<input htmlEscape="false" id="contractPrice" readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractInfo.contractPrice}" pattern="#,#00.00"/>"/>
-							</div>
-							<shiro:hasPermission name="workcontractinfo:workContractInfo:contractPrice">
-								<c:if test="${fns:getUser().office.id eq workContractInfo.officeId && workContractInfo.contractState < 10}">
-									<a onclick="openDialogre('修改合同金额', '${ctx}/workcontractinfo/workContractInfo/formContractPrice?id=${workContractInfo.id}','50%','300px',false,'inputForm')", class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-edit"></i> 修改</a>
-								</c:if>
-							</shiro:hasPermission>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label ">工程分类：</label>
-							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractInfo.contractType, 'contract_type', '')}"/>
-							</div>
-						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label ">委托方：</label>
+							<label class="layui-form-label ">合同名称：</label>
 							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
+								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.name}"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
@@ -226,60 +154,64 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label ">对方合同编号：</label>
+							<label class="layui-form-label ">合同类型：</label>
 							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.anotherContractNum}"/>
+								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label double-line ">工程投资额(万元)：</label>
+							<label class="layui-form-label double-line">合同金额(元)预计金额：</label>
 							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractInfo.investmentAmount}" pattern="#,#00.00"/>"/>
+								<input htmlEscape="false" id="contractPrice" readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractInfo.contractPrice}" pattern="#,#00.00"/>"/>
 							</div>
+							<shiro:hasPermission name="workcontractinfo:workContractInfo:contractPrice">
+								<c:if test="${fns:getUser().office.id eq workContractInfo.officeId && workContractInfo.contractState < 10}">
+									<a onclick="openDialogre('修改合同金额', '${ctx}/workcontractinfo/workContractInfo/formContractPrice?id=${workContractInfo.id}','50%','300px',false,'inputForm')", class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-edit"></i> 修改</a>
+								</c:if>
+							</shiro:hasPermission>
 						</div>
 						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label ">归档状态：</label>
+							<label class="layui-form-label ">对方合同编号：</label>
 							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getDictLabel(workContractInfo.recordState, 'record_state','')}"/>
+								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.anotherContractNum}"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label ">合同类型：</label>
+						<div class="layui-item layui-col-sm12">
+							<label class="layui-form-label">收费标准</label>
 							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+								<form:checkboxes path="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label ">创建时间：</label>
+						<div class="layui-item layui-col-sm12">
+							<label class="layui-form-label ">其他详情：</label>
 							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.createDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
+								<form:input path="otherDetails" readonly="true" htmlEscape="false" class="form-control layui-input"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm12 with-textarea">
-							<label class="layui-form-label">付款摘要：</label>
+
+
+
+						<%--<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label ">创建时间：</label>
 							<div class="layui-input-block">
-								<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.summaryPayment}</textarea>
+								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.createDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
 							</div>
-						</div>
+						</div>--%>
+
 						<div class="layui-item layui-col-sm12 with-textarea">
 							<label class="layui-form-label">合同特别条款：</label>
 							<div class="layui-input-block">
 								<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.contractSpecial}</textarea>
 							</div>
 						</div>
-						<%--<div class="layui-item layui-col-sm12 with-textarea">
-							<label class="layui-form-label">合同类型说明：</label>
-							<div class="layui-input-block">
-								<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.contractTypeDoc}</textarea>
-							</div>
-						</div>--%>
+
 						<div class="layui-item layui-col-sm12 with-textarea">
 							<label class="layui-form-label">备注：</label>
 							<div class="layui-input-block">
 								<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.remarks}</textarea>
 							</div>
 						</div>
-						<c:if test="${not empty workContractInfo.alterInfo.reason}">
+						<%--<c:if test="${not empty workContractInfo.alterInfo.reason}">
 							<div class="layui-item layui-col-sm12 with-textarea">
 								<label class="layui-form-label">作废原因：</label>
 								<div class="layui-input-block">
@@ -294,7 +226,7 @@
 									<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.contractCategory}</textarea>
 								</div>
 							</div>
-						</c:if>
+						</c:if>--%>
 					</div>
 
 					<div class="form-group layui-row">
@@ -503,6 +435,12 @@
 
 	</form:form>
 	</div>
+	<script>
+		layui.use('form', function () {
+			var form = layui.form;
+			form.render();
+		});
+	</script>
 </div>
 </body>
 </html>

src/main/webapp/webpage/modules/workcontractinfo/workContractgzAudit.jsp

@@ -4,6 +4,8 @@
 <head>
 	<title>合同管理审批</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script type="text/javascript">
         var validateForm;
         function doSubmit(obj){
@@ -38,7 +40,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
-			<form:form id="inputForm" modelAttribute="workContractInfo" enctype="multipart/form-data" action="${ctx}/workcontractinfo/workContractInfo/saveAudit" method="post" class="form-horizontal">
+			<form:form id="inputForm" modelAttribute="workContractInfo" enctype="multipart/form-data" action="${ctx}/workcontractinfo/workContractInfo/saveAudit" method="post" class="form-horizontal layui-form">
 				<form:hidden path="id"/>
 			<form:hidden path="home"/>
 				<form:hidden path="act.taskId"/>
@@ -61,88 +63,21 @@
 						<div id="tab-11" class="tab-pane active">
 							<div class="form-group layui-row first lw9">
 								<div class="form-group-label"><h2>项目合同信息</h2></div>
-								<c:if test="${workContractInfo.ext == 0}">
-									<div class="layui-item layui-col-sm6">
-										<label class="layui-form-label">合同来源：</label>
-										<div class="layui-input-block">
-											<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="投标项目"/>
-										</div>
-									</div>
-									<div class="layui-item layui-col-sm6">
-										<label class="layui-form-label lw9">合同编号：</label>
-										<div class="layui-input-block">
-											<div class="input-group">
-												<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.contractNum}"/>
-												<span class="input-group-btn">
-											<label class="form-status"><c:choose><c:when test="${ empty workContractInfo.contractState}">新添</c:when><c:otherwise>${fns:getDictLabel(workContractInfo.contractState, 'audit_completion_state','')}</c:otherwise>	</c:choose></label>
-										</span>
-											</div>
-										</div>
-									</div>
-									<div class="layui-item layui-col-sm6">
-										<label class="layui-form-label">投标项目：</label>
-										<div class="layui-input-block">
-											<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.project.projectName}"/>
-										</div>
-									</div>
-								</c:if>
-								<c:if test="${workContractInfo.ext != 0}">
-									<div class="layui-item layui-col-sm6">
-										<label class="layui-form-label">合同来源：</label>
-										<div class="layui-input-block">
-											<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="非投标项目"/>
-										</div>
-									</div>
-									<div class="layui-item layui-col-sm6">
-										<label class="layui-form-label lw9">合同编号：</label>
-										<div class="layui-input-block">
-											<div class="input-group">
-												<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.contractNum}"/>
-												<span class="input-group-btn">
-											<label class="form-status"><c:choose><c:when test="${ empty workContractInfo.contractState}">新添</c:when><c:otherwise>${fns:getDictLabel(workContractInfo.contractState, 'audit_completion_state','')}</c:otherwise>	</c:choose></label>
-										</span>
-											</div>
-										</div>
-									</div>
-								</c:if>
 								<div class="layui-item layui-col-sm6">
-									<label class="layui-form-label">总合同名称：</label>
+									<label class="layui-form-label ">客户名称：</label>
 									<div class="layui-input-block">
-										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.totalContractName}"/>
+										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
 									</div>
 								</div>
-								<div class="layui-item layui-col-sm6 ">
+								<div class="layui-item layui-col-sm6">
 									<label class="layui-form-label ">合同名称：</label>
 									<div class="layui-input-block">
 										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.name}"/>
 									</div>
 								</div>
+
 								<div class="layui-item layui-col-sm6">
-									<label class="layui-form-label lw9">所属部门：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.chargeCompanyName}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6">
-									<label class="layui-form-label double-line"><span class="require-item">*</span>合 同 金 额 (元)预计金额：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractInfo.contractPrice}" pattern="#,#00.00"/>"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6">
-									<label class="layui-form-label ">工程分类：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractInfo.contractType, 'contract_type', '')}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6">
-									<label class="layui-form-label ">委托方：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6">
-									<label class="layui-form-label ">签订日期：</label>
+									<label class="layui-form-label "><span class="require-item">*</span>签订日期：</label>
 									<div class="layui-input-block">
 										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy年MM月dd日"/>"/>
 									</div>
@@ -160,114 +95,59 @@
 									</div>
 								</div>
 								<div class="layui-item layui-col-sm6">
-									<label class="layui-form-label ">对方合同编号：</label>
+									<label class="layui-form-label ">合同类型：</label>
 									<div class="layui-input-block">
-										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.anotherContractNum}"/>
+										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
 									</div>
 								</div>
 								<div class="layui-item layui-col-sm6">
-									<label class="layui-form-label  double-line">工程投资额(万元)：</label>
+									<label class="layui-form-label double-line">合同金额(元)预计金额：</label>
 									<div class="layui-input-block">
-										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractInfo.investmentAmount}" pattern="#,#00.00"/>"/>
+										<input htmlEscape="false" id="contractPrice" readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractInfo.contractPrice}" pattern="#,#00.00"/>"/>
 									</div>
+									<shiro:hasPermission name="workcontractinfo:workContractInfo:contractPrice">
+										<c:if test="${fns:getUser().office.id eq workContractInfo.officeId && workContractInfo.contractState < 10}">
+											<a onclick="openDialogre('修改合同金额', '${ctx}/workcontractinfo/workContractInfo/formContractPrice?id=${workContractInfo.id}','50%','300px',false,'inputForm')", class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-edit"></i> 修改</a>
+										</c:if>
+									</shiro:hasPermission>
 								</div>
 								<div class="layui-item layui-col-sm6">
-									<label class="layui-form-label ">归档状态：</label>
+									<label class="layui-form-label ">对方合同编号：</label>
 									<div class="layui-input-block">
-										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getDictLabel(workContractInfo.recordState, 'record_state','')}"/>
+										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.anotherContractNum}"/>
 									</div>
 								</div>
-								<div class="layui-item layui-col-sm6">
-									<label class="layui-form-label ">合同类型：</label>
+								<div class="layui-item layui-col-sm12">
+									<label class="layui-form-label">收费标准</label>
 									<div class="layui-input-block">
-										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+										<form:checkboxes path="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
 									</div>
 								</div>
-								<div class="layui-item layui-col-sm6">
-									<label class="layui-form-label ">创建时间：</label>
+								<div class="layui-item layui-col-sm12">
+									<label class="layui-form-label ">其他详情：</label>
 									<div class="layui-input-block">
-										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.createDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
+										<form:input path="otherDetails" readonly="true" htmlEscape="false" class="form-control layui-input"/>
 									</div>
 								</div>
-								<div class="layui-item layui-col-sm12 with-textarea">
-									<label class="layui-form-label">付款摘要：</label>
+
+								<%--<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label ">创建时间：</label>
 									<div class="layui-input-block">
-										<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.summaryPayment}</textarea>
+										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.createDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
 									</div>
-								</div>
+								</div>--%>
 								<div class="layui-item layui-col-sm12 with-textarea">
 									<label class="layui-form-label">合同特别条款：</label>
 									<div class="layui-input-block">
 										<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.contractSpecial}</textarea>
 									</div>
 								</div>
-								<%--<div class="layui-item layui-col-sm12 with-textarea">
-									<label class="layui-form-label">合同类型说明：</label>
-									<div class="layui-input-block">
-										<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.contractTypeDoc}</textarea>
-									</div>
-								</div>--%>
 								<div class="layui-item layui-col-sm12 with-textarea">
 									<label class="layui-form-label">备注：</label>
 									<div class="layui-input-block">
 										<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.remarks}</textarea>
 									</div>
 								</div>
-								<%--<div class="layui-item layui-col-sm12 with-textarea">
-									<label class="layui-form-label">变更原因：</label>
-									<div class="layui-input-block">
-										<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.contractCategory}</textarea>
-									</div>
-								</div>--%>
-							</div>
-							<div class="form-group layui-row">
-								<div class="form-group-label"><h2>委托方列表</h2></div>
-								<div class="layui-item layui-col-xs12 form-table-container" >
-									<table id="contentTable4" class="table table-bordered table-condensed no-bottom-margin details">
-										<thead>
-										<tr>
-											<th width="30%">委托方名称</th>
-											<th width="20%">客户性质</th>
-											<th width="20%">所属行业</th>
-											<th width="30%">所属地区</th>
-										</tr>
-										</thead>
-										<tbody id="workClientInfoList">
-										<c:if test="${not empty workContractInfo.workClientInfoList}">
-											<c:forEach items="${workContractInfo.workClientInfoList}" var="casePeopleNorm" varStatus="index">
-												<tr id="workClientInfoList${index.index}">
-													<td class="hide">
-															<%--<input id="workClientInfoList${index.index}_id" name="workClientInfoList[${index.index}].id" type="hidden" value="${casePeopleNorm.id}"/>--%>
-													</td>
-														<%--${fns:getDictLabel(workAccount.financialSubjectss, 'not_project_reimbursement', '')}--%>
-													<td>
-															<%--<input id="workClientInfoList${index.index}_name" name="workClientInfoList[${index.index}].name" type="text" value="${casePeopleNorm.name}" readonly="true"   class="form-control "/>--%>
-															${casePeopleNorm.name}
-													</td>
-													<td>
-															<%--<form:select id="workClientInfoList${index.index}_companyType" path="workClientInfoList[${index.index}].companyType" disabled="true" readonly="true" class="form-control">
-                                                                <form:option value="" label=""/>
-                                                                <form:options items="${fns:getMainDictList('company_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                                            </form:select>--%>
-															${fns:getMainDictLabel(casePeopleNorm.companyType, 'company_type', '')}
-													</td>
-													<td>
-															<%--<form:select id="workClientInfoList${index.index}_companyIndustry" path="workClientInfoList[${index.index}].companyIndustry" disabled="true" readonly="true" class="form-control">
-                                                                <form:option value="" label=""/>
-                                                                <form:options items="${fns:getMainDictList('company_industry')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                                            </form:select>--%>
-															${fns:getMainDictLabel(casePeopleNorm.companyIndustry, 'company_industry', '')}
-													</td>
-													<td>
-															<%--<input id="workClientInfoList${index.index}_area" name="workClientInfoList[${index.index}].area.name" type="text" value="${casePeopleNorm.area.name}"  readonly="true"  class="form-control "/>--%>
-															${casePeopleNorm.area.name}
-													</td>
-												</tr>
-											</c:forEach>
-										</c:if>
-										</tbody>
-									</table>
-								</div>
 							</div>
 							<div class="form-group layui-row">
 								<div class="form-group-label"><h2>合同附件表</h2></div>
@@ -351,170 +231,6 @@
 								</div>
 							</div>
 						</div>
-<%--						<div id="tab-22" class="tab-pane">--%>
-
-<%--							<div class="form-group layui-row first lw14">--%>
-<%--								<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">--%>
-<%--										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.workContractReview.timeRequirements}"/>--%>
-<%--									</div>--%>
-<%--								</div>--%>
-<%--								<div class="layui-item layui-col-sm6">--%>
-<%--									<label class="layui-form-label">特殊要求：</label>--%>
-<%--									<div class="layui-input-block">--%>
-<%--										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.workContractReview.specialRequirements}"/>--%>
-<%--									</div>--%>
-<%--								</div>--%>
-<%--								<div class="layui-item layui-col-sm6">--%>
-<%--									<label class="layui-form-label">客户要求是否合法：</label>--%>
-<%--									<div class="layui-input-block">--%>
-<%--										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isLegitimate eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>--%>
-<%--									</div>--%>
-<%--								</div>--%>
-<%--								<div class="layui-item layui-col-sm6">--%>
-<%--									<label class="layui-form-label double-line">客户诚信度的初步判断：</label>--%>
-<%--									<div class="layui-input-block">--%>
-<%--										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.credibility eq 1}">低</c:when><c:when test="${workContractInfo.workContractReview.credibility eq 2}">中</c:when><c:otherwise>高</c:otherwise></c:choose>"/>--%>
-<%--									</div>--%>
-<%--								</div>--%>
-<%--								<div class="layui-item layui-col-sm6">--%>
-<%--									<label class="layui-form-label">风险初步评价：</label>--%>
-<%--									<div class="layui-input-block">--%>
-<%--										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.preliminaryRiskAssessmen eq 1}">低</c:when><c:when test="${workContractInfo.workContractReview.preliminaryRiskAssessmen eq 2}">高</c:when><c:otherwise>中</c:otherwise></c:choose>"/>--%>
-<%--									</div>--%>
-<%--								</div>--%>
-<%--								<div class="layui-item layui-col-sm6">--%>
-<%--									<label class="layui-form-label double-line">被服务对象所处行业环境：</label>--%>
-<%--									<div class="layui-input-block">--%>
-<%--										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.serviceObjectIndustry eq 1}">正常</c:when><c:otherwise>不正常</c:otherwise></c:choose>"/>--%>
-<%--									</div>--%>
-<%--								</div>--%>
-<%--								<div class="layui-item layui-col-sm6">--%>
-<%--									<label class="layui-form-label double-line">与服务有关的客户资料能否恰当获取：</label>--%>
-<%--									<div class="layui-input-block">--%>
-<%--										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isProperAcquisition eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>--%>
-<%--									</div>--%>
-<%--								</div>--%>
-<%--								<div class="layui-item layui-col-sm6">--%>
-<%--									<label class="layui-form-label double-line">人员是否能专业胜任：</label>--%>
-<%--									<div class="layui-input-block">--%>
-<%--										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isUserQualified eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>--%>
-<%--									</div>--%>
-<%--								</div>--%>
-<%--								<div class="layui-item layui-col-sm6">--%>
-<%--									<label class="layui-form-label double-line">是否需要借助外部专家力量：</label>--%>
-<%--									<div class="layui-input-block">--%>
-<%--										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isLegitimate eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>--%>
-<%--									</div>--%>
-<%--								</div>--%>
-<%--								<div class="layui-item layui-col-sm6">--%>
-<%--									<label class="layui-form-label double-line">设备能否满足项目要求：</label>--%>
-<%--									<div class="layui-input-block">--%>
-<%--										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isEquipmentMeetRequirements eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>--%>
-<%--									</div>--%>
-<%--								</div>--%>
-<%--								<div class="layui-item layui-col-sm6">--%>
-<%--									<label class="layui-form-label double-line">时间能否满足客户需求：</label>--%>
-<%--									<div class="layui-input-block">--%>
-<%--										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isTimeMeetRequirements eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>--%>
-<%--									</div>--%>
-<%--								</div>--%>
-<%--								<div class="layui-item layui-col-sm6">--%>
-<%--									<label class="layui-form-label double-line">合同是否可以签定：</label>--%>
-<%--									<div class="layui-input-block">--%>
-<%--										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isContractSignature eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>--%>
-<%--									</div>--%>
-<%--								</div>--%>
-<%--								<div class="layui-item layui-col-sm12">--%>
-<%--									<label class="layui-form-label">备注信息：</label>--%>
-<%--									<div class="layui-input-block">--%>
-<%--										<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.workContractReview.remarks}</textarea>--%>
-<%--									</div>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--							<div class="form-group layui-row">--%>
-<%--								<div class="form-group-label"><h2>合同评审附件信息</h2></div>--%>
-<%--								<div class="layui-item layui-col-xs12 form-table-container" >--%>
-<%--									<table id="contentTable2" class="table table-bordered table-condensed no-bottom-margin details">--%>
-<%--										<thead>--%>
-<%--										<tr>--%>
-<%--											<th>文件</th>--%>
-<%--											<th>上传人</th>--%>
-<%--											<th>上传时间</th>--%>
-<%--											<th width="180px">操作</th>--%>
-<%--										</tr>--%>
-<%--										</thead>--%>
-<%--										<tbody>--%>
-<%--										<c:choose>--%>
-<%--											<c:when test="${not empty workContractInfo.workContractReview.workAttachments}">--%>
-<%--												<c:forEach items="${workContractInfo.workContractReview.workAttachments}" var="workClientAttachment" varStatus="status">--%>
-<%--													<tr>--%>
-<%--															&lt;%&ndash;<td>${status.index + 1}</td>&ndash;%&gt;--%>
-<%--														<c:choose>--%>
-<%--															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')--%>
-<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')--%>
-<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')--%>
-<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')--%>
-<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">--%>
-<%--																<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">--%>
-<%--															</c:when>--%>
-<%--															<c:otherwise>--%>
-<%--																<c:choose>--%>
-<%--																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">--%>
-<%--																		<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>--%>
-<%--																	</c:when>--%>
-<%--																	<c:otherwise>--%>
-<%--																		<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>--%>
-<%--																	</c:otherwise>--%>
-<%--																</c:choose>--%>
-<%--															</c:otherwise>--%>
-<%--														</c:choose>--%>
-<%--														<td>${workClientAttachment.createBy.name}</td>--%>
-<%--														<td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>--%>
-<%--														<td  class="op-td">--%>
-<%--															<div class="op-btn-box" >--%>
-<%--                                                                <c:set var="signflag" value="${fns:getSysParam('sign_flag',fns:getUser())}"/>--%>
-<%--                                                                <c:choose>--%>
-<%--                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')--%>
-<%--                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'doc')--%>
-<%--                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'docx')--%>
-<%--                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'xls')--%>
-<%--                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'xlsx')--%>
-<%--                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ppt')--%>
-<%--                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'pptx')}">--%>
-<%--                                                                            <a href="${ctx}/isignature/iSignatureDocument/sign?recordId=${workClientAttachment.id}" class="op-btn op-btn-sign" target="_blank">签章</a>--%>
-<%--                                                                        <a href="javascript:void(0);" onclick="openDialogView('查看电子签章信息', '${ctx}/isignature/iSignatureDocument/form?recordId=${workClientAttachment.id}','95%', '95%')" class="op-btn op-btn-view" ><i class="fa fa-search-plus"></i> 查看</a>--%>
-<%--                                                                        <c:choose>--%>
-<%--                                                                            <c:when test="${signflag == '是'}">--%>
-<%--                                                                                <a href="javascript:location.href='${ctx}/isignature/iSignatureDocument/download?recordId=${workClientAttachment.id}'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>--%>
-<%--                                                                            </c:when>--%>
-<%--                                                                            <c:otherwise>--%>
-<%--                                                                                <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>--%>
-<%--                                                                            </c:otherwise>--%>
-<%--                                                                        </c:choose>--%>
-<%--                                                                    </c:when>--%>
-<%--                                                                    <c:otherwise>--%>
-<%--                                                                        <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>--%>
-<%--                                                                    </c:otherwise>--%>
-<%--                                                                </c:choose>--%>
-<%--															</div>--%>
-<%--														</td>--%>
-<%--													</tr>--%>
-<%--												</c:forEach>--%>
-<%--											</c:when>--%>
-<%--											<c:otherwise>--%>
-<%--												<tr>--%>
-<%--													<td colspan="4" align="center">暂无数据</td>--%>
-<%--												</tr>--%>
-<%--											</c:otherwise>--%>
-<%--										</c:choose>--%>
-<%--										</tbody>--%>
-<%--									</table>--%>
-<%--								</div>--%>
-<%--							</div>--%>
-<%--						</div>--%>
 					</div>
 				</div>
 
@@ -527,6 +243,12 @@
 			</div>
 		</div>
 	</div>
+	<script>
+		layui.use('form', function () {
+			var form = layui.form;
+			form.render();
+		});
+	</script>
 </div>
 </body>
 </html>