朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 28a3afb3b4a3a0d80aec5eb77e5b3223ffffa303 1 个父辈 1ba2459e

通用业务更新

内嵌 并排对比
正在显示 5 个修改的文件 包含 160 行增加 和 33 行删除
@@ -9,33 +9,47 @@ @@ -9,33 +9,47 @@
9 <el-row> 9 <el-row>
10 <el-form :model="aircraft" :rules="rules" ref="aircraft" label-width="130px" class="demo-ruleForm"> 10 <el-form :model="aircraft" :rules="rules" ref="aircraft" label-width="130px" class="demo-ruleForm">
11 <el-col :span="6"> 11 <el-col :span="6">
12 - <el-form-item label="海关关区" prop="airwayCode" label-width="130px">  
13 - <el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input> 12 + <el-form-item label="海关关区" prop="customcode" label-width="130px">
  13 + <el-input v-model="aircraft.customcode" placeholder="请输入关区号" oninput="value=value.replace(/[^\d]/g,'')" maxLength='4'></el-input>
14 </el-form-item> 14 </el-form-item>
15 </el-col> 15 </el-col>
16 <el-col :span="6"> 16 <el-col :span="6">
17 - <el-form-item label="代理企业海关编码" prop="airwayCode" label-width="130px">  
18 - <el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input> 17 + <el-form-item label="代理企业海关编码" prop="agentcode" label-width="140px">
  18 + <el-input v-model="aircraft.agentcode" placeholder="请输入编码" ></el-input>
19 </el-form-item> 19 </el-form-item>
20 </el-col> 20 </el-col>
21 <el-col :span="6"> 21 <el-col :span="6">
22 <el-form-item label="航空公司英文名称" prop="airwayNameEn" label-width="140px"> 22 <el-form-item label="航空公司英文名称" prop="airwayNameEn" label-width="140px">
23 - <el-input v-model="aircraft.airwayNameEn" placeholder="请输入"></el-input> 23 + <el-input v-model="aircraft.airwayNameEn" placeholder="请输入英文名称" ></el-input>
24 </el-form-item> 24 </el-form-item>
25 </el-col> 25 </el-col>
26 <el-col :span="6"> 26 <el-col :span="6">
27 - <el-form-item label="航空公司中文名称" prop="airwayNameCn" label-width="140px">  
28 - <el-input v-model="aircraft.airwayNameCn" placeholder="请输入"></el-input> 27 + <el-form-item label="航空公司中文名称" prop="airwayNameCn" label-width="130px">
  28 + <el-input v-model="aircraft.airwayNameCn" placeholder="请输入中文名称"></el-input>
29 </el-form-item> 29 </el-form-item>
30 </el-col> 30 </el-col>
31 <el-col :span="6"> 31 <el-col :span="6">
32 <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="130px"> 32 <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="130px">
33 - <el-input v-model.trim="aircraft.aircraftNo" placeholder="请输入" @input="e => aircraft.aircraftNo=inputMe(e)"></el-input> 33 + <el-input v-model.trim="aircraft.aircraftNo" placeholder="请输入编号"></el-input>
34 </el-form-item> 34 </el-form-item>
35 </el-col> 35 </el-col>
36 <el-col :span="6"> 36 <el-col :span="6">
37 - <el-form-item label="航空器国籍/地区" prop="areoNationality" label-width="130px">  
38 - <el-input v-model="aircraft.areoNationality" placeholder="请输入" maxLength='2' @input="e => aircraft.areoNationality=inputMe(e)"></el-input> 37 + <el-form-item label="航空器国籍/地区" prop="areoNationality" label-width="140px">
  38 +<!-- <el-input v-model="aircraft.areoNationality" placeholder="请输入" maxLength='2' @input="e => aircraft.areoNationality=inputMe(e)"></el-input>-->
  39 + <el-select v-model="aircraft.areoNationality"
  40 + filterable
  41 + @click.native="getCountry"
  42 + :loading="loading" placeholder="请选择" @input="e => aircraft.areoNationality=inputMe(e)"
  43 + style="text-transform:uppercase">
  44 + <el-option
  45 + v-for="item in countryOptions"
  46 + :key="item.countryid"
  47 + :label="item.countryid+'-'+item.countrydescchn"
  48 + :value="item.countryid">
  49 + <span style="float: left">{{ item.countryid }}</span>
  50 + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.countrydescchn }}</span>
  51 + </el-option>
  52 + </el-select>
39 </el-form-item> 53 </el-form-item>
40 </el-col> 54 </el-col>
41 <!-- <el-col :span="6">--> 55 <!-- <el-col :span="6">-->
@@ -45,7 +59,7 @@ @@ -45,7 +59,7 @@
45 <!-- </el-col>--> 59 <!-- </el-col>-->
46 <el-col :span="6"> 60 <el-col :span="6">
47 <el-form-item label="机型" prop="areoModel" label-width="140px"> 61 <el-form-item label="机型" prop="areoModel" label-width="140px">
48 - <el-input v-model="aircraft.areoModel" placeholder="请输入"></el-input> 62 + <el-input v-model="aircraft.areoModel" placeholder="请输入机型"></el-input>
49 </el-form-item> 63 </el-form-item>
50 </el-col> 64 </el-col>
51 <el-col :span="6"> 65 <el-col :span="6">
@@ -55,12 +69,25 @@ @@ -55,12 +69,25 @@
55 </el-col> 69 </el-col>
56 <el-col :span="6"> 70 <el-col :span="6">
57 <el-form-item label="航空器所有人" prop="ownerCo" label-width="130px"> 71 <el-form-item label="航空器所有人" prop="ownerCo" label-width="130px">
58 - <el-input v-model="aircraft.ownerCo" placeholder="请输入数量（单位：人）" oninput="value=value.replace(/[^\d]/g,'')"></el-input> 72 + <el-input v-model="aircraft.ownerCo" ></el-input>
59 </el-form-item> 73 </el-form-item>
60 </el-col> 74 </el-col>
61 <el-col :span="6"> 75 <el-col :span="6">
62 <el-form-item label="所有人证件类型" prop="credentialType" label-width="140px"> 76 <el-form-item label="所有人证件类型" prop="credentialType" label-width="140px">
63 - <el-input v-model="aircraft.credentialType" placeholder="请输入"></el-input> 77 +<!-- <el-input v-model="aircraft.credentialType" placeholder="请输入"></el-input>-->
  78 + <el-select v-model="aircraft.credentialType"
  79 + filterable oninput="value=value.replace(/[^\d]/g,'')"
  80 + @click.native="getCreden"
  81 + :loading="loading" placeholder="请选择">
  82 + <el-option
  83 + v-for="item in certOptions"
  84 + :key="item.serialno"
  85 + :label="item.serialno+'-'+item.credenname"
  86 + :value="item.serialno">
  87 + <span style="float: left">{{ item.serialno }}</span>
  88 + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.credenname }}</span>
  89 + </el-option>
  90 + </el-select>
64 </el-form-item> 91 </el-form-item>
65 </el-col> 92 </el-col>
66 <el-col :span="6"> 93 <el-col :span="6">
@@ -87,18 +114,18 @@ @@ -87,18 +114,18 @@
87 114
88 115
89 <el-col :span="6"> 116 <el-col :span="6">
90 - <el-form-item label="航空公司代码" prop="airwayCode" label-width="140px">  
91 - <el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input> 117 + <el-form-item label="航空公司代码" prop="airwayCode" label-width="130px">
  118 + <el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input>
92 </el-form-item> 119 </el-form-item>
93 </el-col> 120 </el-col>
94 <el-col :span="6"> 121 <el-col :span="6">
95 - <el-form-item label="航空器所有方式" prop="useRelation" label-width="130px"> 122 + <el-form-item label="航空器所有方式" prop="useRelation" label-width="140px">
96 <el-input v-model="aircraft.useRelation" placeholder="请输入"></el-input> 123 <el-input v-model="aircraft.useRelation" placeholder="请输入"></el-input>
97 </el-form-item> 124 </el-form-item>
98 </el-col> 125 </el-col>
99 126
100 <el-col :span="6"> 127 <el-col :span="6">
101 - <el-form-item label="国际证书编号" prop="certNo" label-width="130px"> 128 + <el-form-item label="国际证书编号" prop="certNo" label-width="140px">
102 <el-input v-model="aircraft.certNo" placeholder="请输入"></el-input> 129 <el-input v-model="aircraft.certNo" placeholder="请输入"></el-input>
103 </el-form-item> 130 </el-form-item>
104 </el-col> 131 </el-col>
@@ -158,11 +185,13 @@ @@ -158,11 +185,13 @@
158 </style> 185 </style>
159 <script> 186 <script>
160 const fecha = require('fecha'); 187 const fecha = require('fecha');
161 - import {addAircraft, sendAircraft} from "../../api/transport"; 188 + import {addAircraft, selectCountry, selectCreden, sendAircraft} from "../../api/transport";
162 export default { 189 export default {
163 data(){ 190 data(){
164 return{ 191 return{
165 aircraft:{ 192 aircraft:{
  193 + agentcode:undefined,
  194 + customcode:undefined,
166 uuid:undefined, 195 uuid:undefined,
167 airwayCode:undefined, 196 airwayCode:undefined,
168 airwayNameEn:undefined, 197 airwayNameEn:undefined,
@@ -188,12 +217,16 @@ @@ -188,12 +217,16 @@
188 isDelete:undefined, 217 isDelete:undefined,
189 messageid:undefined 218 messageid:undefined
190 }, 219 },
  220 + loading:false,
  221 + certOptions:[],
  222 + countryOptions:[],
  223 +
191 rules:{ 224 rules:{
192 // airwayCode: [ 225 // airwayCode: [
193 // {required: true, message: '请输入', trigger: 'blur'} 226 // {required: true, message: '请输入', trigger: 'blur'}
194 // ], 227 // ],
195 airwayNameEn: [ 228 airwayNameEn: [
196 - {required: true, message: '请输入', trigger: 'blur'} 229 + {required: true, message: '请输入英文名称', trigger: 'blur'}
197 ], 230 ],
198 // airwayNameCn: [ 231 // airwayNameCn: [
199 // {required: true, message: '请输入', trigger: 'blur'} 232 // {required: true, message: '请输入', trigger: 'blur'}
@@ -202,7 +235,7 @@ @@ -202,7 +235,7 @@
202 {required: true, message: '请输入', trigger: 'blur'} 235 {required: true, message: '请输入', trigger: 'blur'}
203 ], 236 ],
204 aircraftNo: [ 237 aircraftNo: [
205 - {required: true, message: '请输入', trigger: 'blur'} 238 + {required: true, message: '请输入编号', trigger: 'blur'}
206 ], 239 ],
207 credentialType: [ 240 credentialType: [
208 {required: true, message: '请输入', trigger: 'blur'} 241 {required: true, message: '请输入', trigger: 'blur'}
@@ -225,6 +258,9 @@ @@ -225,6 +258,9 @@
225 ownerCo: [ 258 ownerCo: [
226 {required: true, message: '请输入', trigger: 'blur'} 259 {required: true, message: '请输入', trigger: 'blur'}
227 ], 260 ],
  261 + agentcode: [
  262 + {required: true, message: '请输入编码', trigger: 'blur'}
  263 + ],
228 // certNo: [ 264 // certNo: [
229 // {required: true, message: '请输入', trigger: 'blur'} 265 // {required: true, message: '请输入', trigger: 'blur'}
230 // ], 266 // ],
@@ -237,6 +273,42 @@ @@ -237,6 +273,42 @@
237 } 273 }
238 }, 274 },
239 methods:{ 275 methods:{
  276 + /*获取国籍*/
  277 + getCountry:function(query){
  278 + this.countryOptions=[];
  279 + let params={countryid:query};
  280 + this.loading = true;
  281 + selectCountry(params).then(res =>{
  282 + if (res!=null) {
  283 + console.log(res.data.data)
  284 + setTimeout(() => {
  285 + this.loading = false;
  286 + this.countryOptions=res.data.data;
  287 + }, 200);
  288 + } else {
  289 + this.countryOptions = [];
  290 + }
  291 +
  292 + });
  293 + },
  294 + /*获取证件*/
  295 + getCreden:function(query){
  296 + this.certOptions=[];
  297 + let params={serialno:query};
  298 + this.loading = true;
  299 + selectCreden(params).then(res =>{
  300 + if (res!=null) {
  301 + console.log(res.data.data)
  302 + setTimeout(() => {
  303 + this.loading = false;
  304 + this.certOptions=res.data.data;
  305 + }, 200);
  306 + } else {
  307 + this.certOptions = [];
  308 + }
  309 +
  310 + });
  311 + },
240 //新增当日飞行计划（保存按钮） 312 //新增当日飞行计划（保存按钮）
241 submitForm(formName) { 313 submitForm(formName) {
242 this.$refs[formName].validate((valid) => { 314 this.$refs[formName].validate((valid) => {
@@ -12,8 +12,8 @@ @@ -12,8 +12,8 @@
12 <div class="grid-content content">申报单位</div> 12 <div class="grid-content content">申报单位</div>
13 </el-col> 13 </el-col>
14 <el-col :span="6"> 14 <el-col :span="6">
15 - <el-form-item label="海关关区" prop="flightNo" label-width="140px">  
16 - <el-input v-model="flight.flightNo" @input="e => flight.flightNo=inputMe(e)"></el-input> 15 + <el-form-item label="海关关区" prop="airwayCode" label-width="140px">
  16 + <el-input v-model="flight.airwayCode" @input="e => flight.airwayCode=inputMe(e)"></el-input>
17 </el-form-item> 17 </el-form-item>
18 </el-col><el-col :span="24"> 18 </el-col><el-col :span="24">
19 <div class="grid-content content">航班信息</div> 19 <div class="grid-content content">航班信息</div>
@@ -89,7 +89,7 @@ @@ -89,7 +89,7 @@
89 fixed="right" 89 fixed="right"
90 prop="" 90 prop=""
91 label="报文操作" 91 label="报文操作"
92 - width="200"> 92 + width="400">
93 <template slot-scope="scope"> 93 <template slot-scope="scope">
94 <el-button 94 <el-button
95 size="mini" 95 size="mini"
@@ -97,6 +97,14 @@ @@ -97,6 +97,14 @@
97 @click="selectDetail(scope.$index,scope.row)">查看回执</el-button> 97 @click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
98 <el-button 98 <el-button
99 size="mini" 99 size="mini"
  100 + type="success"
  101 + @click="changeApply(scope.$index, scope.row)">变更申请</el-button>
  102 + <el-button
  103 + size="mini"
  104 + type="warning"
  105 + @click="cancellApply(scope.$index, scope.row)">撤销申请</el-button>
  106 + <el-button
  107 + size="mini"
100 type="danger" 108 type="danger"
101 @click="handleDel(scope.$index, scope.row)">删除</el-button> 109 @click="handleDel(scope.$index, scope.row)">删除</el-button>
102 </template> 110 </template>
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 fixed="right" 92 fixed="right"
93 prop="" 93 prop=""
94 label="报文操作" 94 label="报文操作"
95 - width="200"> 95 + width="400">
96 <template slot-scope="scope"> 96 <template slot-scope="scope">
97 <el-button 97 <el-button
98 size="mini" 98 size="mini"
@@ -100,6 +100,14 @@ @@ -100,6 +100,14 @@
100 @click="selectDetail(scope.$index,scope.row)">查看回执</el-button> 100 @click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
101 <el-button 101 <el-button
102 size="mini" 102 size="mini"
  103 + type="success"
  104 + @click="changeApply(scope.$index, scope.row)">变更申请</el-button>
  105 + <el-button
  106 + size="mini"
  107 + type="warning"
  108 + @click="cancellApply(scope.$index, scope.row)">撤销申请</el-button>
  109 + <el-button
  110 + size="mini"
103 type="danger" 111 type="danger"
104 @click="handleDel(scope.$index, scope.row)">删除</el-button> 112 @click="handleDel(scope.$index, scope.row)">删除</el-button>
105 </template> 113 </template>
@@ -9,13 +9,13 @@ @@ -9,13 +9,13 @@
9 <el-row> 9 <el-row>
10 <el-form :model="aircraft" :rules="rules" ref="aircraft" label-width="130px" class="demo-ruleForm"> 10 <el-form :model="aircraft" :rules="rules" ref="aircraft" label-width="130px" class="demo-ruleForm">
11 <el-col :span="6"> 11 <el-col :span="6">
12 - <el-form-item label="海关关区" label-width="130px">  
13 - <el-input placeholder="请输入" ></el-input> 12 + <el-form-item label="海关关区" label-width="130px" prop="customcode">
  13 + <el-input v-model="aircraft.customcode" placeholder="请输入" oninput="value=value.replace(/[^\d]/g,'')" maxLength='4'></el-input>
14 </el-form-item> 14 </el-form-item>
15 </el-col> 15 </el-col>
16 <el-col :span="6"> 16 <el-col :span="6">
17 - <el-form-item label="运营企业海关编码" prop="airwayCode" label-width="140px">  
18 - <el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" ></el-input> 17 + <el-form-item label="运营企业海关编码" prop="operatcode" label-width="140px">
  18 + <el-input v-model="aircraft.operatcode" placeholder="请输入" ></el-input>
19 </el-form-item> 19 </el-form-item>
20 </el-col> 20 </el-col>
21 <el-col :span="6"> 21 <el-col :span="6">
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 </el-col> 30 </el-col>
31 <el-col :span="6"> 31 <el-col :span="6">
32 <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="130px"> 32 <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="130px">
33 - <el-input v-model.trim="aircraft.aircraftNo" placeholder="请输入" @input="e => aircraft.aircraftNo=inputMe(e)"></el-input> 33 + <el-input v-model.trim="aircraft.aircraftNo" placeholder="请输入" ></el-input>
34 </el-form-item> 34 </el-form-item>
35 </el-col> 35 </el-col>
36 <!-- <el-col :span="6">--> 36 <!-- <el-col :span="6">-->
@@ -71,7 +71,20 @@ @@ -71,7 +71,20 @@
71 </el-col> 71 </el-col>
72 <el-col :span="6"> 72 <el-col :span="6">
73 <el-form-item label="证书类型" prop="credentialType" label-width="130px"> 73 <el-form-item label="证书类型" prop="credentialType" label-width="130px">
74 - <el-input v-model="aircraft.credentialType" placeholder="请输入"></el-input> 74 +<!-- <el-input v-model="aircraft.credentialType" placeholder="请输入"></el-input>-->
  75 + <el-select v-model="aircraft.credentialType"
  76 + filterable oninput="value=value.replace(/[^\d]/g,'')"
  77 + @click.native="getCreden"
  78 + :loading="loading" placeholder="请选择">
  79 + <el-option
  80 + v-for="item in certOptions"
  81 + :key="item.serialno"
  82 + :label="item.serialno+'-'+item.credenname"
  83 + :value="item.serialno">
  84 + <span style="float: left">{{ item.serialno }}</span>
  85 + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.credenname }}</span>
  86 + </el-option>
  87 + </el-select>
75 </el-form-item> 88 </el-form-item>
76 </el-col> 89 </el-col>
77 <el-col :span="6"> 90 <el-col :span="6">
@@ -149,13 +162,15 @@ @@ -149,13 +162,15 @@
149 .el-col{margin-right: 0px;} 162 .el-col{margin-right: 0px;}
150 </style> 163 </style>
151 <script> 164 <script>
152 - import {addAirLineAircraft, sendAirLineAircraft} from "../../api/transport"; 165 + import {addAirLineAircraft, selectCreden, sendAirLineAircraft} from "../../api/transport";
153 166
154 export default { 167 export default {
155 data(){ 168 data(){
156 return{ 169 return{
157 aircraft:{ 170 aircraft:{
158 uuid:undefined, 171 uuid:undefined,
  172 + customcode:undefined,
  173 + operatcode:undefined,
159 airwayCode:undefined, 174 airwayCode:undefined,
160 airwayNameEn:undefined, 175 airwayNameEn:undefined,
161 airwayNameCn:undefined, 176 airwayNameCn:undefined,
@@ -180,15 +195,21 @@ @@ -180,15 +195,21 @@
180 isDelete:undefined, 195 isDelete:undefined,
181 messageid:undefined 196 messageid:undefined
182 }, 197 },
  198 + loading:false,
  199 + certOptions:[],
  200 +
183 rules:{ 201 rules:{
184 // airwayCode: [ 202 // airwayCode: [
185 // {required: true, message: '请输入', trigger: 'blur'} 203 // {required: true, message: '请输入', trigger: 'blur'}
186 // ], 204 // ],
  205 + operatcode: [
  206 + {required: true, message: '请输入编码', trigger: 'blur'}
  207 + ],
187 // meno: [ 208 // meno: [
188 // {required: true, message: '请输入', trigger: 'blur'} 209 // {required: true, message: '请输入', trigger: 'blur'}
189 // ], 210 // ],
190 airwayNameEn: [ 211 airwayNameEn: [
191 - {required: true, message: '请输入', trigger: 'blur'} 212 + {required: true, message: '请输入英文名称', trigger: 'blur'}
192 ], 213 ],
193 // airwayNameCn: [ 214 // airwayNameCn: [
194 // {required: true, message: '请输入', trigger: 'blur'} 215 // {required: true, message: '请输入', trigger: 'blur'}
@@ -197,7 +218,7 @@ @@ -197,7 +218,7 @@
197 {required: true, message: '请输入', trigger: 'blur'} 218 {required: true, message: '请输入', trigger: 'blur'}
198 ], 219 ],
199 aircraftNo: [ 220 aircraftNo: [
200 - {required: true, message: '请输入', trigger: 'blur'} 221 + {required: true, message: '请输入编号', trigger: 'blur'}
201 ], 222 ],
202 // credentialType: [ 223 // credentialType: [
203 // {required: true, message: '请输入', trigger: 'blur'} 224 // {required: true, message: '请输入', trigger: 'blur'}
@@ -232,6 +253,24 @@ @@ -232,6 +253,24 @@
232 } 253 }
233 }, 254 },
234 methods:{ 255 methods:{
  256 + /*获取证件*/
  257 + getCreden:function(query){
  258 + this.certOptions=[];
  259 + let params={serialno:query};
  260 + this.loading = true;
  261 + selectCreden(params).then(res =>{
  262 + if (res!=null) {
  263 + console.log(res.data.data)
  264 + setTimeout(() => {
  265 + this.loading = false;
  266 + this.certOptions=res.data.data;
  267 + }, 200);
  268 + } else {
  269 + this.certOptions = [];
  270 + }
  271 +
  272 + });
  273 + },
235 //新增航线航空器（保存按钮） 274 //新增航线航空器（保存按钮）
236 submitForm(formName) { 275 submitForm(formName) {
237 this.$refs[formName].validate((valid) => { 276 this.$refs[formName].validate((valid) => {