Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
shanyunduo.cheng
55493aea 1 parent ad09441f

前后去空格，servercode排序

Inline Side-by-side
Showing 2 changed files with 8 additions and 8 deletions
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 > 8 >
9 <el-form-item label="航班号"> 9 <el-form-item label="航班号">
10 <el-input 10 <el-input
11 - v-model="queryParams.purposeOfFlightNo" 11 + v-model.trim="queryParams.purposeOfFlightNo"
12 placeholder="航班号" 12 placeholder="航班号"
13 @keyup.enter.native="getList" 13 @keyup.enter.native="getList"
14 ></el-input> 14 ></el-input>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 > 10 >
11 <el-form-item label="航班号" prop="purposeOfFlightNo"> 11 <el-form-item label="航班号" prop="purposeOfFlightNo">
12 <el-input 12 <el-input
13 - v-model="form.purposeOfFlightNo" 13 + v-model.trim="form.purposeOfFlightNo"
14 style="width: 30%" 14 style="width: 30%"
15 ></el-input> 15 ></el-input>
16 </el-form-item> 16 </el-form-item>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 <!-- <el-alert title="提示：站点之间用回车符分隔" type="info" show-icon size="small" :closable="false" style="height:30px; margin-buttom"> </el-alert> --> 32 <!-- <el-alert title="提示：站点之间用回车符分隔" type="info" show-icon size="small" :closable="false" style="height:30px; margin-buttom"> </el-alert> -->
33 <el-input 33 <el-input
34 type="textarea" 34 type="textarea"
35 - v-model="form.location" 35 + v-model.trim="form.location"
36 :rows="6" 36 :rows="6"
37 resize="none" 37 resize="none"
38 ></el-input> 38 ></el-input>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 <el-form-item label="站点不包含"> 42 <el-form-item label="站点不包含">
43 <el-input 43 <el-input
44 type="textarea" 44 type="textarea"
45 - v-model="form.notLocation" 45 + v-model.trim="form.notLocation"
46 :rows="6" 46 :rows="6"
47 resize="none" 47 resize="none"
48 ></el-input> 48 ></el-input>
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
66 <el-form-item label="URSA包含"> 66 <el-form-item label="URSA包含">
67 <el-input 67 <el-input
68 type="textarea" 68 type="textarea"
69 - v-model="form.includeUrsa" 69 + v-model.trim="form.includeUrsa"
70 :rows="6" 70 :rows="6"
71 resize="none" 71 resize="none"
72 ></el-input> 72 ></el-input>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
76 <el-form-item label="URSA不包含"> 76 <el-form-item label="URSA不包含">
77 <el-input 77 <el-input
78 type="textarea" 78 type="textarea"
79 - v-model="form.notIncludeUrsa" 79 + v-model.trim="form.notIncludeUrsa"
80 :rows="6" 80 :rows="6"
81 resize="none" 81 resize="none"
82 ></el-input> 82 ></el-input>
...@@ -322,7 +322,7 @@ export default { ...@@ -322,7 +322,7 @@ export default {
322 let dict = response.data; 322 let dict = response.data;
323 this.cargoType = dict.cargoType; 323 this.cargoType = dict.cargoType;
324 this.cargoStatus = dict.cargoStatus; 324 this.cargoStatus = dict.cargoStatus;
325 - this.serviceCode = dict.serviceCode; 325 + this.serviceCode = dict.serviceCode.sort((a, b) => a.englishName.localeCompare(b.englishName));
326 this.subCategory = dict.subCategory; 326 this.subCategory = dict.subCategory;
327 }); 327 });
328 if (handle === "detail") { 328 if (handle === "detail") {
...@@ -331,7 +331,7 @@ export default { ...@@ -331,7 +331,7 @@ export default {
331 331
332 if (handle != "add") { 332 if (handle != "add") {
333 let id = this.$route.params.id; 333 let id = this.$route.params.id;
334 - 334 +
335 if (isNaN(Number(id))) { 335 if (isNaN(Number(id))) {
336 findDestinationFltRuleByActualFlight(id).then((response) => { 336 findDestinationFltRuleByActualFlight(id).then((response) => {
337 if (response.code != 200) { 337 if (response.code != 200) {
......