报告签章调整

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

@@ -194,11 +194,11 @@ public class ProjectReportSignatureWorkController extends BaseController {
                 projectReportSignature.setSignatureName(approvalBySigId.getSignatureName());
                 projectReportSignature.setDutyPerson(approvalBySigId.getDutyPerson());
                 projectReportSignature.setWorkAttachments(report.getWorkAttachments());
+            }else {
+                projectReportSignature.setCreateBy(user);
+                projectReportSignature.setOffice(UserUtils.getSelectOffice());
+                projectReportSignature.setCreateDate(new Date());
             }
-        }else {
-            projectReportSignature.setCreateBy(user);
-            projectReportSignature.setOffice(UserUtils.getSelectOffice());
-            projectReportSignature.setCreateDate(new Date());
         }
         //根据当前登录人获取签章负责人信息
         List<User> userList = projectReportSignatureService.getDutyPersonList(user);

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/service/ProjectReportSignatureWorkService.java

@@ -272,60 +272,48 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         signature.setSignatureName(projectReportSignature.getSignatureName());
 
 
-        if (StringUtils.isBlank(projectReportSignature.getId())){
-            if (projectReportSignature.getSignatureType().equals("1")){
-                signature.preInsert();
-                dao.insertReportSignature(signature);
-            }else {
-                signature.preInsert();
-                dao.insertApprovalSignature(signature);
-            }
-
-        }else {
-            //根据签章类型进行保存
-            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 (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);
                 }
 
-            }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);
-                    }
+            }
 
+        }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);
                 }
+
             }
         }
 
 
 
         signature.setWorkAttachments(projectReportSignature.getWorkAttachments());
-
         //保存签章附件信息
         this.saveAttachments(signature);
 
@@ -481,53 +469,42 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         signature.setCreateBy(projectReportSignature.getCreateBy());
 
 
-        if (StringUtils.isBlank(projectReportSignature.getId())){
-            if (projectReportSignature.getSignatureType().equals("1")){
-                signature.preInsert();
-                dao.insertReportSignature(signature);
-            }else {
-                signature.preInsert();
-                dao.insertApprovalSignature(signature);
-            }
-
-        }else {
-            //根据签章类型进行保存
-            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 (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);
                 }
 
-            }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);
-                    }
+            }
 
+        }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);
                 }
+
             }
         }
 
@@ -659,9 +636,9 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         if (projectReportSignature.getWorkAttachments()!=null && !projectReportSignature.getWorkAttachments().isEmpty()) {
             //保存附件信息
             for (WorkClientAttachment workClientAttachment : projectReportSignature.getWorkAttachments()) {
-                if (StringUtils.isBlank(workClientAttachment.getId())&&StringUtils.isNotBlank(workClientAttachment.getAttachmentId())) {
-                    continue;
-                }
+//                if (StringUtils.isBlank(workClientAttachment.getId())&&StringUtils.isNotBlank(workClientAttachment.getAttachmentId())) {
+//                    continue;
+//                }
                 if (StringUtils.isBlank(workClientAttachment.getId())&&StringUtils.isBlank(workClientAttachment.getUrl())) {
                     continue;
                 }
@@ -687,9 +664,9 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         if (projectReportSignature.getWorkAttachments()!=null && !projectReportSignature.getWorkAttachments().isEmpty()) {
             //保存附件信息
             for (WorkClientAttachment workClientAttachment : projectReportSignature.getWorkAttachments()) {
-                if (StringUtils.isBlank(workClientAttachment.getId())&&StringUtils.isNotBlank(workClientAttachment.getAttachmentId())) {
-                    continue;
-                }
+//                if (StringUtils.isBlank(workClientAttachment.getId())&&StringUtils.isNotBlank(workClientAttachment.getAttachmentId())) {
+//                    continue;
+//                }
                 if (StringUtils.isBlank(workClientAttachment.getId())&&StringUtils.isBlank(workClientAttachment.getUrl())) {
                     continue;
                 }

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkApprovalForm.jsp

@@ -119,7 +119,7 @@
                     return false;
                 }
 
-                var attachmentId = $("#signatureId").val();
+                var attachmentId = $("#id").val();
                 var attachmentFlag = "174";
                 /*console.log(file);*/
                 var timestamp=new Date().getTime();
@@ -487,11 +487,23 @@
             <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">签章描述：</label>
-                    <div class="layui-input-block">
-                        <form:input path="signatureName" id="signatureName" maxlength="255" htmlEscape="false" placeholder="请输入签章描述" class="form-control layui-input"/>
+                    <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>
                     </div>
                 </div>
+
 <%--                <div class="layui-item layui-col-sm6 lw7">--%>
 <%--                    <label class="layui-form-label">签章编号：</label>--%>
 <%--                    <div class="layui-input-block">--%>
@@ -505,15 +517,6 @@
 <%--                </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" 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"><span class="require-item">*</span>签章责任人：</label>
                     <div class="layui-input-block readOnlyFFF">
                         <select class="form-control judgment layui-input" id="dutyPerson" name="dutyPerson">
@@ -524,7 +527,12 @@
                         </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">

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkAudit.jsp

@@ -409,11 +409,15 @@
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>签章基础信息</h2></div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label">签章描述：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectReportSignature.signatureName}"/>
+					<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" id="signatureType" disabled="true"  readonly="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>
+
 <%--				<div class="layui-item layui-col-sm6 lw7">--%>
 <%--					<label class="layui-form-label">签章编号：</label>--%>
 <%--					<div class="layui-input-block">--%>
@@ -423,15 +427,7 @@
 <%--					</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">
-						<form:select placeholder="请选择" path="signatureType" class="form-control judgment editable-select layui-input" id="signatureType" disabled="true"  readonly="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>
+
 				<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">
@@ -445,6 +441,13 @@
 				</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" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectReportSignature.signatureName}"/>
+					</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"/>

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkAuditApproval.jsp

@@ -409,11 +409,16 @@
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>签章基础信息</h2></div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label">签章描述：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectReportSignature.signatureName}"/>
+					<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" id="signatureType" disabled="true"  readonly="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>
+
+
 <%--				<div class="layui-item layui-col-sm6 lw7">--%>
 <%--					<label class="layui-form-label">签章编号：</label>--%>
 <%--					<div class="layui-input-block">--%>
@@ -423,15 +428,7 @@
 <%--					</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">
-						<form:select placeholder="请选择" path="signatureType" class="form-control judgment editable-select layui-input" id="signatureType" disabled="true"  readonly="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>
+
 				<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">
@@ -443,6 +440,13 @@
 						</select>
 					</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" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectReportSignature.signatureName}"/>
+					</div>
+				</div>
+
 
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label">创建人：</label>

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkForm.jsp

@@ -97,40 +97,79 @@
         });
 
         function insertTitle(tValue){
-            $("#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;
+            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);
                 }
-                if(suffixResult == 0 ){
-                    top.layer.msg("上传附件只能为："+attachTypes+" 类型文件", {icon: 0});
-                    return false;
-                }
+            }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 = "173";
-                /*console.log(file);*/
-                var timestamp=new Date().getTime();
+                    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);
+                    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);
+                }
             }
+
         }
 
 
@@ -534,12 +573,25 @@
 
             <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">签章描述：</label>
-                    <div class="layui-input-block">
-                        <form:input path="signatureName" id="signatureName" maxlength="255" htmlEscape="false" placeholder="请输入签章描述" class="form-control layui-input"/>
+                    <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>
                     </div>
                 </div>
+
 <%--                <div class="layui-item layui-col-sm6 lw7">--%>
 <%--                    <label class="layui-form-label">签章编号：</label>--%>
 <%--                    <div class="layui-input-block">--%>
@@ -553,23 +605,6 @@
 <%--                </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">
-<%--                        <c:if test="${projectReportSignature.signatureType == null}">--%>
-                            <form:select placeholder="请选择" path="signatureType" onchange="checkType()" 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>--%>
-                    </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">
@@ -580,7 +615,12 @@
                         </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">

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkList.jsp

@@ -446,10 +446,10 @@
                             //上传审定单进行签章
 
                             if(d.signatureUrlFlag == 1){
-                                xml+="<a href=\""+ d.signatureUrl +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" style='height:32px;margin-top: 5px;margin-bottom: 5px;'>签章文件下载</a>"
+                                xml+="<a href=\""+ d.signatureUrl +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" >签章文件下载</a>"
                             }else{
                                 if(d.signatureContractId){
-                                    xml+="<a href=\"${ctx}/ruralProject/signatureCallBack/downLoadAttach?contractId="+ d.signatureContractId +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" style='height:32px;margin-top: 5px;margin-bottom: 5px;'>签章文件下载</a>"
+                                    xml+="<a href=\"${ctx}/ruralProject/signatureCallBack/downLoadAttach?contractId="+ d.signatureContractId +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" >签章文件下载</a>"
                                 }
                             }
 

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkModify.jsp

@@ -496,11 +496,23 @@
             <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">签章描述：</label>
-                    <div class="layui-input-block">
-                        <form:input path="signatureName" id="signatureName" maxlength="255" htmlEscape="false" placeholder="请输入签章描述" class="form-control layui-input"/>
+                    <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>
                     </div>
                 </div>
+
 <%--                <div class="layui-item layui-col-sm6 lw7">--%>
 <%--                    <label class="layui-form-label">签章编号：</label>--%>
 <%--                    <div class="layui-input-block">--%>
@@ -514,15 +526,6 @@
 <%--                </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" onchange="checkType" class="form-control 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>
-                <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 layui-input" id="dutyPerson" name="dutyPerson">
@@ -533,7 +536,12 @@
                         </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">

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkModifyApproval.jsp

@@ -107,7 +107,7 @@
                     return false;
                 }
 
-                var attachmentId = $("#signatureId").val();
+                var attachmentId = $("#id").val();
                 var attachmentFlag = "174";
                 /*console.log(file);*/
                 var timestamp=new Date().getTime();
@@ -497,11 +497,24 @@
             <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">签章描述：</label>
-                    <div class="layui-input-block">
-                        <form:input path="signatureName" id="signatureName" maxlength="255" htmlEscape="false" placeholder="请输入签章描述" class="form-control layui-input"/>
+                    <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>
                     </div>
                 </div>
+            </div>
+
 <%--                <div class="layui-item layui-col-sm6 lw7">--%>
 <%--                    <label class="layui-form-label">签章编号：</label>--%>
 <%--                    <div class="layui-input-block">--%>
@@ -514,15 +527,7 @@
 <%--                    </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">
-                        <form:select placeholder="请选择" path="signatureType" onchange="checkType" class="form-control 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>
+
                 <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">
@@ -534,7 +539,12 @@
                         </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">

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkView.jsp

@@ -326,11 +326,15 @@
             <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">
-                        <form:input path="signatureName" id="signatureName" maxlength="255" readonly="true" htmlEscape="false" placeholder="请输入签章描述" class="form-control layui-input required"/>
+                    <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" id="signatureType" disabled="true"  readonly="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>
+
                     <%--                <div class="layui-item layui-col-sm6 lw7">--%>
                     <%--                    <label class="layui-form-label">签章编号：</label>--%>
                     <%--                    <div class="layui-input-block">--%>
@@ -340,15 +344,7 @@
                     <%--                    </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">
-                        <form:select placeholder="请选择" path="signatureType" class="form-control judgment editable-select layui-input" id="signatureType" disabled="true"  readonly="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>
+
                 <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">
@@ -360,7 +356,12 @@
                         </select>
                     </div>
                 </div>
-
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>签章描述：</label>
+                    <div class="layui-input-block">
+                        <form:input path="signatureName" id="signatureName" maxlength="255" readonly="true" htmlEscape="false" placeholder="请输入签章描述" class="form-control layui-input required"/>
+                    </div>
+                </div>
 
 
                 <div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkViewApproval.jsp

@@ -326,11 +326,16 @@
             <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">
-                        <form:input path="signatureName" id="signatureName" maxlength="255" readonly="true" htmlEscape="false" placeholder="请输入签章描述" class="form-control layui-input required"/>
+                    <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" id="signatureType" disabled="true"  readonly="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>
+
+
                     <%--                <div class="layui-item layui-col-sm6 lw7">--%>
                     <%--                    <label class="layui-form-label">签章编号：</label>--%>
                     <%--                    <div class="layui-input-block">--%>
@@ -340,15 +345,7 @@
                     <%--                    </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">
-                        <form:select placeholder="请选择" path="signatureType" class="form-control judgment editable-select layui-input" id="signatureType" disabled="true"  readonly="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>
+
                 <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">
@@ -361,7 +358,12 @@
                     </div>
                 </div>
 
-
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>签章描述：</label>
+                    <div class="layui-input-block">
+                        <form:input path="signatureName" id="signatureName" maxlength="255" readonly="true" htmlEscape="false" placeholder="请输入签章描述" class="form-control layui-input required"/>
+                    </div>
+                </div>
 
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">创建人：</label>