Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/identification/entity/AuditTemplate.java

@@ -7,6 +7,7 @@ import com.jeeplus.common.persistence.DataEntity;
 public class AuditTemplate extends DataEntity<AuditTemplate> {
     private String identification;  //模板标识
     private String content; //模板内容
+    private String name; //模板标识名称
 
     public String getIdentification() {
         return identification;
@@ -23,4 +24,12 @@ public class AuditTemplate extends DataEntity<AuditTemplate> {
     public void setContent(String content) {
         this.content = content;
     }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
 }

src/main/java/com/jeeplus/modules/identification/service/AuditTemplateService.java

@@ -27,5 +27,9 @@ public class AuditTemplateService  extends CrudService<AuditTemplateDao, AuditTe
         List<AuditTemplate> auditTemplates=auditTemplateDao.findByIdentification(auditTemplate);
         return auditTemplates;
     }
+    @Transactional(readOnly = false)
+    public Integer deleteById(AuditTemplate auditTemplate){
+        return auditTemplateDao.delete(auditTemplate);
+    }
 
 }

src/main/java/com/jeeplus/modules/identification/web/AuditTemplateController.java

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.identification.web;
 
+import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
@@ -15,9 +16,7 @@ import com.jeeplus.modules.sys.utils.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
@@ -47,8 +46,20 @@ public class AuditTemplateController extends BaseController {
      * @param model
      * @return
      */
+    @RequestMapping(value = {"templateList"})
+    public String templateList(AuditTemplate auditTemplate, HttpServletRequest request, HttpServletResponse response, Model model) {
+        List<AuditTemplate> auditTemplates=auditTemplateService.findByIdentification(auditTemplate);
+        model.addAttribute("auditTemplates",auditTemplates);
+        model.addAttribute("auditTemplate",auditTemplate);
+        return "modules/identification/AuditTemplateGenList";
+    }
+    /**
+     * 增加模板页面
+     * @param model
+     * @return
+     */
     @RequestMapping(value = {"toSave"})
-    public String list(AuditTemplate auditTemplate, HttpServletRequest request, HttpServletResponse response, Model model) {
+    public String toSave(AuditTemplate auditTemplate, HttpServletRequest request, HttpServletResponse response, Model model) {
         auditTemplate.setCreateBy(UserUtils.getUser());
         model.addAttribute("auditTemplate",auditTemplate);
         return "modules/identification/AuditTemplateForm";
@@ -61,8 +72,7 @@ public class AuditTemplateController extends BaseController {
     @RequestMapping(value = "save")
     public String save(AuditTemplate auditTemplate, Model model) {
         auditTemplateService.save(auditTemplate);
-        return "redirect:" + adminPath + "/oa/oaNotify/?repage";
-
+        return "redirect:" + adminPath + "/auditTemplate/auditTemplate/?repage";
     }
     /**
      * 审核-展示
@@ -75,5 +85,20 @@ public class AuditTemplateController extends BaseController {
         model.addAttribute("auditTemplates",auditTemplates);
         return "modules/iframeView/opinion";
     }
+    /**
+     * 审核模板-删除
+     * @param model
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "delete")
+    public String delete(AuditTemplate auditTemplate, Model model) {
+        try {
+            int i=auditTemplateService.deleteById(auditTemplate);
+        }catch (Exception e){
+            return "删除失败";
+        }
+        return "删除成功";
+    }
 
 }

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

@@ -827,6 +827,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
     public String selectReproject(String auditOpinion, Model model) {
         //审核意见模板标识
         model.addAttribute("identification", "projectReportDataLeader");
+        model.addAttribute("identificationName", "报告项目组成员审核意见");
         ProjectReportData projectReportData = new ProjectReportData();
         model.addAttribute("auditOpinion",auditOpinion);
         model.addAttribute("projectReportData",projectReportData);

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

@@ -1067,6 +1067,7 @@ public class WorkProjectNotifyController extends BaseController {
 						return "modules/workreimbursement/workReimbursementFormDetail";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						model.addAttribute("identification","workreimbursement");
+						model.addAttribute("identificationName","报销审核意见");
 						if (workReimbursement.getAct() != null && StringUtils.isNotBlank(workReimbursement.getAct().getTaskDefKey()) && "cw".equals(workReimbursement.getAct().getTaskDefKey())) {
 							return "modules/workreimbursement/workReimbursementCWAudit";
 						}
@@ -1095,6 +1096,7 @@ public class WorkProjectNotifyController extends BaseController {
 						return "modules/workcontractinfo/workContractInfoLookForm";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						model.addAttribute("identification", "workContractInfo");
+						model.addAttribute("identificationName","合同审核意见");
 						if (workContractInfo.getAct() != null) {
 							if ("gzr".equals(workContractInfo.getAct().getTaskDefKey())) {
 								return "modules/workcontractinfo/workContractgzAudit";
@@ -1163,6 +1165,7 @@ public class WorkProjectNotifyController extends BaseController {
 							}
 						}
 						model.addAttribute("identification","workinvoice");
+						model.addAttribute("identificationName","发票审核意见");
 						if (StringUtils.isNotBlank(taskDefKey) && ("bmzr".equals(taskDefKey) ||
 								"scbzr".equals(taskDefKey))) {
 							return "modules/workinvoice/workInvoiceAudit";
@@ -1430,6 +1433,7 @@ public class WorkProjectNotifyController extends BaseController {
 							}
 							//审核模板标识
 							model.addAttribute("identification", "ruralprojectrecords");
+							model.addAttribute("identificationName","项目登记审核意见");
 							return "modules/ruralprojectrecords/ruralProjectRecordsAudit";
 						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 							//查询工程类型信息
@@ -1496,6 +1500,7 @@ public class WorkProjectNotifyController extends BaseController {
 						return "modules/ruralprojectrecords/ruralProjectRecordsView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						model.addAttribute("identification", "ruralprojectrecordsCheck");
+						model.addAttribute("identificationName","选查审核意见");
 						switch (type){
 							case "1":
 								return "modules/ruralprojectrecords/check/ruralProjectRecordsAudit";
@@ -1699,6 +1704,7 @@ public class WorkProjectNotifyController extends BaseController {
 						return "modules/workcontractrecord/workContractView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						model.addAttribute("identification", "workContractRecord");
+						model.addAttribute("identificationName","合同归档审核意见");
 						return "modules/workcontractrecord/workContractRecordAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workcontractrecord/workContractRecordModifyApply";
@@ -1718,6 +1724,8 @@ public class WorkProjectNotifyController extends BaseController {
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/workContractBorrow/workContractBorrowView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+						model.addAttribute("identification", "workContractBorrow");
+						model.addAttribute("identificationName","合同借用审核意见");
 						return "modules/workContractBorrow/workContractBorrowAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workContractBorrow/workContractBorrowModify";
@@ -2653,6 +2661,7 @@ public class WorkProjectNotifyController extends BaseController {
 						projectcontentinfo.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
 						projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
 						model.addAttribute("identification", "projectReportData");
+						model.addAttribute("identificationName","报告审核意见");
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						Iterator<RuralReportConsultant> itView = consultants.iterator();
@@ -2966,6 +2975,7 @@ public class WorkProjectNotifyController extends BaseController {
 						projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
 						projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
 						model.addAttribute("identification","projectcontentinfoFile");
+						model.addAttribute("identificationName","归档审核意见");
 						return "modules/projectcontentinfo/projectReportRecordAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/projectcontentinfo/projectReportRecordModifyApply";
@@ -3168,6 +3178,7 @@ public class WorkProjectNotifyController extends BaseController {
 						return "modules/oa/oaNotifyView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						model.addAttribute("identification","oaNotify");
+						model.addAttribute("identificationName","公告审核意见");
 						return "modules/oa/oaNotifyAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/oa/oaNotifyModifyApply";
@@ -3666,6 +3677,7 @@ public class WorkProjectNotifyController extends BaseController {
 						return "modules/projectFilingBatch/projectFilingBatchView";
 					} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						model.addAttribute("identification", "projectFilingBatch");
+						model.addAttribute("identificationName", "批量归档审核模板意见");
 						return "modules/projectFilingBatch/projectFilingBatchAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/projectFilingBatch/projectFilingBatchApply";

src/main/resources/mappings/modules/identification/AuditTemplateDao.xml

@@ -9,6 +9,7 @@
 		a.update_by AS "updateBy.id",
 		a.update_date AS "updateDate",
 		a.del_flag AS "delFlag",
+		a.name AS "name",
 		a.identification as "identification",
 		a.content as "content"
 	</sql>
@@ -77,6 +78,7 @@
 			update_by,
 			update_date,
 			del_flag,
+			name,
 			identification,
 			content
 		) VALUES (
@@ -86,6 +88,7 @@
 			#{updateBy.id},
 			#{updateDate},
 			#{delFlag},
+			#{name},
 			#{identification},
 			#{content}
 		)

src/main/webapp/webpage/modules/identification/AuditTemplateForm.jsp

@@ -32,7 +32,7 @@
             });
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
-                    loading('正在提交，请稍等...');
+                    // loading('正在提交，请稍等...');
                     form.submit();
                 },
                 errorContainer: "#messageBox",
@@ -57,20 +57,12 @@
     <div class="container">
         <form:form id="inputForm" modelAttribute="auditTemplate" action="${ctx}/auditTemplate/auditTemplate/save" method="post" class="form-horizontal layui-form">
             <form:hidden path="id"/>
+            <form:hidden path="createBy.name" readonly="true"  htmlEscape="false" class="form-control layui-input"/>
+            <form:hidden path="identification" readonly="true" htmlEscape="false"  class="form-control layui-input"/>
+            <form:hidden path="name" readonly="true" htmlEscape="false"  class="form-control layui-input"/>
+
             <div class="form-group layui-row first">
                 <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">
-                        <form:input path="createBy.name" readonly="true"  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-input-block">
-                        <form:input path="identification" 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-input-block">

src/main/webapp/webpage/modules/identification/AuditTemplateGenList.jsp

@@ -0,0 +1,142 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<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/layui/xmSelect.js" charset="utf-8"></script>
+    <style>
+        label.error{
+            top:40px;
+            left:0;
+        }
+        #standardDetail-error{
+            top:82px;
+            left:0;
+        }
+    </style>
+    <script type="text/javascript">
+        var validateForm;
+        function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+            if(validateForm.form()){
+                $("#inputForm").submit();
+                return true;
+            }
+            return false;
+        }
+        $(document).ready(function() {
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+            });
+            validateForm = $("#inputForm").validate({
+                submitHandler: function(form){
+                    loading('正在提交，请稍等...');
+                    form.submit();
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function(error, element) {
+                    $("#messageBox").text("输入有误，请先更正。");
+                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
+            var edit = "${workReviewStandard.id}";
+            if(edit!=null && edit!=''){
+                $("#reviewParentButton").attr("disabled","disabled");
+            }
+        });
+        function openDialogre(title,url,width,height,target,buttons) {
+            if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+                width = 'auto';
+                height = 'auto';
+            } else {//如果是PC端，根据用户设置的width和height显示。
+            }
+            var split = buttons.split(",");
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                maxmin: true, //开启最大化最小化按钮
+                skin: 'three-btns',
+                content: url,
+                btn: split,
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){
+                            location = '${ctx}/auditTemplate/auditTemplate/templateList?identification=${auditTemplate.identification}&name=${auditTemplate.name}';
+                        }, 100);//延时0.1秒，对应360 7.1版本bug
+                    }
+                },
+                btn2:function(index){
+                }
+            });
+        }
+        function deleteByid(mess, href) {
+            top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
+                if (typeof href == 'function') {
+                    href();
+                }else{
+                    resetTip(); //loading();
+                    $.ajax({
+                        url:href,
+                        type:"post",
+                        success:function(data){
+                            parent.layer.msg(data,{icon:1});
+                            location = '${ctx}/auditTemplate/auditTemplate/templateList?identification=${auditTemplate.identification}&name=${auditTemplate.name}';
+                        }
+                    });
+                }
+                top.layer.close(index);
+            });
+            return false;
+        }
+    </script>
+</head>
+<body>
+<div style="margin: 10px 30px;background-color: #FFB800"> <a href="javascript:void(0)"  onclick="openDialogre('添加模板', '${ctx}/auditTemplate/auditTemplate/toSave?identification=${auditTemplate.identification}&name=${auditTemplate.name}','80%', '50%','','添加,关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 添加审核意见模板</a></div>
+<div class="single-form">
+    <div class="container">
+        <table class="table table-bordered">
+            <thead>
+                <th>模板</th>
+                <th>操作</th>
+            </thead>
+            <tbody>
+                <c:forEach items="${auditTemplates}" var="tem">
+                    <tr align="center" >
+                        <td>${tem.content}</td>
+                        <td>
+                            <div class="layui-btn-group">
+                                <div class="op-btn-box">
+                                    <a href="${ctx}/auditTemplate/auditTemplate/delete?id=${tem.id}" onclick="return deleteByid('确认要删除该审核模板吗？', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>
+                                </div>
+                            </div>
+                        </td>
+                    </tr>
+                </c:forEach>
+            </tbody>
+        </table>
+    </div>
+</div>
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
+
+
+</script>
+</body>
+</html>

src/main/webapp/webpage/modules/oa/oaNotifyAudit.jsp

@@ -449,7 +449,7 @@
             <div class="form-group layui-row page-end"></div>
         </form:form>
         <div class="form-group-label">
-            <div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('添加模板', '${ctx}/auditTemplate/auditTemplate/toSave?identification=${identification}','80%', '50%','','添加,关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 添加审核意见模板</a></div>
+            <div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
             <h2>审批意见</h2>
         </div>
         <iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
@@ -484,23 +484,8 @@
             content: url,
             btn: split,
             btn1: function(index, layero){
-                var body = top.layer.getChildFrame('body', index);
-                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                var inputForm = body.find('#inputForm');
-                var top_iframe;
-                if(target){
-                    top_iframe = target;//如果指定了iframe，则在改frame中跳转
-                }else{
-                    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-                }
-                inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-                if(iframeWin.contentWindow.doSubmit(1) ){
-                    // top.layer.close(index);//关闭对话框。
-                    setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
-                    setTimeout(function(){top.layer.close(document.getElementById('iframe').contentWindow.location.reload())}, 100);
-                }
-            },
-            btn2:function(index){
+                top.layer.close(index)
+                document.getElementById('iframe').contentWindow.location.reload();
             }
         });
     }

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchAudit.jsp

@@ -393,7 +393,7 @@
 
 	</form:form>
 		<div class="form-group-label">
-			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('添加模板', '${ctx}/auditTemplate/auditTemplate/toSave?identification=${identification}','80%', '50%','','添加,关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 添加审核意见模板</a></div>
+			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
 			<h2>审批意见</h2>
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
@@ -427,23 +427,8 @@
 			content: url,
 			btn: split,
 			btn1: function(index, layero){
-				var body = top.layer.getChildFrame('body', index);
-				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-				var inputForm = body.find('#inputForm');
-				var top_iframe;
-				if(target){
-					top_iframe = target;//如果指定了iframe，则在改frame中跳转
-				}else{
-					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-				}
-				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-				if(iframeWin.contentWindow.doSubmit(1) ){
-					// top.layer.close(index);//关闭对话框。
-					setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
-					setTimeout(function(){top.layer.close(document.getElementById('iframe').contentWindow.location.reload())}, 100);
-				}
-			},
-			btn2:function(index){
+				top.layer.close(index)
+				document.getElementById('iframe').contentWindow.location.reload();
 			}
 		});
 	}

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

@@ -678,7 +678,7 @@
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 		<div class="form-group-label">
-			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('添加模板', '${ctx}/auditTemplate/auditTemplate/toSave?identification=${identification}','80%', '50%','','添加,关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 添加审核意见模板</a></div>
+			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
 			<h2>审批意见</h2>
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
@@ -714,23 +714,8 @@
 			content: url,
 			btn: split,
 			btn1: function(index, layero){
-				var body = top.layer.getChildFrame('body', index);
-				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-				var inputForm = body.find('#inputForm');
-				var top_iframe;
-				if(target){
-					top_iframe = target;//如果指定了iframe，则在改frame中跳转
-				}else{
-					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-				}
-				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-				if(iframeWin.contentWindow.doSubmit(1) ){
-					// top.layer.close(index);//关闭对话框。
-					setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
-					setTimeout(function(){top.layer.close(document.getElementById('iframe').contentWindow.location.reload())}, 100);
-				}
-			},
-			btn2:function(index){
+				top.layer.close(index)
+				document.getElementById('iframe').contentWindow.location.reload();
 			}
 		});
 	}

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsAudit.jsp

@@ -533,23 +533,8 @@
 						content: url,
 						btn: split,
 						btn1: function(index, layero){
-							var body = top.layer.getChildFrame('body', index);
-							var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-							var inputForm = body.find('#inputForm');
-							var top_iframe;
-							if(target){
-								top_iframe = target;//如果指定了iframe，则在改frame中跳转
-							}else{
-								top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-							}
-							inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-							if(iframeWin.contentWindow.doSubmit(1) ){
-								// top.layer.close(index);//关闭对话框。
-								setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
-								setTimeout(function(){top.layer.close(document.getElementById('iframe').contentWindow.location.reload())}, 100);
-							}
-						},
-						btn2:function(index){
+							top.layer.close(index)
+							document.getElementById('iframe').contentWindow.location.reload();
 						}
 					});
 				}
@@ -574,7 +559,7 @@
 
 	</form:form>
 		<div class="form-group-label">
-			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('添加模板', '${ctx}/auditTemplate/auditTemplate/toSave?identification=${identification}','80%', '50%','','添加,关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 添加审核意见模板</a></div>
+			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
 			<h2>提交说明</h2>
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsDownAudit.jsp

@@ -562,23 +562,8 @@
 						content: url,
 						btn: split,
 						btn1: function(index, layero){
-							var body = top.layer.getChildFrame('body', index);
-							var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-							var inputForm = body.find('#inputForm');
-							var top_iframe;
-							if(target){
-								top_iframe = target;//如果指定了iframe，则在改frame中跳转
-							}else{
-								top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-							}
-							inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-							if(iframeWin.contentWindow.doSubmit(1) ){
-								// top.layer.close(index);//关闭对话框。
-								setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
-								setTimeout(function(){top.layer.close(document.getElementById('iframe').contentWindow.location.reload())}, 100);
-							}
-						},
-						btn2:function(index){
+							top.layer.close(index)
+							document.getElementById('iframe').contentWindow.location.reload();
 						}
 					});
 				}
@@ -601,7 +586,7 @@
 
 	</form:form>
 		<div class="form-group-label">
-			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('添加模板', '${ctx}/auditTemplate/auditTemplate/toSave?identification=${identification}','80%', '50%','','添加,关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 添加审核意见模板</a></div>
+			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
 			<h2>审批意见</h2>
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>

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

@@ -780,23 +780,8 @@
 						content: url,
 						btn: split,
 						btn1: function(index, layero){
-							var body = top.layer.getChildFrame('body', index);
-							var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-							var inputForm = body.find('#inputForm');
-							var top_iframe;
-							if(target){
-								top_iframe = target;//如果指定了iframe，则在改frame中跳转
-							}else{
-								top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-							}
-							inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-							if(iframeWin.contentWindow.doSubmit(1) ){
-								// top.layer.close(index);//关闭对话框。
-								setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
-								setTimeout(function(){top.layer.close(document.getElementById('iframe').contentWindow.location.reload())}, 100);
-							}
-						},
-						btn2:function(index){
+							top.layer.close(index)
+							document.getElementById('iframe').contentWindow.location.reload();
 						}
 					});
 				}
@@ -847,7 +832,7 @@
 
 	</form:form>
 		<div class="form-group-label">
-			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('添加模板', '${ctx}/auditTemplate/auditTemplate/toSave?identification=${identification}','80%', '50%','','添加,关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 添加审核意见模板</a></div>
+			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
 			<h2>审批意见</h2>
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>

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

@@ -1390,7 +1390,7 @@
 		</form:form>
 
 		<div class="form-group-label">
-			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre1('添加模板', '${ctx}/auditTemplate/auditTemplate/toSave?identification=${identification}','80%', '50%','','添加,关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 添加审核意见模板</a></div>
+			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre1('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
 			<h2>审批意见</h2>
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
@@ -1421,23 +1421,8 @@
 			content: url,
 			btn: split,
 			btn1: function(index, layero){
-				var body = top.layer.getChildFrame('body', index);
-				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-				var inputForm = body.find('#inputForm');
-				var top_iframe;
-				if(target){
-					top_iframe = target;//如果指定了iframe，则在改frame中跳转
-				}else{
-					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-				}
-				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-				if(iframeWin.contentWindow.doSubmit(1) ){
-					// top.layer.close(index);//关闭对话框。
-					setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
-					setTimeout(function(){top.layer.close(document.getElementById('iframe').contentWindow.location.reload())}, 100);
-				}
-			},
-			btn2:function(index){
+				top.layer.close(index)
+				document.getElementById('iframe').contentWindow.location.reload();
 			}
 		});
 	}

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

@@ -36,38 +36,13 @@
 		<div class="full-width fl">
 			<div class="layui-row">
 				<div class="form-group-label">
-					<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('添加模板', '${ctx}/auditTemplate/auditTemplate/toSave?identification=${identification}','80%', '50%','','添加,关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 添加审核意见模板</a></div>
+					<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
 					<h2>审核意见</h2>
 				</div>
 				<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value">${auditOpinion}</iframe>
 				<form:form id="searchForm" modelAttribute="projectReportData" action="" method="post" class="layui-form">
 					<div class="commonQuery">
 					<input type="hidden" id="reimburseRemarks" name="reimburseRemarks" value="${auditOpinion}" maxlength="250">
-<%--					<div class="layui-item layui-col-sm12 lw7 with-textarea">--%>
-							<%--						<label class="layui-form-label double-line"><span class="require-item">*</span>审核意见：</label>--%>
-							<%--						<div class="layui-input-block">--%>
-							<%--							<div class="layui-item layui-col-sm6 lw7 with-textarea">--%>
-							<%--								<div class="layui-input-block" style="margin-left:0px;position: relative">--%>
-							<%--									<textarea placeholder="请输入审核意见:" id="reimburseRemarks" name="reimburseRemarks" style="width: 100%" rows="10" class="form-control required" maxlength="500">${auditOpinion}</textarea>--%>
-							<%--									<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>--%>
-							<%--									<input type="file" name="upload_files" style="display: none;">--%>
-							<%--								</div>--%>
-							<%--							</div>--%>
-							<%--							<div class="layui-item layui-col-sm4 lw6 with-textarea">--%>
-							<%--								<div class="layui-input-block" style="margin-left:10px;">--%>
-							<%--									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>--%>
-							<%--									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>--%>
-							<%--									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>--%>
-							<%--									<div style="padding: 5px 0px;">--%>
-							<%--										<form:select path="consultantRemarks" id="auditOpinion" lay-filter="zixunOpinion" lay-verify="zixunOpinion" class="form-control simple-select">--%>
-							<%--											<form:option value=""/>--%>
-							<%--											<form:options items="${fns:getMainDictListOnProjectAdvent('consultant_comments')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
-							<%--										</form:select>--%>
-							<%--									</div>--%>
-							<%--								</div>--%>
-							<%--							</div>--%>
-							<%--						</div>--%>
-							<%--					</div>--%>
 					</div>
 				</form:form>
 			</div>
@@ -147,23 +122,8 @@
 			content: url,
 			btn: split,
 			btn1: function(index, layero){
-				var body = top.layer.getChildFrame('body', index);
-				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-				var inputForm = body.find('#inputForm');
-				var top_iframe;
-				if(target){
-					top_iframe = target;//如果指定了iframe，则在改frame中跳转
-				}else{
-					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-				}
-				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-				if(iframeWin.contentWindow.doSubmit(1) ){
-					// top.layer.close(index);//关闭对话框。
-					setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
-					setTimeout(function(){top.layer.close(document.getElementById('iframe').contentWindow.location.reload())}, 100);
-				}
-			},
-			btn2:function(index){
+				top.layer.close(index)
+				document.getElementById('iframe').contentWindow.location.reload();
 			}
 		});
 	}

src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowAudit.jsp

@@ -186,27 +186,16 @@
 <%--					</div>--%>
 <%--				</div>--%>
 <%--			</div>--%>
+			<div class="form-group-label">
+				<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
+				<h2>审批意见</h2>
+			</div>
+			<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批意见</h2></div>
-				<div class="layui-item layui-col-sm8 lw6 with-textarea">
-					<div class="layui-input-block" style="margin-left:10px;position: relative">
-						<form:textarea placeholder="请输入意见:" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
-						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
-						<input type="file" name="upload_files" style="display: none;">
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm4 lw6 with-textarea">
-					<div class="layui-input-block" style="margin-left:10px;">
-						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
-						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
-						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
-						<div style="padding: 5px 0px;">
-							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
-								<form:option value=""/>
-								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-							</form:select>
-						</div>
-					</div>
+				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<act:flowChart procInsId="${workContractRecord.act.procInsId}"/>
+					<act:histoicFlow procInsId="${workContractRecord.act.procInsId}"/>
 				</div>
 			</div>
 			<div class="form-group layui-row">
@@ -221,28 +210,31 @@
 	</div>
 </div>
 <script>
-	$(document).ready(function() {
-		$("#clearOpinon").click(function(){
-			var s=$("input[name='sh']").length;
-			for(var i=0;i<s;i++){
-				$("input[name='sh']").attr("checked",false)
-				layui.form.render();
-
+	function f1(row) {
+		// window.parent.document.getElementById('opinion').value = row;
+		$("#opinion").val(row)
+	}
+	function openDialogre(title,url,width,height,target,buttons) {
+		if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+			width = 'auto';
+			height = 'auto';
+		} else {//如果是PC端，根据用户设置的width和height显示。
+		}
+		var split = buttons.split(",");
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			maxmin: true, //开启最大化最小化按钮
+			skin: 'three-btns',
+			content: url,
+			btn: split,
+			btn1: function(index, layero){
+				top.layer.close(index)
+				document.getElementById('iframe').contentWindow.location.reload();
 			}
-			$("#opinion").val("");
-		})
-		layui.use(['form', 'layer'], function () {
-			var form = layui.form;
-			//下拉框监听器
-			layui.form.on('select(opinion)', function(data){
-				var span=data.value;
-				if(span!=""){
-					var opinion=$("#opinion").val()+span+";"
-					$("#opinion").val(opinion);
-				}
-			});
 		});
-	})
+	}
 </script>
 </body>
 </html>

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

@@ -116,7 +116,7 @@
                                     <label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
                                     <div class="layui-input-block">
                                         <input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" disabled id="jine" value="0" <c:if test="${workContractInfo.contractInformation=='0'}">checked</c:if>>
-                                        <input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" disabled id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
+                                        <input type="radio" title="费率合同" lay-filter="jine" name="contractInformation" disabled id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
                                     </div>
                                 </div>
                                 <div class="layui-item layui-col-sm6">
@@ -279,7 +279,7 @@
 
             </form:form>
         <div class="form-group-label">
-            <div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('添加模板', '${ctx}/auditTemplate/auditTemplate/toSave?identification=${identification}','80%', '50%','','添加,关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 添加审核意见模板</a></div>
+            <div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
             <h2>审批意见</h2>
         </div>
         <iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
@@ -316,23 +316,8 @@
                 content: url,
                 btn: split,
                 btn1: function(index, layero){
-                    var body = top.layer.getChildFrame('body', index);
-                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                    var inputForm = body.find('#inputForm');
-                    var top_iframe;
-                    if(target){
-                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
-                    }else{
-                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-                    }
-                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-                    if(iframeWin.contentWindow.doSubmit(1) ){
-                        // top.layer.close(index);//关闭对话框。
-                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
-                        setTimeout(function(){top.layer.close(document.getElementById('iframe').contentWindow.location.reload())}, 100);
-                    }
-                },
-                btn2:function(index){
+                    top.layer.close(index)
+                    document.getElementById('iframe').contentWindow.location.reload();
                 }
             });
         }

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

@@ -34,12 +34,12 @@
         }
         $(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(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());
@@ -132,12 +132,12 @@
 
 			if("${workContractInfo.contractInformation}" == "1"){
 				$("#contractPrice").parent().parent().hide();
-				$("#contractPrice").removeClass("judgment")
+				$("#contractPrice").removeClass("required")
 				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
-				$("#otherDetails").attr("class","form-control layui-input judgment")
+				$("#otherDetails").attr("class","form-control layui-input required")
 			}else{
 				$("#contractPrice").parent().parent().show();
-				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#contractPrice").attr("class","form-control required number layui-input")
 				$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
 				$("#otherDetails").attr("class","form-control layui-input")
 			}
@@ -646,7 +646,7 @@
 								<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
 								<div class="layui-input-block">
 									<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" checked id="jine" value="0" <c:if test="${workContractInfo.contractInformation=='0'}">checked</c:if>>
-									<input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
+									<input type="radio" title="费率合同" lay-filter="jine" name="contractInformation" id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
@@ -678,13 +678,13 @@
 							<div class="layui-item layui-col-sm12" id="chargeCriterionList">
 								<label class="layui-form-label">收费标准</label>
 								<div class="layui-input-block">
-									<form:checkboxes path="chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
+										<form:checkboxes path="chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm12">
-								<label class="layui-form-label ">其他详情：</label>
+								<label class="layui-form-label "></label>
 								<div class="layui-input-block">
-									<form:input path="otherDetails" readonly="true" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
+									<form:input path="otherDetails" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm12 with-textarea">
@@ -888,31 +888,35 @@
 		layui.use('form', function () {
 			var form = layui.form;
 			form.render();
-
 			//复选框监听器
 			form.on('checkbox(chargeCriterionList)', function(data){
+				var zhi=$("#otherDetails").val();
 				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("");
+				if ($(this).prop("checked")==true){
+					zhi+=$(this).val()+";"
 				}
+				$("#otherDetails").val(zhi);
+				// if(ids.indexOf("4")!=-1){
+				// 	document.getElementById("otherDetails").readOnly=false
+				// }else{
+				// 	document.getElementById("otherDetails").readOnly=true
+				// 	$("#otherDetails").val("");
+				// }
 			});
 			layui.form.on('radio(jine)', function(data){
 				var span=data.value;
 				if(span==1){
 					$("#contractPrice").parent().parent().hide();
-					$("#contractPrice").removeClass("judgment")
+					$("#contractPrice").removeClass("required")
 					$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
-					$("#otherDetails").attr("class","form-control layui-input judgment")
+					$("#otherDetails").attr("class","form-control layui-input required")
 
 				}else{
 					$("#contractPrice").parent().parent().show();
-					$("#contractPrice").attr("class","form-control judgment number layui-input")
+					$("#contractPrice").attr("class","form-control required number layui-input")
 					$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
 					$("#otherDetails").attr("class","form-control layui-input")
 				}

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

@@ -671,7 +671,7 @@
 								<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
 								<div class="layui-input-block">
 									<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" checked id="jine" value="0" <c:if test="${workContractInfo.contractInformation=='0'}">checked</c:if>>
-									<input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
+									<input type="radio" title="费率合同" lay-filter="jine" name="contractInformation" id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
@@ -903,11 +903,10 @@
 		layui.use('form', function () {
 			var form = layui.form;
 			form.render();
-			var zhi=$("#otherDetails").val();
 			//复选框监听器
 			form.on('checkbox(chargeCriterionList)', function(data){
 				var ids = [];
-
+				var zhi=$("#otherDetails").val();
 				$("input[name='chargeCriterionList']:checked").each(function(i){
 					ids.push($(this).val());
 				})
@@ -929,7 +928,6 @@
 					$("#contractPrice").removeClass("judgment")
 					$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
 					$("#otherDetails").attr("class","form-control layui-input judgment")
-
 				}else{
 					$("#contractPrice").parent().parent().show();
 					$("#contractPrice").attr("class","form-control judgment number layui-input")

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

@@ -99,12 +99,12 @@
 			//判定合同金额类别
 			if("${workContractInfo.contractInformation}" == "1"){
 				$("#contractPrice").parent().parent().hide();
-				$("#contractPrice").removeClass("judgment")
+				$("#contractPrice").removeClass("required")
 				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
-				$("#otherDetails").attr("class","form-control layui-input judgment")
+				$("#otherDetails").attr("class","form-control layui-input required")
 			}else{
 				$("#contractPrice").parent().parent().show();
-				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#contractPrice").attr("class","form-control required number layui-input")
 				$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
 				$("#otherDetails").attr("class","form-control layui-input")
 			}
@@ -614,7 +614,7 @@
 							<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
 							<div class="layui-input-block">
 								<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" readonly id="jine" value="0" <c:if test="${workContractInfo.contractInformation=='0'}">checked</c:if>>
-								<input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" readonly id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
+								<input type="radio" title="费率合同" lay-filter="jine" name="contractInformation" readonly id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
@@ -639,7 +639,7 @@
 						<div class="layui-item layui-col-sm12">
 							<label class="layui-form-label "><!--其他详情：--></label>
 							<div class="layui-input-block">
-								<form:input placeholder="请选择收费标准" path="otherDetails" id="otherDetails" htmlEscape="false" maxlength="255" class="form-control layui-input"/>
+								<form:input placeholder="请选择收费标准" path="otherDetails" id="otherDetails" htmlEscape="false" maxlength="255" class="form-control layui-input required"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm12 with-textarea">
@@ -1016,10 +1016,10 @@
 		layui.use('form', function () {
 			var form = layui.form;
 			form.render();
-			var zhi=$("#otherDetails").val();
 			//复选框监听器
 			form.on('checkbox(chargeCriterionList)', function(data){
 				var ids = [];
+				var zhi=$("#otherDetails").val();
 				$("input[name='chargeCriterionList']:checked").each(function(i){
 					ids.push($(this).val())
 				})
@@ -1037,13 +1037,13 @@
 				var span=data.value;
 				if(span==1){
 					$("#contractPrice").parent().parent().hide();
-					$("#contractPrice").removeClass("judgment")
+					$("#contractPrice").removeClass("required")
 					$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
-					$("#otherDetails").attr("class","form-control layui-input judgment")
+					$("#otherDetails").attr("class","form-control layui-input required")
 
 				}else{
 					$("#contractPrice").parent().parent().show();
-					$("#contractPrice").attr("class","form-control judgment number layui-input")
+					$("#contractPrice").attr("class","form-control required number layui-input")
 					$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
 					$("#otherDetails").attr("class","form-control layui-input")
 				}

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

@@ -175,7 +175,7 @@
 							<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
 							<div class="layui-input-block">
 								<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" disabled id="jine" value="0" <c:if test="${workContractInfo.contractInformation=='0'}">checked</c:if>>
-								<input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" disabled id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
+								<input type="radio" title="费率合同" lay-filter="jine" name="contractInformation" disabled id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordAudit.jsp

@@ -165,7 +165,7 @@
 					<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
 					<div class="layui-input-block">
 						<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" disabled id="jine" value="0" <c:if test="${workContractRecord.workContractInfo.contractInformation=='0'}">checked</c:if>>
-						<input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" disabled id="jine1" value="1" <c:if test="${workContractRecord.workContractInfo.contractInformation=='1'}">checked</c:if>>
+						<input type="radio" title="费率合同" lay-filter="jine" name="contractInformation" disabled id="jine1" value="1" <c:if test="${workContractRecord.workContractInfo.contractInformation=='1'}">checked</c:if>>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -357,7 +357,7 @@
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 		<div class="form-group-label">
-			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('添加模板', '${ctx}/auditTemplate/auditTemplate/toSave?identification=${identification}','80%', '50%','','添加,关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 添加审核意见模板</a></div>
+			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
 			<h2>审批意见</h2>
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
@@ -391,23 +391,8 @@
 			content: url,
 			btn: split,
 			btn1: function(index, layero){
-				var body = top.layer.getChildFrame('body', index);
-				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-				var inputForm = body.find('#inputForm');
-				var top_iframe;
-				if(target){
-					top_iframe = target;//如果指定了iframe，则在改frame中跳转
-				}else{
-					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-				}
-				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-				if(iframeWin.contentWindow.doSubmit(1) ){
-					// top.layer.close(index);//关闭对话框。
-					setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
-					setTimeout(function(){top.layer.close(document.getElementById('iframe').contentWindow.location.reload())}, 100);
-				}
-			},
-			btn2:function(index){
+				top.layer.close(index)
+				document.getElementById('iframe').contentWindow.location.reload();
 			}
 		});
 	}

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordForm.jsp

@@ -58,12 +58,12 @@
             // });
 			if("${workContractRecord.workContractInfo.contractInformation}" == "1"){
 				$("#contractPrice").parent().parent().hide();
-				$("#contractPrice").removeClass("judgment")
+				$("#contractPrice").removeClass("required")
 				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
-				$("#otherDetails").attr("class","form-control layui-input judgment")
+				$("#otherDetails").attr("class","form-control layui-input required")
 			}else{
 				$("#contractPrice").parent().parent().show();
-				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#contractPrice").attr("class","form-control required number layui-input")
 				$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
 				$("#otherDetails").attr("class","form-control layui-input")
 			}
@@ -97,16 +97,16 @@
 			$("#contractFee").change(function(){
 				//状态为其他的时候  添加required样式
 				if($(this).val() == "4"){
-					$("#contractFeeDoc").attr("class","form-control judgment");
+					$("#contractFeeDoc").attr("class","form-control required");
 				}else{
 					$("#contractFeeDoc").attr("class","form-control");
 				}
 			});
-			$("#contractType").attr("class","form-control judgment");
+			$("#contractType").attr("class","form-control required");
 			/* $("#contractType").change(function(){
                  //状态为其他的时候  添加required样式
                  if($(this).val() == "5"){
-                     $("#contractTypeDoc").attr("class","form-control judgment");
+                     $("#contractTypeDoc").attr("class","form-control required");
                  }else{
                      $("#contractTypeDoc").attr("class","form-control");
                  }
@@ -188,21 +188,21 @@
 					<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>
 					<div class="layui-input-block with-icon">
 						<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="workContractInfo.client.id"  value="${workContractRecord.workContractInfo.client.id}"  title="选择客户" labelName="workContractInfo.client.name"
-											  cssStyle="background-color:#fff" labelValue="${workContractRecord.workContractInfo.client.name}" cssClass="form-control layui-input judgment" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
+											  cssStyle="background-color:#fff" labelValue="${workContractRecord.workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
 
 					</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 path="workContractInfo.name" htmlEscape="false" placeholder="请输入合同名称"   class="form-control judgment layui-input"/>
+						<form:input path="workContractInfo.name" htmlEscape="false" placeholder="请输入合同名称"   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">
-						<input placeholder="请选择签订日期" style="background-color: #fff" class="laydate-icondate layui-input form-control layer-date laydate-icon judgment" readonly="readonly" id="contractDate" name="workContractInfo.contractDate" value="<fmt:formatDate value="${workContractRecord.workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
+						<input placeholder="请选择签订日期" style="background-color: #fff" class="laydate-icondate layui-input form-control layer-date laydate-icon required" readonly="readonly" id="contractDate" name="workContractInfo.contractDate" value="<fmt:formatDate value="${workContractRecord.workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -220,7 +220,7 @@
 				<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="workContractInfo.contractTypeDoc" id="contractTypeDoc" cssClass="form-control judgment simple-select">
+						<form:select path="workContractInfo.contractTypeDoc" id="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>
@@ -230,13 +230,13 @@
 					<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
 					<div class="layui-input-block">
 						<input type="radio" title="金额合同" lay-filter="jine" name="workContractInfo.contractInformation" checked id="jine" value="0" <c:if test="${workContractRecord.workContractInfo.contractInformation=='0'}">checked</c:if>>
-						<input type="radio" title="框架合同" lay-filter="jine" name="workContractInfo.contractInformation" id="jine1" value="1" <c:if test="${workContractRecord.workContractInfo.contractInformation=='1'}">checked</c:if>>
+						<input type="radio" title="费率合同" lay-filter="jine" name="workContractInfo.contractInformation" id="jine1" value="1" <c:if test="${workContractRecord.workContractInfo.contractInformation=='1'}">checked</c:if>>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额 (元)<br/>预计金额：</label>
 					<div class="layui-input-block">
-						<form:input path="workContractInfo.contractPrice" id="contractPrice" htmlEscape="false"  placeholder="请输入合同金额/预计金额"   pattern="#.00" class="form-control judgment number  layui-input"/>
+						<form:input path="workContractInfo.contractPrice" id="contractPrice" htmlEscape="false"  placeholder="请输入合同金额/预计金额"   pattern="#.00" class="form-control required number  layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -392,11 +392,10 @@
 	layui.use('form', function () {
 		var form = layui.form;
 		form.render();
-		var zhi=$("#otherDetails").val();
 		//复选框监听器
 		form.on('checkbox(chargeCriterionList)', function(data){
+			var zhi=$("#otherDetails").val();
 			var ids = [];
-
 			$("input[name='chargeCriterionList']:checked").each(function(i){
 				ids.push($(this).val());
 			})
@@ -409,13 +408,13 @@
 			var span=data.value;
 			if(span==1){
 				$("#contractPrice").parent().parent().hide();
-				$("#contractPrice").removeClass("judgment")
+				$("#contractPrice").removeClass("required")
 				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
-				$("#otherDetails").attr("class","form-control layui-input judgment")
+				$("#otherDetails").attr("class","form-control layui-input required")
 
 			}else{
 				$("#contractPrice").parent().parent().show();
-				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#contractPrice").attr("class","form-control required number layui-input")
 				$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
 				$("#otherDetails").attr("class","form-control layui-input")
 			}

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordModifyApply.jsp

@@ -51,24 +51,24 @@
 			});
 			if("${workContractRecord.workContractInfo.contractInformation}" == "1"){
 				$("#contractPrice").parent().parent().hide();
-				$("#contractPrice").removeClass("judgment")
+				$("#contractPrice").removeClass("required")
 				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
-				$("#otherDetails").attr("class","form-control layui-input judgment")
+				$("#otherDetails").attr("class","form-control layui-input required")
 			}else{
 				$("#contractPrice").parent().parent().show();
-				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#contractPrice").attr("class","form-control required number layui-input")
 				$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
 				$("#otherDetails").attr("class","form-control layui-input")
 			}
 			$("#contractFee").change(function(){
 				//状态为其他的时候  添加required样式
 				if($(this).val() == "4"){
-					$("#contractFeeDoc").attr("class","form-control judgment");
+					$("#contractFeeDoc").attr("class","form-control required");
 				}else{
 					$("#contractFeeDoc").attr("class","form-control");
 				}
 			});
-			$("#contractType").attr("class","form-control judgment");
+			$("#contractType").attr("class","form-control required");
 
 			laydate.render({
 				elem: '#contractDate',
@@ -133,20 +133,20 @@
 					<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>
 					<div class="layui-input-block with-icon">
 						<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="workContractInfo.client.id"  value="${workContractRecord.workContractInfo.client.id}"  title="选择客户" labelName="workContractInfo.client.name"
-											  cssStyle="background-color:#fff" labelValue="${workContractRecord.workContractInfo.client.name}" cssClass="form-control layui-input judgment" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
+											  cssStyle="background-color:#fff" labelValue="${workContractRecord.workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
 
 					</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 path="workContractInfo.name" htmlEscape="false" placeholder="请输入合同名称"   class="form-control judgment layui-input"/>
+						<form:input path="workContractInfo.name" htmlEscape="false" placeholder="请输入合同名称"   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">
-						<input placeholder="请选择签订日期" style="background-color: #fff" class="laydate-icondate layui-input form-control layer-date laydate-icon judgment" readonly="readonly" id="contractDate" name="workContractInfo.contractDate" value="<fmt:formatDate value="${workContractRecord.workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
+						<input placeholder="请选择签订日期" style="background-color: #fff" class="laydate-icondate layui-input form-control layer-date laydate-icon required" readonly="readonly" id="contractDate" name="workContractInfo.contractDate" value="<fmt:formatDate value="${workContractRecord.workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -156,7 +156,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">合同终止日期：</label>
+					<label class="layui-form-label double-line">合同终止日期：</label>
 					<div class="layui-input-block">
 						<input placeholder="请输入合同终止日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="closingDate" name="workContractInfo.closingDate" value="<fmt:formatDate value="${workContractRecord.workContractInfo.closingDate}" pattern="yyyy-MM-dd"/>">
 					</div>
@@ -164,7 +164,7 @@
 				<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="workContractInfo.contractTypeDoc" id="contractTypeDoc" cssClass="form-control judgment simple-select">
+						<form:select path="workContractInfo.contractTypeDoc" id="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>
@@ -174,13 +174,13 @@
 					<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
 					<div class="layui-input-block">
 						<input type="radio" title="金额合同" lay-filter="jine" name="workContractInfo.contractInformation" checked id="jine" value="0" <c:if test="${workContractRecord.workContractInfo.contractInformation=='0'}">checked</c:if>>
-						<input type="radio" title="框架合同" lay-filter="jine" name="workContractInfo.contractInformation" id="jine1" value="1" <c:if test="${workContractRecord.workContractInfo.contractInformation=='1'}">checked</c:if>>
+						<input type="radio" title="费率合同" lay-filter="jine" name="workContractInfo.contractInformation" id="jine1" value="1" <c:if test="${workContractRecord.workContractInfo.contractInformation=='1'}">checked</c:if>>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额 (元)<br/>预计金额：</label>
 					<div class="layui-input-block">
-						<form:input path="workContractInfo.contractPrice" id="contractPrice" htmlEscape="false"  placeholder="请输入合同金额/预计金额"   pattern="#.00" class="form-control judgment number  layui-input"/>
+						<form:input path="workContractInfo.contractPrice" id="contractPrice" htmlEscape="false"  placeholder="请输入合同金额/预计金额"   pattern="#.00" class="form-control required number  layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -364,11 +364,10 @@
 	layui.use('form', function () {
 		var form = layui.form;
 		form.render();
-		var zhi=$("#otherDetails").val();
 		//复选框监听器
 		form.on('checkbox(chargeCriterionList)', function(data){
 			var ids = [];
-
+			var zhi=$("#otherDetails").val();
 			$("input[name='chargeCriterionList']:checked").each(function(i){
 				ids.push($(this).val());
 			})
@@ -381,13 +380,13 @@
 			var span=data.value;
 			if(span==1){
 				$("#contractPrice").parent().parent().hide();
-				$("#contractPrice").removeClass("judgment")
+				$("#contractPrice").removeClass("required")
 				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
-				$("#otherDetails").attr("class","form-control layui-input judgment")
+				$("#otherDetails").attr("class","form-control layui-input required")
 
 			}else{
 				$("#contractPrice").parent().parent().show();
-				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#contractPrice").attr("class","form-control required number layui-input")
 				$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
 				$("#otherDetails").attr("class","form-control layui-input")
 			}

src/main/webapp/webpage/modules/workcontractrecord/workContractView.jsp

@@ -135,7 +135,7 @@
 					<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
 					<div class="layui-input-block">
 						<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" disabled id="jine" value="0" <c:if test="${workContractRecord.workContractInfo.contractInformation=='0'}">checked</c:if>>
-						<input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" disabled id="jine1" value="1" <c:if test="${workContractRecord.workContractInfo.contractInformation=='1'}">checked</c:if>>
+						<input type="radio" title="费率合同" lay-filter="jine" name="contractInformation" disabled id="jine1" value="1" <c:if test="${workContractRecord.workContractInfo.contractInformation=='1'}">checked</c:if>>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -302,11 +302,10 @@
 	layui.use('form', function () {
 		var form = layui.form;
 		form.render();
-		var zhi=$("#otherDetails").val();
 		//复选框监听器
 		form.on('checkbox(chargeCriterionList)', function(data){
 			var ids = [];
-
+			var zhi=$("#otherDetails").val();
 			$("input[name='chargeCriterionList']:checked").each(function(i){
 				ids.push($(this).val());
 			})

src/main/webapp/webpage/modules/workinvoice/workInvoiceAuditEnd.jsp

@@ -758,23 +758,8 @@
 							content: url,
 							btn: split,
 							btn1: function(index, layero){
-								var body = top.layer.getChildFrame('body', index);
-								var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-								var inputForm = body.find('#inputForm');
-								var top_iframe;
-								if(target){
-									top_iframe = target;//如果指定了iframe，则在改frame中跳转
-								}else{
-									top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-								}
-								inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-								if(iframeWin.contentWindow.doSubmit(1) ){
-									// top.layer.close(index);//关闭对话框。
-									setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
-									setTimeout(function(){top.layer.close(document.getElementById('iframe').contentWindow.location.reload())}, 100);
-								}
-							},
-							btn2:function(index){
+								top.layer.close(index)
+								document.getElementById('iframe').contentWindow.location.reload();
 							}
 						});
 					}
@@ -786,7 +771,7 @@
 		<div class="form-group layui-row page-end"></div>
 	</form:form>
 		<div class="form-group-label">
-			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('添加模板', '${ctx}/auditTemplate/auditTemplate/toSave?identification=${identification}','80%', '50%','','添加,关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 添加审核意见模板</a></div>
+			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
 			<h2>审批意见</h2>
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementAudit.jsp

@@ -497,7 +497,7 @@
 		<div class="form-group layui-row page-end"></div>
 	</form:form>
 		<div class="form-group-label">
-			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('添加模板', '${ctx}/auditTemplate/auditTemplate/toSave?identification=${identification}','80%', '50%','','添加,关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 添加审核意见模板</a></div>
+			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
 			<h2>审批意见</h2>
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
@@ -531,23 +531,8 @@
 			content: url,
 			btn: split,
 			btn1: function(index, layero){
-				var body = top.layer.getChildFrame('body', index);
-				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-				var inputForm = body.find('#inputForm');
-				var top_iframe;
-				if(target){
-					top_iframe = target;//如果指定了iframe，则在改frame中跳转
-				}else{
-					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-				}
-				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-				if(iframeWin.contentWindow.doSubmit(1) ){
-					// top.layer.close(index);//关闭对话框。
-					setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
-					setTimeout(function(){top.layer.close(document.getElementById('iframe').contentWindow.location.reload())}, 100);
-				}
-			},
-			btn2:function(index){
+				top.layer.close(index)
+				document.getElementById('iframe').contentWindow.location.reload();
 			}
 		});
 	}

src/main/webapp/webpage/modules/workreimbursement/workReimbursementCWAudit.jsp

@@ -817,7 +817,7 @@
             <div class="form-group layui-row page-end"></div>
         </form:form>
         <div class="form-group-label">
-            <div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('添加模板', '${ctx}/auditTemplate/auditTemplate/toSave?identification=${identification}','80%', '50%','','添加,关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 添加审核意见模板</a></div>
+            <div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
             <h2>审批意见</h2>
         </div>
         <iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
@@ -851,23 +851,8 @@
             content: url,
             btn: split,
             btn1: function(index, layero){
-                var body = top.layer.getChildFrame('body', index);
-                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                var inputForm = body.find('#inputForm');
-                var top_iframe;
-                if(target){
-                    top_iframe = target;//如果指定了iframe，则在改frame中跳转
-                }else{
-                    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-                }
-                inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-                if(iframeWin.contentWindow.doSubmit(1) ){
-                    // top.layer.close(index);//关闭对话框。
-                    setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
-                    setTimeout(function(){top.layer.close(document.getElementById('iframe').contentWindow.location.reload())}, 100);
-                }
-            },
-            btn2:function(index){
+                top.layer.close(index)
+                document.getElementById('iframe').contentWindow.location.reload();
             }
         });
     }