jinhui.wang

删除无用代码,航班迁转报错提示增加

...@@ -614,7 +614,6 @@ export default { ...@@ -614,7 +614,6 @@ export default {
614 this.infoForm.fltDate = res.data.list.ruleDate 614 this.infoForm.fltDate = res.data.list.ruleDate
615 this.infoForm.route = res.data.list.flightRoute 615 this.infoForm.route = res.data.list.flightRoute
616 this.infoForm.list.push(this.dataHandle(res.data.list)) 616 this.infoForm.list.push(this.dataHandle(res.data.list))
617 - console.log(this.infoForm)
618 } else { 617 } else {
619 this.isEmpty = true 618 this.isEmpty = true
620 } 619 }
......
...@@ -522,7 +522,6 @@ export default { ...@@ -522,7 +522,6 @@ export default {
522 .catch(() => { 522 .catch(() => {
523 this.tableLoading = false; 523 this.tableLoading = false;
524 }); 524 });
525 - console.log(this.$refs.newTables)
526 this.$refs.newTables.clearTable(); 525 this.$refs.newTables.clearTable();
527 this.cargoTotal(); 526 this.cargoTotal();
528 }, 527 },
......
...@@ -159,6 +159,18 @@ export default { ...@@ -159,6 +159,18 @@ export default {
159 this.msgSuccess(res.msg) 159 this.msgSuccess(res.msg)
160 } else { 160 } else {
161 this.msgWarning(res.msg) 161 this.msgWarning(res.msg)
162 + if (res.data != null && res.data.length > 0) {
163 + let arr = []
164 + res.data.forEach(item => {
165 + let obj = {
166 + waybillNo: item.split(':')[0],
167 + errorMessage: item.split(':')[1]
168 + }
169 + arr.push(obj)
170 + })
171 + this.$router.push({ name: 'UpDateResult', params: { data: arr, from: 'queryCargo' } })
172 + this.dialogBeforeClose()
173 + }
162 } 174 }
163 }); 175 });
164 this.cleaerForm(); 176 this.cleaerForm();
...@@ -176,6 +188,18 @@ export default { ...@@ -176,6 +188,18 @@ export default {
176 } else { 188 } else {
177 this.loading = false; 189 this.loading = false;
178 this.msgWarning(res.msg) 190 this.msgWarning(res.msg)
191 + if (res.data != null && res.data.length > 0) {
192 + let arr = []
193 + res.data.forEach(item => {
194 + let obj = {
195 + waybillNo: item.split(':')[0],
196 + errorMessage: item.split(':')[1]
197 + }
198 + arr.push(obj)
199 + })
200 + this.$router.push({ name: 'UpDateResult', params: { data: arr, from: 'queryCargo' } })
201 + this.dialogBeforeClose()
202 + }
179 } 203 }
180 }).catch(() => { 204 }).catch(() => {
181 this.loading = false; 205 this.loading = false;
......
...@@ -4,9 +4,11 @@ ...@@ -4,9 +4,11 @@
4 <!-- <el-table-column label="行号" prop="line" width="50" align="center"> 4 <!-- <el-table-column label="行号" prop="line" width="50" align="center">
5 </el-table-column> --> 5 </el-table-column> -->
6 <el-table-column label="序号" type="index" width="70" align="center" /> 6 <el-table-column label="序号" type="index" width="70" align="center" />
7 + <el-table-column label="运单号" prop="waybillNo" width="150" v-if="fromRoute == 'queryCargo'" />
7 <el-table-column label="错误信息" prop="errorMessage"> 8 <el-table-column label="错误信息" prop="errorMessage">
8 <template slot-scope="scope"> 9 <template slot-scope="scope">
9 - {{scope.row}} 10 + <span v-if="fromRoute == 'queryCargo'">{{ scope.row.errorMessage }}</span>
11 + <span v-else> {{ scope.row }}</span>
10 <!-- <div v-for="(m, key) in scope.row.errorMessage" :key="key"> 12 <!-- <div v-for="(m, key) in scope.row.errorMessage" :key="key">
11 {{ m }} 13 {{ m }}
12 </div> --> 14 </div> -->
......