Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
7c1e35fc 1 parent 7d5ca3c0

modify

Inline Side-by-side
Showing 1 changed file with 0 additions and 3 deletions
...@@ -299,8 +299,6 @@ export default { ...@@ -299,8 +299,6 @@ export default {
299 } 299 }
300 queryRoute(obj).then(res => { 300 queryRoute(obj).then(res => {
301 if (res.code === 200) { 301 if (res.code === 200) {
302 -<<<<<<< HEAD
303 -=======
304 res.data.list.map(item=>{ 302 res.data.list.map(item=>{
305 if(item.isEtesRoute == "N" || item.isEtesRoute == null){ 303 if(item.isEtesRoute == "N" || item.isEtesRoute == null){
306 item.isEtesRoute = false; 304 item.isEtesRoute = false;
...@@ -308,7 +306,6 @@ export default { ...@@ -308,7 +306,6 @@ export default {
308 item.isEtesRoute = true; 306 item.isEtesRoute = true;
309 } 307 }
310 }) 308 })
311 ->>>>>>> fix-issues
312 this.tableData = res.data.list 309 this.tableData = res.data.list
313 this.total = res.data.total 310 this.total = res.data.total
314 } else { 311 } else {
......