shanyunduo.cheng

导入异常提示

...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
8 :key="item.id" 8 :key="item.id"
9 :label="item.englishName" 9 :label="item.englishName"
10 :value="item.code" 10 :value="item.code"
11 - >{{item.englishName}}</el-option> 11 + >{{ item.englishName }}</el-option
12 + >
12 </el-select> 13 </el-select>
13 </el-form-item> 14 </el-form-item>
14 <el-form-item> 15 <el-form-item>
...@@ -32,7 +33,9 @@ ...@@ -32,7 +33,9 @@
32 > 33 >
33 </el-form-item> 34 </el-form-item>
34 </el-form> 35 </el-form>
35 - <div style="font-size: 12px;font-weight: 700;">提示:<span style="color:#0000FF">以下为所提交的数据或出错信息</span></div> 36 + <div style="font-size: 12px; font-weight: 700">
37 + 提示:<span style="color: #0000ff">以下为所提交的数据或出错信息</span>
38 + </div>
36 39
37 <el-table 40 <el-table
38 ref="filterTable" 41 ref="filterTable"
...@@ -46,13 +49,22 @@ ...@@ -46,13 +49,22 @@
46 49
47 <el-table-column label="错误信息" prop="errorMessage" fixed width="200"> 50 <el-table-column label="错误信息" prop="errorMessage" fixed width="200">
48 <template slot-scope="scope"> 51 <template slot-scope="scope">
49 - <div v-for="(m,key) in scope.row.errorMessage" :key="key">{{ m }}</div> 52 + <div v-for="(m, key) in scope.row.errorMessage" :key="key">
53 + {{ m }}
54 + </div>
50 </template> 55 </template>
51 </el-table-column> 56 </el-table-column>
52 57
53 - <el-table-column v-if="tableData.length == 0" ></el-table-column> 58 + <el-table-column v-if="tableData.length == 0"></el-table-column>
54 59
55 - <el-table-column v-for="(value,key) in this.tableData[0]" :key="key" v-if="key != 'errorMessage' && key != 'line'" :label="key" :prop="key" width="120"></el-table-column> 60 + <el-table-column
61 + v-for="(value, key) in this.tableData[0]"
62 + :key="key"
63 + v-if="key != 'errorMessage' && key != 'line'"
64 + :label="key"
65 + :prop="key"
66 + width="120"
67 + ></el-table-column>
56 </el-table> 68 </el-table>
57 </div> 69 </div>
58 </template> 70 </template>
...@@ -122,10 +134,17 @@ export default { ...@@ -122,10 +134,17 @@ export default {
122 console.log(option); 134 console.log(option);
123 importFlight(file, this.form.type).then((res) => { 135 importFlight(file, this.form.type).then((res) => {
124 if (res.code != 200) { 136 if (res.code != 200) {
125 - this.$message.error(res.msg); 137 + if (res.data.length != 0) {
126 - this.tableData = res.data; 138 + this.$alert(res.msg + "其他航班已更新!", "提示", {
139 + confirmButtonText: "确定",
140 + type: "warning",
141 + });
142 + }else {
143 + this.$message.error(res.msg);
144 + this.tableData = res.data;
145 + }
127 } else { 146 } else {
128 - this.$message.success('导入成功'); 147 + this.$message.success("导入成功");
129 this.tableData = res.data; 148 this.tableData = res.data;
130 } 149 }
131 }); 150 });
......