Skip to content

蔡永松 / fontweb-dc

Go to a project
Toggle navigation
Toggle navigation pinning
84eba7be by 焦小希
Options

Merge branch '3ddc' of http://yun.pashanhoo.com:9090/xian-java/fontweb-dc into 3ddc

2 parents a83785e6 cd02938c
Inline Side-by-side
Showing 7 changed files with 105 additions and 26 deletions
...@@ -97,7 +97,7 @@ var self = new Vue({ ...@@ -97,7 +97,7 @@ var self = new Vue({
97 jumpdetailPage(data) { 97 jumpdetailPage(data) {
98 var taskid = data.TASKID; 98 var taskid = data.TASKID;
99 var detailType = data.detailType; 99 var detailType = data.detailType;
100 var projectid = data.PROJECTID; 100 var projectid = data.id;
101 var flowInstanceId =data.INSTANCEID; 101 var flowInstanceId =data.INSTANCEID;
102 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME)); 102 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
103 var stats = data.stats ? data.stats : ''; 103 var stats = data.stats ? data.stats : '';
...@@ -110,7 +110,7 @@ var self = new Vue({ ...@@ -110,7 +110,7 @@ var self = new Vue({
110 var layerid=""; 110 var layerid="";
111 var coverage=""; 111 var coverage="";
112 var url = CONF_FRONT_SERVERURL 112 var url = CONF_FRONT_SERVERURL
113 + 'view/projecttask/detailproject.jsp?projectid=' + 20190 + "&referer=''&stats=" 113 + 'view/projecttask/detailproject.jsp?projectid=' + projectid + "&referer=''&stats="
114 + stats +"&projectcode="+projectcode+"&taskId=" + taskid + "&flowInstanceId=" + flowInstanceId+'&titleEncode=' 114 + stats +"&projectcode="+projectcode+"&taskId=" + taskid + "&flowInstanceId=" + flowInstanceId+'&titleEncode='
115 + titleEncode + "&projectStatus=" + PROJECTSTATUS+"&flowRevisionId="+FLOWREVISIONID+flowItemTypeKvStr+"&FLOWVERSION="+version+"&detailType="+detailType; 115 + titleEncode + "&projectStatus=" + PROJECTSTATUS+"&flowRevisionId="+FLOWREVISIONID+flowItemTypeKvStr+"&FLOWVERSION="+version+"&detailType="+detailType;
116 116
......
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
188 width="55"> 188 width="55">
189 </el-table-column> 189 </el-table-column>
190 <el-table-column 190 <el-table-column
191 prop="xh" 191 type="index"
192 label="序号" 192 label="序号"
193 width="55"> 193 width="55">
194 </el-table-column> 194 </el-table-column>
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
324 width="55"> 324 width="55">
325 </el-table-column> 325 </el-table-column>
326 <el-table-column 326 <el-table-column
327 prop="xh" 327 type="index"
328 label="序号" 328 label="序号"
329 width="55"> 329 width="55">
330 </el-table-column> 330 </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){
......
...@@ -113,28 +113,29 @@ ...@@ -113,28 +113,29 @@
113 v-if="isActive==1" 113 v-if="isActive==1"
114 :data="tabaledata" 114 :data="tabaledata"
115 style="width: 100%;" 115 style="width: 100%;"
116 height="100%" 116 height="750px"
117 border 117 border
118 stripe 118 stripe
119 :default-sort = "{prop: 'xh', order: 'ascending'}" 119 :default-sort = "{prop: 'xh', order: 'ascending'}"
120 @row-click="clickData"
120 > 121 >
121 <el-table-column 122 <el-table-column
122 type="selection" 123 type="selection"
123 width="55"> 124 width="55">
124 </el-table-column> 125 </el-table-column>
125 <el-table-column 126 <el-table-column
126 prop="xh" 127 type="index"
127 label="序号" 128 label="序号"
128 width="55"> 129 width="55">
129 </el-table-column> 130 </el-table-column>
130 <el-table-column 131 <el-table-column
131 prop="ajmc" 132 prop="xmmc"
132 width="300" 133 width="300"
133 label="案件名称" 134 label="案件名称"
134 align="center" 135 align="center"
135 ></el-table-column> 136 ></el-table-column>
136 <el-table-column 137 <el-table-column
137 prop="anlx" 138 prop="ajlx"
138 label="案件类型" 139 label="案件类型"
139 align="center" 140 align="center"
140 width="100" 141 width="100"
...@@ -162,7 +163,7 @@ ...@@ -162,7 +163,7 @@
162 > 163 >
163 </el-table-column> 164 </el-table-column>
164 <el-table-column 165 <el-table-column
165 prop="djsh" 166 prop="djsj"
166 label="登记时间" 167 label="登记时间"
167 align="center" 168 align="center"
168 width="200" 169 width="200"
...@@ -184,24 +185,25 @@ ...@@ -184,24 +185,25 @@
184 border 185 border
185 stripe 186 stripe
186 :default-sort = "{prop: 'xh', order: 'ascending'}" 187 :default-sort = "{prop: 'xh', order: 'ascending'}"
188 @row-click="clickData"
187 > 189 >
188 <el-table-column 190 <el-table-column
189 type="selection" 191 type="selection"
190 width="55"> 192 width="55">
191 </el-table-column> 193 </el-table-column>
192 <el-table-column 194 <el-table-column
193 prop="xh" 195 type="index"
194 label="序号" 196 label="序号"
195 width="55"> 197 width="55">
196 </el-table-column> 198 </el-table-column>
197 <el-table-column 199 <el-table-column
198 prop="ajmc" 200 prop="xmmc"
199 width="300" 201 width="300"
200 label="案件名称" 202 label="案件名称"
201 align="center" 203 align="center"
202 ></el-table-column> 204 ></el-table-column>
203 <el-table-column 205 <el-table-column
204 prop="anlx" 206 prop="ajlx"
205 label="案件类型" 207 label="案件类型"
206 align="center" 208 align="center"
207 width="100" 209 width="100"
...@@ -229,7 +231,7 @@ ...@@ -229,7 +231,7 @@
229 > 231 >
230 </el-table-column> 232 </el-table-column>
231 <el-table-column 233 <el-table-column
232 prop="djsh" 234 prop="djsj"
233 label="登记时间" 235 label="登记时间"
234 align="center" 236 align="center"
235 width="200" 237 width="200"
...@@ -251,24 +253,25 @@ ...@@ -251,24 +253,25 @@
251 border 253 border
252 stripe 254 stripe
253 :default-sort = "{prop: 'xh', order: 'ascending'}" 255 :default-sort = "{prop: 'xh', order: 'ascending'}"
256 @row-click="clickData"
254 > 257 >
255 <el-table-column 258 <el-table-column
256 type="selection" 259 type="selection"
257 width="55"> 260 width="55">
258 </el-table-column> 261 </el-table-column>
259 <el-table-column 262 <el-table-column
260 prop="xh" 263 type="index"
261 label="序号" 264 label="序号"
262 width="55"> 265 width="55">
263 </el-table-column> 266 </el-table-column>
264 <el-table-column 267 <el-table-column
265 prop="ajmc" 268 prop="xmmc"
266 width="300" 269 width="300"
267 label="案件名称" 270 label="案件名称"
268 align="center" 271 align="center"
269 ></el-table-column> 272 ></el-table-column>
270 <el-table-column 273 <el-table-column
271 prop="anlx" 274 prop="ajlx"
272 label="案件类型" 275 label="案件类型"
273 align="center" 276 align="center"
274 width="100" 277 width="100"
...@@ -296,7 +299,7 @@ ...@@ -296,7 +299,7 @@
296 > 299 >
297 </el-table-column> 300 </el-table-column>
298 <el-table-column 301 <el-table-column
299 prop="djsh" 302 prop="djsj"
300 label="登记时间" 303 label="登记时间"
301 align="center" 304 align="center"
302 width="200" 305 width="200"
...@@ -318,24 +321,25 @@ ...@@ -318,24 +321,25 @@
318 border 321 border
319 stripe 322 stripe
320 :default-sort = "{prop: 'xh', order: 'ascending'}" 323 :default-sort = "{prop: 'xh', order: 'ascending'}"
324 @row-click="clickData"
321 > 325 >
322 <el-table-column 326 <el-table-column
323 type="selection" 327 type="selection"
324 width="55"> 328 width="55">
325 </el-table-column> 329 </el-table-column>
326 <el-table-column 330 <el-table-column
327 prop="xh" 331 type="index"
328 label="序号" 332 label="序号"
329 width="55"> 333 width="55">
330 </el-table-column> 334 </el-table-column>
331 <el-table-column 335 <el-table-column
332 prop="ajmc" 336 prop="xmmc"
333 width="300" 337 width="300"
334 label="案件名称" 338 label="案件名称"
335 align="center" 339 align="center"
336 ></el-table-column> 340 ></el-table-column>
337 <el-table-column 341 <el-table-column
338 prop="anlx" 342 prop="ajlx"
339 label="案件类型" 343 label="案件类型"
340 align="center" 344 align="center"
341 width="100" 345 width="100"
...@@ -363,7 +367,7 @@ ...@@ -363,7 +367,7 @@
363 > 367 >
364 </el-table-column> 368 </el-table-column>
365 <el-table-column 369 <el-table-column
366 prop="djsh" 370 prop="djsj"
367 label="登记时间" 371 label="登记时间"
368 align="center" 372 align="center"
369 width="200" 373 width="200"
...@@ -383,11 +387,11 @@ ...@@ -383,11 +387,11 @@
383 <el-pagination 387 <el-pagination
384 @size-change="handleSizeChange" 388 @size-change="handleSizeChange"
385 @current-change="handleCurrentChange" 389 @current-change="handleCurrentChange"
386 :current-page="1" 390 :current-page="pageNum"
387 :page-sizes="[2, 3, 5]" 391 :page-sizes="[2, 3, 5]"
388 :page-size="4" 392 :page-size="pageSize"
389 layout="total, sizes, prev, pager, next, jumper" 393 layout="total, sizes, prev, pager, next, jumper"
390 :total="8"> 394 :total="total">
391 </el-pagination> 395 </el-pagination>
392 </div> 396 </div>
393 </div> 397 </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 },
......
...@@ -112,6 +112,7 @@ ...@@ -112,6 +112,7 @@
112 height="100%" 112 height="100%"
113 border 113 border
114 stripe 114 stripe
115 @row-click="clickData"
115 > 116 >
116 <el-table-column 117 <el-table-column
117 type="selection" 118 type="selection"
......