朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 0a2fbc553cf9b0a8c008251292c4fd5c75057eb3 1 个父辈 d2621378

优化预配舱单界面 添加货主信息管理

内嵌 并排对比
正在显示 5 个修改的文件 包含 1437 行增加 和 363 行删除
  1 +import http from '../http.js'
  2 +import axios from "axios";
  3 +
  4 +let baseUrl = 'nmms-server-export/shipper'
  5 +
  6 +export const getList = params => { return http.get(`${baseUrl}/list`, params)};
  7 +
  8 +export const getListHzTypeList = params => { return http.get(`${baseUrl}/getListHzTypeList`, params)};
  9 +// export const getListHzTypeList = params => { return http.get(`http://127.0.0.1:8008/shipper/getListHzTypeList`, params)};
  10 +
  11 +export const remove = params => { return axios.delete(`${baseUrl}/remove`, { params: params }); };
  12 +
  13 +export const batchRemove = params => { return axios.delete(`${baseUrl}/batchRemove`, { params: params }); };
  14 +
  15 +export const edit = params => { return http.put(`${baseUrl}/edit`, params)};
  16 +
  17 +export const add = params => { return http.post(`${baseUrl}/add`,params)};
  18 +
  19 +// export const getList = params => { return http.get(`http://127.0.0.1:8008/shipper/list`, params)};
  20 +//
  21 +// export const getListHzTypeList = params => { return http.get(`http://127.0.0.1:8008/shipper/getListHzTypeList`, params)};
  22 +//
  23 +// export const remove = params => { return axios.delete(`http://127.0.0.1:8008/shipper/remove`, { params: params }); };
  24 +//
  25 +// export const batchRemove = params => { return axios.delete(`http://127.0.0.1:8008/shipper/batchRemove`, { params: params }); };
  26 +//
  27 +// export const edit = params => { return http.put(`http://127.0.0.1:8008/shipper/edit`, params)};
  28 +//
  29 +// export const add = params => { return http.post(`http://127.0.0.1:8008/shipper/add`,params)};
  30 +
  31 +
@@ -98,6 +98,8 @@ import outConfigure from './views/airtransport/outConfigure.vue' @@ -98,6 +98,8 @@ import outConfigure from './views/airtransport/outConfigure.vue'
98 import queryFlightConfigure from './views/airtransport/queryFlightConfigure.vue' 98 import queryFlightConfigure from './views/airtransport/queryFlightConfigure.vue'
99 import Consigner from './views/consigner/consigner.vue' 99 import Consigner from './views/consigner/consigner.vue'
100 import Consignee from './views/consigner/consignee.vue' 100 import Consignee from './views/consigner/consignee.vue'
  101 +// 货主信息管理
  102 +import Shipper from './views/shipper/shipper.vue'
101 import Security from './views/security/security.vue' 103 import Security from './views/security/security.vue'
102 import dynamics from './views/airtransport/dynamics.vue' 104 import dynamics from './views/airtransport/dynamics.vue'
103 105
@@ -415,6 +417,15 @@ let routes = [ @@ -415,6 +417,15 @@ let routes = [
415 ] 417 ]
416 }, 418 },
417 { 419 {
  420 + path: '/shipper',
  421 + component: Home,
  422 + name: '货主信息管理',
  423 + iconCls:'el-icon-setting',
  424 + children:[
  425 + {path:'/shipper',component:Shipper,name:'货主信息管理'},
  426 + ]
  427 + },
  428 + {
418 path: '/', 429 path: '/',
419 component: HomeNew, 430 component: HomeNew,
420 name: '转关运抵', 431 name: '转关运抵',
@@ -196,7 +196,7 @@ @@ -196,7 +196,7 @@
196 this.$router.push({name: '出港运抵', params: {flightData: this.flight}}) 196 this.$router.push({name: '出港运抵', params: {flightData: this.flight}})
197 } 197 }
198 if (this.flight.messageType === "MT2201") { 198 if (this.flight.messageType === "MT2201") {
199 - this.$router.push({name: '出港预配舱单', params: {flightData: this.flight}}) 199 + this.$router.push({name: '国内出港预配舱单', params: {flightData: this.flight}})
200 } 200 }
201 } else { 201 } else {
202 Message.warning("请将航班信息填写完整") 202 Message.warning("请将航班信息填写完整")
@@ -72,10 +72,12 @@ @@ -72,10 +72,12 @@
72 :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> 72 :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
73 <el-table-column type="selection" width="55"> 73 <el-table-column type="selection" width="55">
74 </el-table-column> 74 </el-table-column>
75 - <el-table-column label="运单号" width="200" align="center"> 75 + <el-table-column label="运单号" width="130" align="center">
76 <template slot-scope="scope"> 76 <template slot-scope="scope">
77 - <span class="tableInline" v-if="scope.row.awbh !==''">{{scope.row.awbh}}</span>  
78 - <span class="tableInline" v-else>{{scope.row.awba}}</span> 77 + <!-- <span class="tableInline" v-if="scope.row.awbh !==''">{{scope.row.awbh}}</span>-->
  78 + <!-- <span class="tableInline" v-else>{{scope.row.awba}}</span>-->
  79 + <a type="text" style="color: #409eff;text-decoration: underline" class="tableInline" @click="handleEdit(scope.row)" v-if="scope.row.awbh !==''">{{scope.row.awbh}}</a>
  80 + <a type="text" style="color: #409eff;text-decoration: underline" class="tableInline" @click="handleEdit(scope.row)" v-else>{{scope.row.awba}}</a>
79 </template> 81 </template>
80 </el-table-column> 82 </el-table-column>
81 <el-table-column label="运单件数/重量" width="100" align="center"> 83 <el-table-column label="运单件数/重量" width="100" align="center">
@@ -93,7 +95,7 @@ @@ -93,7 +95,7 @@
93 {{scope.row.goodsname}} 95 {{scope.row.goodsname}}
94 </template> 96 </template>
95 </el-table-column> 97 </el-table-column>
96 - <el-table-column label="配载时间" width="140" align="center"> 98 + <el-table-column label="配载时间" width="150" align="center">
97 <template slot-scope="scope"> 99 <template slot-scope="scope">
98 {{scope.row.actime}} 100 {{scope.row.actime}}
99 </template> 101 </template>
@@ -131,18 +133,21 @@ @@ -131,18 +133,21 @@
131 <template slot-scope="scope" > 133 <template slot-scope="scope" >
132 <el-row> 134 <el-row>
133 <el-col :span="5" style="margin-right: 10px"> 135 <el-col :span="5" style="margin-right: 10px">
134 - <el-button type="warning" icon="el-icon-view" size="mini" @click="handleSend(scope.row)">收发明细</el-button> 136 + <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
135 </el-col> 137 </el-col>
136 - <el-col :span="4" style="margin-right: 30px">  
137 - <el-button type="primary" icon="el-icon-edit" style="width: 100px" size="mini" @click="handleEdit(scope.row)" >编辑</el-button> 138 + <el-col :span="5" style="margin-right: 10px">
  139 + <el-button type="warning" icon="el-icon-view" size="mini" @click="handleSend(scope.row)">收发明细</el-button>
138 </el-col> 140 </el-col>
  141 +<!-- <el-col :span="4" style="margin-right: 30px">-->
  142 +<!-- <el-button type="primary" icon="el-icon-edit" style="width: 100px" size="mini" @click="handleEdit(scope.row)" >编辑</el-button>-->
  143 +<!-- </el-col>-->
139 <el-col :span="5" style="margin-right: 10px"> 144 <el-col :span="5" style="margin-right: 10px">
140 - <el-button type="info" icon="el-icon-edit" size="mini" @click="handleAwbStatus(scope.row)" 145 + <el-button type="info" icon="el-icon-edit" size="mini" @click="handleAwbStatus(scope.row)"
141 :disabled="scope.row.status === '22'">更改状态 146 :disabled="scope.row.status === '22'">更改状态
142 </el-button> 147 </el-button>
143 </el-col> 148 </el-col>
144 - <el-col :span="5">  
145 - <el-button type="success" icon="el-icon-plus" size="mini" v-if="scope.row.awbh ===''" 149 + <el-col :span="5" style="margin-right: 10px">
  150 + <el-button type="success" icon="el-icon-plus" size="mini" v-if="scope.row.awbh ===''"
146 @click="handleAddAwbh(scope.row)">新增分单 151 @click="handleAddAwbh(scope.row)">新增分单
147 </el-button> 152 </el-button>
148 </el-col> 153 </el-col>
@@ -156,7 +161,6 @@ @@ -156,7 +161,6 @@
156 <el-col :span="7" style="margin-right: 10px"> 161 <el-col :span="7" style="margin-right: 10px">
157 <el-button type="primary" icon="el-icon-plus" size="mini" style="width: 130px" @click="handleAwbEdit(scope.row)" 162 <el-button type="primary" icon="el-icon-plus" size="mini" style="width: 130px" @click="handleAwbEdit(scope.row)"
158 :disabled="editStatus(scope.row.status)">发送预配修改报</el-button> 163 :disabled="editStatus(scope.row.status)">发送预配修改报</el-button>
159 - <!-- <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>-->  
160 </el-col> 164 </el-col>
161 <el-col :span="7"> 165 <el-col :span="7">
162 <el-button type="danger" icon="el-icon-delete" size="mini" style="width: 130px;margin-bottom: 10px" @click="handleSendDelete(scope.row)" 166 <el-button type="danger" icon="el-icon-delete" size="mini" style="width: 130px;margin-bottom: 10px" @click="handleSendDelete(scope.row)"
@@ -167,9 +171,10 @@ @@ -167,9 +171,10 @@
167 </template> 171 </template>
168 </el-table-column> 172 </el-table-column>
169 </el-table> 173 </el-table>
  174 +
170 <div class="btnFoot"> 175 <div class="btnFoot">
171 <el-row> 176 <el-row>
172 - <el-button type="primary" size="mini" v-if="preQuery.flightno !== undefined | preData.length > 0" 177 + <el-button type="primary" size="mini" v-if="preQuery.flightno !== undefined | preData.length >0"
173 @click="handleAddpreInfo">新增预配舱单 178 @click="handleAddpreInfo">新增预配舱单
174 </el-button> 179 </el-button>
175 <el-button type="primary" size="mini" @click="handelBackStep" 180 <el-button type="primary" size="mini" @click="handelBackStep"
@@ -181,81 +186,607 @@ @@ -181,81 +186,607 @@
181 <pagination background layout="total, prev, pager, next" v-show="total>0" :total="total" :page.sync="preQuery.pageSize" :limit.sync="preQuery.limitSize" 186 <pagination background layout="total, prev, pager, next" v-show="total>0" :total="total" :page.sync="preQuery.pageSize" :limit.sync="preQuery.limitSize"
182 @pagination="getList"/> 187 @pagination="getList"/>
183 188
  189 +<!-- <el-dialog top="5vh" :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible" width="90%">-->
  190 +<!-- <el-form ref="preFormData" :model="preModel" :rules="preRoles" label-position="right"-->
  191 +<!-- label-width="80px" size="mini" class="el-dialog-div">-->
  192 +<!-- <div class="grid-content content" style="font-size: 10px">-->
  193 +<!-- 运单信息-->
  194 +<!-- </div>-->
  195 +<!-- <el-row>-->
  196 +<!-- <el-col :span="7.5">-->
  197 +<!-- <el-form-item label="" prop="awba">-->
  198 +<!-- <el-input :disabled="dialogStatus !== 'create'" v-model="awba" clearable>-->
  199 +<!-- <template slot="prepend" >主单号</template>-->
  200 +<!-- </el-input>-->
  201 +<!-- </el-form-item>-->
  202 +<!-- </el-col>-->
  203 +<!-- <el-col :span="7.5" v-if="fenStatus === 'addAwbh'">-->
  204 +<!-- <el-form-item label="" prop="awbh">-->
  205 +<!-- <el-input v-model="awbh" clearable>-->
  206 +<!-- <template slot="prepend" >分单号</template>-->
  207 +<!-- </el-input>-->
  208 +<!-- </el-form-item>-->
  209 +<!-- </el-col>-->
  210 +<!-- </el-row>-->
  211 +<!-- <div class="grid-content content" style="font-size: 10px">-->
  212 +<!-- 航班信息-->
  213 +<!-- </div>-->
  214 +<!-- <el-row>-->
  215 +<!-- <el-col :span="7.5">-->
  216 +<!-- <el-form-item label="" prop="carrier">-->
  217 +<!-- <el-input v-model="carrier" :disabled="fenStatus === 'addAwbh'" clearable>-->
  218 +<!-- <template slot="prepend" >承运人</template>-->
  219 +<!-- </el-input>-->
  220 +<!-- </el-form-item>-->
  221 +<!-- </el-col>-->
  222 +<!-- <el-col :span="7.5">-->
  223 +<!-- <el-form-item label="" prop="flightno">-->
  224 +<!-- <el-input v-model="flightno" :disabled="fenStatus === 'addAwbh'" clearable>-->
  225 +<!-- <template slot="prepend" >航班号</template>-->
  226 +<!-- </el-input>-->
  227 +<!-- </el-form-item>-->
  228 +<!-- </el-col>-->
  229 +<!-- <el-col :span="7.5">-->
  230 +<!-- <el-form-item label="" prop="flightdate">-->
  231 +<!-- <el-date-picker :disabled="fenStatus === 'addAwbh'"-->
  232 +<!-- value-format="yyyy-MM-dd" style="width: 270px"-->
  233 +<!-- v-model="preModel.flightdate" align="right"-->
  234 +<!-- type="date" placeholder="请输入航班日期" clearable/>-->
  235 +<!-- </el-form-item>-->
  236 +<!-- </el-col>-->
  237 +<!-- <el-col :span="7.5">-->
  238 +<!-- <el-form-item label="" prop="originstation">-->
  239 +<!-- <el-select-->
  240 +<!-- filterable-->
  241 +<!-- clearable-->
  242 +<!-- placeholder="请选择起始站"-->
  243 +<!-- :remote-method="remoteMethodAirport"-->
  244 +<!-- allow-create remote-->
  245 +<!-- v-model="originstation"-->
  246 +<!-- :loading="airportLoading"-->
  247 +<!-- style="width: 270px">-->
  248 +<!-- <el-option v-for="item in airportCode"-->
  249 +<!-- :key="item.airportid" :label="item.airportid"-->
  250 +<!-- :value="item.airportid" :disabled="fenStatus === 'addAwbh'">-->
  251 +<!-- <span style="float: left">{{ item.airportdescchn }}</span>-->
  252 +<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportid }}</span>-->
  253 +<!-- </el-option>-->
  254 +<!-- </el-select>-->
  255 +<!-- </el-form-item>-->
  256 +<!-- </el-col>-->
  257 +<!-- <el-col :span="7.5">-->
  258 +<!-- <el-form-item label="" prop="destinationstation">-->
  259 +<!-- <el-select filterable clearable placeholder="请选择目的站" allow-create remote-->
  260 +<!-- v-model="destinationstation" :remote-method="remoteMethodAirport" style="width: 270px">-->
  261 +<!-- <el-option v-for="item in airportCode"-->
  262 +<!-- :key="item.airportid" :label="item.airportid"-->
  263 +<!-- :value="item.airportid" :disabled="fenStatus === 'addAwbh'" >-->
  264 +<!-- <span style="float: left">{{ item.airportdescchn }}</span>-->
  265 +<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportid }}</span>-->
  266 +<!-- </el-option>-->
  267 +<!-- </el-select>-->
  268 +<!-- </el-form-item>-->
  269 +<!-- </el-col>-->
  270 +<!-- </el-row>-->
  271 +<!-- <div class="grid-content content" style="font-size: 10px">-->
  272 +<!-- 航程信息-->
  273 +<!-- </div>-->
  274 +<!-- <div>-->
  275 +<!-- <el-row>-->
  276 +<!-- <el-col :span="5">-->
  277 +<!-- <el-form-item label="" prop="carrier">-->
  278 +<!-- <el-input v-model="carrier" disabled clearable>-->
  279 +<!-- <template slot="prepend" >承运人</template>-->
  280 +<!-- </el-input>-->
  281 +<!-- </el-form-item>-->
  282 +<!-- </el-col>-->
  283 +<!-- <el-col :span="5">-->
  284 +<!-- <el-form-item label="" prop="destinationstation">-->
  285 +<!-- <el-input v-model="destinationstation" disabled clearable>-->
  286 +<!-- <template slot="prepend" >到达航站</template>-->
  287 +<!-- </el-input>-->
  288 +<!-- </el-form-item>-->
  289 +<!-- </el-col>-->
  290 +<!-- <el-col :span="5">-->
  291 +<!-- <el-form-item label="">-->
  292 +<!-- <el-input v-model="by1" clearable>-->
  293 +<!-- <template slot="prepend" >承运人1</template>-->
  294 +<!-- </el-input>-->
  295 +<!-- </el-form-item>-->
  296 +<!-- </el-col>-->
  297 +<!-- <el-col :span="5">-->
  298 +<!-- <el-form-item label="">-->
  299 +<!-- <el-input v-model="dest1" clearable>-->
  300 +<!-- <template slot="prepend" >到达航站1</template>-->
  301 +<!-- </el-input>-->
  302 +<!-- </el-form-item>-->
  303 +<!-- </el-col>-->
  304 +<!-- <el-col :span="5">-->
  305 +<!-- <el-form-item label="">-->
  306 +<!-- <el-input v-model="by2" clearable>-->
  307 +<!-- <template slot="prepend" >承运人2</template>-->
  308 +<!-- </el-input>-->
  309 +<!-- </el-form-item>-->
  310 +<!-- </el-col>-->
  311 +<!-- <el-col :span="5">-->
  312 +<!-- <el-form-item label="">-->
  313 +<!-- <el-input v-model="dest2" clearable>-->
  314 +<!-- <template slot="prepend" >到达航站2</template>-->
  315 +<!-- </el-input>-->
  316 +<!-- </el-form-item>-->
  317 +<!-- </el-col>-->
  318 +<!-- </el-row>-->
  319 +<!-- </div>-->
  320 +<!-- <div class="grid-content content" style="font-size: 10px">-->
  321 +<!-- 货物信息-->
  322 +<!-- </div>-->
  323 +<!-- <el-row>-->
  324 +<!-- <el-col :span="5">-->
  325 +<!-- <el-form-item label="" prop="awbinfo.pcs">-->
  326 +<!-- <el-input v-model="preModel.awbinfo.pcs" clearable>-->
  327 +<!-- <template slot="prepend" >运单件数</template>-->
  328 +<!-- </el-input>-->
  329 +<!-- </el-form-item>-->
  330 +<!-- </el-col>-->
  331 +<!-- <el-col :span="5">-->
  332 +<!-- <el-form-item label="" prop="awbinfo.weight">-->
  333 +<!-- <el-input v-model="preModel.awbinfo.weight" clearable>-->
  334 +<!-- <template slot="prepend" >运单重量</template>-->
  335 +<!-- </el-input>-->
  336 +<!-- </el-form-item>-->
  337 +<!-- </el-col>-->
  338 +<!-- <el-col :span="5">-->
  339 +<!-- <el-form-item label="" prop="goodsname">-->
  340 +<!-- <el-input v-model="goodsname" clearable>-->
  341 +<!-- <template slot="prepend" >货物描述</template>-->
  342 +<!-- </el-input>-->
  343 +<!-- </el-form-item>-->
  344 +<!-- </el-col>-->
  345 +<!-- <el-col :span="5" v-if="fenStatus !=='addAwbh'">-->
  346 +<!-- <el-form-item label="" prop="piece">-->
  347 +<!-- <el-input v-model="preModel.piece" clearable>-->
  348 +<!-- <template slot="prepend" >预配件数</template>-->
  349 +<!-- </el-input>-->
  350 +<!-- </el-form-item>-->
  351 +<!-- </el-col>-->
  352 +<!-- <el-col :span="5" v-if="fenStatus ==='addAwbh'">-->
  353 +<!-- <el-form-item label="" prop="piece">-->
  354 +<!-- <el-input v-model="preModel.piece" clearable>-->
  355 +<!-- <template slot="prepend" >预配件数</template>-->
  356 +<!-- </el-input>-->
  357 +<!-- </el-form-item>-->
  358 +<!-- </el-col>-->
  359 +<!-- <el-col :span="5" v-if="fenStatus !=='addAwbh'">-->
  360 +<!-- <el-form-item label="" prop="weight">-->
  361 +<!-- <el-input v-model="preModel.weight" clearable>-->
  362 +<!-- <template slot="prepend" >预配重量</template>-->
  363 +<!-- </el-input>-->
  364 +<!-- </el-form-item>-->
  365 +<!-- </el-col>-->
  366 +<!-- <el-col :span="5" v-if="fenStatus ==='addAwbh'">-->
  367 +<!-- <el-form-item label="" prop="weight">-->
  368 +<!-- <el-input v-model="preModel.weight" clearable>-->
  369 +<!-- <template slot="prepend" >预配重量</template>-->
  370 +<!-- </el-input>-->
  371 +<!-- </el-form-item>-->
  372 +<!-- </el-col>-->
  373 +<!-- <el-col :span="5">-->
  374 +<!-- <el-form-item label="" prop="actime">-->
  375 +<!-- <el-date-picker value-format="yyyy-MM-dd HH:mm:ss"-->
  376 +<!-- v-model="preModel.actime" align="right" style="width: 180px"-->
  377 +<!-- type="datetime" placeholder="请选择预配时间"/>-->
  378 +<!-- </el-form-item>-->
  379 +<!-- </el-col>-->
  380 +<!-- <el-col :span="5">-->
  381 +<!-- <el-form-item label="" prop="customcode">-->
  382 +<!-- <el-select v-model="preModel.customcode" placeholder="请选择关区代码"-->
  383 +<!-- filterable clearable :remote-method="remoteMethodCustomCode" :loading="customLoading" remote-->
  384 +<!-- :disabled="fenStatus === 'addAwbh'">-->
  385 +<!-- <el-option v-for="item in customCodeList" :key="item.customcode" :label="item.customcode"-->
  386 +<!-- :value="item.customcode">-->
  387 +<!-- <span style="float: left">{{ item.customcode }}</span>-->
  388 +<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.customname }}</span>-->
  389 +<!-- </el-option>-->
  390 +<!-- </el-select>-->
  391 +<!-- </el-form-item>-->
  392 +<!-- </el-col>-->
  393 +<!-- <el-col :span="5">-->
  394 +<!-- <el-form-item label="">-->
  395 +<!-- <el-select v-model="preModel.awbinfo.awbtype" class="filter-item" placeholder="请录入货物类型">-->
  396 +<!-- <el-option v-for="item in customTypes" :key="item.value"-->
  397 +<!-- :label="item.label"-->
  398 +<!-- :value="item.value">-->
  399 +<!-- </el-option>-->
  400 +<!-- </el-select>-->
  401 +<!-- </el-form-item>-->
  402 +<!-- </el-col>-->
  403 +<!-- <el-col :span="5">-->
  404 +<!-- <el-form-item label="" prop="awbinfo.paymodel">-->
  405 +<!-- <el-select v-model="preModel.awbinfo.paymodel" class="filter-item" placeholder="请选择付费方式">-->
  406 +<!-- <el-option-->
  407 +<!-- v-for="item in payTypes"-->
  408 +<!-- :key="item.value"-->
  409 +<!-- :label="item.label"-->
  410 +<!-- :value="item.value">-->
  411 +<!-- </el-option>-->
  412 +<!-- </el-select>-->
  413 +<!-- </el-form-item>-->
  414 +<!-- </el-col>-->
  415 +<!-- <el-col :span="5">-->
  416 +<!-- <el-form-item label="" prop="">-->
  417 +<!-- <el-input v-model="specopeid" clearable>-->
  418 +<!-- <template slot="prepend" >卸货地</template>-->
  419 +<!-- </el-input>-->
  420 +<!-- </el-form-item>-->
  421 +<!-- </el-col>-->
  422 +<!-- <el-col :span="5">-->
  423 +<!-- <el-form-item label="" prop="">-->
  424 +<!-- <el-input v-model="preModel.awbinfo.shpcustomerid" clearable>-->
  425 +<!-- <template slot="prepend" >代理人代码</template>-->
  426 +<!-- </el-input>-->
  427 +<!-- </el-form-item>-->
  428 +<!-- </el-col>-->
  429 +<!-- <el-col :span="5">-->
  430 +<!-- <el-form-item label="" prop="">-->
  431 +<!-- <el-input v-model="preModel.awbinfo.shpcustomerid" clearable>-->
  432 +<!-- <template slot="prepend" >代理人名称</template>-->
  433 +<!-- </el-input>-->
  434 +<!-- </el-form-item>-->
  435 +<!-- </el-col>-->
  436 +<!-- </el-row>-->
  437 +<!-- <el-row style="margin-bottom: 10px">-->
  438 +<!-- <el-col :span="7" v-if="fenStatus ==='addAwbh'">-->
  439 +<!-- <span>-->
  440 +<!-- 货物剩余信息：-->
  441 +<!-- </span>-->
  442 +<!-- </el-col>-->
  443 +<!-- <el-col :span="7" v-if="fenStatus ==='addAwbh'">-->
  444 +<!-- <span>剩余件数:{{awbPiece}}</span>-->
  445 +<!-- </el-col>-->
  446 +<!-- <el-col :span="7" v-if="fenStatus ==='addAwbh'">-->
  447 +<!-- <span>剩余重量:{{awbWeight}}</span>-->
  448 +<!-- </el-col>-->
  449 +<!-- </el-row>-->
  450 +<!-- <div class="grid-content content" style="font-size: 10px">-->
  451 +<!-- 发货人信息-->
  452 +<!-- <el-button type="primary" size="mini" @click="consignerSelect()">选择发货人信息</el-button>-->
  453 +<!-- </div>-->
  454 +<!-- <el-row>-->
  455 +<!-- <el-col :span="5">-->
  456 +<!-- <el-form-item label="" prop="awbinfo.shprname">-->
  457 +<!-- <el-input v-model="shprname" clearable>-->
  458 +<!-- <template slot="prepend" >发货人名称</template>-->
  459 +<!-- </el-input>-->
  460 +<!-- </el-form-item>-->
  461 +<!-- </el-col>-->
  462 +<!-- <el-col :span="5">-->
  463 +<!-- <el-form-item label="" prop="awbinfo.shpraddress">-->
  464 +<!-- <el-input v-model="shpraddress" clearable>-->
  465 +<!-- <template slot="prepend" >地址</template>-->
  466 +<!-- </el-input>-->
  467 +<!-- </el-form-item>-->
  468 +<!-- </el-col>-->
  469 +<!-- <el-col :span="5">-->
  470 +<!-- <el-form-item label="">-->
  471 +<!-- <el-input v-model="scityid" maxlength="5" clearable>-->
  472 +<!-- <template slot="prepend" >城市代码</template>-->
  473 +<!-- </el-input>-->
  474 +<!-- </el-form-item>-->
  475 +<!-- </el-col>-->
  476 +<!-- <el-col :span="5">-->
  477 +<!-- <el-form-item label="">-->
  478 +<!-- <el-input v-model="preModel.awbinfo.shprmobiletype" clearable>-->
  479 +<!-- <template slot="prepend" >传真</template>-->
  480 +<!-- </el-input>-->
  481 +<!-- </el-form-item>-->
  482 +<!-- </el-col>-->
  483 +<!-- <el-col :span="5">-->
  484 +<!-- <el-form-item label="" prop="awbinfo.shprcountyr">-->
  485 +<!-- <el-select-->
  486 +<!-- :remote-method="remoteMethod"-->
  487 +<!-- :loading="listLoading"-->
  488 +<!-- v-model="shprcountyr"-->
  489 +<!-- filterable-->
  490 +<!-- allow-create-->
  491 +<!-- remote-->
  492 +<!-- placeholder="请选择国家代码" clearable>目的站-->
  493 +<!-- <el-option-->
  494 +<!-- v-for="item in countryOption"-->
  495 +<!-- :key="item.value"-->
  496 +<!-- :label="item.value"-->
  497 +<!-- :value="item.value">-->
  498 +<!-- <span style="float: left">{{ item.label }}</span>-->
  499 +<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>-->
  500 +<!-- </el-option>-->
  501 +<!-- </el-select>-->
  502 +<!-- </el-form-item>-->
  503 +<!-- </el-col>-->
  504 +<!-- <el-col :span="7.5">-->
  505 +<!-- <el-form-item label="" prop="awbinfo.shprtel">-->
  506 +<!-- <el-input v-model="preModel.awbinfo.shprtel" clearable>-->
  507 +<!-- <template slot="prepend" >电话</template>-->
  508 +<!-- </el-input>-->
  509 +<!-- </el-form-item>-->
  510 +<!-- </el-col>-->
  511 +
  512 +<!-- <el-col :span="7.5">-->
  513 +<!-- <el-form-item label="" prop="awbinfo.shpaeocode">-->
  514 +<!-- <el-input v-model="shpaeocode" clearable style="width: 270px">-->
  515 +<!-- <template slot="prepend" >发货人AEO编码</template>-->
  516 +<!-- </el-input>-->
  517 +<!-- </el-form-item>-->
  518 +<!-- </el-col>-->
  519 +
  520 +<!-- &lt;!&ndash;<el-col :span="7.5">&ndash;&gt;-->
  521 +<!-- &lt;!&ndash;<el-form-item label="企业代码类型" prop="awbinfo.shpcomidpre">&ndash;&gt;-->
  522 +<!-- &lt;!&ndash;<el-select&ndash;&gt;-->
  523 +<!-- &lt;!&ndash;v-model="shpcomidpre"&ndash;&gt;-->
  524 +<!-- &lt;!&ndash;filterable&ndash;&gt;-->
  525 +<!-- &lt;!&ndash;placeholder="请选择企业代码类型" style="width: 200px;">&ndash;&gt;-->
  526 +<!-- &lt;!&ndash;<el-option&ndash;&gt;-->
  527 +<!-- &lt;!&ndash;v-for="item in shpCompnyTypeOption"&ndash;&gt;-->
  528 +<!-- &lt;!&ndash;:key="item.value"&ndash;&gt;-->
  529 +<!-- &lt;!&ndash;:label="item.label"&ndash;&gt;-->
  530 +<!-- &lt;!&ndash;:value="item.value"/>&ndash;&gt;-->
  531 +<!-- &lt;!&ndash;</el-select>&ndash;&gt;-->
  532 +<!-- &lt;!&ndash;</el-form-item>&ndash;&gt;-->
  533 +<!-- &lt;!&ndash;</el-col>&ndash;&gt;-->
  534 +<!-- &lt;!&ndash;<el-col :span="7.5">&ndash;&gt;-->
  535 +<!-- &lt;!&ndash;<el-form-item prop="awbinfo.shpcomidpno" label-width="10px">&ndash;&gt;-->
  536 +<!-- &lt;!&ndash;<el-input v-model="shpcomidpno" placeholder="企业代码"/>&ndash;&gt;-->
  537 +<!-- &lt;!&ndash;</el-form-item>&ndash;&gt;-->
  538 +<!-- &lt;!&ndash;</el-col>&ndash;&gt;-->
  539 +<!-- </el-row>-->
  540 +<!-- <div class="grid-content content" style="font-size: 10px">-->
  541 +<!-- 收货人信息-->
  542 +<!-- <el-button type="primary" size="mini" @click="consigneeSelect()">选择收货人信息</el-button>-->
  543 +<!-- </div>-->
  544 +<!-- <el-row>-->
  545 +<!-- <el-col :span="5">-->
  546 +<!-- <el-form-item label="" prop="awbinfo.cnsnname">-->
  547 +<!-- <el-input v-model="cnsnname" clearable>-->
  548 +<!-- <template slot="prepend" >收货人名称</template>-->
  549 +<!-- </el-input>-->
  550 +<!-- </el-form-item>-->
  551 +<!-- </el-col>-->
  552 +<!-- <el-col :span="5">-->
  553 +<!-- <el-form-item label="" prop="awbinfo.cnsnaddress">-->
  554 +<!-- <el-input v-model="cnsnaddress" clearable>-->
  555 +<!-- <template slot="prepend" >地址</template>-->
  556 +<!-- </el-input>-->
  557 +<!-- </el-form-item>-->
  558 +<!-- </el-col>-->
  559 +<!-- <el-col :span="5">-->
  560 +<!-- <el-form-item label="">-->
  561 +<!-- <el-input v-model="ecityid" clearable maxlength="5">-->
  562 +<!-- <template slot="prepend" >城市代码</template>-->
  563 +<!-- </el-input>-->
  564 +<!-- </el-form-item>-->
  565 +<!-- </el-col>-->
  566 +<!-- <el-col :span="5">-->
  567 +<!-- <el-form-item label="">-->
  568 +<!-- <el-input v-model="preModel.awbinfo.cnsrmobiletype" clearable>-->
  569 +<!-- <template slot="prepend" >传真</template>-->
  570 +<!-- </el-input>-->
  571 +<!-- </el-form-item>-->
  572 +<!-- </el-col>-->
  573 +<!-- <el-col :span="5">-->
  574 +<!-- <el-form-item label="" prop="awbinfo.cnscountyr">-->
  575 +<!-- <el-select-->
  576 +<!-- :remote-method="remoteMethod"-->
  577 +<!-- :listLoading="listLoading"-->
  578 +<!-- v-model="cnscountyr"-->
  579 +<!-- filterable-->
  580 +<!-- allow-create-->
  581 +<!-- remote-->
  582 +<!-- placeholder="请选择国家代码" clearable>-->
  583 +<!-- <el-option-->
  584 +<!-- v-for="item in countryOption"-->
  585 +<!-- :key="item.value"-->
  586 +<!-- :label="item.value"-->
  587 +<!-- :value="item.value">-->
  588 +<!-- <span style="float: left">{{ item.label }}</span>-->
  589 +<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>-->
  590 +<!-- </el-option>-->
  591 +<!-- </el-select>-->
  592 +<!-- </el-form-item>-->
  593 +<!-- </el-col>-->
  594 +<!-- <el-col :span="7.5">-->
  595 +<!-- <el-form-item label="" prop="awbinfo.cnsntel">-->
  596 +<!-- <el-input v-model="preModel.awbinfo.cnsntel" clearable>-->
  597 +<!-- <template slot="prepend" >电话</template>-->
  598 +<!-- </el-input>-->
  599 +<!-- </el-form-item>-->
  600 +<!-- </el-col>-->
  601 +
  602 +<!-- <el-col :span="7.5">-->
  603 +<!-- <el-form-item label="" prop="awbinfo.cnsaeocode">-->
  604 +<!-- <el-input v-model="cnsaeocode" clearable style="width: 270px">-->
  605 +<!-- <template slot="prepend" >收货人AEO编码</template>-->
  606 +<!-- </el-input>-->
  607 +<!-- </el-form-item>-->
  608 +<!-- </el-col>-->
  609 +
  610 +<!-- </el-row>-->
  611 +<!-- <el-row>-->
  612 +<!-- <el-col :span="6">-->
  613 +<!-- <el-form-item label="" prop="awbinfo.cnsrctcname">-->
  614 +<!-- <el-input v-model="cnsrctcname" clearable>-->
  615 +<!-- <template slot="prepend" >收货人名称</template>-->
  616 +<!-- </el-input>-->
  617 +<!-- </el-form-item>-->
  618 +<!-- </el-col>-->
  619 +<!-- <el-col :span="6">-->
  620 +<!-- <el-form-item label="" prop="awbinfo.cnsrctctel">-->
  621 +<!-- <el-input v-model="preModel.awbinfo.cnsrctctel" clearable style="width: 270px">-->
  622 +<!-- <template slot="prepend" >收货人电话</template>-->
  623 +<!-- </el-input>-->
  624 +<!-- </el-form-item>-->
  625 +<!-- </el-col>-->
  626 +<!-- </el-row>-->
  627 +
  628 +<!-- &lt;!&ndash;<el-col :span="7.5">&ndash;&gt;-->
  629 +<!-- &lt;!&ndash;<el-form-item label="企业代码类型" prop="awbinfo.csgcustomerid">&ndash;&gt;-->
  630 +<!-- &lt;!&ndash;<el-select&ndash;&gt;-->
  631 +<!-- &lt;!&ndash;v-model="cnscomidpre"&ndash;&gt;-->
  632 +<!-- &lt;!&ndash;filterable&ndash;&gt;-->
  633 +<!-- &lt;!&ndash;placeholder="请选择企业代码类型" style="width: 200px;">&ndash;&gt;-->
  634 +<!-- &lt;!&ndash;<el-option&ndash;&gt;-->
  635 +<!-- &lt;!&ndash;v-for="item in shpCompnyTypeOption"&ndash;&gt;-->
  636 +<!-- &lt;!&ndash;:key="item.value"&ndash;&gt;-->
  637 +<!-- &lt;!&ndash;:label="item.label"&ndash;&gt;-->
  638 +<!-- &lt;!&ndash;:value="item.value"/>&ndash;&gt;-->
  639 +<!-- &lt;!&ndash;</el-select>&ndash;&gt;-->
  640 +<!-- &lt;!&ndash;</el-form-item>&ndash;&gt;-->
  641 +<!-- &lt;!&ndash;</el-col>&ndash;&gt;-->
  642 +<!-- &lt;!&ndash;<el-col :span="7.5">&ndash;&gt;-->
  643 +<!-- &lt;!&ndash;<el-form-item prop="awbinfo.cnscomidno" label-width="10px">&ndash;&gt;-->
  644 +<!-- &lt;!&ndash;<el-input v-model="cnscomidno" placeholder="企业代码"/>&ndash;&gt;-->
  645 +<!-- &lt;!&ndash;</el-form-item>&ndash;&gt;-->
  646 +<!-- &lt;!&ndash;</el-col>&ndash;&gt;-->
  647 +<!-- <div v-if="dialogStatus === 'sendUpdate'">-->
  648 +<!-- <div class="grid-content content">-->
  649 +<!-- 运单信息-->
  650 +<!-- </div>-->
  651 +<!-- <el-row>-->
  652 +<!-- <el-col :span="6">-->
  653 +<!-- <el-form-item label="" prop="reason">-->
  654 +<!-- <el-input v-model="preModel.reason" clearable>-->
  655 +<!-- <template slot="prepend" >修改原因</template>-->
  656 +<!-- </el-input>-->
  657 +<!-- </el-form-item>-->
  658 +<!-- </el-col>-->
  659 +<!-- <el-col :span="6">-->
  660 +<!-- <el-form-item label="" prop="contactName">-->
  661 +<!-- <el-input v-model="preModel.contactName" clearable>-->
  662 +<!-- <template slot="prepend" >修改人</template>-->
  663 +<!-- </el-input>-->
  664 +<!-- </el-form-item>-->
  665 +<!-- </el-col>-->
  666 +<!-- <el-col :span="6">-->
  667 +<!-- <el-form-item label="" prop="contactTel">-->
  668 +<!-- <el-input v-model="preModel.contactTel" clearable maxlength="5">-->
  669 +<!-- <template slot="prepend" >修改人Tel</template>-->
  670 +<!-- </el-input>-->
  671 +<!-- </el-form-item>-->
  672 +<!-- </el-col>-->
  673 +<!-- </el-row>-->
  674 +<!-- </div>-->
  675 +
  676 +<!-- </el-form>-->
  677 +<!-- <div slot="footer" class="dialog-footer" style="text-align: center">-->
  678 +<!-- <el-button @click="dialogFormVisible = false" size="medium"-->
  679 +<!-- style="width: 100px;background-color: #6F8294;color: #ffffff">取消</el-button>-->
  680 +<!-- <el-button type="success" size="medium" style="width: 100px" v-show="dialogStatus!=='sendUpdate'"-->
  681 +<!-- @click="dialogStatus ==='create'? createData():updateData()">保存</el-button>-->
  682 +<!-- <el-button type="primary" size="medium" style="width: 100px" v-show="dialogStatus==='sendUpdate'" @click="sendUpdate()">发送</el-button>-->
  683 +<!-- </div>-->
  684 +<!-- </el-dialog>-->
184 <el-dialog top="5vh" :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible" width="90%"> 685 <el-dialog top="5vh" :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible" width="90%">
185 - <el-form ref="preFormData" :model="preModel" :rules="preRoles" label-position="right" 686 + <el-form ref="preFormData" :model="preModel" :rules="preRoles" label-position="right"
186 label-width="80px" size="mini" class="el-dialog-div"> 687 label-width="80px" size="mini" class="el-dialog-div">
187 - <div class="grid-content content" style="font-size: 10px">  
188 - 运单信息 688 + <div style="font-size: 10px;background-color: #F0F0F0;color: #6459A5">
  689 + <span style="text-align:center;display:inline-block;width:100px;border-bottom: 2px solid #6459A5">
  690 + 运单信息
  691 + </span>
189 </div> 692 </div>
190 - <el-row>  
191 - <el-col :span="7.5">  
192 - <el-form-item label="" prop="awba">  
193 - <el-input :disabled="dialogStatus !== 'create'" v-model="awba" clearable>  
194 - <template slot="prepend" >主单号</template> 693 + <el-row class="flight-info" style="padding-left: 90px;padding-right: 90px">
  694 + <el-col :span="6">
  695 + <el-form-item label="主单号" prop="awba">
  696 + <el-input :disabled="dialogStatus !== 'create'" v-model="awba" clearable style="width: 140px">
195 </el-input> 697 </el-input>
196 </el-form-item> 698 </el-form-item>
197 </el-col> 699 </el-col>
198 - <el-col :span="7.5" v-if="fenStatus === 'addAwbh'">  
199 - <el-form-item label="" prop="awbh"> 700 + <el-col :span="6" v-if="fenStatus === 'addAwbh'">
  701 + <el-form-item label="分单号" prop="awbh">
200 <el-input v-model="awbh" clearable> 702 <el-input v-model="awbh" clearable>
201 - <template slot="prepend" >分单号</template>  
202 </el-input> 703 </el-input>
203 </el-form-item> 704 </el-form-item>
204 </el-col> 705 </el-col>
205 - </el-row>  
206 - <div class="grid-content content" style="font-size: 10px">  
207 - 航班信息  
208 - </div>  
209 - <el-row>  
210 - <el-col :span="7.5">  
211 - <el-form-item label="" prop="carrier">  
212 - <el-input v-model="carrier" :disabled="fenStatus === 'addAwbh'" clearable>  
213 - <template slot="prepend" >承运人</template>  
214 - </el-input> 706 + <el-col :span="6">
  707 + <el-form-item label="提前运抵">
  708 + <el-select v-model="preModel.ext3" class="filter-item" style="width: 140px" placeholder="请录入报关类型">
  709 + <el-option v-for="item in ext3" :key="item.value"
  710 + :label="item.label"
  711 + :value="item.value">
  712 + </el-option>
  713 + </el-select>
215 </el-form-item> 714 </el-form-item>
216 </el-col> 715 </el-col>
217 - <el-col :span="7.5">  
218 - <el-form-item label="" prop="flightno">  
219 - <el-input v-model="flightno" :disabled="fenStatus === 'addAwbh'" clearable>  
220 - <template slot="prepend" >航班号</template> 716 + <el-col :span="6">
  717 + <el-form-item label="报关类型">
  718 + <el-select v-model="preModel.ext4" class="filter-item" style="width: 140px" placeholder="请录入报关类型">
  719 + <el-option v-for="item in customsDeclarationType" :key="item.value"
  720 + :label="item.label"
  721 + :value="item.value">
  722 + </el-option>
  723 + </el-select>
  724 + </el-form-item>
  725 + </el-col>
  726 + <el-col :span="6">
  727 + <el-form-item label="货物属性">
  728 + <el-select v-model="preModel.awbinfo.goodsAttribute" class="filter-item" style="width: 140px" placeholder="请录入货物属性">
  729 + <el-option v-for="item in goodsAttribute" :key="item.value"
  730 + :label="item.label"
  731 + :value="item.value">
  732 + </el-option>
  733 + </el-select>
  734 + </el-form-item>
  735 + </el-col>
  736 + </el-row>
  737 + <div style="font-size: 10px;background-color: #F0F0F0;color: #6459A5">
  738 + <span style="text-align:center;display:inline-block;width:100px;border-bottom: 2px solid #6459A5">
  739 + 航班信息
  740 + </span>
  741 + </div>
  742 + <el-row class="flight-info" style="padding-left: 90px;padding-right: 90px">
  743 + <el-col :span="6">
  744 + <el-form-item label="航班号" prop="flightno">
  745 + <el-input v-model="flightno" :disabled="fenStatus === 'addAwbh'" style="width: 140px" clearable>
221 </el-input> 746 </el-input>
222 </el-form-item> 747 </el-form-item>
223 </el-col> 748 </el-col>
224 - <el-col :span="7.5">  
225 - <el-form-item label="" prop="flightdate"> 749 + <el-col :span="6">
  750 + <el-form-item label="航班日期" prop="flightdate">
226 <el-date-picker :disabled="fenStatus === 'addAwbh'" 751 <el-date-picker :disabled="fenStatus === 'addAwbh'"
227 - value-format="yyyy-MM-dd" style="width: 270px"  
228 - v-model="preModel.flightdate" align="right" 752 + value-format="yyyy-MM-dd"
  753 + style="width: 280px"
  754 + v-model="preModel.flightdate" align="left"
  755 + class="flight-date-tianbo"
229 type="date" placeholder="请输入航班日期" clearable/> 756 type="date" placeholder="请输入航班日期" clearable/>
230 </el-form-item> 757 </el-form-item>
231 </el-col> 758 </el-col>
232 - <el-col :span="7.5">  
233 - <el-form-item label="" prop="originstation"> 759 + <el-col :span="6">
  760 + <el-form-item label="起始站" prop="originstation">
234 <el-select 761 <el-select
235 filterable 762 filterable
236 clearable 763 clearable
237 placeholder="请选择起始站" 764 placeholder="请选择起始站"
238 :remote-method="remoteMethodAirport" 765 :remote-method="remoteMethodAirport"
  766 + default-first-option
239 allow-create remote 767 allow-create remote
240 v-model="originstation" 768 v-model="originstation"
241 :loading="airportLoading" 769 :loading="airportLoading"
242 - style="width: 270px"> 770 + style="width: 140px">
243 <el-option v-for="item in airportCode" 771 <el-option v-for="item in airportCode"
244 :key="item.airportid" :label="item.airportid" 772 :key="item.airportid" :label="item.airportid"
245 - :value="item.airportid" :disabled="fenStatus === 'addAwbh'"> 773 + :value="item.airportid" >
246 <span style="float: left">{{ item.airportdescchn }}</span> 774 <span style="float: left">{{ item.airportdescchn }}</span>
247 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportid }}</span> 775 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportid }}</span>
248 </el-option> 776 </el-option>
249 </el-select> 777 </el-select>
250 </el-form-item> 778 </el-form-item>
251 </el-col> 779 </el-col>
252 - <el-col :span="7.5">  
253 - <el-form-item label="" prop="destinationstation"> 780 + <el-col :span="6">
  781 + <el-form-item label="目的站" prop="destinationstation">
254 <el-select filterable clearable placeholder="请选择目的站" allow-create remote 782 <el-select filterable clearable placeholder="请选择目的站" allow-create remote
255 - v-model="destinationstation" :remote-method="remoteMethodAirport" style="width: 270px"> 783 + v-model="destinationstation"
  784 + :remote-method="remoteMethodAirport"
  785 + default-first-option
  786 + style="width: 140px">
256 <el-option v-for="item in airportCode" 787 <el-option v-for="item in airportCode"
257 :key="item.airportid" :label="item.airportid" 788 :key="item.airportid" :label="item.airportid"
258 - :value="item.airportid" :disabled="fenStatus === 'addAwbh'" > 789 + :value="item.airportid">
259 <span style="float: left">{{ item.airportdescchn }}</span> 790 <span style="float: left">{{ item.airportdescchn }}</span>
260 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportid }}</span> 791 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportid }}</span>
261 </el-option> 792 </el-option>
@@ -263,172 +794,84 @@ @@ -263,172 +794,84 @@
263 </el-form-item> 794 </el-form-item>
264 </el-col> 795 </el-col>
265 </el-row> 796 </el-row>
266 - <div class="grid-content content" style="font-size: 10px">  
267 - 航程信息  
268 - </div>  
269 - <div>  
270 - <el-row>  
271 - <el-col :span="5">  
272 - <el-form-item label="" prop="carrier">  
273 - <el-input v-model="carrier" disabled clearable>  
274 - <template slot="prepend" >承运人</template>  
275 - </el-input>  
276 - </el-form-item>  
277 - </el-col>  
278 - <el-col :span="5">  
279 - <el-form-item label="" prop="destinationstation">  
280 - <el-input v-model="destinationstation" disabled clearable>  
281 - <template slot="prepend" >到达航站</template>  
282 - </el-input>  
283 - </el-form-item>  
284 - </el-col>  
285 - <el-col :span="5">  
286 - <el-form-item label="">  
287 - <el-input v-model="by1" clearable>  
288 - <template slot="prepend" >承运人1</template>  
289 - </el-input>  
290 - </el-form-item>  
291 - </el-col>  
292 - <el-col :span="5">  
293 - <el-form-item label="">  
294 - <el-input v-model="dest1" clearable>  
295 - <template slot="prepend" >到达航站1</template>  
296 - </el-input>  
297 - </el-form-item>  
298 - </el-col>  
299 - <el-col :span="5">  
300 - <el-form-item label="">  
301 - <el-input v-model="by2" clearable>  
302 - <template slot="prepend" >承运人2</template>  
303 - </el-input>  
304 - </el-form-item>  
305 - </el-col>  
306 - <el-col :span="5">  
307 - <el-form-item label="">  
308 - <el-input v-model="dest2" clearable>  
309 - <template slot="prepend" >到达航站2</template>  
310 - </el-input>  
311 - </el-form-item>  
312 - </el-col>  
313 - </el-row>  
314 - </div>  
315 - <div class="grid-content content" style="font-size: 10px">  
316 - 货物信息  
317 - </div>  
318 <el-row> 797 <el-row>
319 - <el-col :span="5">  
320 - <el-form-item label="" prop="awbinfo.pcs">  
321 - <el-input v-model="preModel.awbinfo.pcs" clearable>  
322 - <template slot="prepend" >运单件数</template>  
323 - </el-input>  
324 - </el-form-item>  
325 - </el-col>  
326 - <el-col :span="5">  
327 - <el-form-item label="" prop="awbinfo.weight">  
328 - <el-input v-model="preModel.awbinfo.weight" clearable>  
329 - <template slot="prepend" >运单重量</template>  
330 - </el-input>  
331 - </el-form-item>  
332 - </el-col>  
333 - <el-col :span="5">  
334 - <el-form-item label="" prop="goodsname">  
335 - <el-input v-model="goodsname" clearable>  
336 - <template slot="prepend" >货物描述</template>  
337 - </el-input>  
338 - </el-form-item>  
339 - </el-col>  
340 - <el-col :span="5" v-if="fenStatus !=='addAwbh'">  
341 - <el-form-item label="" prop="piece">  
342 - <el-input v-model="preModel.piece" clearable>  
343 - <template slot="prepend" >预配件数</template>  
344 - </el-input>  
345 - </el-form-item>  
346 - </el-col>  
347 - <el-col :span="5" v-if="fenStatus ==='addAwbh'">  
348 - <el-form-item label="" prop="piece">  
349 - <el-input v-model="preModel.piece" clearable>  
350 - <template slot="prepend" >预配件数</template>  
351 - </el-input>  
352 - </el-form-item>  
353 - </el-col>  
354 - <el-col :span="5" v-if="fenStatus !=='addAwbh'">  
355 - <el-form-item label="" prop="weight">  
356 - <el-input v-model="preModel.weight" clearable>  
357 - <template slot="prepend" >预配重量</template>  
358 - </el-input>  
359 - </el-form-item>  
360 - </el-col>  
361 - <el-col :span="5" v-if="fenStatus ==='addAwbh'">  
362 - <el-form-item label="" prop="weight">  
363 - <el-input v-model="preModel.weight" clearable>  
364 - <template slot="prepend" >预配重量</template>  
365 - </el-input>  
366 - </el-form-item>  
367 - </el-col>  
368 - <el-col :span="5">  
369 - <el-form-item label="" prop="actime">  
370 - <el-date-picker value-format="yyyy-MM-dd HH:mm:ss"  
371 - v-model="preModel.actime" align="right" style="width: 180px"  
372 - type="datetime" placeholder="请选择预配时间"/>  
373 - </el-form-item>  
374 - </el-col>  
375 - <el-col :span="5">  
376 - <el-form-item label="" prop="customcode">  
377 - <el-select v-model="preModel.customcode" placeholder="请选择关区代码"  
378 - filterable clearable :remote-method="remoteMethodCustomCode" :loading="customLoading" remote  
379 - :disabled="fenStatus === 'addAwbh'">  
380 - <el-option v-for="item in customCodeList" :key="item.customcode" :label="item.customcode"  
381 - :value="item.customcode">  
382 - <span style="float: left">{{ item.customcode }}</span>  
383 - <span style="float: right; color: #8492a6; font-size: 13px">{{ item.customname }}</span> 798 + <div align="center" class="bpp" style="margin-bottom: 4px">
  799 + <tr style="background-color: #F1F3FF" >
  800 + <td width="70px">
  801 + 航程
  802 + </td>
  803 + <td width="350px">
  804 + 到达站
  805 + </td>
  806 + <td width="350px">
  807 + 承运人
  808 + </td>
  809 + </tr>
  810 + <tr>
  811 + <td style="border-left: 1.5px solid #F1F3FF">
  812 + 1
  813 + </td>
  814 + <td style="border: 1.5px solid #F1F3FF;border-top: 0px">
  815 + <el-input style="background-color: #fff;text-align: center" v-model="by1" size="mini" placeholder="三字码"></el-input>
  816 + </td>
  817 + <td style="border-right: 1.5px solid #F1F3FF">
  818 + <el-input style="background-color: #fff" v-model="dest1" size="mini" placeholder="承运人代码"></el-input>
  819 + </td>
  820 + </tr>
  821 + <tr>
  822 + <td style="border: 1.5px solid #F1F3FF">
  823 + 2
  824 + </td>
  825 + <td style="border-bottom: 1.5px solid #F1F3FF">
  826 + <el-input style="background-color: #fff;text-align: center" v-model="by2" size="mini" placeholder="三字码"></el-input>
  827 + </td>
  828 + <td style="border: 1.5px solid #F1F3FF">
  829 + <el-input style="background-color: #fff" v-model="dest2" size="mini" placeholder="承运人代码"></el-input>
  830 + </td>
  831 + </tr>
  832 + </div>
  833 +
  834 + </el-row>
  835 + <div style="font-size: 10px;background-color: #F0F0F0;color: #6459A5" v-if="fenStatus !=='addAwbh'">
  836 + <span style="text-align:center;display:inline-block;width:100px;border-bottom: 2px solid #6459A5">
  837 + 代理信息
  838 + </span>
  839 + </div>
  840 + <el-row class="flight-info" v-if="fenStatus !=='addAwbh'" style="padding-left: 90px;padding-right: 90px">
  841 + <el-col :span="6">
  842 + <el-form-item label="订舱代理">
  843 + <el-select v-model="preModel.bookingAgentId" class="filter-item" style="width: 140px" placeholder="请录入订舱代理">
  844 + <el-option v-for="item in bookingAgentList" :key="item.id"
  845 + :label="item.forShort"
  846 + :value="item.id">
384 </el-option> 847 </el-option>
385 </el-select> 848 </el-select>
386 </el-form-item> 849 </el-form-item>
387 </el-col> 850 </el-col>
388 - <el-col :span="5">  
389 - <el-form-item label="">  
390 - <el-select v-model="preModel.awbinfo.awbtype" class="filter-item" placeholder="请录入货物类型">  
391 - <el-option v-for="item in customTypes" :key="item.value"  
392 - :label="item.label"  
393 - :value="item.value"> 851 + <el-col :span="6">
  852 + <el-form-item label="操作代理">
  853 + <el-select v-model="preModel.operatingAgentId" class="filter-item" placeholder="请录入操作代理">
  854 + <el-option v-for="item in operatingAgentList" :key="item.id"
  855 + :label="item.forShort"
  856 + :value="item.id">
394 </el-option> 857 </el-option>
395 </el-select> 858 </el-select>
396 </el-form-item> 859 </el-form-item>
397 </el-col> 860 </el-col>
398 - <el-col :span="5">  
399 - <el-form-item label="" prop="awbinfo.paymodel">  
400 - <el-select v-model="preModel.awbinfo.paymodel" class="filter-item" placeholder="请选择付费方式">  
401 - <el-option  
402 - v-for="item in payTypes"  
403 - :key="item.value"  
404 - :label="item.label"  
405 - :value="item.value">  
406 - </el-option>  
407 - </el-select>  
408 - </el-form-item>  
409 - </el-col>  
410 - <el-col :span="5">  
411 - <el-form-item label="" prop="">  
412 - <el-input v-model="specopeid" clearable>  
413 - <template slot="prepend" >卸货地</template> 861 + <el-col :span="6">
  862 + <el-form-item label="代理名称" prop="">
  863 + <el-input disabled v-model="preModel.awbinfo.dest4" clearable style="width: 140px">
414 </el-input> 864 </el-input>
415 </el-form-item> 865 </el-form-item>
416 </el-col> 866 </el-col>
417 - <el-col :span="5">  
418 - <el-form-item label="" prop="">  
419 - <el-input v-model="preModel.awbinfo.shpcustomerid" clearable>  
420 - <template slot="prepend" >代理人代码</template> 867 + <el-col :span="6">
  868 + <el-form-item label="代理编码" prop="">
  869 + <el-input disabled v-model="preModel.awbinfo.dest4city" clearable style="width: 140px">
421 </el-input> 870 </el-input>
422 </el-form-item> 871 </el-form-item>
423 </el-col> 872 </el-col>
424 - <el-col :span="5">  
425 - <el-form-item label="" prop="">  
426 - <el-input v-model="preModel.awbinfo.shpcustomerid" clearable>  
427 - <template slot="prepend" >代理人名称</template>  
428 - </el-input>  
429 - </el-form-item>  
430 - </el-col>  
431 </el-row> 873 </el-row>
  874 +
432 <el-row style="margin-bottom: 10px"> 875 <el-row style="margin-bottom: 10px">
433 <el-col :span="7" v-if="fenStatus ==='addAwbh'"> 876 <el-col :span="7" v-if="fenStatus ==='addAwbh'">
434 <span> 877 <span>
@@ -442,49 +885,37 @@ @@ -442,49 +885,37 @@
442 <span>剩余重量:{{awbWeight}}</span> 885 <span>剩余重量:{{awbWeight}}</span>
443 </el-col> 886 </el-col>
444 </el-row> 887 </el-row>
445 - <div class="grid-content content" style="font-size: 10px">  
446 - 发货人信息  
447 - <el-button type="primary" size="mini" @click="consignerSelect()">选择发货人信息</el-button> 888 + <div style="font-size: 10px;background-color: #F0F0F0;color: #6459A5">
  889 + <span style="text-align:center;display:inline-block;width:100px;border-bottom: 2px solid #6459A5">
  890 + 发货人
  891 + </span>
448 </div> 892 </div>
449 - <el-row>  
450 - <el-col :span="5">  
451 - <el-form-item label="" prop="awbinfo.shprname">  
452 - <el-input v-model="shprname" clearable>  
453 - <template slot="prepend" >发货人名称</template>  
454 - </el-input>  
455 - </el-form-item>  
456 - </el-col>  
457 - <el-col :span="5">  
458 - <el-form-item label="" prop="awbinfo.shpraddress">  
459 - <el-input v-model="shpraddress" clearable>  
460 - <template slot="prepend" >地址</template>  
461 - </el-input>  
462 - </el-form-item>  
463 - </el-col>  
464 - <el-col :span="5">  
465 - <el-form-item label="">  
466 - <el-input v-model="scityid" maxlength="5" clearable>  
467 - <template slot="prepend" >城市代码</template> 893 + <el-row style="padding-left: 90px;padding-right: 90px">
  894 + <el-button class="sun" style="border:1px solid #6459A5;color: #6459A5" plain size="mini" @click="consignerSelect()">选择发货人</el-button>
  895 + <el-col :span="12">
  896 + <el-form-item label="发货人" prop="awbinfo.shprname">
  897 + <el-input id="a" v-model="shprname" clearable style="width: 340px">
468 </el-input> 898 </el-input>
469 </el-form-item> 899 </el-form-item>
470 </el-col> 900 </el-col>
471 - <el-col :span="5">  
472 - <el-form-item label="">  
473 - <el-input v-model="preModel.awbinfo.shprmobiletype" clearable>  
474 - <template slot="prepend" >传真</template> 901 + <el-col :span="12">
  902 + <el-form-item label="地址" prop="awbinfo.shpraddress">
  903 + <el-input v-model="shpraddress" clearable style="width: 340px">
475 </el-input> 904 </el-input>
476 </el-form-item> 905 </el-form-item>
477 </el-col> 906 </el-col>
478 - <el-col :span="5">  
479 - <el-form-item label="" prop="awbinfo.shprcountyr"> 907 +
  908 + <el-col :span="6">
  909 + <el-form-item label="国家代码" prop="awbinfo.shprcountyr">
480 <el-select 910 <el-select
481 :remote-method="remoteMethod" 911 :remote-method="remoteMethod"
482 :loading="listLoading" 912 :loading="listLoading"
483 v-model="shprcountyr" 913 v-model="shprcountyr"
484 filterable 914 filterable
  915 + default-first-option
485 allow-create 916 allow-create
486 remote 917 remote
487 - placeholder="请选择国家代码" clearable>目的站 918 + placeholder="请选择国家代码" clearable style="width: 120px">
488 <el-option 919 <el-option
489 v-for="item in countryOption" 920 v-for="item in countryOption"
490 :key="item.value" 921 :key="item.value"
@@ -496,85 +927,61 @@ @@ -496,85 +927,61 @@
496 </el-select> 927 </el-select>
497 </el-form-item> 928 </el-form-item>
498 </el-col> 929 </el-col>
499 - <el-col :span="7.5">  
500 - <el-form-item label="" prop="awbinfo.shprtel">  
501 - <el-input v-model="preModel.awbinfo.shprtel" clearable>  
502 - <template slot="prepend" >电话</template> 930 + <el-col :span="6">
  931 + <el-form-item label="城市代码" prop="awbinfo.scityid">
  932 + <el-input v-model="preModel.awbinfo.scityid" clearable style="width: 120px">
503 </el-input> 933 </el-input>
504 </el-form-item> 934 </el-form-item>
505 </el-col> 935 </el-col>
506 -  
507 - <el-col :span="7.5">  
508 - <el-form-item label="" prop="awbinfo.shpaeocode">  
509 - <el-input v-model="shpaeocode" clearable style="width: 270px">  
510 - <template slot="prepend" >发货人AEO编码</template>  
511 - </el-input>  
512 - </el-form-item>  
513 - </el-col>  
514 -  
515 - <!--<el-col :span="7.5">-->  
516 - <!--<el-form-item label="企业代码类型" prop="awbinfo.shpcomidpre">-->  
517 - <!--<el-select-->  
518 - <!--v-model="shpcomidpre"-->  
519 - <!--filterable-->  
520 - <!--placeholder="请选择企业代码类型" style="width: 200px;">-->  
521 - <!--<el-option-->  
522 - <!--v-for="item in shpCompnyTypeOption"-->  
523 - <!--:key="item.value"-->  
524 - <!--:label="item.label"-->  
525 - <!--:value="item.value"/>-->  
526 - <!--</el-select>-->  
527 - <!--</el-form-item>-->  
528 - <!--</el-col>-->  
529 - <!--<el-col :span="7.5">-->  
530 - <!--<el-form-item prop="awbinfo.shpcomidpno" label-width="10px">-->  
531 - <!--<el-input v-model="shpcomidpno" placeholder="企业代码"/>-->  
532 - <!--</el-form-item>-->  
533 - <!--</el-col>-->  
534 - </el-row>  
535 - <div class="grid-content content" style="font-size: 10px">  
536 - 收货人信息  
537 - <el-button type="primary" size="mini" @click="consigneeSelect()">选择收货人信息</el-button>  
538 - </div>  
539 - <el-row>  
540 - <el-col :span="5">  
541 - <el-form-item label="" prop="awbinfo.cnsnname">  
542 - <el-input v-model="cnsnname" clearable>  
543 - <template slot="prepend" >收货人名称</template> 936 + <el-col :span="6">
  937 + <el-form-item label="电话" prop="awbinfo.shprtel">
  938 + <el-input v-model="preModel.awbinfo.shprtel" clearable style="width: 120px">
  939 + <!-- <template slot="prepend" >&nbsp;&nbsp;&nbsp;电&nbsp;&nbsp;&nbsp;话&nbsp;&nbsp;&nbsp;</template>-->
544 </el-input> 940 </el-input>
545 </el-form-item> 941 </el-form-item>
546 </el-col> 942 </el-col>
547 - <el-col :span="5">  
548 - <el-form-item label="" prop="awbinfo.cnsnaddress">  
549 - <el-input v-model="cnsnaddress" clearable>  
550 - <template slot="prepend" >地址</template> 943 + <el-col :span="6">
  944 + <el-form-item label="AEO编码" prop="awbinfo.shpaeocode">
  945 + <el-input v-model="preModel.awbinfo.shpaeocode" clearable style="width: 120px">
  946 + <!-- <template slot="prepend" >&nbsp;&nbsp;AEO编码&nbsp;</template>-->
551 </el-input> 947 </el-input>
552 </el-form-item> 948 </el-form-item>
553 </el-col> 949 </el-col>
554 - <el-col :span="5">  
555 - <el-form-item label="">  
556 - <el-input v-model="ecityid" clearable maxlength="5">  
557 - <template slot="prepend" >城市代码</template> 950 + </el-row>
  951 + <div style="font-size: 10px;background-color: #F0F0F0;color: #6459A5">
  952 + <span style="text-align:center;display:inline-block;width:100px;border-bottom: 2px solid #6459A5">
  953 + 收货人
  954 + </span>
  955 + </div>
  956 + <el-row style="padding-left: 90px;padding-right: 90px">
  957 + <el-button class="suns" style="border:1px solid #6459A5;color: #6459A5" plain size="mini" @click="consigneeSelect()" >选择收货人</el-button>
  958 + <el-col :span="12">
  959 + <el-form-item label="收货人" prop="awbinfo.cnsnname">
  960 + <el-input v-model="cnsnname" clearable style="width: 340px">
  961 + <!-- <template slot="prepend" ></template>-->
558 </el-input> 962 </el-input>
559 </el-form-item> 963 </el-form-item>
560 </el-col> 964 </el-col>
561 - <el-col :span="5">  
562 - <el-form-item label="">  
563 - <el-input v-model="preModel.awbinfo.cnsrmobiletype" clearable>  
564 - <template slot="prepend" >传真</template> 965 + <el-col :span="12">
  966 + <el-form-item label="地址" prop="awbinfo.cnsnaddress">
  967 + <el-input v-model="cnsnaddress" clearable style="width: 340px">
  968 + <!-- <template slot="prepend" >&nbsp;&nbsp;&nbsp;地&nbsp;&nbsp;&nbsp;址&nbsp;&nbsp;&nbsp;</template>-->
565 </el-input> 969 </el-input>
566 </el-form-item> 970 </el-form-item>
567 </el-col> 971 </el-col>
568 - <el-col :span="5">  
569 - <el-form-item label="" prop="awbinfo.cnscountyr"> 972 +
  973 + <el-col :span="6">
  974 + <el-form-item label="国家代码" prop="awbinfo.cnscountyr">
  975 + <!-- <div class="el-input-group__prepend select-lable" style="line-height: 27px;float:left; width:98px;font-size:12px;text-align: center;">&nbsp;国家代码&nbsp;</div>-->
570 <el-select 976 <el-select
571 :remote-method="remoteMethod" 977 :remote-method="remoteMethod"
572 :listLoading="listLoading" 978 :listLoading="listLoading"
573 v-model="cnscountyr" 979 v-model="cnscountyr"
574 filterable 980 filterable
575 allow-create 981 allow-create
  982 + default-first-option
576 remote 983 remote
577 - placeholder="请选择国家代码" clearable> 984 + placeholder="请选择国家代码" clearable style="width: 120px">
578 <el-option 985 <el-option
579 v-for="item in countryOption" 986 v-for="item in countryOption"
580 :key="item.value" 987 :key="item.value"
@@ -586,59 +993,86 @@ @@ -586,59 +993,86 @@
586 </el-select> 993 </el-select>
587 </el-form-item> 994 </el-form-item>
588 </el-col> 995 </el-col>
589 - <el-col :span="7.5">  
590 - <el-form-item label="" prop="awbinfo.cnsntel">  
591 - <el-input v-model="preModel.awbinfo.cnsntel" clearable>  
592 - <template slot="prepend" >电话</template> 996 + <el-col :span="6">
  997 + <el-form-item label="城市代码" prop="awbinfo.ecityid">
  998 + <el-input v-model="preModel.awbinfo.ecityid" clearable style="width: 120px">
  999 + <!-- <template slot="prepend" >&nbsp;城市代码&nbsp;&nbsp;</template>-->
593 </el-input> 1000 </el-input>
594 </el-form-item> 1001 </el-form-item>
595 </el-col> 1002 </el-col>
596 -  
597 - <el-col :span="7.5">  
598 - <el-form-item label="" prop="awbinfo.cnsaeocode">  
599 - <el-input v-model="cnsaeocode" clearable style="width: 270px">  
600 - <template slot="prepend" >收货人AEO编码</template> 1003 + <el-col :span="6">
  1004 + <el-form-item label="电话" prop="awbinfo.cnsntel">
  1005 + <el-input v-model="preModel.awbinfo.cnsntel" clearable style="width: 120px">
  1006 + <!-- <template slot="prepend" >&nbsp;&nbsp;&nbsp;电&nbsp;&nbsp;&nbsp;话&nbsp;&nbsp;&nbsp;</template>-->
601 </el-input> 1007 </el-input>
602 </el-form-item> 1008 </el-form-item>
603 </el-col> 1009 </el-col>
604 1010
  1011 + <el-col :span="6">
  1012 + <el-form-item label="AEO编码" prop="awbinfo.cnsaeocode">
  1013 + <el-input v-model="preModel.awbinfo.cnsaeocode" clearable style="width: 120px">
  1014 + <!-- <template slot="prepend" >&nbsp;AEO编码&nbsp;&nbsp;</template>-->
  1015 + </el-input>
  1016 + </el-form-item>
  1017 + </el-col>
  1018 + </el-row>
  1019 + <div style="font-size: 10px;background-color: #F0F0F0;color: #6459A5">
  1020 + <span style="text-align:center;display:inline-block;width:100px;border-bottom: 2px solid #6459A5">
  1021 + 货物信息
  1022 + </span>
  1023 + </div>
  1024 + <el-row style="padding-left: 90px;padding-right: 90px">
  1025 + <el-col :span="6">
  1026 + <el-form-item label="货物描述" prop="goodsname">
  1027 + <el-input v-model="goodsname" clearable style="width: 120px">
  1028 + </el-input>
  1029 + </el-form-item>
  1030 + </el-col>
  1031 + <el-col :span="6">
  1032 + <el-form-item label="预配件数" prop="piece">
  1033 + <el-input v-model="preModel.piece" @input="pieceEcho" clearable style="width: 120px">
  1034 + </el-input>
  1035 + </el-form-item>
  1036 + </el-col>
  1037 + <el-col :span="6">
  1038 + <el-form-item label="预配重量" prop="weight">
  1039 + <el-input v-model="preModel.weight" @input="weightEcho" clearable style="width: 120px">
  1040 + </el-input>
  1041 + </el-form-item>
  1042 + </el-col>
  1043 + <el-col :span="6">
  1044 + <el-form-item label="所属关区" prop="customcode">
  1045 + <el-select v-model="preModel.customcode" class="filter-item" style="width: 140px" placeholder="请选择所属关区">
  1046 + <el-option v-for="item in custom" :key="item.value"
  1047 + :label="item.label"
  1048 + :value="item.value">
  1049 + </el-option>
  1050 + </el-select>
  1051 + </el-form-item>
  1052 + </el-col>
  1053 + <el-col :span="6">
  1054 + <el-form-item label="付费方式" prop="awbinfo.paymodel">
  1055 + <el-select v-model="preModel.awbinfo.paymodel" class="filter-item" placeholder="请选择付费方式" style="width: 120px">
  1056 + <el-option
  1057 + v-for="item in payTypes"
  1058 + :key="item.value"
  1059 + :label="item.label"
  1060 + :value="item.value">
  1061 + </el-option>
  1062 + </el-select>
  1063 + </el-form-item>
  1064 + </el-col>
  1065 + <el-col :span="6">
  1066 + <el-form-item label="货物类型" prop="awbinfo.awbtype">
  1067 + <el-select v-model="preModel.awbinfo.awbtype" class="filter-item" style="width: 140px" placeholder="请录入货物类型">
  1068 + <el-option v-for="item in customTypess" :key="item.value"
  1069 + :label="item.label"
  1070 + :value="item.value">
  1071 + </el-option>
  1072 + </el-select>
  1073 + </el-form-item>
  1074 + </el-col>
605 </el-row> 1075 </el-row>
606 - <el-row>  
607 - <el-col :span="6">  
608 - <el-form-item label="" prop="awbinfo.cnsrctcname">  
609 - <el-input v-model="cnsrctcname" clearable>  
610 - <template slot="prepend" >收货人名称</template>  
611 - </el-input>  
612 - </el-form-item>  
613 - </el-col>  
614 - <el-col :span="6">  
615 - <el-form-item label="" prop="awbinfo.cnsrctctel">  
616 - <el-input v-model="preModel.awbinfo.cnsrctctel" clearable style="width: 270px">  
617 - <template slot="prepend" >收货人电话</template>  
618 - </el-input>  
619 - </el-form-item>  
620 - </el-col>  
621 - </el-row>  
622 -  
623 - <!--<el-col :span="7.5">-->  
624 - <!--<el-form-item label="企业代码类型" prop="awbinfo.csgcustomerid">-->  
625 - <!--<el-select-->  
626 - <!--v-model="cnscomidpre"-->  
627 - <!--filterable-->  
628 - <!--placeholder="请选择企业代码类型" style="width: 200px;">-->  
629 - <!--<el-option-->  
630 - <!--v-for="item in shpCompnyTypeOption"-->  
631 - <!--:key="item.value"-->  
632 - <!--:label="item.label"-->  
633 - <!--:value="item.value"/>-->  
634 - <!--</el-select>-->  
635 - <!--</el-form-item>-->  
636 - <!--</el-col>-->  
637 - <!--<el-col :span="7.5">-->  
638 - <!--<el-form-item prop="awbinfo.cnscomidno" label-width="10px">-->  
639 - <!--<el-input v-model="cnscomidno" placeholder="企业代码"/>-->  
640 - <!--</el-form-item>-->  
641 - <!--</el-col>-->  
642 <div v-if="dialogStatus === 'sendUpdate'"> 1076 <div v-if="dialogStatus === 'sendUpdate'">
643 <div class="grid-content content"> 1077 <div class="grid-content content">
644 运单信息 1078 运单信息
@@ -670,10 +1104,10 @@ @@ -670,10 +1104,10 @@
670 1104
671 </el-form> 1105 </el-form>
672 <div slot="footer" class="dialog-footer" style="text-align: center"> 1106 <div slot="footer" class="dialog-footer" style="text-align: center">
673 - <el-button @click="dialogFormVisible = false" size="medium"  
674 - style="width: 100px;background-color: #6F8294;color: #ffffff">取消</el-button> 1107 + <el-button @click="dialogFormVisible = false" size="medium" type="primary"
  1108 + style="width: 100px">取消</el-button>
675 <el-button type="success" size="medium" style="width: 100px" v-show="dialogStatus!=='sendUpdate'" 1109 <el-button type="success" size="medium" style="width: 100px" v-show="dialogStatus!=='sendUpdate'"
676 - @click="dialogStatus ==='create'? createData():updateData()">保存</el-button> 1110 + @click="dialogStatus ==='create'? createData():updateData()" v-loading="addloading">保存</el-button>
677 <el-button type="primary" size="medium" style="width: 100px" v-show="dialogStatus==='sendUpdate'" @click="sendUpdate()">发送</el-button> 1111 <el-button type="primary" size="medium" style="width: 100px" v-show="dialogStatus==='sendUpdate'" @click="sendUpdate()">发送</el-button>
678 </div> 1112 </div>
679 </el-dialog> 1113 </el-dialog>
@@ -750,8 +1184,7 @@ @@ -750,8 +1184,7 @@
750 style="width: 100px;background-color: #6F8294;color: #ffffff">取消</el-button> 1184 style="width: 100px;background-color: #6F8294;color: #ffffff">取消</el-button>
751 <el-button type="primary" size="medium" style="width: 100px" @click="sendDelete()">发送</el-button> 1185 <el-button type="primary" size="medium" style="width: 100px" @click="sendDelete()">发送</el-button>
752 </div> 1186 </div>
753 - </el-dialog>  
754 - 1187 + </el-dialog>
755 <el-dialog title="发货人信息" :visible.sync="dialogSelectVisible" width="70%"> 1188 <el-dialog title="发货人信息" :visible.sync="dialogSelectVisible" width="70%">
756 <!--工具条--> 1189 <!--工具条-->
757 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> 1190 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
@@ -830,7 +1263,6 @@ @@ -830,7 +1263,6 @@
830 <pagination background layout="total, prev, pager, next" v-show="consigneeQuery.total>0" :total="consigneeQuery.total" :page.sync="consigneeQuery.pageSize" :limit.sync="consigneeQuery.limitSize" 1263 <pagination background layout="total, prev, pager, next" v-show="consigneeQuery.total>0" :total="consigneeQuery.total" :page.sync="consigneeQuery.pageSize" :limit.sync="consigneeQuery.limitSize"
831 @pagination="consignerSelect()"/> 1264 @pagination="consignerSelect()"/>
832 </el-dialog> 1265 </el-dialog>
833 -  
834 </div> 1266 </div>
835 </template> 1267 </template>
836 <script> 1268 <script>
@@ -901,6 +1333,7 @@ @@ -901,6 +1333,7 @@
901 func: treeToArray, 1333 func: treeToArray,
902 total: 1, 1334 total: 1,
903 isAdmin: false, 1335 isAdmin: false,
  1336 + addloading: false,
904 consignerList: [], 1337 consignerList: [],
905 dialogNeeVisible: false, 1338 dialogNeeVisible: false,
906 consigneeList: [], 1339 consigneeList: [],
@@ -920,27 +1353,76 @@ @@ -920,27 +1353,76 @@
920 preQuery: { 1353 preQuery: {
921 pageSize: 1, 1354 pageSize: 1,
922 limitSize: 30, 1355 limitSize: 30,
923 - awba: undefined,  
924 - carrier: undefined,  
925 - flightno: undefined,  
926 - flightdate: undefined,  
927 - originstation: undefined,  
928 - destinationstation: undefined,  
929 - messageType: undefined 1356 + awba: '',
  1357 + carrier: '',
  1358 + flightno: '',
  1359 + flightdate: '',
  1360 + originstation: '',
  1361 + destinationstation: '',
  1362 + userId:'',
  1363 + customCode:'',
  1364 + enterpriseId:'',
  1365 + messageType: ''
930 }, 1366 },
931 dialogMap: { 1367 dialogMap: {
932 update: '编辑预配舱单', 1368 update: '编辑预配舱单',
933 create: '添加预配舱单', 1369 create: '添加预配舱单',
934 addAwbh: '添加分单' 1370 addAwbh: '添加分单'
935 }, 1371 },
936 - customTypes: [ 1372 + customTypess: [
937 {label: '普通货物', value: '001'}, 1373 {label: '普通货物', value: '001'},
938 {label: '国际转运货物', value: '002'}, 1374 {label: '国际转运货物', value: '002'},
939 {label: '国内转关', value: '003'}, 1375 {label: '国内转关', value: '003'},
940 {label: '空箱', value: '004'}, 1376 {label: '空箱', value: '004'},
941 - {label: '快件', value: '005'}],  
942 - payTypes: [{label: '预付', value: '0'}, {label: '到付', value: '1'}], 1377 + {label: '快件', value: '005'}
  1378 + ],
  1379 + custom:[
  1380 + {label: '4604', value: '4604'},
  1381 + {label: '4620', value: '4620'},
  1382 + ],
  1383 +
  1384 + customsDeclarationType: [
  1385 + {label: '本地报关', value: '001'},
  1386 + {label: '转关', value: '002'},
  1387 + {label: '通关一体化', value: '003'},
  1388 + {label: '提前报关', value: '004'}],
  1389 + shipmentCargo:[
  1390 + {label: '郑州机场地面处理',value:'1'}
  1391 + ],
  1392 + ext3: [
  1393 + {label: '正常运抵', value: 'N'},
  1394 + {label: '提前运抵', value: 'Y'},
  1395 + ],
  1396 + shipType:[
  1397 + {label: '普货交运', value: '1'},
  1398 + {label: '邮件交运', value: '2'},
  1399 + {label: '国际邮件交运', value: '3'}],
  1400 + codeType:[
  1401 + {label: 'USCI', value: 'USCI'},
  1402 + {label: 'OC', value: 'OC'},
  1403 + {label: '9999', value: '9999'}
  1404 + ],
  1405 + goodsAttribute:[
  1406 + {label: '非保税', value: '2'},
  1407 + {label: '保税', value: '1'}
  1408 + ],
  1409 + consignorList:[],
  1410 + operatingAgentList:[],
  1411 + bookingAgentList:[],
  1412 + payTypes: [{label: '预付', value: 'PP'}, {label: '到付', value: 'CC'}],
943 splitcodes: [{label: '是', value: 'T'}, {label: '否', value: 'P'}], 1413 splitcodes: [{label: '是', value: 'T'}, {label: '否', value: 'P'}],
  1414 + packagingInformation: [
  1415 + {label: '纸箱', value: '1'},
  1416 + {label: '木箱', value: '2'},
  1417 + {label: '桶装', value: '3'},
  1418 + {label: '纸托', value: '4'},
  1419 + {label: '木托', value: '5'},
  1420 + {label: '塑料箱', value: '6'},
  1421 + {label: '金属托', value: '7'},
  1422 + {label: '散装', value: '8'},
  1423 + {label: '包', value: '9'},
  1424 + {label: '其他', value: '10'}
  1425 + ],
944 customCodeList: [], 1426 customCodeList: [],
945 airportCode:[], 1427 airportCode:[],
946 dialogStatus: undefined, 1428 dialogStatus: undefined,
@@ -1006,9 +1488,12 @@ @@ -1006,9 +1488,12 @@
1006 uldNo: undefined, 1488 uldNo: undefined,
1007 status: undefined, 1489 status: undefined,
1008 ex5: undefined, 1490 ex5: undefined,
  1491 + ext3: undefined,
1009 reason: undefined, 1492 reason: undefined,
1010 contactName: undefined, 1493 contactName: undefined,
1011 contactTel: undefined, 1494 contactTel: undefined,
  1495 + bookingAgentId: undefined,
  1496 + operatingAgentId: undefined,
1012 awbinfo: { 1497 awbinfo: {
1013 pcs: undefined, 1498 pcs: undefined,
1014 weight: undefined, 1499 weight: undefined,
@@ -1045,7 +1530,7 @@ @@ -1045,7 +1530,7 @@
1045 dest3: undefined, 1530 dest3: undefined,
1046 eairportid: undefined, 1531 eairportid: undefined,
1047 csgcustomerid: undefined, 1532 csgcustomerid: undefined,
1048 - paymodel: '0', 1533 + paymodel: 'PP',
1049 awbtype: undefined 1534 awbtype: undefined
1050 }, 1535 },
1051 user: { 1536 user: {
@@ -1396,7 +1881,7 @@ @@ -1396,7 +1881,7 @@
1396 dest3: undefined, 1881 dest3: undefined,
1397 eairportid: undefined, 1882 eairportid: undefined,
1398 csgcustomerid: undefined, 1883 csgcustomerid: undefined,
1399 - paymodel: '0', 1884 + paymodel: 'PP',
1400 }, 1885 },
1401 user: { 1886 user: {
1402 username : JSON.parse(sessionStorage.getItem('user')).username 1887 username : JSON.parse(sessionStorage.getItem('user')).username
@@ -1405,9 +1890,19 @@ @@ -1405,9 +1890,19 @@
1405 }, 1890 },
1406 // >>>>>>>>>>>>>>>>新增主单<<<<<<<<<<<<<<<<<< 1891 // >>>>>>>>>>>>>>>>新增主单<<<<<<<<<<<<<<<<<<
1407 handleAddpreInfo() { 1892 handleAddpreInfo() {
1408 - 1893 + this.addloading = false;
1409 this.fenStatus=undefined; 1894 this.fenStatus=undefined;
1410 this.restModel() 1895 this.restModel()
  1896 + let _this = this;
  1897 + getListHzTypeList().then(res => {
  1898 + if (res.data.code == '200') {
  1899 + _this.consignorList = res.data.data.consignorList;
  1900 + _this.operatingAgentList = res.data.data.operatingAgentList;
  1901 + _this.bookingAgentList = res.data.data.bookingAgentList;
  1902 + } else {
  1903 + Message.error("获取货主列表失败")
  1904 + }
  1905 + })
1411 this.preModel.carrier = this.preQuery.carrier 1906 this.preModel.carrier = this.preQuery.carrier
1412 this.preModel.flightno = this.preQuery.flightno 1907 this.preModel.flightno = this.preQuery.flightno
1413 this.preModel.flightdate = this.preQuery.flightdate 1908 this.preModel.flightdate = this.preQuery.flightdate
@@ -1420,16 +1915,22 @@ @@ -1420,16 +1915,22 @@
1420 this.$refs.preFormData.clearValidate() 1915 this.$refs.preFormData.clearValidate()
1421 }) 1916 })
1422 }, 1917 },
  1918 + pieceEcho: function(val){
  1919 + this.preModel.awbinfo.pcs = val;
  1920 + },
  1921 + weightEcho: function(val){
  1922 + this.preModel.awbinfo.weight = val;
  1923 + },
1423 createData() { 1924 createData() {
1424 this.$refs.preFormData.validate(valid => { 1925 this.$refs.preFormData.validate(valid => {
1425 if (valid) { 1926 if (valid) {
1426 addMt2201(this.preModel).then(res => { 1927 addMt2201(this.preModel).then(res => {
1427 - if (res.data.count > 0) { 1928 + if (res.data.code == '200') {
1428 Message.success("新增成功") 1929 Message.success("新增成功")
1429 this.dialogFormVisible = false 1930 this.dialogFormVisible = false
1430 this.getList() 1931 this.getList()
1431 } else { 1932 } else {
1432 - Message.error("新增失败，请检查数据") 1933 + Message.error(res.data.msg);
1433 } 1934 }
1434 }) 1935 })
1435 } 1936 }
@@ -1512,11 +2013,11 @@ @@ -1512,11 +2013,11 @@
1512 }, 2013 },
1513 // >>>>>>>>>>>>>>>>搜索<<<<<<<<<<<<<<<<<< 2014 // >>>>>>>>>>>>>>>>搜索<<<<<<<<<<<<<<<<<<
1514 handleSerach() { 2015 handleSerach() {
1515 - // this.preQuery.flightno = undefined  
1516 - // this.preQuery.carrier = undefined  
1517 - // this.preQuery.originstation = undefined  
1518 - // this.preQuery.flightdate = undefined  
1519 - // this.preQuery.destinationstation = undefined 2016 + this.preQuery.flightno = undefined
  2017 + this.preQuery.carrier = undefined
  2018 + this.preQuery.originstation = undefined
  2019 + this.preQuery.flightdate = undefined
  2020 + this.preQuery.destinationstation = undefined
1520 this.getList() 2021 this.getList()
1521 }, 2022 },
1522 // >>>>>>>>>>>>>>>>收发明细<<<<<<<<<<<<<<<<<< 2023 // >>>>>>>>>>>>>>>>收发明细<<<<<<<<<<<<<<<<<<
@@ -1575,6 +2076,7 @@ @@ -1575,6 +2076,7 @@
1575 this.dialogStatus = undefined; 2076 this.dialogStatus = undefined;
1576 this.fenStatus = undefined; 2077 this.fenStatus = undefined;
1577 this.preModel = Object.assign({}, row) 2078 this.preModel = Object.assign({}, row)
  2079 + this.preModel.flightno = row.carrier+row.flightno;
1578 this.dialogStatus = 'update' 2080 this.dialogStatus = 'update'
1579 if (row.awbh !== undefined && row.awbh !== ""){ 2081 if (row.awbh !== undefined && row.awbh !== ""){
1580 this.fenStatus = 'addAwbh' 2082 this.fenStatus = 'addAwbh'
@@ -1596,12 +2098,19 @@ @@ -1596,12 +2098,19 @@
1596 } 2098 }
1597 2099
1598 updateMT2201(_this.preModel).then(res => { 2100 updateMT2201(_this.preModel).then(res => {
1599 - if (res.data.count > 0) {  
1600 - Message.success("修改成功")  
1601 - this.dialogFormVisible = false  
1602 - this.getList()  
1603 - } else {  
1604 - Message.error("修改失败，请检查数据") 2101 + if (res.data.code == "200") {
  2102 + Message.success(res.data.msg)
  2103 + _this.dialogFormVisible = false
  2104 + _this.getList()
  2105 + } else if (res.data.code == "201"){
  2106 + _this.preModel.flightno=_this.preModel.carrier+_this.preModel.flightno
  2107 + Message.error(res.data.msg);
  2108 + }else if (res.data.code == "202"){
  2109 + _this.preModel.flightno=_this.preModel.carrier+_this.preModel.flightno
  2110 + Message.error(res.data.msg)
  2111 + }else if (res.data.code == "203"){
  2112 + _this.preModel.flightno=_this.preModel.carrier+_this.preModel.flightno
  2113 + Message.error(res.data.msg)
1605 } 2114 }
1606 }) 2115 })
1607 } 2116 }
@@ -1968,4 +2477,56 @@ @@ -1968,4 +2477,56 @@
1968 .tableInline { 2477 .tableInline {
1969 line-height: 8px; 2478 line-height: 8px;
1970 } 2479 }
  2480 + .el-dialog-div{
  2481 + height: 60vh;
  2482 + overflow: auto;
  2483 + }
  2484 +
  2485 + .el-dialog-div .flight-info .select-lable{
  2486 + line-height: 27px;
  2487 + float:left;
  2488 + width:98px;
  2489 + font-size:12px;
  2490 + text-align: center;
  2491 + }
  2492 +
  2493 + .el-dialog-div .flight-info .el-select--mini{
  2494 + width: calc(100% - 100px)!important;
  2495 + }
  2496 +
  2497 + .el-dialog-div .flight-info .el-select--mini .el-input__inner,.el-dialog-div .flight-info .el-date-editor .el-input__inner{
  2498 + border-top-left-radius: 0;
  2499 + border-bottom-left-radius: 0;
  2500 + }
  2501 +
  2502 + .el-dialog-div .flight-info .select-lable{
  2503 + line-height: 27px;
  2504 + float:left;
  2505 + width:98px;
  2506 + font-size:12px;
  2507 + text-align: center;
  2508 + }
  2509 +
  2510 + .el-dialog-div .flight-info .el-select--mini{
  2511 + width: calc(100% - 100px)!important;
  2512 + }
  2513 +
  2514 + .el-dialog-div .flight-info .el-select--mini .el-input__inner,.el-dialog-div .flight-info .el-date-editor .el-input__inner{
  2515 + border-top-left-radius: 0;
  2516 + border-bottom-left-radius: 0;
  2517 + }
  2518 + .bpp .el-input__inner {
  2519 + background-color: #fff;
  2520 + border: 0px;
  2521 + }
  2522 + .sun{
  2523 + position: absolute;
  2524 + top: 5px;
  2525 + left: 0px;
  2526 + }
  2527 + .suns{
  2528 + position: absolute;
  2529 + top: 5px;
  2530 + left: 0px;
  2531 + }
1971 </style> 2532 </style>
  1 +<template>
  2 + <section>
  3 + <!--工具条-->
  4 + <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
  5 + <el-form :inline="true" :model="filters">
  6 + <el-form-item>
  7 + <el-input v-model="filters.fullName" placeholder="简称查询"></el-input>
  8 + </el-form-item>
  9 + <el-form-item>
  10 + <el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" v-on:click="getShipperList()">查询</el-button>
  11 + </el-form-item>
  12 + <el-form-item>
  13 + <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="companyAdd">新增</el-button>
  14 + </el-form-item>
  15 + <el-form-item>
  16 + <el-button type="danger" style="width:150px" icon="el-icon-delete" size="medium" @click="batchRemove">批量删除</el-button>
  17 + </el-form-item>
  18 + </el-form>
  19 + </el-col>
  20 + <!--列表-->
  21 + <el-table :data="shipperList" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
  22 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  23 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
  24 + <el-table-column type="selection" width="55">
  25 + </el-table-column>
  26 + <el-table-column prop="forShort" label="全称" >
  27 + </el-table-column>
  28 + <el-table-column prop="fullName" label="简称">
  29 + </el-table-column>
  30 + <el-table-column prop="theShipperType" label="类型">
  31 + <template slot-scope="scope">
  32 + <span v-if="scope.row.theShipperType == '1'" style="color: #ff4d51">发货人</span>
  33 + <span v-if="scope.row.theShipperType == '2'" style="color: #5BB75B">操作代理</span>
  34 + <span v-if="scope.row.theShipperType == '3'" style="color: #001528">订舱代理</span>
  35 + </template>
  36 + </el-table-column>
  37 + <el-table-column prop="contacts" label="联系人">
  38 + </el-table-column>
  39 + <el-table-column prop="phone" label="电话">
  40 + </el-table-column>
  41 + <el-table-column label="操作" min-width="180px" fixed="right">
  42 + <template slot-scope="scope">
  43 + <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
  44 + <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDel(scope.$index, scope.row)">删除</el-button>
  45 +<!-- <el-button type="primary" size="small" @click="print(scope.$index, scope.row)">打印</el-button>-->
  46 + </template>
  47 + </el-table-column>
  48 + </el-table>
  49 + <!--分页-->
  50 + <el-col :span="24" class="toolbar">
  51 + <el-pagination
  52 + @size-change="handleSizeChange"
  53 + @current-change="handleCurrentChange"
  54 + :current-page.sync="pageSize"
  55 + :page-sizes="[10, 30, 50, 100]"
  56 + :page-size=limitSize
  57 + layout="total,sizes, prev, pager, next"
  58 + :total=total>
  59 + </el-pagination>
  60 + </el-col>
  61 + <!--编辑界面-->
  62 + <el-dialog title="编辑" :visible.sync="editFormVisible" :close-on-click-modal="false" width="60%" text-align="center" tyle="margin-top: -20px">
  63 + <el-form :model="editForm" :rules="editFormRules" ref="editForm" align="center" label-width="145px" style="margin-top: -10px">
  64 + <el-row>
  65 + <el-col :span="4">
  66 + <el-form-item label="ID" hidden>
  67 + <span>{{editForm.id}}</span>
  68 + </el-form-item>
  69 + </el-col>
  70 + </el-row>
  71 + <el-row>
  72 + <el-col :span="8" style="margin-right: 20px">
  73 + <el-form-item label="" prop="forShort">
  74 + <el-input v-model="editForm.forShort" auto-complete="on" placeholder="全称" style="width:300px" size="small">
  75 + <template slot="prepend" >全称</template>
  76 + </el-input>
  77 + </el-form-item>
  78 + </el-col>
  79 + <el-col :span="8">
  80 + <el-form-item label="" prop="fullName">
  81 + <el-input v-model="editForm.fullName" onkeyup="this.value=this.value.toUpperCase()" auto-complete="on" placeholder="简称" style="width:300px" size="small">
  82 + <template slot="prepend" >简称</template>
  83 + </el-input>
  84 + </el-form-item>
  85 + </el-col>
  86 + </el-row>
  87 + <el-row>
  88 + <el-col :span="8" style="margin-right: 20px">
  89 + <el-form-item label="" prop="theShipperType">
  90 + <el-select v-model="editForm.theShipperType" placeholder="请选择货主类型">
  91 + <el-option
  92 + v-for="item in typeOptions"
  93 + :key="item.value"
  94 + :label="item.label"
  95 + :value="item.value">
  96 + </el-option>
  97 + </el-select>
  98 + </el-form-item>
  99 + </el-col>
  100 + <el-col :span="8">
  101 + <el-form-item label="" prop="destination">
  102 + <el-input v-model="editForm.contacts"
  103 + auto-complete="on" placeholder="联系人" style="width:300px" size="small">
  104 + <template slot="prepend" >联系人</template>
  105 + </el-input>
  106 + </el-form-item>
  107 + </el-col>
  108 + </el-row>
  109 + <el-row>
  110 +
  111 + <el-col :span="8" style="margin-right: 20px">
  112 + <el-form-item label="" prop="piece">
  113 + <el-input v-model="editForm.phone"
  114 + auto-complete="on" placeholder="phone" style="width:300px" size="small">
  115 + <template slot="prepend" >phone</template>
  116 + </el-input>
  117 + </el-form-item>
  118 + </el-col>
  119 + </el-row>
  120 + </el-form>
  121 + <div slot="footer" class="dialog-footer" align="center">
  122 + <el-button type="success" size="medium" style="width: 120px" @click.native="editSubmit(1)">保存</el-button>
  123 + </div>
  124 + </el-dialog>
  125 + <!--新增界面-->
  126 + <el-dialog title="新增" :visible.sync="addFormVisible" :close-on-click-modal="false" tyle="margin-top: -20px"
  127 + width="60%" text-align="center">
  128 + <el-form :model="addForm" label-width="145px" status-icon style="margin-top: -10px" align="center" :rules="addFormRules" ref="addForm">
  129 + <el-row>
  130 + <el-col :span="8" style="margin-right: 20px">
  131 + <el-form-item label="" prop="forShort">
  132 + <el-input v-model="addForm.forShort" auto-complete="on" placeholder="全称"
  133 + style="width:300px" size="small">
  134 + <template slot="prepend" >全称</template>
  135 + </el-input>
  136 + </el-form-item>
  137 + </el-col>
  138 + <el-col :span="8">
  139 + <el-form-item label="" prop="fullName">
  140 + <el-input v-model="addForm.fullName" onkeyup="this.value=this.value.toUpperCase()" auto-complete="on" placeholder="简称" style="width:300px" size="small">
  141 + <template slot="prepend" >简称</template>
  142 + </el-input>
  143 + </el-form-item>
  144 + </el-col>
  145 + </el-row>
  146 + <el-row>
  147 + <el-col :span="8" style="margin-right: 20px">
  148 + <el-form-item label="" prop="theShipperTypeList" >
  149 + <el-select v-model="addForm.theShipperTypeList" multiple placeholder="请选择货主类型">
  150 + <el-option
  151 + v-for="item in typeOptions"
  152 + :key="item.value"
  153 + :label="item.label"
  154 + :value="item.value">
  155 + </el-option>
  156 + </el-select>
  157 + </el-form-item>
  158 + </el-col>
  159 + <el-col :span="8">
  160 + <el-form-item label="" prop="contacts">
  161 + <el-input v-model="addForm.contacts"
  162 + auto-complete="on" placeholder="联系人" style="width:300px" size="small">
  163 + <template slot="prepend" >联系人</template>
  164 + </el-input>
  165 + </el-form-item>
  166 + </el-col>
  167 + </el-row>
  168 + <el-row>
  169 + <el-col :span="8" style="margin-right: 20px">
  170 + <el-form-item label="" prop="phone">
  171 + <el-input v-model="addForm.phone"
  172 + auto-complete="on" placeholder="电话" style="width:300px" size="small">
  173 + <template slot="prepend" >电话</template>
  174 + </el-input>
  175 + </el-form-item>
  176 + </el-col>
  177 + </el-row>
  178 + </el-form>
  179 + <div slot="footer" class="dialog-footer" align="center">
  180 + <el-button type="success" size="medium" style="width: 120px" @click.native="addSubmit(1)">保存</el-button>
  181 + </div>
  182 + </el-dialog>
  183 + </section>
  184 +</template>
  185 +<script>
  186 + import { getList, remove, add, edit} from '../../api/shipper/shipper';
  187 + export default {
  188 +
  189 + data() {
  190 + // Vue.component('barcode', VueBarcode);
  191 + return {
  192 + typeOptions: [{
  193 + value: '1',
  194 + label: '发货人'
  195 + }, {
  196 + value: '2',
  197 + label: '操作代理'
  198 + }, {
  199 + value: '3',
  200 + label: '订舱代理'
  201 + }],
  202 +
  203 + filters: {
  204 + fullName: ''
  205 + },
  206 + shipperList: [],
  207 + total: 0,
  208 + pageSize: 1,
  209 + limitSize: 10,
  210 + listLoading: false,
  211 + //编辑界面是否显示
  212 + editFormVisible: false,
  213 + editLoading: false,
  214 + printFormVisible: false,
  215 + editFormRules: {
  216 + forShort: [
  217 + { required: true, message: '请输入全称', trigger: 'blur' }
  218 + ],
  219 + fullName: [
  220 + { required: true, message: '请输入简称', trigger: 'blur' }
  221 + ],
  222 + theShipperType: [
  223 + { required: true, message: '请选择货主类型', trigger: 'blur' }
  224 + ],
  225 + contacts: [
  226 + { required: true, message: '请输入联系人', trigger: 'blur' }
  227 + ],
  228 + phone: [
  229 + { required: true, message: '请输入电话', trigger: 'blur' }
  230 + ]
  231 + },
  232 + //编辑界面数据
  233 + editForm: {
  234 + id:'',
  235 + forShort: '',
  236 + fullName: '',
  237 + theShipperType: '',
  238 + contacts: '',
  239 + phone: ''
  240 + },
  241 + //新增界面是否显示
  242 + addFormVisible: false,
  243 + addFormRules: {
  244 + forShort: [
  245 + { required: true, message: '请输入全称', trigger: 'blur' }
  246 + ],
  247 + fullName: [
  248 + { required: true, message: '请输入简称', trigger: 'blur' }
  249 + ],
  250 + theShipperTypeList: [
  251 + { required: true, message: '请选择货主类型', trigger: 'blur' }
  252 + ],
  253 + contacts: [
  254 + { required: true, message: '请输入联系人', trigger: 'blur' }
  255 + ],
  256 + phone: [
  257 + { required: true, message: '请输入电话', trigger: 'blur' }
  258 + ]
  259 + },
  260 +
  261 + //新增界面数据
  262 + addForm: {
  263 + id:'',
  264 + forShort: '',
  265 + fullName: '',
  266 + theShipperType: '',
  267 + contacts: '',
  268 + phone: '',
  269 + theShipperTypeList:''
  270 + }
  271 + }
  272 + },
  273 + mounted() {
  274 + this.getShipperList();
  275 + },
  276 + methods: {
  277 +
  278 + /**
  279 + * 分页
  280 + * @param val
  281 + */
  282 + handleSizeChange(val) {
  283 + this.limitSize = val;
  284 + this.getShipperList();
  285 + },
  286 + handleCurrentChange(val) {
  287 + this.pageSize = val;
  288 + this.getShipperList();
  289 + },
  290 +
  291 + //获取货主信息列表
  292 + getShipperList() {
  293 + let para = {
  294 + pageSize: this.pageSize,
  295 + limitSize: this.limitSize,
  296 + fullName: this.filters.fullName
  297 + };
  298 + this.listLoading = true;
  299 + getList(para).then((res) => {
  300 + this.total = res.data.data.total;
  301 + this.shipperList = res.data.data.list;
  302 + this.listLoading = false;
  303 + }).catch((error) => {
  304 + this.listLoading = false;
  305 + if(null!= error.response && error.response!==undefined){
  306 + let status= error.response.status;
  307 + let msg = error.response.statusText;
  308 + alert(status+msg);
  309 + }else {
  310 + alert(error);
  311 + }
  312 +
  313 + });
  314 +
  315 + },
  316 + //删除
  317 + handleDel: function (index, row) {
  318 + this.$confirm('确认删除该记录吗?', '提示', {
  319 + type: 'warning'
  320 + }).then(() => {
  321 + this.listLoading = true;
  322 + let para = {ids: row.id };
  323 + remove(para).then((res) => {
  324 + if (res.data.code == '200'){
  325 + this.listLoading = false;
  326 + this.$message({
  327 + message: res.data.msg,
  328 + type: 'success'
  329 + });
  330 + this.getShipperList();
  331 + }else {
  332 + this.listLoading = false;
  333 + this.$message({
  334 + message: res.data.msg,
  335 + type: 'error'
  336 + });
  337 + this.getShipperList();
  338 + }
  339 +
  340 + }).catch((error) => {
  341 + this.listLoading = false;
  342 + alert(error);
  343 + });
  344 + }).catch();
  345 + },
  346 + /**
  347 + * 显示编辑界面
  348 + * @param index
  349 + * @param row 为这行的数据对象
  350 + */
  351 + handleEdit: function (index, row) {
  352 + this.editFormVisible = true;
  353 + this.editForm = Object.assign({}, row);
  354 + this.getShipperList();
  355 + },
  356 + //编辑
  357 + editSubmit: function (value) {
  358 + this.$refs.editForm.validate((valid) => {
  359 + if (valid) {
  360 + this.$confirm('确认提交吗？', '提示', {}).then(() => {
  361 + this.editLoading = true;
  362 + let para = Object.assign({}, this.editForm);
  363 + this.editLoading = true;
  364 + edit(para).then((res) => {
  365 + if (res.data.code == '200'){
  366 + this.$message({
  367 + message: res.data.msg,
  368 + type: 'success'
  369 + });
  370 + this.$refs['editForm'].resetFields();
  371 + this.editFormVisible = false;
  372 + this.getShipperList();
  373 + }else {
  374 + this.$message({
  375 + message: res.data.msg,
  376 + type: 'error'
  377 + });
  378 + }
  379 + }).catch(error => alert(error));
  380 + }).catch(() =>{
  381 +
  382 + });
  383 + }
  384 + });
  385 + },
  386 + //显示新增界面，每次点开初始化数据
  387 + companyAdd: function () {
  388 + if (this.$refs['addForm'] != null){
  389 + this.$refs['addForm'].resetFields();
  390 + }
  391 + this.addFormVisible = true;
  392 + this.getShipperList();
  393 + },
  394 +
  395 + // 新增
  396 + addSubmit: function (value) {
  397 + this.$refs.addForm.validate((valid) => {
  398 + if (valid) {
  399 + this.$confirm('确认提交吗？', '提示', {}).then(() => {
  400 + let para = Object.assign({}, this.addForm);
  401 + add(para).then((res) => {
  402 + if (res.data.code == '200'){
  403 + this.$message({
  404 + message: res.data.msg,
  405 + type: 'success'
  406 + });
  407 + this.$refs['addForm'].resetFields();
  408 + this.addFormVisible = false;
  409 + this.getShipperList();
  410 + }else {
  411 + this.$message({
  412 + message: res.data.msg,
  413 + type: 'error'
  414 + });
  415 + }
  416 + }).catch(error => alert(error));
  417 + }).catch(() =>{
  418 +
  419 + });
  420 + }
  421 + });
  422 + },
  423 + selsChange: function (sels) {
  424 + this.sels = sels;
  425 + },
  426 +
  427 +
  428 +
  429 + //批量删除
  430 + batchRemove: function () {
  431 + var ids = this.sels.map(item => item.id).toString();
  432 + this.$confirm('确认删除选中记录吗？', '提示', {
  433 + type: 'warning'
  434 + }).then(() => {
  435 + this.listLoading = true;
  436 + //NProgress.start();
  437 + let para = { ids: ids };
  438 + remove(para).then((res) => {
  439 + this.listLoading = false;
  440 + //NProgress.done();
  441 + this.$message({
  442 + message: '删除成功',
  443 + type: 'success'
  444 + });
  445 + this.getShipperList();
  446 + });
  447 + }).catch(() => {
  448 +
  449 + });
  450 + },
  451 + },
  452 +
  453 + }
  454 +</script>
  455 +<style>
  456 + .el-input-group__prepend {
  457 + background-color: #6F8294;
  458 + color:#ffffff
  459 + }
  460 + .el-input__inner{
  461 + background-color: #F7F7F7;
  462 + }
  463 + .el-dialog-div .flight-info .select-lable{
  464 + line-height: 17px;
  465 + float:left;
  466 + width:80px;
  467 + font-size:12px;
  468 + text-align: center;
  469 + }
  470 +
  471 +</style>