浏览代码

代码提交

user5 1 年之前
父节点
当前提交
31140faf73

+ 4 - 4
src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/controller/ProjectReportSignatureCallBackController.java

@@ -101,8 +101,8 @@ public class ProjectReportSignatureCallBackController extends BaseController {
             projectReportSignatureWork.setSignatureUploadFileUser(userName);
 
         }
-        //修改签章对应信息文件
-        projectReportSignatureWorkDao.updateReportSignatureInfo(projectReportSignatureWork);
+        //修改审定单签章对应信息文件
+        projectReportSignatureWorkDao.updateApprovalSignatureInfo(projectReportSignatureWork);
 
         return null;
     }
@@ -140,7 +140,7 @@ public class ProjectReportSignatureCallBackController extends BaseController {
     }
 
     /**
-     * 审定单签章回调操作
+     * 报告签章回调操作
      * @param presignCallBack  回调参数
      * @return
      */
@@ -189,7 +189,7 @@ public class ProjectReportSignatureCallBackController extends BaseController {
 
         }
         //修改签章对应信息文件
-        projectReportSignatureWorkDao.updateApprovalSignatureInfo(projectReportSignatureWork);
+        projectReportSignatureWorkDao.updateReportSignatureInfo(projectReportSignatureWork);
 
         return null;
     }

+ 3 - 3
src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/controller/ProjectReportSignatureWorkController.java

@@ -207,7 +207,7 @@ public class ProjectReportSignatureWorkController extends BaseController {
         }
 
         model.addAttribute("projectReportSignature", projectReportSignature);
-        return "modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkForm";
+        return "modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkReportForm";
     }
 
     /**
@@ -518,10 +518,10 @@ public class ProjectReportSignatureWorkController extends BaseController {
                     return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
                 }
 
-                if(t.getStatus() == 2){
+                if(approvalBySigId.getStatus() == 2){
                     addMessage(redirectAttributes, "报告签章申请已送审,无法重复送审");
                     return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
-                }else if(t.getStatus() == 5){
+                }else if(approvalBySigId.getStatus() == 5){
                     addMessage(redirectAttributes, "报告签章申请已审核完成,无法再次送审");
                     return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
                 }

+ 48 - 67
src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/service/ProjectReportSignatureWorkService.java

@@ -274,41 +274,33 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
 
         //根据签章类型进行保存
         if (projectReportSignature.getSignatureType().equals("1")){//报告签章
-
-            ProjectReportSignatureWork signatureWork = dao.get(projectReportSignature.getId());
             ReportSignature reportSignature = dao.getReportBySigId(projectReportSignature.getId());
-            ReportSignature approvalSignature = dao.getApprovalBySigId(projectReportSignature.getId());
             //判断签章类型是否发生改变
-            if (signatureWork.getSignatureType().equals(projectReportSignature.getSignatureType())){
-                //修改报告签章信息
-                if (null != reportSignature){
-                    signature.setId(reportSignature.getId());
-                    signature.preUpdate();
-                    dao.updateReportSignature(signature);
-                }else {
-                    signature.preInsert();
-                    dao.insertReportSignature(signature);
-                }
-
+            //修改报告签章信息
+            if (null != reportSignature){
+                signature.setId(reportSignature.getId());
+                signature.preUpdate();
+                dao.updateReportSignature(signature);
+            }else {
+                signature.preInsert();
+                dao.insertReportSignature(signature);
             }
 
+
         }else {
-            ProjectReportSignatureWork signatureWork = dao.get(projectReportSignature.getId());
-            ReportSignature reportSignature = dao.getReportBySigId(projectReportSignature.getId());
             ReportSignature approvalSignature = dao.getApprovalBySigId(projectReportSignature.getId());
             //判断签章类型是否发生改变
-            if (signatureWork.getSignatureType().equals(projectReportSignature.getSignatureType())){
-                //修改报告签章信息
-                if (null != reportSignature){
-                    signature.setId(reportSignature.getId());
-                    signature.preUpdate();
-                    dao.updateApprovalSignature(signature);
-                }else {
-                    signature.preInsert();
-                    dao.insertApprovalSignature(signature);
-                }
-
+            //修改报告签章信息
+            if (null != approvalSignature){
+                signature.setId(approvalSignature.getId());
+                signature.preUpdate();
+                dao.updateApprovalSignature(signature);
+            }else {
+                signature.preInsert();
+                dao.insertApprovalSignature(signature);
             }
+
+
         }
 
 
@@ -364,23 +356,18 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
             signature.preInsert();
             dao.insertApprovalSignature(signature);
         }else {
-            //根据签章类型进行保存
-            ProjectReportSignatureWork signatureWork = dao.get(projectReportSignature.getId());
-            ReportSignature reportSignature = dao.getReportBySigId(projectReportSignature.getId());
             ReportSignature approvalSignature = dao.getApprovalBySigId(projectReportSignature.getId());
-            //判断签章类型是否发生改变
-            if (signatureWork.getSignatureType().equals(projectReportSignature.getSignatureType())){
-                //修改报告签章信息
-                if (null != reportSignature){
-                    signature.setId(reportSignature.getId());
-                    signature.preUpdate();
-                    dao.updateApprovalSignature(signature);
-                }else {
-                    signature.preInsert();
-                    dao.insertApprovalSignature(signature);
-                }
-
+            //修改报告签章信息
+            if (null != approvalSignature){
+                signature.setId(approvalSignature.getId());
+                signature.preUpdate();
+                dao.updateApprovalSignature(signature);
+            }else {
+                signature.preInsert();
+                dao.insertApprovalSignature(signature);
             }
+
+
         }
 
 
@@ -489,21 +476,19 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
             }
 
         }else {
-            ProjectReportSignatureWork signatureWork = dao.get(projectReportSignature.getId());
             ReportSignature approvalSignature = dao.getApprovalBySigId(projectReportSignature.getId());
             //判断签章类型是否发生改变
-            if (signatureWork.getSignatureType().equals(projectReportSignature.getSignatureType())){
-                //修改报告签章信息
-                if (null != approvalSignature){
-                    signature.setId(approvalSignature.getId());
-                    signature.preUpdate();
-                    dao.updateApprovalSignature(signature);
-                }else {
-                    signature.preInsert();
-                    dao.insertApprovalSignature(signature);
-                }
-
+            //修改报告签章信息
+            if (null != approvalSignature){
+                signature.setId(approvalSignature.getId());
+                signature.preUpdate();
+                dao.updateApprovalSignature(signature);
+            }else {
+                signature.preInsert();
+                dao.insertApprovalSignature(signature);
             }
+
+
         }
 
 
@@ -597,21 +582,17 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
             signature.preInsert();
             dao.insertApprovalSignature(signature);
         }else {
-            //根据签章类型进行保存
-            ProjectReportSignatureWork signatureWork = dao.get(projectReportSignature.getId());
             //判断签章类型是否发生改变
-            if (signatureWork.getSignatureType().equals(projectReportSignature.getSignatureType())){
-                ReportSignature approvalSignature = dao.getApprovalBySigId(projectReportSignature.getId());
-                if (null != approvalSignature){
-                    signature.setId(approvalSignature.getId());
-                    signature.preUpdate();
-                    dao.updateApprovalSignature(signature);
-                }else {
-                    signature.preInsert();
-                    dao.insertApprovalSignature(signature);
-                }
-
+            ReportSignature approvalSignature = dao.getApprovalBySigId(projectReportSignature.getId());
+            if (null != approvalSignature){
+                signature.setId(approvalSignature.getId());
+                signature.preUpdate();
+                dao.updateApprovalSignature(signature);
+            }else {
+                signature.preInsert();
+                dao.insertApprovalSignature(signature);
             }
+
         }
 
         signature.setWorkAttachments(projectReportSignature.getWorkAttachments());

+ 2 - 1
src/main/resources/mappings/modules/signature/projectReport/ProjectReportSignatureDao.xml

@@ -555,10 +555,11 @@
 				su.NAME
 			FROM
 				sys_area_staff a
+				left join signature_electronic_info sei on sei.create_by = a.area_leader_id and sei.del_flag = 0
 				LEFT JOIN sys_user su ON su.id = a.area_leader_id
 				AND su.del_flag = '0'
 			WHERE
-				a.area_leader_id = #{id} and a.del_flag = '0'
+				a.area_leader_id = #{id} and a.del_flag = '0' and sei.status = 5
 				) y
 		union all
 			select x.* from (

+ 5 - 12
src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkApprovalForm.jsp

@@ -381,6 +381,7 @@
             <form:hidden path="id"/>
             <form:hidden path="signatureId"/>
             <input type="hidden" id="flagFile" value="">
+            <input type="hidden" id="signatureType" name="signatureType" value="${projectReportSignature.signatureType}">
 
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>签章项目信息</h2></div>
@@ -489,18 +490,10 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>签章类型:</label>
                     <div class="layui-input-block readOnlyFFF">
-                        <c:if test="${projectReportSignature.signatureType == null}">
-                            <form:select placeholder="请选择" path="signatureType"  class="form-control required judgment editable-select layui-input" id="signatureType" value="${projectReportSignature.signatureType}">
-                                <form:option value=""/>
-                                <form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                            </form:select>
-                        </c:if>
-                        <c:if test="${projectReportSignature.signatureType != null}">
-                            <form:select placeholder="请选择" path="signatureType" class="form-control judgment editable-select layui-input" disabled="true" id="signatureType" value="${projectReportSignature.signatureType}">
-                                <form:option value=""/>
-                                <form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                            </form:select>
-                        </c:if>
+                        <form:select placeholder="请选择" path="signatureType" class="form-control judgment editable-select layui-input" disabled="true" value="${projectReportSignature.signatureType}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
                     </div>
                 </div>
 

+ 4 - 12
src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkForm.jsp

@@ -577,18 +577,10 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>签章类型:</label>
                     <div class="layui-input-block readOnlyFFF">
-                        <c:if test="${projectReportSignature.signatureType == null}">
-                            <form:select placeholder="请选择" path="signatureType"  class="form-control required judgment editable-select layui-input" id="signatureType" value="${projectReportSignature.signatureType}">
-                                <form:option value=""/>
-                                <form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                            </form:select>
-                        </c:if>
-                        <c:if test="${projectReportSignature.signatureType != null}">
-                            <form:select placeholder="请选择" path="signatureType" class="form-control judgment editable-select layui-input" disabled="true" id="signatureType" value="${projectReportSignature.signatureType}">
-                                <form:option value=""/>
-                                <form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                            </form:select>
-                        </c:if>
+                        <form:select placeholder="请选择" path="signatureType"  class="form-control required judgment editable-select layui-input" id="signatureType" value="${projectReportSignature.signatureType}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
                     </div>
                 </div>
 

+ 861 - 0
src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkReportForm.jsp

@@ -0,0 +1,861 @@
+<%@ 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}/helloweba_editable-select/jquery.editable-select.min.js"></script>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
+    <script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
+    <script src="${ctxStatic}/common/html/js/script.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
+    <style>
+
+        #contractTypeDoc-error{
+            top:80px;
+            left:0;
+        }
+        /*超过5个汉字,调整label的长度,以下是配套的*/
+        .layui-item .layui-form-label{
+            width:90px;
+        }
+        #projectReportSignatureRelationList td{
+            padding-left: 0px;
+            padding-right: 0px;
+        }
+    </style>
+    <script type="text/javascript">
+        var validateForm;
+        var isMasterClient = true;//是否是委托方
+        var clientCount = 0;
+        function doSubmit(i){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
+            console.log(i)
+            if(validateForm.form()){
+                if(i==2){
+                    $("#inputForm").attr("action","${ctx}/projectReport/projectReportSignature/tstore");
+                }else{
+
+                    var flag = $("#flagFile").val();
+                    if(flag == 'false'){
+                        top.layer.msg('附件信息未上传完成,请等待!', {icon: 0});
+                        return;
+                    }
+                    var length = $("#file_attachment").find("tr").length ;
+                    if(length == 0){
+                        top.layer.msg("请上传报告签章附件", {icon: 0});
+                        return;
+                    }
+                    var signatureType = $("#signatureType").val();
+                    if(signatureType == ''){
+                        top.layer.msg("请选择签章类型", {icon: 0});
+                        return;
+                    }
+                    var dutyPerson = $("#dutyPerson").val();
+                    if(dutyPerson == ''){
+                        top.layer.msg("请选择签章责任人", {icon: 0});
+                        return;
+                    }
+                    var flags=judgment();
+                    if (!flags){
+                        return flags;
+                    }
+                }
+                $("#inputForm").submit();
+                return true;
+            }else{
+                parent.layer.msg("信息未填写完整!", {icon: 5});
+            }
+            return false;
+        }
+        $(document).ready(function() {
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+            });
+
+            $("#attachment_btn").click(function () {
+                $("#attachment_file").click();
+            });
+            var radioVal ;
+            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);
+                    }
+                }
+            });
+
+        });
+
+        function insertTitle(tValue){
+            var type=$("#signatureType").val()
+            if (type == '1'){
+                $("#flagFile").val(false);
+                var files = $("#attachment_file")[0].files;
+                for(var i = 0;i<files.length;i++) {
+                    var file = files[i];
+                    var attachTypes = "doc,docx,pdf";
+                    var suffixResult = 0;
+                    var fileName = file.name.lastIndexOf(".");//获取到文件名开始到最后一个“.”的长度。
+                    var fileNameLength = file.name.length;//获取到文件名长度
+                    var suffix = file.name.substring(fileName + 1, fileNameLength);//截取后缀名
+                    suffix = suffix.toLowerCase();//后缀名转换小写
+                    attachTypes = attachTypes.toLowerCase();
+                    var attachTypeList = attachTypes.split(",");
+                    for (var x in attachTypeList) {
+                        if(attachTypeList[x] == suffix){
+                            suffixResult = 1;
+                            break;
+                        }
+                    }
+                    if(suffixResult == 0 ){
+                        top.layer.msg("上传附件只能为:"+attachTypes+" 类型文件", {icon: 0});
+                        return false;
+                    }
+
+                    var attachmentId = $("#id").val();
+                    var attachmentFlag = "173";
+                    /*console.log(file);*/
+                    var timestamp=new Date().getTime();
+
+                    var storeAs = "signatureProjectReportWork";
+                    var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
+                    var divId = "_attachment";
+                    $("#addFile"+divId).show();
+                    multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,0);
+                }
+            }else {
+                $("#flagFile").val(false);
+                var files = $("#attachment_file")[0].files;
+                for(var i = 0;i<files.length;i++) {
+                    var file = files[i];
+                    var attachTypes = "doc,docx,pdf";
+                    var suffixResult = 0;
+                    var fileName = file.name.lastIndexOf(".");//获取到文件名开始到最后一个“.”的长度。
+                    var fileNameLength = file.name.length;//获取到文件名长度
+                    var suffix = file.name.substring(fileName + 1, fileNameLength);//截取后缀名
+                    suffix = suffix.toLowerCase();//后缀名转换小写
+                    attachTypes = attachTypes.toLowerCase();
+                    var attachTypeList = attachTypes.split(",");
+                    for (var x in attachTypeList) {
+                        if(attachTypeList[x] == suffix){
+                            suffixResult = 1;
+                            break;
+                        }
+                    }
+                    if(suffixResult == 0 ){
+                        top.layer.msg("上传附件只能为:"+attachTypes+" 类型文件", {icon: 0});
+                        return false;
+                    }
+
+                    var attachmentId = $("#id").val();
+                    var attachmentFlag = "174";
+                    /*console.log(file);*/
+                    var timestamp=new Date().getTime();
+
+                    var storeAs = "signatureProjectReportWork";
+                    var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
+                    var divId = "_attachment";
+                    $("#addFile"+divId).show();
+                    multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,0);
+                }
+            }
+
+        }
+
+
+        function addFile() {
+            $("#attachment_file").click();
+        }
+
+        function addRow(list, idx, tpl, row){
+            bornTemplete(list, idx, tpl, row, idx);
+        }
+
+        function bornTemplete(list, idx, tpl, row, idx1){
+            $(list).append(Mustache.render(tpl, {
+                idx: idx, delBtn: true, row: row,
+                order:idx1 + 1
+            }));
+            $(list+idx).find("select").each(function(){
+                $(this).val($(this).attr("data-value"));
+            });
+            $(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
+                var ss = $(this).attr("data-value").split(',');
+                for (var i=0; i<ss.length; i++){
+                    if($(this).val() == ss[i]){
+                        $(this).attr("checked","checked");
+                    }
+                }
+            });
+        }
+        function delRow(obj, prefix){
+            var id = $(prefix+"_id");
+            var delFlag = $(prefix+"_delFlag");
+            $(obj).parent().parent().remove();
+        }
+
+
+
+
+
+        function addRow1(list, idx, tpl, row){
+            var idx1 = $("#projectReportSignatureRelationList tr").length;
+            if(idx1>0){
+                var count=0;
+                for (var i=1;i<=idx1;i++) {
+                    var delFlag = $("#projectReportSignatureRelationList").find("tr").eq(i-1).find("input").eq(1).val();
+                    if (delFlag == "1") {
+                        count = i;
+                    }
+                }
+                if (idx1>count){
+                    var id=$("#projectReportSignatureRelationList").find("tr").eq(count).find("input").eq(5).val();
+                    if (id!=undefined && id != ''){
+                        if (row== undefined){
+                            row={"isProject": "1","isProjectFalg": "1"};
+                            layui.form.render();
+                        }
+                    }else{
+                        parent.layer.msg("请选择项目报告信息",{icon:6});
+                        layui.form.render();
+                        return false;
+                    }
+                }
+            }
+            if(list == '#projectReportSignatureRelationList'){
+                bornTemplete1(list, idx, tpl, row, idx1);
+            }
+        }
+        function bornTemplete1(list, idx, tpl, row, idx1){
+            $(list).append(Mustache.render(tpl, {
+                idx: idx, delBtn: true, row: row,
+                order:idx1 + 1
+            }));
+            $(list+idx).find("select").each(function(){
+                $(this).val($(this).attr("data-value"));
+            });
+            $(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
+                var ss = $(this).attr("data-value").split(',');
+                for (var i=0; i<ss.length; i++){
+                    if($(this).val() == ss[i]){
+                        $(this).attr("checked","checked");
+                    }
+                }
+            });
+        }
+
+        function delRow1(obj, prefix) {
+            var id = $(prefix + "_signatureId");
+            var delFlag = $(prefix + "_delFlag");
+            if (id.val() == "") {
+                $(obj).parent().parent().remove();
+            } else if (delFlag.val() == "0") {
+                delFlag.val("1");
+                $(obj).html("&divide;").attr("title", "撤回删除");
+                $(obj).parent().parent().addClass("error");
+                $(obj).parent().parent().addClass("hide");
+            } else if (delFlag.val() == "1") {
+                delFlag.val("0");
+                $(obj).html("&times;").attr("title", "删除");
+                $(obj).parent().parent().removeClass("error");
+            }
+            var length=$("#projectReportSignatureRelationList tr").length;
+            var count=length;
+            for (var i=1;i<=length;i++) {
+                var delFlag = $("#projectReportSignatureRelationList").find("tr").eq(i-1).find("input").eq(1).val();
+                if (delFlag == "1") {
+                    count =count-1;
+                }
+            }
+            if(count==1){
+                layui.form.render();
+            }else if (count>1){
+                layui.form.render();
+            }else if(count == 0){
+                $("#projectFlag").val("");
+            }
+        }
+
+        function newSetPNumber(obj,ids,details){
+            var idx=ids.split("_")[0]
+            var idArray= new Array(); //定义一数组
+            idArray=obj.split(","); //字符分割
+
+            for (var k=0;k<idArray.length ;k++ )
+            {
+                $.ajax({
+                    async:false,
+                    type:'post',
+                    url:'${ctx}/projectReport/projectReportSignature/getPNumber',
+                    data:{
+                        "obj":idArray[k]
+                    },
+                    success:function(data){
+                        if(k>=1){
+                            var row = projectReportSignatureRelationListRowIdx;
+                            addRow1('#projectReportSignatureRelationList', projectReportSignatureRelationListRowIdx, projectReportSignatureRelationListTpl, data[k])
+                            projectReportSignatureRelationListRowIdx = projectReportSignatureRelationListRowIdx + 1;
+                            var d = JSON.parse(data);
+                            var workContractName="#projectReportSignatureRelationList"+row+"_workContractName";
+                            var projectNum="#projectReportSignatureRelationList"+row+"_projectNum";
+                            var clientName="#projectReportSignatureRelationList"+row+"_clientName";
+                            var reportDataNum="#projectReportSignatureRelationList"+row+"_reportDataNum";
+                            var projectName="#projectReportSignatureRelationList"+row+"_projectIdName";
+                            var id="#projectReportSignatureRelationList"+row+"_projectIdId";
+                            $(id).val(d.id);
+                            $(projectName).val(d.projectName);
+                            $(workContractName).val(d.workContractName);
+                            $(projectNum).val(d.projectNum);
+                            $(clientName).val(d.clientName);
+                            $(reportDataNum).val(d.reportDataNum);
+                            var areaId = $("#areaId").val();
+                            if(undefined ==areaId || null == areaId || '' == areaId){
+                                $("#areaId").val(d.areaId);
+                                $("#areaName").val(d.areaName);
+                            }
+                        }else{
+                            var d = JSON.parse(data);
+                            var workContractName="#"+idx+"_workContractName";
+                            var projectNum="#"+idx+"_projectNum";
+                            var clientName="#"+idx+"_clientName";
+                            var reportDataNum="#"+idx+"_reportDataNum";
+                            $(workContractName).val(d.workContractName);
+                            $(projectNum).val(d.projectNum);
+                            $(clientName).val(d.clientName);
+                            $(reportDataNum).val(d.reportDataNum);
+                            var areaId = $("#areaId").val();
+                            if(undefined ==areaId || null == areaId || '' == areaId){
+                                $("#areaId").val(d.areaId);
+                                $("#areaName").val(d.areaName);
+                            }
+                        }
+                    }
+                })
+            }
+
+            var length=$("#projectReportSignatureRelationList tr").length;
+            var count=length;
+            for (var i=1;i<=length;i++) {
+                var delFlag = $("#projectReportSignatureRelationList").find("tr").eq(i-1).find("input").eq(1).val();
+                if (delFlag == "1") {
+                    count =count-1;
+                }
+            }
+            if(count==1){
+                layui.form.render();
+            }else if (count>1){
+                layui.form.render();
+            }else if(count == 0){
+                $("#projectFlag").val("");
+            }
+
+        }
+
+        function setProjectValue(obj){
+            console.log('obj',obj)
+            var pro = false
+            $.ajax({
+                async:false,
+                type:'post',
+                url:'${ctx}/projectReport/projectReportSignature/checkProject',
+                data:{
+                    "obj":obj
+                },
+                success:function(data){
+                    pro = data
+                }
+
+            })
+            if (pro){
+                parent.layer.msg("项目已经存在列表中,无法添加",{icon:6});
+                $.ajax({
+                    async:false,
+                    type:'post',
+                    url:'${ctx}/projectReport/projectReportSignature/getPNumber',
+                    data:{
+                        "obj":obj
+                    },
+                    success:function(data){
+                        var d = JSON.parse(data);
+                        $("#projectId").val('');
+                        $("#projectName").val('');
+                        $("#workContractName").val('');
+                        $("#projectNum").val('');
+                        $("#clientName").val('');
+                        $("#reportDataNum").val('');
+                        // var areaId = $("#areaId").val();
+                        // if(undefined ==areaId || null == areaId || '' == areaId){
+                        //     $("#areaId").val(d.areaId);
+                        //     $("#areaName").val(d.areaName);
+                        // }
+
+                    }
+                })
+            }else{
+                $.ajax({
+                    async:false,
+                    type:'post',
+                    url:'${ctx}/projectReport/projectReportSignature/getPNumber',
+                    data:{
+                        "obj":obj
+                    },
+                    success:function(data){
+                        var d = JSON.parse(data);
+                        $("#projectId").val(d.id);
+                        $("#projectName").val(d.projectName);
+                        $("#workContractName").val(d.workContractName);
+                        $("#projectNum").val(d.projectNum);
+                        $("#clientName").val(d.clientName);
+                        $("#reportDataNum").val(d.reportDataNum);
+                        var areaId = $("#areaId").val();
+                        if(undefined ==areaId || null == areaId || '' == areaId){
+                            $("#areaId").val(d.areaId);
+                            $("#areaName").val(d.areaName);
+                        }
+
+                    }
+                })
+            }
+
+            }
+
+        function checkType() {
+            var id = $("#id").val()
+            var sigType = $("#signatureType").val()
+            console.log('id',id)
+            console.log('type',sigType)
+            $.ajax({
+                async:false,
+                type:'post',
+                url:'${ctx}/projectReport/projectReportSignature/checkType',
+                data:{
+                    "id":id,
+                    "signatureType":sigType
+                },
+                success:function(data){
+                    if(data){
+                        parent.layer.msg("该签章类型已经存在",{icon:6});
+                    }
+                }
+            })
+
+        }
+
+
+    </script>
+</head>
+<body>
+<div class="single-form">
+    <div class="container">
+        <sys:message content="${message}"/>
+        <form:form id="inputForm" modelAttribute="projectReportSignature" action="${ctx}/projectReport/projectReportSignature/save" method="post" class="form-horizontal layui-form ">
+            <form:hidden path="id"/>
+            <input type="hidden" id="flagFile" value="">
+            <input type="hidden" id="signatureType" name="signatureType" value="${projectReportSignature.signatureType}">
+
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>签章项目信息</h2></div>
+                <div id="divv">
+                    <div class="layui-item layui-col-sm6 lw7" id="d1">
+                        <label class="layui-form-label"><span class="require-item">*</span>选择项目:</label>
+                        <c:if test="${projectReportSignature.reportSignatureRelation == null}">
+                            <div class="layui-input-block  with-icon">
+                                <sys:gridselectSignatureProject url="${ctx}/projectReport/projectReportSignature/getProjectReportList" type="" isTotal="" id="projectId" name="reportSignatureRelation.projectId"  value="${projectReportSignature.reportSignatureRelation.projectId}"  title="选择所属项目" labelName="reportSignatureRelation.projectName"
+                                                                cssStyle="background-color: #fff" labelValue="${projectReportSignature.reportSignatureRelation.projectName}" cssClass="form-control required layui-input" fieldLabels="项目名称" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName"></sys:gridselectSignatureProject>
+
+                            </div>
+                        </c:if>
+                        <c:if test="${projectReportSignature.reportSignatureRelation != null}">
+                        <div class="layui-input-block">
+                            <input  htmlEscape="false"  readonly="true" id="projectName"  class="form-control layui-input" value="${projectReportSignature.reportSignatureRelation.projectName}"/>
+                            <input  htmlEscape="false"  readonly="true" type="hidden" id="projectId"  class="form-control layui-input" value="${projectReportSignature.reportSignatureRelation.projectId}"/>
+                        </div>
+                         </c:if>
+
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">报告号:</label>
+                        <div class="layui-input-block">
+                            <input  htmlEscape="false"  readonly="true" id="reportDataNum"  class="form-control layui-input" value="${projectReportSignature.reportSignatureRelation.reportDataNum}"/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">合同名称:</label>
+                        <div class="layui-input-block">
+                            <input  htmlEscape="false"  readonly="true" id="workContractName"  class="form-control layui-input" value="${projectReportSignature.reportSignatureRelation.workContractName}"/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">项目编号:</label>
+                        <div class="layui-input-block">
+                            <input  htmlEscape="false"  readonly="true" id="projectNum"  class="form-control layui-input" value="${projectReportSignature.reportSignatureRelation.projectNum}"/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">委托方:</label>
+                        <div class="layui-input-block">
+                            <input htmlEscape="false"  readonly="true" id="clientName" name="reportSignatureRelation.clientName" class="form-control layui-input" value="${projectReportSignature.reportSignatureRelation.clientName}"/>
+                        </div>
+                    </div>
+                </div>
+<%--                <div class="layui-item nav-btns">--%>
+<%--                    <a class="nav-btn nav-btn-add" onclick="addRow1('#projectReportSignatureRelationList', projectReportSignatureRelationListRowIdx, projectReportSignatureRelationListTpl);projectReportSignatureRelationListRowIdx = projectReportSignatureRelationListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增</a>--%>
+<%--                </div>--%>
+<%--                <div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">--%>
+<%--                    <table id="contentTables" class="table table-bordered table-condensed can-edit no-bottom-margin details">--%>
+<%--                        <thead>--%>
+<%--                        <tr>--%>
+<%--                            <th width="200px"><font color="red">*</font>项目名称</th>--%>
+<%--                            <th width="200px">报告号</th>--%>
+<%--                            <th width="200px">合同名称</th>--%>
+<%--                            <th width="200px">项目编号</th>--%>
+<%--                            <th width="200px">委托方</th>--%>
+<%--                            <th width="100px">操作</th>--%>
+<%--                        </tr>--%>
+<%--                        </thead>--%>
+<%--                        <tbody id="projectReportSignatureRelationList">--%>
+<%--                        </tbody>--%>
+<%--                    </table>--%>
+<%--                    <script type="text/template" id="projectReportSignatureRelationListTpl">//<!----%>
+<%--                    <tr id="projectReportSignatureRelationList{{idx}}">--%>
+<%--                        <td class="hide">--%>
+<%--                            <input id="projectReportSignatureRelationList{{idx}}_signatureId" name="projectReportSignatureRelationList[{{idx}}].signatureId" type="hidden" value="{{row.signatureId}}"/>--%>
+<%--							<input id="projectReportSignatureRelationList{{idx}}_delFlag" name="projectReportSignatureRelationList[{{idx}}].delFlag" type="hidden" value="0"/>--%>
+<%--							<input id="projectReportSignatureRelationList{{idx}}_contractId" name="projectReportSignatureRelationList[{{idx}}].contractId" type="hidden" value="{{row.contractId}}"/>--%>
+<%--                        </td>--%>
+<%--                        <td>--%>
+<%--                            <sys:gridselectprojectsignatures url="${ctx}/projectReport/projectReportSignature/getProjectReportList" id="projectReportSignatureRelationList{{idx}}_projectId" name="projectReportSignatureRelationList[{{idx}}].projectId"  value="{{row.projectId}}"  title="选择所属项目" labelName="projectReportSignatureRelationList[{{idx}}].projectName" cssStyle="background-color: #fff"--%>
+<%--													labelValue="{{row.projectName}}" cssClass="form-control judgment layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName"  isProject="{{row.isProject}}" isProjectFalg="{{row.isProjectFalg}}" details="{{row.details}}"></sys:gridselectprojectsignatures>--%>
+<%--&lt;%&ndash;                        </td>&ndash;%&gt;--%>
+<%--                        <td>--%>
+<%--							<input id="projectReportSignatureRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" readonly="readonly"  class="form-control"/>--%>
+<%--                        </td>--%>
+<%--                        <td>--%>
+<%--							<input id="projectReportSignatureRelationList{{idx}}_workContractName"  type="text" value="{{row.workContractName}}" readonly="readonly"  class="form-control"/>--%>
+<%--                        </td>--%>
+<%--                        <td style="text-align:center;">--%>
+<%--							<input id="projectReportSignatureRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" readonly="readonly"  class="form-control"/>--%>
+<%--                        </td>--%>
+<%--                        <td>--%>
+<%--							<input id="projectReportSignatureRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" readonly="readonly"  class="form-control"/>--%>
+<%--                        </td>--%>
+<%--                        <td class="text-center op-td" >--%>
+<%--                            {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow1(this, '#projectReportSignatureRelationList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}--%>
+<%--                        </td>--%>
+<%--                    </tr>//-->--%>
+<%--                    </script>--%>
+<%--                    <script type="text/javascript">--%>
+<%--                        var projectReportSignatureRelationListRowIdx = 0, projectReportSignatureRelationListTpl = $("#projectReportSignatureRelationListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");--%>
+<%--                        /*if($("#id").val()){--%>
+<%--                            projectReportSignatureRelationListRowIdx = ${fn:length(projectReportSignature.projectReportSignatureRelationList)};--%>
+<%--						}*/--%>
+<%--                        $(document).ready(function() {--%>
+<%--                            var data = ${fns:toJson(projectReportSignature.projectReportSignatureRelationList)};--%>
+<%--                            console.log(data)--%>
+<%--                            for (var i=0; i<data.length; i++){--%>
+<%--                                addRow1('#projectReportSignatureRelationList', projectReportSignatureRelationListRowIdx, projectReportSignatureRelationListTpl, data[i])--%>
+<%--                                projectReportSignatureRelationListRowIdx = projectReportSignatureRelationListRowIdx + 1;--%>
+<%--                            }--%>
+<%--                        });--%>
+<%--                    </script>--%>
+<%--                </div>--%>
+
+            </div>
+
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>签章基础信息</h2></div>
+
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>签章类型:</label>
+                    <div class="layui-input-block readOnlyFFF">
+                        <form:select placeholder="请选择" path="signatureType" class="form-control judgment editable-select layui-input" disabled="true" id="signatureType" value="${projectReportSignature.signatureType}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+
+<%--                <div class="layui-item layui-col-sm6 lw7">--%>
+<%--                    <label class="layui-form-label">签章编号:</label>--%>
+<%--                    <div class="layui-input-block">--%>
+<%--                        <div class="input-group">--%>
+<%--                            <form:input path="number" htmlEscape="false" readonly="true" class="form-control layui-input"/>--%>
+<%--                            &lt;%&ndash;<span class="input-group-btn">--%>
+<%--                                <label class="form-status"><c:choose><c:when test="${not empty projectReportSignature.status}">${fns:getDictLabel(projectReportSignature.status, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>--%>
+<%--                             </span>&ndash;%&gt;--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
+<%--                </div>--%>
+
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>签章责任人:</label>
+                    <div class="layui-input-block readOnlyFFF">
+                        <select class="form-control judgment required layui-input" id="dutyPerson" name="dutyPerson">
+                            <option value=""/>
+                            <c:forEach items="${dutyPersonList}" var="user">
+                                <option value="${user.id}" <c:if test="${projectReportSignature.dutyPerson eq user.id }">selected</c:if>>${user.name}</option>
+                            </c:forEach>
+                        </select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">签章描述:</label>
+                    <div class="layui-input-block">
+                        <form:input path="signatureName" id="signatureName" maxlength="255" htmlEscape="false" placeholder="请输入签章描述" class="form-control layui-input"/>
+                    </div>
+                </div>
+
+
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">创建人:</label>
+                    <div class="layui-input-block">
+                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
+                        <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">所属部门:</label>
+                    <div class="layui-input-block">
+                        <form:input path="office.name" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">创建日期:</label>
+                    <div class="layui-input-block">
+                        <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${projectReportSignature.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control judgment layui-input"/>
+                    </div>
+                </div>
+
+                <div class="layui-item layui-col-sm12 lw7 with-textarea">
+                    <label class="layui-form-label ">备注:</label>
+                    <div class="layui-input-block">
+                        <form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2><span class="require-item">*</span>签章附件信息<span style="color: red">(仅可上传doc、docx、pdf类型文档)</span></h2></div>
+                <div class="layui-item nav-btns">
+                    <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
+                </div>
+                <div id="addFile_attachment" style="display: none" class="upload-progress">
+                    <span id="fileName_attachment"></span>
+                    <b><span id="baifenbi_attachment"></span></b>
+                    <div class="progress">
+                            <%--进度条--%>
+                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
+                        </div>
+                    </div>
+                </div>
+                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple"
+                       style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
+                <span id="attachment_title"></span>
+                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
+                    <table id="upTable" class="table table-bordered table-condensed details">
+                        <thead>
+                        <tr>
+                                <%-- <th>序号</th>--%>
+                            <th>文件</th>
+                            <th>上传人</th>
+                            <th>上传时间</th>
+                            <th width="200px">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="file_attachment">
+                        <c:forEach items="${projectReportSignature.workAttachments}" var="workClientAttachment"
+                                   varStatus="status">
+                            <tr>
+                                    <%-- <td>${status.index + 1}</td>--%>
+                                <c:choose>
+                                    <c:when test="${projectReportSignature.uploadMode == 2}">
+                                        <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.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','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="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <c:choose>
+                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                            </c:when>
+                                                            <c:otherwise>
+                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                            </c:otherwise>
+                                                        </c:choose>
+                                                    </c:otherwise>
+                                                </c:choose>
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </c:when>
+                                    <c:otherwise>
+                                        <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="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a>
+                                                        </td>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <c:choose>
+                                                            <c:when test="${projectReportSignature.uploadMode == 2}">
+                                                                <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.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','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="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                                            </c:when>
+                                                                            <c:otherwise>
+                                                                                <c:choose>
+                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:when>
+                                                                                    <c:otherwise>
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:otherwise>
+                                                                                </c:choose>
+                                                                            </c:otherwise>
+                                                                        </c:choose>
+                                                                    </c:otherwise>
+                                                                </c:choose>
+                                                            </c:when>
+                                                            <c:otherwise>
+                                                                <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="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                                            </c:when>
+                                                                            <c:otherwise>
+                                                                                <c:choose>
+                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:when>
+                                                                                    <c:otherwise>
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:otherwise>
+                                                                                </c:choose>
+                                                                            </c:otherwise>
+                                                                        </c:choose>
+                                                                    </c:otherwise>
+                                                                </c:choose>
+                                                            </c:otherwise>
+                                                        </c:choose>
+                                                    </c:otherwise>
+                                                </c:choose>
+                                            </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">
+
+                                            <%--附件下载删除--%>
+                                        <c:choose>
+                                            <c:when test="${projectReportSignature.uploadMode == 2}">
+                                                <c:choose>
+                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                        <a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <a href="${workClientAttachment.temporaryUrl}" 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}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                            </c:otherwise>
+                                        </c:choose>
+                                        <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')"
+                                               class="op-btn op-btn-delete"><i class="fa fa-trash"></i>&nbsp;删除</a>
+                                        </c:if>
+                                        <c:if test="${workClientAttachment.collectFlag != 1}">
+                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn layui-btn-warm" >&nbsp;收藏</a>
+                                        </c:if>
+                                    </div>
+                                </td>
+                            </tr>
+                        </c:forEach>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+            <div class="form-group layui-row page-end"></div>
+        </form:form>
+    </div>
+</div>
+<script>
+    $(document).ready(function() {
+        layui.use(['form', 'layer'], function () {
+            var form = layui.form;
+            layui.form.on('select(dutyPersonFilter)', function(data){
+                console.log(data.value); //得到被选中的值
+                var duty = data.value
+
+               var res= $("#dutyPerson").val()
+                console.log(res);
+            });
+        });
+
+    });
+
+</script>
+</body>
+</html>