Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
d6f41fc4 2 parents 07866e70 6f958b8b

Merge branch 'test' into uat

Inline Side-by-side
Showing 1 changed file with 2 additions and 0 deletions
...@@ -199,6 +199,7 @@ export default { ...@@ -199,6 +199,7 @@ export default {
199 this.cleaerForm(); 199 this.cleaerForm();
200 this.$emit("dialogBeforeClose", { close: false, reload: true }); 200 this.$emit("dialogBeforeClose", { close: false, reload: true });
201 } else if (res.code === 201) { 201 } else if (res.code === 201) {
202 + this.loading = false
202 let arr = [] 203 let arr = []
203 res.data.forEach(item => { 204 res.data.forEach(item => {
204 let obj = { 205 let obj = {
...@@ -210,6 +211,7 @@ export default { ...@@ -210,6 +211,7 @@ export default {
210 this.$router.push({ name: 'UpDateResult', query: { data: arr, from: 'queryCargo' } }) 211 this.$router.push({ name: 'UpDateResult', query: { data: arr, from: 'queryCargo' } })
211 this.dialogBeforeClose() 212 this.dialogBeforeClose()
212 } else if (res.code === 203) { 213 } else if (res.code === 203) {
214 + this.loading = false
213 this.reBatchMoveCargoToOtherFlight(res.msg, 'notInWhite') 215 this.reBatchMoveCargoToOtherFlight(res.msg, 'notInWhite')
214 } else { 216 } else {
215 this.msgWarning(res.msg) 217 this.msgWarning(res.msg)
......