|
@@ -689,7 +689,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
|
|
|
- //判断是否是新增的数据
|
|
|
+ //判断是否是新增的数据-刷新数据
|
|
|
async judageAdd(){
|
|
|
if(!this.queryParam.flourOrGarment || this.queryParam.flourOrGarment == ''){
|
|
|
this.queryParam ={}
|
|
@@ -697,7 +697,7 @@ export default {
|
|
|
this.queryParam.flourOrGarment =this.returnFlourOrGarment
|
|
|
await this.getShipmentList()
|
|
|
this.queryParam = {}
|
|
|
- this.defalutDate()
|
|
|
+ this.defalutDate()
|
|
|
}else{
|
|
|
await this.getShipmentList()
|
|
|
}
|
|
@@ -706,12 +706,18 @@ export default {
|
|
|
|
|
|
// 导出
|
|
|
handleExportXls(fileName) {
|
|
|
-
|
|
|
+ if(!this.queryParam.flourOrGarment || this.queryParam.flourOrGarment == ''){
|
|
|
+ this.queryParam ={}
|
|
|
+ this.queryParam.id = this.returnId
|
|
|
+ this.queryParam.flourOrGarment =this.returnFlourOrGarment
|
|
|
+ }
|
|
|
exportXls(this.queryParam).then(res =>{
|
|
|
if(res.success==false){
|
|
|
this.$message.error(res.message)
|
|
|
}else{
|
|
|
downFile('/shippingDetails/syShippingDetails/exportXls',this.queryParam).then(data => {
|
|
|
+ this.queryParam = {}
|
|
|
+ this.defalutDate()
|
|
|
if (!data) {
|
|
|
this.$message.warning('文件下载失败')
|
|
|
return
|
|
@@ -737,8 +743,15 @@ export default {
|
|
|
},
|
|
|
|
|
|
//明细导出
|
|
|
- exportXlsShipment(fileName){
|
|
|
+ async exportXlsShipment(fileName){
|
|
|
+ if(!this.queryParam.flourOrGarment || this.queryParam.flourOrGarment == ''){
|
|
|
+ this.queryParam ={}
|
|
|
+ this.queryParam.id = this.returnId
|
|
|
+ this.queryParam.flourOrGarment =this.returnFlourOrGarment
|
|
|
+ }
|
|
|
downFile('/shippingDetails/syShippingDetails/exportXlsShipping',this.queryParam).then(data => {
|
|
|
+ this.queryParam = {}
|
|
|
+ this.defalutDate()
|
|
|
if (!data) {
|
|
|
this.$message.warning('文件下载失败')
|
|
|
return
|