8812f2e6 by weimo934

修改点击进入详情页

1 parent 57d903bc
...@@ -14,17 +14,6 @@ function setLayuiData(_data, type, version) { ...@@ -14,17 +14,6 @@ function setLayuiData(_data, type, version) {
14 14
15 ]]; 15 ]];
16 if (orign == 'ghsc') { 16 if (orign == 'ghsc') {
17 // 规划审查 已办项目 表头设置
18 // "<th width=\"5%\"><div class=\"tableCell\">状态</div></th> " +
19 // "<th width=\"8%\"><div class=\"tableCell\">项目编号</div></th>" +
20 // "<th width=\"8%\"><div class=\"tableCell\">规划类型</div></th>" + // --
21 // "<th width=\"30%\"><div class=\"tableCell\">项目名称</div></th>" +
22 // "<th width=\"10%\"><div class=\"tableCell\">行政辖区</div></th>" + //"<th width=\"12%\"><div class=\"tableCell\">业务类型</div></th>" +
23 // "<th width=\"10%\"><div class=\"tableCell\">项目版本</div></th>" + //"<th width=\"8%\"><div class=\"tableCell\">发起部门</div></th>" +
24 // "<th width=\"10%\"><div class=\"tableCell\">当前环节</div></th>" + // --
25 // "<th width=\"8%\"><div class=\"tableCell\">发起部门</div></th>" + // --
26 // "<th width=\"8%\"><div class=\"tableCell\">报送日期</div></th>" +
27
28 // isType; // 1 数据申请 2 成果审查 17 // isType; // 1 数据申请 2 成果审查
29 if(isType == 1) { 18 if(isType == 1) {
30 // -- 数据申请 19 // -- 数据申请
...@@ -42,20 +31,7 @@ function setLayuiData(_data, type, version) { ...@@ -42,20 +31,7 @@ function setLayuiData(_data, type, version) {
42 , { field: 'ACTIVITYNAME', title: '当前环节', width: "10%", event: "eventProjectstatus" } 31 , { field: 'ACTIVITYNAME', title: '当前环节', width: "10%", event: "eventProjectstatus" }
43 , { field: 'BINDINGASSIGNEE', title: '申请部门', width: "8%", event: "eventInterconnect" } 32 , { field: 'BINDINGASSIGNEE', title: '申请部门', width: "8%", event: "eventInterconnect" }
44 , { field: 'REGISTERTIME', title: '申请时间', width: "10%", event: "eventRegistertime", templet: function (d) { return d.REGISTERTIME ? d.REGISTERTIME.substring(0, 16) : ''} } 33 , { field: 'REGISTERTIME', title: '申请时间', width: "10%", event: "eventRegistertime", templet: function (d) { return d.REGISTERTIME ? d.REGISTERTIME.substring(0, 16) : ''} }
45 // , { field: 'FLOWNAME', title: '业务类型', width: "12%", event: "eventflowname" }
46 ]]; 34 ]];
47 // "<th width=\"1%\" class=\"checkboxCls\">" + '<input class="parent_check" type="checkbox" name="" lay-skin="primary" title="" >' + "</th>" +
48 // "<th width=\"3%\" class=\"statusIcon\"></th>" +
49 // "<th width=\"5%\"><div class=\"tableCell\">状态</div></th> " +
50 // "<th width=\"8%\"><div class=\"tableCell\">项目编号</div></th>" +
51 //
52 // "<th width=\"8%\"><div class=\"tableCell\">数据类型</div></th>" + // --
53 // "<th width=\"20%\"><div class=\"tableCell\">数据用途</div></th>" +
54 // "<th width=\"10%\"><div class=\"tableCell\">密级</div></th>" + //"<th width=\"12%\"><div class=\"tableCell\">业务类型</div></th>" +
55 // // "<th width=\"10%\"><div class=\"tableCell\">项目版本</div></th>" + //"<th width=\"8%\"><div class=\"tableCell\">发起部门</div></th>" +
56 // "<th width=\"10%\"><div class=\"tableCell\">当前环节</div></th>" + // --
57 // "<th width=\"8%\"><div class=\"tableCell\">申请部门</div></th>" + // --
58 // "<th width=\"11%\"><div class=\"tableCell\">申请日期</div></th>" +
59 }else { 35 }else {
60 layuiTableCol = [[ //标题栏 36 layuiTableCol = [[ //标题栏
61 { field: 'CHECKBOX', type: 'checkbox', title: '复选框', unresize: false, event: "eventCheckbox", width: "31" } 37 { field: 'CHECKBOX', type: 'checkbox', title: '复选框', unresize: false, event: "eventCheckbox", width: "31" }
......
...@@ -2138,6 +2138,7 @@ function workingSeeDetail(td) { ...@@ -2138,6 +2138,7 @@ function workingSeeDetail(td) {
2138 } 2138 }
2139 // end 2139 // end
2140 //不再验证会议状态 2140 //不再验证会议状态
2141 console.log(data)
2141 openApproveDetail(data); 2142 openApproveDetail(data);
2142 /*if(data.MEETINGPROJECTSTATE!=null && data.MEETINGPROJECTSTATE!="" && parent.listName!="项目查询" && parent.listName!="已办项目"){ 2143 /*if(data.MEETINGPROJECTSTATE!=null && data.MEETINGPROJECTSTATE!="" && parent.listName!="项目查询" && parent.listName!="已办项目"){
2143 parent.layer?parent.layer.msg("项目正在"+data.MEETINGPROJECTSTATE, {icon : 7}):opener.parent.layer.msg("项目正在"+data.MEETINGPROJECTSTATE, {icon : 7}); 2144 parent.layer?parent.layer.msg("项目正在"+data.MEETINGPROJECTSTATE, {icon : 7}):opener.parent.layer.msg("项目正在"+data.MEETINGPROJECTSTATE, {icon : 7});
......
...@@ -89,7 +89,41 @@ var self = new Vue({ ...@@ -89,7 +89,41 @@ var self = new Vue({
89 }, 89 },
90 clickData(row, column, event) { 90 clickData(row, column, event) {
91 // console.log(row, column, event) 91 // console.log(row, column, event)
92 alert(1111) 92 this.jumpdetailPage(row);
93 },// 详情
94 jumpdetailPage(data) {
95 var taskid = data.TASKID;
96 var detailType = data.detailType;
97 var projectid = data.PROJECTID;
98 var flowInstanceId =data.INSTANCEID;
99 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
100 var stats = data.stats ? data.stats : '';
101 var projecttype = data.FLOWNAME;
102 var PROJECTSTATUS = encodeURI(encodeURI(data.PROJECTSTATUS));
103 var FLOWREVISIONID = data.FLOWREVISIONID;
104 var projectcode = data.PROJECTCODE;
105 var flowItemTypeKvStr = data.FLOWITEMTYPE?"&flowItemTypeId=" + data.FLOWITEMTYPE:"";
106 var version = data.FLOWVERSION;
107 var layerid="";
108 var coverage="";
109 var url = CONF_FRONT_SERVERURL
110 + 'view/projecttask/detailproject.jsp?projectid=' + 20190 + "&referer=''&stats="
111 + stats +"&projectcode="+projectcode+"&taskId=" + taskid + "&flowInstanceId=" + flowInstanceId+'&titleEncode='
112 + titleEncode + "&projectStatus=" + PROJECTSTATUS+"&flowRevisionId="+FLOWREVISIONID+flowItemTypeKvStr+"&FLOWVERSION="+version+"&detailType="+detailType;
113
114 detailPage = window.open(this.handleJumpUrl(url));
115 parent.saveOpenNew?parent.saveOpenNew(detailPage):sreachparent(opener,"saveOpenNew",detailPage);
116 },
117 openApproveDetail(data) {
118 var type = this.params.rwListIndex;
119 if(type == "项目管理") data.stats = "Manage";
120 else if(type == "项目查询") data.stats = "search" ;
121 else if(type == "待办项目") data.stats = "projecting";
122 else if(type == "已办项目") data.stats = "dealedproject";
123 // create by zys start
124 else if(type == 0) data.stats = "projecting"; // 待办
125 else if(type == 1) data.stats = "dealedproject"; // 已办
126 this.jumpdetailPage(data);
93 }, 127 },
94 openHandleJumpUrl(flowId, itemTypeId, _stats = 'create') { 128 openHandleJumpUrl(flowId, itemTypeId, _stats = 'create') {
95 // debugger 129 // debugger
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
74 <div style="line-height: 37px;margin-left: -100px"> 74 <div style="line-height: 37px;margin-left: -100px">
75 <el-button v-show="isActive == 3" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610de737b99270173937337e00133','1')">添加</el-button> 75 <el-button v-show="isActive == 3" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610de737b99270173937337e00133','1')">添加</el-button>
76 <el-button v-show="isActive == 3" type ="primary" size="mini">删除</el-button> 76 <el-button v-show="isActive == 3" type ="primary" size="mini">删除</el-button>
77 <el-button v-show="isActive == 5" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610de737b99270173937337e00133','1')">添加</el-button> 77 <el-button v-show="isActive == 5" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610d86125b9a801612600a4c60003','1')">添加</el-button>
78 <el-button v-show="isActive == 5" type ="primary" size="mini">删除</el-button> 78 <el-button v-show="isActive == 5" type ="primary" size="mini">删除</el-button>
79 </div> 79 </div>
80 <div style="float: right"> 80 <div style="float: right">
......
...@@ -78,9 +78,9 @@ ...@@ -78,9 +78,9 @@
78 <span class="optspan" :class="isActive==5? 'select':''" @click="click(5)">转办</span> 78 <span class="optspan" :class="isActive==5? 'select':''" @click="click(5)">转办</span>
79 </div> 79 </div>
80 <div style="line-height: 37px;margin-left: -100px"> 80 <div style="line-height: 37px;margin-left: -100px">
81 <el-button v-show="isActive == 3" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610de737b99270173937337e00133','1')">添加</el-button> 81 <!--<el-button v-show="isActive == 3" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610de737b99270173937337e00133','1')">添加</el-button>-->
82 <el-button v-show="isActive == 3" type ="primary" size="mini">删除</el-button> 82 <el-button v-show="isActive == 3" type ="primary" size="mini">删除</el-button>
83 <el-button v-show="isActive == 5" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610de737b99270173937337e00133','1')">添加</el-button> 83 <!-- <el-button v-show="isActive == 5" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610de737b99270173937337e00133','1')">添加</el-button>-->
84 <el-button v-show="isActive == 5" type ="primary" size="mini">删除</el-button> 84 <el-button v-show="isActive == 5" type ="primary" size="mini">删除</el-button>
85 </div> 85 </div>
86 <div style="float: right"> 86 <div style="float: right">
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
94 <el-row :gutter="20"> 94 <el-row :gutter="20">
95 <el-col :span="4"> 95 <el-col :span="4">
96 <!-- <button class="btns">查询</button>--> 96 <!-- <button class="btns">查询</button>-->
97 <button class="btns" @click="openHandleJumpUrl('t1001_8a8610de737b99270173937337e00133','1')">添加</button> 97 <!-- <button class="btns" @click="openHandleJumpUrl('t1001_8a8610de737b99270173937337e00133','1')">添加</button>-->
98 <button class="btns">删除</button> 98 <button class="btns">删除</button>
99 </el-col> 99 </el-col>
100 <el-col :span="6"> 100 <el-col :span="6">
......