朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 42d88262c981bce15c5f2b0fcf5a51064ac9d6ce 1 个父辈 5e82c1ad

20200623-trans

内嵌 并排对比
正在显示 4 个修改的文件 包含 2067 行增加 和 35 行删除
@@ -102,6 +102,23 @@ let routes = [ @@ -102,6 +102,23 @@ let routes = [
102 ] 102 ]
103 }, 103 },
104 // { path: '/test', component: Main }, 104 // { path: '/test', component: Main },
  105 +
  106 + // 货运系统--航班预配
  107 + {
  108 + path: '/domdep',
  109 + component: Home,
  110 + name: '国内出港',
  111 + iconCls: 'el-icon-setting',
  112 + children: [
  113 + { path: '/Page4', component: Page4, name: '航班预配' },
  114 + // { path: '/role', component: Role, name: '组织机构' },
  115 + // { path: '/perm', component: Perm, name: '权限管理' },
  116 + // { path: '/log', component: LOG, name: '系统日志' },
  117 + // { path: '/department', component: Department, name: '部门管理' },
  118 + // { path: '/company', component: Company, name: '公司管理'},
  119 + // { path: '/group', component: Group, name: '集团管理'}
  120 + ]
  121 + },
105 { 122 {
106 path: '/admin', 123 path: '/admin',
107 component: Home, 124 component: Home,
@@ -196,18 +196,7 @@ @@ -196,18 +196,7 @@
196 }, 196 },
197 //编辑航班查询功能 197 //编辑航班查询功能
198 handleEdit(index,row){ 198 handleEdit(index,row){
199 - this.$router.push({path:'/flights',query:{uuid:JSON.stringify(row.uuid),airwayCode:JSON.stringify(row.airwayCode)  
200 - ,airwayNameEn:JSON.stringify(row.airwayNameEn), airwayNameCn:JSON.stringify(row.airwayNameCn),  
201 - transportAgentCode:JSON.stringify(row.transportAgentCode),groundAgentCode:JSON.stringify(row.groundAgentCode),  
202 - flightNo:JSON.stringify(row.flightNo),shareFlightNo:JSON.stringify(row.shareFlightNo),linesType:JSON.stringify(row.linesType),  
203 - std:JSON.stringify(row.std), sta:JSON.stringify(row.sta),effStartdate:JSON.stringify(row.effStartdate),  
204 - effEnddate:JSON.stringify(row.effEnddate),plan:JSON.stringify(row.plan), remark:JSON.stringify(row.remark),  
205 - createTime:JSON.stringify(row.createTime),createBy:JSON.stringify(row.createBy),updateTime:JSON.stringify(row.updateTime),  
206 - updateBy:JSON.stringify(row.updateBy),isDelete:JSON.stringify(row.isDelete),flightType:JSON.stringify(row.flightType), cancelFlag:JSON.stringify(row.cancelFlag),  
207 - departurePort:JSON.stringify(row.departurePort),arrivalPort:JSON.stringify(row.arrivalPort),departureCustomNo:JSON.stringify(row.departureCustomNo),  
208 - arrivalCustomNo:JSON.stringify(row.arrivalCustomNo),serialno:JSON.stringify(row.serialno),status:JSON.stringify(row.status),  
209 - statusMsg:JSON.stringify(row.statusMsg),messageid:JSON.stringify(row.messageid)  
210 - }}) 199 + this.$router.push({path:'/flights',query:row})
211 }, 200 },
212 //获取默认值 201 //获取默认值
213 defaultData(){ 202 defaultData(){
1 <template> 1 <template>
2 - <div>  
3 - <h1>vuex 测试</h1>  
4 - Clicked: {{ getCount }} times  
5 - <button @click="increment">+</button>  
6 - <button @click="decrement">-</button> 2 + <el-container>
  3 + <el-main>
  4 + <el-row>
  5 + <el-col :span="24">
  6 + <div class="grid-content content">航班预配</div>
  7 + </el-col>
  8 + </el-row>
  9 +<!-- 搜索区域-->
  10 + <el-row>
  11 + <el-form :inline="true" :model="formInline" class="demo-form-inline">
  12 + <el-col :span="5">
  13 + <el-form-item label="航班号">
  14 + <el-input v-model="formInline.user" placeholder="请输入航班号"></el-input>
  15 + </el-form-item>
  16 + </el-col>
  17 + <el-col :span="4">
  18 + <el-form-item>
  19 + <el-button type="primary" @click="onSubmit">查询</el-button>
  20 + </el-form-item>
  21 + </el-col>
  22 + <el-col :span="4">
  23 + <el-form-item>
  24 + <el-select v-model="formInline.value" placeholder="航班操作" style="margin-left: 50px">
  25 + <el-option
  26 + v-for="item in options"
  27 + :key="item.value"
  28 + :label="item.label"
  29 + :value="item.value">
  30 + </el-option>
  31 + </el-select>
  32 + </el-form-item>
  33 + </el-col>
  34 + </el-form>
  35 + </el-row>
  36 +<!-- 表单区域①-->
  37 + <el-row>
  38 + <el-table
  39 + ref="multipleTable"
  40 + :data="tableData"
  41 + tooltip-effect="dark"
  42 + style="width: 100%"
  43 + @selection-change="handleSelectionChange">
  44 + <el-table-column
  45 + type="selection"
  46 + width="55">
  47 + </el-table-column>
  48 + <el-table-column
  49 + label="运单号">
  50 + <template slot-scope="scope">{{ scope.row.date }}</template>
  51 + </el-table-column>
  52 + <el-table-column
  53 + prop="name"
  54 + label="件数">
  55 + </el-table-column>
  56 + <el-table-column
  57 + prop="address"
  58 + label="重量">
  59 + </el-table-column>
  60 + <el-table-column
  61 + prop="name"
  62 + label="体积">
  63 + </el-table-column>
  64 + <el-table-column
  65 + prop="address"
  66 + label="品名">
  67 + </el-table-column>
  68 + </el-table>
  69 + <div style="margin-top:5px;margin-left: 1000px">
  70 + <el-button type="primary" >配上</el-button>
  71 + <el-button type="success" @click="dialogFormVisible = true">新增</el-button>
  72 + <el-button type="warning" @click="dialogFormsVisible = true">导入</el-button>
  73 + </div>
  74 + </el-row>
  75 +<!-- 表单①新增按钮弹框-->
  76 + <el-row>
  77 + <el-dialog title="新增页面" :visible.sync="dialogFormVisible">
  78 + <el-form :model="form">
  79 + <el-row>
  80 + <el-col :span="10">
  81 + <el-form-item label="运单号" :label-width="formLabelWidth">
  82 + <el-input v-model="form.name" autocomplete="off"></el-input>
  83 + </el-form-item>
  84 + </el-col>
  85 + <el-col :span="10">
  86 + <el-form-item label="目的站" :label-width="formLabelWidth">
  87 + <el-input v-model="form.name" autocomplete="off"></el-input>
  88 + </el-form-item>
  89 + </el-col>
  90 + <el-col :span="10">
  91 + <el-form-item label="件数" :label-width="formLabelWidth">
  92 + <el-input v-model="form.name" autocomplete="off"></el-input>
  93 + </el-form-item>
  94 + </el-col>
  95 + <el-col :span="10">
  96 + <el-form-item label="重量" :label-width="formLabelWidth">
  97 + <el-input v-model="form.name" autocomplete="off" placeholder="单位：KG"></el-input>
  98 + </el-form-item>
  99 + </el-col>
  100 + <el-col :span="10">
  101 + <el-form-item label="体积" :label-width="formLabelWidth">
  102 + <el-input v-model="form.name" autocomplete="off"></el-input>
  103 + </el-form-item>
  104 + </el-col>
  105 + <el-col :span="10">
  106 + <el-form-item label="品名" :label-width="formLabelWidth">
  107 + <el-select v-model="form.region" placeholder="请选择品名">
  108 + <el-option label="品名一" value="品名一"></el-option>
  109 + <el-option label="品名二" value="品名二"></el-option>
  110 + </el-select>
  111 + </el-form-item>
  112 + </el-col>
  113 + <el-col :span="10">
  114 + <el-form-item label="特货代码" :label-width="formLabelWidth">
  115 + <el-input v-model="form.name" autocomplete="off"></el-input>
  116 + </el-form-item>
  117 + </el-col>
  118 + <el-col :span="10">
  119 + <el-form-item label="代理人" :label-width="formLabelWidth">
  120 + <el-input v-model="form.name" autocomplete="off"></el-input>
  121 + </el-form-item>
  122 + </el-col>
  123 + <el-col :span="10">
  124 + <el-form-item label="优先级" :label-width="formLabelWidth">
  125 + <el-input v-model="form.name" autocomplete="off"></el-input>
  126 + </el-form-item>
  127 + </el-col>
  128 + <el-col :span="10">
  129 + <el-form-item label="备注" :label-width="formLabelWidth">
  130 + <el-input v-model="form.name" autocomplete="off"></el-input>
  131 + </el-form-item>
  132 + </el-col>
  133 + </el-row>
  134 + </el-form>
  135 + <div slot="footer" class="dialog-footer">
  136 + <el-button @click="dialogFormVisible = false">取 消</el-button>
  137 + <el-button type="primary" @click="dialogFormVisible = false">保 存</el-button>
  138 + </div>
  139 + </el-dialog>
  140 + </el-row>
  141 +<!-- 表单①导入按钮弹框-->
  142 + <el-row>
  143 + <el-dialog title="批量导入" :visible.sync="dialogFormsVisible">
  144 + <el-form :model="form1" >
  145 + <el-row>
  146 + <el-col :span="5">
  147 + <el-form-item>
  148 + <el-form-item label="ULD" :label-width="formsLabelWidths">
  149 + <el-input v-model="form1.name" autocomplete="off"></el-input>
  150 + </el-form-item>
  151 + </el-form-item>
  152 + </el-col>
  153 + </el-row>
  154 + </el-form>
  155 + </el-dialog>
  156 + </el-row>
  157 +<!-- 表单区域②-->
  158 + <el-row>
  159 + <el-table
  160 + ref="multipleTable"
  161 + :data="tableData"
  162 + tooltip-effect="dark"
  163 + style="width: 100%"
  164 + @selection-change="handleSelectionChange">
  165 + <el-table-column
  166 + label="ULD类型">
  167 + <template slot-scope="scope">{{ scope.row.date }}</template>
  168 + </el-table-column>
  169 + <el-table-column
  170 + prop="name"
  171 + label="件数">
  172 + </el-table-column>
  173 + <el-table-column
  174 + prop="address"
  175 + label="机仓位">
  176 + </el-table-column>
  177 + </el-table>
  178 + <div style="margin-top:5px;margin-left: 1000px">
  179 + <el-button type="primary" >拉下</el-button>
  180 + <el-button type="success" @click="dialogFormVisibles = true">新增</el-button>
  181 + <el-button type="danger" >删除</el-button>
  182 + </div>
  183 + </el-row>
  184 +<!-- 表单②新增按钮弹框-->
  185 + <el-row>
  186 + <el-dialog title="新增页面" :visible.sync="dialogFormVisibles">
  187 + <el-form :model="forms">
  188 + <el-row>
  189 + <el-col :span="10">
  190 + <el-form-item label="ULD" :label-width="formLabelWidths">
  191 + <el-input v-model="forms.name" autocomplete="off"></el-input>
  192 + </el-form-item>
  193 + </el-col>
  194 + <el-col :span="10">
  195 + <el-form-item label="件数" :label-width="formLabelWidths">
  196 + <el-input v-model="forms.name" autocomplete="off"></el-input>
  197 + </el-form-item>
  198 + </el-col>
  199 + <el-col :span="10">
  200 + <el-form-item label="机仓位" :label-width="formLabelWidths">
  201 + <el-select v-model="forms.region" placeholder="请选择机仓位">
  202 + <el-option label="仓位一" value="仓位一"></el-option>
  203 + <el-option label="仓位二" value="仓位二"></el-option>
  204 + </el-select>
  205 + </el-form-item>
  206 + </el-col>
  207 + <el-col :span="10">
  208 + <el-form-item label="板位" :label-width="formLabelWidths">
  209 + <el-select v-model="forms.region" placeholder="请选择板位">
  210 + <el-option label="板位一" value="板位一"></el-option>
  211 + <el-option label="板位二" value="板位二"></el-option>
  212 + </el-select>
  213 + </el-form-item>
  214 + </el-col>
  215 + <el-col :span="10">
  216 + <el-form-item label="板型" :label-width="formLabelWidths">
  217 + <el-select v-model="forms.region" placeholder="请选择板型">
  218 + <el-option label="板型一" value="板型一"></el-option>
  219 + <el-option label="板型二" value="板型二"></el-option>
  220 + </el-select>
  221 + </el-form-item>
  222 + </el-col>
  223 + </el-row>
  224 + </el-form>
  225 + <div slot="footer" class="dialog-footer">
  226 + <el-button @click="dialogFormVisibles = false">取 消</el-button>
  227 + <el-button type="primary" @click="dialogFormVisibles = false">保 存</el-button>
7 </div> 228 </div>
8 -</template>  
9 229
  230 + </el-dialog>
  231 + </el-row>
  232 + </el-main>
  233 + </el-container>
  234 +</template>
10 <script> 235 <script>
11 - import { mapGetters } from 'vuex'  
12 - import { mapActions } from 'vuex'  
13 -  
14 export default { 236 export default {
15 - computed: {  
16 - // 使用对象展开运算符将 getters 混入 computed 对象中  
17 - ...mapGetters([  
18 - 'getCount'  
19 - // ...  
20 - ]) 237 + data() {
  238 + return {
  239 + formInline: {
  240 + user: '',
  241 + value: ''
  242 + },
  243 + tableData:[],
  244 + multipleSelection: [],
  245 + options: [{
  246 + value: '操作1',
  247 + label: '操作1'
  248 + }, {
  249 + value: '操作2',
  250 + label: '操作2'
  251 + }],
  252 + dialogFormVisible: false,
  253 + dialogFormVisibles: false,
  254 + dialogFormsVisible: false,
  255 + form: {},
  256 + form1: {},
  257 + forms: {},
  258 + formLabelWidth: '120px',
  259 + formLabelWidths: '120px',
  260 + }
21 }, 261 },
22 methods: { 262 methods: {
23 - ...mapActions([  
24 - 'increment', // 映射 this.increment() 为 this.$store.dispatch('increment')  
25 - 'decrement'  
26 - ])  
27 - //...mapActions({  
28 - // add: 'increment' // 映射 this.add() 为 this.$store.dispatch('increment')  
29 - //}) 263 + onSubmit() {
  264 + console.log('submit!');
  265 + },
  266 + handleSelectionChange(val) {
  267 + this.multipleSelection = val;
  268 + }
30 } 269 }
31 } 270 }
32 -  
33 </script> 271 </script>
  1 +Index: src/views/airtransport/queryFlight.vue
  2 +IDEA additional info:
  3 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  4 +<+>UTF-8
  5 +===================================================================
  6 +--- src/views/airtransport/queryFlight.vue (revision 6b552697d551139b5ea2935024146065781f309f)
  7 ++++ src/views/airtransport/queryFlight.vue (date 1592464752790)
  8 +@@ -10,18 +10,18 @@
  9 + <el-row>
  10 + <el-form :label-position="labelPosition" :model="queryFlight" :rules="rules" ref="queryFlight"
  11 + label-width="130px" class="demo-ruleForm">
  12 +- <el-col :span="8">
  13 +- <el-form-item label="航空公司代码：" prop="flightNo" label-width="110px">
  14 +- <el-input v-model="queryFlight.flightNo" style="width:190px"></el-input>
  15 ++ <el-col :span="8" >
  16 ++ <el-form-item label="航班号：" prop="aircraftNo" label-width="80px">
  17 ++ <el-input v-model="queryFlight.aircraftNo" style="width:190px"></el-input>
  18 + </el-form-item>
  19 + </el-col>
  20 +- <el-col :span="8" >
  21 +- <el-form-item label="航班号：" prop="aircraftNo" label-width="80px">
  22 +- <el-input v-model="queryFlight.aircraftNo" style="width:190px"></el-input>
  23 ++ <el-col :span="8">
  24 ++ <el-form-item label="航空公司代码：" prop="flightNo" label-width="110px">
  25 ++ <el-input v-model="queryFlight.flightNo" style="width:190px"></el-input>
  26 + </el-form-item>
  27 + </el-col>
  28 + <el-col :span="6" >
  29 +- <el-button type="primary" @click="submitForm('queryFlight')">查询</el-button>
  30 ++ <el-button type="primary" @click="submitForm()">查询</el-button>
  31 + </el-col>
  32 + </el-form>
  33 + </el-row>
  34 +@@ -45,50 +45,42 @@
  35 + </el-table-column>
  36 + <el-table-column
  37 + prop="flightNo"
  38 +- label="航班号"
  39 +- width="80">
  40 ++ label="航班号">
  41 + </el-table-column>
  42 + <el-table-column
  43 + prop="airwayCode"
  44 +- label="航空公司代码"
  45 +- width="120">
  46 ++ label="航空公司代码">
  47 + </el-table-column>
  48 + <el-table-column
  49 + prop="flightDate"
  50 +- label="航空公司中文"
  51 +- width="150">
  52 ++ label="航空公司中文">
  53 + </el-table-column>
  54 + <el-table-column
  55 + prop="transportAgentCode"
  56 +- label="传输代理人"
  57 +- width="120">
  58 ++ label="传输代理人">
  59 + </el-table-column>
  60 + <el-table-column
  61 + prop="groundAgentCode"
  62 +- label="地面代理人"
  63 +- width="120">
  64 ++ label="地面代理人">
  65 + </el-table-column>
  66 + <el-table-column
  67 + prop="linesType"
  68 +- label="运输计划"
  69 +- width="150">
  70 ++ label="运输计划">
  71 + </el-table-column>
  72 + <el-table-column
  73 + prop="flightType"
  74 +- label="航班性质"
  75 +- width="80">
  76 ++ label="航班性质">
  77 + </el-table-column>
  78 + <el-table-column
  79 + prop="shareFlightNo"
  80 +- label="共享航班号"
  81 +- width="150">
  82 ++ label="共享航班号">
  83 + </el-table-column>
  84 + <el-table-column
  85 + prop="statusMsg"
  86 +- label="海关回执"
  87 +- width="150">
  88 ++ label="海关回执">
  89 + </el-table-column>
  90 + <el-table-column
  91 ++ fixed="right"
  92 + prop=""
  93 + label="报文操作"
  94 + width="150">
  95 +@@ -199,9 +191,8 @@
  96 + },
  97 + //获取默认值
  98 + defaultData(){
  99 +- this.flightNo=JSON.parse(this.$route.query.flightNo);
  100 +- this.aircraftNo=JSON.parse(this.$route.query.aircraftNo);
  101 +-
  102 ++ this.flightNo = JSON.parse(this.$route.query.flightNo);
  103 ++ this.aircraftNo = JSON.parse(this.$route.query.aircraftNo);
  104 + },
  105 + //列表删除功能
  106 + handleDel(index,row){
  107 +Index: src/views/airtransport/flight.vue
  108 +IDEA additional info:
  109 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  110 +<+>UTF-8
  111 +===================================================================
  112 +--- src/views/airtransport/flight.vue (revision 6b552697d551139b5ea2935024146065781f309f)
  113 ++++ src/views/airtransport/flight.vue (date 1592465156817)
  114 +@@ -225,6 +225,19 @@
  115 + label="备注">
  116 + </el-table-column>
  117 + </el-table>
  118 ++ <el-row>
  119 ++ <div class="block">
  120 ++ <el-pagination
  121 ++ @size-change="handleSizeChange"
  122 ++ @current-change="handleCurrentChange"
  123 ++ :current-page="currentPage"
  124 ++ :page-sizes="[10, 20, 30, 40]"
  125 ++ :page-size="pageSize"
  126 ++ layout="total, sizes, prev, pager, next, jumper"
  127 ++ :total="total">
  128 ++ </el-pagination>
  129 ++ </div>
  130 ++ </el-row>
  131 + </el-dialog>
  132 + </el-row>
  133 + <el-row>
  134 +@@ -383,7 +396,9 @@
  135 + ],
  136 + dialogTableVisible:false,
  137 + centerDialogVisible:false,
  138 +- currentPage4:4,
  139 ++ currentPage: 1,
  140 ++ pageSize:10,
  141 ++ total:0,
  142 + msg:undefined,
  143 + tableData: [],
  144 + tableloading:true,
  145 +@@ -392,7 +407,7 @@
  146 + methods:{
  147 + //航线信息查询
  148 + selectAirline(){
  149 +- let params={currentPage:this.currentPage,pageSize:this.pageSize,createBy:this.airLine.createBy};
  150 ++ let params={currentPage:this.currentPage,pageSize:this.pageSize,aircraftNo:this.flight.aircraftNo};
  151 + this.dialogTableVisible=true;
  152 + this.tableloading=true;
  153 + selectRoute(params).then(res=>{
  154 +@@ -411,7 +426,7 @@
  155 + if(response.code=='200'){
  156 + this.centerDialogVisible=true;
  157 + this.msg=response.msg;
  158 +- this.$router.push({path:'/queryFlight',query:{flightNo:JSON.stringify(this.flight.flightNo),aircraftNo:JSON.stringify(this.flight.aircraftNo)}});
  159 ++ this.$router.push({path:'/queryFlights',query:{flightNo:JSON.stringify(this.flight.flightNo),flightDate:JSON.stringify(this.flight.flightDate)}});
  160 + this.centerDialogVisible=false;
  161 + }else{
  162 + this.centerDialogVisible=true;
  163 +@@ -426,10 +441,11 @@
  164 + },
  165 + //分页方法
  166 + handleSizeChange(val) {
  167 +- console.log(`每页 ${val} 条`);
  168 ++ this.pageSize=val;
  169 + },
  170 + handleCurrentChange(val) {
  171 +- console.log(`当前页: ${val}`);
  172 ++ this.currentPage=val;
  173 ++ this.submitForm();
  174 + },
  175 + //航线信息查询选择功能
  176 + handleEdit(index,row){
  177 +Index: src/views/airtransport/queryArrival.vue
  178 +IDEA additional info:
  179 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  180 +<+>UTF-8
  181 +===================================================================
  182 +--- src/views/airtransport/queryArrival.vue (revision 6b552697d551139b5ea2935024146065781f309f)
  183 ++++ src/views/airtransport/queryArrival.vue (date 1592550089820)
  184 +@@ -11,11 +11,6 @@
  185 + <el-form :label-position="labelPosition" :model="queryArrival" :rules="rules" ref="queryFlight"
  186 + label-width="130px" class="demo-ruleForm">
  187 + <el-col :span="6" >
  188 +- <el-form-item label="承运人：" prop="awcd" label-width="80px">
  189 +- <el-input v-model="queryArrival.awcd" style="width:190px"></el-input>
  190 +- </el-form-item>
  191 +- </el-col>
  192 +- <el-col :span="6" >
  193 + <el-form-item label="航班号：" prop="flightNo" label-width="80px">
  194 + <el-input v-model="queryArrival.flightNo" style="width:190px"></el-input>
  195 + </el-form-item>
  196 +@@ -25,13 +20,14 @@
  197 + <el-date-picker
  198 + v-model="queryArrival.flightDate"
  199 + type="date"
  200 ++ format="yyyyMMdd"
  201 + style="width:190px"
  202 + placeholder="选择日期">
  203 + </el-date-picker>
  204 + </el-form-item>
  205 + </el-col>
  206 + <el-col :span="5" >
  207 +- <el-button type="primary" @click="submitForm('queryArrival')">查询</el-button>
  208 ++ <el-button type="primary" @click="submitForm()">查询</el-button>
  209 + </el-col>
  210 + </el-form>
  211 + </el-row>
  212 +@@ -40,6 +36,7 @@
  213 + <el-table
  214 + :data="tableData"
  215 + border
  216 ++ v-loading="tableloading"
  217 + style="width: 100%;margin-bottom: 10px">
  218 + <el-table-column
  219 + fixed="left"
  220 +@@ -54,8 +51,7 @@
  221 + </el-table-column>
  222 + <el-table-column
  223 + prop="flightNo"
  224 +- label="航班号"
  225 +- width="80">
  226 ++ label="航班号">
  227 + </el-table-column>
  228 + <el-table-column
  229 + prop="flightDate"
  230 +@@ -64,28 +60,23 @@
  231 + </el-table-column>
  232 + <el-table-column
  233 + prop="aircraftNo"
  234 +- label="航空器注册编码"
  235 +- width="120">
  236 ++ label="航空器注册编码">
  237 + </el-table-column>
  238 + <el-table-column
  239 + prop="departurePort"
  240 +- label="出发港"
  241 +- width="80">
  242 ++ label="出发港">
  243 + </el-table-column>
  244 + <el-table-column
  245 + prop="arrivalPort"
  246 +- label="目的港"
  247 +- width="80">
  248 ++ label="目的港">
  249 + </el-table-column>
  250 + <el-table-column
  251 + prop="customDistrictNo"
  252 +- label="关区代码"
  253 +- width="80">
  254 ++ label="关区代码">
  255 + </el-table-column>
  256 + <el-table-column
  257 + prop="transportflag"
  258 +- label="运输计划"
  259 +- width="150">
  260 ++ label="运输计划">
  261 + </el-table-column>
  262 + <el-table-column
  263 + prop="departuredatetime"
  264 +@@ -94,13 +85,12 @@
  265 + </el-table-column>
  266 + <el-table-column
  267 + prop="statusMsg"
  268 +- label="海关回执"
  269 +- width="150">
  270 ++ label="海关回执">
  271 + </el-table-column>
  272 + <el-table-column
  273 ++ fixed="right"
  274 + prop=""
  275 +- label="报文操作"
  276 +- width="150">
  277 ++ label="报文操作">
  278 + <template slot-scope="scope">
  279 + <el-button
  280 + size="mini"
  281 +@@ -122,10 +112,10 @@
  282 + @size-change="handleSizeChange"
  283 + @current-change="handleCurrentChange"
  284 + :current-page="currentPage"
  285 +- :page-sizes="[100, 200, 300, 400]"
  286 +- :page-size="100"
  287 ++ :page-sizes="[10, 20, 30, 40]"
  288 ++ :page-size="pageSize"
  289 + layout="total, sizes, prev, pager, next, jumper"
  290 +- :total="400">
  291 ++ :total="total">
  292 + </el-pagination>
  293 + </div>
  294 + </el-row>
  295 +@@ -151,37 +141,91 @@
  296 +
  297 + </style>
  298 + <script>
  299 ++ import {editPrediction, selectPrediction} from "../../api/transport";
  300 ++
  301 + export default {
  302 + data(){
  303 + return{
  304 + queryArrival:{
  305 +- awcd:undefined,
  306 + flightNo:undefined,
  307 + flightDate:undefined,
  308 + },
  309 +- rules:{
  310 +- awcd: [
  311 +- {required: true, message: '请输入', trigger: 'blur'}
  312 +- ],
  313 +- flightNo: [
  314 +- {required: true, message: '请输入', trigger: 'blur'}
  315 +- ],
  316 +- flightDate: [
  317 +- {required: true, message: '请选择', trigger: 'change'}
  318 +- ],
  319 +- },
  320 ++ rules: {},
  321 + labelPosition:'left',
  322 +- currentPage: 4,
  323 +- tableData:[]
  324 ++ currentPage: 1,
  325 ++ pageSize:10,
  326 ++ total:0,
  327 ++ tableData:[],
  328 ++ tableloading:false
  329 + }
  330 + },
  331 + methods: {
  332 ++ //分页
  333 + handleSizeChange(val) {
  334 +- console.log(`每页 ${val} 条`);
  335 ++ this.pageSize=val;
  336 + },
  337 + handleCurrentChange(val) {
  338 +- console.log(`当前页: ${val}`);
  339 +- }
  340 ++ this.currentPage=val;
  341 ++ this.submitForm();
  342 ++ },
  343 ++ //获取进港预报查询列表
  344 ++ submitForm() {
  345 ++ let params = {
  346 ++ currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryArrival.flightNo,
  347 ++ flightDate: this.queryArrival.flightDate
  348 ++ };
  349 ++ this.tableloading = true;
  350 ++ selectPrediction(params).then(res => {
  351 ++ let response = res.data.data;
  352 ++ this.tableData = response.list;
  353 ++ this.tableloading = false;
  354 ++ this.total = response.total;
  355 ++ });
  356 ++ },
  357 ++ //列表删除功能
  358 ++ handleDel(index, row) {
  359 ++ this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
  360 ++ confirmButtonText: '确定',
  361 ++ cancelButtonText: '取消',
  362 ++ type: 'warning'
  363 ++ }).then(() => {
  364 ++ editPrediction(row).then(res => {
  365 ++ let response = res.data;
  366 ++ if (response.code == '200') {
  367 ++ this.$message({
  368 ++ type: 'info',
  369 ++ message: '删除成功'
  370 ++ });
  371 ++ this.submitForm();
  372 ++ } else {
  373 ++ this.$message({
  374 ++ type: 'info',
  375 ++ message: '删除失败'
  376 ++ });
  377 ++ }
  378 ++ });
  379 ++ }).catch(() => {
  380 ++ this.$message({
  381 ++ type: 'info',
  382 ++ message: '已取消删除'
  383 ++ });
  384 ++ });
  385 ++ },
  386 ++ //获取默认值
  387 ++ defaultData() {
  388 ++ this.flightNo = JSON.parse(this.$route.query.flightNo);
  389 ++ this.flightDate = JSON.parse(this.$route.query.flightDate);
  390 ++ },
  391 ++ //编辑进港预报
  392 ++ handleEdit(index,row){
  393 ++ this.$router.push({path:'/arrival',query: row})
  394 ++ },
  395 ++
  396 + },
  397 ++ //渲染方法
  398 ++ mounted(){
  399 ++ this.defaultData();
  400 ++ this.submitForm();
  401 ++ }
  402 + }
  403 + </script>
  404 +\ No newline at end of file
  405 +Index: src/views/airtransport/arrival.vue
  406 +IDEA additional info:
  407 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  408 +<+>UTF-8
  409 +===================================================================
  410 +--- src/views/airtransport/arrival.vue (revision 6b552697d551139b5ea2935024146065781f309f)
  411 ++++ src/views/airtransport/arrival.vue (date 1592287678205)
  412 +@@ -23,6 +23,8 @@
  413 + <el-date-picker
  414 + v-model="arrival.flightDate"
  415 + type="date"
  416 ++ value-format="yyyyMMdd"
  417 ++ format="yyyyMMdd"
  418 + style="width:275px"
  419 + placeholder="选择日期">
  420 + </el-date-picker>
  421 +@@ -30,22 +32,32 @@
  422 + </el-col>
  423 + <el-col :span="8">
  424 + <el-form-item label="出发港" prop="departurePort" label-width="120px">
  425 +- <el-input v-model="arrival.departurePort"></el-input>
  426 ++ <el-input v-model="arrival.departurePort" @input="e => arrival.departurePort=inputMe(e)"
  427 ++ maxLength='3'></el-input>
  428 + </el-form-item>
  429 + </el-col>
  430 + <el-col :span="8">
  431 + <el-form-item label="目的港" prop="arrivalPort" label-width="120px">
  432 +- <el-input v-model="arrival.arrivalPort"></el-input>
  433 ++ <el-input v-model="arrival.arrivalPort" @input="e => arrival.arrivalPort=inputMe(e)"
  434 ++ maxLength='3'></el-input>
  435 + </el-form-item>
  436 + </el-col>
  437 + <el-col :span="8">
  438 + <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px">
  439 +- <el-input v-model="arrival.customDistrictNo"></el-input>
  440 ++ <el-input v-model="arrival.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')"
  441 ++ maxLength='4'></el-input>
  442 + </el-form-item>
  443 + </el-col>
  444 + <el-col :span="6">
  445 + <el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px">
  446 +- <el-input v-model="arrival.departuredatetime"></el-input>
  447 ++ <el-date-picker
  448 ++ v-model="arrival.departuredatetime"
  449 ++ type="date"
  450 ++ format="yyyyMMdd"
  451 ++ value-format="yyyyMMdd"
  452 ++ style="width:100%"
  453 ++ placeholder="任意时间点">
  454 ++ </el-date-picker>
  455 + </el-form-item>
  456 + </el-col>
  457 + <el-col :span="6">
  458 +@@ -55,12 +67,26 @@
  459 + </el-col>
  460 + <el-col :span="6">
  461 + <el-form-item label="完成装卸时间" prop="dischargecompleteddatetime" label-width="120px">
  462 +- <el-input v-model="arrival.dischargecompleteddatetime"></el-input>
  463 ++ <el-date-picker
  464 ++ v-model="arrival.dischargecompleteddatetime"
  465 ++ type="date"
  466 ++ format="yyyyMMdd"
  467 ++ value-format="yyyyMMdd"
  468 ++ style="width:100%"
  469 ++ placeholder="任意时间点">
  470 ++ </el-date-picker>
  471 + </el-form-item>
  472 + </el-col>
  473 + <el-col :span="6">
  474 + <el-form-item label="预计抵港时间" prop="arrivaldatetime" label-width="140px">
  475 +- <el-input v-model="arrival.arrivaldatetime"></el-input>
  476 ++ <el-date-picker
  477 ++ v-model="arrival.arrivaldatetime"
  478 ++ type="date"
  479 ++ format="yyyyMMdd"
  480 ++ value-format="yyyyMMdd"
  481 ++ style="width:100%"
  482 ++ placeholder="任意时间点">
  483 ++ </el-date-picker>
  484 + </el-form-item>
  485 + </el-col>
  486 + <el-col :span="24">
  487 +@@ -74,6 +100,20 @@
  488 + <el-col :span="24"> <el-button type="primary" @click="submitForm('arrival')">保 存</el-button>
  489 + <el-button type="success">保存并发送</el-button></el-col>
  490 + </el-row>
  491 ++ <!--对话提示框-->
  492 ++ <el-row>
  493 ++ <el-dialog
  494 ++ title="系统提示"
  495 ++ :visible.sync="centerDialogVisible"
  496 ++ width="30%"
  497 ++ center>
  498 ++ <span>{{msg}}</span>
  499 ++ <span slot="footer" class="dialog-footer">
  500 ++ <el-button @click="centerDialogVisible = false">取 消</el-button>
  501 ++ <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
  502 ++ </span>
  503 ++ </el-dialog>
  504 ++ </el-row>
  505 + </el-main>
  506 + </el-container>
  507 + </template>
  508 +@@ -96,6 +136,8 @@
  509 + .el-col{margin-right: 0px;}
  510 + </style>
  511 + <script>
  512 ++ import {addPrediction} from "../../api/transport";
  513 ++
  514 + export default {
  515 + data(){
  516 + return{
  517 +@@ -121,7 +163,7 @@
  518 + {required: true, message: '请输入', trigger: 'blur'}
  519 + ],
  520 + flightDate: [
  521 +- {type: 'date',required: true, message: '请选择', trigger: 'change'}
  522 ++ {required: true, message: '请选择', trigger: 'change'}
  523 + ],
  524 + departurePort: [
  525 + {required: true, message: '请输入(三字码)', trigger: 'blur'},
  526 +@@ -135,7 +177,7 @@
  527 + {required: true, message: '请选择', trigger: 'blur'}
  528 + ],
  529 + departuredatetime: [
  530 +- {required: true, message: '请选择', trigger: 'blur'}
  531 ++ {required: true, message: '请选择', trigger: 'change'}
  532 + ],
  533 + stayid: [
  534 + {required: true, message: '请输入', trigger: 'blur'}
  535 +@@ -147,31 +189,45 @@
  536 + {required: true, message: '请选择', trigger: 'blur'}
  537 + ],
  538 + },
  539 +- tableData:[]
  540 ++ tableData:[],
  541 ++ centerDialogVisible:false,
  542 ++ msg:undefined,
  543 + }
  544 + },
  545 + methods:{
  546 ++ //新增进港预报申报（保存按钮）
  547 + submitForm(formName) {
  548 + this.$refs[formName].validate((valid) => {
  549 + if (valid) {
  550 +- alert('submit!');
  551 +- } else {
  552 +- console.log('error submit!!');
  553 +- return false;
  554 +- }
  555 +- });
  556 +- },
  557 +- submitPerson(formName){
  558 +- this.$refs[formName].validate((valid) => {
  559 +- if (valid) {
  560 +- alert('submit!');
  561 ++ addPrediction(this.arrival).then(res=>{
  562 ++ let response=res.data;
  563 ++ if(response.code=='200'){
  564 ++ this.centerDialogVisible=true;
  565 ++ this.msg=response.msg;
  566 ++ this.$router.push({path:'/queryArrival',query:{flightNo:JSON.stringify(this.arrival.flightNo),flightDate:JSON.stringify(this.arrival.flightDate)},});
  567 ++ }else{
  568 ++ this.msg=response.msg;
  569 ++ }
  570 ++ });
  571 + } else {
  572 + console.log('error submit!!');
  573 + return false;
  574 + }
  575 + });
  576 + },
  577 +-
  578 ++ //加载默认值
  579 ++ defaultData(){
  580 ++ if(this.$route.query!=null){
  581 ++ let ob=Object.assign(this.arrival, this.$route.query);
  582 ++ }
  583 ++ },
  584 ++ // 过滤中英文
  585 ++ inputMe(e){
  586 ++ return e.replace(/[^a-zA-Z]/g,'').toUpperCase();
  587 ++ }
  588 ++ },
  589 ++ mounted(){
  590 ++ this.defaultData();
  591 + }
  592 + }
  593 + </script>
  594 +\ No newline at end of file
  595 +Index: src/views/airtransport/confirmatory.vue
  596 +IDEA additional info:
  597 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  598 +<+>UTF-8
  599 +===================================================================
  600 +--- src/views/airtransport/confirmatory.vue (revision 6b552697d551139b5ea2935024146065781f309f)
  601 ++++ src/views/airtransport/confirmatory.vue (date 1592445000186)
  602 +@@ -23,6 +23,8 @@
  603 + <el-date-picker
  604 + v-model="confirmatory.flightDate"
  605 + type="date"
  606 ++ value-format="yyyyMMdd"
  607 ++ format="yyyyMMdd"
  608 + style="width:275px"
  609 + placeholder="选择日期">
  610 + </el-date-picker>
  611 +@@ -30,22 +32,38 @@
  612 + </el-col>
  613 + <el-col :span="8">
  614 + <el-form-item label="离港时间" prop="departuredatetime" label-width="120px">
  615 +- <el-input v-model="confirmatory.departuredatetime"></el-input>
  616 ++ <el-date-picker
  617 ++ v-model="confirmatory.departuredatetime"
  618 ++ type="date"
  619 ++ value-format="yyyyMMdd"
  620 ++ format="yyyyMMdd"
  621 ++ style="width:100%"
  622 ++ placeholder="任意时间点">
  623 ++ </el-date-picker>
  624 + </el-form-item>
  625 + </el-col>
  626 + <el-col :span="8">
  627 + <el-form-item label="目的港" prop="arrivalPort" label-width="120px">
  628 +- <el-input v-model="confirmatory.arrivalPort"></el-input>
  629 ++ <el-input v-model="confirmatory.arrivalPort" @input="e => confirmatory.arrivalPort=inputMe(e)"
  630 ++ maxLength='3'></el-input>
  631 + </el-form-item>
  632 + </el-col>
  633 + <el-col :span="8">
  634 + <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px">
  635 +- <el-input v-model="confirmatory.customDistrictNo"></el-input>
  636 ++ <el-input v-model="confirmatory.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')"
  637 ++ maxLength='4'></el-input>
  638 + </el-form-item>
  639 + </el-col>
  640 + <el-col :span="8">
  641 + <el-form-item label="抵港时间" prop="arrivaldatetime" label-width="120px">
  642 +- <el-input v-model="confirmatory.arrivaldatetime"></el-input>
  643 ++ <el-date-picker
  644 ++ v-model="confirmatory.arrivaldatetime"
  645 ++ type="date"
  646 ++ value-format="yyyyMMdd"
  647 ++ format="yyyyMMdd"
  648 ++ style="width:100%"
  649 ++ placeholder="任意时间点">
  650 ++ </el-date-picker>
  651 + </el-form-item>
  652 + </el-col>
  653 + <el-col :span="8">
  654 +@@ -63,6 +81,20 @@
  655 + <el-row style="margin-left: 120px">
  656 + <el-col :span="24"> <el-button type="primary" @click="submitForm('confirmatory')">保 存</el-button>
  657 + <el-button type="success">保存并发送</el-button></el-col>
  658 ++ </el-row>
  659 ++ <!--对话提示框-->
  660 ++ <el-row>
  661 ++ <el-dialog
  662 ++ title="系统提示"
  663 ++ :visible.sync="centerDialogVisible"
  664 ++ width="30%"
  665 ++ center>
  666 ++ <span>{{msg}}</span>
  667 ++ <span slot="footer" class="dialog-footer">
  668 ++ <el-button @click="centerDialogVisible = false">取 消</el-button>
  669 ++ <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
  670 ++ </span>
  671 ++ </el-dialog>
  672 + </el-row>
  673 + </el-main>
  674 + </el-container>
  675 +@@ -86,6 +118,8 @@
  676 + .el-col{margin-right: 0px;}
  677 + </style>
  678 + <script>
  679 ++ import {addConfirm} from "../../api/transport";
  680 ++
  681 + export default {
  682 + data(){
  683 + return{
  684 +@@ -128,31 +162,45 @@
  685 + {required: true, message: '请选择', trigger: 'blur'}
  686 + ],
  687 + },
  688 +- tableData:[]
  689 ++ tableData:[],
  690 ++ msg:undefined,
  691 ++ centerDialogVisible:false,
  692 + }
  693 + },
  694 + methods:{
  695 ++ //新增进港确报申报（保存按钮）
  696 + submitForm(formName) {
  697 + this.$refs[formName].validate((valid) => {
  698 + if (valid) {
  699 +- alert('submit!');
  700 +- } else {
  701 +- console.log('error submit!!');
  702 +- return false;
  703 +- }
  704 +- });
  705 +- },
  706 +- submitPerson(formName){
  707 +- this.$refs[formName].validate((valid) => {
  708 +- if (valid) {
  709 +- alert('submit!');
  710 ++ addConfirm(this.confirmatory).then(res=>{
  711 ++ let response=res.data;
  712 ++ if(response.code=='200'){
  713 ++ this.centerDialogVisible=true;
  714 ++ this.msg=response.msg;
  715 ++ this.$router.push({path:'/queryConfirmatory',query:{flightNo:JSON.stringify(this.confirmatory.flightNo),flightDate:JSON.stringify(this.confirmatory.flightDate)},});
  716 ++ }else{
  717 ++ this.msg=response.msg;
  718 ++ }
  719 ++ });
  720 + } else {
  721 + console.log('error submit!!');
  722 + return false;
  723 + }
  724 + });
  725 + },
  726 +-
  727 ++ //加载默认值
  728 ++ defaultData(){
  729 ++ if(this.$route.query!=null){
  730 ++ let ob=Object.assign(this.confirmatory, this.$route.query);
  731 ++ }
  732 ++ },
  733 ++ // 过滤中英文
  734 ++ inputMe(e){
  735 ++ return e.replace(/[^a-zA-Z]/g,'').toUpperCase();
  736 ++ }
  737 ++ },
  738 ++ mounted(){
  739 ++ this.defaultData();
  740 + }
  741 + }
  742 + </script>
  743 +\ No newline at end of file
  744 +Index: src/views/airtransport/queryFlightConfigure.vue
  745 +IDEA additional info:
  746 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  747 +<+>UTF-8
  748 +===================================================================
  749 +--- src/views/airtransport/queryFlightConfigure.vue (revision 6b552697d551139b5ea2935024146065781f309f)
  750 ++++ src/views/airtransport/queryFlightConfigure.vue (date 1592272006035)
  751 +@@ -40,23 +40,19 @@
  752 + </el-table-column>
  753 + <el-table-column
  754 + prop="username"
  755 +- label="用户名"
  756 +- width="120">
  757 ++ label="用户名">
  758 + </el-table-column>
  759 + <el-table-column
  760 + prop="flightno"
  761 +- label="航班号"
  762 +- width="80">
  763 ++ label="航班号">
  764 + </el-table-column>
  765 + <el-table-column
  766 + prop="ietype"
  767 +- label="进出港"
  768 +- width="80">
  769 ++ label="进出港">
  770 + </el-table-column>
  771 + <el-table-column
  772 + prop="createby"
  773 +- label="创建人"
  774 +- width="120">
  775 ++ label="创建人">
  776 + </el-table-column>
  777 + <el-table-column
  778 + prop="createtime"
  779 +@@ -65,8 +61,7 @@
  780 + </el-table-column>
  781 + <el-table-column
  782 + prop="updateby"
  783 +- label="更新人"
  784 +- width="120">
  785 ++ label="更新人">
  786 + </el-table-column>
  787 + <el-table-column
  788 + prop="updatetime"
  789 +@@ -74,6 +69,7 @@
  790 + width="120">
  791 + </el-table-column>
  792 + <el-table-column
  793 ++ fixed="right"
  794 + prop=""
  795 + label="报文操作"
  796 + width="150">
  797 +Index: src/views/airtransport/outConfigure.vue
  798 +IDEA additional info:
  799 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  800 +<+>UTF-8
  801 +===================================================================
  802 +--- src/views/airtransport/outConfigure.vue (revision 6b552697d551139b5ea2935024146065781f309f)
  803 ++++ src/views/airtransport/outConfigure.vue (date 1592795864525)
  804 +@@ -61,6 +61,7 @@
  805 + flightNo:undefined,
  806 + ietype:undefined,
  807 + reamrk:undefined,
  808 ++ accessFlag:'2'
  809 + },
  810 + rules: {
  811 + flightNo: [
  812 +Index: src/views/airtransport/queryConfigure.vue
  813 +IDEA additional info:
  814 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  815 +<+>UTF-8
  816 +===================================================================
  817 +--- src/views/airtransport/queryConfigure.vue (revision 6b552697d551139b5ea2935024146065781f309f)
  818 ++++ src/views/airtransport/queryConfigure.vue (date 1592363277619)
  819 +@@ -8,7 +8,7 @@
  820 + </el-row>
  821 + <!-- 搜索区域-->
  822 + <el-row>
  823 +- <el-form :label-position="labelPosition" :model="queryConfigure" :rules="rules" ref="queryFlight"
  824 ++ <el-form :label-position="labelPosition" :model="queryConfigure" ref="queryFlight"
  825 + label-width="130px" class="demo-ruleForm">
  826 +
  827 + <el-col :span="6" >
  828 +@@ -17,7 +17,7 @@
  829 + </el-form-item>
  830 + </el-col>
  831 + <el-col :span="5" >
  832 +- <el-button type="primary" @click="submitForm('queryConfigure')">查询</el-button>
  833 ++ <el-button type="primary" @click="submitForm()">查询</el-button>
  834 + </el-col>
  835 + </el-form>
  836 + </el-row>
  837 +@@ -26,6 +26,7 @@
  838 + <el-table
  839 + :data="tableData"
  840 + border
  841 ++ v-loading="tableloading"
  842 + style="width: 100%;margin-bottom: 10px">
  843 + <el-table-column
  844 + fixed="left"
  845 +@@ -40,23 +41,19 @@
  846 + </el-table-column>
  847 + <el-table-column
  848 + prop="username"
  849 +- label="用户名"
  850 +- width="120">
  851 ++ label="用户名">
  852 + </el-table-column>
  853 + <el-table-column
  854 + prop="flightno"
  855 +- label="航班号"
  856 +- width="80">
  857 ++ label="航班号">
  858 + </el-table-column>
  859 + <el-table-column
  860 + prop="ietype"
  861 +- label="进出港"
  862 +- width="80">
  863 ++ label="进出港">
  864 + </el-table-column>
  865 + <el-table-column
  866 + prop="createby"
  867 +- label="创建人"
  868 +- width="120">
  869 ++ label="创建人">
  870 + </el-table-column>
  871 + <el-table-column
  872 + prop="createtime"
  873 +@@ -65,8 +62,7 @@
  874 + </el-table-column>
  875 + <el-table-column
  876 + prop="updateby"
  877 +- label="更新人"
  878 +- width="120">
  879 ++ label="更新人">
  880 + </el-table-column>
  881 + <el-table-column
  882 + prop="updatetime"
  883 +@@ -74,6 +70,7 @@
  884 + width="120">
  885 + </el-table-column>
  886 + <el-table-column
  887 ++ fixed="right"
  888 + prop=""
  889 + label="报文操作"
  890 + width="150">
  891 +@@ -98,10 +95,10 @@
  892 + @size-change="handleSizeChange"
  893 + @current-change="handleCurrentChange"
  894 + :current-page="currentPage"
  895 +- :page-sizes="[100, 200, 300, 400]"
  896 +- :page-size="100"
  897 ++ :page-sizes="[10, 20, 30, 40]"
  898 ++ :page-size="pageSize"
  899 + layout="total, sizes, prev, pager, next, jumper"
  900 +- :total="400">
  901 ++ :total="total">
  902 + </el-pagination>
  903 + </div>
  904 + </el-row>
  905 +@@ -127,29 +124,86 @@
  906 +
  907 + </style>
  908 + <script>
  909 ++ import {editSchedule, selectSchedule} from "../../api/transport";
  910 ++
  911 + export default {
  912 + data(){
  913 + return{
  914 + queryConfigure:{
  915 + flightNo:undefined,
  916 + },
  917 +- rules:{
  918 +- flightNo: [
  919 +- {required: true, message: '请输入', trigger: 'blur'}
  920 +- ],
  921 +- },
  922 + labelPosition:'left',
  923 +- currentPage: 4,
  924 ++ currentPage: 1,
  925 ++ pageSize:10,
  926 ++ total:0,
  927 ++ tableloading:false,
  928 + tableData:[]
  929 + }
  930 + },
  931 + methods: {
  932 ++ //分页
  933 + handleSizeChange(val) {
  934 +- console.log(`每页 ${val} 条`);
  935 ++ this.pageSize=val;
  936 + },
  937 + handleCurrentChange(val) {
  938 +- console.log(`当前页: ${val}`);
  939 +- }
  940 ++ this.currentPage=val;
  941 ++ this.submitForm();
  942 ++ },
  943 ++ //获取进港航班配置查询列表
  944 ++ submitForm() {
  945 ++ let params = {
  946 ++ currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryConfigure.flightNo,
  947 ++ };
  948 ++ this.tableloading = true;
  949 ++ selectSchedule(params).then(res => {
  950 ++ let response = res.data.data;
  951 ++ this.tableData = response.list;
  952 ++ this.tableloading = false;
  953 ++ this.total = response.total;
  954 ++ });
  955 ++ },
  956 ++ //列表删除功能
  957 ++ handleDel(index, row) {
  958 ++ this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
  959 ++ confirmButtonText: '确定',
  960 ++ cancelButtonText: '取消',
  961 ++ type: 'warning'
  962 ++ }).then(() => {
  963 ++ editSchedule(row).then(res => {
  964 ++ let response = res.data;
  965 ++ if (response.code == '200') {
  966 ++ this.$message({
  967 ++ type: 'info',
  968 ++ message: '删除成功'
  969 ++ });
  970 ++ this.submitForm();
  971 ++ } else {
  972 ++ this.$message({
  973 ++ type: 'info',
  974 ++ message: '删除失败'
  975 ++ });
  976 ++ }
  977 ++ });
  978 ++ }).catch(() => {
  979 ++ this.$message({
  980 ++ type: 'info',
  981 ++ message: '已取消删除'
  982 ++ });
  983 ++ });
  984 ++ },
  985 ++ //获取默认值
  986 ++ defaultData() {
  987 ++ this.flightNo = JSON.parse(this.$route.query.flightNo);
  988 ++ },
  989 ++ //编辑进港航班配置
  990 ++ handleEdit(index,row){
  991 ++ this.$router.push({path:'/configure',query: row})
  992 ++ },
  993 + },
  994 ++ //渲染方法
  995 ++ mounted(){
  996 ++ this.defaultData();
  997 ++ this.submitForm();
  998 ++ }
  999 + }
  1000 + </script>
  1001 +\ No newline at end of file
  1002 +Index: src/views/airtransport/configure.vue
  1003 +IDEA additional info:
  1004 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  1005 +<+>UTF-8
  1006 +===================================================================
  1007 +--- src/views/airtransport/configure.vue (revision 6b552697d551139b5ea2935024146065781f309f)
  1008 ++++ src/views/airtransport/configure.vue (date 1592795805280)
  1009 +@@ -29,8 +29,22 @@
  1010 + </el-form>
  1011 + </el-row>
  1012 + <el-row style="margin-left: 120px">
  1013 +- <el-col :span="24"> <el-button type="primary" @click="submitForm('confirmatory')">保 存</el-button>
  1014 ++ <el-col :span="24"> <el-button type="primary" @click="submitForm('configure')">保 存</el-button>
  1015 + </el-col>
  1016 ++ </el-row>
  1017 ++ <!--对话提示框-->
  1018 ++ <el-row>
  1019 ++ <el-dialog
  1020 ++ title="系统提示"
  1021 ++ :visible.sync="centerDialogVisible"
  1022 ++ width="30%"
  1023 ++ center>
  1024 ++ <span>{{msg}}</span>
  1025 ++ <span slot="footer" class="dialog-footer">
  1026 ++ <el-button @click="centerDialogVisible = false">取 消</el-button>
  1027 ++ <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
  1028 ++ </span>
  1029 ++ </el-dialog>
  1030 + </el-row>
  1031 + </el-main>
  1032 + </el-container>
  1033 +@@ -54,6 +68,8 @@
  1034 + .el-col{margin-right: 0px;}
  1035 + </style>
  1036 + <script>
  1037 ++ import { addSchedule} from "../../api/transport";
  1038 ++
  1039 + export default {
  1040 + data(){
  1041 + return{
  1042 +@@ -75,31 +91,42 @@
  1043 + {value:'1',label:'进港'},
  1044 + {value:'2',label:'出港'}
  1045 + ],
  1046 +- tableData:[]
  1047 ++ tableData:[],
  1048 ++ msg:undefined,
  1049 ++ centerDialogVisible:false,
  1050 ++ accessFlag:'1'
  1051 + }
  1052 + },
  1053 + methods:{
  1054 ++ //新增进港确报申报（保存按钮）
  1055 + submitForm(formName) {
  1056 + this.$refs[formName].validate((valid) => {
  1057 + if (valid) {
  1058 +- alert('submit!');
  1059 +- } else {
  1060 +- console.log('error submit!!');
  1061 +- return false;
  1062 +- }
  1063 +- });
  1064 +- },
  1065 +- submitPerson(formName){
  1066 +- this.$refs[formName].validate((valid) => {
  1067 +- if (valid) {
  1068 +- alert('submit!');
  1069 ++ addSchedule(this.configure).then(res=>{
  1070 ++ let response=res.data;
  1071 ++ if(response.code=='200'){
  1072 ++ this.centerDialogVisible=true;
  1073 ++ this.msg=response.msg;
  1074 ++ this.$router.push({path:'/queryConfigure',query:{flightNo:JSON.stringify(this.queryConfigure.flightNo)},});
  1075 ++ }else{
  1076 ++ this.msg=response.msg;
  1077 ++ }
  1078 ++ });
  1079 + } else {
  1080 + console.log('error submit!!');
  1081 + return false;
  1082 + }
  1083 + });
  1084 + },
  1085 +-
  1086 ++ //加载默认值
  1087 ++ defaultData(){
  1088 ++ if(this.$route.query!=null){
  1089 ++ let ob=Object.assign(this.configure, this.$route.query);
  1090 ++ }
  1091 ++ },
  1092 ++ },
  1093 ++ mounted(){
  1094 ++ this.defaultData();
  1095 + }
  1096 + }
  1097 + </script>
  1098 +\ No newline at end of file
  1099 +Index: src/views/airtransport/queryConfirmatory.vue
  1100 +IDEA additional info:
  1101 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  1102 +<+>UTF-8
  1103 +===================================================================
  1104 +--- src/views/airtransport/queryConfirmatory.vue (revision 6b552697d551139b5ea2935024146065781f309f)
  1105 ++++ src/views/airtransport/queryConfirmatory.vue (date 1592290243601)
  1106 +@@ -8,14 +8,9 @@
  1107 + </el-row>
  1108 + <!-- 搜索区域-->
  1109 + <el-row>
  1110 +- <el-form :label-position="labelPosition" :model="queryConfirmatory" :rules="rules" ref="queryFlight"
  1111 ++ <el-form :label-position="labelPosition" :model="queryConfirmatory" ref="queryFlight"
  1112 + label-width="130px" class="demo-ruleForm">
  1113 + <el-col :span="6" >
  1114 +- <el-form-item label="承运人：" prop="awcd" label-width="80px">
  1115 +- <el-input v-model="queryConfirmatory.awcd" style="width:190px"></el-input>
  1116 +- </el-form-item>
  1117 +- </el-col>
  1118 +- <el-col :span="6" >
  1119 + <el-form-item label="航班号：" prop="flightNo" label-width="80px">
  1120 + <el-input v-model="queryConfirmatory.flightNo" style="width:190px"></el-input>
  1121 + </el-form-item>
  1122 +@@ -25,13 +20,14 @@
  1123 + <el-date-picker
  1124 + v-model="queryConfirmatory.flightDate"
  1125 + type="date"
  1126 ++ format="yyyyMMdd"
  1127 + style="width:190px"
  1128 + placeholder="选择日期">
  1129 + </el-date-picker>
  1130 + </el-form-item>
  1131 + </el-col>
  1132 + <el-col :span="5" >
  1133 +- <el-button type="primary" @click="submitForm('queryConfirmatory')">查询</el-button>
  1134 ++ <el-button type="primary" @click="submitForm()">查询</el-button>
  1135 + </el-col>
  1136 + </el-form>
  1137 + </el-row>
  1138 +@@ -40,6 +36,7 @@
  1139 + <el-table
  1140 + :data="tableData"
  1141 + border
  1142 ++ v-loading="tableloading"
  1143 + style="width: 100%;margin-bottom: 10px">
  1144 + <el-table-column
  1145 + fixed="left"
  1146 +@@ -54,8 +51,7 @@
  1147 + </el-table-column>
  1148 + <el-table-column
  1149 + prop="flightNo"
  1150 +- label="航班号"
  1151 +- width="80">
  1152 ++ label="航班号">
  1153 + </el-table-column>
  1154 + <el-table-column
  1155 + prop="flightDate"
  1156 +@@ -64,23 +60,19 @@
  1157 + </el-table-column>
  1158 + <el-table-column
  1159 + prop="aircraftNo"
  1160 +- label="航空器注册编码"
  1161 +- width="120">
  1162 ++ label="航空器注册编码">
  1163 + </el-table-column>
  1164 + <el-table-column
  1165 + prop="arrivalPort"
  1166 +- label="目的港"
  1167 +- width="80">
  1168 ++ label="目的港">
  1169 + </el-table-column>
  1170 + <el-table-column
  1171 + prop="customDistrictNo"
  1172 +- label="关区代码"
  1173 +- width="80">
  1174 ++ label="关区代码">
  1175 + </el-table-column>
  1176 + <el-table-column
  1177 + prop="transportflag"
  1178 +- label="运输计划"
  1179 +- width="80">
  1180 ++ label="运输计划">
  1181 + </el-table-column>
  1182 + <el-table-column
  1183 + prop="departuredatetime"
  1184 +@@ -94,10 +86,10 @@
  1185 + </el-table-column>
  1186 + <el-table-column
  1187 + prop="statusMsg"
  1188 +- label="海关回执"
  1189 +- width="150">
  1190 ++ label="海关回执">
  1191 + </el-table-column>
  1192 + <el-table-column
  1193 ++ fixed="right"
  1194 + prop=""
  1195 + label="报文操作"
  1196 + width="150">
  1197 +@@ -122,10 +114,10 @@
  1198 + @size-change="handleSizeChange"
  1199 + @current-change="handleCurrentChange"
  1200 + :current-page="currentPage"
  1201 +- :page-sizes="[100, 200, 300, 400]"
  1202 +- :page-size="100"
  1203 ++ :page-sizes="[10, 20, 30, 40]"
  1204 ++ :page-size="pageSize"
  1205 + layout="total, sizes, prev, pager, next, jumper"
  1206 +- :total="400">
  1207 ++ :total="total">
  1208 + </el-pagination>
  1209 + </div>
  1210 + </el-row>
  1211 +@@ -151,37 +143,88 @@
  1212 +
  1213 + </style>
  1214 + <script>
  1215 ++ import {editConfirm, selectConfirm} from "../../api/transport";
  1216 ++
  1217 + export default {
  1218 + data(){
  1219 + return{
  1220 + queryConfirmatory:{
  1221 +- awcd:undefined,
  1222 + flightNo:undefined,
  1223 + flightDate:undefined,
  1224 + },
  1225 +- rules:{
  1226 +- awcd: [
  1227 +- {required: true, message: '请输入', trigger: 'blur'}
  1228 +- ],
  1229 +- flightNo: [
  1230 +- {required: true, message: '请输入', trigger: 'blur'}
  1231 +- ],
  1232 +- flightDate: [
  1233 +- {required: true, message: '请选择', trigger: 'change'}
  1234 +- ],
  1235 +- },
  1236 + labelPosition:'left',
  1237 +- currentPage: 4,
  1238 ++ currentPage: 1,
  1239 ++ pageSize:10,
  1240 ++ total:0,
  1241 ++ tableloading:false,
  1242 + tableData:[]
  1243 + }
  1244 + },
  1245 + methods: {
  1246 ++ //分页
  1247 + handleSizeChange(val) {
  1248 +- console.log(`每页 ${val} 条`);
  1249 ++ this.pageSize=val;
  1250 + },
  1251 + handleCurrentChange(val) {
  1252 +- console.log(`当前页: ${val}`);
  1253 +- }
  1254 ++ this.currentPage=val;
  1255 ++ this.submitForm();
  1256 ++ },
  1257 ++ //获取进港确报查询列表
  1258 ++ submitForm() {
  1259 ++ let params = {
  1260 ++ currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryConfirmatory.flightNo,
  1261 ++ flightDate: this.queryConfirmatory.flightDate
  1262 ++ };
  1263 ++ this.tableloading = true;
  1264 ++ selectConfirm(params).then(res => {
  1265 ++ let response = res.data.data;
  1266 ++ this.tableData = response.list;
  1267 ++ this.tableloading = false;
  1268 ++ this.total = response.total;
  1269 ++ });
  1270 ++ },
  1271 ++ //列表删除功能
  1272 ++ handleDel(index, row) {
  1273 ++ this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
  1274 ++ confirmButtonText: '确定',
  1275 ++ cancelButtonText: '取消',
  1276 ++ type: 'warning'
  1277 ++ }).then(() => {
  1278 ++ editConfirm(row).then(res => {
  1279 ++ let response = res.data;
  1280 ++ if (response.code == '200') {
  1281 ++ this.$message({
  1282 ++ type: 'info',
  1283 ++ message: '删除成功'
  1284 ++ });
  1285 ++ this.submitForm();
  1286 ++ } else {
  1287 ++ this.$message({
  1288 ++ type: 'info',
  1289 ++ message: '删除失败'
  1290 ++ });
  1291 ++ }
  1292 ++ });
  1293 ++ }).catch(() => {
  1294 ++ this.$message({
  1295 ++ type: 'info',
  1296 ++ message: '已取消删除'
  1297 ++ });
  1298 ++ });
  1299 ++ },
  1300 ++ //获取默认值
  1301 ++ defaultData() {
  1302 ++ this.flightNo = JSON.parse(this.$route.query.flightNo);
  1303 ++ },
  1304 ++ //编辑进港确报
  1305 ++ handleEdit(index,row){
  1306 ++ this.$router.push({path:'/confirmatory',query: row})
  1307 ++ },
  1308 + },
  1309 ++ //渲染方法
  1310 ++ mounted(){
  1311 ++ this.defaultData();
  1312 ++ this.submitForm();
  1313 ++ }
  1314 + }
  1315 + </script>
  1316 +\ No newline at end of file
  1317 +Index: src/views/airtransport/queryRouteaircraft.vue
  1318 +IDEA additional info:
  1319 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  1320 +<+>UTF-8
  1321 +===================================================================
  1322 +--- src/views/airtransport/queryRouteaircraft.vue (revision 6b552697d551139b5ea2935024146065781f309f)
  1323 ++++ src/views/airtransport/queryRouteaircraft.vue (date 1592466018902)
  1324 +@@ -8,7 +8,7 @@
  1325 + </el-row>
  1326 + <!-- 搜索区域-->
  1327 + <el-row>
  1328 +- <el-form :label-position="labelPosition" :model="queryRouteaircraft" :rules="rules" ref="queryRouteaircraft"
  1329 ++ <el-form :label-position="labelPosition" :model="queryRouteaircraft" ref="queryRouteaircraft"
  1330 + label-width="130px" class="demo-ruleForm">
  1331 + <el-col :span="8">
  1332 + <el-form-item label="航空器所有人代码:" prop="airwayCode" label-width="130px">
  1333 +@@ -45,60 +45,50 @@
  1334 + </el-table-column>
  1335 + <el-table-column
  1336 + prop=ownerCo"
  1337 +- label="航空器所有人代码"
  1338 +- width="120">
  1339 ++ label="航空器所有人代码">
  1340 + </el-table-column>
  1341 + <el-table-column
  1342 + prop="airwayNameEn"
  1343 +- label="所有人英文名称"
  1344 +- width="120">
  1345 ++ label="所有人英文名称">
  1346 + </el-table-column>
  1347 + <el-table-column
  1348 + prop="airwayNameCn"
  1349 +- label="所有人中文名称"
  1350 +- width="150">
  1351 ++ label="所有人中文名称">
  1352 + </el-table-column>
  1353 + <el-table-column
  1354 + prop="aircraftNo"
  1355 +- label="航空器注册编号"
  1356 +- width="120">
  1357 ++ label="航空器注册编号">
  1358 + </el-table-column>
  1359 + <el-table-column
  1360 + prop="certNo"
  1361 +- label="国际证书编号"
  1362 +- width="120">
  1363 ++ label="国际证书编号">
  1364 + </el-table-column>
  1365 + <el-table-column
  1366 + prop="owner"
  1367 +- label="航空器所有人"
  1368 +- width="120">
  1369 ++ label="航空器所有人">
  1370 + </el-table-column>
  1371 + <el-table-column
  1372 + prop="areoNationality"
  1373 +- label="国籍"
  1374 +- width="80">
  1375 ++ label="国籍">
  1376 + </el-table-column>
  1377 + <el-table-column
  1378 + prop="areoModel"
  1379 +- label="机型"
  1380 +- width="80">
  1381 ++ label="机型">
  1382 + </el-table-column>
  1383 + <el-table-column
  1384 + prop="deliverDate"
  1385 +- label="交付日期"
  1386 +- width="120">
  1387 ++ label="交付日期">
  1388 + </el-table-column>
  1389 + <el-table-column
  1390 + prop="statusMsg"
  1391 +- label="海关回执"
  1392 +- width="120">
  1393 ++ label="海关回执">
  1394 + </el-table-column>
  1395 + <el-table-column
  1396 + prop="supervisoryProperty"
  1397 +- label="所有权监管"
  1398 +- width="120">
  1399 ++ label="所有权监管">
  1400 + </el-table-column>
  1401 + <el-table-column
  1402 ++ fixed="right"
  1403 + prop=""
  1404 + label="报文操作"
  1405 + width="150">
  1406 +@@ -235,7 +225,7 @@
  1407 + this.defaultData();
  1408 + this.submitForm();
  1409 + }
  1410 +- }
  1411 ++ },
  1412 +
  1413 + }
  1414 + </script>
  1415 +Index: src/api/transport.js
  1416 +IDEA additional info:
  1417 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  1418 +<+>UTF-8
  1419 +===================================================================
  1420 +--- src/api/transport.js (revision 6b552697d551139b5ea2935024146065781f309f)
  1421 ++++ src/api/transport.js (date 1592362588742)
  1422 +@@ -94,9 +94,12 @@
  1423 + //查询列表
  1424 + export const selectSchedule=params=>{return http.get(`${baseUrlSchedule}/selectSchedule`, params);};
  1425 +
  1426 ++
  1427 ++
  1428 + //查询长期计划查询列表
  1429 + export const selectLongTimePlan=params=>{return http.get(`${baseUrlLongtimeplan}/selectLongTimePlan`, params);};
  1430 +
  1431 ++
  1432 + //机组人员
  1433 + //新增方法
  1434 + export const addBillPerson = params => { return http.post(`${baseUrlBillperson}/addBillPerson`, params); };
  1435 +Index: src/views/airtransport/queryFlightplan.vue
  1436 +IDEA additional info:
  1437 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  1438 +<+>UTF-8
  1439 +===================================================================
  1440 +--- src/views/airtransport/queryFlightplan.vue (revision 6b552697d551139b5ea2935024146065781f309f)
  1441 ++++ src/views/airtransport/queryFlightplan.vue (date 1592464640954)
  1442 +@@ -8,7 +8,7 @@
  1443 + </el-row>
  1444 + <!-- 搜索区域-->
  1445 + <el-row>
  1446 +- <el-form :label-position="labelPosition" :model="queryFlightplan" :rules="rules" ref="queryFlightplan"
  1447 ++ <el-form :label-position="labelPosition" :model="queryFlightplan" ref="queryFlightplan"
  1448 + label-width="130px" class="demo-ruleForm">
  1449 + <el-col :span="6" >
  1450 + <el-form-item label="承运人:" prop="awcd" label-width="110px">
  1451 +@@ -56,60 +56,52 @@
  1452 + </el-table-column>
  1453 + <el-table-column
  1454 + prop="flightNo"
  1455 +- label="航班号"
  1456 +- width="80">
  1457 ++ label="航班号">
  1458 + </el-table-column>
  1459 + <el-table-column
  1460 + prop="flightDate"
  1461 +- label="航班日期"
  1462 +- width="150">
  1463 ++ label="航班日期">
  1464 + </el-table-column>
  1465 + <el-table-column
  1466 + prop="departurePort"
  1467 +- label="出发港"
  1468 +- width="80">
  1469 ++ label="出发港">
  1470 + </el-table-column>
  1471 + <el-table-column
  1472 + prop="departureCustomNo"
  1473 +- label="关区代码"
  1474 +- width="80">
  1475 ++ label="关区代码">
  1476 + </el-table-column>
  1477 + <el-table-column
  1478 + prop="arrivalPort"
  1479 +- label="目的港"
  1480 +- width="80">
  1481 ++ label="目的港">
  1482 + </el-table-column>
  1483 + <el-table-column
  1484 + prop="arrivalCustomNo"
  1485 +- label="关区代码"
  1486 +- width="80">
  1487 ++ label="关区代码">
  1488 + </el-table-column>
  1489 + <el-table-column
  1490 + prop="currentTakeoffTime"
  1491 + label="离港时间"
  1492 +- width="150">
  1493 ++ width="120">
  1494 + </el-table-column>
  1495 + <el-table-column
  1496 + prop="currentLandingTime"
  1497 + label="抵港时间"
  1498 +- width="150">
  1499 ++ width="120">
  1500 + </el-table-column>
  1501 + <el-table-column
  1502 + prop="transportflag"
  1503 +- label="进出港"
  1504 +- width="80">
  1505 ++ label="进出港">
  1506 + </el-table-column>
  1507 + <el-table-column
  1508 + prop="linesType"
  1509 +- label="执行任务类型"
  1510 +- width="150">
  1511 ++ label="执行任务类型">
  1512 + </el-table-column>
  1513 + <el-table-column
  1514 + prop="statusMsg"
  1515 +- label="海关回执"
  1516 +- width="150">
  1517 ++ label="海关回执">
  1518 + </el-table-column>
  1519 + <el-table-column
  1520 ++ fixed="right"
  1521 + prop=""
  1522 + label="报文操作"
  1523 + width="150">
  1524 +@@ -172,7 +164,6 @@
  1525 + flightDate:undefined,
  1526 + aircraftNo:undefined,
  1527 + },
  1528 +- rules:{},
  1529 + labelPosition:'left',
  1530 + currentPage: 1,
  1531 + pageSize:10,
  1532 +Index: src/views/airtransport/queryRoute.vue
  1533 +IDEA additional info:
  1534 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  1535 +<+>UTF-8
  1536 +===================================================================
  1537 +--- src/views/airtransport/queryRoute.vue (revision 6b552697d551139b5ea2935024146065781f309f)
  1538 ++++ src/views/airtransport/queryRoute.vue (date 1592461576457)
  1539 +@@ -27,8 +27,7 @@
  1540 + style="width:100%;margin-bottom: 10px">
  1541 + <el-table-column
  1542 + fixed="left"
  1543 +- label="操作"
  1544 +- width="100">
  1545 ++ label="操作">
  1546 + <template slot-scope="scope">
  1547 + <el-button
  1548 + size="mini"
  1549 +@@ -38,59 +37,53 @@
  1550 + </el-table-column>
  1551 + <el-table-column
  1552 + prop="serialNo"
  1553 +- label="航线序号"
  1554 +- width="80">
  1555 ++ label="航线序号">
  1556 + </el-table-column>
  1557 + <el-table-column
  1558 + prop="departurePort"
  1559 +- label="出发港"
  1560 +- width="80">
  1561 ++ label="出发港">
  1562 + </el-table-column>
  1563 + <el-table-column
  1564 + prop="departureCustomNo"
  1565 + label="出发港关区代码"
  1566 +- width="150">
  1567 ++ width="120">
  1568 + </el-table-column>
  1569 + <el-table-column
  1570 + prop="arrivalPort"
  1571 +- label="目的港"
  1572 +- width="80">
  1573 ++ label="目的港">
  1574 + </el-table-column>
  1575 + <el-table-column
  1576 + prop="arrivalCustomNo"
  1577 + label="目的港关区代码"
  1578 +- width="150">
  1579 ++ width="120">
  1580 + </el-table-column>
  1581 + <el-table-column
  1582 + prop="std"
  1583 +- label="长期离港时间"
  1584 +- width="150">
  1585 ++ label="长期离港时间">
  1586 + </el-table-column>
  1587 + <el-table-column
  1588 + prop="sta"
  1589 +- label="长期抵港时间"
  1590 +- width="150">
  1591 ++ label="长期抵港时间">
  1592 + </el-table-column>
  1593 + <el-table-column
  1594 + prop="effStartdate"
  1595 + label="有效期起始时间"
  1596 +- width="150">
  1597 ++ width="120">
  1598 + </el-table-column>
  1599 + <el-table-column
  1600 + prop="effEnddate"
  1601 + label="有效期结束时间"
  1602 +- width="150">
  1603 ++ width="120">
  1604 + </el-table-column>
  1605 + <el-table-column
  1606 + prop="plan"
  1607 +- label="每周执行情况"
  1608 +- width="150">
  1609 ++ label="每周执行情况">
  1610 + </el-table-column>
  1611 + <el-table-column
  1612 +-
  1613 ++ fixed="right"
  1614 + prop="remark"
  1615 + label="报文操作"
  1616 +- width="250">
  1617 ++ width="200">
  1618 + <template slot-scope="scope">
  1619 + <el-button
  1620 + size="mini"
  1621 +@@ -182,7 +175,6 @@
  1622 + //获取默认值
  1623 + defaultData(){
  1624 + let ob=Object.assign(this.queryRoute, this.$route.query);
  1625 +-
  1626 + },
  1627 + //列表删除功能
  1628 + handleDelete(index,row){
  1629 +Index: src/views/airtransport/aircraft.vue
  1630 +IDEA additional info:
  1631 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  1632 +<+>UTF-8
  1633 +===================================================================
  1634 +--- src/views/airtransport/aircraft.vue (revision 6b552697d551139b5ea2935024146065781f309f)
  1635 ++++ src/views/airtransport/aircraft.vue (date 1592465449586)
  1636 +@@ -210,6 +210,7 @@
  1637 + ],
  1638 + },
  1639 + centerDialogVisible:false,
  1640 ++ msg:undefined
  1641 + }
  1642 + },
  1643 + methods:{
  1644 +Index: src/views/airtransport/routeaircraft.vue
  1645 +IDEA additional info:
  1646 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  1647 +<+>UTF-8
  1648 +===================================================================
  1649 +--- src/views/airtransport/routeaircraft.vue (revision 6b552697d551139b5ea2935024146065781f309f)
  1650 ++++ src/views/airtransport/routeaircraft.vue (date 1592467020642)
  1651 +@@ -134,7 +134,7 @@
  1652 + .el-col{margin-right: 0px;}
  1653 + </style>
  1654 + <script>
  1655 +- import {addFlightPlan} from "../../api/transport";
  1656 ++ import {addAirLineAircraft} from "../../api/transport";
  1657 +
  1658 + export default {
  1659 + data(){
  1660 +@@ -210,6 +210,7 @@
  1661 + ],
  1662 + },
  1663 + centerDialogVisible:false,
  1664 ++ msg:undefined
  1665 + }
  1666 + },
  1667 + methods:{
  1668 +@@ -217,12 +218,12 @@
  1669 + submitForm(formName) {
  1670 + this.$refs[formName].validate((valid) => {
  1671 + if (valid) {
  1672 +- addFlightPlan(this.aircraft).then(res=>{
  1673 ++ addAirLineAircraft(this.aircraft).then(res=>{
  1674 + let response=res.data;
  1675 + if(response.code=='200'){
  1676 + this.centerDialogVisible=true;
  1677 + this.msg=response.msg;
  1678 +- this.$router.push({path:'/queryRouteaircraft',query:{airwayCode:JSON.stringify(this.aircraft.airwayCode)},});
  1679 ++ this.$router.push({path:'/queryRouteaircraft',query:{airwayCode:JSON.stringify(this.aircraft.airwayCode),aircraftNo:JSON.stringify(this.aircraft.aircraftNo)},});
  1680 + }else{
  1681 + this.msg=response.msg;
  1682 + }
  1683 +@@ -236,7 +237,7 @@
  1684 + //加载默认值
  1685 + defaultData(){
  1686 + if(this.$route.query!=null){
  1687 +- let ob=Object.assign(this.airwayCode, this.$route.query);
  1688 ++ let ob=Object.assign(this.aircraft, this.$route.query);
  1689 + }
  1690 + },
  1691 + },
  1692 +Index: src/views/airtransport/route.vue
  1693 +IDEA additional info:
  1694 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  1695 +<+>UTF-8
  1696 +===================================================================
  1697 +--- src/views/airtransport/route.vue (revision 6b552697d551139b5ea2935024146065781f309f)
  1698 ++++ src/views/airtransport/route.vue (date 1592376292274)
  1699 +@@ -22,7 +22,7 @@
  1700 + </el-col>
  1701 + <el-col :span="6">
  1702 + <el-form-item label="目的港" prop="arrivalPort" label-width="120px">
  1703 +- <el-input @input="e => airline.arrivalPort=inputMe(e)" v-model="airline.arrivalPort"
  1704 ++ <el-input v-model="airline.arrivalPort" @input="e => airline.arrivalPort=inputMe(e)"
  1705 + maxLength='3'></el-input>
  1706 + </el-form-item>
  1707 + </el-col>
  1708 +@@ -317,7 +317,7 @@
  1709 + },
  1710 + handleCurrentChange(val) {
  1711 + this.currentPage=val;
  1712 +- this.selectLongtimeplan();
  1713 ++ this.submitForm();
  1714 + },
  1715 + //长期飞行计划选择功能
  1716 + handleEdit(index,row){
  1717 +Index: src/views/airtransport/queryAircraft.vue
  1718 +IDEA additional info:
  1719 +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  1720 +<+>UTF-8
  1721 +===================================================================
  1722 +--- src/views/airtransport/queryAircraft.vue (revision 6b552697d551139b5ea2935024146065781f309f)
  1723 ++++ src/views/airtransport/queryAircraft.vue (date 1592214204577)
  1724 +@@ -45,43 +45,35 @@
  1725 + </el-table-column>
  1726 + <el-table-column
  1727 + prop=airwayCode"
  1728 +- label="航空器所有人代码"
  1729 +- width="120">
  1730 ++ label="航空器所有人代码">
  1731 + </el-table-column>
  1732 + <el-table-column
  1733 + prop="airwayNameEn"
  1734 +- label="所有人英文名称"
  1735 +- width="120">
  1736 ++ label="所有人英文名称">
  1737 + </el-table-column>
  1738 + <el-table-column
  1739 + prop="airwayNameCn"
  1740 +- label="所有人中文名称"
  1741 +- width="150">
  1742 ++ label="所有人中文名称">
  1743 + </el-table-column>
  1744 + <el-table-column
  1745 + prop="aircraftNo"
  1746 +- label="航空器注册编号"
  1747 +- width="120">
  1748 ++ label="航空器注册编号">
  1749 + </el-table-column>
  1750 + <el-table-column
  1751 + prop="certNo"
  1752 +- label="国际证书编号"
  1753 +- width="120">
  1754 ++ label="国际证书编号">
  1755 + </el-table-column>
  1756 + <el-table-column
  1757 + prop="ownerCo"
  1758 +- label="航空器所有人"
  1759 +- width="120">
  1760 ++ label="航空器所有人">
  1761 + </el-table-column>
  1762 + <el-table-column
  1763 + prop="areoNationality"
  1764 +- label="国籍"
  1765 +- width="80">
  1766 ++ label="国籍">
  1767 + </el-table-column>
  1768 + <el-table-column
  1769 + prop="areoModel"
  1770 +- label="机型"
  1771 +- width="80">
  1772 ++ label="机型">
  1773 + </el-table-column>
  1774 + <el-table-column
  1775 + prop="deliverDate"
  1776 +@@ -90,10 +82,10 @@
  1777 + </el-table-column>
  1778 + <el-table-column
  1779 + prop="statusMsg"
  1780 +- label="海关回执"
  1781 +- width="120">
  1782 ++ label="海关回执">
  1783 + </el-table-column>
  1784 + <el-table-column
  1785 ++ fixed="right"
  1786 + prop=""
  1787 + label="报文操作"
  1788 + width="150">