jinhui.wang

样式修正

...@@ -4,14 +4,12 @@ ...@@ -4,14 +4,12 @@
4 label-position="right" label-width="auto"> 4 label-position="right" label-width="auto">
5 <el-form-item label="原航班"> 5 <el-form-item label="原航班">
6 <el-input type="text" v-model="upCase" placeholder="请输入原航班" clearable></el-input> 6 <el-input type="text" v-model="upCase" placeholder="请输入原航班" clearable></el-input>
7 - <!-- <el-input v-model="upCase" placeholder="请输入原航班" clearable size="small" /> -->
8 </el-form-item> 7 </el-form-item>
9 <el-form-item label="状态" prop="status"> 8 <el-form-item label="状态" prop="status">
10 <el-select v-model="queryParams.status" placeholder="请选择" clearable> 9 <el-select v-model="queryParams.status" placeholder="请选择" clearable>
11 <el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" /> 10 <el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" />
12 </el-select> 11 </el-select>
13 </el-form-item> 12 </el-form-item>
14 -
15 <el-form-item> 13 <el-form-item>
16 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询原航班配置</el-button> 14 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询原航班配置</el-button>
17 </el-form-item> 15 </el-form-item>
...@@ -20,7 +18,6 @@ ...@@ -20,7 +18,6 @@
20 <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.flightDate" type="date" placeholder="选择日期"> 18 <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.flightDate" type="date" placeholder="选择日期">
21 </el-date-picker> 19 </el-date-picker>
22 </el-form-item> 20 </el-form-item>
23 -
24 <el-form-item> 21 <el-form-item>
25 <el-button type="primary" icon="el-icon-search" size="mini" @click="findSourceFlightAndFlightDate">查询实际配载航班 22 <el-button type="primary" icon="el-icon-search" size="mini" @click="findSourceFlightAndFlightDate">查询实际配载航班
26 </el-button>&#12288; 23 </el-button>&#12288;
...@@ -33,7 +30,6 @@ ...@@ -33,7 +30,6 @@
33 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> 30 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
34 </el-form-item> 31 </el-form-item>
35 </el-form> 32 </el-form>
36 -
37 <el-table v-loading="loading" height="550" size="small" :data="sourceFlightRulesList" highlight-current-row border 33 <el-table v-loading="loading" height="550" size="small" :data="sourceFlightRulesList" highlight-current-row border
38 stripe> 34 stripe>
39 <el-table-column type="index" label="序号" align="center"> 35 <el-table-column type="index" label="序号" align="center">
...@@ -47,7 +43,7 @@ ...@@ -47,7 +43,7 @@
47 <el-table-column label="结束时间" align="center" prop="endDate" width="100" /> 43 <el-table-column label="结束时间" align="center" prop="endDate" width="100" />
48 <el-table-column label="最后修改人" align="center" prop="updateUserName" width="100" /> 44 <el-table-column label="最后修改人" align="center" prop="updateUserName" width="100" />
49 <el-table-column label="最后修改时间" align="center" prop="updateTime" width="100" /> 45 <el-table-column label="最后修改时间" align="center" prop="updateTime" width="100" />
50 - <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right"> 46 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
51 <template slot-scope="scope"> 47 <template slot-scope="scope">
52 <el-button size="mini" type="text" icon="el-icon-edit" v-hasPermi="['allocation:rand:update']" 48 <el-button size="mini" type="text" icon="el-icon-edit" v-hasPermi="['allocation:rand:update']"
53 @click="handleUpdate(scope.row)">修改</el-button> 49 @click="handleUpdate(scope.row)">修改</el-button>
...@@ -63,10 +59,8 @@ ...@@ -63,10 +59,8 @@
63 </template> 59 </template>
64 </el-table-column> 60 </el-table-column>
65 </el-table> 61 </el-table>
66 -
67 <pagination v-show="total > 0" :total="total" layout=" prev, pager, next, jumper, sizes,total" 62 <pagination v-show="total > 0" :total="total" layout=" prev, pager, next, jumper, sizes,total"
68 :page.sync="queryParams.pageNum" :limit.sync="queryParams.limit" @pagination="findSourceFlightRules" /> 63 :page.sync="queryParams.pageNum" :limit.sync="queryParams.limit" @pagination="findSourceFlightRules" />
69 -
70 <!-- 查看目的航班对话框 --> 64 <!-- 查看目的航班对话框 -->
71 <el-dialog title="实际配载航班" :visible.sync="openFlightDate" width="70%" :close-on-click-modal="false" 65 <el-dialog title="实际配载航班" :visible.sync="openFlightDate" width="70%" :close-on-click-modal="false"
72 :append-to-body="true"> 66 :append-to-body="true">
...@@ -88,7 +82,6 @@ ...@@ -88,7 +82,6 @@
88 <el-button @click="cancelFlightDate">返 回</el-button> 82 <el-button @click="cancelFlightDate">返 回</el-button>
89 </div> 83 </div>
90 </el-dialog> 84 </el-dialog>
91 -
92 <!-- 添加或修改对话框 --> 85 <!-- 添加或修改对话框 -->
93 <el-dialog :title="title" :visible.sync="open" width="55%" :append-to-body="true" :close-on-click-modal="false"> 86 <el-dialog :title="title" :visible.sync="open" width="55%" :append-to-body="true" :close-on-click-modal="false">
94 <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto"> 87 <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto">
...@@ -98,7 +91,6 @@ ...@@ -98,7 +91,6 @@
98 <el-input v-model="form.sourceFlightNo" placeholder="请输入原航班号" maxlength="10" /> 91 <el-input v-model="form.sourceFlightNo" placeholder="请输入原航班号" maxlength="10" />
99 </el-form-item> 92 </el-form-item>
100 </el-col> 93 </el-col>
101 -
102 <el-col :span="8"> 94 <el-col :span="8">
103 <el-form-item label="口岸" prop="portName"> 95 <el-form-item label="口岸" prop="portName">
104 <el-select :disabled="true" v-model="form.portName" size="mini" placeholder="选择口岸"> 96 <el-select :disabled="true" v-model="form.portName" size="mini" placeholder="选择口岸">
...@@ -123,7 +115,6 @@ ...@@ -123,7 +115,6 @@
123 </el-date-picker> 115 </el-date-picker>
124 </el-form-item> 116 </el-form-item>
125 </el-col> 117 </el-col>
126 -
127 <el-col :span="24" style="margin-bottom: 5%"> 118 <el-col :span="24" style="margin-bottom: 5%">
128 <span style="color: #ff4949; margin-left: 10%">提示:配载航班之间请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span><br /> 119 <span style="color: #ff4949; margin-left: 10%">提示:配载航班之间请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span><br />
129 <span 120 <span
...@@ -291,10 +282,10 @@ export default { ...@@ -291,10 +282,10 @@ export default {
291 this.queryParams.start = 0; 282 this.queryParams.start = 0;
292 } 283 }
293 findSourceFlightRulesApi(this.queryParams).then((response) => { 284 findSourceFlightRulesApi(this.queryParams).then((response) => {
285 + this.loading = false;
294 if (response.code == 200) { 286 if (response.code == 200) {
295 this.sourceFlightRulesList = response.data.list; 287 this.sourceFlightRulesList = response.data.list;
296 this.total = response.data.totalCount; 288 this.total = response.data.totalCount;
297 - this.loading = false;
298 } else { 289 } else {
299 this.msgError(response.msg); 290 this.msgError(response.msg);
300 } 291 }
...@@ -358,9 +349,8 @@ export default { ...@@ -358,9 +349,8 @@ export default {
358 if (valid) { 349 if (valid) {
359 this.form.dayOfWeek = this.dayOfWeek.sort(); 350 this.form.dayOfWeek = this.dayOfWeek.sort();
360 let formdata = JSON.parse(JSON.stringify(this.form)); 351 let formdata = JSON.parse(JSON.stringify(this.form));
361 - formdata.sourceFlightNo = this.upCase(formdata.sourceFlightNo 352 + formdata.sourceFlightNo = formdata.sourceFlightNo.trim().toUpperCase();
362 - .trim()); 353 + formdata.flightRank = formdata.flightRank.trim().toUpperCase();
363 - formdata.flightRank = this.upCase(formdata.flightRank.trim());
364 if (formdata.startDate === undefined || formdata.startDate == null) { 354 if (formdata.startDate === undefined || formdata.startDate == null) {
365 formdata.startDate = ""; 355 formdata.startDate = "";
366 } 356 }
......