cd02938c by weimo934

修改点击进入详情页2

1 parent af213db2
...@@ -96,7 +96,7 @@ var self = new Vue({ ...@@ -96,7 +96,7 @@ var self = new Vue({
96 jumpdetailPage(data) { 96 jumpdetailPage(data) {
97 var taskid = data.TASKID; 97 var taskid = data.TASKID;
98 var detailType = data.detailType; 98 var detailType = data.detailType;
99 var projectid = data.PROJECTID; 99 var projectid = data.id;
100 var flowInstanceId =data.INSTANCEID; 100 var flowInstanceId =data.INSTANCEID;
101 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME)); 101 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
102 var stats = data.stats ? data.stats : ''; 102 var stats = data.stats ? data.stats : '';
...@@ -109,7 +109,7 @@ var self = new Vue({ ...@@ -109,7 +109,7 @@ var self = new Vue({
109 var layerid=""; 109 var layerid="";
110 var coverage=""; 110 var coverage="";
111 var url = CONF_FRONT_SERVERURL 111 var url = CONF_FRONT_SERVERURL
112 + 'view/projecttask/detailproject.jsp?projectid=' + 20190 + "&referer=''&stats=" 112 + 'view/projecttask/detailproject.jsp?projectid=' + projectid + "&referer=''&stats="
113 + stats +"&projectcode="+projectcode+"&taskId=" + taskid + "&flowInstanceId=" + flowInstanceId+'&titleEncode=' 113 + stats +"&projectcode="+projectcode+"&taskId=" + taskid + "&flowInstanceId=" + flowInstanceId+'&titleEncode='
114 + titleEncode + "&projectStatus=" + PROJECTSTATUS+"&flowRevisionId="+FLOWREVISIONID+flowItemTypeKvStr+"&FLOWVERSION="+version+"&detailType="+detailType; 114 + titleEncode + "&projectStatus=" + PROJECTSTATUS+"&flowRevisionId="+FLOWREVISIONID+flowItemTypeKvStr+"&FLOWVERSION="+version+"&detailType="+detailType;
115 115
......
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
166 width="55"> 166 width="55">
167 </el-table-column> 167 </el-table-column>
168 <el-table-column 168 <el-table-column
169 prop="xh" 169 type="index"
170 label="序号" 170 label="序号"
171 width="55"> 171 width="55">
172 </el-table-column> 172 </el-table-column>
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
302 width="55"> 302 width="55">
303 </el-table-column> 303 </el-table-column>
304 <el-table-column 304 <el-table-column
305 prop="xh" 305 type="index"
306 label="序号" 306 label="序号"
307 width="55"> 307 width="55">
308 </el-table-column> 308 </el-table-column>
......
...@@ -4,7 +4,11 @@ var self = new Vue({ ...@@ -4,7 +4,11 @@ var self = new Vue({
4 return { 4 return {
5 search:'', 5 search:'',
6 projectId:null, 6 projectId:null,
7 userId:null, 7 userId:'t0101_8a8610de737b99270173941e5c50017e',
8 flowid: 't1001_8a8610de737b99270173937337e00133',
9 pageNum:1,
10 pageSize:10,
11 total:0,
8 // 表格数据 12 // 表格数据
9 tabaledata:[ 13 tabaledata:[
10 { 14 {
...@@ -61,9 +65,53 @@ var self = new Vue({ ...@@ -61,9 +65,53 @@ var self = new Vue({
61 isActive:1, 65 isActive:1,
62 } 66 }
63 }, 67 },
68 mounted(){
69 this.getData();
70 },
64 methods:{ 71 methods:{
72 getData() {
73 axios.get(CONF_NEWGHSC_SERVERURL + '/ghjg/haveToDo/'+this.pageNum+'/'+this.pageSize, {
74 params: {
75 flowid: this.flowid,
76 userId: this.userId,
77 keyword: this.search
78 }
79 }).then(res => {
80 console.log(res)
81 this.total=res.data.data.total;
82 this.tabaledata = res.data.data.list;
83 }).catch(res=>{
84 console.log(res)
85 });
86
87 },
65 handleSizeChange(){ 88 handleSizeChange(){
66 89
90 }, clickData(row, column, event) {
91 this.jumpdetailPage(row);
92 },
93 jumpdetailPage(data) {
94 var taskid = data.TASKID;
95 var detailType = data.detailType;
96 var projectid = data.id;
97 var flowInstanceId =data.INSTANCEID;
98 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
99 var stats = data.stats ? data.stats : '';
100 var projecttype = data.FLOWNAME;
101 var PROJECTSTATUS = encodeURI(encodeURI(data.PROJECTSTATUS));
102 var FLOWREVISIONID = data.FLOWREVISIONID;
103 var projectcode = data.PROJECTCODE;
104 var flowItemTypeKvStr = data.FLOWITEMTYPE?"&flowItemTypeId=" + data.FLOWITEMTYPE:"";
105 var version = data.FLOWVERSION;
106 var layerid="";
107 var coverage="";
108 var url = CONF_FRONT_SERVERURL
109 + 'view/projecttask/detailproject.jsp?projectid=' + projectid + "&referer=''&stats="
110 + stats +"&projectcode="+projectcode+"&taskId=" + taskid + "&flowInstanceId=" + flowInstanceId+'&titleEncode='
111 + titleEncode + "&projectStatus=" + PROJECTSTATUS+"&flowRevisionId="+FLOWREVISIONID+flowItemTypeKvStr+"&FLOWVERSION="+version+"&detailType="+detailType;
112
113 detailPage = window.open(this.handleJumpUrl(url));
114 parent.saveOpenNew?parent.saveOpenNew(detailPage):sreachparent(opener,"saveOpenNew",detailPage);
67 }, 115 },
68 handleCurrentChange(){}, 116 handleCurrentChange(){},
69 click(val){ 117 click(val){
......
...@@ -93,28 +93,29 @@ ...@@ -93,28 +93,29 @@
93 v-if="isActive==1" 93 v-if="isActive==1"
94 :data="tabaledata" 94 :data="tabaledata"
95 style="width: 100%;" 95 style="width: 100%;"
96 height="100%" 96 height="750px"
97 border 97 border
98 stripe 98 stripe
99 :default-sort = "{prop: 'xh', order: 'ascending'}" 99 :default-sort = "{prop: 'xh', order: 'ascending'}"
100 @row-click="clickData"
100 > 101 >
101 <el-table-column 102 <el-table-column
102 type="selection" 103 type="selection"
103 width="55"> 104 width="55">
104 </el-table-column> 105 </el-table-column>
105 <el-table-column 106 <el-table-column
106 prop="xh" 107 type="index"
107 label="序号" 108 label="序号"
108 width="55"> 109 width="55">
109 </el-table-column> 110 </el-table-column>
110 <el-table-column 111 <el-table-column
111 prop="ajmc" 112 prop="xmmc"
112 width="300" 113 width="300"
113 label="案件名称" 114 label="案件名称"
114 align="center" 115 align="center"
115 ></el-table-column> 116 ></el-table-column>
116 <el-table-column 117 <el-table-column
117 prop="anlx" 118 prop="ajlx"
118 label="案件类型" 119 label="案件类型"
119 align="center" 120 align="center"
120 width="100" 121 width="100"
...@@ -142,7 +143,7 @@ ...@@ -142,7 +143,7 @@
142 > 143 >
143 </el-table-column> 144 </el-table-column>
144 <el-table-column 145 <el-table-column
145 prop="djsh" 146 prop="djsj"
146 label="登记时间" 147 label="登记时间"
147 align="center" 148 align="center"
148 width="200" 149 width="200"
...@@ -164,24 +165,25 @@ ...@@ -164,24 +165,25 @@
164 border 165 border
165 stripe 166 stripe
166 :default-sort = "{prop: 'xh', order: 'ascending'}" 167 :default-sort = "{prop: 'xh', order: 'ascending'}"
168 @row-click="clickData"
167 > 169 >
168 <el-table-column 170 <el-table-column
169 type="selection" 171 type="selection"
170 width="55"> 172 width="55">
171 </el-table-column> 173 </el-table-column>
172 <el-table-column 174 <el-table-column
173 prop="xh" 175 type="index"
174 label="序号" 176 label="序号"
175 width="55"> 177 width="55">
176 </el-table-column> 178 </el-table-column>
177 <el-table-column 179 <el-table-column
178 prop="ajmc" 180 prop="xmmc"
179 width="300" 181 width="300"
180 label="案件名称" 182 label="案件名称"
181 align="center" 183 align="center"
182 ></el-table-column> 184 ></el-table-column>
183 <el-table-column 185 <el-table-column
184 prop="anlx" 186 prop="ajlx"
185 label="案件类型" 187 label="案件类型"
186 align="center" 188 align="center"
187 width="100" 189 width="100"
...@@ -209,7 +211,7 @@ ...@@ -209,7 +211,7 @@
209 > 211 >
210 </el-table-column> 212 </el-table-column>
211 <el-table-column 213 <el-table-column
212 prop="djsh" 214 prop="djsj"
213 label="登记时间" 215 label="登记时间"
214 align="center" 216 align="center"
215 width="200" 217 width="200"
...@@ -231,24 +233,25 @@ ...@@ -231,24 +233,25 @@
231 border 233 border
232 stripe 234 stripe
233 :default-sort = "{prop: 'xh', order: 'ascending'}" 235 :default-sort = "{prop: 'xh', order: 'ascending'}"
236 @row-click="clickData"
234 > 237 >
235 <el-table-column 238 <el-table-column
236 type="selection" 239 type="selection"
237 width="55"> 240 width="55">
238 </el-table-column> 241 </el-table-column>
239 <el-table-column 242 <el-table-column
240 prop="xh" 243 type="index"
241 label="序号" 244 label="序号"
242 width="55"> 245 width="55">
243 </el-table-column> 246 </el-table-column>
244 <el-table-column 247 <el-table-column
245 prop="ajmc" 248 prop="xmmc"
246 width="300" 249 width="300"
247 label="案件名称" 250 label="案件名称"
248 align="center" 251 align="center"
249 ></el-table-column> 252 ></el-table-column>
250 <el-table-column 253 <el-table-column
251 prop="anlx" 254 prop="ajlx"
252 label="案件类型" 255 label="案件类型"
253 align="center" 256 align="center"
254 width="100" 257 width="100"
...@@ -276,7 +279,7 @@ ...@@ -276,7 +279,7 @@
276 > 279 >
277 </el-table-column> 280 </el-table-column>
278 <el-table-column 281 <el-table-column
279 prop="djsh" 282 prop="djsj"
280 label="登记时间" 283 label="登记时间"
281 align="center" 284 align="center"
282 width="200" 285 width="200"
...@@ -298,24 +301,25 @@ ...@@ -298,24 +301,25 @@
298 border 301 border
299 stripe 302 stripe
300 :default-sort = "{prop: 'xh', order: 'ascending'}" 303 :default-sort = "{prop: 'xh', order: 'ascending'}"
304 @row-click="clickData"
301 > 305 >
302 <el-table-column 306 <el-table-column
303 type="selection" 307 type="selection"
304 width="55"> 308 width="55">
305 </el-table-column> 309 </el-table-column>
306 <el-table-column 310 <el-table-column
307 prop="xh" 311 type="index"
308 label="序号" 312 label="序号"
309 width="55"> 313 width="55">
310 </el-table-column> 314 </el-table-column>
311 <el-table-column 315 <el-table-column
312 prop="ajmc" 316 prop="xmmc"
313 width="300" 317 width="300"
314 label="案件名称" 318 label="案件名称"
315 align="center" 319 align="center"
316 ></el-table-column> 320 ></el-table-column>
317 <el-table-column 321 <el-table-column
318 prop="anlx" 322 prop="ajlx"
319 label="案件类型" 323 label="案件类型"
320 align="center" 324 align="center"
321 width="100" 325 width="100"
...@@ -343,7 +347,7 @@ ...@@ -343,7 +347,7 @@
343 > 347 >
344 </el-table-column> 348 </el-table-column>
345 <el-table-column 349 <el-table-column
346 prop="djsh" 350 prop="djsj"
347 label="登记时间" 351 label="登记时间"
348 align="center" 352 align="center"
349 width="200" 353 width="200"
...@@ -363,11 +367,11 @@ ...@@ -363,11 +367,11 @@
363 <el-pagination 367 <el-pagination
364 @size-change="handleSizeChange" 368 @size-change="handleSizeChange"
365 @current-change="handleCurrentChange" 369 @current-change="handleCurrentChange"
366 :current-page="1" 370 :current-page="pageNum"
367 :page-sizes="[2, 3, 5]" 371 :page-sizes="[2, 3, 5]"
368 :page-size="4" 372 :page-size="pageSize"
369 layout="total, sizes, prev, pager, next, jumper" 373 layout="total, sizes, prev, pager, next, jumper"
370 :total="8"> 374 :total="total">
371 </el-pagination> 375 </el-pagination>
372 </div> 376 </div>
373 </div> 377 </div>
......
...@@ -128,7 +128,7 @@ var self = new Vue({ ...@@ -128,7 +128,7 @@ var self = new Vue({
128 jumpdetailPage(data) { 128 jumpdetailPage(data) {
129 var taskid = data.TASKID; 129 var taskid = data.TASKID;
130 var detailType = data.detailType; 130 var detailType = data.detailType;
131 var projectid = data.PROJECTID; 131 var projectid = data.id;
132 var flowInstanceId =data.INSTANCEID; 132 var flowInstanceId =data.INSTANCEID;
133 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME)); 133 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
134 var stats = data.stats ? data.stats : ''; 134 var stats = data.stats ? data.stats : '';
......
...@@ -117,6 +117,32 @@ var self = new Vue({ ...@@ -117,6 +117,32 @@ var self = new Vue({
117 }); 117 });
118 118
119 }, 119 },
120 clickData(row){
121 this.jumpdetailPage(row)
122 },
123 jumpdetailPage(data) {
124 var taskid = data.TASKID;
125 var detailType = data.detailType;
126 var projectid = data.id;
127 var flowInstanceId =data.INSTANCEID;
128 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
129 var stats = data.stats ? data.stats : '';
130 var projecttype = data.FLOWNAME;
131 var PROJECTSTATUS = encodeURI(encodeURI(data.PROJECTSTATUS));
132 var FLOWREVISIONID = data.FLOWREVISIONID;
133 var projectcode = data.PROJECTCODE;
134 var flowItemTypeKvStr = data.FLOWITEMTYPE?"&flowItemTypeId=" + data.FLOWITEMTYPE:"";
135 var version = data.FLOWVERSION;
136 var layerid="";
137 var coverage="";
138 var url = CONF_FRONT_SERVERURL
139 + 'view/projecttask/detailproject.jsp?projectid=' + projectid + "&referer=''&stats="
140 + stats +"&projectcode="+projectcode+"&taskId=" + taskid + "&flowInstanceId=" + flowInstanceId+'&titleEncode='
141 + titleEncode + "&projectStatus=" + PROJECTSTATUS+"&flowRevisionId="+FLOWREVISIONID+flowItemTypeKvStr+"&FLOWVERSION="+version+"&detailType="+detailType;
142
143 detailPage = window.open(this.handleJumpUrl(url));
144 parent.saveOpenNew?parent.saveOpenNew(detailPage):sreachparent(opener,"saveOpenNew",detailPage);
145 },
120 handleSizeChange(){ 146 handleSizeChange(){
121 147
122 }, 148 },
......
...@@ -111,6 +111,7 @@ ...@@ -111,6 +111,7 @@
111 height="100%" 111 height="100%"
112 border 112 border
113 stripe 113 stripe
114 @row-click="clickData"
114 > 115 >
115 <el-table-column 116 <el-table-column
116 type="selection" 117 type="selection"
......