签证查看页功能

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

@@ -188,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去查找汇总表获取汇总表信息
@@ -202,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

@@ -267,16 +267,16 @@
                 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}/project/projectVisa/view?id="+d.id+"','95%', '95%')\">" + d.number + "</a>";
                             }