Skip to content

蔡永松 / fontweb-dc

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

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

2 parents 5315656b 6f0e5832
Inline Side-by-side
Showing 7 changed files with 83 additions and 76 deletions
...@@ -4,7 +4,7 @@ var self = new Vue({ ...@@ -4,7 +4,7 @@ var self = new Vue({
4 return { 4 return {
5 search: '', 5 search: '',
6 flowid: 't1001_8a8610de737b99270173937337e00133', 6 flowid: 't1001_8a8610de737b99270173937337e00133',
7 userid: 't0101_8a8610de737b99270173941e5c50017e', 7 userName: '案件查处',
8 pageNum:1, 8 pageNum:1,
9 pageSize:10, 9 pageSize:10,
10 total:0, 10 total:0,
...@@ -34,15 +34,18 @@ var self = new Vue({ ...@@ -34,15 +34,18 @@ var self = new Vue({
34 }, 34 },
35 methods: { 35 methods: {
36 getData() { 36 getData() {
37 axios.get(CONF_NEWGHSC_SERVERURL + '/ghjg/backlog/'+this.pageNum+'/'+this.pageSize, { 37 axios.post(CONF_NEWGHSC_SERVERURL + '/dblb/list/workings', null,{
38 params: { 38 params: {
39 flowid: this.flowid, 39 flowid: this.flowid,
40 userId: this.userid, 40 userName: this.userName,
41 keyword: this.search 41 pageIndex:this.pageNum,
42 pageSize:this.pageSize,
42 } 43 }
43 }).then(res => { 44 }).then(res => {
45 debugger
44 this.total=res.data.data.total; 46 this.total=res.data.data.total;
45 this.tabaledata = res.data.data.list; 47 this.tabaledata = res.data.data.Data[0];
48
46 }).catch(res=>{ 49 }).catch(res=>{
47 console.log(res) 50 console.log(res)
48 }); 51 });
...@@ -111,10 +114,10 @@ var self = new Vue({ ...@@ -111,10 +114,10 @@ var self = new Vue({
111 jumpdetailPage(data) { 114 jumpdetailPage(data) {
112 var taskid = data.TASKID; 115 var taskid = data.TASKID;
113 var detailType = data.detailType; 116 var detailType = data.detailType;
114 var projectid = data.id; 117 var projectid = data.PROJECTID;
115 var flowInstanceId =data.INSTANCEID; 118 var flowInstanceId =data.INSTANCEID;
116 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME)); 119 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
117 var stats = data.stats ? data.stats : ''; 120 var stats = 'projecting';
118 var projecttype = data.FLOWNAME; 121 var projecttype = data.FLOWNAME;
119 var PROJECTSTATUS = encodeURI(encodeURI(data.PROJECTSTATUS)); 122 var PROJECTSTATUS = encodeURI(encodeURI(data.PROJECTSTATUS));
120 var FLOWREVISIONID = data.FLOWREVISIONID; 123 var FLOWREVISIONID = data.FLOWREVISIONID;
......
...@@ -125,27 +125,27 @@ ...@@ -125,27 +125,27 @@
125 width="55"> 125 width="55">
126 </el-table-column> 126 </el-table-column>
127 <el-table-column 127 <el-table-column
128 prop="xmmc" 128 prop="PHXMMC"
129 width="300" 129 width="300"
130 label="案件名称" 130 label="案件名称"
131 align="center" 131 align="center"
132 ></el-table-column> 132 ></el-table-column>
133 <el-table-column 133 <el-table-column
134 prop="ajlx" 134 prop="PHAJLX"
135 label="案件类型" 135 label="案件类型"
136 align="center" 136 align="center"
137 width="100" 137 width="100"
138 > 138 >
139 </el-table-column> 139 </el-table-column>
140 <el-table-column 140 <el-table-column
141 prop="zrdw" 141 prop="PHZRDW"
142 label="责任单位" 142 label="责任单位"
143 align="center" 143 align="center"
144 width="200" 144 width="200"
145 > 145 >
146 </el-table-column> 146 </el-table-column>
147 <el-table-column 147 <el-table-column
148 prop="ssqy" 148 prop="PHSSQY"
149 label="所属区域" 149 label="所属区域"
150 align="center" 150 align="center"
151 width="200" 151 width="200"
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
159 > 159 >
160 </el-table-column> 160 </el-table-column>
161 <el-table-column 161 <el-table-column
162 prop="djsj" 162 prop="CREATETIME"
163 label="登记时间" 163 label="登记时间"
164 align="center" 164 align="center"
165 width="200" 165 width="200"
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
171 </template> 171 </template>
172 </el-table-column> 172 </el-table-column>
173 <el-table-column 173 <el-table-column
174 prop="jssj" 174 prop="RECEIVETIME"
175 label="接收时间" 175 label="接收时间"
176 align="center" 176 align="center"
177 width="200" 177 width="200"
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
198 width="55"> 198 width="55">
199 </el-table-column> 199 </el-table-column>
200 <el-table-column 200 <el-table-column
201 prop="xmmc" 201 prop="PHXMMC"
202 width="300" 202 width="300"
203 label="案件名称" 203 label="案件名称"
204 align="center" 204 align="center"
...@@ -211,14 +211,14 @@ ...@@ -211,14 +211,14 @@
211 > 211 >
212 </el-table-column> 212 </el-table-column>
213 <el-table-column 213 <el-table-column
214 prop="zrdw" 214 prop="PHZRDW"
215 label="责任单位" 215 label="责任单位"
216 align="center" 216 align="center"
217 width="200" 217 width="200"
218 > 218 >
219 </el-table-column> 219 </el-table-column>
220 <el-table-column 220 <el-table-column
221 prop="ssqy" 221 prop="PHSSQY"
222 label="所属区域" 222 label="所属区域"
223 align="center" 223 align="center"
224 width="200" 224 width="200"
...@@ -232,14 +232,14 @@ ...@@ -232,14 +232,14 @@
232 > 232 >
233 </el-table-column> 233 </el-table-column>
234 <el-table-column 234 <el-table-column
235 prop="djsh" 235 prop="CREATETIME"
236 label="登记时间" 236 label="登记时间"
237 align="center" 237 align="center"
238 width="200" 238 width="200"
239 > 239 >
240 </el-table-column> 240 </el-table-column>
241 <el-table-column 241 <el-table-column
242 prop="jssi" 242 prop="RECEIVETIME"
243 label="接收时间" 243 label="接收时间"
244 align="center" 244 align="center"
245 width="200" 245 width="200"
...@@ -279,14 +279,14 @@ ...@@ -279,14 +279,14 @@
279 > 279 >
280 </el-table-column> 280 </el-table-column>
281 <el-table-column 281 <el-table-column
282 prop="zrdw" 282 prop="PHZRDW"
283 label="责任单位" 283 label="责任单位"
284 align="center" 284 align="center"
285 width="200" 285 width="200"
286 > 286 >
287 </el-table-column> 287 </el-table-column>
288 <el-table-column 288 <el-table-column
289 prop="ssqy" 289 prop="PHSSQY"
290 label="所属区域" 290 label="所属区域"
291 align="center" 291 align="center"
292 width="200" 292 width="200"
...@@ -300,14 +300,14 @@ ...@@ -300,14 +300,14 @@
300 > 300 >
301 </el-table-column> 301 </el-table-column>
302 <el-table-column 302 <el-table-column
303 prop="djsh" 303 prop="CREATETIME"
304 label="登记时间" 304 label="登记时间"
305 align="center" 305 align="center"
306 width="200" 306 width="200"
307 > 307 >
308 </el-table-column> 308 </el-table-column>
309 <el-table-column 309 <el-table-column
310 prop="jssi" 310 prop="RECEIVETIME"
311 label="接收时间" 311 label="接收时间"
312 align="center" 312 align="center"
313 width="200" 313 width="200"
...@@ -334,7 +334,7 @@ ...@@ -334,7 +334,7 @@
334 width="55"> 334 width="55">
335 </el-table-column> 335 </el-table-column>
336 <el-table-column 336 <el-table-column
337 prop="xmmc" 337 prop="PHXMMC"
338 width="300" 338 width="300"
339 label="案件名称" 339 label="案件名称"
340 align="center" 340 align="center"
...@@ -347,14 +347,14 @@ ...@@ -347,14 +347,14 @@
347 > 347 >
348 </el-table-column> 348 </el-table-column>
349 <el-table-column 349 <el-table-column
350 prop="zrdw" 350 prop="PHZRDW"
351 label="责任单位" 351 label="责任单位"
352 align="center" 352 align="center"
353 width="200" 353 width="200"
354 > 354 >
355 </el-table-column> 355 </el-table-column>
356 <el-table-column 356 <el-table-column
357 prop="ssqy" 357 prop="PHSSQY"
358 label="所属区域" 358 label="所属区域"
359 align="center" 359 align="center"
360 width="200" 360 width="200"
...@@ -368,14 +368,14 @@ ...@@ -368,14 +368,14 @@
368 > 368 >
369 </el-table-column> 369 </el-table-column>
370 <el-table-column 370 <el-table-column
371 prop="djsh" 371 prop="CREATETIME"
372 label="登记时间" 372 label="登记时间"
373 align="center" 373 align="center"
374 width="200" 374 width="200"
375 > 375 >
376 </el-table-column> 376 </el-table-column>
377 <el-table-column 377 <el-table-column
378 prop="jssi" 378 prop="RECEIVETIME"
379 label="接收时间" 379 label="接收时间"
380 align="center" 380 align="center"
381 width="200" 381 width="200"
......
...@@ -4,14 +4,14 @@ var self = new Vue({ ...@@ -4,14 +4,14 @@ var self = new Vue({
4 return { 4 return {
5 search:'', 5 search:'',
6 projectId:null, 6 projectId:null,
7 userId:'t0101_8a8610de737b99270173941e5c50017e', 7 userName: '案件查处',
8 flowid: 't1001_8a8610de737b99270173937337e00133', 8 flowid: 't1001_8a8610de737b99270173937337e00133',
9 pageNum:1, 9 pageNum:1,
10 pageSize:10, 10 pageSize:10,
11 total:0, 11 total:0,
12 // 表格数据 12 // 表格数据
13 tabaledata:[ 13 tabaledata:[
14 { 14 /* {
15 xh:'1', 15 xh:'1',
16 ajmc:'关于拍卖出让87.608亩国有建设用地使用权的请示（GX3-18-25）', 16 ajmc:'关于拍卖出让87.608亩国有建设用地使用权的请示（GX3-18-25）',
17 anlx:'双随机', 17 anlx:'双随机',
...@@ -60,7 +60,7 @@ var self = new Vue({ ...@@ -60,7 +60,7 @@ var self = new Vue({
60 ljr:'向小华', 60 ljr:'向小华',
61 djsh:'2020-07-05', 61 djsh:'2020-07-05',
62 jssi:'2020-07-05', 62 jssi:'2020-07-05',
63 }, 63 },*/
64 ], 64 ],
65 isActive:1, 65 isActive:1,
66 } 66 }
...@@ -70,16 +70,17 @@ var self = new Vue({ ...@@ -70,16 +70,17 @@ var self = new Vue({
70 }, 70 },
71 methods:{ 71 methods:{
72 getData() { 72 getData() {
73 axios.get(CONF_NEWGHSC_SERVERURL + '/ghjg/haveToDo/'+this.pageNum+'/'+this.pageSize, { 73 axios.get(CONF_NEWGHSC_SERVERURL + '/dblb/list/worked', {
74 params: { 74 params: {
75 flowid: this.flowid, 75 pageIndex:this.pageNum,
76 userId: this.userId, 76 pageSize:this.pageSize,
77 keyword: this.search 77 flowId: this.flowid,
78 userName: this.userName,
78 } 79 }
79 }).then(res => { 80 }).then(res => {
80 console.log(res) 81 console.log(res)
81 this.total=res.data.data.total; 82 this.total=res.data.total;
82 this.tabaledata = res.data.data.list; 83 this.tabaledata = res.data.data.Data[0];
83 }).catch(res=>{ 84 }).catch(res=>{
84 console.log(res) 85 console.log(res)
85 }); 86 });
...@@ -93,7 +94,7 @@ var self = new Vue({ ...@@ -93,7 +94,7 @@ var self = new Vue({
93 jumpdetailPage(data) { 94 jumpdetailPage(data) {
94 var taskid = data.TASKID; 95 var taskid = data.TASKID;
95 var detailType = data.detailType; 96 var detailType = data.detailType;
96 var projectid = data.id; 97 var projectid = data.PROJECTID;
97 var flowInstanceId =data.INSTANCEID; 98 var flowInstanceId =data.INSTANCEID;
98 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME)); 99 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
99 var stats = 'dealedproject'; 100 var stats = 'dealedproject';
......
...@@ -129,27 +129,27 @@ ...@@ -129,27 +129,27 @@
129 width="55"> 129 width="55">
130 </el-table-column> 130 </el-table-column>
131 <el-table-column 131 <el-table-column
132 prop="xmmc" 132 prop="PHXMMC"
133 width="300" 133 width="300"
134 label="案件名称" 134 label="案件名称"
135 align="center" 135 align="center"
136 ></el-table-column> 136 ></el-table-column>
137 <el-table-column 137 <el-table-column
138 prop="ajlx" 138 prop="PHAJLX"
139 label="案件类型" 139 label="案件类型"
140 align="center" 140 align="center"
141 width="100" 141 width="100"
142 > 142 >
143 </el-table-column> 143 </el-table-column>
144 <el-table-column 144 <el-table-column
145 prop="zrdw" 145 prop="PHZRDW"
146 label="责任单位" 146 label="责任单位"
147 align="center" 147 align="center"
148 width="200" 148 width="200"
149 > 149 >
150 </el-table-column> 150 </el-table-column>
151 <el-table-column 151 <el-table-column
152 prop="ssqy" 152 prop="PHSSQY"
153 label="所属区域" 153 label="所属区域"
154 align="center" 154 align="center"
155 width="200" 155 width="200"
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
163 > 163 >
164 </el-table-column> 164 </el-table-column>
165 <el-table-column 165 <el-table-column
166 prop="djsj" 166 prop="CREATETIME"
167 label="登记时间" 167 label="登记时间"
168 align="center" 168 align="center"
169 width="200" 169 width="200"
...@@ -197,27 +197,27 @@ ...@@ -197,27 +197,27 @@
197 width="55"> 197 width="55">
198 </el-table-column> 198 </el-table-column>
199 <el-table-column 199 <el-table-column
200 prop="xmmc" 200 prop="PHXMMC"
201 width="300" 201 width="300"
202 label="案件名称" 202 label="案件名称"
203 align="center" 203 align="center"
204 ></el-table-column> 204 ></el-table-column>
205 <el-table-column 205 <el-table-column
206 prop="ajlx" 206 prop="PHAJLX"
207 label="案件类型" 207 label="案件类型"
208 align="center" 208 align="center"
209 width="100" 209 width="100"
210 > 210 >
211 </el-table-column> 211 </el-table-column>
212 <el-table-column 212 <el-table-column
213 prop="zrdw" 213 prop="PHZRDW"
214 label="责任单位" 214 label="责任单位"
215 align="center" 215 align="center"
216 width="200" 216 width="200"
217 > 217 >
218 </el-table-column> 218 </el-table-column>
219 <el-table-column 219 <el-table-column
220 prop="ssqy" 220 prop="PHSSQY"
221 label="所属区域" 221 label="所属区域"
222 align="center" 222 align="center"
223 width="200" 223 width="200"
...@@ -265,27 +265,27 @@ ...@@ -265,27 +265,27 @@
265 width="55"> 265 width="55">
266 </el-table-column> 266 </el-table-column>
267 <el-table-column 267 <el-table-column
268 prop="xmmc" 268 prop="PHXMMC"
269 width="300" 269 width="300"
270 label="案件名称" 270 label="案件名称"
271 align="center" 271 align="center"
272 ></el-table-column> 272 ></el-table-column>
273 <el-table-column 273 <el-table-column
274 prop="ajlx" 274 prop="PHAJLX"
275 label="案件类型" 275 label="案件类型"
276 align="center" 276 align="center"
277 width="100" 277 width="100"
278 > 278 >
279 </el-table-column> 279 </el-table-column>
280 <el-table-column 280 <el-table-column
281 prop="zrdw" 281 prop="PHZRDW"
282 label="责任单位" 282 label="责任单位"
283 align="center" 283 align="center"
284 width="200" 284 width="200"
285 > 285 >
286 </el-table-column> 286 </el-table-column>
287 <el-table-column 287 <el-table-column
288 prop="ssqy" 288 prop="PHSSQY"
289 label="所属区域" 289 label="所属区域"
290 align="center" 290 align="center"
291 width="200" 291 width="200"
...@@ -333,27 +333,27 @@ ...@@ -333,27 +333,27 @@
333 width="55"> 333 width="55">
334 </el-table-column> 334 </el-table-column>
335 <el-table-column 335 <el-table-column
336 prop="xmmc" 336 prop="PHXMMC"
337 width="300" 337 width="300"
338 label="案件名称" 338 label="案件名称"
339 align="center" 339 align="center"
340 ></el-table-column> 340 ></el-table-column>
341 <el-table-column 341 <el-table-column
342 prop="ajlx" 342 prop="PHAJLX"
343 label="案件类型" 343 label="案件类型"
344 align="center" 344 align="center"
345 width="100" 345 width="100"
346 > 346 >
347 </el-table-column> 347 </el-table-column>
348 <el-table-column 348 <el-table-column
349 prop="zrdw" 349 prop="PHZRDW"
350 label="责任单位" 350 label="责任单位"
351 align="center" 351 align="center"
352 width="200" 352 width="200"
353 > 353 >
354 </el-table-column> 354 </el-table-column>
355 <el-table-column 355 <el-table-column
356 prop="ssqy" 356 prop="PHSSQY"
357 label="所属区域" 357 label="所属区域"
358 align="center" 358 align="center"
359 width="200" 359 width="200"
......
...@@ -6,7 +6,7 @@ var self = new Vue({ ...@@ -6,7 +6,7 @@ var self = new Vue({
6 projectId:null, 6 projectId:null,
7 userId:null, 7 userId:null,
8 flowid: 't1001_8a8610de737b99270173937337e00133', 8 flowid: 't1001_8a8610de737b99270173937337e00133',
9 userid: 't0101_8a8610de737b99270173941e5c50017e', 9 userName: '案件查处',
10 pageNum:1, 10 pageNum:1,
11 pageSize:2, 11 pageSize:2,
12 total:0, 12 total:0,
...@@ -27,15 +27,16 @@ var self = new Vue({ ...@@ -27,15 +27,16 @@ var self = new Vue({
27 }, 27 },
28 handleCurrentChange(){}, 28 handleCurrentChange(){},
29 getData() { 29 getData() {
30 axios.get(CONF_NEWGHSC_SERVERURL + '/ghjg/backlog/'+this.pageNum+'/'+this.pageSize, { 30 axios.get(CONF_NEWGHSC_SERVERURL + '/dblb/list/workings', {
31 params: { 31 params: {
32 flowid: this.flowid, 32 pageIndex:this.pageNum,
33 userId: this.userid, 33 pageSize:this.pagesize,
34 keyword: this.search 34 flowId: this.flowid,
35 userName: this.userName,
35 } 36 }
36 }).then(res => { 37 }).then(res => {
37 this.total=res.data.data.total; 38 this.total=res.data.total;
38 this.tabaledata = res.data.data.list; 39 this.tabaledata =res.data.data.Data[0];
39 }).catch(); 40 }).catch();
40 41
41 }, 42 },
......
...@@ -120,62 +120,62 @@ ...@@ -120,62 +120,62 @@
120 width="55"> 120 width="55">
121 </el-table-column> 121 </el-table-column>
122 <el-table-column 122 <el-table-column
123 prop="xmbh" 123 prop="PHXMBH"
124 width="130" 124 width="130"
125 label="项目编号" 125 label="项目编号"
126 align="center" 126 align="center"
127 ></el-table-column> 127 ></el-table-column>
128 <el-table-column 128 <el-table-column
129 prop="xmmc" 129 prop="PHXMMC"
130 label="项目名称" 130 label="项目名称"
131 align="center" 131 align="center"
132 width="450" 132 width="450"
133 > 133 >
134 </el-table-column> 134 </el-table-column>
135 <el-table-column 135 <el-table-column
136 prop="djbh" 136 prop="PHDJBH"
137 label="地籍编号" 137 label="地籍编号"
138 align="center" 138 align="center"
139 width="100" 139 width="100"
140 > 140 >
141 </el-table-column> 141 </el-table-column>
142 <el-table-column 142 <el-table-column
143 prop="ydmj" 143 prop="PHYDMJ"
144 label="用地面积（亩）" 144 label="用地面积（亩）"
145 align="center" 145 align="center"
146 width="180" 146 width="180"
147 > 147 >
148 </el-table-column> 148 </el-table-column>
149 <el-table-column 149 <el-table-column
150 prop="zdwz" 150 prop="PHZDWZ"
151 label="宗地位置" 151 label="宗地位置"
152 align="center" 152 align="center"
153 width="400" 153 width="400"
154 > 154 >
155 </el-table-column> 155 </el-table-column>
156 <el-table-column 156 <el-table-column
157 prop="tdyt" 157 prop="PHTDYT"
158 label="土地用途" 158 label="土地用途"
159 align="center" 159 align="center"
160 width="150" 160 width="150"
161 > 161 >
162 </el-table-column> 162 </el-table-column>
163 <el-table-column 163 <el-table-column
164 prop="zrdw" 164 prop="PHZRDW"
165 label="责任单位" 165 label="责任单位"
166 align="center" 166 align="center"
167 width="100" 167 width="100"
168 > 168 >
169 </el-table-column> 169 </el-table-column>
170 <el-table-column 170 <el-table-column
171 prop="ssqy" 171 prop="PHSSQY"
172 label="所属区域" 172 label="所属区域"
173 align="center" 173 align="center"
174 width="100" 174 width="100"
175 > 175 >
176 </el-table-column> 176 </el-table-column>
177 <el-table-column 177 <el-table-column
178 prop="cjsj" 178 prop="CREATETIME"
179 label="创建时间" 179 label="创建时间"
180 align="center" 180 align="center"
181 width="100" 181 width="100"
......
...@@ -104,15 +104,17 @@ var self = new Vue({ ...@@ -104,15 +104,17 @@ var self = new Vue({
104 }, 104 },
105 methods:{ 105 methods:{
106 getData() { 106 getData() {
107 axios.get(CONF_NEWGHSC_SERVERURL + '/ghjg/backlog/'+this.pageNum+'/'+this.pageSize, { 107 axios.post(CONF_NEWGHSC_SERVERURL + '/dblb/list/worked', {
108 params: { 108 params: {
109 flowid: this.flowid, 109 pageIndex:this.pageNum,
110 userId: this.userid, 110 pageSize:this.pagesize,
111 flowId: this.flowid,
112 userName: this.userName,
111 keyword: this.search 113 keyword: this.search
112 } 114 }
113 }).then(res => { 115 }).then(res => {
114 this.total=res.data.data.total; 116 this.total=res.data.Data.total;
115 this.tabaledata = res.data.data.list; 117 this.tabaledata = res.data.data.Data[0];
116 }).catch(res=>{ 118 }).catch(res=>{
117 console.log(res) 119 console.log(res)
118 }); 120 });
...@@ -133,7 +135,7 @@ var self = new Vue({ ...@@ -133,7 +135,7 @@ var self = new Vue({
133 jumpdetailPage(data) { 135 jumpdetailPage(data) {
134 var taskid = data.TASKID; 136 var taskid = data.TASKID;
135 var detailType = data.detailType; 137 var detailType = data.detailType;
136 var projectid = data.id; 138 var projectid = data.PROJECTID;
137 var flowInstanceId =data.INSTANCEID; 139 var flowInstanceId =data.INSTANCEID;
138 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME)); 140 var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
139 var stats = 'dealedproject'; 141 var stats = 'dealedproject';
......