Merge pull request '运单导出问题件调整' (#184) from master-xjkh into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/184
This commit is contained in:
commit
04af862c85
@ -1231,6 +1231,13 @@ export default {
|
|||||||
if(j === 'waybillOther.moneyCompany'){
|
if(j === 'waybillOther.moneyCompany'){
|
||||||
return v['waybillOther']['moneyCompany'];
|
return v['waybillOther']['moneyCompany'];
|
||||||
}
|
}
|
||||||
|
if(j=== 'blIsQuestion'){
|
||||||
|
if(v[j] == 1){
|
||||||
|
return '是';
|
||||||
|
}else{
|
||||||
|
return '否';
|
||||||
|
}
|
||||||
|
}
|
||||||
return v[j]
|
return v[j]
|
||||||
}))
|
}))
|
||||||
},
|
},
|
||||||
|
|||||||
@ -1081,7 +1081,8 @@ export default {
|
|||||||
this.exportData(this.selectionList,loadingInstance);
|
this.exportData(this.selectionList,loadingInstance);
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
let qExportParam=this.initQueryParams();
|
this.initQueryParams();
|
||||||
|
let qExportParam={...this.queryParams};
|
||||||
qExportParam.pageNum=1;
|
qExportParam.pageNum=1;
|
||||||
qExportParam.pageSize=20000;
|
qExportParam.pageSize=20000;
|
||||||
|
|
||||||
@ -1194,6 +1195,13 @@ export default {
|
|||||||
if(j === 'waybillOther.moneyCompany'){
|
if(j === 'waybillOther.moneyCompany'){
|
||||||
return v['waybillOther']['moneyCompany'];
|
return v['waybillOther']['moneyCompany'];
|
||||||
}
|
}
|
||||||
|
if(j=== 'blIsQuestion'){
|
||||||
|
if(v[j] == 1){
|
||||||
|
return '是';
|
||||||
|
}else{
|
||||||
|
return '否';
|
||||||
|
}
|
||||||
|
}
|
||||||
return v[j]
|
return v[j]
|
||||||
}))
|
}))
|
||||||
},
|
},
|
||||||
|
|||||||
@ -1274,6 +1274,13 @@ export default {
|
|||||||
if(j === 'waybillOther.moneyCompany'){
|
if(j === 'waybillOther.moneyCompany'){
|
||||||
return v['waybillOther']['moneyCompany'];
|
return v['waybillOther']['moneyCompany'];
|
||||||
}
|
}
|
||||||
|
if(j=== 'blIsQuestion'){
|
||||||
|
if(v[j] == 1){
|
||||||
|
return '是';
|
||||||
|
}else{
|
||||||
|
return '否';
|
||||||
|
}
|
||||||
|
}
|
||||||
return v[j]
|
return v[j]
|
||||||
}))
|
}))
|
||||||
},
|
},
|
||||||
|
|||||||
@ -1224,6 +1224,13 @@ export default {
|
|||||||
if(j === 'waybillOther.moneyCompany'){
|
if(j === 'waybillOther.moneyCompany'){
|
||||||
return v['waybillOther']['moneyCompany'];
|
return v['waybillOther']['moneyCompany'];
|
||||||
}
|
}
|
||||||
|
if(j=== 'blIsQuestion'){
|
||||||
|
if(v[j] == 1){
|
||||||
|
return '是';
|
||||||
|
}else{
|
||||||
|
return '否';
|
||||||
|
}
|
||||||
|
}
|
||||||
return v[j]
|
return v[j]
|
||||||
}))
|
}))
|
||||||
},
|
},
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user