Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectVisa/entity/VisaTreeData.java

@@ -10,6 +10,7 @@ public class VisaTreeData extends DataEntity<VisaTreeData> {
     private String contractId;//合同Id
     private String tableId;//设计变更-签证表Id
     private String contractName;//合同名称
+    private String cnumber;//合同编号
     private String number;//设计变更-签证编号
     private Date date;//设计变更-签证时间
     private String pid;//父类id=0
@@ -106,4 +107,12 @@ public class VisaTreeData extends DataEntity<VisaTreeData> {
     public void setConfirmMoney(Double confirmMoney) {
         this.confirmMoney = confirmMoney;
     }
+
+    public String getCnumber() {
+        return cnumber;
+    }
+
+    public void setCnumber(String cnumber) {
+        this.cnumber = cnumber;
+    }
 }

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectVisaController.java

@@ -127,6 +127,24 @@ public class ProjectVisaController extends BaseController {
         return "modules/projectrecord/implementStage/projectVisaForm";
     }
 
+    //编辑签证汇总页面
+    @RequestMapping(value = "view")
+    public String view(ProjectVisa projectVisa, Model model) {
+
+        if(StringUtils.isNotEmpty(projectVisa.getId())){
+            ProjectVisa visa=projectVisaService.getVisa(projectVisa);
+            WorkClientAttachment attchment = new WorkClientAttachment();
+            attchment.setAttachmentId(projectVisa.getId());
+            List<WorkClientAttachment> attachments = workClientAttachmentDao.findList(attchment);
+            visa.setWorkAttachments(attachments);
+            model.addAttribute("projectVisa", visa);
+        }else{
+            model.addAttribute("projectVisa", projectVisa);
+        }
+
+        return "modules/projectrecord/implementStage/projectVisaView";
+    }
+
 
     /**
      * 保存客户管理
@@ -170,6 +188,7 @@ public class ProjectVisaController extends BaseController {
             visaTreeData.setDate(contract.getCreateDate());
             visaTreeData.setNumber("");
             visaTreeData.setPid("0");
+            visaTreeData.setCnumber(contract.getCnumber());
 
             treeList.add(visaTreeData);
             //根据获取的合同的id去查找汇总表获取汇总表信息
@@ -184,7 +203,7 @@ public class ProjectVisaController extends BaseController {
                 visaTreeData2.setConfirmMoney(visa.getConfirmMoney());
                 visaTreeData2.setDate(visa.getDate());
                 visaTreeData2.setSendMoney(visa.getSendMoney());
-
+                visaTreeData2.setCnumber(contract.getCnumber());
                 visaTreeData2.setNumber(visa.getNumber());
 
                 treeList.add(visaTreeData2);

src/main/webapp/webpage/modules/projectrecord/implementStage/projectVisaList.jsp

@@ -143,61 +143,6 @@
                 }
             });
         }
-
-        /*//添加签证汇总
-        function openVisa(title,url,width,height,target){
-            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
-                width='auto';
-                height='auto';
-            }else{//如果是PC端，根据用户设置的width和height显示。
-
-            }
-            top.layer.open({
-                type: 2,
-                area: [width, height],
-                title: title,
-                maxmin: false, //开启最大化最小化按钮
-                content: url ,
-                skin:"three-btns",
-                btn: ['送审','暂存','关闭'],
-                btn1: function(index, layero){
-                    var body = top.layer.getChildFrame('body', index);
-                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                    var inputForm = body.find('#inputForm');
-                    var top_iframe;
-                    if(target){
-                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
-                    }else{
-                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-                    }
-                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-                    if(iframeWin.contentWindow.doSubmit(1) ){
-                        // top.layer.close(index);//关闭对话框。
-                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
-                    }
-                },
-                btn2:function(index,layero){
-                    var body = top.layer.getChildFrame('body', index);
-                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                    var inputForm = body.find('#inputForm');
-                    var top_iframe;
-                    if(target){
-                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
-                    }else{
-                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-                    }
-                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-                    if(iframeWin.contentWindow.doSubmit(3) ){
-                        // top.layer.close(index);//关闭对话框。
-                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
-                    }
-                    return false;
-                },
-                btn3: function(index){
-                }
-            });
-
-        }*/
     </script>
     <style>
         body{
@@ -322,18 +267,18 @@
                 page: false,
                 cols: [[
                     {type: 'numbers', align:'center', title: '序号' ,width:80},
-                    {field: 'contractName', title: '合同名称',templet:function(d){
+                    {field: 'contractName', title: '合同编号',templet:function(d){
                             if(0 == d.pid){
-                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=according&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<font>"+d.cnumber+"</font>";
                             }else{
-                                return "<a>" + d.contractName + "</a>";
+                                return "<font>"+d.cnumber+"</font>";
                             }
                         }},
-                    {field: 'number', align:'center', title: '签证编号',templet:function(d){
+                    {field: 'contractName', title: '合同名称/签证编号',templet:function(d){
                             if(0 == d.pid){
-                                return "";
+                                return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=according&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.id+"','95%', '95%')\">" + d.number + "</a>";
+                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看签证内容', '${ctx}/project/projectVisa/view?id="+d.id+"','95%', '95%')\">" + d.number + "</a>";
                             }
                         }},
                     {field: 'sendMoney', align:'center', title: '送审金额',templet: function(d){

src/main/webapp/webpage/modules/projectrecord/implementStage/projectVisaView.jsp

@@ -0,0 +1,134 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+    <title>工作内容详情管理</title>
+    <meta name="decorator" content="default"/>
+    <script src="${ctxStatic}/layer-v2.3/layui/xmSelect.js" charset="utf-8"></script>
+    <style>
+        #projectContentDataType-error{
+            left:0;
+            top:40px;
+        }
+    </style>
+</head>
+<body>
+<div class="single-form">
+    <div class="container${container}">
+        <form:form id="inputForm" modelAttribute="projectVisa" action="${ctx}/project/projectVisa/save?" method="post" class="form-horizontal">
+            <form:hidden path="id"/>
+            <form:hidden path="contractId" value="${projectVisa.contractId}"/>
+
+
+
+            <sys:message content="${message}"/>
+            <div class="form-group layui-row first lw12">
+                <div class="form-group-label"><h2>基本信息</h2></div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">签证编号：</label>
+                    <div class="layui-input-block">
+                        <form:input path="number" htmlEscape="false" readonly="true"  class="form-control layui-input required"/>
+                    </div>
+                </div>
+
+
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">签证日期</label>
+                    <div class="layui-input-block">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="true" id="closingDate" name="date" value="<fmt:formatDate value="${projectVisa.date}" pattern="yyyy-MM-dd"/>">
+                    </div>
+                </div>
+
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">送审金额：</label>
+                    <div class="layui-input-block">
+                        <form:input path="sendMoney" htmlEscape="false" readonly="true"  class="form-control required layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">审批手续合规性：</label>
+                    <div class="layui-input-block">
+                        <form:input path="procedure" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">定审金额：</label>
+                    <div class="layui-input-block">
+                        <form:input path="confirmMoney" htmlEscape="false" readonly="true"  class="form-control required layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm12 lw7">
+                    <label class="layui-form-label">主要内容：</label>
+                    <div class="layui-input-block">
+                        <form:textarea path="content" htmlEscape="false" rows="4" maxlength="500" readonly="true"
+                                       onkeyup="checkContentKeyUp('unitIntroduction',500);" class="form-control "/>
+                    </div>
+                    <span id="contentMsg" style="float: right"></span>
+                </div>
+            </div>
+
+
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>附件信息</h2></div>
+                <div class="layui-item nav-btns">
+                </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 width="150px">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="file_attachment">
+                        <c:forEach items="${projectVisa.workAttachments}" var = "workAttachment" varStatus="status">
+                            <tr>
+                                <c:choose>
+                                    <c:when test="${fn:containsIgnoreCase(workAttachment.attachmentName,'jpg')
+                                                                           or fn:containsIgnoreCase(workAttachment.attachmentName,'png')
+                                                                           or fn:containsIgnoreCase(workAttachment.attachmentName,'gif')
+                                                                           or fn:containsIgnoreCase(workAttachment.attachmentName,'bmp')
+                                                                           or fn:containsIgnoreCase(workAttachment.attachmentName,'jpeg')}">
+                                        <td><img src="${workAttachment.url}" width="50" height="50" alt="${workAttachment.attachmentName}"/></td>
+                                    </c:when>
+                                    <c:otherwise>
+                                        <c:choose>
+                                            <c:when test="${fn:containsIgnoreCase(workAttachment.attachmentName,'pdf')}">
+                                                <td><a href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%','1')">${workAttachment.attachmentName}</a></td>
+                                            </c:when>
+                                            <c:otherwise>
+                                                <td><a href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName}</a></td>
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </c:otherwise>
+                                </c:choose>
+                                <td>${workAttachment.createBy.name}</td>
+                                <td><fmt:formatDate value="${workAttachment.createDate}" type="both"/></td>
+                                <td class="op-td">
+                                    <div class="op-btn-box" >
+                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                    </div>
+                                </td>
+                            </tr>
+                        </c:forEach>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </form:form>
+    </div>
+</div>
+</body>
+</html>