Merge remote-tracking branch 'origin/master'
正在显示
27 个修改的文件
包含
3397 行增加
和
855 行删除
| @@ -19,6 +19,31 @@ let baseUrlBillcreden = 'air-server-transport/transport/creden' | @@ -19,6 +19,31 @@ let baseUrlBillcreden = 'air-server-transport/transport/creden' | ||
| 19 | let baseUrlExact = 'air-server-transport/exactPlanConfig' | 19 | let baseUrlExact = 'air-server-transport/exactPlanConfig' |
| 20 | //预报 | 20 | //预报 |
| 21 | let baseUrlConfig = 'air-server-transport/prePlanConfig' | 21 | let baseUrlConfig = 'air-server-transport/prePlanConfig' |
| 22 | +//物料申报 | ||
| 23 | +let baseUrlSupply = 'air-server-transport/transport/supplymatter' | ||
| 24 | +let baseUrlCargo = 'air-server-transport/transport/cargodetails' | ||
| 25 | +//国际转运 | ||
| 26 | +let baseUrlTrans = 'nmms-server-import/nmms/mt8205' | ||
| 27 | + | ||
| 28 | + | ||
| 29 | +//国际转运 | ||
| 30 | +export const selectMt8205 = params => { return http.get(`${baseUrlTrans}/selectMt8205`, params); }; | ||
| 31 | +export const addMt8205 = params => { return http.post(`${baseUrlTrans}/addMt8205`, params); }; | ||
| 32 | +export const ediMt8205 = params => { return http.post(`${baseUrlTrans}/ediMt8205`, params); }; | ||
| 33 | +export const delMt8205 = params => { return http.get(`${baseUrlTrans}/delMt8205`, params); }; | ||
| 34 | +export const sendCreateMt8205 = params => { return http.post(`${baseUrlTrans}/sendCreateMt8205`, params); }; | ||
| 35 | + | ||
| 36 | + | ||
| 37 | +//物料申报管理 | ||
| 38 | +export const addSupplyMatter = params => { return http.post(`${baseUrlSupply}/addSupplyMatter`, params); }; | ||
| 39 | +export const ediSupplyMatter = params => { return http.post(`${baseUrlSupply}/ediSupplyMatter`, params); }; | ||
| 40 | +export const delSupplyMatter = params => { return http.post(`${baseUrlSupply}/delSupplyMatter`, params); }; | ||
| 41 | +export const selectSupplyMatter = params => { return http.post(`${baseUrlSupply}/selectSupplyMatter`, params); }; | ||
| 42 | +export const sendSupplyMatter = params => { return http.post(`${baseUrlSupply}/sendSupplyMatter`, params); }; | ||
| 43 | +//货物明细 | ||
| 44 | +export const addCargoDetails = params => { return http.post(`${baseUrlCargo}/addCargoDetails`, params); }; | ||
| 45 | +export const delCargoDetails = params => { return http.post(`${baseUrlCargo}/delCargoDetails`, params); }; | ||
| 46 | +export const selectCargoDetails = params => { return http.get(`${baseUrlCargo}/selectCargoDetails`, params); }; | ||
| 22 | 47 | ||
| 23 | 48 | ||
| 24 | 49 |
| @@ -8,7 +8,7 @@ import store from './vuex/store' | @@ -8,7 +8,7 @@ import store from './vuex/store' | ||
| 8 | import Vuex from 'vuex' | 8 | import Vuex from 'vuex' |
| 9 | import axios from 'axios' | 9 | import axios from 'axios' |
| 10 | import rout from './routes' | 10 | import rout from './routes' |
| 11 | -import Mock from './mock' | 11 | +// import Mock from './mock' |
| 12 | import i18n from './lang' | 12 | import i18n from './lang' |
| 13 | import 'font-awesome/css/font-awesome.min.css' | 13 | import 'font-awesome/css/font-awesome.min.css' |
| 14 | 14 | ||
| @@ -29,10 +29,10 @@ Vue.filter('datefmt',function(input,fmtstring){ | @@ -29,10 +29,10 @@ Vue.filter('datefmt',function(input,fmtstring){ | ||
| 29 | }); | 29 | }); |
| 30 | 30 | ||
| 31 | // 注册websocket组件到VUE | 31 | // 注册websocket组件到VUE |
| 32 | -Vue.prototype.socketApi = socketApi | 32 | +// Vue.prototype.socketApi = socketApi |
| 33 | 33 | ||
| 34 | Vue.config.productionTip = false | 34 | Vue.config.productionTip = false |
| 35 | -Mock.bootstrap(); | 35 | +// Mock.bootstrap(); |
| 36 | Vue.use(ElementUI, | 36 | Vue.use(ElementUI, |
| 37 | { | 37 | { |
| 38 | // eslint-disable-next-line no-undef | 38 | // eslint-disable-next-line no-undef |
| @@ -100,6 +100,10 @@ import Consignee from './views/consigner/consignee.vue' | @@ -100,6 +100,10 @@ import Consignee from './views/consigner/consignee.vue' | ||
| 100 | import Shipper from './views/shipper/shipper.vue' | 100 | import Shipper from './views/shipper/shipper.vue' |
| 101 | import Security from './views/security/security.vue' | 101 | import Security from './views/security/security.vue' |
| 102 | import dynamics from './views/airtransport/dynamics.vue' | 102 | import dynamics from './views/airtransport/dynamics.vue' |
| 103 | +import matter from './views/airtransport/matter.vue' | ||
| 104 | +//国际转运 | ||
| 105 | +import transfer from './views/airtransport/transfer.vue' | ||
| 106 | +// import transpour from './views/airtransport/transpour.vue' | ||
| 103 | 107 | ||
| 104 | 108 | ||
| 105 | 109 | ||
| @@ -115,7 +119,7 @@ import Way from './views/nav3/Way.vue' | @@ -115,7 +119,7 @@ import Way from './views/nav3/Way.vue' | ||
| 115 | //朱总让做的网页在线客服 | 119 | //朱总让做的网页在线客服 |
| 116 | import Webdialog from './views/bus/Webdialog.vue' | 120 | import Webdialog from './views/bus/Webdialog.vue' |
| 117 | 121 | ||
| 118 | -//国际转运 | 122 | +//转运申请 |
| 119 | import Transport from './views/nav4/Transport.vue' | 123 | import Transport from './views/nav4/Transport.vue' |
| 120 | 124 | ||
| 121 | /* 车辆调度系统 */ | 125 | /* 车辆调度系统 */ |
| @@ -462,6 +466,18 @@ let routes = [ | @@ -462,6 +466,18 @@ let routes = [ | ||
| 462 | iconCls:'el-icon-goods', | 466 | iconCls:'el-icon-goods', |
| 463 | children:[ | 467 | children:[ |
| 464 | {path:'/dynamics',component:dynamics,name:'在港动态信息'}, | 468 | {path:'/dynamics',component:dynamics,name:'在港动态信息'}, |
| 469 | + {path:'/matter',component:matter,name:'物料申报管理'} | ||
| 470 | + ] | ||
| 471 | + }, | ||
| 472 | + { | ||
| 473 | + path: '/', | ||
| 474 | + component: HomeNew, | ||
| 475 | + name: '国际转运', | ||
| 476 | + iconCls:'el-icon-goods', | ||
| 477 | + children:[ | ||
| 478 | + {path:'/transfer',component:transfer,name:'国际转运'}, | ||
| 479 | + // {path:'/transpour',component:transpour,name:'转运导入'} | ||
| 480 | + | ||
| 465 | ] | 481 | ] |
| 466 | }, | 482 | }, |
| 467 | { | 483 | { |
| @@ -226,7 +226,7 @@ | @@ -226,7 +226,7 @@ | ||
| 226 | this.collapsed=!this.collapsed; | 226 | this.collapsed=!this.collapsed; |
| 227 | }, | 227 | }, |
| 228 | checkUpdate() { | 228 | checkUpdate() { |
| 229 | - axios.get('http://localhost:12021/static/nmmsVer.json').then(function(response) { | 229 | + axios.get('/static/nmmsVer.json').then(function(response) { |
| 230 | // 判断版本号是否与本地一致 | 230 | // 判断版本号是否与本地一致 |
| 231 | if (response.data.nmmsVer != localStorage.getItem('nmmsVer')) { | 231 | if (response.data.nmmsVer != localStorage.getItem('nmmsVer')) { |
| 232 | localStorage.setItem('nmmsVer', response.data.nmmsVer) | 232 | localStorage.setItem('nmmsVer', response.data.nmmsVer) |
src/views/airtransport/matter.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <section> | ||
| 3 | + <!--工具条--> | ||
| 4 | + <el-row class="toolbar"> | ||
| 5 | + <el-form :inline="true" :model="form"> | ||
| 6 | + <el-form-item> | ||
| 7 | + <el-input v-model="form.aircraftflightno" placeholder="航班号"></el-input> | ||
| 8 | + </el-form-item> | ||
| 9 | + <el-form-item> | ||
| 10 | + <el-button type="primary" @click="getList">查询</el-button> | ||
| 11 | + </el-form-item> | ||
| 12 | + <el-form-item> | ||
| 13 | + <el-button type="success" @click="add">新增</el-button> | ||
| 14 | + </el-form-item> | ||
| 15 | + </el-form> | ||
| 16 | + </el-row> | ||
| 17 | + <!-- 表单区域--> | ||
| 18 | + <el-row :span="24" class="toolbar" style="margin-top: 40px"> | ||
| 19 | + <el-col :span="24"> | ||
| 20 | + <el-table | ||
| 21 | + highlight-current-row | ||
| 22 | + @selection-change="matterChange" | ||
| 23 | + style="border-radius: 10px 10px 0px 0px" | ||
| 24 | + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" | ||
| 25 | + ref="multipleTable" | ||
| 26 | + :data="tableData" | ||
| 27 | + tooltip-effect="dark"> | ||
| 28 | + <el-table-column | ||
| 29 | + type="selection" | ||
| 30 | + width="45"> | ||
| 31 | + </el-table-column> | ||
| 32 | + <el-table-column | ||
| 33 | + type="index" | ||
| 34 | + :index="indexMethod" | ||
| 35 | + width="45"> | ||
| 36 | + </el-table-column> | ||
| 37 | + <el-table-column | ||
| 38 | + prop="num" | ||
| 39 | + label="编号" | ||
| 40 | + width="80"> | ||
| 41 | + </el-table-column> | ||
| 42 | + <el-table-column | ||
| 43 | + prop="aircraftnum" | ||
| 44 | + label="物料添加航空器编号" | ||
| 45 | + width="130"> | ||
| 46 | + </el-table-column> | ||
| 47 | + <el-table-column | ||
| 48 | + prop="aircraftflightno" | ||
| 49 | + label="航班号" | ||
| 50 | + width="80"> | ||
| 51 | + </el-table-column> | ||
| 52 | + <el-table-column | ||
| 53 | + prop="aircraftflightdate" | ||
| 54 | + label="物料添加航班日期" | ||
| 55 | + width="140"> | ||
| 56 | + </el-table-column> | ||
| 57 | + <el-table-column | ||
| 58 | + prop="unaircraftnum" | ||
| 59 | + label="物料起卸航空器编号" | ||
| 60 | + width="130"> | ||
| 61 | + </el-table-column> | ||
| 62 | + <el-table-column | ||
| 63 | + prop="unaircraftflightno" | ||
| 64 | + label="物料起卸航班号" | ||
| 65 | + width="130"> | ||
| 66 | + </el-table-column> | ||
| 67 | + <el-table-column | ||
| 68 | + prop="unaircraftlightdate" | ||
| 69 | + label="物料起卸航班日期" | ||
| 70 | + width="140"> | ||
| 71 | + </el-table-column> | ||
| 72 | + <el-table-column | ||
| 73 | + prop="bustype" | ||
| 74 | + label="业务类型" | ||
| 75 | + width="80"> | ||
| 76 | + <template slot-scope="scope"> | ||
| 77 | + <span v-if="scope.row.bustype ==='1'">起卸</span> | ||
| 78 | + <span v-if="scope.row.bustype ==='3'">添加</span> | ||
| 79 | + <span v-if="scope.row.bustype ==='5'">调拨</span> | ||
| 80 | + </template> | ||
| 81 | + </el-table-column> | ||
| 82 | + <el-table-column | ||
| 83 | + prop="remark5" | ||
| 84 | + label="填写时间" | ||
| 85 | + width="140"> | ||
| 86 | + </el-table-column> | ||
| 87 | + <el-table-column | ||
| 88 | + prop="add" | ||
| 89 | + width="120" | ||
| 90 | + label="海关备案状态"> | ||
| 91 | + </el-table-column> | ||
| 92 | + <el-table-column label="操作" width="300" fixed="right"> | ||
| 93 | + <template slot-scope="scope"> | ||
| 94 | + <el-button type="success" size="mini" @click="edit(scope.$index,scope.row)">编辑</el-button> | ||
| 95 | + | ||
| 96 | + <el-button type="warning" size="mini" @click="apply(scope.row)"> | ||
| 97 | + 申请 | ||
| 98 | + </el-button> | ||
| 99 | + <el-button type="primary" size="mini"> | ||
| 100 | + 完成 | ||
| 101 | + </el-button> | ||
| 102 | + <el-button type="danger" size="mini" @click="del(scope.row)"> | ||
| 103 | + 删除 | ||
| 104 | + </el-button> | ||
| 105 | + </template> | ||
| 106 | + | ||
| 107 | + </el-table-column> | ||
| 108 | + </el-table> | ||
| 109 | + | ||
| 110 | + </el-col> | ||
| 111 | + <!--分页区域--> | ||
| 112 | + <el-col :span="24" style="margin-bottom: 40px;margin-top: 10px"> | ||
| 113 | + <el-pagination | ||
| 114 | + :current-page="form.pageNum" | ||
| 115 | + :page-sizes="[10, 50, 100, 500]" | ||
| 116 | + :page-size="form.pageSize" | ||
| 117 | + layout="total, sizes, prev, pager, next, jumper" | ||
| 118 | + :total="total" | ||
| 119 | + @size-change="handleSizeChange" | ||
| 120 | + @current-change="handleCurrentChange" | ||
| 121 | + /> | ||
| 122 | + </el-col> | ||
| 123 | + </el-row> | ||
| 124 | +<!-- 弹框区域--> | ||
| 125 | + <el-row> | ||
| 126 | + <el-dialog | ||
| 127 | + :title="dialogMap[dialogStatus]" | ||
| 128 | + :visible.sync="supply_dialog.addDialog" | ||
| 129 | + style="margin-top: -50px" | ||
| 130 | + text-align="center" | ||
| 131 | + width="95%"> | ||
| 132 | + <template> | ||
| 133 | + <el-tabs v-model="activeName" @tab-click="handleClick"> | ||
| 134 | + <el-tab-pane label="供退物料信息" name="first"> | ||
| 135 | + <el-form ref="formSupply" :inline="true" :model="formSupply" label-width="145px" label-position="right" :rules="rulesSupply" > | ||
| 136 | + <el-row style="margin-bottom: 10px"> | ||
| 137 | + <el-col :span="24"> | ||
| 138 | + <div class="grid-content content">申报单位</div> | ||
| 139 | + </el-col> | ||
| 140 | + </el-row> | ||
| 141 | + <el-row> | ||
| 142 | + <el-col :span="8"> | ||
| 143 | + <el-form-item label="海关关区" prop="customcode"> | ||
| 144 | + <el-input v-model="formSupply.customcode" placeholder="" suffix-icon=“xxxx”></el-input> | ||
| 145 | + </el-form-item> | ||
| 146 | + </el-col> | ||
| 147 | + <el-col :span="8"> | ||
| 148 | + <el-form-item label="申报单流水号" prop="serialnum"> | ||
| 149 | + <el-input v-model="formSupply.serialnum" placeholder="" suffix-icon=“xxxx” /> | ||
| 150 | + </el-form-item> | ||
| 151 | + </el-col> | ||
| 152 | + </el-row> | ||
| 153 | + <el-row style="margin-bottom: 10px"> | ||
| 154 | + <el-col :span="24"> | ||
| 155 | + <div class="grid-content content">供退物料信息</div> | ||
| 156 | + </el-col> | ||
| 157 | + </el-row> | ||
| 158 | + <el-row> | ||
| 159 | + <el-col :span="8"> | ||
| 160 | + <el-form-item label="业务类型" prop="bustype"> | ||
| 161 | + <div v-if="dialogStatus === 'update'"> | ||
| 162 | + <el-select disabled="" v-model="formSupply.bustype" placeholder="请选择" size="mini"> | ||
| 163 | + <el-option label="1-起卸" value="1"></el-option> | ||
| 164 | + <el-option label="3-添加" value="3"></el-option> | ||
| 165 | + <el-option label="5-调拨" value="5"></el-option> | ||
| 166 | + </el-select> | ||
| 167 | + </div> | ||
| 168 | + <div v-else> | ||
| 169 | + <el-select v-model="formSupply.bustype" placeholder="请选择" size="mini"> | ||
| 170 | + <el-option label="1-起卸" value="1"></el-option> | ||
| 171 | + <el-option label="3-添加" value="3"></el-option> | ||
| 172 | + <el-option label="5-调拨" value="5"></el-option> | ||
| 173 | + </el-select> | ||
| 174 | + </div> | ||
| 175 | + </el-form-item> | ||
| 176 | +<!-- <el-form-item label="业务类型" prop="bustype">--> | ||
| 177 | +<!-- <el-select v-model="formSupply.bustype" placeholder="请选择" size="mini" :disabled="false">--> | ||
| 178 | +<!-- <el-option label="1-起卸" value="起卸"></el-option>--> | ||
| 179 | +<!-- <el-option label="3-添加" value="添加"></el-option>--> | ||
| 180 | +<!-- <el-option label="5-调拨" value="调拨"></el-option>--> | ||
| 181 | +<!-- </el-select>--> | ||
| 182 | +<!-- </el-form-item>--> | ||
| 183 | + </el-col> | ||
| 184 | + <el-col :span="8"> | ||
| 185 | + <el-form-item label="运输工具企业代码" prop="enterprisecode"> | ||
| 186 | + <el-input v-model="formSupply.enterprisecode" placeholder="" suffix-icon=“xxxx” /> | ||
| 187 | + </el-form-item> | ||
| 188 | + </el-col> | ||
| 189 | + <el-col :span="8"> | ||
| 190 | + <el-form-item label="出发港" prop="destination"> | ||
| 191 | + <el-input v-model="formSupply.destination" placeholder="" suffix-icon=“xxxx” /> | ||
| 192 | + </el-form-item> | ||
| 193 | + </el-col> | ||
| 194 | + </el-row> | ||
| 195 | + <el-row> | ||
| 196 | + <el-col :span="8"> | ||
| 197 | + <el-form-item label="物料添加航空器编号 " prop="aircraftnum"> | ||
| 198 | + <el-input v-model="formSupply.aircraftnum" placeholder="" suffix-icon=“xxxx”></el-input> | ||
| 199 | + </el-form-item> | ||
| 200 | + </el-col> | ||
| 201 | + <el-col :span="8"> | ||
| 202 | + <el-form-item label="物料添加航班号" prop="aircraftflightno"> | ||
| 203 | + <el-input v-model="formSupply.aircraftflightno" placeholder="" suffix-icon=“xxxx” /> | ||
| 204 | + </el-form-item> | ||
| 205 | + </el-col> | ||
| 206 | + <el-col :span="8"> | ||
| 207 | + <el-form-item label="物料添加航班日期" prop="aircraftflightdate"> | ||
| 208 | + <el-date-picker | ||
| 209 | + v-model="formSupply.aircraftflightdate" | ||
| 210 | + type="date" size="mini" | ||
| 211 | + value-format="yyyy-MM-dd" | ||
| 212 | + format="yyyy-MM-dd" | ||
| 213 | + style="width:93%" | ||
| 214 | + placeholder="选择日期"> | ||
| 215 | + </el-date-picker> | ||
| 216 | + </el-form-item> | ||
| 217 | + </el-col> | ||
| 218 | + </el-row> | ||
| 219 | + <el-row> | ||
| 220 | + <el-col :span="8"> | ||
| 221 | + <el-form-item label="物料起卸航空器编号" prop="unaircraftnum"> | ||
| 222 | + <el-input v-model="formSupply.unaircraftnum" placeholder="" suffix-icon=“xxxx”></el-input> | ||
| 223 | + </el-form-item> | ||
| 224 | + </el-col> | ||
| 225 | + <el-col :span="8"> | ||
| 226 | + <el-form-item label="物料起卸航班号" prop="unaircraftflightno"> | ||
| 227 | + <el-input v-model="formSupply.unaircraftflightno" placeholder="" suffix-icon=“xxxx” /> | ||
| 228 | + </el-form-item> | ||
| 229 | + </el-col> | ||
| 230 | + <el-col :span="8"> | ||
| 231 | + <el-form-item label="物料起卸航班日期" prop="unaircraftlightdate"> | ||
| 232 | + <el-date-picker | ||
| 233 | + v-model="formSupply.unaircraftlightdate" | ||
| 234 | + type="date" size="mini" | ||
| 235 | + value-format="yyyy-MM-dd" | ||
| 236 | + format="yyyy-MM-dd" | ||
| 237 | + style="width:93%" | ||
| 238 | + placeholder="选择日期"> | ||
| 239 | + </el-date-picker> | ||
| 240 | + </el-form-item> | ||
| 241 | + </el-col> | ||
| 242 | + </el-row> | ||
| 243 | + <el-row style="margin-bottom: 10px"> | ||
| 244 | + <el-col :span="24"> | ||
| 245 | + <div class="grid-content content">备注信息</div> | ||
| 246 | + </el-col> | ||
| 247 | + </el-row> | ||
| 248 | + <el-row> | ||
| 249 | + <el-col :span="24"> | ||
| 250 | + <el-form-item label="备注" prop="remark"> | ||
| 251 | + <el-input | ||
| 252 | + v-model="formSupply.remark" | ||
| 253 | + type="textarea" | ||
| 254 | + :rows="1" style="width: 520px" | ||
| 255 | + placeholder="请输入内容" | ||
| 256 | + /> | ||
| 257 | + </el-form-item> | ||
| 258 | + </el-col> | ||
| 259 | + </el-row> | ||
| 260 | + <el-row style="margin-bottom: 5px;margin-top: 25px"> | ||
| 261 | + <el-col :span="24" :offset="9"> | ||
| 262 | + <el-form-item > | ||
| 263 | + <el-button style="width: 100px" type="info" @click="supply_dialog.addDialog = false">取消</el-button> | ||
| 264 | + <el-button type="primary" style="width: 100px" @click="dialogStatus==='create'?mat_add():mat_edit()">提交</el-button> | ||
| 265 | + </el-form-item> | ||
| 266 | + </el-col> | ||
| 267 | + </el-row> | ||
| 268 | + </el-form> | ||
| 269 | + </el-tab-pane> | ||
| 270 | + <el-tab-pane label="货物明细信息" name="second"> | ||
| 271 | + <el-form ref="formCargo" :inline="true" :model="formCargo" label-width="70px" label-position="right" :rules="rulesCargo" > | ||
| 272 | + <el-row> | ||
| 273 | + <el-col :span="24"> | ||
| 274 | + <div class="grid-content content">货物信息</div> | ||
| 275 | + </el-col> | ||
| 276 | + </el-row> | ||
| 277 | + <el-row> | ||
| 278 | + <el-col :span="6"> | ||
| 279 | + <el-form-item label="物料" prop="material"> | ||
| 280 | + <el-select v-model="formCargo.material" placeholder="请选择" size="mini"> | ||
| 281 | + <el-option label="1-航油" value="1"></el-option> | ||
| 282 | + <el-option label="2-航材" value="2"></el-option> | ||
| 283 | + <el-option label="3-免税品" value="3"></el-option> | ||
| 284 | + <el-option label="4-航空食品" value="4"></el-option> | ||
| 285 | + <el-option label="5-其他" value="5"></el-option> | ||
| 286 | + </el-select> | ||
| 287 | + </el-form-item> | ||
| 288 | + </el-col> | ||
| 289 | + <el-col :span="6"> | ||
| 290 | + <el-form-item label="物品名称" prop="itemname"> | ||
| 291 | + <el-input v-model="formCargo.itemname" placeholder="" suffix-icon=“xxxx” /> | ||
| 292 | + </el-form-item> | ||
| 293 | + </el-col> | ||
| 294 | + <el-col :span="6"> | ||
| 295 | + <el-form-item label="申请数量" prop="applynum"> | ||
| 296 | + <el-input v-model="formCargo.applynum" placeholder="" suffix-icon=“xxxx”></el-input> | ||
| 297 | + </el-form-item> | ||
| 298 | + </el-col> | ||
| 299 | + <el-col :span="6"> | ||
| 300 | + <el-form-item label="计量单位" prop="unit"> | ||
| 301 | + <el-select v-model="formCargo.unit" placeholder="请选择" size="mini"> | ||
| 302 | + <el-option label="000-无" value="000"></el-option> | ||
| 303 | + <el-option label="001-台" value="001"></el-option> | ||
| 304 | + <el-option label="002-座" value="002"></el-option> | ||
| 305 | + <el-option label="003-辆" value="003"></el-option> | ||
| 306 | + <el-option label="004-艘" value="004"></el-option> | ||
| 307 | + <el-option label="005-架" value="005"></el-option> | ||
| 308 | + <el-option label="006-套" value="006"></el-option> | ||
| 309 | + <el-option label="007-个" value="007"></el-option> | ||
| 310 | + <el-option label="008-只" value="008"></el-option> | ||
| 311 | + <el-option label="009-头" value="009"></el-option> | ||
| 312 | + <el-option label="010-张" value="010"></el-option> | ||
| 313 | + <el-option label="011-件" value="011"></el-option> | ||
| 314 | + <el-option label="012-支" value="012"></el-option> | ||
| 315 | + <el-option label="013-枝" value="013"></el-option> | ||
| 316 | + <el-option label="014-根" value="014"></el-option> | ||
| 317 | + <el-option label="015-条" value="015"></el-option> | ||
| 318 | + <el-option label="016-把" value="016"></el-option> | ||
| 319 | + <el-option label="017-块" value="017"></el-option> | ||
| 320 | + <el-option label="018-卷" value="018"></el-option> | ||
| 321 | + <el-option label="019-副" value="019"></el-option> | ||
| 322 | + </el-select> | ||
| 323 | + </el-form-item> | ||
| 324 | + </el-col> | ||
| 325 | + </el-row> | ||
| 326 | + <el-row style="margin-bottom: 10px"> | ||
| 327 | + <el-col :span="24"> | ||
| 328 | + <div class="grid-content content">备注信息</div> | ||
| 329 | + </el-col> | ||
| 330 | + </el-row> | ||
| 331 | + <el-row style="margin-bottom: 10px"> | ||
| 332 | + <el-col :span="12"> | ||
| 333 | + <el-form-item label="备注" prop="remark"> | ||
| 334 | + <el-input | ||
| 335 | + v-model="formCargo.remark" | ||
| 336 | + type="textarea" | ||
| 337 | + :rows="1" style="width: 400px" | ||
| 338 | + placeholder="请输入内容" | ||
| 339 | + /> | ||
| 340 | + </el-form-item> | ||
| 341 | + </el-col> | ||
| 342 | + <el-col :span="12"> | ||
| 343 | + <el-form-item> | ||
| 344 | + <el-button type="primary" @click="getListCargo">查询</el-button> | ||
| 345 | + </el-form-item> | ||
| 346 | + <el-form-item> | ||
| 347 | + <el-button type="success" @click="addCargo">保存</el-button> | ||
| 348 | + </el-form-item> | ||
| 349 | + </el-col> | ||
| 350 | + </el-row> | ||
| 351 | + </el-form> | ||
| 352 | + <el-table | ||
| 353 | + @selection-change="handleSelectionChangeMat" | ||
| 354 | + style="border-radius: 10px 10px 0px 0px;margin-bottom: 20px" | ||
| 355 | + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" | ||
| 356 | + ref="multipleTable" | ||
| 357 | + :data="tableDataCargo" | ||
| 358 | + tooltip-effect="dark"> | ||
| 359 | + <el-table-column | ||
| 360 | + type="selection" | ||
| 361 | + width="55"> | ||
| 362 | + </el-table-column> | ||
| 363 | + <el-table-column | ||
| 364 | + type="index" | ||
| 365 | + width="50"> | ||
| 366 | + </el-table-column> | ||
| 367 | + <el-table-column | ||
| 368 | + prop="material" | ||
| 369 | + label="物料" | ||
| 370 | + width="120"> | ||
| 371 | + </el-table-column> | ||
| 372 | + <el-table-column | ||
| 373 | + prop="itemname" | ||
| 374 | + label="物品名称" | ||
| 375 | + width="120"> | ||
| 376 | + </el-table-column> | ||
| 377 | + <el-table-column | ||
| 378 | + prop="applynum" | ||
| 379 | + label="申请数量"> | ||
| 380 | + </el-table-column> | ||
| 381 | + <el-table-column | ||
| 382 | + prop="unit" | ||
| 383 | + label="计量单位" | ||
| 384 | + width="120"> | ||
| 385 | + </el-table-column> | ||
| 386 | + <el-table-column | ||
| 387 | + prop="remark" | ||
| 388 | + label="备注" | ||
| 389 | + show-overflow-tooltip> | ||
| 390 | + </el-table-column> | ||
| 391 | + <el-table-column label="操作" fixed="right" width="120"> | ||
| 392 | + <template slot-scope="scope"> | ||
| 393 | + <el-button type="danger" size="mini" @click="delCargo(scope.row)"> | ||
| 394 | + 删除 | ||
| 395 | + </el-button> | ||
| 396 | + </template> | ||
| 397 | + </el-table-column> | ||
| 398 | + </el-table> | ||
| 399 | + <!--分页区域--> | ||
| 400 | + <el-col :span="24" style="margin-top: 20px;padding-bottom: 30px"> | ||
| 401 | + <el-pagination | ||
| 402 | + :current-page="pageNumCargo" | ||
| 403 | + :page-sizes="[10, 50, 100, 500]" | ||
| 404 | + :page-size="pageSizeCargo" | ||
| 405 | + layout="total, sizes, prev, pager, next, jumper" | ||
| 406 | + :total="totalCargo" | ||
| 407 | + @size-change="handleSizeChangeCargo" | ||
| 408 | + @current-change="handleCurrentChangeCargo" | ||
| 409 | + /> | ||
| 410 | + </el-col> | ||
| 411 | + </el-tab-pane> | ||
| 412 | + </el-tabs> | ||
| 413 | + </template> | ||
| 414 | + </el-dialog> | ||
| 415 | + | ||
| 416 | + </el-row> | ||
| 417 | + | ||
| 418 | + | ||
| 419 | + </section> | ||
| 420 | +</template> | ||
| 421 | + | ||
| 422 | +<script> | ||
| 423 | + import {selectSupplyMatter, addSupplyMatter, ediSupplyMatter, delSupplyMatter,addCargoDetails,delCargoDetails,selectCargoDetails,sendSupplyMatter} from "../../api/transport"; | ||
| 424 | + | ||
| 425 | + export default { | ||
| 426 | + name: "matter", | ||
| 427 | + data(){ | ||
| 428 | + return{ | ||
| 429 | + // 首页>>>>>>>>>>>>>>>>>>>>>>>>>>>> | ||
| 430 | + form:{ | ||
| 431 | + aircraftflightno:'', | ||
| 432 | + pageNum: 1, | ||
| 433 | + pageSize: 10, | ||
| 434 | + }, | ||
| 435 | + formcargo:{ | ||
| 436 | + supplyid:'' | ||
| 437 | + }, | ||
| 438 | + total: 0, | ||
| 439 | + tableData:[{ | ||
| 440 | + aircraftflightno:'B5157', | ||
| 441 | + }], | ||
| 442 | + multipleSelection:[], | ||
| 443 | + // 弹框>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> | ||
| 444 | + dialogMap: { | ||
| 445 | + update: '供退物料新增', | ||
| 446 | + create: '供退物料修改' | ||
| 447 | + }, | ||
| 448 | + dialogStatus: 'create', | ||
| 449 | + supply_dialog: { | ||
| 450 | + // 添加对话框 | ||
| 451 | + addDialog: false, | ||
| 452 | + // 编辑对话框 | ||
| 453 | + editDialog: false | ||
| 454 | + }, | ||
| 455 | + activeName: 'first', | ||
| 456 | + // 弹框1-1>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> | ||
| 457 | + formSupply:{ | ||
| 458 | + autoid:'', | ||
| 459 | + customcode:'4604', | ||
| 460 | + serialnum:'', | ||
| 461 | + bustype:'1', | ||
| 462 | + enterprisecode:'460470678395-9', | ||
| 463 | + aircraftnum:'', | ||
| 464 | + destination:'CGO', | ||
| 465 | + aircraftflightno:'', | ||
| 466 | + aircraftflightdate:'', | ||
| 467 | + unaircraftnum:'', | ||
| 468 | + unaircraftflightno:'', | ||
| 469 | + unaircraftlightdate:'', | ||
| 470 | + remark:'', | ||
| 471 | + remark1:'', | ||
| 472 | + remark2:'', | ||
| 473 | + remark3:'', | ||
| 474 | + remark4:'', | ||
| 475 | + remark5:'', | ||
| 476 | + createtime:'', | ||
| 477 | + updatetime:'', | ||
| 478 | + declar:'', | ||
| 479 | + }, | ||
| 480 | + rulesSupply: { | ||
| 481 | + customcode: [ | ||
| 482 | + { required: true, message: '', trigger: 'change' } | ||
| 483 | + ], | ||
| 484 | + }, | ||
| 485 | + // 弹框1-2>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> | ||
| 486 | + formCargo:{ | ||
| 487 | + id:'', | ||
| 488 | + material:'', | ||
| 489 | + itemname:'', | ||
| 490 | + applynum:'', | ||
| 491 | + unit:'', | ||
| 492 | + remark:'', | ||
| 493 | + supplyid:'', | ||
| 494 | + remark1:'', | ||
| 495 | + remark2:'', | ||
| 496 | + remark3:'', | ||
| 497 | + remark4:'', | ||
| 498 | + }, | ||
| 499 | + pageNumCargo: 1, | ||
| 500 | + pageSizeCargo: 10, | ||
| 501 | + totalCargo: 0, | ||
| 502 | + rulesCargo: { | ||
| 503 | + material: [ | ||
| 504 | + { required: true, message: '请输入', trigger: 'change' } | ||
| 505 | + ], | ||
| 506 | + itemname: [ | ||
| 507 | + { required: true, message: '请输入', trigger: 'change' } | ||
| 508 | + ], | ||
| 509 | + applynum: [ | ||
| 510 | + { required: true, message: '请输入', trigger: 'change' } | ||
| 511 | + ], | ||
| 512 | + unit: [ | ||
| 513 | + { required: true, message: '请输入', trigger: 'change' } | ||
| 514 | + ], | ||
| 515 | + }, | ||
| 516 | + tableDataCargo:[], | ||
| 517 | + // 多选 | ||
| 518 | + currentRow: null | ||
| 519 | + } | ||
| 520 | + }, | ||
| 521 | + mounted() { | ||
| 522 | + //获取列表 | ||
| 523 | + this.getList(); | ||
| 524 | + // var user = loginuserInfo; | ||
| 525 | + // if (user) { | ||
| 526 | + // this.form.username = user.username || ''; | ||
| 527 | + // } | ||
| 528 | + }, | ||
| 529 | + methods:{ | ||
| 530 | + // 首页>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> | ||
| 531 | + //首页表单分页 | ||
| 532 | + handleSizeChange(val) { | ||
| 533 | + this.form.pageSize = val | ||
| 534 | + this.getList() | ||
| 535 | + }, | ||
| 536 | + handleCurrentChange(val) { | ||
| 537 | + this.form.pageNum = val | ||
| 538 | + this.getList() | ||
| 539 | + }, | ||
| 540 | + // 首页表格选中 | ||
| 541 | + matterChange(val) { | ||
| 542 | + this.multipleSelection = val; | ||
| 543 | + }, | ||
| 544 | + // 序列 | ||
| 545 | + indexMethod(index) { | ||
| 546 | + return index + 1; | ||
| 547 | + }, | ||
| 548 | + // 获取消息标签列表 | ||
| 549 | + getList() { | ||
| 550 | + const _this = this | ||
| 551 | + selectSupplyMatter(this.form).then((response) => { | ||
| 552 | + const res = response.data | ||
| 553 | + if (res.code !== '200') { | ||
| 554 | + return _this.$message.error('获取消息收发记录，失败！') | ||
| 555 | + } | ||
| 556 | + // 获取列表数据 | ||
| 557 | + _this.tableData = res.data.list | ||
| 558 | + // 获取列表的总记录数 | ||
| 559 | + _this.total = res.data.total | ||
| 560 | + _this.$message.success('获取消息收发记录，成功！') | ||
| 561 | + }).catch(error => { | ||
| 562 | + // 关闭加载 | ||
| 563 | + _this.$message.error(error.toString()) | ||
| 564 | + }) | ||
| 565 | + }, | ||
| 566 | + // 打开新增 | ||
| 567 | + add() { | ||
| 568 | + this.dialogStatus = 'create' | ||
| 569 | + this.supply_dialog.addDialog = true | ||
| 570 | + this.tableDataCargo = '' | ||
| 571 | + this.formCargo = { | ||
| 572 | + id:'', | ||
| 573 | + material:'', | ||
| 574 | + itemname:'', | ||
| 575 | + applynum:'', | ||
| 576 | + unit:'', | ||
| 577 | + remark:'', | ||
| 578 | + supplyid:'', | ||
| 579 | + remark1:'', | ||
| 580 | + remark2:'', | ||
| 581 | + remark3:'', | ||
| 582 | + remark4:'', | ||
| 583 | + } | ||
| 584 | + this.formSupply = { | ||
| 585 | + autoid:'', | ||
| 586 | + customcode:'4604', | ||
| 587 | + serialnum:'', | ||
| 588 | + bustype:'', | ||
| 589 | + enterprisecode:'460470678395-9', | ||
| 590 | + aircraftnum:'', | ||
| 591 | + destination:'CGO', | ||
| 592 | + aircraftflightno:'', | ||
| 593 | + aircraftflightdate:'', | ||
| 594 | + unaircraftnum:'', | ||
| 595 | + unaircraftflightno:'', | ||
| 596 | + unaircraftlightdate:'', | ||
| 597 | + remark:'', | ||
| 598 | + remark1:'', | ||
| 599 | + remark2:'', | ||
| 600 | + remark3:'', | ||
| 601 | + remark4:'', | ||
| 602 | + remark5:'', | ||
| 603 | + createtime:'', | ||
| 604 | + updatetime:'', | ||
| 605 | + declar:'', | ||
| 606 | + } | ||
| 607 | + // this.form.arrivetime = new Date().format('yyyyMMddHHmmss') | ||
| 608 | + }, | ||
| 609 | + // 新增功能 | ||
| 610 | + mat_add() { // 进行表单的预验证 | ||
| 611 | + this.$refs.formSupply.validate(valid => { | ||
| 612 | + // 未通过，表单预校验 | ||
| 613 | + if (!valid) return | ||
| 614 | + addSupplyMatter(this.formSupply).then((response) => { | ||
| 615 | + const res = response.data; | ||
| 616 | + // 添加失败 | ||
| 617 | + if (res.code !== '200') { | ||
| 618 | + // 关闭加载 | ||
| 619 | + return this.$message.error(res.msg) | ||
| 620 | + } | ||
| 621 | + // 添加，成功 | ||
| 622 | + this.$message.success(res.msg) | ||
| 623 | + this.formCargo.supplyid=res.data; | ||
| 624 | + console.log("---->"+this.formCargo.supplyid) | ||
| 625 | + // 隐藏对话框 | ||
| 626 | + /*this.supply_dialog.addDialog = false*/ | ||
| 627 | + // 刷新列表 | ||
| 628 | + this.getList() | ||
| 629 | + }).catch(error => { | ||
| 630 | + this.$message.error(error.toString()) | ||
| 631 | + }) | ||
| 632 | + }) | ||
| 633 | + }, | ||
| 634 | + // 打开编辑 | ||
| 635 | + edit(index, row) { | ||
| 636 | + // $("select").each(function () { | ||
| 637 | + // $("#" + this.id).attr("disabled", true); | ||
| 638 | + // }); | ||
| 639 | + this.formSupply = Object.assign({}, row) | ||
| 640 | + this.supply_dialog.addDialog = true | ||
| 641 | + this.dialogStatus = 'update' | ||
| 642 | + this.$nextTick(() => { | ||
| 643 | + this.formSupply = Object.assign({}, row) | ||
| 644 | + }) | ||
| 645 | + this.formCargo.supplyid=row.autoid; | ||
| 646 | + this.getListCargo(); | ||
| 647 | + this.formCargo = { | ||
| 648 | + id:'', | ||
| 649 | + material:'', | ||
| 650 | + itemname:'', | ||
| 651 | + applynum:'', | ||
| 652 | + unit:'', | ||
| 653 | + remark:'', | ||
| 654 | + supplyid:'', | ||
| 655 | + remark1:'', | ||
| 656 | + remark2:'', | ||
| 657 | + remark3:'', | ||
| 658 | + remark4:'', | ||
| 659 | + } | ||
| 660 | + }, | ||
| 661 | + // 编辑功能 | ||
| 662 | + mat_edit() { | ||
| 663 | + // 进行表单的预验证 | ||
| 664 | + this.$refs.formSupply.validate(valid => { | ||
| 665 | + // 未通过，表单预校验 | ||
| 666 | + if (!valid) return | ||
| 667 | + ediSupplyMatter(this.formSupply).then((response) => { | ||
| 668 | + const res = response.data | ||
| 669 | + if (res.code !== '200') { | ||
| 670 | + return this.$message.error(res.msg) | ||
| 671 | + } | ||
| 672 | + this.$message.success(res.msg) | ||
| 673 | + // 隐藏对话框 | ||
| 674 | + // this.supply_dialog.addDialog = false | ||
| 675 | + // 刷新列表 | ||
| 676 | + this.getList() | ||
| 677 | + }).catch(error => { | ||
| 678 | + this.$message.error(error.toString()) | ||
| 679 | + }) | ||
| 680 | + }) | ||
| 681 | + }, | ||
| 682 | + // 删除 | ||
| 683 | + del(row) { | ||
| 684 | + // 弹框询问是否删除？ | ||
| 685 | + this.$confirm('此操作永久删除该消息收发记录, 是否继续?', '警告', { | ||
| 686 | + confirmButtonText: '确定删除', | ||
| 687 | + cancelButtonText: '取消', | ||
| 688 | + type: 'warning' | ||
| 689 | + } | ||
| 690 | + ).then(() => { | ||
| 691 | + delSupplyMatter(row).then((response) => { | ||
| 692 | + console.log(row) | ||
| 693 | + const res = response.data | ||
| 694 | + if (res.code !== '200') { | ||
| 695 | + return this.$message.error(res.msg) | ||
| 696 | + } | ||
| 697 | + this.$message.success(res.msg) | ||
| 698 | + // 刷新列表 | ||
| 699 | + this.getList() | ||
| 700 | + }).catch(error => { | ||
| 701 | + this.$message.error(res.msg) | ||
| 702 | + }) | ||
| 703 | + }).catch(() => { | ||
| 704 | + }) | ||
| 705 | + }, | ||
| 706 | + // 申请 | ||
| 707 | + apply(row) { | ||
| 708 | + // 弹框询问是否申请？ | ||
| 709 | + this.$confirm('是否发送申请', { | ||
| 710 | + confirmButtonText: '确定', | ||
| 711 | + cancelButtonText: '取消', | ||
| 712 | + type: 'warning' | ||
| 713 | + } | ||
| 714 | + ).then(() => { | ||
| 715 | + sendSupplyMatter(row).then((response) => { | ||
| 716 | + const res = response.data | ||
| 717 | + if (res.code !== '200') { | ||
| 718 | + return this.$message.error(res.msg) | ||
| 719 | + } | ||
| 720 | + this.$message.success(res.msg) | ||
| 721 | + // 刷新列表 | ||
| 722 | + this.getList() | ||
| 723 | + }).catch(error => { | ||
| 724 | + this.$message.error(res.msg) | ||
| 725 | + }) | ||
| 726 | + }).catch(() => { | ||
| 727 | + }) | ||
| 728 | + }, | ||
| 729 | + // 弹框>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> | ||
| 730 | + // 弹框标签 | ||
| 731 | + handleClick(tab, event) { | ||
| 732 | + console.log(tab, event); | ||
| 733 | + }, | ||
| 734 | + // 弹框1-1>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> | ||
| 735 | + // 弹框1-2>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> | ||
| 736 | + // 弹框1-2多选 | ||
| 737 | + handleSelectionChangeMat(val) { | ||
| 738 | + this.currentRow = val; | ||
| 739 | + }, | ||
| 740 | + //弹框1-2表单分页 | ||
| 741 | + handleSizeChangeCargo(val) { | ||
| 742 | + this.pageSizeCargo = val | ||
| 743 | + this.getListCargo() | ||
| 744 | + }, | ||
| 745 | + handleCurrentChangeCargo(val) { | ||
| 746 | + this.pageNumCargo = val | ||
| 747 | + this.getListCargo() | ||
| 748 | + }, | ||
| 749 | + // 获取消息标签列表 | ||
| 750 | + getListCargo() { | ||
| 751 | + const _this = this | ||
| 752 | + let parms={supplyid:this.formCargo.supplyid}; | ||
| 753 | + selectCargoDetails(parms).then((response) => { | ||
| 754 | + const res = response.data | ||
| 755 | + if (res.code !== '200') { | ||
| 756 | + return _this.$message.error('获取消息收发记录，失败！') | ||
| 757 | + } | ||
| 758 | + // 获取列表数据 | ||
| 759 | + _this.tableDataCargo = res.data.list | ||
| 760 | + // 获取列表的总记录数 | ||
| 761 | + _this.totalCargo = res.data.total | ||
| 762 | + _this.$message.success('获取消息收发记录，成功！') | ||
| 763 | + }).catch(error => { | ||
| 764 | + // 关闭加载 | ||
| 765 | + _this.$message.error(error.toString()) | ||
| 766 | + }) | ||
| 767 | + }, | ||
| 768 | + // 新增功能 | ||
| 769 | + addCargo() { // 进行表单的预验证 | ||
| 770 | + this.$refs.formCargo.validate(valid => { | ||
| 771 | + // 未通过，表单预校验 | ||
| 772 | + if (!valid) return | ||
| 773 | + if(this.formCargo.supplyid!=null && this.formCargo.supplyid!=''){ | ||
| 774 | + addCargoDetails(this.formCargo).then((response) => { | ||
| 775 | + const res = response.data | ||
| 776 | + // 添加失败 | ||
| 777 | + if (res.code !== '200') { | ||
| 778 | + // 关闭加载 | ||
| 779 | + return this.$message.error(res.msg) | ||
| 780 | + } | ||
| 781 | + // 添加，成功 | ||
| 782 | + this.$message.success(res.msg) | ||
| 783 | + // 刷新列表 | ||
| 784 | + this.getListCargo() | ||
| 785 | + }).catch(error => { | ||
| 786 | + this.$message.error(error.toString()) | ||
| 787 | + }) | ||
| 788 | + }else{ | ||
| 789 | + return this.$message.error("请先保存供料退货信息") | ||
| 790 | + } | ||
| 791 | + }) | ||
| 792 | + }, | ||
| 793 | + // 删除 | ||
| 794 | + delCargo(row) { | ||
| 795 | + // 弹框询问是否删除？ | ||
| 796 | + this.$confirm('此操作永久删除该消息收发记录, 是否继续?', '警告', { | ||
| 797 | + confirmButtonText: '确定删除', | ||
| 798 | + cancelButtonText: '取消', | ||
| 799 | + type: 'warning' | ||
| 800 | + } | ||
| 801 | + ).then(() => { | ||
| 802 | + delCargoDetails(row).then((response) => { | ||
| 803 | + console.log(row) | ||
| 804 | + const res = response.data | ||
| 805 | + if (res.code !== '200') { | ||
| 806 | + return this.$message.error(res.msg) | ||
| 807 | + } | ||
| 808 | + this.$message.success(res.msg) | ||
| 809 | + // 刷新列表 | ||
| 810 | + this.getListCargo() | ||
| 811 | + }).catch(error => { | ||
| 812 | + this.$message.error(res.msg) | ||
| 813 | + }) | ||
| 814 | + }).catch(() => { | ||
| 815 | + }) | ||
| 816 | + }, | ||
| 817 | + }, | ||
| 818 | + | ||
| 819 | + } | ||
| 820 | +</script> | ||
| 821 | + | ||
| 822 | +<style scoped> | ||
| 823 | + .toolbar{ | ||
| 824 | + background-color: white; | ||
| 825 | + border-radius: 5px 5px 5px 5px; | ||
| 826 | + padding: 15px 0 0 20px; | ||
| 827 | + } | ||
| 828 | +</style> |
src/views/airtransport/transfer.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <el-container> | ||
| 3 | + <el-main style="background-color: white"> | ||
| 4 | + <el-row> | ||
| 5 | + <el-form :model="form" :rules="form" ref="ruleForm" label-width="2px" class="demo-ruleForm"> | ||
| 6 | + <el-row style="margin-top: -20px"> | ||
| 7 | + <el-col :span="24"><div class="grid-content content"><p>国际转运查询</p></div></el-col> | ||
| 8 | + </el-row> | ||
| 9 | + <el-row> | ||
| 10 | + <el-col :span="6"> | ||
| 11 | + <el-form-item label="" > | ||
| 12 | + <el-input placeholder="" v-model="form.transcarrier" style="width:220px"> | ||
| 13 | + <template slot="prepend">承运人</template> | ||
| 14 | + </el-input> | ||
| 15 | + </el-form-item> | ||
| 16 | + </el-col> | ||
| 17 | + <el-col :span="6"> | ||
| 18 | + <el-form-item label=""> | ||
| 19 | + <el-input placeholder="" v-model="form.transflightno" style="width:220px"> | ||
| 20 | + <template slot="prepend">航班号</template> | ||
| 21 | + </el-input> | ||
| 22 | + </el-form-item> | ||
| 23 | + </el-col> | ||
| 24 | + <el-col :span="10"> | ||
| 25 | + <el-form-item label="" > | ||
| 26 | + <div class="ip"> | ||
| 27 | + 航班日期 | ||
| 28 | + </div> | ||
| 29 | + <el-date-picker type="date" placeholder="选择日期" | ||
| 30 | + v-model="form.transflightdate" style="width: 140px;" | ||
| 31 | + value-format="yyyy-MM-dd"></el-date-picker> | ||
| 32 | + </el-form-item> | ||
| 33 | + </el-col> | ||
| 34 | + </el-row> | ||
| 35 | + <el-row> | ||
| 36 | + <el-col :span="6" style="margin-top: -15px"> | ||
| 37 | + <el-form-item label="" prop="transawbano"> | ||
| 38 | + <el-input placeholder="" v-model="form.transawbano" style="width:220px"> | ||
| 39 | + <template slot="prepend">主单号</template> | ||
| 40 | + </el-input> | ||
| 41 | + </el-form-item> | ||
| 42 | + </el-col> | ||
| 43 | + <el-col :span="6" style="margin-top: -15px"> | ||
| 44 | + <el-form-item label="" prop="transawbhno"> | ||
| 45 | + <el-input placeholder="" v-model="form.transawbhno" style="width:220px"> | ||
| 46 | + <template slot="prepend">分单号</template> | ||
| 47 | + </el-input> | ||
| 48 | + </el-form-item> | ||
| 49 | + </el-col> | ||
| 50 | + <el-col :span="4" style="margin-top: -15px"> | ||
| 51 | + <el-button type="primary" icon="el-icon-search" @click="submitForm()">查 询</el-button> | ||
| 52 | + </el-col> | ||
| 53 | + </el-row> | ||
| 54 | + </el-form> | ||
| 55 | + </el-row> | ||
| 56 | + <el-row style="margin-top: -20px"> | ||
| 57 | + <el-col :span="24"><div class="grid-content content"><p>国际转运明细</p></div></el-col> | ||
| 58 | + </el-row> | ||
| 59 | + <!--列表部分--> | ||
| 60 | + <el-row> | ||
| 61 | + <template> | ||
| 62 | + <el-table | ||
| 63 | + class="table" | ||
| 64 | + v-loading="tableloading" | ||
| 65 | + ref="multipleTable" | ||
| 66 | + :data="tableData" | ||
| 67 | + tooltip-effect="dark" | ||
| 68 | + style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px" | ||
| 69 | + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" | ||
| 70 | + row-key="uuid" | ||
| 71 | + border | ||
| 72 | + default-expand-all | ||
| 73 | + :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> | ||
| 74 | + <el-table-column | ||
| 75 | + label="主单号" | ||
| 76 | + width="185" | ||
| 77 | + prop="transawbano" | ||
| 78 | + > | ||
| 79 | + </el-table-column> | ||
| 80 | + <el-table-column | ||
| 81 | + prop="transawbhno" | ||
| 82 | + label="分单号" | ||
| 83 | + width="70"> | ||
| 84 | + </el-table-column> | ||
| 85 | + <el-table-column | ||
| 86 | + prop="originflightno" | ||
| 87 | + label="进港航班" | ||
| 88 | + width="70"> | ||
| 89 | + </el-table-column> | ||
| 90 | + <el-table-column | ||
| 91 | + prop="transpiece" | ||
| 92 | + label="运单件数" | ||
| 93 | + width="70"> | ||
| 94 | + </el-table-column> | ||
| 95 | + <el-table-column | ||
| 96 | + prop="transweight" | ||
| 97 | + label="运单重量" | ||
| 98 | + width="80"> | ||
| 99 | + </el-table-column> | ||
| 100 | + <el-table-column | ||
| 101 | + prop="goodsname" | ||
| 102 | + label="货物品名" | ||
| 103 | + width="80"> | ||
| 104 | + </el-table-column> | ||
| 105 | + <el-table-column | ||
| 106 | + prop="transflightno" | ||
| 107 | + label="转运航班" | ||
| 108 | + width="140"> | ||
| 109 | + </el-table-column> | ||
| 110 | + <el-table-column | ||
| 111 | + prop="status" | ||
| 112 | + label="状态" | ||
| 113 | + width="100" :formatter="formatStatus"> | ||
| 114 | + </el-table-column> | ||
| 115 | + <el-table-column | ||
| 116 | + prop="ext5" | ||
| 117 | + label="回执信息" | ||
| 118 | + width="260"> | ||
| 119 | +<!-- <template slot-scope="scope">--> | ||
| 120 | +<!-- <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">--> | ||
| 121 | +<!-- {{scope.row.ext5}}--> | ||
| 122 | +<!-- </span>--> | ||
| 123 | +<!-- <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C">--> | ||
| 124 | +<!-- {{scope.row.ext5}}--> | ||
| 125 | +<!-- </span>--> | ||
| 126 | +<!-- <span v-else-if="scope.row.status=='12' || scope.row.status=='13'" style="color: #F56C6C">--> | ||
| 127 | +<!-- {{scope.row.ext5}}--> | ||
| 128 | +<!-- </span>--> | ||
| 129 | +<!-- <span v-else style="color: #909399;">--> | ||
| 130 | +<!-- {{scope.row.ext5}}--> | ||
| 131 | +<!-- </span>--> | ||
| 132 | +<!-- </template>--> | ||
| 133 | + </el-table-column> | ||
| 134 | + <el-table-column | ||
| 135 | + prop="operation" | ||
| 136 | + label="操作" | ||
| 137 | + width="285"> | ||
| 138 | + <template slot-scope="scope"> | ||
| 139 | + <el-row type="flex" justify="space-between"> | ||
| 140 | + <el-button | ||
| 141 | + size="mini" | ||
| 142 | + type="info" | ||
| 143 | + @click="handleDetail(scope.$index, scope.row)">收发明细 | ||
| 144 | + </el-button> | ||
| 145 | + <el-button | ||
| 146 | + size="mini" | ||
| 147 | + type="success" | ||
| 148 | + @click="editForm(scope.$index, scope.row)">编辑运单 | ||
| 149 | + </el-button> | ||
| 150 | + | ||
| 151 | + </el-row> | ||
| 152 | + <el-row type="flex" justify="space-between"> | ||
| 153 | + | ||
| 154 | + <el-button | ||
| 155 | + size="mini" | ||
| 156 | + type="primary" | ||
| 157 | + @click="handleSend(scope.$index, scope.row)" | ||
| 158 | + :disabled="btSendStatusFormater(scope.row.status)">申请转运 | ||
| 159 | + </el-button> | ||
| 160 | + <el-button | ||
| 161 | + size="mini" | ||
| 162 | + type="warning" | ||
| 163 | + @click="UpdateStatus(scope.$index, scope.row)">更改状态 | ||
| 164 | + </el-button> | ||
| 165 | + <el-button | ||
| 166 | + size="mini" | ||
| 167 | + type="danger" | ||
| 168 | + @click="handleDelete(scope.$index, scope.row)" | ||
| 169 | + :disabled="btDeleStatusFormater(scope.row.status)">删除运单 | ||
| 170 | + </el-button> | ||
| 171 | + </el-row> | ||
| 172 | + </template> | ||
| 173 | + </el-table-column> | ||
| 174 | + </el-table> | ||
| 175 | + </template> | ||
| 176 | + </el-row> | ||
| 177 | + | ||
| 178 | + <!--分页区域--> | ||
| 179 | + <el-row style="margin-bottom: 10px"> | ||
| 180 | + <el-pagination | ||
| 181 | + :current-page="form.pageNum" | ||
| 182 | + :page-sizes="[100, 505, 1000, 5000]" | ||
| 183 | + :page-size="form.pageSize" | ||
| 184 | + layout="total, sizes, prev, pager, next, jumper" | ||
| 185 | + :total="total" | ||
| 186 | + @size-change="handleSizeChange" | ||
| 187 | + @current-change="handleCurrentChange" | ||
| 188 | + /> | ||
| 189 | + </el-row> | ||
| 190 | + <!--footer部分--> | ||
| 191 | + <el-row style="margin-top: 10px"> | ||
| 192 | + <el-col :span="4" class="pub"> | ||
| 193 | + <div class="grid-content"> | ||
| 194 | + <el-button type="primary" size="mini" @click="addForm()">新增国际转运</el-button> | ||
| 195 | + </div> | ||
| 196 | + </el-col> | ||
| 197 | + <el-col :span="2.5" class="pub"> | ||
| 198 | + <div class="grid-content"><span>主单数：{{sumNmmsCount}}</span></div> | ||
| 199 | + </el-col> | ||
| 200 | + <el-col :span="3.5" class="pub"> | ||
| 201 | + <div class="grid-content"><span>舱单总件数：{{sumNmmsPrice}}</span></div> | ||
| 202 | + </el-col> | ||
| 203 | + <el-col :span="7.5" class="pub"> | ||
| 204 | + <div class="grid-content"><span>舱单总重量：{{sumNmmsWeight}}</span></div> | ||
| 205 | + </el-col> | ||
| 206 | + </el-row> | ||
| 207 | + <!--明细列表弹出框--> | ||
| 208 | + <el-row> | ||
| 209 | + <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%"> | ||
| 210 | + <el-table :data="gridData" style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px" | ||
| 211 | + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"> | ||
| 212 | + <el-table-column property="busdate" label="时间" width="160"></el-table-column> | ||
| 213 | + <el-table-column property="username" label="操作人" width="130"></el-table-column> | ||
| 214 | + <el-table-column property="buspiece" label="发送件数" width="130"></el-table-column> | ||
| 215 | + <el-table-column property="busweight" label="发送重量" width="130"></el-table-column> | ||
| 216 | + <el-table-column property="cusrestext" label="回执内容"></el-table-column> | ||
| 217 | + </el-table> | ||
| 218 | + </el-dialog> | ||
| 219 | + </el-row> | ||
| 220 | + <!--编辑主单--> | ||
| 221 | + <el-dialog :title="dialogMap[dialogStatus]" :visible.sync="outerVisible.addDialog" width="80%" style="margin-top: -40px" > | ||
| 222 | + <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="labelPosition" size="mini" style="padding-left: 10px"> | ||
| 223 | + <!--原始舱单信息部分--> | ||
| 224 | + <el-row class="flightInfo"> | ||
| 225 | + <el-col :span="24"> | ||
| 226 | + <div class="grid-content content">原始舱单信息</div> | ||
| 227 | + </el-col> | ||
| 228 | + <el-row style="margin-top: 60px"> | ||
| 229 | +<!-- <el-col :span="6">--> | ||
| 230 | +<!-- <el-form-item prop="awba">--> | ||
| 231 | +<!-- <div v-if="dialogStatus === 'update'">--> | ||
| 232 | +<!-- <el-input disabled="" v-model="ruleForm.awba" style="width: 200px">--> | ||
| 233 | +<!-- <template slot="prepend">运单号</template>--> | ||
| 234 | +<!-- </el-input>--> | ||
| 235 | +<!-- </div>--> | ||
| 236 | +<!-- <div v-else>--> | ||
| 237 | +<!-- <el-input v-model="ruleForm.awba" style="width: 200px">--> | ||
| 238 | +<!-- <template slot="prepend">运单号</template>--> | ||
| 239 | +<!-- </el-input>--> | ||
| 240 | +<!-- </div>--> | ||
| 241 | +<!-- </el-form-item>--> | ||
| 242 | +<!-- </el-col>--> | ||
| 243 | + <el-col :span="6"> | ||
| 244 | + <el-form-item prop="origincarrier" > | ||
| 245 | + <el-input v-model="ruleForm.origincarrier" style="width: 200px" placeholder="必填项" onkeyup="this.value=this.value.toUpperCase()"> | ||
| 246 | + <template slot="prepend">承运人</template> | ||
| 247 | + </el-input> | ||
| 248 | + </el-form-item> | ||
| 249 | + </el-col> | ||
| 250 | + <el-col :span="6"> | ||
| 251 | + <el-form-item prop="originflightno" > | ||
| 252 | + <el-input v-model="ruleForm.originflightno" style="width: 200px" placeholder="必填项"> | ||
| 253 | + <template slot="prepend">航班号</template> | ||
| 254 | + </el-input> | ||
| 255 | + </el-form-item> | ||
| 256 | + </el-col> | ||
| 257 | + | ||
| 258 | +<!-- <el-col :span="6">--> | ||
| 259 | +<!-- <el-form-item label="" >--> | ||
| 260 | +<!-- <el-form-item prop="originflightdate">--> | ||
| 261 | +<!-- <div class="ip">--> | ||
| 262 | +<!-- 航班日期--> | ||
| 263 | +<!-- </div>--> | ||
| 264 | +<!-- <el-date-picker type="date" placeholder="选择日期"--> | ||
| 265 | +<!-- v-model="ruleForm.originflightdate"--> | ||
| 266 | +<!-- value-formatformat="yyyy-MM-dd"--> | ||
| 267 | +<!-- style="width: 125px">--> | ||
| 268 | + | ||
| 269 | +<!-- </el-date-picker>--> | ||
| 270 | +<!-- </el-form-item>--> | ||
| 271 | +<!-- </el-form-item>--> | ||
| 272 | +<!-- </el-col>--> | ||
| 273 | + <el-col :span="6"> | ||
| 274 | + <el-form-item label="" > | ||
| 275 | + <el-form-item prop="originflightdate"> | ||
| 276 | + <div class="ip"> | ||
| 277 | + 航班日期 | ||
| 278 | + </div> | ||
| 279 | + <el-date-picker type="date" placeholder="选择日期" | ||
| 280 | + v-model="ruleForm.originflightdate" | ||
| 281 | + value-format="yyyy-MM-dd" | ||
| 282 | + style="width: 125px"> | ||
| 283 | + | ||
| 284 | + </el-date-picker> | ||
| 285 | + </el-form-item> | ||
| 286 | + </el-form-item> | ||
| 287 | + </el-col> | ||
| 288 | + </el-row> | ||
| 289 | + <el-row> | ||
| 290 | + <el-col :span="6" style="margin-top: -20px" > | ||
| 291 | + <el-form-item prop="originawbano" > | ||
| 292 | + <el-input v-model="ruleForm.originawbano" style="width: 200px" placeholder="必填项" > | ||
| 293 | + <template slot="prepend">主单号</template> | ||
| 294 | + </el-input> | ||
| 295 | + </el-form-item> | ||
| 296 | + </el-col> | ||
| 297 | + <el-col :span="12" style="margin-top: -20px"> | ||
| 298 | + <el-form-item prop="originstation"> | ||
| 299 | + <el-input v-model="ruleForm.originawbhno" style="width: 200px"> | ||
| 300 | + <template slot="prepend">分单号</template> | ||
| 301 | + </el-input> | ||
| 302 | + </el-form-item> | ||
| 303 | + </el-col> | ||
| 304 | + <el-col :span="6" style="margin-top: -20px"> | ||
| 305 | + <el-button type="primary" icon="el-icon-search">查 询</el-button> | ||
| 306 | + </el-col> | ||
| 307 | + </el-row> | ||
| 308 | + </el-row> | ||
| 309 | + <!--预配舱单信息部分--> | ||
| 310 | + <el-row class="flightInfo"> | ||
| 311 | + <el-col :span="24"> | ||
| 312 | + <div class="grid-content content">预配舱单信息</div> | ||
| 313 | + </el-col> | ||
| 314 | + <el-row style="margin-top: 60px"> | ||
| 315 | + <!-- <el-col :span="6">--> | ||
| 316 | + <!-- <el-form-item prop="awba">--> | ||
| 317 | + <!-- <div v-if="dialogStatus === 'update'">--> | ||
| 318 | + <!-- <el-input disabled="" v-model="ruleForm.awba" style="width: 200px">--> | ||
| 319 | + <!-- <template slot="prepend">运单号</template>--> | ||
| 320 | + <!-- </el-input>--> | ||
| 321 | + <!-- </div>--> | ||
| 322 | + <!-- <div v-else>--> | ||
| 323 | + <!-- <el-input v-model="ruleForm.awba" style="width: 200px">--> | ||
| 324 | + <!-- <template slot="prepend">运单号</template>--> | ||
| 325 | + <!-- </el-input>--> | ||
| 326 | + <!-- </div>--> | ||
| 327 | + <!-- </el-form-item>--> | ||
| 328 | + <!-- </el-col>--> | ||
| 329 | + <el-col :span="6"> | ||
| 330 | + <el-form-item prop="transcarrier" > | ||
| 331 | + <el-input v-model="ruleForm.transcarrier" style="width: 200px" placeholder="必填项" onkeyup="this.value=this.value.toUpperCase()"> | ||
| 332 | + <template slot="prepend">承运人</template> | ||
| 333 | + </el-input> | ||
| 334 | + </el-form-item> | ||
| 335 | + </el-col> | ||
| 336 | + <el-col :span="6"> | ||
| 337 | + <el-form-item prop="transflightno" > | ||
| 338 | + <el-input v-model="ruleForm.transflightno" style="width: 200px" placeholder="必填项"> | ||
| 339 | + <template slot="prepend">航班号</template> | ||
| 340 | + </el-input> | ||
| 341 | + </el-form-item> | ||
| 342 | + </el-col> | ||
| 343 | + | ||
| 344 | + <el-col :span="6"> | ||
| 345 | + <el-form-item label="" > | ||
| 346 | + <el-form-item prop="transflightdate"> | ||
| 347 | + <div class="ip"> | ||
| 348 | + 航班日期 | ||
| 349 | + </div> | ||
| 350 | + <el-date-picker type="date" placeholder="选择日期" | ||
| 351 | + v-model="ruleForm.transflightdate" | ||
| 352 | + value-format="yyyy-MM-dd" | ||
| 353 | + style="width: 125px"> | ||
| 354 | + | ||
| 355 | + </el-date-picker> | ||
| 356 | + </el-form-item> | ||
| 357 | + </el-form-item> | ||
| 358 | + </el-col> | ||
| 359 | + </el-row> | ||
| 360 | + <el-row> | ||
| 361 | + <el-col :span="6" style="margin-top: -20px" > | ||
| 362 | + <el-form-item prop="transawbano" > | ||
| 363 | + <el-input v-model="ruleForm.transawbano" style="width: 200px" placeholder="必填项"> | ||
| 364 | + <template slot="prepend">主单号</template> | ||
| 365 | + </el-input> | ||
| 366 | + </el-form-item> | ||
| 367 | + </el-col> | ||
| 368 | + <el-col :span="6" style="margin-top: -20px" > | ||
| 369 | + <el-form-item prop="transawbhno"> | ||
| 370 | + <el-input v-model="ruleForm.transawbhno" style="width: 200px"> | ||
| 371 | + <template slot="prepend">分单号</template> | ||
| 372 | + </el-input> | ||
| 373 | + </el-form-item> | ||
| 374 | + </el-col> | ||
| 375 | + </el-row> | ||
| 376 | + </el-row> | ||
| 377 | + <!--运单信息部分--> | ||
| 378 | + <el-row class="flightInfo"> | ||
| 379 | + <el-col :span="24"> | ||
| 380 | + <div class="grid-content content">提运单信息</div> | ||
| 381 | + </el-col> | ||
| 382 | + </el-row> | ||
| 383 | + <el-row style="margin-bottom: 0px;"> | ||
| 384 | + <el-row class="product"> | ||
| 385 | + <el-col :span="6"> | ||
| 386 | + <el-form-item label="" prop="transpiece" > | ||
| 387 | + <el-input v-model="ruleForm.transpiece" placeholder="必填项" style="width: 200px" oninput="value=value.replace(/[^\d]/g,'')"> | ||
| 388 | + <template slot="prepend">件 数</template> | ||
| 389 | + </el-input> | ||
| 390 | + </el-form-item> | ||
| 391 | + </el-col> | ||
| 392 | + <el-col :span="6"> | ||
| 393 | + <el-form-item label="" prop="transweight" > | ||
| 394 | + <el-input v-model="ruleForm.transweight" placeholder="必填项" style="width: 200px" oninput="value=value.replace(/[^\d]/g,'')"> | ||
| 395 | + <template slot="prepend">重 量</template> | ||
| 396 | + </el-input> | ||
| 397 | + </el-form-item> | ||
| 398 | + </el-col> | ||
| 399 | + <el-col :span="6"> | ||
| 400 | + <el-form-item label="" prop="goodsname" > | ||
| 401 | + <el-input v-model="ruleForm.goodsname" style="width: 210px" placeholder="必填项"> | ||
| 402 | + <template slot="prepend">货物描述</template> | ||
| 403 | + </el-input> | ||
| 404 | + </el-form-item> | ||
| 405 | + </el-col> | ||
| 406 | + <el-col :span="6"> | ||
| 407 | + <el-form-item label="" prop="customcode" > | ||
| 408 | + <div class="ip"> | ||
| 409 | + 海关关区 | ||
| 410 | + </div> | ||
| 411 | + <el-select v-model="ruleForm.customcode" | ||
| 412 | + filterable | ||
| 413 | + allow-create | ||
| 414 | + default-first-option | ||
| 415 | + remote | ||
| 416 | + :remote-method="remoteMethod2" | ||
| 417 | + :loading="loading" placeholder="请选择" style="width: 115px"> | ||
| 418 | + <el-option | ||
| 419 | + v-for="item in customcodes" | ||
| 420 | + :key="item.customcode" | ||
| 421 | + :label="item.customcode" | ||
| 422 | + :value="item.customcode"> | ||
| 423 | + <span style="float: left">{{ item.customcode }}</span> | ||
| 424 | + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.customname }}</span> | ||
| 425 | + </el-option> | ||
| 426 | + </el-select> | ||
| 427 | + </el-form-item> | ||
| 428 | + </el-col> | ||
| 429 | + </el-row> | ||
| 430 | + <el-row class="product"> | ||
| 431 | + <el-col :span="6"> | ||
| 432 | + <el-form-item label="" prop="awboriginstation" > | ||
| 433 | + <el-input v-model="ruleForm.awboriginstation" style="width: 200px" placeholder="必填项" onkeyup="this.value=this.value.toUpperCase()"> | ||
| 434 | + <template slot="prepend">始发站</template> | ||
| 435 | + </el-input> | ||
| 436 | + </el-form-item> | ||
| 437 | + </el-col> | ||
| 438 | + <el-col :span="6"> | ||
| 439 | + <el-form-item label="" prop="awbdesstation" > | ||
| 440 | + <el-input v-model="ruleForm.awbdesstation" placeholder="必填项" style="width: 200px" onkeyup="this.value=this.value.toUpperCase()"> | ||
| 441 | + <template slot="prepend">目的站</template> | ||
| 442 | + </el-input> | ||
| 443 | + </el-form-item> | ||
| 444 | + </el-col> | ||
| 445 | + <el-col :span="6"> | ||
| 446 | + <el-form-item label="" prop="goodspackage"> | ||
| 447 | + <div class="ip"> | ||
| 448 | + 包装类型 | ||
| 449 | + </div> | ||
| 450 | + <el-select v-model="ruleForm.goodspackage" placeholder="请选择" size="mini" style="width: 125px"> | ||
| 451 | + <el-option label="木箱" value="PK"></el-option> | ||
| 452 | + </el-select> | ||
| 453 | + </el-form-item> | ||
| 454 | + </el-col> | ||
| 455 | + <el-col :span="6"> | ||
| 456 | + <el-button type="primary" icon="el-icon-check" @click="dialogStatus==='create'?outerVisible_add():outerVisible_edit()" size="small">保 存</el-button> | ||
| 457 | + <el-button icon="el-icon-close" @click="outerVisible.addDialog = false" size="small">取 消</el-button> | ||
| 458 | + </el-col> | ||
| 459 | + </el-row> | ||
| 460 | + </el-row> | ||
| 461 | + </el-form> | ||
| 462 | + </el-dialog> | ||
| 463 | + </el-main> | ||
| 464 | + </el-container> | ||
| 465 | +</template> | ||
| 466 | + | ||
| 467 | +<script> | ||
| 468 | + import { | ||
| 469 | + addMt8205, | ||
| 470 | + selectMt8205, | ||
| 471 | + sendCreateMt8205, | ||
| 472 | + delMt8205, | ||
| 473 | + ediMt8205, | ||
| 474 | + } from "../../api/transport"; | ||
| 475 | + import {loginedUserInfo} from "../../api/user"; | ||
| 476 | + import {selectCustomcode, sendCreateMt1201} from "../../api/mt1201"; | ||
| 477 | + import {selectResponseList} from "../../api/InResponse"; | ||
| 478 | + | ||
| 479 | + export default { | ||
| 480 | + name: "transfer", | ||
| 481 | + data() { | ||
| 482 | + return{ | ||
| 483 | + customcodes:[], | ||
| 484 | + loading:false, | ||
| 485 | + // 搜索条件 | ||
| 486 | + form: { | ||
| 487 | + transcarrier:'', | ||
| 488 | + transflightno:'', | ||
| 489 | + transflightdate:'', | ||
| 490 | + transawbano:'', | ||
| 491 | + transawbhno:'', | ||
| 492 | + pageNum: 1, | ||
| 493 | + pageSize: 100, | ||
| 494 | + }, | ||
| 495 | + sumNmmsCount:0, | ||
| 496 | + sumNmmsPrice:0, | ||
| 497 | + sumNmmsWeight:0, | ||
| 498 | + total: 0, | ||
| 499 | + // 搜索列表 | ||
| 500 | + tableData:[], | ||
| 501 | + tableloading:false, | ||
| 502 | + // 明细 | ||
| 503 | + dialogTableVisible:false, | ||
| 504 | + gridData:[], | ||
| 505 | + // 新增/编辑 | ||
| 506 | + dialogStatus:'create', | ||
| 507 | + dialogMap:{ | ||
| 508 | + update: '编辑', | ||
| 509 | + create: '添加' | ||
| 510 | + }, | ||
| 511 | + outerVisible: { | ||
| 512 | + // 添加对话框 | ||
| 513 | + addDialog: false, | ||
| 514 | + // 编辑对话框 | ||
| 515 | + editDialog: false | ||
| 516 | + }, | ||
| 517 | + labelPosition: 'left', | ||
| 518 | + ruleForm: { | ||
| 519 | + uuid1201:'', | ||
| 520 | + uuid2201:'', | ||
| 521 | + origincarrier: undefined, | ||
| 522 | + originflightno: undefined, | ||
| 523 | + originflightdate: undefined, | ||
| 524 | + originawbano: undefined, | ||
| 525 | + originawbhno: undefined, | ||
| 526 | + transcarrier: undefined, | ||
| 527 | + transflightno: undefined, | ||
| 528 | + transflightdate: undefined, | ||
| 529 | + transawbano: undefined, | ||
| 530 | + transawbhno: undefined, | ||
| 531 | + transpiece: undefined, | ||
| 532 | + transweight: undefined, | ||
| 533 | + goodsname: undefined, | ||
| 534 | + goodspackage:'PK', | ||
| 535 | + awbdesstation:undefined, | ||
| 536 | + awboriginstation:undefined, | ||
| 537 | + customcode:'', | ||
| 538 | + status:'', | ||
| 539 | + actime:'', | ||
| 540 | + updatetime:'', | ||
| 541 | + ext3:'', | ||
| 542 | + ext4:'', | ||
| 543 | + ext5:'', | ||
| 544 | + }, | ||
| 545 | + rules: { | ||
| 546 | + origincarrier: [ | ||
| 547 | + { required: true, message: '请输入承运人代码', trigger: 'blur' }, | ||
| 548 | + ], | ||
| 549 | + originflightno: [ | ||
| 550 | + { required: true, message: '请输入航班号', trigger: 'blur' }, | ||
| 551 | + ], | ||
| 552 | + originawbano: [ | ||
| 553 | + { required: true, message: '请输入主单号', trigger: 'blur' }, | ||
| 554 | + ], | ||
| 555 | + originflightdate: [ | ||
| 556 | + { required: true, message: '请输入航班日期', trigger: 'blur' }, | ||
| 557 | + ], | ||
| 558 | + transawbano: [ | ||
| 559 | + { required: true, message: '请输入主单号', trigger: 'blur' }, | ||
| 560 | + ], | ||
| 561 | + transcarrier: [ | ||
| 562 | + { required: true, message: '请输入承运人代码', trigger: 'blur' }, | ||
| 563 | + ], | ||
| 564 | + transflightno: [ | ||
| 565 | + { required: true, message: '请输入航班号', trigger: 'blur' }, | ||
| 566 | + ], | ||
| 567 | + | ||
| 568 | + transpiece: [ | ||
| 569 | + { required: true, message: '请输入件数', trigger: 'blur' }, | ||
| 570 | + ], | ||
| 571 | + transweight: [ | ||
| 572 | + { required: true, message: '请输入重量', trigger: 'blur' }, | ||
| 573 | + ], | ||
| 574 | + goodsname: [ | ||
| 575 | + { required: true, message: '请输入货物描述', trigger: 'blur' }, | ||
| 576 | + ], | ||
| 577 | + customcode: [ | ||
| 578 | + { required: true, message: '请输入关区', trigger: 'blur' }, | ||
| 579 | + ], | ||
| 580 | + awboriginstation: [ | ||
| 581 | + { required: true, message: '请输入起始站', trigger: 'blur' }, | ||
| 582 | + ], | ||
| 583 | + transflightdate: [ | ||
| 584 | + { required: true, message: '请选择日期', trigger: 'blur' }, | ||
| 585 | + ], | ||
| 586 | + awbdesstation: [ | ||
| 587 | + { required: true, message: '请输入目的站', trigger: 'blur' }, | ||
| 588 | + ], | ||
| 589 | + } | ||
| 590 | + | ||
| 591 | + } | ||
| 592 | + }, | ||
| 593 | + methods:{ | ||
| 594 | + //获取关区代码 | ||
| 595 | + remoteMethod2:function(query){ | ||
| 596 | + this.customcodes=[]; | ||
| 597 | + let params={customcode:query}; | ||
| 598 | + this.loading = true; | ||
| 599 | + selectCustomcode(params).then(res =>{ | ||
| 600 | + if (res !== '') { | ||
| 601 | + setTimeout(() => { | ||
| 602 | + this.loading = false; | ||
| 603 | + this.customcodes=res.data.data; | ||
| 604 | + }, 200); | ||
| 605 | + } else { | ||
| 606 | + this.customcodes = []; | ||
| 607 | + } | ||
| 608 | + | ||
| 609 | + }); | ||
| 610 | + }, | ||
| 611 | + //首页表单分页 | ||
| 612 | + handleSizeChange(val) { | ||
| 613 | + this.form.pageSize = val | ||
| 614 | + this.submitForm() | ||
| 615 | + }, | ||
| 616 | + handleCurrentChange(val) { | ||
| 617 | + this.form.pageNum = val | ||
| 618 | + this.submitForm() | ||
| 619 | + }, | ||
| 620 | + //回执收发明细 | ||
| 621 | + handleDetail(index,row){ | ||
| 622 | + // if(row.flightno.length>4){ | ||
| 623 | + // row.flightno=row.flightno.substring(2); | ||
| 624 | + // } | ||
| 625 | + let params={awbano:row.transawbano,awbhno:row.transawbhno,carrier:row.transcarrier,flightno:row.transflightno,flightdate:row.transflightdate,bustype:'MT8205'} | ||
| 626 | + selectResponseList(params).then(res=>{ | ||
| 627 | + this.dialogTableVisible=true; | ||
| 628 | + let response=res.data.data; | ||
| 629 | + this.gridData=response; | ||
| 630 | + }); | ||
| 631 | + }, | ||
| 632 | + // 获取消息标签列表 | ||
| 633 | + submitForm() { | ||
| 634 | + const _this = this | ||
| 635 | + selectMt8205(this.form).then((response) => { | ||
| 636 | + const res = response.data | ||
| 637 | + console.log(res) | ||
| 638 | + // console.log(response.data) | ||
| 639 | + if (res.code !== '200') { | ||
| 640 | + return _this.$message.error('获取消息收发记录，失败！') | ||
| 641 | + } | ||
| 642 | + // 获取列表数据 | ||
| 643 | + _this.tableData = res.data.list | ||
| 644 | + // 获取列表的总记录数 | ||
| 645 | + _this.total = res.data.total | ||
| 646 | + _this.$message.success('获取消息收发记录，成功！') | ||
| 647 | + }).catch(error => { | ||
| 648 | + // 关闭加载 | ||
| 649 | + _this.$message.error(error.toString()) | ||
| 650 | + }) | ||
| 651 | + }, | ||
| 652 | + //新增编辑弹框关闭重置 | ||
| 653 | + // configure_addDialogClosed() { | ||
| 654 | + // // 重置对话框 | ||
| 655 | + // this.$refs.ruleForm.resetFields() | ||
| 656 | + // }, | ||
| 657 | + // 打开新增 | ||
| 658 | + addForm() { | ||
| 659 | + this.dialogStatus = 'create' | ||
| 660 | + this.outerVisible.addDialog = true | ||
| 661 | + this.ruleForm = { | ||
| 662 | + uuid1201:'', | ||
| 663 | + uuid2201:'', | ||
| 664 | + origincarrier: undefined, | ||
| 665 | + originflightno: undefined, | ||
| 666 | + originflightdate: undefined, | ||
| 667 | + originawbano: undefined, | ||
| 668 | + originawbhno: undefined, | ||
| 669 | + transcarrier: undefined, | ||
| 670 | + transflightno: undefined, | ||
| 671 | + transflightdate: undefined, | ||
| 672 | + transawbano: undefined, | ||
| 673 | + transawbhno: '', | ||
| 674 | + transpiece: undefined, | ||
| 675 | + transweight: undefined, | ||
| 676 | + goodsname: undefined, | ||
| 677 | + goodspackage:'PK', | ||
| 678 | + awbdesstation:undefined, | ||
| 679 | + awboriginstation:undefined, | ||
| 680 | + customcode:'', | ||
| 681 | + status:'', | ||
| 682 | + actime:'', | ||
| 683 | + updatetime:'', | ||
| 684 | + ext3:'', | ||
| 685 | + ext4:'', | ||
| 686 | + ext5:'', | ||
| 687 | + } | ||
| 688 | + }, | ||
| 689 | + // 新增功能 | ||
| 690 | + outerVisible_add() { // 进行表单的预验证 | ||
| 691 | + this.$refs.ruleForm.validate(valid => { | ||
| 692 | + // 未通过，表单预校验 | ||
| 693 | + if (!valid) return | ||
| 694 | + addMt8205(this.ruleForm).then((response) => { | ||
| 695 | + const res = response.data | ||
| 696 | + // 添加失败 | ||
| 697 | + if (res.code !== '200') { | ||
| 698 | + // 关闭加载 | ||
| 699 | + return this.$message.error(res.msg) | ||
| 700 | + } | ||
| 701 | + // 添加，成功 | ||
| 702 | + this.$message.success(res.msg) | ||
| 703 | + // 隐藏对话框 | ||
| 704 | + this.outerVisible.addDialog = false | ||
| 705 | + // 刷新列表 | ||
| 706 | + this.submitForm() | ||
| 707 | + }).catch(error => { | ||
| 708 | + this.$message.error(error.toString()) | ||
| 709 | + }) | ||
| 710 | + }) | ||
| 711 | + }, | ||
| 712 | + // 打开编辑 | ||
| 713 | + editForm(index, row) { | ||
| 714 | + this.ruleForm = Object.assign({}, row) | ||
| 715 | + this.outerVisible.addDialog = true | ||
| 716 | + this.dialogStatus = 'update' | ||
| 717 | + this.$nextTick(() => { | ||
| 718 | + this.ruleForm = Object.assign({}, row) | ||
| 719 | + }) | ||
| 720 | + console.log(row) | ||
| 721 | + }, | ||
| 722 | + // 编辑功能 | ||
| 723 | + outerVisible_edit() { | ||
| 724 | + // 进行表单的预验证 | ||
| 725 | + this.$refs.ruleForm.validate(valid => { | ||
| 726 | + // 未通过，表单预校验 | ||
| 727 | + if (!valid) return | ||
| 728 | + ediMt8205(this.ruleForm).then((response) => { | ||
| 729 | + const res = response.data | ||
| 730 | + if (res.code !== '200') { | ||
| 731 | + return this.$message.error(res.msg) | ||
| 732 | + } | ||
| 733 | + this.$message.success(res.msg) | ||
| 734 | + // 隐藏对话框 | ||
| 735 | + this.outerVisible.addDialog = false | ||
| 736 | + // 刷新列表 | ||
| 737 | + this.submitForm() | ||
| 738 | + }).catch(error => { | ||
| 739 | + this.$message.error(error.toString()) | ||
| 740 | + }) | ||
| 741 | + }) | ||
| 742 | + }, | ||
| 743 | + //删除 | ||
| 744 | + handleDelete(index, row) { | ||
| 745 | + // 弹框询问是否删除？ | ||
| 746 | + this.$confirm('此操作永久删除该消息收发记录, 是否继续?', '警告', { | ||
| 747 | + confirmButtonText: '确定删除', | ||
| 748 | + cancelButtonText: '取消', | ||
| 749 | + type: 'warning' | ||
| 750 | + } | ||
| 751 | + ).then(() => { | ||
| 752 | + delMt8205({ uuid: row.uuid }).then((response) => { | ||
| 753 | + console.log(row) | ||
| 754 | + const res = response.data | ||
| 755 | + this.$message.success(res.msg) | ||
| 756 | + this.submitForm() | ||
| 757 | + }).catch(error => { | ||
| 758 | + this.$message.error(res.msg) | ||
| 759 | + }) | ||
| 760 | + }).catch(() => { | ||
| 761 | + }) | ||
| 762 | + }, | ||
| 763 | + //申请转运 | ||
| 764 | + handleSend(index, row) { | ||
| 765 | + // 弹框询问是否删除？ | ||
| 766 | + this.$confirm('是否发送运单申请?', '警告', { | ||
| 767 | + confirmButtonText: '确定', | ||
| 768 | + cancelButtonText: '取消', | ||
| 769 | + type: 'warning' | ||
| 770 | + } | ||
| 771 | + ).then(() => { | ||
| 772 | + const map = {'mt8205':row,'username':loginedUserInfo().username} | ||
| 773 | + sendCreateMt8205(map).then((response) => { | ||
| 774 | + const res = response.data | ||
| 775 | + this.$message.success(res.msg) | ||
| 776 | + this.submitForm() | ||
| 777 | + }).catch(error => { | ||
| 778 | + this.$message.error(res.msg) | ||
| 779 | + }) | ||
| 780 | + }).catch(() => { | ||
| 781 | + }) | ||
| 782 | + }, | ||
| 783 | + //更改状态 | ||
| 784 | + UpdateStatus(column,row){ | ||
| 785 | + this.$confirm("是否发送更改状态", "确认消息", { | ||
| 786 | + distinguishCancelAndClose: true, | ||
| 787 | + confirmButtonText: '确认更改', | ||
| 788 | + cancelButtonText: '取消更改' | ||
| 789 | + }).then(() => { | ||
| 790 | + row.status = '22'; | ||
| 791 | + }).catch(action => { | ||
| 792 | + this.$message({ | ||
| 793 | + type: 'info', | ||
| 794 | + message: action === 'cancel' | ||
| 795 | + ? '取消状态更改' | ||
| 796 | + : '状态更改取消' | ||
| 797 | + }) | ||
| 798 | + }) | ||
| 799 | + }, | ||
| 800 | + //状态识别 | ||
| 801 | + formatStatus: function(row,column){ | ||
| 802 | + return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单' | ||
| 803 | + :row.status=='11'?'放行':row.status=='12'?'拒装':row.status=='13'?'禁卸' | ||
| 804 | + :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报' | ||
| 805 | + :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':''; | ||
| 806 | + }, | ||
| 807 | + //发送舱单报按钮,删除，修改判定事件 | ||
| 808 | + btSendStatusFormater:(status) => { | ||
| 809 | + if(status=='23' || status=='24'||status=='25'){ | ||
| 810 | + return true; | ||
| 811 | + }else if(status=='22' ) { | ||
| 812 | + return false; | ||
| 813 | + } | ||
| 814 | + }, | ||
| 815 | + btEditStatusFormater:(status) => { | ||
| 816 | + if(status=='23' || status=='24'||status=='25'){ | ||
| 817 | + return true; | ||
| 818 | + }else if(status=='22' ) { | ||
| 819 | + return false; | ||
| 820 | + } | ||
| 821 | + }, | ||
| 822 | + btDeleStatusFormater:(status) => { | ||
| 823 | + if(status=='23' || status=='24'||status=='25'){ | ||
| 824 | + return true; | ||
| 825 | + }else if(status=='22' ) { | ||
| 826 | + return false; | ||
| 827 | + } | ||
| 828 | + }, | ||
| 829 | + // 过滤中英文 | ||
| 830 | + inputMe(e){ | ||
| 831 | + return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase(); | ||
| 832 | + } | ||
| 833 | + }, | ||
| 834 | + //渲染方法 | ||
| 835 | + mounted(){ | ||
| 836 | + this.submitForm(); | ||
| 837 | + // this.ruleForm.originflightdate = new Date().format('yyyy-MM-dd') | ||
| 838 | + // this.ruleForm.transflightdate = new Date().format('yyyy-MM-dd') | ||
| 839 | + | ||
| 840 | + } | ||
| 841 | + } | ||
| 842 | +</script> | ||
| 843 | + | ||
| 844 | +<style scoped> | ||
| 845 | + .ip{ | ||
| 846 | + max-width: 100px; | ||
| 847 | + margin-right: -5px; | ||
| 848 | + display: inline-block; | ||
| 849 | + background-color: #6F8294; | ||
| 850 | + color: #ffffff; | ||
| 851 | + border: 1px solid #DCDFE6; | ||
| 852 | + vertical-align: middle; | ||
| 853 | + padding: 0 18px; | ||
| 854 | + white-space: nowrap; | ||
| 855 | + border-top-right-radius: 0px; | ||
| 856 | + border-top-left-radius: 4px; | ||
| 857 | + border-bottom-left-radius: 4px; | ||
| 858 | + border-bottom-right-radius: 0px; | ||
| 859 | + font-size: 10px; | ||
| 860 | + } | ||
| 861 | +</style> |
| @@ -4,13 +4,15 @@ | @@ -4,13 +4,15 @@ | ||
| 4 | <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> | 4 | <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> |
| 5 | <el-form :inline="true" :model="filters"> | 5 | <el-form :inline="true" :model="filters"> |
| 6 | <el-form-item> | 6 | <el-form-item> |
| 7 | - <el-input size="small" v-model="filters.companyName" placeholder="公司名称"></el-input> | 7 | + <el-input size="small" v-model="filters.companyName" placeholder="公司名称"> |
| 8 | + <template slot="prepend">公司名称</template> | ||
| 9 | + </el-input> | ||
| 8 | </el-form-item> | 10 | </el-form-item> |
| 9 | <el-form-item> | 11 | <el-form-item> |
| 10 | - <el-button type="warning" style="width:150px" size="small" icon="el-icon-plus" v-on:click="getConsignee()">查询</el-button> | 12 | + <el-button type="warning" style="width:150px" icon="el-icon-plus" v-on:click="getConsignee()">查  询</el-button> |
| 11 | </el-form-item> | 13 | </el-form-item> |
| 12 | <el-form-item> | 14 | <el-form-item> |
| 13 | - <el-button type="primary" style="width:150px" size="small" icon="el-icon-plus" @click="companyAdd">新增</el-button> | 15 | + <el-button type="primary" style="width:150px" icon="el-icon-plus" @click="companyAdd">新  增</el-button> |
| 14 | </el-form-item> | 16 | </el-form-item> |
| 15 | </el-form> | 17 | </el-form> |
| 16 | </el-col> | 18 | </el-col> |
| @@ -35,8 +37,8 @@ | @@ -35,8 +37,8 @@ | ||
| 35 | <!-- </el-table-column>--> | 37 | <!-- </el-table-column>--> |
| 36 | <el-table-column label="操作" min-width="150"> | 38 | <el-table-column label="操作" min-width="150"> |
| 37 | <template slot-scope="scope"> | 39 | <template slot-scope="scope"> |
| 38 | - <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button> | ||
| 39 | - <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDel(scope.$index, scope.row)">删除</el-button> | 40 | + <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编  辑</el-button> |
| 41 | + <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDel(scope.$index, scope.row)">删  除</el-button> | ||
| 40 | </template> | 42 | </template> |
| 41 | </el-table-column> | 43 | </el-table-column> |
| 42 | </el-table> | 44 | </el-table> |
| @@ -135,7 +137,8 @@ | @@ -135,7 +137,8 @@ | ||
| 135 | 137 | ||
| 136 | <script> | 138 | <script> |
| 137 | import { getList, remove, add, edit} from '../../api/consigner/consignee'; | 139 | import { getList, remove, add, edit} from '../../api/consigner/consignee'; |
| 138 | - import loginUserInfo from '../../api/base'; | 140 | + |
| 141 | + import {loginedUserInfo} from "../../api/user"; | ||
| 139 | 142 | ||
| 140 | export default { | 143 | export default { |
| 141 | data() { | 144 | data() { |
| @@ -231,7 +234,7 @@ | @@ -231,7 +234,7 @@ | ||
| 231 | pageSize: this.pageSize, | 234 | pageSize: this.pageSize, |
| 232 | limitSize: this.limitSize, | 235 | limitSize: this.limitSize, |
| 233 | companyName: this.filters.companyName, | 236 | companyName: this.filters.companyName, |
| 234 | - enterpriseId: loginUserInfo.companyId | 237 | + enterpriseId: loginedUserInfo().companyId |
| 235 | }; | 238 | }; |
| 236 | this.listLoading = true; | 239 | this.listLoading = true; |
| 237 | getList(para).then((res) => { | 240 | getList(para).then((res) => { |
| @@ -402,8 +405,8 @@ | @@ -402,8 +405,8 @@ | ||
| 402 | }, | 405 | }, |
| 403 | //设置 用户id 企业id | 406 | //设置 用户id 企业id |
| 404 | userId(){ | 407 | userId(){ |
| 405 | - this.coneeForm.userId = loginUserInfo.userId; | ||
| 406 | - this.coneeForm.enterpriseId = loginUserInfo.companyId; | 408 | + this.coneeForm.userId = loginedUserInfo().userId; |
| 409 | + this.coneeForm.enterpriseId = loginedUserInfo().companyId; | ||
| 407 | } | 410 | } |
| 408 | }, | 411 | }, |
| 409 | 412 |
| @@ -4,13 +4,15 @@ | @@ -4,13 +4,15 @@ | ||
| 4 | <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> | 4 | <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> |
| 5 | <el-form :inline="true" :model="filters"> | 5 | <el-form :inline="true" :model="filters"> |
| 6 | <el-form-item> | 6 | <el-form-item> |
| 7 | - <el-input size="small" v-model="filters.companyName" placeholder="公司名称"></el-input> | 7 | + <el-input size="small" v-model="filters.companyName" placeholder="公司名称"> |
| 8 | + <template slot="prepend">公司名称</template> | ||
| 9 | + </el-input> | ||
| 8 | </el-form-item> | 10 | </el-form-item> |
| 9 | <el-form-item> | 11 | <el-form-item> |
| 10 | - <el-button type="warning" style="width:150px" size="small" icon="el-icon-plus" v-on:click="getConsignee()">查询</el-button> | 12 | + <el-button type="warning" style="width:150px" icon="el-icon-plus" v-on:click="getConsignee()">查  询</el-button> |
| 11 | </el-form-item> | 13 | </el-form-item> |
| 12 | <el-form-item> | 14 | <el-form-item> |
| 13 | - <el-button type="primary" style="width:150px" size="small" icon="el-icon-plus" @click="companyAdd">新增</el-button> | 15 | + <el-button type="primary" style="width:150px" icon="el-icon-plus" @click="companyAdd">新  增</el-button> |
| 14 | </el-form-item> | 16 | </el-form-item> |
| 15 | </el-form> | 17 | </el-form> |
| 16 | </el-col> | 18 | </el-col> |
| @@ -35,8 +37,8 @@ | @@ -35,8 +37,8 @@ | ||
| 35 | <!-- </el-table-column>--> | 37 | <!-- </el-table-column>--> |
| 36 | <el-table-column label="操作" min-width="150"> | 38 | <el-table-column label="操作" min-width="150"> |
| 37 | <template slot-scope="scope"> | 39 | <template slot-scope="scope"> |
| 38 | - <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button> | ||
| 39 | - <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDel(scope.$index, scope.row)">删除</el-button> | 40 | + <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编  辑</el-button> |
| 41 | + <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDel(scope.$index, scope.row)">删  除</el-button> | ||
| 40 | </template> | 42 | </template> |
| 41 | </el-table-column> | 43 | </el-table-column> |
| 42 | </el-table> | 44 | </el-table> |
| @@ -135,7 +137,7 @@ | @@ -135,7 +137,7 @@ | ||
| 135 | 137 | ||
| 136 | <script> | 138 | <script> |
| 137 | import { getList, remove, add, edit} from '../../api/consigner/consigner'; | 139 | import { getList, remove, add, edit} from '../../api/consigner/consigner'; |
| 138 | - import loginUserInfo from '../../api/base'; | 140 | + import {loginedUserInfo} from "../../api/user"; |
| 139 | 141 | ||
| 140 | export default { | 142 | export default { |
| 141 | data() { | 143 | data() { |
| @@ -231,7 +233,7 @@ | @@ -231,7 +233,7 @@ | ||
| 231 | pageSize: this.pageSize, | 233 | pageSize: this.pageSize, |
| 232 | limitSize: this.limitSize, | 234 | limitSize: this.limitSize, |
| 233 | companyName: this.filters.companyName, | 235 | companyName: this.filters.companyName, |
| 234 | - enterpriseId: loginUserInfo.companyId | 236 | + enterpriseId: loginedUserInfo().companyId |
| 235 | }; | 237 | }; |
| 236 | this.listLoading = true; | 238 | this.listLoading = true; |
| 237 | getList(para).then((res) => { | 239 | getList(para).then((res) => { |
| @@ -402,8 +404,8 @@ | @@ -402,8 +404,8 @@ | ||
| 402 | }, | 404 | }, |
| 403 | //设置 用户id 企业id | 405 | //设置 用户id 企业id |
| 404 | userId(){ | 406 | userId(){ |
| 405 | - this.conerForm.userId = loginUserInfo.userId; | ||
| 406 | - this.conerForm.enterpriseId = loginUserInfo.companyId; | 407 | + this.conerForm.userId = loginedUserInfo().userId; |
| 408 | + this.conerForm.enterpriseId = loginedUserInfo().companyId; | ||
| 407 | } | 409 | } |
| 408 | }, | 410 | }, |
| 409 | 411 |
| @@ -38,7 +38,7 @@ | @@ -38,7 +38,7 @@ | ||
| 38 | </div> | 38 | </div> |
| 39 | </el-col> | 39 | </el-col> |
| 40 | <div class="grid-content el-btn"> | 40 | <div class="grid-content el-btn"> |
| 41 | - <el-button type="primary" @click="handleSerach">查询</el-button> | 41 | + <el-button type="primary" @click="handleSerach" icon="el-icon-search">查  询</el-button> |
| 42 | <el-button v-if="arriveQuery.flightno ===undefined && arriveData.length<1" | 42 | <el-button v-if="arriveQuery.flightno ===undefined && arriveData.length<1" |
| 43 | type="primary" | 43 | type="primary" |
| 44 | @click="handleAddArrive">新增运抵 | 44 | @click="handleAddArrive">新增运抵 |
| @@ -78,17 +78,17 @@ | @@ -78,17 +78,17 @@ | ||
| 78 | <!-- <span>{{scope.row.awbh}}</span>--> | 78 | <!-- <span>{{scope.row.awbh}}</span>--> |
| 79 | <!-- </template>--> | 79 | <!-- </template>--> |
| 80 | <!-- </el-table-column>--> | 80 | <!-- </el-table-column>--> |
| 81 | - <el-table-column label="运抵件数" width="70" align="center"> | 81 | + <el-table-column label="运抵件数" width="80" align="center"> |
| 82 | <template slot-scope="scope"> | 82 | <template slot-scope="scope"> |
| 83 | <span>{{scope.row.piece}}</span> | 83 | <span>{{scope.row.piece}}</span> |
| 84 | </template> | 84 | </template> |
| 85 | </el-table-column> | 85 | </el-table-column> |
| 86 | - <el-table-column label="运抵重量" width="70" align="center"> | 86 | + <el-table-column label="运抵重量" width="80" align="center"> |
| 87 | <template slot-scope="scope"> | 87 | <template slot-scope="scope"> |
| 88 | <span>{{scope.row.weight}}</span> | 88 | <span>{{scope.row.weight}}</span> |
| 89 | </template> | 89 | </template> |
| 90 | </el-table-column> | 90 | </el-table-column> |
| 91 | - <el-table-column label="货物描述" width="120" style="height: 20px" align="center"> | 91 | + <el-table-column label="货物描述" width="120" style="height: 20px" align="center" show-overflow-tooltip> |
| 92 | <template slot-scope="scope"> | 92 | <template slot-scope="scope"> |
| 93 | <span>{{scope.row.goodsname}}</span> | 93 | <span>{{scope.row.goodsname}}</span> |
| 94 | </template> | 94 | </template> |
| @@ -122,45 +122,57 @@ | @@ -122,45 +122,57 @@ | ||
| 122 | <span v-if="scope.row.status ==='25'">已发送修改报</span> | 122 | <span v-if="scope.row.status ==='25'">已发送修改报</span> |
| 123 | </template> | 123 | </template> |
| 124 | </el-table-column> | 124 | </el-table-column> |
| 125 | - <el-table-column prop="receipt" label="回执信息" align="center"> | 125 | + <el-table-column prop="receipt" label="回执信息" align="center" show-overflow-tooltip width="380" > |
| 126 | <template slot-scope="scope"> | 126 | <template slot-scope="scope"> |
| 127 | - <span>{{scope.row.ext5}}</span> | 127 | + <el-tag v-if="scope.row.status=='01' || scope.row.status=='11'" type="success"> |
| 128 | + {{scope.row.ext5}} | ||
| 129 | + </el-tag> | ||
| 130 | + <el-tag v-else-if="scope.row.status=='02' || scope.row.status=='03'" type="warning"> | ||
| 131 | + {{scope.row.ext5}} | ||
| 132 | + </el-tag> | ||
| 133 | + <el-tag v-else-if="scope.row.status=='12' || scope.row.status=='13'" type="danger"> | ||
| 134 | + {{scope.row.ext5}} | ||
| 135 | + </el-tag> | ||
| 136 | + <el-tag v-else> | ||
| 137 | + {{scope.row.ext5}} | ||
| 138 | + </el-tag> | ||
| 128 | </template> | 139 | </template> |
| 129 | </el-table-column> | 140 | </el-table-column> |
| 130 | - <el-table-column prop="operation" fixed="right" label="操作" align="center" width="400"> | 141 | + <el-table-column prop="operation" fixed="right" label="操作" align="center" width="350"> |
| 131 | <template slot-scope="scope"> | 142 | <template slot-scope="scope"> |
| 132 | - <el-button @click="handleSendDesc(scope.row)">收发明细</el-button> | ||
| 133 | -<!-- <el-button type="success" @click="handleEdit(scope.row)">编辑</el-button>--> | ||
| 134 | - <el-button type="primary" @click="handleSendAwb(scope.row)" | ||
| 135 | - :disabled="scope.row.status ==='23'">发送出港运抵报 | ||
| 136 | - </el-button> | ||
| 137 | - <p></p> | ||
| 138 | - <el-button type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单 | ||
| 139 | - </el-button> | ||
| 140 | - <el-button type="warning" @click="handleAwbStatus(scope.row)" | ||
| 141 | - :disabled="scope.row.status ==='22'">更改状态 | ||
| 142 | - </el-button> | ||
| 143 | - <el-button type="primary" v-if="scope.row.awbh ===''" | ||
| 144 | - @click="handleAddAwbh(scope.row)">新增分单 | ||
| 145 | - </el-button> | ||
| 146 | - <el-button type="danger" @click="handleSendDelete(scope.row)" | ||
| 147 | - :disabled="scope.row.status ==='24'">发删除报 | ||
| 148 | - </el-button> | 143 | + <el-row type="flex" justify="space-between"> |
| 144 | +<!-- <el-button type="success" @click="handleEdit(scope.row)">编辑运单</el-button>--> | ||
| 145 | + <el-button icon="el-icon-view" @click="handleSendDesc(scope.row)">收发明细</el-button> | ||
| 146 | + <el-button type="success" icon="el-icon-plus" v-if="scope.row.awbh ===''" | ||
| 147 | + @click="handleAddAwbh(scope.row)">新增分单 | ||
| 148 | + </el-button> | ||
| 149 | + <el-button type="danger" icon="el-icon-delete" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button> | ||
| 150 | + </el-row> | ||
| 151 | + <el-row type="flex" justify="space-between"> | ||
| 152 | + <el-button type="primary" icon="el-icon-plus" @click="handleSendAwb(scope.row)" | ||
| 153 | + :disabled="scope.row.status ==='23'">运抵申报 | ||
| 154 | + </el-button> | ||
| 155 | + <el-button type="warning" icon="el-icon-edit" @click="handleAwbStatus(scope.row)" | ||
| 156 | + :disabled="scope.row.status ==='22'">更改状态 | ||
| 157 | + </el-button> | ||
| 158 | + <el-button type="danger" icon="el-icon-delete" @click="handleSendDelete(scope.row)" | ||
| 159 | + :disabled="scope.row.status ==='24'">删除申报 | ||
| 160 | + </el-button> | ||
| 161 | + </el-row> | ||
| 149 | </template> | 162 | </template> |
| 150 | </el-table-column> | 163 | </el-table-column> |
| 151 | </el-table> | 164 | </el-table> |
| 152 | <div class="btnFoot"> | 165 | <div class="btnFoot"> |
| 153 | <el-row> | 166 | <el-row> |
| 154 | - <el-button type="primary" v-if="arriveQuery.flightno !==undefined || arriveData.length>0" | ||
| 155 | - @click="handelAddArriveInfo">新增出港运抵 | 167 | + <el-button icon="el-icon-plus" type="success" v-if="arriveQuery.flightno !==undefined || arriveData.length>0" |
| 168 | + @click="handelAddArriveInfo">新增运抵 | ||
| 156 | </el-button> | 169 | </el-button> |
| 157 | - <el-button type="primary" v-if="arriveQuery.flightno !== undefined || arriveData.length>0" | ||
| 158 | - @click="handelBackStep">返回 | 170 | + <el-button icon="el-icon-back" type="primary" v-if="arriveQuery.flightno !== undefined || arriveData.length>0" |
| 171 | + @click="handelBackStep">返  回 | ||
| 159 | </el-button> | 172 | </el-button> |
| 160 | </el-row> | 173 | </el-row> |
| 161 | </div> | 174 | </div> |
| 162 | - <pagination background layout="total, prev, pager, next" v-show="total>0" :total="total" :page.sync="arriveQuery.pageSize" | ||
| 163 | - :limit.sync="arriveQuery.limitSize" | 175 | + <pagination v-show="total>0" :total="total" :page.sync="arriveQuery.pageSize" :limit.sync="arriveQuery.limitSize" |
| 164 | @pagination="getList"/> | 176 | @pagination="getList"/> |
| 165 | <el-dialog :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible"> | 177 | <el-dialog :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible"> |
| 166 | <el-form ref="arriveFormData" :model="arriveModel" :rules="arriveRoles" label-position="right" | 178 | <el-form ref="arriveFormData" :model="arriveModel" :rules="arriveRoles" label-position="right" |
| @@ -184,12 +196,12 @@ | @@ -184,12 +196,12 @@ | ||
| 184 | <span>航班信息</span> | 196 | <span>航班信息</span> |
| 185 | </div> | 197 | </div> |
| 186 | <el-row> | 198 | <el-row> |
| 187 | - <el-col :span="7.5"> | ||
| 188 | - <el-form-item label="承运人" prop="carrier"> | ||
| 189 | - <el-input v-model="carrier" | ||
| 190 | - :disabled="fenStatus === 'addAwbh'"></el-input> | ||
| 191 | - </el-form-item> | ||
| 192 | - </el-col> | 199 | +<!-- <el-col :span="7.5">--> |
| 200 | +<!-- <el-form-item label="承运人" prop="carrier">--> | ||
| 201 | +<!-- <el-input v-model="carrier"--> | ||
| 202 | +<!-- :disabled="fenStatus === 'addAwbh'"></el-input>--> | ||
| 203 | +<!-- </el-form-item>--> | ||
| 204 | +<!-- </el-col>--> | ||
| 193 | <el-col :span="7.5"> | 205 | <el-col :span="7.5"> |
| 194 | <el-form-item label="航班号" prop="flightno"> | 206 | <el-form-item label="航班号" prop="flightno"> |
| 195 | <el-input v-model="flightno" | 207 | <el-input v-model="flightno" |
| @@ -454,6 +466,7 @@ | @@ -454,6 +466,7 @@ | ||
| 454 | piece: [{required: true, trigger: 'change', validator: validatorNums}], | 466 | piece: [{required: true, trigger: 'change', validator: validatorNums}], |
| 455 | arrivetime: [{required: true, trigger: 'blur', message:'请选择运抵时间'}], | 467 | arrivetime: [{required: true, trigger: 'blur', message:'请选择运抵时间'}], |
| 456 | customcode: [{required: true, trigger: 'blur', message:'海关关区不能为空'}], | 468 | customcode: [{required: true, trigger: 'blur', message:'海关关区不能为空'}], |
| 469 | + flightdate: [{required: true, trigger: 'blur', message:'请选择航班日期'}], | ||
| 457 | }, | 470 | }, |
| 458 | arriveData: [], | 471 | arriveData: [], |
| 459 | detailData: [], | 472 | detailData: [], |
| @@ -492,20 +505,21 @@ | @@ -492,20 +505,21 @@ | ||
| 492 | contactName:[{required:true,message:'操作人不能为空',trigger:'blur'}], | 505 | contactName:[{required:true,message:'操作人不能为空',trigger:'blur'}], |
| 493 | contactTel:[ | 506 | contactTel:[ |
| 494 | { required: true, message: '手机号不能为空', trigger: 'blur' }, | 507 | { required: true, message: '手机号不能为空', trigger: 'blur' }, |
| 495 | - { type: 'number', message: '手机号格式不正确', trigger: 'blur', | ||
| 496 | - transform(value){ | ||
| 497 | - var phone = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/ | ||
| 498 | - if (!phone.test(value)){ | ||
| 499 | - return false; | ||
| 500 | - }else { | ||
| 501 | - return Number(value); | ||
| 502 | - } | ||
| 503 | - }} | 508 | + // { type: 'number', message: '手机号格式不正确', trigger: 'blur', |
| 509 | + // transform(value){ | ||
| 510 | + // var phone = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/ | ||
| 511 | + // if (!phone.test(value)){ | ||
| 512 | + // return false; | ||
| 513 | + // }else { | ||
| 514 | + // return Number(value); | ||
| 515 | + // } | ||
| 516 | + // } | ||
| 517 | + // } | ||
| 504 | ], | 518 | ], |
| 505 | }, | 519 | }, |
| 506 | } | 520 | } |
| 507 | }, | 521 | }, |
| 508 | - created() { | 522 | + activated() { |
| 509 | if (this.$route.params.flightData !== undefined) { | 523 | if (this.$route.params.flightData !== undefined) { |
| 510 | // 给查询条件赋值 | 524 | // 给查询条件赋值 |
| 511 | if (this.$route.params.flightData.awba !== undefined && this.$route.params.flightData.awba !== '') { | 525 | if (this.$route.params.flightData.awba !== undefined && this.$route.params.flightData.awba !== '') { |
| @@ -517,11 +531,19 @@ | @@ -517,11 +531,19 @@ | ||
| 517 | this.arriveQuery.originstation = this.$route.params.flightData.originstation | 531 | this.arriveQuery.originstation = this.$route.params.flightData.originstation |
| 518 | this.arriveQuery.destinationstation = this.$route.params.flightData.destinationstation | 532 | this.arriveQuery.destinationstation = this.$route.params.flightData.destinationstation |
| 519 | this.getList() | 533 | this.getList() |
| 534 | + }else { | ||
| 535 | + this.arriveQuery= { | ||
| 536 | + pageSize: 1, | ||
| 537 | + limitSize: 10, | ||
| 538 | + awba: undefined, | ||
| 539 | + messageType: 'MT3201', | ||
| 540 | + } | ||
| 520 | } | 541 | } |
| 521 | let username = loginedUserInfo().username | 542 | let username = loginedUserInfo().username |
| 522 | if (username === 'admin') { | 543 | if (username === 'admin') { |
| 523 | this.isAdmin = true | 544 | this.isAdmin = true |
| 524 | } | 545 | } |
| 546 | + this.isAdmin = true | ||
| 525 | }, | 547 | }, |
| 526 | computed: { | 548 | computed: { |
| 527 | awba: { | 549 | awba: { |
| @@ -626,9 +648,11 @@ | @@ -626,9 +648,11 @@ | ||
| 626 | handelAddArriveInfo() { | 648 | handelAddArriveInfo() { |
| 627 | this.restModel() | 649 | this.restModel() |
| 628 | // 给model赋值，所使用数据是以单独单号查询数据所得 | 650 | // 给model赋值，所使用数据是以单独单号查询数据所得 |
| 629 | - this.arriveModel.carrier = this.arriveQuery.carrier | 651 | + // this.arriveModel.carrier = this.arriveQuery.carrier |
| 630 | this.arriveModel.flightdate = this.arriveQuery.flightdate | 652 | this.arriveModel.flightdate = this.arriveQuery.flightdate |
| 631 | - this.arriveModel.flightno = this.arriveQuery.flightno | 653 | + if (this.arriveQuery.carrier!=undefined){ |
| 654 | + this.arriveModel.flightno = this.arriveQuery.carrier+this.arriveQuery.flightno | ||
| 655 | + } | ||
| 632 | this.arriveModel.originstation = this.arriveQuery.originstation | 656 | this.arriveModel.originstation = this.arriveQuery.originstation |
| 633 | this.arriveModel.destinationstation = this.arriveQuery.destinationstation | 657 | this.arriveModel.destinationstation = this.arriveQuery.destinationstation |
| 634 | this.arriveModel.customcode = this.arriveQuery.customcode | 658 | this.arriveModel.customcode = this.arriveQuery.customcode |
| @@ -643,10 +667,10 @@ | @@ -643,10 +667,10 @@ | ||
| 643 | handleAddAwbh(row){ | 667 | handleAddAwbh(row){ |
| 644 | this.restModel() | 668 | this.restModel() |
| 645 | // 给model赋值，所使用数据是以单独单号查询数据所得 | 669 | // 给model赋值，所使用数据是以单独单号查询数据所得 |
| 646 | - this.arriveModel.carrier = row.carrier | 670 | + // this.arriveModel.carrier = row.carrier |
| 647 | this.arriveModel.awba = row.awba | 671 | this.arriveModel.awba = row.awba |
| 648 | this.arriveModel.flightdate = row.flightdate | 672 | this.arriveModel.flightdate = row.flightdate |
| 649 | - this.arriveModel.flightno = row.flightno | 673 | + this.arriveModel.flightno =row.carrier+ row.flightno |
| 650 | this.arriveModel.originstation = row.originstation | 674 | this.arriveModel.originstation = row.originstation |
| 651 | this.arriveModel.destinationstation = row.destinationstation | 675 | this.arriveModel.destinationstation = row.destinationstation |
| 652 | this.arriveModel.customcode = row.customcode | 676 | this.arriveModel.customcode = row.customcode |
| @@ -663,6 +687,8 @@ | @@ -663,6 +687,8 @@ | ||
| 663 | createData() { | 687 | createData() { |
| 664 | this.$refs.arriveFormData.validate(valid => { | 688 | this.$refs.arriveFormData.validate(valid => { |
| 665 | if (valid) { | 689 | if (valid) { |
| 690 | + this.arriveModel.carrier = this.arriveModel.flightno.substring(0,2); | ||
| 691 | + this.arriveModel.flightno = this.arriveModel.flightno.substring(2); | ||
| 666 | addMt3201(this.arriveModel).then(res => { | 692 | addMt3201(this.arriveModel).then(res => { |
| 667 | if (res.data.code == "200") { | 693 | if (res.data.code == "200") { |
| 668 | this.dialogFormVisible = false | 694 | this.dialogFormVisible = false |
| @@ -704,6 +730,7 @@ | @@ -704,6 +730,7 @@ | ||
| 704 | // 编辑 | 730 | // 编辑 |
| 705 | handleEdit(row) { | 731 | handleEdit(row) { |
| 706 | this.arriveModel = Object.assign({}, row) // copy obj | 732 | this.arriveModel = Object.assign({}, row) // copy obj |
| 733 | + this.arriveModel.flightno = row.carrier+row.flightno | ||
| 707 | if (row.awbh === ''){ | 734 | if (row.awbh === ''){ |
| 708 | this.fenStatus = undefined | 735 | this.fenStatus = undefined |
| 709 | }else { | 736 | }else { |
| @@ -723,6 +750,8 @@ | @@ -723,6 +750,8 @@ | ||
| 723 | username : loginedUserInfo().username | 750 | username : loginedUserInfo().username |
| 724 | } | 751 | } |
| 725 | if (valid) { | 752 | if (valid) { |
| 753 | + this.arriveModel.carrier = this.arriveModel.flightno.substring(0,2); | ||
| 754 | + this.arriveModel.flightno = this.arriveModel.flightno.substring(2); | ||
| 726 | updateMT3201(this.arriveModel).then(res => { | 755 | updateMT3201(this.arriveModel).then(res => { |
| 727 | if (res.data.code == "200") { | 756 | if (res.data.code == "200") { |
| 728 | this.dialogFormVisible = false | 757 | this.dialogFormVisible = false |
| @@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
| 7 | <el-date-picker v-model="listQuery.flightDate" clearable type="date" style="width: 270px;margin-right: 50px" | 7 | <el-date-picker v-model="listQuery.flightDate" clearable type="date" style="width: 270px;margin-right: 50px" |
| 8 | placeholder="航班日期" | 8 | placeholder="航班日期" |
| 9 | class="filter-item" value-format="yyyy-MM-dd"></el-date-picker> | 9 | class="filter-item" value-format="yyyy-MM-dd"></el-date-picker> |
| 10 | - <el-button type="warning" style="width:150px" size="medium" icon="el-icon-search" @click="handleSearch">查询</el-button> | 10 | + <el-button type="warning" style="width:150px" icon="el-icon-search" @click="handleSearch">查  询</el-button> |
| 11 | </div> | 11 | </div> |
| 12 | <el-table :data="flightData" v-loading="listLoading" stripe | 12 | <el-table :data="flightData" v-loading="listLoading" stripe |
| 13 | style="border-radius: 10px 10px 0px 0px;line-height: 25px;" stripe | 13 | style="border-radius: 10px 10px 0px 0px;line-height: 25px;" stripe |
| @@ -106,7 +106,7 @@ | @@ -106,7 +106,7 @@ | ||
| 106 | airportCode: [], | 106 | airportCode: [], |
| 107 | }; | 107 | }; |
| 108 | }, | 108 | }, |
| 109 | - created() { | 109 | + activated() { |
| 110 | if (this.$route.params.scopeRow !== undefined) { | 110 | if (this.$route.params.scopeRow !== undefined) { |
| 111 | if (this.$route.params.scopeRow.carrier === undefined) { | 111 | if (this.$route.params.scopeRow.carrier === undefined) { |
| 112 | this.flight.flightno = this.$route.params.scopeRow.flightno | 112 | this.flight.flightno = this.$route.params.scopeRow.flightno |
| @@ -185,7 +185,7 @@ | @@ -185,7 +185,7 @@ | ||
| 185 | } else { | 185 | } else { |
| 186 | this.flight.awba = undefined | 186 | this.flight.awba = undefined |
| 187 | } | 187 | } |
| 188 | - | 188 | + console.log("-----------"+this.flight.messageType); |
| 189 | if (this.flight.messageType === "MT5202") { | 189 | if (this.flight.messageType === "MT5202") { |
| 190 | this.$router.push({name: '出港理货', params: {flightData: this.flight}}); | 190 | this.$router.push({name: '出港理货', params: {flightData: this.flight}}); |
| 191 | } | 191 | } |
| @@ -38,9 +38,9 @@ | @@ -38,9 +38,9 @@ | ||
| 38 | </div> | 38 | </div> |
| 39 | </el-col> | 39 | </el-col> |
| 40 | <div class="el-btn"> | 40 | <div class="el-btn"> |
| 41 | - <el-button type="primary" size="mini" @click="handleSearch">查询</el-button> | 41 | + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearch">查  询</el-button> |
| 42 | <el-button v-if="loadingQuery.flightno === undefined && loadingData.length <1" | 42 | <el-button v-if="loadingQuery.flightno === undefined && loadingData.length <1" |
| 43 | - type="primary" size="mini" @click="handleAddLoading">新增装载 | 43 | + type="success" icon="el-icon-plus" size="mini" @click="handleAddLoading">新增装载 |
| 44 | </el-button> | 44 | </el-button> |
| 45 | </div> | 45 | </div> |
| 46 | </div> | 46 | </div> |
| @@ -59,6 +59,16 @@ | @@ -59,6 +59,16 @@ | ||
| 59 | <a type="text" style="color: #409eff;text-decoration: underline" class="tableInline" @click="handleEdit(scope.row)">{{scope.row.awba}}</a> | 59 | <a type="text" style="color: #409eff;text-decoration: underline" class="tableInline" @click="handleEdit(scope.row)">{{scope.row.awba}}</a> |
| 60 | </template> | 60 | </template> |
| 61 | </el-table-column> | 61 | </el-table-column> |
| 62 | + <el-table-column label="航班号" width="100" align="center"> | ||
| 63 | + <template slot-scope="scope"> | ||
| 64 | + <span>{{scope.row.carrier}}{{scope.row.flightno}}</span> | ||
| 65 | + </template> | ||
| 66 | + </el-table-column> | ||
| 67 | + <el-table-column label="航班日期" width="130" align="center"> | ||
| 68 | + <template slot-scope="scope"> | ||
| 69 | + <span>{{scope.row.flightdate}}</span> | ||
| 70 | + </template> | ||
| 71 | + </el-table-column> | ||
| 62 | <el-table-column label="运载件数" width="70" align="center"> | 72 | <el-table-column label="运载件数" width="70" align="center"> |
| 63 | <template slot-scope="scope"> | 73 | <template slot-scope="scope"> |
| 64 | <span>{{scope.row.lodingpiece}}</span> | 74 | <span>{{scope.row.lodingpiece}}</span> |
| @@ -69,7 +79,7 @@ | @@ -69,7 +79,7 @@ | ||
| 69 | <span>{{scope.row.lodingweight}}</span> | 79 | <span>{{scope.row.lodingweight}}</span> |
| 70 | </template> | 80 | </template> |
| 71 | </el-table-column> | 81 | </el-table-column> |
| 72 | - <el-table-column label="货物描述" width="120" align="center"> | 82 | + <el-table-column label="货物描述" width="120" align="center" show-overflow-tooltip> |
| 73 | <template slot-scope="scope"> | 83 | <template slot-scope="scope"> |
| 74 | <span>{{scope.row.goodsname}}</span> | 84 | <span>{{scope.row.goodsname}}</span> |
| 75 | </template> | 85 | </template> |
| @@ -103,50 +113,56 @@ | @@ -103,50 +113,56 @@ | ||
| 103 | <span v-if="scope.row.status ==='25'">已发送修改报</span> | 113 | <span v-if="scope.row.status ==='25'">已发送修改报</span> |
| 104 | </template> | 114 | </template> |
| 105 | </el-table-column> | 115 | </el-table-column> |
| 106 | - <el-table-column label="回执信息" width="270" align="center"> | 116 | + <el-table-column label="回执信息" width="220" align="center" show-overflow-tooltip> |
| 107 | <template slot-scope="scope"> | 117 | <template slot-scope="scope"> |
| 108 | - <span>{{scope.row.ext5}}</span> | 118 | + <el-tag v-if="scope.row.status=='01' || scope.row.status=='11'" type="success"> |
| 119 | + {{scope.row.ext5}} | ||
| 120 | + </el-tag> | ||
| 121 | + <el-tag v-else-if="scope.row.status=='02' || scope.row.status=='03'" type="warning"> | ||
| 122 | + {{scope.row.ext5}} | ||
| 123 | + </el-tag> | ||
| 124 | + <el-tag v-else-if="scope.row.status=='12' || scope.row.status=='13'" type="danger"> | ||
| 125 | + {{scope.row.ext5}} | ||
| 126 | + </el-tag> | ||
| 127 | + <el-tag v-else> | ||
| 128 | + {{scope.row.ext5}} | ||
| 129 | + </el-tag> | ||
| 109 | </template> | 130 | </template> |
| 110 | </el-table-column> | 131 | </el-table-column> |
| 111 | - <el-table-column label="操作" align="center" fixed="right"> | 132 | + <el-table-column label="操作" align="center" width="330px" fixed="right"> |
| 112 | <template slot-scope="scope"> | 133 | <template slot-scope="scope"> |
| 113 | - <el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button> | ||
| 114 | - | ||
| 115 | -<!-- <el-button size="mini" type="success" @click="handleEdit(scope.row)" >编辑--> | ||
| 116 | -<!-- </el-button>--> | ||
| 117 | - | ||
| 118 | - <el-button size="mini" type="primary" @click="handleSendAwb(scope.row)" | ||
| 119 | - :disabled="scope.row.status ==='23'">发送出港装载报 | ||
| 120 | - </el-button> | ||
| 121 | - | ||
| 122 | - <br><br> | ||
| 123 | - <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单 | ||
| 124 | - </el-button> | ||
| 125 | - | ||
| 126 | - <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)" | ||
| 127 | - :disabled="scope.row.status ==='22'">更改状态 | ||
| 128 | - </el-button> | ||
| 129 | - | ||
| 130 | - <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)" | ||
| 131 | - :disabled="scope.row.status ==='24'">发送删除报 | ||
| 132 | - </el-button> | ||
| 133 | - | 134 | + <el-row type="flex" justify="space-between"> |
| 135 | + <el-button size="mini" icon="el-icon-view" @click="handleSend(scope.row)">收发明细</el-button> | ||
| 136 | + <el-button size="mini" icon="el-icon-edit" type="warning" @click="handleAwbStatus(scope.row)" | ||
| 137 | + :disabled="scope.row.status ==='22'">更改状态 | ||
| 138 | + </el-button> | ||
| 139 | + <el-button size="mini" icon="el-icon-delete" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单 | ||
| 140 | + </el-button> | ||
| 141 | + </el-row> | ||
| 142 | + <el-row type="flex" justify="space-between"> | ||
| 143 | + <el-button size="mini" type="primary" icon="el-icon-plus" @click="handleSendAwb(scope.row)" | ||
| 144 | + :disabled="scope.row.status ==='23'">装载申报 | ||
| 145 | + </el-button> | ||
| 146 | + <el-button size="mini" icon="el-icon-delete" type="danger" @click="handleSendDelete(scope.row)" | ||
| 147 | + :disabled="scope.row.status ==='24'">删除申报 | ||
| 148 | + </el-button> | ||
| 149 | + </el-row> | ||
| 134 | </template> | 150 | </template> |
| 135 | </el-table-column> | 151 | </el-table-column> |
| 136 | </el-table> | 152 | </el-table> |
| 137 | <div class="btnFoot"> | 153 | <div class="btnFoot"> |
| 138 | <el-row> | 154 | <el-row> |
| 139 | - <el-button type="primary" size="mini" | 155 | + <el-button type="success" icon="el-icon-plus" size="mini" |
| 140 | v-if="loadingQuery.flightno !== undefined || loadingData.length >0" | 156 | v-if="loadingQuery.flightno !== undefined || loadingData.length >0" |
| 141 | - @click="handelAddLoadingInfo">新增出港装载 | 157 | + @click="handelAddLoadingInfo">新增装载 |
| 142 | </el-button> | 158 | </el-button> |
| 143 | - <el-button type="primary" size="mini" | 159 | + <el-button type="primary" icon="el-icon-back" size="mini" |
| 144 | v-if="loadingQuery.flightno !== undefined || loadingData.length>0" | 160 | v-if="loadingQuery.flightno !== undefined || loadingData.length>0" |
| 145 | - @click="handelBackStep">返回 | 161 | + @click="handelBackStep">返  回 |
| 146 | </el-button> | 162 | </el-button> |
| 147 | </el-row> | 163 | </el-row> |
| 148 | </div> | 164 | </div> |
| 149 | - <pagination background layout="total, prev, pager, next" v-show="total>0" :total="total" :page.sync="loadingQuery.pageSize" :limit.sync="loadingQuery.limitSize" | 165 | + <pagination v-show="total>0" :total="total" :page.sync="loadingQuery.pageSize" :limit.sync="loadingQuery.limitSize" |
| 150 | @pagination="getList"/> | 166 | @pagination="getList"/> |
| 151 | 167 | ||
| 152 | <el-dialog :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible"> | 168 | <el-dialog :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible"> |
| @@ -161,11 +177,11 @@ | @@ -161,11 +177,11 @@ | ||
| 161 | <el-input v-model="loadingModel.awba" :disabled="dialogStatus ==='update'"></el-input> | 177 | <el-input v-model="loadingModel.awba" :disabled="dialogStatus ==='update'"></el-input> |
| 162 | </el-form-item> | 178 | </el-form-item> |
| 163 | </el-col> | 179 | </el-col> |
| 164 | - <el-col :span="7.5"> | ||
| 165 | - <el-form-item label="承运人" prop="carrier"> | ||
| 166 | - <el-input v-model="carrier" :disabled="dialogStatus ==='update'"></el-input> | ||
| 167 | - </el-form-item> | ||
| 168 | - </el-col> | 180 | +<!-- <el-col :span="7.5">--> |
| 181 | +<!-- <el-form-item label="承运人" prop="carrier">--> | ||
| 182 | +<!-- <el-input v-model="carrier" :disabled="dialogStatus ==='update'"></el-input>--> | ||
| 183 | +<!-- </el-form-item>--> | ||
| 184 | +<!-- </el-col>--> | ||
| 169 | <el-col :span="7.5"> | 185 | <el-col :span="7.5"> |
| 170 | <el-form-item label="航班号" prop="flightno"> | 186 | <el-form-item label="航班号" prop="flightno"> |
| 171 | <el-input v-model="flightno" :disabled="dialogStatus ==='update'"></el-input> | 187 | <el-input v-model="flightno" :disabled="dialogStatus ==='update'"></el-input> |
| @@ -462,8 +478,8 @@ | @@ -462,8 +478,8 @@ | ||
| 462 | goodsname: [{required: true, trigger: 'blur', validator: validAlphabetsSpanceKey}], | 478 | goodsname: [{required: true, trigger: 'blur', validator: validAlphabetsSpanceKey}], |
| 463 | carrier: [{required: true, trigger: 'blur', validator: validatorAwbh}], | 479 | carrier: [{required: true, trigger: 'blur', validator: validatorAwbh}], |
| 464 | flightno: [{required: true, trigger: 'blur', validator: validatorAwbh}], | 480 | flightno: [{required: true, trigger: 'blur', validator: validatorAwbh}], |
| 465 | - flightdate: [{required: true, trigger: 'blur'}], | ||
| 466 | - loadingtime: [{required: true, trigger: 'blur'}], | 481 | + flightdate: [{required: true, trigger: 'blur', message:'请选择航班时间'}], |
| 482 | + loadingtime: [{required: true, trigger: 'blur', message:'请选择装载时间'}], | ||
| 467 | originstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}], | 483 | originstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}], |
| 468 | destinationstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}], | 484 | destinationstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}], |
| 469 | lodingpiece: [{type: 'number',required: true, trigger: 'change', message: '只能输入数字'}], | 485 | lodingpiece: [{type: 'number',required: true, trigger: 'change', message: '只能输入数字'}], |
| @@ -529,7 +545,7 @@ | @@ -529,7 +545,7 @@ | ||
| 529 | }, | 545 | }, |
| 530 | } | 546 | } |
| 531 | }, | 547 | }, |
| 532 | - created() { | 548 | + activated() { |
| 533 | if (this.$route.params.flightData !== undefined) { | 549 | if (this.$route.params.flightData !== undefined) { |
| 534 | // 给查询条件赋值 | 550 | // 给查询条件赋值 |
| 535 | if (this.$route.params.flightData.awba !== undefined && this.$route.params.flightData.awba !== '') { | 551 | if (this.$route.params.flightData.awba !== undefined && this.$route.params.flightData.awba !== '') { |
| @@ -541,6 +557,13 @@ | @@ -541,6 +557,13 @@ | ||
| 541 | this.loadingQuery.originstation = this.$route.params.flightData.originstation | 557 | this.loadingQuery.originstation = this.$route.params.flightData.originstation |
| 542 | this.loadingQuery.destinationstation = this.$route.params.flightData.destinationstation | 558 | this.loadingQuery.destinationstation = this.$route.params.flightData.destinationstation |
| 543 | this.getList() | 559 | this.getList() |
| 560 | + }else { | ||
| 561 | + this.loadingQuery= { | ||
| 562 | + pageSize: 1, | ||
| 563 | + limitSize: 10, | ||
| 564 | + awba: undefined, | ||
| 565 | + messageType: 'MT4201' | ||
| 566 | + } | ||
| 544 | } | 567 | } |
| 545 | let username = loginedUserInfo().username | 568 | let username = loginedUserInfo().username |
| 546 | if (username === 'admin') { | 569 | if (username === 'admin') { |
| @@ -654,6 +677,7 @@ | @@ -654,6 +677,7 @@ | ||
| 654 | // 编辑 弹框 | 677 | // 编辑 弹框 |
| 655 | handleEdit(row) { | 678 | handleEdit(row) { |
| 656 | this.loadingModel = Object.assign({}, row) | 679 | this.loadingModel = Object.assign({}, row) |
| 680 | + this.loadingModel.flightno = row.carrier+row.flightno | ||
| 657 | this.dialogStatus = 'update' | 681 | this.dialogStatus = 'update' |
| 658 | this.dialogFormVisible = true | 682 | this.dialogFormVisible = true |
| 659 | this.$nextTick(() => { | 683 | this.$nextTick(() => { |
| @@ -668,6 +692,8 @@ | @@ -668,6 +692,8 @@ | ||
| 668 | _this.loadingModel.user= { | 692 | _this.loadingModel.user= { |
| 669 | username : loginedUserInfo().username | 693 | username : loginedUserInfo().username |
| 670 | } | 694 | } |
| 695 | + this.loadingModel.carrier = this.loadingModel.flightno.substring(0,2); | ||
| 696 | + this.loadingModel.flightno = this.loadingModel.flightno.substring(2); | ||
| 671 | updateMT4201(this.loadingModel).then(res => { | 697 | updateMT4201(this.loadingModel).then(res => { |
| 672 | if (res.data.count > 0) { | 698 | if (res.data.count > 0) { |
| 673 | this.dialogFormVisible = false | 699 | this.dialogFormVisible = false |
| @@ -869,9 +895,11 @@ | @@ -869,9 +895,11 @@ | ||
| 869 | handelAddLoadingInfo() { | 895 | handelAddLoadingInfo() { |
| 870 | this.restModel() | 896 | this.restModel() |
| 871 | // 给model赋值，所使用数据是以单独单号查询数据所得 | 897 | // 给model赋值，所使用数据是以单独单号查询数据所得 |
| 872 | - this.loadingModel.carrier = this.loadingQuery.carrier | 898 | + // this.loadingModel.carrier = this.loadingQuery.carrier |
| 873 | this.loadingModel.flightdate = this.loadingQuery.flightdate | 899 | this.loadingModel.flightdate = this.loadingQuery.flightdate |
| 874 | - this.loadingModel.flightno = this.loadingQuery.flightno | 900 | + if ( this.loadingQuery.carrier != undefined){ |
| 901 | + this.loadingModel.flightno = this.loadingQuery.carrier + this.loadingQuery.flightno | ||
| 902 | + } | ||
| 875 | this.loadingModel.originstation = this.loadingQuery.originstation | 903 | this.loadingModel.originstation = this.loadingQuery.originstation |
| 876 | this.loadingModel.destinationstation = this.loadingQuery.destinationstation | 904 | this.loadingModel.destinationstation = this.loadingQuery.destinationstation |
| 877 | this.loadingModel.customcode = this.loadingQuery.customcode | 905 | this.loadingModel.customcode = this.loadingQuery.customcode |
| @@ -886,6 +914,8 @@ | @@ -886,6 +914,8 @@ | ||
| 886 | createData() { | 914 | createData() { |
| 887 | this.$refs.loadingFormData.validate(valid => { | 915 | this.$refs.loadingFormData.validate(valid => { |
| 888 | if (valid) { | 916 | if (valid) { |
| 917 | + this.loadingModel.carrier = this.loadingModel.flightno.substring(0,2); | ||
| 918 | + this.loadingModel.flightno = this.loadingModel.flightno.substring(2); | ||
| 889 | addMt4201(this.loadingModel).then(res => { | 919 | addMt4201(this.loadingModel).then(res => { |
| 890 | if (res.data.count > 0) { | 920 | if (res.data.count > 0) { |
| 891 | this.dialogFormVisible = false | 921 | this.dialogFormVisible = false |
| @@ -2,9 +2,9 @@ | @@ -2,9 +2,9 @@ | ||
| 2 | <!--<div class="app-container">--> | 2 | <!--<div class="app-container">--> |
| 3 | <div class="app-content"> | 3 | <div class="app-content"> |
| 4 | <div class="filter-container" style="margin-top: 50px;padding-bottom: 5px"> | 4 | <div class="filter-container" style="margin-top: 50px;padding-bottom: 5px"> |
| 5 | - <el-input v-model="listQuery.awba" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="运单号"/> | ||
| 6 | - <el-input v-model="listQuery.carrier" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="承运人"/> | ||
| 7 | - <el-input v-model="listQuery.flightno" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="航班号"/> | 5 | + <el-input v-model="listQuery.awba" @blur="inputAwba" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="运单号"/> |
| 6 | +<!-- <el-input v-model="listQuery.carrier" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="承运人"/>--> | ||
| 7 | + <el-input v-model="flightComNo" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="航班号"/> | ||
| 8 | <el-date-picker v-model="listQuery.flightDate" type="date" placeholder="航班日期" | 8 | <el-date-picker v-model="listQuery.flightDate" type="date" placeholder="航班日期" |
| 9 | value-format="yyyy-MM-dd" class="filter-item"></el-date-picker> | 9 | value-format="yyyy-MM-dd" class="filter-item"></el-date-picker> |
| 10 | </div> | 10 | </div> |
| @@ -18,8 +18,8 @@ | @@ -18,8 +18,8 @@ | ||
| 18 | <el-select v-model="listQuery.customStatus" clearable class="filter-item" placeholder="请选择海关状态" style="width: 200px;margin-right: 10px"> | 18 | <el-select v-model="listQuery.customStatus" clearable class="filter-item" placeholder="请选择海关状态" style="width: 200px;margin-right: 10px"> |
| 19 | <el-option v-for="item in customStatusList" :key="item.value" :label="item.label" :value="item.value"></el-option> | 19 | <el-option v-for="item in customStatusList" :key="item.value" :label="item.label" :value="item.value"></el-option> |
| 20 | </el-select> | 20 | </el-select> |
| 21 | - <el-button type="warning" style="width:150px" size="medium" icon="el-icon-search" @click="handleSearch">查询</el-button> | ||
| 22 | - <el-button type="primary" style="width:150px" size="medium" icon="el-icon-search" | 21 | + <el-button type="warning" style="width:150px" icon="el-icon-search" @click="handleSearch">查  询</el-button> |
| 22 | + <el-button type="primary" style="width:150px" icon="el-icon-search" | ||
| 23 | @click="handleUpdateStatus">批量修改状态</el-button> | 23 | @click="handleUpdateStatus">批量修改状态</el-button> |
| 24 | </div> | 24 | </div> |
| 25 | <div class="midSpan"> | 25 | <div class="midSpan"> |
| @@ -116,10 +116,18 @@ | @@ -116,10 +116,18 @@ | ||
| 116 | </el-table-column> | 116 | </el-table-column> |
| 117 | <el-table-column label="回执内容" align="center" show-overflow-tooltip> | 117 | <el-table-column label="回执内容" align="center" show-overflow-tooltip> |
| 118 | <template slot-scope="scope"> | 118 | <template slot-scope="scope"> |
| 119 | - <span>{{ scope.row.customText }}</span> | ||
| 120 | - <!--<div>--> | ||
| 121 | - <!--<el-progress :percentage="scope.row.customComplate" :status="scope.row.status | statusFilter"/>--> | ||
| 122 | - <!--</div>--> | 119 | + <el-tag v-if="scope.row.status=='01' || scope.row.status=='11'" type="success"> |
| 120 | + {{scope.row.customText}} | ||
| 121 | + </el-tag> | ||
| 122 | + <el-tag v-else-if="scope.row.status=='02' || scope.row.status=='03'" type="warning"> | ||
| 123 | + {{scope.row.customText}} | ||
| 124 | + </el-tag> | ||
| 125 | + <el-tag v-else-if="scope.row.status=='12' || scope.row.status=='13'" type="danger"> | ||
| 126 | + {{scope.row.customText}} | ||
| 127 | + </el-tag> | ||
| 128 | + <el-tag v-else> | ||
| 129 | + {{scope.row.customText}} | ||
| 130 | + </el-tag> | ||
| 123 | </template> | 131 | </template> |
| 124 | </el-table-column> | 132 | </el-table-column> |
| 125 | <el-table-column label="操作" width="180px" align="center"> | 133 | <el-table-column label="操作" width="180px" align="center"> |
| @@ -145,6 +153,7 @@ | @@ -145,6 +153,7 @@ | ||
| 145 | import {getMt520XListForParam} from "@/api/exitTidy"; | 153 | import {getMt520XListForParam} from "@/api/exitTidy"; |
| 146 | import {getMt3201ListForParam} from "@/api/exitArrive"; | 154 | import {getMt3201ListForParam} from "@/api/exitArrive"; |
| 147 | import {getMt4201ListForParam} from "@/api/exitLoading"; | 155 | import {getMt4201ListForParam} from "@/api/exitLoading"; |
| 156 | + import {Message} from "element-ui"; | ||
| 148 | 157 | ||
| 149 | export default { | 158 | export default { |
| 150 | name: "ExitManifest", | 159 | name: "ExitManifest", |
| @@ -157,10 +166,10 @@ | @@ -157,10 +166,10 @@ | ||
| 157 | listLoading: false, | 166 | listLoading: false, |
| 158 | listQuery: { | 167 | listQuery: { |
| 159 | pageSize: 1, | 168 | pageSize: 1, |
| 160 | - limitSize: 100, | 169 | + limitSize: 10, |
| 161 | awba:undefined, | 170 | awba:undefined, |
| 162 | - carrier: undefined, | ||
| 163 | - flightno:undefined, | 171 | + carrier: '', |
| 172 | + flightno:'', | ||
| 164 | flightDate: new Date(), | 173 | flightDate: new Date(), |
| 165 | messageType: undefined, | 174 | messageType: undefined, |
| 166 | messageStatus: undefined, | 175 | messageStatus: undefined, |
| @@ -198,16 +207,51 @@ | @@ -198,16 +207,51 @@ | ||
| 198 | ] | 207 | ] |
| 199 | } | 208 | } |
| 200 | }, | 209 | }, |
| 210 | + computed: { | ||
| 211 | + flightComNo: { | ||
| 212 | + get: function () { | ||
| 213 | + return this.listQuery.carrier+this.listQuery.flightno; | ||
| 214 | + }, | ||
| 215 | + set: function (val) { | ||
| 216 | + this.listQuery.carrier=''; | ||
| 217 | + this.listQuery.flightno = val.toUpperCase(); | ||
| 218 | + } | ||
| 219 | + } | ||
| 220 | + }, | ||
| 201 | methods: { | 221 | methods: { |
| 202 | getList() { | 222 | getList() { |
| 203 | - this.listLoading = true | ||
| 204 | - getManifests(this.listQuery).then(res =>{ | ||
| 205 | - this.manifestData = res.data.data.list | ||
| 206 | - this.total = res.data.data.total | ||
| 207 | - setTimeout(() =>{ | ||
| 208 | - this.listLoading = false | ||
| 209 | - },1500) | ||
| 210 | - }) | 223 | + // 主单为空 航班号 航班日期 不能为空 |
| 224 | + if (this.listQuery.awba == undefined | ||
| 225 | + && this.listQuery.flightno != ''){ | ||
| 226 | + this.listLoading = true | ||
| 227 | + if (this.listQuery.flightno != '' && this.listQuery.flightno.length > 0){ | ||
| 228 | + this.listQuery.carrier = this.listQuery.flightno.substring(0,2); | ||
| 229 | + this.listQuery.flightno = this.listQuery.flightno.substring(2); | ||
| 230 | + } | ||
| 231 | + getManifests(this.listQuery).then(res =>{ | ||
| 232 | + this.manifestData = res.data.data.list | ||
| 233 | + this.total = res.data.data.total | ||
| 234 | + setTimeout(() =>{ | ||
| 235 | + this.listLoading = false | ||
| 236 | + },1500) | ||
| 237 | + }) | ||
| 238 | + }else if (this.listQuery.awba != undefined){ | ||
| 239 | + this.listLoading = true | ||
| 240 | + this.listQuery.flightDate = undefined; | ||
| 241 | + getManifests(this.listQuery).then(res =>{ | ||
| 242 | + this.manifestData = res.data.data.list | ||
| 243 | + this.total = res.data.data.total | ||
| 244 | + setTimeout(() =>{ | ||
| 245 | + this.listLoading = false | ||
| 246 | + },1500) | ||
| 247 | + }) | ||
| 248 | + }else { | ||
| 249 | + Message.warning("请输入运单号或者航班号为查询条件"); | ||
| 250 | + } | ||
| 251 | + | ||
| 252 | + }, | ||
| 253 | + inputAwba(){ | ||
| 254 | + this.listQuery.flightDate = ''; | ||
| 211 | }, | 255 | }, |
| 212 | handleSelectionChange() { | 256 | handleSelectionChange() { |
| 213 | 257 | ||
| @@ -220,7 +264,6 @@ | @@ -220,7 +264,6 @@ | ||
| 220 | 264 | ||
| 221 | }, | 265 | }, |
| 222 | handleUpdate(row){ | 266 | handleUpdate(row){ |
| 223 | - console.log(row.messageType ) | ||
| 224 | if(row.messageType === 'MT2201'){ | 267 | if(row.messageType === 'MT2201'){ |
| 225 | this.$router.push({name: '出港航班信息', params: {scopeRow: row}}) | 268 | this.$router.push({name: '出港航班信息', params: {scopeRow: row}}) |
| 226 | } | 269 | } |
| @@ -8,15 +8,29 @@ | @@ -8,15 +8,29 @@ | ||
| 8 | </el-col> | 8 | </el-col> |
| 9 | <el-col :span="24"> | 9 | <el-col :span="24"> |
| 10 | <div class="grid-content co"> | 10 | <div class="grid-content co"> |
| 11 | - <el-col :span="1"> | ||
| 12 | - <div class="grid-content"></div> | ||
| 13 | - </el-col> | ||
| 14 | - <el-col :span="20"> | ||
| 15 | - <div class="grid-content"> | ||
| 16 | - <span class="titleSpan">航班号：{{this.preQuery.carrier}}{{this.preQuery.flightno}}</span> | ||
| 17 | - <span class="titleSpan">航班日期：{{this.preQuery.flightdate}}</span> | ||
| 18 | -<!-- <span class="titleSpan">航段：{{this.preQuery.originstation}}-{{this.preQuery.destinationstation}}</span>--> | ||
| 19 | - </div> | 11 | + <el-col :span="24"> |
| 12 | + <el-row> | ||
| 13 | + <el-col :span="4"> | ||
| 14 | + <el-input v-model="flightComNo" placeholder="航班号" clearable > | ||
| 15 | + <template slot="prepend">航班号</template> | ||
| 16 | + </el-input> | ||
| 17 | + </el-col> | ||
| 18 | + <el-col :span="1"> | ||
| 19 | + <div class="grid-content"></div> | ||
| 20 | + </el-col> | ||
| 21 | + <el-col :span="4"> | ||
| 22 | + <div class="el-input el-input--mini el-input-group el-input-group--prepend el-input--suffix"> | ||
| 23 | + <div class="el-input-group__prepend"> 航班日期</div> | ||
| 24 | + <el-date-picker | ||
| 25 | + value-format="yyyy-MM-dd" | ||
| 26 | + style="width: 200px" | ||
| 27 | + v-model="preQuery.flightdate" align="left" | ||
| 28 | + class="flight-date-tianbo" | ||
| 29 | + type="date" placeholder="请输入航班日期" clearable> | ||
| 30 | + </el-date-picker> | ||
| 31 | + </div> | ||
| 32 | + </el-col> | ||
| 33 | + </el-row> | ||
| 20 | </el-col> | 34 | </el-col> |
| 21 | </div> | 35 | </div> |
| 22 | </el-col> | 36 | </el-col> |
| @@ -30,7 +44,7 @@ | @@ -30,7 +44,7 @@ | ||
| 30 | </el-col> | 44 | </el-col> |
| 31 | <el-col :span="24"> | 45 | <el-col :span="24"> |
| 32 | <div class="grid-content"> | 46 | <div class="grid-content"> |
| 33 | - <el-col :span="3"> | 47 | + <el-col :span="4"> |
| 34 | <div class="grid-content"> | 48 | <div class="grid-content"> |
| 35 | <el-input v-model="preQuery.awba" placeholder="请输入主单号" clearable> | 49 | <el-input v-model="preQuery.awba" placeholder="请输入主单号" clearable> |
| 36 | <template slot="prepend">主单号</template> | 50 | <template slot="prepend">主单号</template> |
| @@ -38,21 +52,21 @@ | @@ -38,21 +52,21 @@ | ||
| 38 | </div> | 52 | </div> |
| 39 | </el-col> | 53 | </el-col> |
| 40 | <div class="grid-content el-btn"> | 54 | <div class="grid-content el-btn"> |
| 41 | - <el-button type="warning" style="width:150px" icon="el-icon-search" @click="handleSerach">查询</el-button> | ||
| 42 | - <el-button v-if="preQuery.flightno === undefined && preData.length<1" type="primary" | 55 | + <el-button type="warning" style="width:150px" icon="el-icon-search" @click="handleSerach">查  询</el-button> |
| 56 | + <el-button v-if="preQuery.flightno === undefined && preData.length<1" type="success" | ||
| 43 | style="width:150px" icon="el-icon-plus" | 57 | style="width:150px" icon="el-icon-plus" |
| 44 | @click="handleAddpre">新增预配舱单 | 58 | @click="handleAddpre">新增预配舱单 |
| 45 | </el-button> | 59 | </el-button> |
| 46 | - <el-button @click="handleAwbSend('')" v-if="batchChooseFlag" style="width:150px" type="primary"> | ||
| 47 | - 批量发送申报 | 60 | + <el-button icon="el-icon-plus" @click="handleAwbSend('')" v-if="batchChooseFlag" style="width:150px" type="primary"> |
| 61 | + 批量申报 | ||
| 48 | </el-button> | 62 | </el-button> |
| 49 | - <el-button @click="handleAwbEdit('')" v-if="batchChooseFlag" style="width:150px" type="success"> | ||
| 50 | - 批量发送修改申报 | 63 | + <el-button icon="el-icon-edit" @click="handleAwbEdit('')" v-if="batchChooseFlag" style="width:150px" type="success"> |
| 64 | + 批量修改申报 | ||
| 51 | </el-button> | 65 | </el-button> |
| 52 | - <el-button @click="handleSendDelete('')" v-if="batchChooseFlag" style="width:150px" type="danger"> | ||
| 53 | - 批量发送删除申报 | 66 | + <el-button icon="el-icon-delete" @click="handleSendDelete('')" v-if="batchChooseFlag" style="width:150px" type="danger"> |
| 67 | + 批量删除申报 | ||
| 54 | </el-button> | 68 | </el-button> |
| 55 | - <el-button @click="download" style="width:150px" type="success"> | 69 | + <el-button icon="el-icon-download" @click="download" style="width:150px" type="success"> |
| 56 | 模板下载 | 70 | 模板下载 |
| 57 | </el-button> | 71 | </el-button> |
| 58 | <el-upload | 72 | <el-upload |
| @@ -117,7 +131,7 @@ | @@ -117,7 +131,7 @@ | ||
| 117 | {{scope.row.weight}} | 131 | {{scope.row.weight}} |
| 118 | </template> | 132 | </template> |
| 119 | </el-table-column> | 133 | </el-table-column> |
| 120 | - <el-table-column label="货物描述" width="120" align="center"> | 134 | + <el-table-column label="货物描述" width="120" align="center" show-overflow-tooltip> |
| 121 | <template slot-scope="scope"> | 135 | <template slot-scope="scope"> |
| 122 | {{scope.row.goodsname}} | 136 | {{scope.row.goodsname}} |
| 123 | </template> | 137 | </template> |
| @@ -156,63 +170,59 @@ | @@ -156,63 +170,59 @@ | ||
| 156 | <span v-if="scope.row.status ==='25'">已发送修改报</span> | 170 | <span v-if="scope.row.status ==='25'">已发送修改报</span> |
| 157 | </template> | 171 | </template> |
| 158 | </el-table-column> | 172 | </el-table-column> |
| 159 | - <el-table-column prop="receipt" label="回执信息" align="center"> | 173 | + <el-table-column prop="receipt" label="回执信息" align="center" show-overflow-tooltip> |
| 160 | <template slot-scope="scope"> | 174 | <template slot-scope="scope"> |
| 161 | - {{scope.row.ext5}} | 175 | + <el-tag v-if="scope.row.status=='01' || scope.row.status=='11'" type="success"> |
| 176 | + {{scope.row.ext5}} | ||
| 177 | + </el-tag> | ||
| 178 | + <el-tag v-else-if="scope.row.status=='02' || scope.row.status=='03'" type="warning"> | ||
| 179 | + {{scope.row.ext5}} | ||
| 180 | + </el-tag> | ||
| 181 | + <el-tag v-else-if="scope.row.status=='12' || scope.row.status=='13'" type="danger"> | ||
| 182 | + {{scope.row.ext5}} | ||
| 183 | + </el-tag> | ||
| 184 | + <el-tag v-else> | ||
| 185 | + {{scope.row.ext5}} | ||
| 186 | + </el-tag> | ||
| 162 | </template> | 187 | </template> |
| 163 | </el-table-column> | 188 | </el-table-column> |
| 164 | <el-table-column label="操作" width="450px" fixed="right" align="center"> | 189 | <el-table-column label="操作" width="450px" fixed="right" align="center"> |
| 165 | <template slot-scope="scope" > | 190 | <template slot-scope="scope" > |
| 166 | - <el-row> | ||
| 167 | - <el-col :span="5" style="margin-right: 10px"> | ||
| 168 | - <el-button type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button> | ||
| 169 | - </el-col> | ||
| 170 | - <el-col :span="5" style="margin-right: 10px"> | ||
| 171 | - <el-button type="warning" icon="el-icon-view" @click="handleSend(scope.row)">收发明细</el-button> | ||
| 172 | - </el-col> | ||
| 173 | - <el-col :span="5" style="margin-right: 10px"> | ||
| 174 | - <el-button type="info" icon="el-icon-edit" @click="handleAwbStatus(scope.row)" | ||
| 175 | - :disabled="scope.row.status === '22'">更改状态 | ||
| 176 | - </el-button> | ||
| 177 | - </el-col> | ||
| 178 | - <el-col :span="5" style="margin-right: 10px"> | ||
| 179 | - <el-button type="primary" icon="el-icon-plus" v-if="scope.row.awbh ===''" | ||
| 180 | - @click="handleAddAwbh(scope.row)">新增分单 | ||
| 181 | - </el-button> | ||
| 182 | - </el-col> | 191 | + <el-row type="flex" justify="space-between"> |
| 192 | + <el-button icon="el-icon-view" @click="handleSend(scope.row)">收发明细</el-button> | ||
| 193 | + <el-button type="success" icon="el-icon-plus" v-if="scope.row.awbh ===''" | ||
| 194 | + @click="handleAddAwbh(scope.row)">新增分单 | ||
| 195 | + </el-button> | ||
| 196 | + <el-button type="warning" icon="el-icon-edit" @click="handleAwbStatus(scope.row)" | ||
| 197 | + :disabled="scope.row.status === '22'">更改状态 | ||
| 198 | + </el-button> | ||
| 199 | + | ||
| 200 | + <el-button type="danger" icon="el-icon-delete" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button> | ||
| 183 | </el-row> | 201 | </el-row> |
| 184 | - <el-row> | ||
| 185 | - <el-col :span="7" style="margin-right: 10px"> | ||
| 186 | - <el-button type="primary" icon="el-icon-plus" style="width: 130px" @click="handleAwbSend(scope.row.uuid)" | ||
| 187 | - :disabled="addStatus(scope.row.status)">发送预配舱单报 | ||
| 188 | - </el-button> | ||
| 189 | - </el-col> | ||
| 190 | - <el-col :span="7" style="margin-right: 10px"> | ||
| 191 | - <el-button type="success" icon="el-icon-plus" style="width: 130px" @click="handleAwbEdit(scope.row.uuid)" | ||
| 192 | - :disabled="editStatus(scope.row.status)">发送预配修改报</el-button> | ||
| 193 | - </el-col> | ||
| 194 | - <el-col :span="7"> | ||
| 195 | - <el-button type="danger" icon="el-icon-delete" style="width: 130px;margin-bottom: 10px" @click="handleSendDelete(scope.row.uuid)" | ||
| 196 | - :disabled="deleteStatus(scope.row.status)">发送预配删除报</el-button> | ||
| 197 | - </el-col> | 202 | + <el-row type="flex" justify="space-between"> |
| 203 | + <el-button type="primary" icon="el-icon-plus" @click="handleAwbSend(scope.row.uuid)" | ||
| 204 | + :disabled="addStatus(scope.row.status)">预配申报 | ||
| 205 | + </el-button> | ||
| 206 | + <el-button type="success" icon="el-icon-edit" @click="handleAwbEdit(scope.row.uuid)" | ||
| 207 | + :disabled="editStatus(scope.row.status)">修改申报</el-button> | ||
| 208 | + <el-button type="danger" icon="el-icon-delete" @click="handleSendDelete(scope.row.uuid)" | ||
| 209 | + :disabled="deleteStatus(scope.row.status)">删除申报</el-button> | ||
| 198 | </el-row> | 210 | </el-row> |
| 199 | - | ||
| 200 | </template> | 211 | </template> |
| 201 | </el-table-column> | 212 | </el-table-column> |
| 202 | </el-table> | 213 | </el-table> |
| 203 | 214 | ||
| 204 | <div class="btnFoot"> | 215 | <div class="btnFoot"> |
| 205 | <el-row> | 216 | <el-row> |
| 206 | - <el-button type="primary" v-if="preQuery.flightno !== undefined || preData.length >0" | 217 | + <el-button type="success" icon="el-icon-plus" v-if="preQuery.flightno !== undefined || preData.length >0" |
| 207 | @click="handleAddpreInfo">新增预配舱单 | 218 | @click="handleAddpreInfo">新增预配舱单 |
| 208 | </el-button> | 219 | </el-button> |
| 209 | - <el-button type="primary" @click="handelBackStep" | ||
| 210 | - v-if="preQuery.flightno !== undefined || preData.length >0">返回 | 220 | + <el-button type="primary" icon="el-icon-back" @click="handelBackStep" |
| 221 | + v-if="preQuery.flightno !== undefined || preData.length >0">返  回 | ||
| 211 | </el-button> | 222 | </el-button> |
| 212 | </el-row> | 223 | </el-row> |
| 213 | </div> | 224 | </div> |
| 214 | - | ||
| 215 | - <pagination background layout="total, prev, pager, next" v-show="total>0" :total="total" :page.sync="preQuery.pageSize" :limit.sync="preQuery.limitSize" | 225 | + <pagination v-show="total>0" :total="total" :page.sync="preQuery.pageSize" :limit.sync="preQuery.limitSize" |
| 216 | @pagination="getList"/> | 226 | @pagination="getList"/> |
| 217 | <el-dialog top="5vh" :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible" width="90%"> | 227 | <el-dialog top="5vh" :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible" width="90%"> |
| 218 | <el-form ref="preFormData" :model="preModel" :rules="preRoles" label-position="right" | 228 | <el-form ref="preFormData" :model="preModel" :rules="preRoles" label-position="right" |
| @@ -279,7 +289,13 @@ | @@ -279,7 +289,13 @@ | ||
| 279 | <el-input v-model="flightno" @blur="transportQuery()" :disabled="fenStatus === 'addAwbh'" style="width: 140px" clearable> | 289 | <el-input v-model="flightno" @blur="transportQuery()" :disabled="fenStatus === 'addAwbh'" style="width: 140px" clearable> |
| 280 | </el-input> | 290 | </el-input> |
| 281 | </el-form-item> | 291 | </el-form-item> |
| 282 | - <span id="message"></span> | 292 | + <el-alert |
| 293 | + title="运输工具申报信息:" | ||
| 294 | + :type="alert_type" | ||
| 295 | + :description = "alert_des" | ||
| 296 | + :closable="false" | ||
| 297 | + > | ||
| 298 | + </el-alert> | ||
| 283 | </el-col> | 299 | </el-col> |
| 284 | <el-col :span="6"> | 300 | <el-col :span="6"> |
| 285 | <el-form-item label="航班日期" prop="flightdate"> | 301 | <el-form-item label="航班日期" prop="flightdate"> |
| @@ -578,10 +594,20 @@ | @@ -578,10 +594,20 @@ | ||
| 578 | </el-col> | 594 | </el-col> |
| 579 | <el-col :span="6"> | 595 | <el-col :span="6"> |
| 580 | <el-form-item label="所属关区" prop="customcode"> | 596 | <el-form-item label="所属关区" prop="customcode"> |
| 581 | - <el-select v-model="preModel.customcode" clearable class="filter-item" style="width: 140px" placeholder="请选择所属关区"> | ||
| 582 | - <el-option v-for="item in custom" :key="item.value" | ||
| 583 | - :label="item.label" | ||
| 584 | - :value="item.value"> | 597 | +<!-- <el-select v-model="preModel.customcode" clearable class="filter-item" style="width: 140px" placeholder="请选择所属关区">--> |
| 598 | +<!-- <el-option v-for="item in custom" :key="item.value"--> | ||
| 599 | +<!-- :label="item.label"--> | ||
| 600 | +<!-- :value="item.value">--> | ||
| 601 | +<!-- </el-option>--> | ||
| 602 | +<!-- </el-select>--> | ||
| 603 | + <el-select v-model="preModel.customcode" class="filter-item" placeholder="请输入关区代码" | ||
| 604 | + filterable clearable remote :remote-method="remoteMethodCustomCode" :loading="customLoading" | ||
| 605 | + allow-create | ||
| 606 | + default-first-option> | ||
| 607 | + <el-option v-for="item in customCodeList" :key="item.customcode" :label="item.customcode" | ||
| 608 | + :value="item.customcode"> | ||
| 609 | + <span style="float: left">{{ item.customcode }}</span> | ||
| 610 | + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.customname }}</span> | ||
| 585 | </el-option> | 611 | </el-option> |
| 586 | </el-select> | 612 | </el-select> |
| 587 | </el-form-item> | 613 | </el-form-item> |
| @@ -728,10 +754,12 @@ | @@ -728,10 +754,12 @@ | ||
| 728 | <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> | 754 | <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> |
| 729 | <el-form :inline="true" :model="consignerQuery"> | 755 | <el-form :inline="true" :model="consignerQuery"> |
| 730 | <el-form-item> | 756 | <el-form-item> |
| 731 | - <el-input v-model="consignerQuery.companyName" placeholder="关键字查询" size="small"></el-input> | 757 | + <el-input v-model="consignerQuery.companyName" placeholder="公司名称" size="small"> |
| 758 | + <template slot="prepend">公司名称</template> | ||
| 759 | + </el-input> | ||
| 732 | </el-form-item> | 760 | </el-form-item> |
| 733 | <el-form-item> | 761 | <el-form-item> |
| 734 | - <el-button type="primary" size="small" v-on:click="consignerSelect()">查询</el-button> | 762 | + <el-button type="primary" icon="el-icon-plus" size="small" v-on:click="consignerSelect()">查  询</el-button> |
| 735 | </el-form-item> | 763 | </el-form-item> |
| 736 | </el-form> | 764 | </el-form> |
| 737 | </el-col> | 765 | </el-col> |
| @@ -753,7 +781,7 @@ | @@ -753,7 +781,7 @@ | ||
| 753 | </el-table-column> | 781 | </el-table-column> |
| 754 | <el-table-column label="操作"> | 782 | <el-table-column label="操作"> |
| 755 | <template slot-scope="scope"> | 783 | <template slot-scope="scope"> |
| 756 | - <el-button type="success" size="mini" @click="consignerClick(scope.row)">选择</el-button> | 784 | + <el-button type="success" size="mini" icon="el-icon-thumb" @click="consignerClick(scope.row)">选  择</el-button> |
| 757 | </template> | 785 | </template> |
| 758 | </el-table-column> | 786 | </el-table-column> |
| 759 | </el-table> | 787 | </el-table> |
| @@ -765,10 +793,12 @@ | @@ -765,10 +793,12 @@ | ||
| 765 | <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> | 793 | <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> |
| 766 | <el-form :inline="true" :model="consignerQuery"> | 794 | <el-form :inline="true" :model="consignerQuery"> |
| 767 | <el-form-item> | 795 | <el-form-item> |
| 768 | - <el-input v-model="consigneeQuery.companyName" placeholder="关键字查询" size="small"></el-input> | 796 | + <el-input v-model="consigneeQuery.companyName" placeholder="公司名称" size="small"> |
| 797 | + <template slot="prepend">公司名称</template> | ||
| 798 | + </el-input> | ||
| 769 | </el-form-item> | 799 | </el-form-item> |
| 770 | <el-form-item> | 800 | <el-form-item> |
| 771 | - <el-button type="primary" v-on:click="consigneeSelect()" size="small">查询</el-button> | 801 | + <el-button type="primary" icon="el-icon-plus" v-on:click="consigneeSelect()" size="small">查  询</el-button> |
| 772 | </el-form-item> | 802 | </el-form-item> |
| 773 | </el-form> | 803 | </el-form> |
| 774 | </el-col> | 804 | </el-col> |
| @@ -790,7 +820,7 @@ | @@ -790,7 +820,7 @@ | ||
| 790 | </el-table-column> | 820 | </el-table-column> |
| 791 | <el-table-column label="操作"> | 821 | <el-table-column label="操作"> |
| 792 | <template slot-scope="scope"> | 822 | <template slot-scope="scope"> |
| 793 | - <el-button type="success" @click="consigneeClick(scope.row)" size="small">选择</el-button> | 823 | + <el-button type="success" icon="el-icon-thumb" @click="consigneeClick(scope.row)" size="small">选  择</el-button> |
| 794 | </template> | 824 | </template> |
| 795 | </el-table-column> | 825 | </el-table-column> |
| 796 | </el-table> | 826 | </el-table> |
| @@ -830,6 +860,7 @@ | @@ -830,6 +860,7 @@ | ||
| 830 | validAlphabetsAndSpanceKey, | 860 | validAlphabetsAndSpanceKey, |
| 831 | validatorNum | 861 | validatorNum |
| 832 | } from "@/utils/validate" | 862 | } from "@/utils/validate" |
| 863 | + import flight from "../airtransport/flight"; | ||
| 833 | 864 | ||
| 834 | export default { | 865 | export default { |
| 835 | name: "ExitPre", | 866 | name: "ExitPre", |
| @@ -870,12 +901,15 @@ | @@ -870,12 +901,15 @@ | ||
| 870 | func: treeToArray, | 901 | func: treeToArray, |
| 871 | total: 1, | 902 | total: 1, |
| 872 | isAdmin: false, | 903 | isAdmin: false, |
| 904 | + alert_type: 'info', | ||
| 905 | + alert_des: '', | ||
| 873 | addloading: false, | 906 | addloading: false, |
| 874 | consignerList: [], | 907 | consignerList: [], |
| 875 | dialogNeeVisible: false, | 908 | dialogNeeVisible: false, |
| 876 | batchChooseFlag: false, | 909 | batchChooseFlag: false, |
| 877 | batchChooseSelection: '', | 910 | batchChooseSelection: '', |
| 878 | consigneeList: [], | 911 | consigneeList: [], |
| 912 | + carrierAndFlight: '', | ||
| 879 | consignerQuery: { | 913 | consignerQuery: { |
| 880 | companyName: '', | 914 | companyName: '', |
| 881 | total: 0, | 915 | total: 0, |
| @@ -996,6 +1030,7 @@ | @@ -996,6 +1030,7 @@ | ||
| 996 | awba: [{required: true, trigger: 'blur', validator: validatorAwb}], | 1030 | awba: [{required: true, trigger: 'blur', validator: validatorAwb}], |
| 997 | awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}], | 1031 | awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}], |
| 998 | 'awbinfo.paymodel': [{required: true, message: '付款方式必选', trigger: 'change'}], | 1032 | 'awbinfo.paymodel': [{required: true, message: '付款方式必选', trigger: 'change'}], |
| 1033 | + 'awbinfo.awbtype': [{required: true, message: '货物类型必须', trigger: 'change'}], | ||
| 999 | goodsname: [{required: true, trigger: 'blur', validator: validAlphabetsSpanceKey}], | 1034 | goodsname: [{required: true, trigger: 'blur', validator: validAlphabetsSpanceKey}], |
| 1000 | ex5: [{required: true, message: '货物描述不能为空', trigger: 'blur'}], | 1035 | ex5: [{required: true, message: '货物描述不能为空', trigger: 'blur'}], |
| 1001 | 'awbinfo.sairportid': [{required: true, message: '起始航站不能为空', trigger: 'change'}], | 1036 | 'awbinfo.sairportid': [{required: true, message: '起始航站不能为空', trigger: 'change'}], |
| @@ -1074,7 +1109,10 @@ | @@ -1074,7 +1109,10 @@ | ||
| 1074 | eairportid: undefined, | 1109 | eairportid: undefined, |
| 1075 | csgcustomerid: undefined, | 1110 | csgcustomerid: undefined, |
| 1076 | paymodel: 'PP', | 1111 | paymodel: 'PP', |
| 1077 | - awbtype: undefined | 1112 | + awbtype: undefined, |
| 1113 | + dest4:undefined, | ||
| 1114 | + dest4city:undefined | ||
| 1115 | + | ||
| 1078 | }, | 1116 | }, |
| 1079 | user: { | 1117 | user: { |
| 1080 | username: loginedUserInfo().username | 1118 | username: loginedUserInfo().username |
| @@ -1116,13 +1154,29 @@ | @@ -1116,13 +1154,29 @@ | ||
| 1116 | }) | 1154 | }) |
| 1117 | }, 1000) | 1155 | }, 1000) |
| 1118 | }, | 1156 | }, |
| 1119 | - created() { | 1157 | + // deactivated(){ |
| 1158 | + // this.preQuery= { | ||
| 1159 | + // pageSize: 1, | ||
| 1160 | + // limitSize: 30, | ||
| 1161 | + // awba: '', | ||
| 1162 | + // carrier: '', | ||
| 1163 | + // flightno: '', | ||
| 1164 | + // flightdate: '', | ||
| 1165 | + // originstation: '', | ||
| 1166 | + // destinationstation: '', | ||
| 1167 | + // userId:loginedUserInfo().userId, | ||
| 1168 | + // customCode:'', | ||
| 1169 | + // enterpriseId:loginedUserInfo().companyId, | ||
| 1170 | + // messageType: '' | ||
| 1171 | + // } | ||
| 1172 | + // console.log("distroyed") | ||
| 1173 | + // }, | ||
| 1174 | + activated() { | ||
| 1120 | if (this.$route.params.flightData !== undefined) { | 1175 | if (this.$route.params.flightData !== undefined) { |
| 1121 | this.preQuery.carrier = this.$route.params.flightData.flightno.substring(0, 2) | 1176 | this.preQuery.carrier = this.$route.params.flightData.flightno.substring(0, 2) |
| 1122 | this.preQuery.flightno = this.$route.params.flightData.flightno.substring(2) | 1177 | this.preQuery.flightno = this.$route.params.flightData.flightno.substring(2) |
| 1178 | + this.carrierAndFlight = this.$route.params.flightData.flightno; | ||
| 1123 | this.preQuery.flightdate = this.$route.params.flightData.flightdate | 1179 | this.preQuery.flightdate = this.$route.params.flightData.flightdate |
| 1124 | - this.preQuery.originstation = this.$route.params.flightData.originstation | ||
| 1125 | - this.preQuery.destinationstation = this.$route.params.flightData.destinationstation | ||
| 1126 | if (this.$route.params.flightData.awba !== undefined && this.$route.params.flightData.awba !== '') { | 1180 | if (this.$route.params.flightData.awba !== undefined && this.$route.params.flightData.awba !== '') { |
| 1127 | this.preQuery.awba = this.$route.params.flightData.awba.substring(0, 3) + "-" + this.$route.params.flightData.awba.substring(3) | 1181 | this.preQuery.awba = this.$route.params.flightData.awba.substring(0, 3) + "-" + this.$route.params.flightData.awba.substring(3) |
| 1128 | } | 1182 | } |
| @@ -1341,37 +1395,56 @@ | @@ -1341,37 +1395,56 @@ | ||
| 1341 | this.preModel.awbinfo.dest3 = val.toUpperCase().trim() | 1395 | this.preModel.awbinfo.dest3 = val.toUpperCase().trim() |
| 1342 | } | 1396 | } |
| 1343 | }, | 1397 | }, |
| 1398 | + flightComNo: { | ||
| 1399 | + get: function () { | ||
| 1400 | + return this.carrierAndFlight; | ||
| 1401 | + }, | ||
| 1402 | + set: function (val) { | ||
| 1403 | + val = val.toUpperCase(); | ||
| 1404 | + if (util.checkNull(val) && val.length>=2){ | ||
| 1405 | + this.preQuery.carrier= val.substring(0,2); | ||
| 1406 | + this.preQuery.flightno = val.substring(2) | ||
| 1407 | + }else { | ||
| 1408 | + this.preQuery.carrier= '' | ||
| 1409 | + this.preQuery.flightno = '' | ||
| 1410 | + } | ||
| 1411 | + this.carrierAndFlight = val | ||
| 1412 | + | ||
| 1413 | + } | ||
| 1414 | + } | ||
| 1344 | }, | 1415 | }, |
| 1345 | methods: { | 1416 | methods: { |
| 1346 | // >>>>>>>>>>>>>>>>获取list集合<<<<<<<<<<<<<<<<<< | 1417 | // >>>>>>>>>>>>>>>>获取list集合<<<<<<<<<<<<<<<<<< |
| 1347 | getList() { | 1418 | getList() { |
| 1419 | + // console.log("11111"+JSON.stringify(this.preQuery)); | ||
| 1348 | this.listLoading = true | 1420 | this.listLoading = true |
| 1349 | - if (this.preQuery.awba !== undefined && this.preQuery.awba !== '') { | ||
| 1350 | - getMt2201ListForParam(this.preQuery).then(res => { | ||
| 1351 | - this.preData = res.data.data.list | ||
| 1352 | - this.total = res.data.data.total | ||
| 1353 | - if (res.data.data.list.length > 0) { | ||
| 1354 | - this.preQuery.carrier = this.preData[0].carrier | ||
| 1355 | - this.preQuery.flightno = this.preData[0].flightno | ||
| 1356 | - this.preQuery.flightdate = this.preData[0].flightdate | ||
| 1357 | - this.preQuery.originstation = this.preData[0].originstation | ||
| 1358 | - this.preQuery.destinationstation = this.preData[0].destinationstation | ||
| 1359 | - this.preQuery.customcode = this.preData[0].customcode | ||
| 1360 | - } | ||
| 1361 | - setTimeout(() => { | ||
| 1362 | - this.listLoading = false | ||
| 1363 | - }, 1500) | ||
| 1364 | - }) | ||
| 1365 | - } else { | 1421 | + // if (this.preQuery.awba !== undefined && this.preQuery.awba !== '') { |
| 1422 | + // console.log("22222"+JSON.stringify(this.preQuery)); | ||
| 1423 | + // getMt2201ListForParam(this.preQuery).then(res => { | ||
| 1424 | + // this.preData = res.data.data.list | ||
| 1425 | + // this.total = res.data.data.total | ||
| 1426 | + // if (res.data.data.list.length > 0) { | ||
| 1427 | + // this.preQuery.carrier = this.preData[0].carrier | ||
| 1428 | + // this.preQuery.flightno = this.preData[0].flightno | ||
| 1429 | + // this.preQuery.flightdate = this.preData[0].flightdate | ||
| 1430 | + // this.preQuery.originstation = this.preData[0].originstation | ||
| 1431 | + // this.preQuery.destinationstation = this.preData[0].destinationstation | ||
| 1432 | + // this.preQuery.customcode = this.preData[0].customcode | ||
| 1433 | + // } | ||
| 1434 | + // setTimeout(() => { | ||
| 1435 | + // this.listLoading = false | ||
| 1436 | + // }, 1500) | ||
| 1437 | + // }) | ||
| 1438 | + // } else { | ||
| 1439 | + // console.log("33333"+JSON.stringify(this.preQuery)); | ||
| 1366 | getMt2201ListForParam(this.preQuery).then(res => { | 1440 | getMt2201ListForParam(this.preQuery).then(res => { |
| 1367 | this.preData = res.data.data.list | 1441 | this.preData = res.data.data.list |
| 1368 | - | ||
| 1369 | this.total = res.data.data.total | 1442 | this.total = res.data.data.total |
| 1370 | setTimeout(() => { | 1443 | setTimeout(() => { |
| 1371 | this.listLoading = false | 1444 | this.listLoading = false |
| 1372 | }, 1500) | 1445 | }, 1500) |
| 1373 | }) | 1446 | }) |
| 1374 | - } | 1447 | + // } |
| 1375 | }, | 1448 | }, |
| 1376 | // >>>>>>>>>>>>>>>>重置实体<<<<<<<<<<<<<<<<<< | 1449 | // >>>>>>>>>>>>>>>>重置实体<<<<<<<<<<<<<<<<<< |
| 1377 | restModel() { | 1450 | restModel() { |
| @@ -1436,6 +1509,8 @@ | @@ -1436,6 +1509,8 @@ | ||
| 1436 | username : JSON.parse(sessionStorage.getItem('user')).username | 1509 | username : JSON.parse(sessionStorage.getItem('user')).username |
| 1437 | } | 1510 | } |
| 1438 | } | 1511 | } |
| 1512 | + this.alert_des = '' | ||
| 1513 | + this.alert_type = 'info' | ||
| 1439 | }, | 1514 | }, |
| 1440 | // >>>>>>>>>>>>>>>>新增主单<<<<<<<<<<<<<<<<<< | 1515 | // >>>>>>>>>>>>>>>>新增主单<<<<<<<<<<<<<<<<<< |
| 1441 | handleAddpreInfo() { | 1516 | handleAddpreInfo() { |
| @@ -1456,8 +1531,6 @@ | @@ -1456,8 +1531,6 @@ | ||
| 1456 | this.preModel.flightno = this.preQuery.carrier+this.preQuery.flightno | 1531 | this.preModel.flightno = this.preQuery.carrier+this.preQuery.flightno |
| 1457 | } | 1532 | } |
| 1458 | this.preModel.flightdate = this.preQuery.flightdate | 1533 | this.preModel.flightdate = this.preQuery.flightdate |
| 1459 | - this.preModel.originstation = this.preQuery.originstation | ||
| 1460 | - this.preModel.destinationstation = this.preQuery.destinationstation | ||
| 1461 | this.preModel.customcode = this.preQuery.customcode | 1534 | this.preModel.customcode = this.preQuery.customcode |
| 1462 | this.dialogStatus = 'create' | 1535 | this.dialogStatus = 'create' |
| 1463 | this.dialogFormVisible = true | 1536 | this.dialogFormVisible = true |
| @@ -1551,7 +1624,6 @@ | @@ -1551,7 +1624,6 @@ | ||
| 1551 | }, | 1624 | }, |
| 1552 | // 收货人信息赋值 | 1625 | // 收货人信息赋值 |
| 1553 | consigneeClick(val){ | 1626 | consigneeClick(val){ |
| 1554 | - console.log(val); | ||
| 1555 | this.preModel.awbinfo.cnsnname=val.conName; | 1627 | this.preModel.awbinfo.cnsnname=val.conName; |
| 1556 | this.preModel.awbinfo.cnsnaddress=val.conAddress; | 1628 | this.preModel.awbinfo.cnsnaddress=val.conAddress; |
| 1557 | this.preModel.awbinfo.ecityid=val.conCity; | 1629 | this.preModel.awbinfo.ecityid=val.conCity; |
| @@ -1562,10 +1634,8 @@ | @@ -1562,10 +1634,8 @@ | ||
| 1562 | }, | 1634 | }, |
| 1563 | // >>>>>>>>>>>>>>>>搜索<<<<<<<<<<<<<<<<<< | 1635 | // >>>>>>>>>>>>>>>>搜索<<<<<<<<<<<<<<<<<< |
| 1564 | handleSerach() { | 1636 | handleSerach() { |
| 1565 | - this.preQuery.flightno = undefined | ||
| 1566 | - this.preQuery.carrier = undefined | ||
| 1567 | this.preQuery.originstation = undefined | 1637 | this.preQuery.originstation = undefined |
| 1568 | - this.preQuery.flightdate = undefined | 1638 | + // this.preQuery.flightdate = undefined |
| 1569 | this.preQuery.destinationstation = undefined | 1639 | this.preQuery.destinationstation = undefined |
| 1570 | this.getList() | 1640 | this.getList() |
| 1571 | }, | 1641 | }, |
| @@ -1658,7 +1728,7 @@ | @@ -1658,7 +1728,7 @@ | ||
| 1658 | delete this.preModel.parent | 1728 | delete this.preModel.parent |
| 1659 | delete this.preModel.children | 1729 | delete this.preModel.children |
| 1660 | _this.preModel.user= { | 1730 | _this.preModel.user= { |
| 1661 | - username : JSON.parse(sessionStorage.getItem('user')).username | 1731 | + username : loginedUserInfo().username |
| 1662 | } | 1732 | } |
| 1663 | 1733 | ||
| 1664 | updateMT2201(_this.preModel).then(res => { | 1734 | updateMT2201(_this.preModel).then(res => { |
| @@ -1994,19 +2064,26 @@ | @@ -1994,19 +2064,26 @@ | ||
| 1994 | 2064 | ||
| 1995 | // 远程查询运输工具申报是否成功 | 2065 | // 远程查询运输工具申报是否成功 |
| 1996 | transportQuery(){ | 2066 | transportQuery(){ |
| 1997 | - if (this.preModel.flightno !== undefined && this.preModel.flightno !== '' | ||
| 1998 | - && this.preModel.flightdate !== undefined && this.preModel.flightdate !== ''){ | 2067 | + let _this = this |
| 2068 | + if (this.preModel.flightno != undefined && this.preModel.flightno != '' | ||
| 2069 | + && this.preModel.flightdate != undefined && this.preModel.flightdate != ''){ | ||
| 1999 | const params = { | 2070 | const params = { |
| 2000 | flightNo: this.preModel.flightno, | 2071 | flightNo: this.preModel.flightno, |
| 2001 | flightDate: this.preModel.flightdate | 2072 | flightDate: this.preModel.flightdate |
| 2002 | } | 2073 | } |
| 2003 | selectPredictionInterface(params).then(res =>{ | 2074 | selectPredictionInterface(params).then(res =>{ |
| 2004 | if(res.data.data != undefined && res.data.data != ""){ | 2075 | if(res.data.data != undefined && res.data.data != ""){ |
| 2005 | - const span = document.getElementById("message"); | ||
| 2006 | - span.innerHTML = res.data.data[0].statusMsg; | 2076 | + let ysgj_data = res.data.data[0] |
| 2077 | + let ysgj_status = ysgj_data.status | ||
| 2078 | + if (ysgj_status === '02'){ | ||
| 2079 | + _this.alert_type = 'success' | ||
| 2080 | + }else{ | ||
| 2081 | + _this.alert_type = 'warning' | ||
| 2082 | + } | ||
| 2083 | + _this.alert_des = ysgj_data.statusMsg | ||
| 2007 | }else { | 2084 | }else { |
| 2008 | - const span = document.getElementById("message"); | ||
| 2009 | - span.innerHTML = "" | 2085 | + _this.alert_des = "此航班的运输工具申报未做预报动态申报." |
| 2086 | + _this.alert_type = 'error' | ||
| 2010 | } | 2087 | } |
| 2011 | }) | 2088 | }) |
| 2012 | } | 2089 | } |
| @@ -38,9 +38,9 @@ | @@ -38,9 +38,9 @@ | ||
| 38 | </div> | 38 | </div> |
| 39 | </el-col> | 39 | </el-col> |
| 40 | <div class="grid-content el-btn"> | 40 | <div class="grid-content el-btn"> |
| 41 | - <el-button type="primary" size="mini" @click="handleSerach">查询</el-button> | 41 | + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSerach">查  询</el-button> |
| 42 | <el-button v-if="tidyQuery.flightno === undefined && tidyData.length <1" | 42 | <el-button v-if="tidyQuery.flightno === undefined && tidyData.length <1" |
| 43 | - type="primary" size="mini" | 43 | + type="success" size="mini" icon="el-icon-plus" |
| 44 | @click="handleAddTidy">新增理货 | 44 | @click="handleAddTidy">新增理货 |
| 45 | </el-button> | 45 | </el-button> |
| 46 | </div> | 46 | </div> |
| @@ -68,16 +68,6 @@ | @@ -68,16 +68,6 @@ | ||
| 68 | <a type="text" style="color: #409eff;text-decoration: underline" class="tableInline" @click="handleEdit(scope.row)" v-else>{{scope.row.awba}}</a> | 68 | <a type="text" style="color: #409eff;text-decoration: underline" class="tableInline" @click="handleEdit(scope.row)" v-else>{{scope.row.awba}}</a> |
| 69 | </template> | 69 | </template> |
| 70 | </el-table-column> | 70 | </el-table-column> |
| 71 | -<!-- <el-table-column label="分单号" width="120" align="center">--> | ||
| 72 | -<!-- <template slot-scope="scope">--> | ||
| 73 | -<!-- <span>{{scope.row.awbh}}</span>--> | ||
| 74 | -<!-- </template>--> | ||
| 75 | -<!-- </el-table-column>--> | ||
| 76 | -<!-- <el-table-column label="运单件数/重量" width="100" align="center">--> | ||
| 77 | -<!-- <template slot-scope="scope">--> | ||
| 78 | -<!-- <span>{{scope.row.awbpiece}} / {{scope.row.awbweight}}</span>--> | ||
| 79 | -<!-- </template>--> | ||
| 80 | -<!-- </el-table-column>--> | ||
| 81 | <el-table-column label="理货件数" width="100" align="center"> | 71 | <el-table-column label="理货件数" width="100" align="center"> |
| 82 | <template slot-scope="scope"> | 72 | <template slot-scope="scope"> |
| 83 | <span>{{scope.row.piece}}</span> | 73 | <span>{{scope.row.piece}}</span> |
| @@ -98,7 +88,7 @@ | @@ -98,7 +88,7 @@ | ||
| 98 | <span>{{scope.row.endtime}}</span> | 88 | <span>{{scope.row.endtime}}</span> |
| 99 | </template> | 89 | </template> |
| 100 | </el-table-column> | 90 | </el-table-column> |
| 101 | - <el-table-column label="状态" width="100" align="center"> | 91 | + <el-table-column label="状态" width="200" align="center"> |
| 102 | <template slot-scope="scope"> | 92 | <template slot-scope="scope"> |
| 103 | <span v-if="scope.row.status ==='01'">接受申报</span> | 93 | <span v-if="scope.row.status ==='01'">接受申报</span> |
| 104 | <span v-if="scope.row.status ==='02'">待人工审核</span> | 94 | <span v-if="scope.row.status ==='02'">待人工审核</span> |
| @@ -122,36 +112,49 @@ | @@ -122,36 +112,49 @@ | ||
| 122 | <span v-if="scope.row.status ==='25'">已发送修改报</span> | 112 | <span v-if="scope.row.status ==='25'">已发送修改报</span> |
| 123 | </template> | 113 | </template> |
| 124 | </el-table-column> | 114 | </el-table-column> |
| 125 | - <el-table-column label="回执信息" show-overflow-tooltip width="230" align="center"> | 115 | + <el-table-column label="回执信息" show-overflow-tooltip width="300" align="center" show-overflow-tooltip> |
| 126 | <template slot-scope="scope"> | 116 | <template slot-scope="scope"> |
| 127 | - <span>{{scope.row.ext5}}</span> | 117 | + <el-tag v-if="scope.row.status=='01' || scope.row.status=='11'" type="success"> |
| 118 | + {{scope.row.ext5}} | ||
| 119 | + </el-tag> | ||
| 120 | + <el-tag v-else-if="scope.row.status=='02' || scope.row.status=='03'" type="warning"> | ||
| 121 | + {{scope.row.ext5}} | ||
| 122 | + </el-tag> | ||
| 123 | + <el-tag v-else-if="scope.row.status=='12' || scope.row.status=='13'" type="danger"> | ||
| 124 | + {{scope.row.ext5}} | ||
| 125 | + </el-tag> | ||
| 126 | + <el-tag v-else> | ||
| 127 | + {{scope.row.ext5}} | ||
| 128 | + </el-tag> | ||
| 128 | </template> | 129 | </template> |
| 129 | </el-table-column> | 130 | </el-table-column> |
| 130 | - <el-table-column prop="operation" label="操作" width="420px" align="center"> | 131 | + <el-table-column prop="operation" label="操作" width="400px" align="center"> |
| 131 | <template slot-scope="scope"> | 132 | <template slot-scope="scope"> |
| 132 | - <el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button> | ||
| 133 | -<!-- <el-button size="mini" type="success" @click="handleEdit(scope.row)">编辑</el-button>--> | ||
| 134 | - <el-button size="mini" type="primary" @click="handleAwbSend(scope.row)" | ||
| 135 | - :disabled="addStatus(scope.row.status)">发送出港理货报</el-button> | 133 | + <el-row type="flex" justify="space-between"> |
| 134 | + <el-button size="mini" icon="el-icon-view" @click="handleSend(scope.row)">收发明细</el-button> | ||
| 135 | + <el-button size="mini" type="success" icon="el-icon-plus" v-if="scope.row.awbh ===''" | ||
| 136 | + @click="handleAddAwbh(scope.row)">新增分单</el-button> | ||
| 137 | + <el-button size="mini" type="danger" icon="el-icon-delete" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button> | ||
| 138 | + </el-row> | ||
| 139 | + <el-row type="flex" justify="space-between"> | ||
| 140 | + <el-button size="mini" icon="el-icon-plus" type="primary" @click="handleAwbSend(scope.row)" | ||
| 141 | + :disabled="addStatus(scope.row.status)">理货申报</el-button> | ||
| 142 | + <el-button size="mini" type="warning" icon="el-icon-edit" @click="handleAwbStatus(scope.row)" | ||
| 143 | + :disabled="scope.row.status ==='22'">更改状态</el-button> | ||
| 136 | 144 | ||
| 137 | - <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button> | ||
| 138 | - <p></p> | ||
| 139 | - <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)" | ||
| 140 | - :disabled="scope.row.status ==='22'">更改状态</el-button> | ||
| 141 | - <el-button size="mini" type="primary" v-if="scope.row.awbh ===''" | ||
| 142 | - @click="handleAddAwbh(scope.row)">新增分单</el-button> | ||
| 143 | - <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)" | ||
| 144 | - :disabled="deleteStatus(scope.row.status)">发出港理货删除报</el-button> | 145 | + <el-button size="mini" type="danger" icon="el-icon-delete" @click="handleSendDelete(scope.row)" |
| 146 | + :disabled="deleteStatus(scope.row.status)">删除申报</el-button> | ||
| 147 | + </el-row> | ||
| 145 | </template> | 148 | </template> |
| 146 | </el-table-column> | 149 | </el-table-column> |
| 147 | </el-table> | 150 | </el-table> |
| 148 | <div class="btnFoot"> | 151 | <div class="btnFoot"> |
| 149 | <el-row> | 152 | <el-row> |
| 150 | - <el-button type="primary" size="mini" v-if="tidyQuery.flightno !== undefined || tidyData.length> 0" | ||
| 151 | - @click="handelAddTidyInfo">新增出港理货 | 153 | + <el-button type="success" icon="el-icon-plus" size="mini" v-if="tidyQuery.flightno !== undefined || tidyData.length> 0" |
| 154 | + @click="handelAddTidyInfo">新增理货 | ||
| 152 | </el-button> | 155 | </el-button> |
| 153 | - <el-button type="primary" size="mini" v-if="tidyQuery.flightno !== undefined || tidyData.length> 0" | ||
| 154 | - @click="handelBackStep">返回 | 156 | + <el-button type="primary" icon="el-icon-back" size="mini" v-if="tidyQuery.flightno !== undefined || tidyData.length> 0" |
| 157 | + @click="handelBackStep">返  回 | ||
| 155 | </el-button> | 158 | </el-button> |
| 156 | </el-row> | 159 | </el-row> |
| 157 | </div> | 160 | </div> |
| @@ -179,11 +182,11 @@ | @@ -179,11 +182,11 @@ | ||
| 179 | </el-col> | 182 | </el-col> |
| 180 | </el-row> | 183 | </el-row> |
| 181 | <el-row> | 184 | <el-row> |
| 182 | - <el-col :span="7.5"> | ||
| 183 | - <el-form-item label="承运人" prop="carrier"> | ||
| 184 | - <el-input v-model="carrier" :disabled="dialogStatus === 'update'"></el-input> | ||
| 185 | - </el-form-item> | ||
| 186 | - </el-col> | 185 | +<!-- <el-col :span="7.5">--> |
| 186 | +<!-- <el-form-item label="承运人" prop="carrier">--> | ||
| 187 | +<!-- <el-input v-model="carrier" :disabled="dialogStatus === 'update'"></el-input>--> | ||
| 188 | +<!-- </el-form-item>--> | ||
| 189 | +<!-- </el-col>--> | ||
| 187 | <el-col :span="7.5"> | 190 | <el-col :span="7.5"> |
| 188 | <el-form-item label="航班号" prop="flightno"> | 191 | <el-form-item label="航班号" prop="flightno"> |
| 189 | <el-input v-model="flightno" :disabled="dialogStatus === 'update'"></el-input> | 192 | <el-input v-model="flightno" :disabled="dialogStatus === 'update'"></el-input> |
| @@ -253,12 +256,12 @@ | @@ -253,12 +256,12 @@ | ||
| 253 | </el-row> | 256 | </el-row> |
| 254 | <el-row> | 257 | <el-row> |
| 255 | <el-col :span="7.5"> | 258 | <el-col :span="7.5"> |
| 256 | - <el-form-item label="装载件数" prop="piece"> | 259 | + <el-form-item label="理货件数" prop="piece"> |
| 257 | <el-input v-model="tidyModel.piece"></el-input> | 260 | <el-input v-model="tidyModel.piece"></el-input> |
| 258 | </el-form-item> | 261 | </el-form-item> |
| 259 | </el-col> | 262 | </el-col> |
| 260 | <el-col :span="7.5"> | 263 | <el-col :span="7.5"> |
| 261 | - <el-form-item label="装载重量" prop="weight"> | 264 | + <el-form-item label="理货重量" prop="weight"> |
| 262 | <el-input v-model="tidyModel.weight"></el-input> | 265 | <el-input v-model="tidyModel.weight"></el-input> |
| 263 | </el-form-item> | 266 | </el-form-item> |
| 264 | </el-col> | 267 | </el-col> |
| @@ -447,6 +450,7 @@ | @@ -447,6 +450,7 @@ | ||
| 447 | goodsname: [{required: true, message: "货物描述不能为空"},{ trigger: 'blur', validator: validAlphabetsSpanceKey}], | 450 | goodsname: [{required: true, message: "货物描述不能为空"},{ trigger: 'blur', validator: validAlphabetsSpanceKey}], |
| 448 | carrier: [{required: true, message:"承运人不能为空"},{trigger: 'blur', validator: validatorAwbh}], | 451 | carrier: [{required: true, message:"承运人不能为空"},{trigger: 'blur', validator: validatorAwbh}], |
| 449 | flightno: [{required: true, message:"航班号不能为空"}, { trigger: 'blur', validator: validatorAwbh}], | 452 | flightno: [{required: true, message:"航班号不能为空"}, { trigger: 'blur', validator: validatorAwbh}], |
| 453 | + flightdate: [{required: true, trigger:'blur', message:"请选择航班日期"}], | ||
| 450 | originstation: [{required: true, message:"起始站不能为空"}, {trigger: 'blur', validator: validatorAlphabets}], | 454 | originstation: [{required: true, message:"起始站不能为空"}, {trigger: 'blur', validator: validatorAlphabets}], |
| 451 | destinationstation: [{required: true, message:"目的站不能为空"}, { trigger: 'blur', validator: validatorAlphabets}], | 455 | destinationstation: [{required: true, message:"目的站不能为空"}, { trigger: 'blur', validator: validatorAlphabets}], |
| 452 | weight: [{required: true, message:"重量不能为空"}, { trigger: 'change', validator: validatorNums}], | 456 | weight: [{required: true, message:"重量不能为空"}, { trigger: 'change', validator: validatorNums}], |
| @@ -484,7 +488,7 @@ | @@ -484,7 +488,7 @@ | ||
| 484 | awbweight: undefined, | 488 | awbweight: undefined, |
| 485 | rcfdep: 'MT5202', | 489 | rcfdep: 'MT5202', |
| 486 | userinfo: { | 490 | userinfo: { |
| 487 | - username : JSON.parse(sessionStorage.getItem('user')).username | 491 | + username : loginedUserInfo().username |
| 488 | } | 492 | } |
| 489 | }, | 493 | }, |
| 490 | respModel : { | 494 | respModel : { |
| @@ -520,7 +524,7 @@ | @@ -520,7 +524,7 @@ | ||
| 520 | rows:{}, | 524 | rows:{}, |
| 521 | } | 525 | } |
| 522 | }, | 526 | }, |
| 523 | - created() { | 527 | + activated() { |
| 524 | if (this.$route.params.flightData !== undefined) { | 528 | if (this.$route.params.flightData !== undefined) { |
| 525 | this.tidyQuery.carrier = this.$route.params.flightData.flightno.substring(0, 2) | 529 | this.tidyQuery.carrier = this.$route.params.flightData.flightno.substring(0, 2) |
| 526 | this.tidyQuery.flightno = this.$route.params.flightData.flightno.substring(2) | 530 | this.tidyQuery.flightno = this.$route.params.flightData.flightno.substring(2) |
| @@ -531,8 +535,15 @@ | @@ -531,8 +535,15 @@ | ||
| 531 | this.tidyQuery.awba = this.$route.params.flightData.awba.substring(0, 3) + "-" + this.$route.params.flightData.awba.substring(3) | 535 | this.tidyQuery.awba = this.$route.params.flightData.awba.substring(0, 3) + "-" + this.$route.params.flightData.awba.substring(3) |
| 532 | } | 536 | } |
| 533 | this.getList() | 537 | this.getList() |
| 538 | + }else { | ||
| 539 | + this.tidyQuery = { | ||
| 540 | + pageSize: 1, | ||
| 541 | + limitSize: 10, | ||
| 542 | + awba: undefined, | ||
| 543 | + rcfdep: "MT5202" | ||
| 544 | + } | ||
| 534 | } | 545 | } |
| 535 | - let username = JSON.parse(sessionStorage.getItem('user')).username | 546 | + let username = loginedUserInfo().username |
| 536 | if(username === 'admin'){ | 547 | if(username === 'admin'){ |
| 537 | this.isAdmin = true | 548 | this.isAdmin = true |
| 538 | } | 549 | } |
| @@ -677,7 +688,7 @@ | @@ -677,7 +688,7 @@ | ||
| 677 | cancelButtonText: '取消' | 688 | cancelButtonText: '取消' |
| 678 | }).then(() => { | 689 | }).then(() => { |
| 679 | row.userinfo = { | 690 | row.userinfo = { |
| 680 | - username : JSON.parse(sessionStorage.getItem('user')).username | 691 | + username : loginedUserInfo().username |
| 681 | } | 692 | } |
| 682 | sendCreateMt5202(row).then(res => { | 693 | sendCreateMt5202(row).then(res => { |
| 683 | if (res.data.count > 0) { | 694 | if (res.data.count > 0) { |
| @@ -708,10 +719,9 @@ | @@ -708,10 +719,9 @@ | ||
| 708 | // 清空from列表 | 719 | // 清空from列表 |
| 709 | this.restModel(); | 720 | this.restModel(); |
| 710 | 721 | ||
| 711 | - this.tidyModel.carrier = row.carrier | ||
| 712 | this.tidyModel.awba = row.awba | 722 | this.tidyModel.awba = row.awba |
| 713 | this.tidyModel.flightdate = row.flightdate | 723 | this.tidyModel.flightdate = row.flightdate |
| 714 | - this.tidyModel.flightno = row.flightno | 724 | + this.tidyModel.flightno = row.carrier + row.flightno |
| 715 | this.tidyModel.originstation = row.originstation | 725 | this.tidyModel.originstation = row.originstation |
| 716 | this.tidyModel.destinationstation = row.destinationstation | 726 | this.tidyModel.destinationstation = row.destinationstation |
| 717 | this.tidyModel.customcode = row.customcode | 727 | this.tidyModel.customcode = row.customcode |
| @@ -739,7 +749,7 @@ | @@ -739,7 +749,7 @@ | ||
| 739 | flightDate: undefined, | 749 | flightDate: undefined, |
| 740 | awbh: undefined, | 750 | awbh: undefined, |
| 741 | rcfdep: 'MT5202', | 751 | rcfdep: 'MT5202', |
| 742 | - username: JSON.parse(sessionStorage.getItem('user')).username, | 752 | + username: loginedUserInfo().username |
| 743 | } | 753 | } |
| 744 | this.dialogDeleteVisible = true | 754 | this.dialogDeleteVisible = true |
| 745 | this.respModel.carrier = row.carrier | 755 | this.respModel.carrier = row.carrier |
| @@ -861,7 +871,7 @@ | @@ -861,7 +871,7 @@ | ||
| 861 | awbweight: undefined, | 871 | awbweight: undefined, |
| 862 | rcfdep: 'MT5202', | 872 | rcfdep: 'MT5202', |
| 863 | userinfo: { | 873 | userinfo: { |
| 864 | - username: JSON.parse(sessionStorage.getItem('user')).username | 874 | + username: loginedUserInfo().username |
| 865 | } | 875 | } |
| 866 | } | 876 | } |
| 867 | }, | 877 | }, |
| @@ -870,9 +880,10 @@ | @@ -870,9 +880,10 @@ | ||
| 870 | this.fenStatus=undefined; | 880 | this.fenStatus=undefined; |
| 871 | this.restModel() | 881 | this.restModel() |
| 872 | // 给model赋值，所使用数据是以单独单号查询数据所得 | 882 | // 给model赋值，所使用数据是以单独单号查询数据所得 |
| 873 | - this.tidyModel.carrier = this.tidyQuery.carrier | ||
| 874 | this.tidyModel.flightdate = this.tidyQuery.flightdate | 883 | this.tidyModel.flightdate = this.tidyQuery.flightdate |
| 875 | - this.tidyModel.flightno = this.tidyQuery.flightno | 884 | + if (this.tidyQuery.carrier != undefined){ |
| 885 | + this.tidyModel.flightno = this.tidyQuery.carrier+this.tidyQuery.flightno | ||
| 886 | + } | ||
| 876 | this.tidyModel.originstation = this.tidyQuery.originstation | 887 | this.tidyModel.originstation = this.tidyQuery.originstation |
| 877 | this.tidyModel.destinationstation = this.tidyQuery.destinationstation | 888 | this.tidyModel.destinationstation = this.tidyQuery.destinationstation |
| 878 | this.tidyModel.customcode = this.tidyQuery.customcode | 889 | this.tidyModel.customcode = this.tidyQuery.customcode |
| @@ -886,6 +897,8 @@ | @@ -886,6 +897,8 @@ | ||
| 886 | createData() { | 897 | createData() { |
| 887 | this.$refs.tidyFormData.validate(valid => { | 898 | this.$refs.tidyFormData.validate(valid => { |
| 888 | if (valid) { | 899 | if (valid) { |
| 900 | + this.tidyModel.carrier = this.tidyModel.flightno.substring(0,2); | ||
| 901 | + this.tidyModel.flightno = this.tidyModel.flightno.substring(2); | ||
| 889 | addMt520X(this.tidyModel).then(res => { | 902 | addMt520X(this.tidyModel).then(res => { |
| 890 | if (res.data.code == "200") { | 903 | if (res.data.code == "200") { |
| 891 | Message.success(res.data.msg); | 904 | Message.success(res.data.msg); |
| @@ -906,6 +919,7 @@ | @@ -906,6 +919,7 @@ | ||
| 906 | this.fenStatus=undefined | 919 | this.fenStatus=undefined |
| 907 | } | 920 | } |
| 908 | this.tidyModel = Object.assign({}, row) | 921 | this.tidyModel = Object.assign({}, row) |
| 922 | + this.tidyModel.flightno = row.carrier+row.flightno | ||
| 909 | this.dialogStatus = 'update' | 923 | this.dialogStatus = 'update' |
| 910 | this.dialogFormVisible = true | 924 | this.dialogFormVisible = true |
| 911 | this.$nextTick(() => { | 925 | this.$nextTick(() => { |
| @@ -921,12 +935,13 @@ | @@ -921,12 +935,13 @@ | ||
| 921 | delete this.tidyModel.children | 935 | delete this.tidyModel.children |
| 922 | 936 | ||
| 923 | _this.tidyModel.user= { | 937 | _this.tidyModel.user= { |
| 924 | - username : JSON.parse(sessionStorage.getItem('user')).username | 938 | + username : loginedUserInfo().username |
| 925 | } | 939 | } |
| 926 | this.tidyModel.userinfo = { | 940 | this.tidyModel.userinfo = { |
| 927 | - username : loginUserInfo().username | 941 | + username : loginedUserInfo().username |
| 928 | } | 942 | } |
| 929 | - | 943 | + this.tidyModel.carrier = this.tidyModel.flightno.substring(0,2); |
| 944 | + this.tidyModel.flightno = this.tidyModel.flightno.substring(2); | ||
| 930 | updateMt520X(this.tidyModel).then(res => { | 945 | updateMt520X(this.tidyModel).then(res => { |
| 931 | console.log(res.data) | 946 | console.log(res.data) |
| 932 | if (res.data.count > 0) { | 947 | if (res.data.count > 0) { |
| @@ -8,44 +8,36 @@ | @@ -8,44 +8,36 @@ | ||
| 8 | <el-row style="display: block;background-color: white;padding-left: 5px"> | 8 | <el-row style="display: block;background-color: white;padding-left: 5px"> |
| 9 | <el-row> | 9 | <el-row> |
| 10 | <el-col :span="6"> | 10 | <el-col :span="6"> |
| 11 | - <span> | ||
| 12 | - 主单号 | ||
| 13 | - </span> | ||
| 14 | - <el-input placeholder="" v-model="defaultQuery.awba" style="width: 150px"> | 11 | + <el-input placeholder="" v-model="defaultQuery.awba" style="width: 200px"> |
| 12 | + <template slot="prepend">主单号</template> | ||
| 15 | </el-input> | 13 | </el-input> |
| 16 | </el-col> | 14 | </el-col> |
| 17 | <el-col :span="6"> | 15 | <el-col :span="6"> |
| 18 | - <span> | ||
| 19 | - 承运人 | ||
| 20 | - </span> | ||
| 21 | - <el-input placeholder="" v-model="defaultQuery.carrier" style="width: 150px"> | 16 | + <el-input placeholder="" v-model="defaultQuery.carrier" style="width: 200px"> |
| 17 | + <template slot="prepend">承运人</template> | ||
| 22 | </el-input> | 18 | </el-input> |
| 23 | </el-col> | 19 | </el-col> |
| 24 | <el-col :span="6"> | 20 | <el-col :span="6"> |
| 25 | - <span> | ||
| 26 | - 航班号 | ||
| 27 | - </span> | ||
| 28 | - <el-input placeholder="" v-model="defaultQuery.flightno" style="width: 150px"> | 21 | + <el-input placeholder="" v-model="defaultQuery.flightno" style="width: 200px"> |
| 22 | + <template slot="prepend">航班号</template> | ||
| 29 | </el-input> | 23 | </el-input> |
| 30 | </el-col> | 24 | </el-col> |
| 31 | <el-col :span="6"> | 25 | <el-col :span="6"> |
| 32 | - <span> | ||
| 33 | - 航班日期 | ||
| 34 | - </span> | 26 | + <div class="ip"> |
| 27 | + 航班日期 </div> | ||
| 35 | <el-date-picker | 28 | <el-date-picker |
| 36 | v-model="defaultQuery.flightdate" | 29 | v-model="defaultQuery.flightdate" |
| 37 | value-format="yyyy-MM-dd" | 30 | value-format="yyyy-MM-dd" |
| 38 | - type="date" style="width: 150px" | 31 | + type="date" style="width: 130px" |
| 39 | placeholder="航班日期"> | 32 | placeholder="航班日期"> |
| 40 | </el-date-picker> | 33 | </el-date-picker> |
| 41 | </el-col> | 34 | </el-col> |
| 42 | </el-row> | 35 | </el-row> |
| 43 | <el-row> | 36 | <el-row> |
| 44 | <el-col :span="6"> | 37 | <el-col :span="6"> |
| 45 | - <span> | ||
| 46 | - 业务状态 | ||
| 47 | - </span> | ||
| 48 | - <el-select v-model="defaultQuery.status" placeholder="选择状态" style="width: 150px"> | 38 | + <div class="ip"> |
| 39 | + 业务状态 </div> | ||
| 40 | + <el-select v-model="defaultQuery.status" placeholder="选择状态" style="width: 120px"> | ||
| 49 | <el-option | 41 | <el-option |
| 50 | v-for="item in options" | 42 | v-for="item in options" |
| 51 | :key="item.value" | 43 | :key="item.value" |
| @@ -55,10 +47,9 @@ | @@ -55,10 +47,9 @@ | ||
| 55 | </el-select> | 47 | </el-select> |
| 56 | </el-col> | 48 | </el-col> |
| 57 | <el-col :span="6"> | 49 | <el-col :span="6"> |
| 58 | - <span> | ||
| 59 | - 报文类型 | ||
| 60 | - </span> | ||
| 61 | - <el-select v-model="defaultQuery.turntype" placeholder="报文类型" style="width: 150px"> | 50 | + <div class="ip"> |
| 51 | + 报文类型 </div> | ||
| 52 | + <el-select v-model="defaultQuery.turntype" placeholder="报文类型" style="width: 120px"> | ||
| 62 | <el-option | 53 | <el-option |
| 63 | v-for="item in options2" | 54 | v-for="item in options2" |
| 64 | :key="item.value" | 55 | :key="item.value" |
| @@ -84,7 +75,8 @@ | @@ -84,7 +75,8 @@ | ||
| 84 | ref="multipleTable" | 75 | ref="multipleTable" |
| 85 | :data="tableData" | 76 | :data="tableData" |
| 86 | tooltip-effect="dark" | 77 | tooltip-effect="dark" |
| 87 | - style="width: 100%"> | 78 | + style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px" |
| 79 | + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"> | ||
| 88 | <el-table-column | 80 | <el-table-column |
| 89 | fixed="left" | 81 | fixed="left" |
| 90 | label="修改状态" | 82 | label="修改状态" |
| @@ -143,7 +135,16 @@ | @@ -143,7 +135,16 @@ | ||
| 143 | label="回执内容" | 135 | label="回执内容" |
| 144 | width="250"> | 136 | width="250"> |
| 145 | <template slot-scope="scope"> | 137 | <template slot-scope="scope"> |
| 146 | - <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A"> | 138 | + <span v-if="scope.row.ext5 && scope.row.ext5.indexOf('异常') != -1" style="color: #F56C6C"> |
| 139 | + {{scope.row.ext5}} | ||
| 140 | + </span> | ||
| 141 | + <span v-else-if="scope.row.ext5 && scope.row.ext5.indexOf('不通过') != -1" style="color: #F56C6C"> | ||
| 142 | + {{scope.row.ext5}} | ||
| 143 | + </span> | ||
| 144 | + <span v-else-if="scope.row.ext5 && scope.row.ext5.indexOf('不接受') != -1" style="color: #F56C6C"> | ||
| 145 | + {{scope.row.ext5}} | ||
| 146 | + </span> | ||
| 147 | + <span v-else-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A"> | ||
| 147 | {{scope.row.ext5}} | 148 | {{scope.row.ext5}} |
| 148 | </span> | 149 | </span> |
| 149 | <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C"> | 150 | <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C"> |
| @@ -158,9 +159,9 @@ | @@ -158,9 +159,9 @@ | ||
| 158 | </template> | 159 | </template> |
| 159 | </el-table-column> | 160 | </el-table-column> |
| 160 | <el-table-column | 161 | <el-table-column |
| 161 | - label="修改状态" | ||
| 162 | - width="480"> | 162 | + label="修改状态" prop="operation" fixed="right" align="center" width="285"> |
| 163 | <template slot-scope="scope"> | 163 | <template slot-scope="scope"> |
| 164 | + <el-row type="flex" justify="space-between"> | ||
| 164 | <el-button | 165 | <el-button |
| 165 | v-if="scope.row.turntype=='MT6202'" | 166 | v-if="scope.row.turntype=='MT6202'" |
| 166 | size="mini" | 167 | size="mini" |
| @@ -177,14 +178,16 @@ | @@ -177,14 +178,16 @@ | ||
| 177 | v-if="scope.row.turntype=='MT6202'" | 178 | v-if="scope.row.turntype=='MT6202'" |
| 178 | size="mini" | 179 | size="mini" |
| 179 | type="success" | 180 | type="success" |
| 180 | - @click="importEdit(scope.$index, scope.row)">编辑 | 181 | + @click="importEdit(scope.$index, scope.row)">编辑信息 |
| 181 | </el-button> | 182 | </el-button> |
| 182 | <el-button | 183 | <el-button |
| 183 | v-else | 184 | v-else |
| 184 | size="mini" | 185 | size="mini" |
| 185 | type="success" | 186 | type="success" |
| 186 | - @click="arriveEdit(scope.$index, scope.row)">编辑 | 187 | + @click="arriveEdit(scope.$index, scope.row)">编辑信息 |
| 187 | </el-button> | 188 | </el-button> |
| 189 | + </el-row> | ||
| 190 | + <el-row type="flex" justify="space-between"> | ||
| 188 | <el-button | 191 | <el-button |
| 189 | v-if="scope.row.turntype=='MT6202'" | 192 | v-if="scope.row.turntype=='MT6202'" |
| 190 | size="mini" | 193 | size="mini" |
| @@ -209,15 +212,16 @@ | @@ -209,15 +212,16 @@ | ||
| 209 | size="mini" | 212 | size="mini" |
| 210 | type="danger" | 213 | type="danger" |
| 211 | :disabled="btDeleStatusFormater(scope.row.status)" | 214 | :disabled="btDeleStatusFormater(scope.row.status)" |
| 212 | - @click="importDel(scope.$index, scope.row)">申请分拨删除 | 215 | + @click="importDel(scope.$index, scope.row)">申请删除 |
| 213 | </el-button> | 216 | </el-button> |
| 214 | <el-button | 217 | <el-button |
| 215 | v-else | 218 | v-else |
| 216 | size="mini" | 219 | size="mini" |
| 217 | type="danger" | 220 | type="danger" |
| 218 | :disabled="btDeleStatusFormater(scope.row.status)" | 221 | :disabled="btDeleStatusFormater(scope.row.status)" |
| 219 | - @click="arriveDel(scope.$index, scope.row)">分拨运抵删除 | 222 | + @click="arriveDel(scope.$index, scope.row)">申请删除 |
| 220 | </el-button> | 223 | </el-button> |
| 224 | + </el-row> | ||
| 221 | </template> | 225 | </template> |
| 222 | </el-table-column> | 226 | </el-table-column> |
| 223 | </el-table> | 227 | </el-table> |
| @@ -251,9 +255,11 @@ | @@ -251,9 +255,11 @@ | ||
| 251 | </el-col> | 255 | </el-col> |
| 252 | </el-row> | 256 | </el-row> |
| 253 | <el-row> | 257 | <el-row> |
| 254 | - <el-col :span="5"> | ||
| 255 | - <el-form-item label="运单号" prop="awba"> | ||
| 256 | - <el-input disabled="" v-model="AruleForm.awba"></el-input> | 258 | + <el-col :span="6"> |
| 259 | + <el-form-item label="" prop="awba"> | ||
| 260 | + <el-input disabled="" v-model="AruleForm.awba" style="width: 200px"> | ||
| 261 | + <template slot="prepend">运单号</template> | ||
| 262 | + </el-input> | ||
| 257 | </el-form-item> | 263 | </el-form-item> |
| 258 | </el-col> | 264 | </el-col> |
| 259 | <el-col :span="15"> | 265 | <el-col :span="15"> |
| @@ -268,28 +274,33 @@ | @@ -268,28 +274,33 @@ | ||
| 268 | </el-row> | 274 | </el-row> |
| 269 | <el-row> | 275 | <el-row> |
| 270 | <el-col :span="5"> | 276 | <el-col :span="5"> |
| 271 | - <el-form-item label="承运人" prop="carrier"> | ||
| 272 | - <el-input disabled="" v-model="AruleForm.carrier"></el-input> | 277 | + <el-form-item label="" prop="carrier"> |
| 278 | + <el-input disabled="" v-model="AruleForm.carrier" style="width: 200px"> | ||
| 279 | + <template slot="prepend">承运人</template> | ||
| 280 | + </el-input> | ||
| 273 | </el-form-item> | 281 | </el-form-item> |
| 274 | </el-col> | 282 | </el-col> |
| 275 | <el-col :span="5"> | 283 | <el-col :span="5"> |
| 276 | - <el-form-item label="航班号" prop="flightno"> | ||
| 277 | - <el-input disabled="" v-model="AruleForm.flightno"></el-input> | 284 | + <el-form-item label="" prop="flightno"> |
| 285 | + <el-input disabled="" v-model="AruleForm.flightno" style="width: 200px"> | ||
| 286 | + <template slot="prepend">航班号</template> | ||
| 287 | + </el-input> | ||
| 278 | </el-form-item> | 288 | </el-form-item> |
| 279 | </el-col> | 289 | </el-col> |
| 280 | - <el-col :span="5"> | ||
| 281 | - <el-form-item label="航班日期" required> | ||
| 282 | - <el-col :span="24"> | 290 | + <el-col :span="7"> |
| 291 | + <el-form-item label="" required> | ||
| 283 | <el-form-item prop="flightdate"> | 292 | <el-form-item prop="flightdate"> |
| 284 | - <el-date-picker disabled="" type="date" placeholder="选择日期" v-model="AruleForm.flightdate" style="width: 100%;"></el-date-picker> | 293 | + <div class="ipt"> |
| 294 | + 航班日期 </div> | ||
| 295 | + <el-date-picker disabled="" type="date" placeholder="选择日期" v-model="AruleForm.flightdate" style="width: 130px;"></el-date-picker> | ||
| 285 | </el-form-item> | 296 | </el-form-item> |
| 286 | - </el-col> | ||
| 287 | </el-form-item> | 297 | </el-form-item> |
| 288 | </el-col> | 298 | </el-col> |
| 289 | - <el-col :span="5"> | ||
| 290 | - <el-form-item label="海关关区" prop="customcode"> | ||
| 291 | - <el-col :span="24"> | ||
| 292 | - <el-select v-model="AruleForm.customcode" placeholder="请选择海关关区" style="width:100%"> | 299 | + <el-col :span="7"> |
| 300 | + <el-form-item label="" prop="customcode"> | ||
| 301 | + <div class="ipt"> | ||
| 302 | + 海关关区 </div> | ||
| 303 | + <el-select v-model="AruleForm.customcode" placeholder="请选择海关关区" style="width:120px"> | ||
| 293 | <div v-if="dialogStatus === 'update'"> | 304 | <div v-if="dialogStatus === 'update'"> |
| 294 | <el-option v-for="item in options3" :key="item.value" :label="item.label" | 305 | <el-option v-for="item in options3" :key="item.value" :label="item.label" |
| 295 | :value="item.value" ></el-option> | 306 | :value="item.value" ></el-option> |
| @@ -299,48 +310,63 @@ | @@ -299,48 +310,63 @@ | ||
| 299 | :value="item.value" ></el-option> | 310 | :value="item.value" ></el-option> |
| 300 | </div> | 311 | </div> |
| 301 | </el-select> | 312 | </el-select> |
| 302 | - </el-col> | ||
| 303 | </el-form-item> | 313 | </el-form-item> |
| 304 | </el-col> | 314 | </el-col> |
| 305 | </el-row> | 315 | </el-row> |
| 306 | <el-row> | 316 | <el-row> |
| 307 | <el-col :span="5"> | 317 | <el-col :span="5"> |
| 308 | - <el-form-item label="运抵件数" prop="turnpiece"> | 318 | + <el-form-item label="" prop="turnpiece"> |
| 309 | <div v-if="dialogStatus === 'update'"> | 319 | <div v-if="dialogStatus === 'update'"> |
| 310 | - <el-input type="number" v-model="AruleForm.turnpiece"></el-input> | 320 | + <el-input type="number" v-model="AruleForm.turnpiece" style="width: 200px"> |
| 321 | + <template slot="prepend">运抵件数</template> | ||
| 322 | + </el-input> | ||
| 311 | </div> | 323 | </div> |
| 312 | <div v-else> | 324 | <div v-else> |
| 313 | - <el-input type="number" disabled="" v-model="AruleForm.turnpiece"></el-input> | 325 | + <el-input type="number" disabled="" v-model="AruleForm.turnpiece" style="width: 200px"> |
| 326 | + <template slot="prepend">运抵件数</template> | ||
| 327 | + </el-input> | ||
| 314 | </div> | 328 | </div> |
| 315 | </el-form-item> | 329 | </el-form-item> |
| 316 | </el-col> | 330 | </el-col> |
| 317 | <el-col :span="5"> | 331 | <el-col :span="5"> |
| 318 | - <el-form-item label="运抵重量" prop="turnweight"> | 332 | + <el-form-item label="" prop="turnweight"> |
| 319 | <div v-if="dialogStatus === 'update'"> | 333 | <div v-if="dialogStatus === 'update'"> |
| 320 | - <el-input type="number" v-model="AruleForm.turnweight"></el-input> | 334 | + <el-input type="number" v-model="AruleForm.turnweight" style="width: 200px"> |
| 335 | + <template slot="prepend">运抵重量</template> | ||
| 336 | + </el-input> | ||
| 321 | </div> | 337 | </div> |
| 322 | <div v-else> | 338 | <div v-else> |
| 323 | - <el-input type="number" disabled="" v-model="AruleForm.turnweight"></el-input> | 339 | + <el-input type="number" disabled="" v-model="AruleForm.turnweight" style="width: 200px"> |
| 340 | + <template slot="prepend">运抵重量</template> | ||
| 341 | + </el-input> | ||
| 324 | </div> | 342 | </div> |
| 325 | </el-form-item> | 343 | </el-form-item> |
| 326 | </el-col> | 344 | </el-col> |
| 327 | - <el-col :span="5"> | ||
| 328 | - <el-form-item label="卸货地" prop="turnunloading"> | 345 | + <el-col :span="7"> |
| 346 | + <el-form-item label="" prop="turnunloading"> | ||
| 329 | <div v-if="dialogStatus === 'update'"> | 347 | <div v-if="dialogStatus === 'update'"> |
| 330 | - <el-input v-model="AruleForm.turnunloading"></el-input> | 348 | + <el-input v-model="AruleForm.turnunloading" style="width: 215px"> |
| 349 | + <template slot="prepend">卸货地</template> | ||
| 350 | + </el-input> | ||
| 331 | </div> | 351 | </div> |
| 332 | <div v-else> | 352 | <div v-else> |
| 333 | - <el-input disabled="" v-model="AruleForm.turnunloading"></el-input> | 353 | + <el-input disabled="" v-model="AruleForm.turnunloading" style="width: 215px"> |
| 354 | + <template slot="prepend">卸货地</template> | ||
| 355 | + </el-input> | ||
| 334 | </div> | 356 | </div> |
| 335 | </el-form-item> | 357 | </el-form-item> |
| 336 | </el-col> | 358 | </el-col> |
| 337 | <el-col :span="5"> | 359 | <el-col :span="5"> |
| 338 | - <el-form-item label="货物描述" prop="turnunloading"> | 360 | + <el-form-item label="" prop="turnunloading"> |
| 339 | <div v-if="dialogStatus === 'update'"> | 361 | <div v-if="dialogStatus === 'update'"> |
| 340 | - <el-input v-model="AruleForm.goodsname"></el-input> | 362 | + <el-input v-model="AruleForm.goodsname" style="width: 200px"> |
| 363 | + <template slot="prepend">货物描述</template> | ||
| 364 | + </el-input> | ||
| 341 | </div> | 365 | </div> |
| 342 | <div v-else> | 366 | <div v-else> |
| 343 | - <el-input disabled="" v-model="AruleForm.goodsname"></el-input> | 367 | + <el-input disabled="" v-model="AruleForm.goodsname" style="width: 200px"> |
| 368 | + <template slot="prepend">货物描述</template> | ||
| 369 | + </el-input> | ||
| 344 | </div> | 370 | </div> |
| 345 | </el-form-item> | 371 | </el-form-item> |
| 346 | </el-col> | 372 | </el-col> |
| @@ -360,8 +386,10 @@ | @@ -360,8 +386,10 @@ | ||
| 360 | </el-row> | 386 | </el-row> |
| 361 | <el-row> | 387 | <el-row> |
| 362 | <el-col :span="5"> | 388 | <el-col :span="5"> |
| 363 | - <el-form-item label="运单号" prop="awba"> | ||
| 364 | - <el-input disabled="" v-model="IruleForm.awba"></el-input> | 389 | + <el-form-item label="" prop="awba"> |
| 390 | + <el-input disabled="" v-model="IruleForm.awba" style="width: 200px"> | ||
| 391 | + <template slot="prepend">运单号</template> | ||
| 392 | + </el-input> | ||
| 365 | </el-form-item> | 393 | </el-form-item> |
| 366 | </el-col> | 394 | </el-col> |
| 367 | <el-col :span="15"> | 395 | <el-col :span="15"> |
| @@ -376,28 +404,33 @@ | @@ -376,28 +404,33 @@ | ||
| 376 | </el-row> | 404 | </el-row> |
| 377 | <el-row> | 405 | <el-row> |
| 378 | <el-col :span="5"> | 406 | <el-col :span="5"> |
| 379 | - <el-form-item label="承运人" prop="carrier"> | ||
| 380 | - <el-input disabled="" v-model="IruleForm.carrier"></el-input> | 407 | + <el-form-item label="" prop="carrier"> |
| 408 | + <el-input disabled="" v-model="IruleForm.carrier" style="width: 200px"> | ||
| 409 | + <template slot="prepend">运承运人单号</template> | ||
| 410 | + </el-input> | ||
| 381 | </el-form-item> | 411 | </el-form-item> |
| 382 | </el-col> | 412 | </el-col> |
| 383 | <el-col :span="5"> | 413 | <el-col :span="5"> |
| 384 | - <el-form-item label="航班号" prop="flightno"> | ||
| 385 | - <el-input disabled="" v-model="IruleForm.flightno"></el-input> | 414 | + <el-form-item label="" prop="flightno"> |
| 415 | + <el-input disabled="" v-model="IruleForm.flightno" style="width: 200px"> | ||
| 416 | + <template slot="prepend">航班号</template> | ||
| 417 | + </el-input> | ||
| 386 | </el-form-item> | 418 | </el-form-item> |
| 387 | </el-col> | 419 | </el-col> |
| 388 | - <el-col :span="5"> | ||
| 389 | - <el-form-item label="航班日期" required> | ||
| 390 | - <el-col :span="24"> | 420 | + <el-col :span="7"> |
| 421 | + <el-form-item label="" required> | ||
| 391 | <el-form-item prop="flightdate"> | 422 | <el-form-item prop="flightdate"> |
| 392 | - <el-date-picker disabled="" type="date" placeholder="选择日期" v-model="IruleForm.flightdate" style="width: 100%;"></el-date-picker> | 423 | + <div class="ipt"> |
| 424 | + 航班日期 </div> | ||
| 425 | + <el-date-picker disabled="" type="date" placeholder="选择日期" v-model="IruleForm.flightdate" style="width: 130px;"></el-date-picker> | ||
| 393 | </el-form-item> | 426 | </el-form-item> |
| 394 | - </el-col> | ||
| 395 | </el-form-item> | 427 | </el-form-item> |
| 396 | </el-col> | 428 | </el-col> |
| 397 | - <el-col :span="5"> | ||
| 398 | - <el-form-item label="海关关区" prop="customcode"> | ||
| 399 | - <el-col :span="24"> | ||
| 400 | - <el-select v-model="IruleForm.customcode" placeholder="请选择海关关区" style="width:100%"> | 429 | + <el-col :span="7"> |
| 430 | + <el-form-item label="" prop="customcode"> | ||
| 431 | + <div class="ipt"> | ||
| 432 | + 海关关区 </div> | ||
| 433 | + <el-select v-model="IruleForm.customcode" placeholder="请选择海关关区" style="width:120px"> | ||
| 401 | <div v-if="dialogStatus === 'update'"> | 434 | <div v-if="dialogStatus === 'update'"> |
| 402 | <el-option v-for="item in options3" :key="item.value" :label="item.label" | 435 | <el-option v-for="item in options3" :key="item.value" :label="item.label" |
| 403 | :value="item.value" ></el-option> | 436 | :value="item.value" ></el-option> |
| @@ -407,68 +440,94 @@ | @@ -407,68 +440,94 @@ | ||
| 407 | :value="item.value" ></el-option> | 440 | :value="item.value" ></el-option> |
| 408 | </div> | 441 | </div> |
| 409 | </el-select> | 442 | </el-select> |
| 410 | - </el-col> | ||
| 411 | </el-form-item> | 443 | </el-form-item> |
| 412 | </el-col> | 444 | </el-col> |
| 413 | </el-row> | 445 | </el-row> |
| 414 | <el-row> | 446 | <el-row> |
| 415 | <el-col :span="5"> | 447 | <el-col :span="5"> |
| 416 | - <el-form-item label="运抵件数" prop="turnpiece"> | 448 | + <el-form-item label="" prop="turnpiece"> |
| 417 | <div v-if="dialogStatus === 'update'"> | 449 | <div v-if="dialogStatus === 'update'"> |
| 418 | - <el-input v-model="IruleForm.turnpiece"></el-input> | 450 | + <el-input v-model="IruleForm.turnpiece" style="width: 200px"> |
| 451 | + <template slot="prepend">运抵件数</template> | ||
| 452 | + </el-input> | ||
| 419 | </div> | 453 | </div> |
| 420 | <div v-else> | 454 | <div v-else> |
| 421 | - <el-input disabled="" v-model="IruleForm.turnpiece"></el-input> | 455 | + <el-input disabled="" v-model="IruleForm.turnpiece" style="width: 200px"> |
| 456 | + <template slot="prepend">运抵件数</template> | ||
| 457 | + </el-input> | ||
| 422 | </div> | 458 | </div> |
| 423 | </el-form-item> | 459 | </el-form-item> |
| 424 | </el-col> | 460 | </el-col> |
| 425 | <el-col :span="5"> | 461 | <el-col :span="5"> |
| 426 | - <el-form-item label="运抵重量" prop="turnweight"> | 462 | + <el-form-item label="" prop="turnweight"> |
| 427 | <div v-if="dialogStatus === 'update'"> | 463 | <div v-if="dialogStatus === 'update'"> |
| 428 | - <el-input v-model="IruleForm.turnweight"></el-input> | 464 | + <el-input v-model="IruleForm.turnweight" style="width: 200px"> |
| 465 | + <template slot="prepend">运抵重量</template> | ||
| 466 | + </el-input> | ||
| 429 | </div> | 467 | </div> |
| 430 | <div v-else> | 468 | <div v-else> |
| 431 | - <el-input disabled="" v-model="IruleForm.turnweight"></el-input> | 469 | + <el-input disabled="" v-model="IruleForm.turnweight" style="width: 200px"> |
| 470 | + <template slot="prepend">运抵重量</template> | ||
| 471 | + </el-input> | ||
| 432 | </div> | 472 | </div> |
| 433 | </el-form-item> | 473 | </el-form-item> |
| 434 | </el-col> | 474 | </el-col> |
| 435 | - <el-col :span="5"> | ||
| 436 | - <el-form-item label="到达地" prop="turnunloading"> | 475 | + <el-col :span="7"> |
| 476 | + <el-form-item label="" prop="turnunloading"> | ||
| 437 | <div v-if="dialogStatus === 'update'"> | 477 | <div v-if="dialogStatus === 'update'"> |
| 438 | - <el-input v-model="IruleForm.turnunloading"></el-input> | 478 | + <el-input v-model="IruleForm.turnunloading" style="width: 200px"> |
| 479 | + <template slot="prepend">到达地</template> | ||
| 480 | + </el-input> | ||
| 439 | </div> | 481 | </div> |
| 440 | <div v-else> | 482 | <div v-else> |
| 441 | - <el-input disabled="" v-model="IruleForm.turnunloading"></el-input> | 483 | + <el-input disabled="" v-model="IruleForm.turnunloading" style="width: 200px"> |
| 484 | + <template slot="prepend">到达地</template> | ||
| 485 | + </el-input> | ||
| 442 | </div> | 486 | </div> |
| 443 | </el-form-item> | 487 | </el-form-item> |
| 444 | </el-col> | 488 | </el-col> |
| 445 | <el-col :span="5"> | 489 | <el-col :span="5"> |
| 446 | - <el-form-item label="拖车号" prop="pno"> | 490 | + <el-form-item label="" prop="pno"> |
| 447 | <div v-if="dialogStatus === 'update'"> | 491 | <div v-if="dialogStatus === 'update'"> |
| 448 | - <el-input v-model="IruleForm.pno"></el-input> | 492 | + <el-input v-model="IruleForm.pno" style="width: 200px"> |
| 493 | + <template slot="prepend">拖车号</template> | ||
| 494 | + </el-input> | ||
| 449 | </div> | 495 | </div> |
| 450 | <div v-else> | 496 | <div v-else> |
| 451 | - <el-input disabled="" v-model="IruleForm.pno"></el-input> | 497 | + <el-input disabled="" v-model="IruleForm.pno" style="width: 200px"> |
| 498 | + <template slot="prepend">拖车号</template> | ||
| 499 | + </el-input> | ||
| 452 | </div> | 500 | </div> |
| 453 | </el-form-item> | 501 | </el-form-item> |
| 454 | </el-col> | 502 | </el-col> |
| 503 | + | ||
| 504 | + </el-row> | ||
| 505 | + <el-row> | ||
| 455 | <el-col :span="5"> | 506 | <el-col :span="5"> |
| 456 | - <el-form-item label="卸货地" prop="ext2"> | 507 | + <el-form-item label="" prop="ext2"> |
| 457 | <div v-if="dialogStatus === 'update'"> | 508 | <div v-if="dialogStatus === 'update'"> |
| 458 | - <el-input v-model="IruleForm.ext2"></el-input> | 509 | + <el-input v-model="IruleForm.ext2" style="width: 200px"> |
| 510 | + <template slot="prepend">卸货地</template> | ||
| 511 | + </el-input> | ||
| 459 | </div> | 512 | </div> |
| 460 | <div v-else> | 513 | <div v-else> |
| 461 | - <el-input disabled="" v-model="IruleForm.ext2"></el-input> | 514 | + <el-input disabled="" v-model="IruleForm.ext2" style="width: 200px"> |
| 515 | + <template slot="prepend">卸货地</template> | ||
| 516 | + </el-input> | ||
| 462 | </div> | 517 | </div> |
| 463 | </el-form-item> | 518 | </el-form-item> |
| 464 | </el-col> | 519 | </el-col> |
| 465 | <el-col :span="5"> | 520 | <el-col :span="5"> |
| 466 | - <el-form-item label="车辆所属" prop="ext1"> | 521 | + <el-form-item label="" prop="ext1"> |
| 467 | <div v-if="dialogStatus === 'update'"> | 522 | <div v-if="dialogStatus === 'update'"> |
| 468 | - <el-input v-model="IruleForm.ext1"></el-input> | 523 | + <el-input v-model="IruleForm.ext1" style="width: 200px"> |
| 524 | + <template slot="prepend">车辆所属</template> | ||
| 525 | + </el-input> | ||
| 469 | </div> | 526 | </div> |
| 470 | <div v-else> | 527 | <div v-else> |
| 471 | - <el-input disabled="" v-model="IruleForm.ext1"></el-input> | 528 | + <el-input disabled="" v-model="IruleForm.ext1" style="width: 200px"> |
| 529 | + <template slot="prepend">车辆所属</template> | ||
| 530 | + </el-input> | ||
| 472 | </div> | 531 | </div> |
| 473 | </el-form-item> | 532 | </el-form-item> |
| 474 | </el-col> | 533 | </el-col> |
| @@ -493,17 +552,44 @@ | @@ -493,17 +552,44 @@ | ||
| 493 | <el-row> | 552 | <el-row> |
| 494 | <el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible"> | 553 | <el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible"> |
| 495 | <el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm"> | 554 | <el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm"> |
| 496 | - <el-form-item label="操作原因" prop="operreason"> | ||
| 497 | - <el-input type="textarea" v-model="Udform.operreason"></el-input> | ||
| 498 | - </el-form-item> | ||
| 499 | - <el-form-item label="操作人" prop="operperson"> | ||
| 500 | - <el-input v-model="Udform.operperson"></el-input> | ||
| 501 | - </el-form-item> | ||
| 502 | - <el-form-item label="联系电话" prop="opertel"> | ||
| 503 | - <el-input v-model="Udform.opertel"></el-input> | ||
| 504 | - </el-form-item> | 555 | +<!-- <el-form-item label="操作原因" prop="operreason">--> |
| 556 | +<!-- <el-input type="textarea" v-model="Udform.operreason"></el-input>--> | ||
| 557 | +<!-- </el-form-item>--> | ||
| 558 | +<!-- <el-form-item label="操作人" prop="operperson">--> | ||
| 559 | +<!-- <el-input v-model="Udform.operperson"></el-input>--> | ||
| 560 | +<!-- </el-form-item>--> | ||
| 561 | +<!-- <el-form-item label="联系电话" prop="opertel">--> | ||
| 562 | +<!-- <el-input v-model="Udform.opertel"></el-input>--> | ||
| 563 | +<!-- </el-form-item>--> | ||
| 564 | + <el-row style="margin: 10px auto"> | ||
| 565 | + <el-col :span="22"> | ||
| 566 | + <el-form-item label="" prop="operreason"> | ||
| 567 | + <div class="ipt"> | ||
| 568 | + 操作原因 | ||
| 569 | + </div> | ||
| 570 | + <el-input autosize type="textarea" v-model="Udform.operreason" style="width: 80%"> | ||
| 571 | + </el-input> | ||
| 572 | + </el-form-item> | ||
| 573 | + </el-col> | ||
| 574 | + </el-row> | ||
| 575 | + <el-row> | ||
| 576 | + <el-col :span="11" style="margin-right: 10px"> | ||
| 577 | + <el-form-item label="" prop="operperson"> | ||
| 578 | + <el-input v-model="Udform.operperson" style="width: 200px"> | ||
| 579 | + <template slot="prepend">操作人</template> | ||
| 580 | + </el-input> | ||
| 581 | + </el-form-item> | ||
| 582 | + </el-col> | ||
| 583 | + <el-col :span="10"> | ||
| 584 | + <el-form-item label="" prop="opertel"> | ||
| 585 | + <el-input v-model="Udform.opertel" style="width: 250px"> | ||
| 586 | + <template slot="prepend">联系电话</template> | ||
| 587 | + </el-input> | ||
| 588 | + </el-form-item> | ||
| 589 | + </el-col> | ||
| 590 | + </el-row> | ||
| 505 | </el-form> | 591 | </el-form> |
| 506 | - <div slot="footer" class="dialog-footer"> | 592 | + <div slot="footer" class="dialog-footer" style="margin-top: 30px" align="center"> |
| 507 | <el-button @click="dialogFormVisible = false">取 消</el-button> | 593 | <el-button @click="dialogFormVisible = false">取 消</el-button> |
| 508 | <el-button type="primary" @click="deleteIdForm('Udform')">确 定</el-button> | 594 | <el-button type="primary" @click="deleteIdForm('Udform')">确 定</el-button> |
| 509 | </div> | 595 | </div> |
| @@ -512,7 +598,8 @@ | @@ -512,7 +598,8 @@ | ||
| 512 | <!--明细列表弹出框--> | 598 | <!--明细列表弹出框--> |
| 513 | <el-row> | 599 | <el-row> |
| 514 | <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%"> | 600 | <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%"> |
| 515 | - <el-table :data="gridData"> | 601 | + <el-table :data="gridData" style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px" |
| 602 | + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" > | ||
| 516 | <el-table-column property="busdate" label="时间" width="160"></el-table-column> | 603 | <el-table-column property="busdate" label="时间" width="160"></el-table-column> |
| 517 | <el-table-column property="username" label="操作人" width="130"></el-table-column> | 604 | <el-table-column property="username" label="操作人" width="130"></el-table-column> |
| 518 | <el-table-column property="buspiece" label="发送件数" width="130"></el-table-column> | 605 | <el-table-column property="buspiece" label="发送件数" width="130"></el-table-column> |
| @@ -525,6 +612,38 @@ | @@ -525,6 +612,38 @@ | ||
| 525 | </el-container> | 612 | </el-container> |
| 526 | </template> | 613 | </template> |
| 527 | <style scoped> | 614 | <style scoped> |
| 615 | + .ip{ | ||
| 616 | + max-width: 100px; | ||
| 617 | + margin-right: -6px; | ||
| 618 | + display: inline-block; | ||
| 619 | + background-color: #6F8294; | ||
| 620 | + color: #ffffff; | ||
| 621 | + border: 1px solid #DCDFE6; | ||
| 622 | + vertical-align: middle; | ||
| 623 | + padding: 5px 18px; | ||
| 624 | + white-space: nowrap; | ||
| 625 | + border-top-right-radius: 0px; | ||
| 626 | + border-top-left-radius: 4px; | ||
| 627 | + border-bottom-left-radius: 4px; | ||
| 628 | + border-bottom-right-radius: 0px; | ||
| 629 | + font-size: 10px; | ||
| 630 | + } | ||
| 631 | + .ipt{ | ||
| 632 | + max-width: 100px; | ||
| 633 | + margin-right: -4px; | ||
| 634 | + display: inline-block; | ||
| 635 | + background-color: #6F8294; | ||
| 636 | + color: #ffffff; | ||
| 637 | + border: 1px solid #DCDFE6; | ||
| 638 | + vertical-align: middle; | ||
| 639 | + padding: 0 18px; | ||
| 640 | + white-space: nowrap; | ||
| 641 | + border-top-right-radius: 0px; | ||
| 642 | + border-top-left-radius: 4px; | ||
| 643 | + border-bottom-left-radius: 4px; | ||
| 644 | + border-bottom-right-radius: 0px; | ||
| 645 | + font-size: 10px; | ||
| 646 | + } | ||
| 528 | .co{height: 36px;line-height: 36px;} | 647 | .co{height: 36px;line-height: 36px;} |
| 529 | .co{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px} | 648 | .co{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px} |
| 530 | .row-bg{background-color: white;padding:0px;} | 649 | .row-bg{background-color: white;padding:0px;} |
| @@ -543,6 +662,7 @@ | @@ -543,6 +662,7 @@ | ||
| 543 | import {mapActions, mapGetters} from 'vuex' | 662 | import {mapActions, mapGetters} from 'vuex' |
| 544 | import {loginedUserInfo} from "../../api/user"; | 663 | import {loginedUserInfo} from "../../api/user"; |
| 545 | export default{ | 664 | export default{ |
| 665 | + name:'Allocatesearch', | ||
| 546 | data(){ | 666 | data(){ |
| 547 | return{ | 667 | return{ |
| 548 | defaultQuery:{ | 668 | defaultQuery:{ |
| @@ -802,7 +922,7 @@ | @@ -802,7 +922,7 @@ | ||
| 802 | const map = {'mt6202':row,'username':loginedUserInfo().username} | 922 | const map = {'mt6202':row,'username':loginedUserInfo().username} |
| 803 | sendCreateMt6202(map).then(res=>{ | 923 | sendCreateMt6202(map).then(res=>{ |
| 804 | let response=res.data; | 924 | let response=res.data; |
| 805 | - //console.log(res); | 925 | + console.log(res); |
| 806 | this.code=response.code; | 926 | this.code=response.code; |
| 807 | if(this.code=='200'){ | 927 | if(this.code=='200'){ |
| 808 | row.status='23' | 928 | row.status='23' |
| @@ -4,56 +4,96 @@ | @@ -4,56 +4,96 @@ | ||
| 4 | <el-row class="row-bg"> | 4 | <el-row class="row-bg"> |
| 5 | <el-col :span="24"><div class="grid-content content co">分拨运抵管理</div></el-col> | 5 | <el-col :span="24"><div class="grid-content content co">分拨运抵管理</div></el-col> |
| 6 | </el-row> | 6 | </el-row> |
| 7 | - <el-row> | ||
| 8 | - <el-col :span="12"> | ||
| 9 | - <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm":label-position="labelPosition"> | ||
| 10 | - <el-form-item label="运单号" prop="awba"> | ||
| 11 | - <el-input v-model="ruleForm.awba"></el-input> | ||
| 12 | - </el-form-item> | ||
| 13 | - <el-form-item label="承运人" prop="carrier"> | ||
| 14 | - <el-input v-model="ruleForm.carrier"></el-input> | ||
| 15 | - </el-form-item> | ||
| 16 | - <el-form-item label="航班号" prop="flightno"> | ||
| 17 | - <el-input v-model="ruleForm.flightno"></el-input> | ||
| 18 | - </el-form-item> | ||
| 19 | - <el-form-item label="航班日期" required> | ||
| 20 | - <el-col :span="24"> | ||
| 21 | - <el-form-item prop="flightdate"> | ||
| 22 | - <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.flightdate" style="width: 100%;"></el-date-picker> | 7 | + <el-row class="row-bg"> |
| 8 | + <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="10px" class="demo-ruleForm":label-position="labelPosition"> | ||
| 9 | + <el-row> | ||
| 10 | + <el-col :span="6"> | ||
| 11 | + <el-form-item label="" prop="awba"> | ||
| 12 | + <el-input v-model="ruleForm.awba" style="width: 200px"> | ||
| 13 | + <template slot="prepend">运 单 号</template> | ||
| 14 | + </el-input> | ||
| 15 | + </el-form-item> | ||
| 16 | + </el-col> | ||
| 17 | + </el-row> | ||
| 18 | + <el-row> | ||
| 19 | + <el-col :span="5"> | ||
| 20 | + <el-form-item label="" prop="carrier"> | ||
| 21 | + <el-input v-model="ruleForm.carrier" style="width: 160px" onkeyup="this.value=this.value.toUpperCase()"> | ||
| 22 | + <template slot="prepend">承 运 人</template> | ||
| 23 | + </el-input> | ||
| 24 | + </el-form-item> | ||
| 25 | + </el-col> | ||
| 26 | + <el-col :span="5"> | ||
| 27 | + <el-form-item label="" prop="flightno"> | ||
| 28 | + <el-input v-model="ruleForm.flightno" style="width: 160px"> | ||
| 29 | + <template slot="prepend">航 班 号</template> | ||
| 30 | + </el-input> | ||
| 23 | </el-form-item> | 31 | </el-form-item> |
| 24 | </el-col> | 32 | </el-col> |
| 25 | - </el-form-item> | ||
| 26 | - <el-form-item label="运抵件数" prop="turnpiece"> | ||
| 27 | - <el-input v-model="ruleForm.turnpiece"></el-input> | ||
| 28 | - </el-form-item> | ||
| 29 | - <el-form-item label="运抵重量" prop="turnweight"> | ||
| 30 | - <el-input v-model="ruleForm.turnweight"></el-input> | ||
| 31 | - </el-form-item> | ||
| 32 | - <el-form-item label="海关关区" prop="customcode"> | ||
| 33 | - <el-col :span="24"> | ||
| 34 | - <el-select v-model="ruleForm.customcode" placeholder="请选择海关关区" style="width:100%"> | ||
| 35 | - <el-option v-for="item in options2" :key="item.value" :label="item.label" | ||
| 36 | - :value="item.value" ></el-option> | ||
| 37 | - </el-select> | 33 | + <el-col :span="7"> |
| 34 | + <el-form-item label="" required> | ||
| 35 | + <el-form-item prop="flightdate"> | ||
| 36 | + <div class="ip"> | ||
| 37 | + 航班日期 | ||
| 38 | + </div> | ||
| 39 | + <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.flightdate" style="width: 125px;"></el-date-picker> | ||
| 40 | + </el-form-item> | ||
| 41 | + </el-form-item> | ||
| 38 | </el-col> | 42 | </el-col> |
| 39 | - </el-form-item> | ||
| 40 | - <el-form-item label="运抵到达" prop="turnunloading"> | ||
| 41 | - <el-col :span="24"> | ||
| 42 | - <el-select v-model="ruleForm.turnunloading" placeholder="请选择运抵到达地" style="width:100%"> | ||
| 43 | - <el-option v-for="item in options" :key="item.value" :label="item.label" | ||
| 44 | - :value="item.value" ></el-option> | ||
| 45 | - </el-select> | 43 | + <el-col :span="7"> |
| 44 | + <el-form-item label="" prop="customcode"> | ||
| 45 | + <div class="ip"> | ||
| 46 | + 海关关区 | ||
| 47 | + </div> | ||
| 48 | + <el-select v-model="ruleForm.customcode" placeholder="请选择海关关区" style="width:125px"> | ||
| 49 | + <el-option v-for="item in options2" :key="item.value" :label="item.label" | ||
| 50 | + :value="item.value" ></el-option> | ||
| 51 | + </el-select> | ||
| 52 | + </el-form-item> | ||
| 53 | + </el-col> | ||
| 54 | + </el-row> | ||
| 55 | + <el-row> | ||
| 56 | + <el-col :span="5" style="margin-top: -20px"> | ||
| 57 | + <el-form-item label="" prop="turnpiece"> | ||
| 58 | + <el-input v-model="ruleForm.turnpiece" style="width: 160px"> | ||
| 59 | + <template slot="prepend">运抵件数</template> | ||
| 60 | + </el-input> | ||
| 61 | + </el-form-item> | ||
| 46 | </el-col> | 62 | </el-col> |
| 47 | - </el-form-item> | ||
| 48 | - <el-form-item label="货物描述" prop="goodsname"> | ||
| 49 | - <el-input v-model="ruleForm.goodsname"></el-input> | ||
| 50 | - </el-form-item> | 63 | + <el-col :span="5" style="margin-top: -20px"> |
| 64 | + <el-form-item label="" prop="turnweight"> | ||
| 65 | + <el-input v-model="ruleForm.turnweight" style="width: 160px"> | ||
| 66 | + <template slot="prepend">运抵重量</template> | ||
| 67 | + </el-input> | ||
| 68 | + </el-form-item> | ||
| 69 | + </el-col> | ||
| 70 | + | ||
| 71 | + <el-col :span="7" style="margin-top: -20px"> | ||
| 72 | + <el-form-item label="" prop="turnunloading"> | ||
| 73 | + <div class="ip"> | ||
| 74 | + 运抵到达 | ||
| 75 | + </div> | ||
| 76 | + <el-select v-model="ruleForm.turnunloading" placeholder="请选择运抵到达地" style="width:125px"> | ||
| 77 | + <el-option v-for="item in options" :key="item.value" :label="item.label" | ||
| 78 | + :value="item.value" ></el-option> | ||
| 79 | + </el-select> | ||
| 80 | + </el-form-item> | ||
| 81 | + </el-col> | ||
| 82 | + <el-col :span="7" style="margin-top: -20px"> | ||
| 83 | + <el-form-item label="" prop="goodsname"> | ||
| 84 | + <el-input v-model="ruleForm.goodsname" style="width: 200px"> | ||
| 85 | + <template slot="prepend">货物描述</template> | ||
| 86 | + </el-input> | ||
| 87 | + </el-form-item> | ||
| 88 | + </el-col> | ||
| 89 | + </el-row> | ||
| 90 | + <el-row> | ||
| 91 | + <el-col :span="4" :offset="10" style="margin-bottom: 10px"> | ||
| 92 | + <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button> | ||
| 93 | + <el-button @click="back">返回</el-button> | ||
| 94 | + </el-col> | ||
| 95 | + </el-row> | ||
| 51 | </el-form> | 96 | </el-form> |
| 52 | - </el-col> | ||
| 53 | - <el-col :span="12"> | ||
| 54 | - <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button> | ||
| 55 | - <el-button type="primary" @click="back">返回</el-button> | ||
| 56 | - </el-col> | ||
| 57 | </el-row> | 97 | </el-row> |
| 58 | <!--对话提示框--> | 98 | <!--对话提示框--> |
| 59 | <el-row> | 99 | <el-row> |
| @@ -73,6 +113,22 @@ | @@ -73,6 +113,22 @@ | ||
| 73 | </el-container> | 113 | </el-container> |
| 74 | </template> | 114 | </template> |
| 75 | <style scoped> | 115 | <style scoped> |
| 116 | + .ip{ | ||
| 117 | + max-width: 100px; | ||
| 118 | + margin-right: -5px; | ||
| 119 | + display: inline-block; | ||
| 120 | + background-color: #6F8294; | ||
| 121 | + color: #ffffff; | ||
| 122 | + border: 1px solid #DCDFE6; | ||
| 123 | + vertical-align: middle; | ||
| 124 | + padding: 0 18px; | ||
| 125 | + white-space: nowrap; | ||
| 126 | + border-top-right-radius: 0px; | ||
| 127 | + border-top-left-radius: 4px; | ||
| 128 | + border-bottom-left-radius: 4px; | ||
| 129 | + border-bottom-right-radius: 0px; | ||
| 130 | + font-size: 10px; | ||
| 131 | + } | ||
| 76 | .co{height: 36px;line-height: 36px;} | 132 | .co{height: 36px;line-height: 36px;} |
| 77 | .co{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px} | 133 | .co{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px} |
| 78 | .row-bg{background-color: white;padding:0px;} | 134 | .row-bg{background-color: white;padding:0px;} |
| @@ -173,6 +229,10 @@ | @@ -173,6 +229,10 @@ | ||
| 173 | } | 229 | } |
| 174 | }); | 230 | }); |
| 175 | }, | 231 | }, |
| 232 | + // 过滤中英文 | ||
| 233 | + inputMe(e){ | ||
| 234 | + return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase(); | ||
| 235 | + }, | ||
| 176 | getDefaultData(){ | 236 | getDefaultData(){ |
| 177 | this.ruleForm=this.$route.params; | 237 | this.ruleForm=this.$route.params; |
| 178 | }, | 238 | }, |
| @@ -65,7 +65,7 @@ | @@ -65,7 +65,7 @@ | ||
| 65 | </el-form-item> | 65 | </el-form-item> |
| 66 | </el-col> | 66 | </el-col> |
| 67 | </el-row> | 67 | </el-row> |
| 68 | - <el-row class="row-bg"> | 68 | + <el-row> |
| 69 | <el-col :span="4" :offset="10"> | 69 | <el-col :span="4" :offset="10"> |
| 70 | <div class="grid-content"> | 70 | <div class="grid-content"> |
| 71 | <el-button type="primary" @click="submitForm('ruleForm')">下一步</el-button> | 71 | <el-button type="primary" @click="submitForm('ruleForm')">下一步</el-button> |
| @@ -87,6 +87,7 @@ | @@ -87,6 +87,7 @@ | ||
| 87 | 87 | ||
| 88 | <script> | 88 | <script> |
| 89 | import { selectAirport } from '../../api/mt1201' | 89 | import { selectAirport } from '../../api/mt1201' |
| 90 | + import jsutil from "@/common/js/util"; | ||
| 90 | export default { | 91 | export default { |
| 91 | data() { | 92 | data() { |
| 92 | return { | 93 | return { |
| @@ -144,7 +145,12 @@ | @@ -144,7 +145,12 @@ | ||
| 144 | submitForm(formName) { | 145 | submitForm(formName) { |
| 145 | this.$refs[formName].validate((valid) => { | 146 | this.$refs[formName].validate((valid) => { |
| 146 | if (valid) { | 147 | if (valid) { |
| 147 | - this.$router.push({path:'/origmaster',query:{flightno:JSON.stringify(this.ruleForm.flightno),flightdate:JSON.stringify(this.dateConversion(this.ruleForm.flightdate)),originstation:JSON.stringify(this.ruleForm.originstation),destinationstation:JSON.stringify(this.ruleForm.destinationstation),awba:JSON.stringify("")}}); | 148 | + this.$router.push({path:'/origmaster',query: |
| 149 | + {flightno:JSON.stringify(this.ruleForm.flightno), | ||
| 150 | + flightdate:JSON.stringify(this.dateConversion(this.ruleForm.flightdate)), | ||
| 151 | + originstation:JSON.stringify(this.ruleForm.originstation), | ||
| 152 | + destinationstation:JSON.stringify(this.ruleForm.destinationstation), | ||
| 153 | + awba:JSON.stringify("")}}); | ||
| 148 | } else { | 154 | } else { |
| 149 | console.log('error submit!!'); | 155 | console.log('error submit!!'); |
| 150 | return false; | 156 | return false; |
| @@ -159,12 +165,17 @@ | @@ -159,12 +165,17 @@ | ||
| 159 | }, | 165 | }, |
| 160 | /*加载默认参数*/ | 166 | /*加载默认参数*/ |
| 161 | getDefaultData(){ | 167 | getDefaultData(){ |
| 162 | - if(this.$route.query!=null){ | ||
| 163 | - console.log(this.$route.query) | ||
| 164 | - this.ruleForm.flightno=JSON.parse(this.$route.query.flightno); | ||
| 165 | - this.ruleForm.flightdate=JSON.parse(this.$route.query.flightdate); | ||
| 166 | - this.ruleForm.originstation=JSON.parse(this.$route.query.originstation); | ||
| 167 | - this.ruleForm.destinationstation=JSON.parse(this.$route.query.destinationstation); | 168 | + if( |
| 169 | + jsutil.checkNull(this.$route.query) | ||
| 170 | + && jsutil.checkNull(this.$route.query.flightno) | ||
| 171 | + && jsutil.checkNull(this.$route.query.flightdate) | ||
| 172 | + && jsutil.checkNull(this.$route.query.originstation) | ||
| 173 | + && jsutil.checkNull(this.$route.query.destinationstation) | ||
| 174 | + ){ | ||
| 175 | + this.ruleForm.flightno=(this.$route.query.flightno); | ||
| 176 | + this.ruleForm.flightdate=(this.$route.query.flightdate); | ||
| 177 | + this.ruleForm.originstation=(this.$route.query.originstation); | ||
| 178 | + this.ruleForm.destinationstation=(this.$route.query.destinationstation); | ||
| 168 | } | 179 | } |
| 169 | } | 180 | } |
| 170 | }, | 181 | }, |
| @@ -72,7 +72,7 @@ | @@ -72,7 +72,7 @@ | ||
| 72 | </el-form-item> | 72 | </el-form-item> |
| 73 | </el-col> | 73 | </el-col> |
| 74 | </el-row> | 74 | </el-row> |
| 75 | - <el-row class="row-bg"> | 75 | + <el-row> |
| 76 | <el-col :span="4" :offset="10"> | 76 | <el-col :span="4" :offset="10"> |
| 77 | <div class="grid-content"> | 77 | <div class="grid-content"> |
| 78 | <el-button type="primary" @click="submitForm('ruleForm')">下一步</el-button> | 78 | <el-button type="primary" @click="submitForm('ruleForm')">下一步</el-button> |
| @@ -94,6 +94,8 @@ | @@ -94,6 +94,8 @@ | ||
| 94 | 94 | ||
| 95 | <script> | 95 | <script> |
| 96 | import { selectAirport } from '../../api/mt1201' | 96 | import { selectAirport } from '../../api/mt1201' |
| 97 | + import jsutil from "@/common/js/util"; | ||
| 98 | + | ||
| 97 | export default { | 99 | export default { |
| 98 | data() { | 100 | data() { |
| 99 | return { | 101 | return { |
| @@ -174,7 +176,12 @@ | @@ -174,7 +176,12 @@ | ||
| 174 | submitForm(formName) { | 176 | submitForm(formName) { |
| 175 | this.$refs[formName].validate((valid) => { | 177 | this.$refs[formName].validate((valid) => { |
| 176 | if (valid) { | 178 | if (valid) { |
| 177 | - this.$router.push({path:'/tallymaster',query:{flightno:JSON.stringify(this.ruleForm.flightno),flightdate:JSON.stringify(this.dateConversion(this.ruleForm.flightdate)),originstation:JSON.stringify(this.ruleForm.originstation),destinationstation:JSON.stringify(this.ruleForm.destinationstation),awba:JSON.stringify("")}}) | 179 | + this.$router.push({path:'/tallymaster',query: |
| 180 | + {flightno:JSON.stringify(this.ruleForm.flightno), | ||
| 181 | + flightdate:JSON.stringify(this.dateConversion(this.ruleForm.flightdate)), | ||
| 182 | + originstation:JSON.stringify(this.ruleForm.originstation), | ||
| 183 | + destinationstation:JSON.stringify(this.ruleForm.destinationstation), | ||
| 184 | + awba:JSON.stringify("")}}); | ||
| 178 | } else { | 185 | } else { |
| 179 | //console.log('error submit!!'); | 186 | //console.log('error submit!!'); |
| 180 | return false; | 187 | return false; |
| @@ -189,11 +196,18 @@ | @@ -189,11 +196,18 @@ | ||
| 189 | }, | 196 | }, |
| 190 | /*获取默认值方法*/ | 197 | /*获取默认值方法*/ |
| 191 | getDefaultData(){ | 198 | getDefaultData(){ |
| 192 | - if(this.$route.query!=null){ | ||
| 193 | - this.ruleForm.flightno=JSON.parse(this.$route.query.flightno); | ||
| 194 | - this.ruleForm.flightdate=JSON.parse(this.$route.query.flightdate); | ||
| 195 | - this.ruleForm.originstation=JSON.parse(this.$route.query.originstation); | ||
| 196 | - this.ruleForm.destinationstation=JSON.parse(this.$route.query.destinationstation); | 199 | + if( |
| 200 | + jsutil.checkNull(this.$route.query) | ||
| 201 | + && jsutil.checkNull(this.$route.query.flightno) | ||
| 202 | + && jsutil.checkNull(this.$route.query.flightdate) | ||
| 203 | + && jsutil.checkNull(this.$route.query.originstation) | ||
| 204 | + && jsutil.checkNull(this.$route.query.destinationstation) | ||
| 205 | + ) | ||
| 206 | + { | ||
| 207 | + this.ruleForm.flightno=(this.$route.query.flightno); | ||
| 208 | + this.ruleForm.flightdate=(this.$route.query.flightdate); | ||
| 209 | + this.ruleForm.originstation=(this.$route.query.originstation); | ||
| 210 | + this.ruleForm.destinationstation=(this.$route.query.destinationstation); | ||
| 197 | } | 211 | } |
| 198 | } | 212 | } |
| 199 | }, | 213 | }, |
| 1 | <template> | 1 | <template> |
| 2 | <el-container> | 2 | <el-container> |
| 3 | <el-main> | 3 | <el-main> |
| 4 | + | ||
| 4 | <el-row class="row-bg"> | 5 | <el-row class="row-bg"> |
| 5 | - <el-col :span="24"><div class="grid-content content co">分拨运单管理</div></el-col> | ||
| 6 | - </el-row> | ||
| 7 | - <el-row> | ||
| 8 | - <el-col :span="12"> | ||
| 9 | - <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm":label-position="labelPosition"> | ||
| 10 | - <el-form-item label="运单号" prop="awba"> | ||
| 11 | - <el-input v-model="ruleForm.awba"></el-input> | ||
| 12 | - </el-form-item> | ||
| 13 | - <el-form-item label="承运人" prop="carrier"> | ||
| 14 | - <el-input v-model="ruleForm.carrier"></el-input> | ||
| 15 | - </el-form-item> | ||
| 16 | - <el-form-item label="航班号" prop="flightno"> | ||
| 17 | - <el-input v-model="ruleForm.flightno"></el-input> | ||
| 18 | - </el-form-item> | ||
| 19 | - <el-form-item label="拖车号" prop="pno"> | ||
| 20 | - <el-input v-model="ruleForm.pno"></el-input> | ||
| 21 | - </el-form-item> | ||
| 22 | - <el-form-item label="航班日期" required> | ||
| 23 | - <el-col :span="24"> | ||
| 24 | - <el-form-item prop="flightdate"> | ||
| 25 | - <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.flightdate" style="width: 100%;"></el-date-picker> | 6 | + <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="30px" class="demo-ruleForm":label-position="labelPosition"> |
| 7 | + <el-row class="row-bg"> | ||
| 8 | + <el-col :span="24"><div class="grid-content content co">分拨运抵管理</div></el-col> | ||
| 9 | + </el-row> | ||
| 10 | + <el-row> | ||
| 11 | + <el-col :span="18"> | ||
| 12 | + <el-form-item label="" prop="awba"> | ||
| 13 | + <el-input v-model="ruleForm.awba" style="width: 200px"> | ||
| 14 | + <template slot="prepend">运 单 号</template> | ||
| 15 | + </el-input> | ||
| 26 | </el-form-item> | 16 | </el-form-item> |
| 27 | </el-col> | 17 | </el-col> |
| 28 | - </el-form-item> | ||
| 29 | - <el-form-item label="分拨件数" prop="turnpiece"> | ||
| 30 | - <el-input v-model="ruleForm.turnpiece"></el-input> | ||
| 31 | - </el-form-item> | ||
| 32 | - <el-form-item label="分拨重量" prop="turnweight"> | ||
| 33 | - <el-input v-model="ruleForm.turnweight"></el-input> | ||
| 34 | - </el-form-item> | ||
| 35 | - <el-form-item label="海关关区" prop="customcode"> | ||
| 36 | - <el-col :span="24"> | ||
| 37 | - <el-select v-model="ruleForm.customcode" placeholder="请选择海关关区" style="width:100%"> | ||
| 38 | - <el-option v-for="item in options2" :key="item.value" :label="item.label" | ||
| 39 | - :value="item.value" ></el-option> | ||
| 40 | - </el-select> | ||
| 41 | - </el-col> | ||
| 42 | - </el-form-item> | ||
| 43 | - <el-form-item label="分拨到达" prop="turnunloading"> | ||
| 44 | - <el-col :span="24"> | ||
| 45 | - <el-select v-model="ruleForm.turnunloading" placeholder="请选择分拨到达地" style="width:100%"> | ||
| 46 | - <el-option v-for="item in options" :key="item.value" :label="item.label" | ||
| 47 | - :value="item.value" ></el-option> | ||
| 48 | - </el-select> | ||
| 49 | - </el-col> | ||
| 50 | - </el-form-item> | ||
| 51 | - <el-form-item label="卸货地" prop="ext2"> | ||
| 52 | - <el-input v-model="ruleForm.ext2"></el-input> | ||
| 53 | - </el-form-item> | ||
| 54 | - <el-form-item label="车辆所发属" prop="ext1"> | ||
| 55 | - <el-input v-model="ruleForm.ext1"></el-input> | ||
| 56 | - </el-form-item> | 18 | + </el-row> |
| 19 | + | ||
| 20 | + | ||
| 21 | +<!-- <el-form-item label="航班号" prop="flightno">--> | ||
| 22 | +<!-- <el-input v-model="ruleForm.flightno"></el-input>--> | ||
| 23 | +<!-- </el-form-item>--> | ||
| 24 | +<!-- <el-form-item label="拖车号" prop="pno">--> | ||
| 25 | +<!-- <el-input v-model="ruleForm.pno"></el-input>--> | ||
| 26 | +<!-- </el-form-item>--> | ||
| 27 | +<!-- <el-form-item label="航班日期" required>--> | ||
| 28 | +<!-- <el-col :span="24">--> | ||
| 29 | +<!-- <el-form-item prop="flightdate">--> | ||
| 30 | +<!-- <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.flightdate" style="width: 100%;"></el-date-picker>--> | ||
| 31 | +<!-- </el-form-item>--> | ||
| 32 | +<!-- </el-col>--> | ||
| 33 | +<!-- </el-form-item>--> | ||
| 34 | +<!-- <el-form-item label="分拨件数" prop="turnpiece">--> | ||
| 35 | +<!-- <el-input v-model="ruleForm.turnpiece"></el-input>--> | ||
| 36 | +<!-- </el-form-item>--> | ||
| 37 | +<!-- <el-form-item label="分拨重量" prop="turnweight">--> | ||
| 38 | +<!-- <el-input v-model="ruleForm.turnweight"></el-input>--> | ||
| 39 | +<!-- </el-form-item>--> | ||
| 40 | +<!-- <el-form-item label="海关关区" prop="customcode">--> | ||
| 41 | +<!-- <el-col :span="24">--> | ||
| 42 | +<!-- <el-select v-model="ruleForm.customcode" placeholder="请选择海关关区" style="width:100%">--> | ||
| 43 | +<!-- <el-option v-for="item in options2" :key="item.value" :label="item.label"--> | ||
| 44 | +<!-- :value="item.value" ></el-option>--> | ||
| 45 | +<!-- </el-select>--> | ||
| 46 | +<!-- </el-col>--> | ||
| 47 | +<!-- </el-form-item>--> | ||
| 48 | +<!-- <el-form-item label="分拨到达" prop="turnunloading">--> | ||
| 49 | +<!-- <el-col :span="24">--> | ||
| 50 | +<!-- <el-select v-model="ruleForm.turnunloading" placeholder="请选择分拨到达地" style="width:100%">--> | ||
| 51 | +<!-- <el-option v-for="item in options" :key="item.value" :label="item.label"--> | ||
| 52 | +<!-- :value="item.value" ></el-option>--> | ||
| 53 | +<!-- </el-select>--> | ||
| 54 | +<!-- </el-col>--> | ||
| 55 | +<!-- </el-form-item>--> | ||
| 56 | +<!-- <el-form-item label="卸货地" prop="ext2">--> | ||
| 57 | +<!-- <el-input v-model="ruleForm.ext2"></el-input>--> | ||
| 58 | +<!-- </el-form-item>--> | ||
| 59 | +<!-- <el-form-item label="车辆所发属" prop="ext1">--> | ||
| 60 | +<!-- <el-input v-model="ruleForm.ext1"></el-input>--> | ||
| 61 | +<!-- </el-form-item>--> | ||
| 62 | + <el-row class="row-bg"> | ||
| 63 | + <el-col :span="24"><div class="grid-content content co">货物信息</div></el-col> | ||
| 64 | + </el-row> | ||
| 65 | + <el-row class="row-bg"> | ||
| 66 | + <el-row> | ||
| 67 | + <el-col :span="5"> | ||
| 68 | + <el-form-item label="" prop="carrier"> | ||
| 69 | + <el-input v-model="ruleForm.carrier" style="width: 160px" onkeyup="this.value=this.value.toUpperCase()"> | ||
| 70 | + <template slot="prepend">承 运 人</template> | ||
| 71 | + </el-input> | ||
| 72 | + </el-form-item> | ||
| 73 | + </el-col> | ||
| 74 | + <el-col :span="5"> | ||
| 75 | + <el-form-item label="" prop="flightno"> | ||
| 76 | + <el-input v-model="ruleForm.flightno" style="width: 160px"> | ||
| 77 | + <template slot="prepend">航 班 号</template> | ||
| 78 | + </el-input> | ||
| 79 | + </el-form-item> | ||
| 80 | + </el-col> | ||
| 81 | + <el-col :span="7"> | ||
| 82 | + <el-form-item label="" prop="flightdate"> | ||
| 83 | + <div class="ip"> | ||
| 84 | + 航班日期 | ||
| 85 | + </div> | ||
| 86 | + <el-date-picker | ||
| 87 | + v-model="ruleForm.flightdate" | ||
| 88 | + value-format="yyyy-MM-dd" | ||
| 89 | + type="date" style="width: 125px" | ||
| 90 | + placeholder="航班日期"> | ||
| 91 | + </el-date-picker> | ||
| 92 | + </el-form-item> | ||
| 93 | + </el-col> | ||
| 94 | + <el-col :span="7"> | ||
| 95 | + <el-form-item label="" prop="customcode"> | ||
| 96 | + <div class="ip"> | ||
| 97 | + 海关关区 | ||
| 98 | + </div> | ||
| 99 | + <el-select v-model="ruleForm.customcode" placeholder="请选择海关关区" style="width:115px"> | ||
| 100 | + <el-option v-for="item in options2" :key="item.value" :label="item.label" | ||
| 101 | + :value="item.value" ></el-option> | ||
| 102 | + </el-select> | ||
| 103 | + </el-form-item> | ||
| 104 | + </el-col> | ||
| 105 | + </el-row> | ||
| 106 | + <el-row> | ||
| 107 | + <el-col :span="5"> | ||
| 108 | + <el-form-item label="" prop="turnpiece"> | ||
| 109 | + <el-input v-model="ruleForm.turnpiece" style="width: 160px"> | ||
| 110 | + <template slot="prepend">分拨件数</template> | ||
| 111 | + </el-input> | ||
| 112 | + </el-form-item> | ||
| 113 | + </el-col> | ||
| 114 | + <el-col :span="5"> | ||
| 115 | + <el-form-item label="" prop="turnweight"> | ||
| 116 | + <el-input v-model="ruleForm.turnweight" style="width: 160px"> | ||
| 117 | + <template slot="prepend">分拨重量</template> | ||
| 118 | + </el-input> | ||
| 119 | + </el-form-item> | ||
| 120 | + </el-col> | ||
| 121 | + <el-col :span="7"> | ||
| 122 | + <el-form-item label="" prop="turnunloading"> | ||
| 123 | + <div class="ip"> | ||
| 124 | + 分拨到达地 | ||
| 125 | + </div> | ||
| 126 | + <el-select v-model="ruleForm.turnunloading" placeholder="请选择分拨到达地" style="width:125px"> | ||
| 127 | + <el-option v-for="item in options" :key="item.value" :label="item.label" | ||
| 128 | + :value="item.value" ></el-option> | ||
| 129 | + </el-select> | ||
| 130 | + </el-form-item> | ||
| 131 | + </el-col> | ||
| 132 | + <el-col :span="7"> | ||
| 133 | + <el-form-item label="" prop="pno"> | ||
| 134 | + <el-input v-model="ruleForm.pno" style="width: 200px"> | ||
| 135 | + <template slot="prepend">拖 车 号</template> | ||
| 136 | + </el-input> | ||
| 137 | + </el-form-item> | ||
| 138 | + </el-col> | ||
| 139 | + </el-row> | ||
| 140 | + </el-row> | ||
| 57 | </el-form> | 141 | </el-form> |
| 58 | - </el-col> | ||
| 59 | - <el-col :span="12"> | 142 | + <el-col :span="8" :offset="10" style="margin-bottom: 20px;margin-top: 10px"> |
| 60 | <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button> | 143 | <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button> |
| 61 | - <el-button type="primary" @click="back">返回</el-button> | 144 | +<!-- <el-button type="primary" @click="submitForm('ruleForm')">保存并发送</el-button>--> |
| 145 | + <el-button @click="back">返回</el-button> | ||
| 62 | </el-col> | 146 | </el-col> |
| 63 | </el-row> | 147 | </el-row> |
| 64 | - <!--对话提示框--> | 148 | + <!--对话提示框--> |
| 65 | <el-row> | 149 | <el-row> |
| 66 | <el-dialog | 150 | <el-dialog |
| 67 | title="系统提示" | 151 | title="系统提示" |
| @@ -79,6 +163,22 @@ | @@ -79,6 +163,22 @@ | ||
| 79 | </el-container> | 163 | </el-container> |
| 80 | </template> | 164 | </template> |
| 81 | <style scoped> | 165 | <style scoped> |
| 166 | + .ip{ | ||
| 167 | + max-width: 100px; | ||
| 168 | + margin-right: -5px; | ||
| 169 | + display: inline-block; | ||
| 170 | + background-color: #6F8294; | ||
| 171 | + color: #ffffff; | ||
| 172 | + border: 1px solid #DCDFE6; | ||
| 173 | + vertical-align: middle; | ||
| 174 | + padding: 0 18px; | ||
| 175 | + white-space: nowrap; | ||
| 176 | + border-top-right-radius: 0px; | ||
| 177 | + border-top-left-radius: 4px; | ||
| 178 | + border-bottom-left-radius: 4px; | ||
| 179 | + border-bottom-right-radius: 0px; | ||
| 180 | + font-size: 10px; | ||
| 181 | + } | ||
| 82 | .co{height: 36px;line-height: 36px;} | 182 | .co{height: 36px;line-height: 36px;} |
| 83 | .co{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px} | 183 | .co{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px} |
| 84 | .row-bg{background-color: white;padding:0px;} | 184 | .row-bg{background-color: white;padding:0px;} |
| @@ -163,12 +263,13 @@ | @@ -163,12 +263,13 @@ | ||
| 163 | } | 263 | } |
| 164 | }, | 264 | }, |
| 165 | methods:{ | 265 | methods:{ |
| 266 | + //保存 | ||
| 166 | submitForm(formName) { | 267 | submitForm(formName) { |
| 167 | this.$refs[formName].validate((valid) => { | 268 | this.$refs[formName].validate((valid) => { |
| 168 | if (valid) { | 269 | if (valid) { |
| 169 | addAllocatImport(this.ruleForm).then(res=>{ | 270 | addAllocatImport(this.ruleForm).then(res=>{ |
| 170 | let response=res.data; | 271 | let response=res.data; |
| 171 | - //console.log(res); | 272 | + console.log(res); |
| 172 | this.code=response.code; | 273 | this.code=response.code; |
| 173 | if(this.code=='200'){ | 274 | if(this.code=='200'){ |
| 174 | this.centerDialogVisible=true; | 275 | this.centerDialogVisible=true; |
| @@ -184,6 +285,10 @@ | @@ -184,6 +285,10 @@ | ||
| 184 | } | 285 | } |
| 185 | }); | 286 | }); |
| 186 | }, | 287 | }, |
| 288 | +// 过滤中英文 | ||
| 289 | + inputMe(e){ | ||
| 290 | + return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase(); | ||
| 291 | + }, | ||
| 187 | getDefaultData(){ | 292 | getDefaultData(){ |
| 188 | this.ruleForm=this.$route.params; | 293 | this.ruleForm=this.$route.params; |
| 189 | }, | 294 | }, |
| @@ -115,6 +115,10 @@ | @@ -115,6 +115,10 @@ | ||
| 115 | departmentid:'' | 115 | departmentid:'' |
| 116 | } | 116 | } |
| 117 | }, | 117 | }, |
| 118 | + mounted() { | ||
| 119 | + this.getdatatime(); | ||
| 120 | + this.getFlightList(); | ||
| 121 | + }, | ||
| 118 | methods: { | 122 | methods: { |
| 119 | /*设置默认航班时间*/ | 123 | /*设置默认航班时间*/ |
| 120 | getdatatime(){ | 124 | getdatatime(){ |
| @@ -149,11 +153,23 @@ | @@ -149,11 +153,23 @@ | ||
| 149 | }, | 153 | }, |
| 150 | /*原始舱单跳转*/ | 154 | /*原始舱单跳转*/ |
| 151 | handleEdit(index, row) { | 155 | handleEdit(index, row) { |
| 152 | - this.$router.push({path:'/enter',query:{flightno:JSON.stringify(row.flightno),flightdate:JSON.stringify(row.flightdate),originstation:JSON.stringify(row.originstation),destinationstation:JSON.stringify(row.destinationstation)}}) | 156 | + // row.waybillType = 'MT1201' |
| 157 | + this.$router.push( | ||
| 158 | + { | ||
| 159 | + path:'/enter', | ||
| 160 | + query:row | ||
| 161 | + } | ||
| 162 | + ) | ||
| 153 | }, | 163 | }, |
| 154 | /*进港理货跳转*/ | 164 | /*进港理货跳转*/ |
| 155 | handleDelete(index, row) { | 165 | handleDelete(index, row) { |
| 156 | - this.$router.push({path:'entertall',query:{flightno:JSON.stringify(row.flightno),flightdate:JSON.stringify(row.flightdate),originstation:JSON.stringify(row.originstation),destinationstation:JSON.stringify(row.destinationstation)}}) | 166 | + // row.waybillType = 'MT5201' |
| 167 | + this.$router.push( | ||
| 168 | + { | ||
| 169 | + path:'entertall', | ||
| 170 | + query:row | ||
| 171 | + } | ||
| 172 | + ) | ||
| 157 | } | 173 | } |
| 158 | }, | 174 | }, |
| 159 | computed:{ | 175 | computed:{ |
| @@ -170,8 +186,7 @@ | @@ -170,8 +186,7 @@ | ||
| 170 | /*渲染方法*/ | 186 | /*渲染方法*/ |
| 171 | activated() { | 187 | activated() { |
| 172 | let that=this; | 188 | let that=this; |
| 173 | - that.getdatatime(); | ||
| 174 | - that.getFlightList(); | 189 | + |
| 175 | }, | 190 | }, |
| 176 | } | 191 | } |
| 177 | </script> | 192 | </script> |
| @@ -32,22 +32,21 @@ | @@ -32,22 +32,21 @@ | ||
| 32 | <div class="grid-content"> | 32 | <div class="grid-content"> |
| 33 | <el-col :span="9" class="pub"> | 33 | <el-col :span="9" class="pub"> |
| 34 | <div class="grid-content"> | 34 | <div class="grid-content"> |
| 35 | - <span> | ||
| 36 | - 主单号: | ||
| 37 | - </span> | ||
| 38 | - <el-input v-model="defaultQuery.awba" placeholder="请输入主单号" style="width: 180px"></el-input> | 35 | + <el-input v-model="defaultQuery.awba" placeholder="请输入主单号" style="width: 250px" clearable> |
| 36 | + <template slot="prepend">主单号</template> | ||
| 37 | + </el-input> | ||
| 39 | </div> | 38 | </div> |
| 40 | </el-col> | 39 | </el-col> |
| 41 | - <el-col :span="2" class="pub"> | 40 | + <el-col :span="3" class="pub"> |
| 42 | <div class="grid-content"> | 41 | <div class="grid-content"> |
| 43 | - <el-button type="primary" size="mini" v-on:click="getList">查询</el-button> | 42 | + <el-button type="primary" size="mini" v-on:click="getList" icon="el-icon-search"> 查  询 </el-button> |
| 44 | </div> | 43 | </div> |
| 45 | </el-col> | 44 | </el-col> |
| 46 | - <el-col :span="4" class="pub"> | 45 | + <el-col :span="3" class="pub"> |
| 47 | <div class="grid-content"> | 46 | <div class="grid-content"> |
| 48 | <el-dropdown @command="handleCommand"> | 47 | <el-dropdown @command="handleCommand"> |
| 49 | - <el-button size="mini" type="success"> | ||
| 50 | - 导出文件<i class="el-icon-arrow-down el-icon--right"></i> | 48 | + <el-button size="mini" type="success" icon="el-icon-download"> |
| 49 | + 导出文件 | ||
| 51 | </el-button> | 50 | </el-button> |
| 52 | <el-dropdown-menu slot="dropdown"> | 51 | <el-dropdown-menu slot="dropdown"> |
| 53 | <el-dropdown-item command="PDF">导出PDF</el-dropdown-item> | 52 | <el-dropdown-item command="PDF">导出PDF</el-dropdown-item> |
| @@ -56,6 +55,13 @@ | @@ -56,6 +55,13 @@ | ||
| 56 | </el-dropdown> | 55 | </el-dropdown> |
| 57 | </div> | 56 | </div> |
| 58 | </el-col> | 57 | </el-col> |
| 58 | + <el-col :span="3"> | ||
| 59 | + <div class="grid-content"> | ||
| 60 | + <el-button type="warning" @click="toggleRowExpansion" icon="el-icon-sort" size="mini"> | ||
| 61 | + 全部{{ isExpansion ? "折叠" : "展开" }} | ||
| 62 | + </el-button> | ||
| 63 | + </div> | ||
| 64 | + </el-col> | ||
| 59 | </div> | 65 | </div> |
| 60 | </el-col> | 66 | </el-col> |
| 61 | </div> | 67 | </div> |
| @@ -72,10 +78,11 @@ | @@ -72,10 +78,11 @@ | ||
| 72 | class="table" | 78 | class="table" |
| 73 | id="pdfDom" | 79 | id="pdfDom" |
| 74 | v-loading="tableloading" | 80 | v-loading="tableloading" |
| 75 | - ref="multipleTable" | 81 | + ref="dataTreeList" |
| 76 | :data="tableData" | 82 | :data="tableData" |
| 77 | tooltip-effect="dark" | 83 | tooltip-effect="dark" |
| 78 | - style="width: 100%" | 84 | + style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px" |
| 85 | + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" | ||
| 79 | @selection-change="handleSelectionChange" | 86 | @selection-change="handleSelectionChange" |
| 80 | row-key="uuid" | 87 | row-key="uuid" |
| 81 | border | 88 | border |
| @@ -87,11 +94,11 @@ | @@ -87,11 +94,11 @@ | ||
| 87 | </el-table-column> | 94 | </el-table-column> |
| 88 | <el-table-column | 95 | <el-table-column |
| 89 | label="运单号" | 96 | label="运单号" |
| 90 | - width="185" | ||
| 91 | - > | 97 | + width="185"> |
| 92 | <template slot-scope="scope"> | 98 | <template slot-scope="scope"> |
| 93 | <span v-if="scope.row.awbh==''||scope.row.awbh==null"> | 99 | <span v-if="scope.row.awbh==''||scope.row.awbh==null"> |
| 94 | - {{scope.row.awba}} | 100 | + {{scope.row.awba}}<i style="margin-left: 2px" class="el-icon-menu" :style="{'color':scope.row.splitcode=='P'?'rgb(255,77,81)' |
| 101 | + :scope.row.splitcode=='M'?'rgb(255,77,81)':scope.row.splitcode=='D'?'rgb(255,77,81)':'rgba(255,255,255,0)'}"></i> | ||
| 95 | </span> | 102 | </span> |
| 96 | <span v-else> | 103 | <span v-else> |
| 97 | {{scope.row.awbh}} | 104 | {{scope.row.awbh}} |
| @@ -101,26 +108,45 @@ | @@ -101,26 +108,45 @@ | ||
| 101 | <el-table-column | 108 | <el-table-column |
| 102 | prop="awbinfo.pcs" | 109 | prop="awbinfo.pcs" |
| 103 | label="总件数" | 110 | label="总件数" |
| 104 | - width="70" | ||
| 105 | - show-overflow-tooltip> | 111 | + width="70"> |
| 112 | + | ||
| 106 | </el-table-column> | 113 | </el-table-column> |
| 107 | <el-table-column | 114 | <el-table-column |
| 108 | prop="awbinfo.weight" | 115 | prop="awbinfo.weight" |
| 109 | label="总重量" | 116 | label="总重量" |
| 110 | - width="70" | ||
| 111 | - show-overflow-tooltip> | 117 | + width="70"> |
| 112 | </el-table-column> | 118 | </el-table-column> |
| 113 | <el-table-column | 119 | <el-table-column |
| 114 | prop="piece" | 120 | prop="piece" |
| 115 | label="舱单件数" | 121 | label="舱单件数" |
| 116 | - width="80" | ||
| 117 | - show-overflow-tooltip> | 122 | + width="80"> |
| 123 | + <template slot-scope="scope"> | ||
| 124 | + <span v-if="scope.row.awbinfo==null" style="color: #ff4d51;font-weight: bold"> | ||
| 125 | + {{scope.row.piece}} | ||
| 126 | + </span> | ||
| 127 | + <span v-else-if="scope.row.awbinfo.pcs!=scope.row.piece" style="color: #ff4d51;font-weight: bold"> | ||
| 128 | + {{scope.row.piece}} | ||
| 129 | + </span> | ||
| 130 | + <span v-else> | ||
| 131 | + {{scope.row.piece}} | ||
| 132 | + </span> | ||
| 133 | + </template> | ||
| 118 | </el-table-column> | 134 | </el-table-column> |
| 119 | <el-table-column | 135 | <el-table-column |
| 120 | prop="weight" | 136 | prop="weight" |
| 121 | label="舱单重量" | 137 | label="舱单重量" |
| 122 | - width="80" | ||
| 123 | - show-overflow-tooltip> | 138 | + width="100"> |
| 139 | + <template slot-scope="scope" style="text-align: center"> | ||
| 140 | + <span v-if="scope.row.awbinfo==null" style="color: #ff4d51;font-weight: bold"> | ||
| 141 | + {{scope.row.weight}} | ||
| 142 | + </span> | ||
| 143 | + <span v-else-if="scope.row.weight != scope.row.awbinfo.weight" style="color: #ff4d51;font-weight: bold"> | ||
| 144 | + {{scope.row.weight}} | ||
| 145 | + </span> | ||
| 146 | + <span v-else> | ||
| 147 | + {{scope.row.weight}} | ||
| 148 | + </span> | ||
| 149 | + </template> | ||
| 124 | </el-table-column> | 150 | </el-table-column> |
| 125 | <el-table-column | 151 | <el-table-column |
| 126 | prop="goodsname" | 152 | prop="goodsname" |
| @@ -136,7 +162,16 @@ | @@ -136,7 +162,16 @@ | ||
| 136 | label="回执内容" | 162 | label="回执内容" |
| 137 | width="260"> | 163 | width="260"> |
| 138 | <template slot-scope="scope"> | 164 | <template slot-scope="scope"> |
| 139 | - <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A"> | 165 | + <span v-if="scope.row.ext5 && scope.row.ext5.indexOf('异常') != -1" style="color: #F56C6C"> |
| 166 | + {{scope.row.ext5}} | ||
| 167 | + </span> | ||
| 168 | + <span v-else-if="scope.row.ext5 && scope.row.ext5.indexOf('不通过') != -1" style="color: #F56C6C"> | ||
| 169 | + {{scope.row.ext5}} | ||
| 170 | + </span> | ||
| 171 | + <span v-else-if="scope.row.ext5 && scope.row.ext5.indexOf('不接受') != -1" style="color: #F56C6C"> | ||
| 172 | + {{scope.row.ext5}} | ||
| 173 | + </span> | ||
| 174 | + <span v-else-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A"> | ||
| 140 | {{scope.row.ext5}} | 175 | {{scope.row.ext5}} |
| 141 | </span> | 176 | </span> |
| 142 | <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C"> | 177 | <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C"> |
| @@ -153,7 +188,7 @@ | @@ -153,7 +188,7 @@ | ||
| 153 | <el-table-column | 188 | <el-table-column |
| 154 | prop="operation" | 189 | prop="operation" |
| 155 | label="操作" | 190 | label="操作" |
| 156 | - width="450" | 191 | + width="380" |
| 157 | show-overflow-tooltip> | 192 | show-overflow-tooltip> |
| 158 | <template slot-scope="scope"> | 193 | <template slot-scope="scope"> |
| 159 | <el-row> | 194 | <el-row> |
| @@ -178,7 +213,7 @@ | @@ -178,7 +213,7 @@ | ||
| 178 | size="mini" | 213 | size="mini" |
| 179 | type="primary" | 214 | type="primary" |
| 180 | @click="handleSend(scope.$index, scope.row)" | 215 | @click="handleSend(scope.$index, scope.row)" |
| 181 | - :disabled="btSendStatusFormater(scope.row.status)">发送舱单报 | 216 | + :disabled="btSendStatusFormater(scope.row.status)">发舱单报 |
| 182 | </el-button> | 217 | </el-button> |
| 183 | <el-button | 218 | <el-button |
| 184 | size="mini" | 219 | size="mini" |
| @@ -191,26 +226,24 @@ | @@ -191,26 +226,24 @@ | ||
| 191 | <el-button | 226 | <el-button |
| 192 | v-if="scope.row.awbh==''||scope.row.awbh==null" | 227 | v-if="scope.row.awbh==''||scope.row.awbh==null" |
| 193 | size="mini" | 228 | size="mini" |
| 194 | - type="success" | ||
| 195 | @click="Importallocation(scope.$index, scope.row)">分拨申请 | 229 | @click="Importallocation(scope.$index, scope.row)">分拨申请 |
| 196 | </el-button> | 230 | </el-button> |
| 197 | <el-button | 231 | <el-button |
| 198 | v-else | 232 | v-else |
| 199 | disabled="" | 233 | disabled="" |
| 200 | - size="mini" type="success" | 234 | + size="mini" |
| 201 | @click="Importallocation(scope.$index, scope.row)">分拨申请 | 235 | @click="Importallocation(scope.$index, scope.row)">分拨申请 |
| 202 | </el-button> | 236 | </el-button> |
| 203 | <!-- style="background-color: #63cdda;color: white"--> | 237 | <!-- style="background-color: #63cdda;color: white"--> |
| 204 | <el-button | 238 | <el-button |
| 205 | v-if="scope.row.awbh==''||scope.row.awbh==null" | 239 | v-if="scope.row.awbh==''||scope.row.awbh==null" |
| 206 | size="mini" | 240 | size="mini" |
| 207 | - type="primary" | ||
| 208 | @click="Allocatearrive(scope.$index, scope.row)">分拨运抵 | 241 | @click="Allocatearrive(scope.$index, scope.row)">分拨运抵 |
| 209 | </el-button> | 242 | </el-button> |
| 210 | <el-button | 243 | <el-button |
| 211 | v-else | 244 | v-else |
| 212 | disabled="" | 245 | disabled="" |
| 213 | - size="mini" type="primary" | 246 | + size="mini" |
| 214 | @click="Allocatearrive(scope.$index, scope.row)">分拨运抵 | 247 | @click="Allocatearrive(scope.$index, scope.row)">分拨运抵 |
| 215 | </el-button> | 248 | </el-button> |
| 216 | <!-- style="background-color:#778beb;color: white"--> | 249 | <!-- style="background-color:#778beb;color: white"--> |
| @@ -218,13 +251,13 @@ | @@ -218,13 +251,13 @@ | ||
| 218 | size="mini" | 251 | size="mini" |
| 219 | style="background-color:#f19066;color: white" | 252 | style="background-color:#f19066;color: white" |
| 220 | @click="handleUpdate(scope.$index, scope.row)" | 253 | @click="handleUpdate(scope.$index, scope.row)" |
| 221 | - :disabled="btEditStatusFormater(scope.row.status)">发送舱单修改报 | 254 | + :disabled="btEditStatusFormater(scope.row.status)">发修改报 |
| 222 | </el-button> | 255 | </el-button> |
| 223 | <el-button | 256 | <el-button |
| 224 | size="mini" | 257 | size="mini" |
| 225 | type="danger" | 258 | type="danger" |
| 226 | @click="handleDelete(scope.$index, scope.row)" | 259 | @click="handleDelete(scope.$index, scope.row)" |
| 227 | - :disabled="btDeleStatusFormater(scope.row.status)">发送舱单删除报 | 260 | + :disabled="btDeleStatusFormater(scope.row.status)">发删除报 |
| 228 | </el-button> | 261 | </el-button> |
| 229 | </el-row> | 262 | </el-row> |
| 230 | 263 | ||
| @@ -236,67 +269,88 @@ | @@ -236,67 +269,88 @@ | ||
| 236 | </el-row> | 269 | </el-row> |
| 237 | <!--编辑主单--> | 270 | <!--编辑主单--> |
| 238 | <el-dialog :title="'原始舱单信息'+textMap[dialogStatus]" :visible.sync="outerVisible" width="90%"> | 271 | <el-dialog :title="'原始舱单信息'+textMap[dialogStatus]" :visible.sync="outerVisible" width="90%"> |
| 239 | - <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="labelPosition" | ||
| 240 | - label-width="78px" size="mini"> | 272 | + <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="labelPosition" size="mini"> |
| 241 | <!--航班信息部分--> | 273 | <!--航班信息部分--> |
| 242 | <el-row class="flightInfo"> | 274 | <el-row class="flightInfo"> |
| 243 | <el-col :span="24"> | 275 | <el-col :span="24"> |
| 244 | <div class="grid-content content">航班信息</div> | 276 | <div class="grid-content content">航班信息</div> |
| 245 | </el-col> | 277 | </el-col> |
| 246 | <el-row class="flightInfo"> | 278 | <el-row class="flightInfo"> |
| 247 | - <el-col :span="4"> | ||
| 248 | - <el-form-item label="运单号" prop="awba"> | 279 | + <el-col :span="6"> |
| 280 | + <el-form-item prop="awba"> | ||
| 249 | <div v-if="dialogStatus === 'update'"> | 281 | <div v-if="dialogStatus === 'update'"> |
| 250 | - <el-input disabled="" v-model="ruleForm.awba"></el-input> | 282 | + <el-input disabled="" v-model="ruleForm.awba" style="width: 200px"> |
| 283 | + <template slot="prepend">运单号</template> | ||
| 284 | + </el-input> | ||
| 251 | </div> | 285 | </div> |
| 252 | <div v-else> | 286 | <div v-else> |
| 253 | - <el-input v-model="ruleForm.awba"></el-input> | 287 | + <el-input v-model="ruleForm.awba" style="width: 200px"> |
| 288 | + <template slot="prepend">运单号</template> | ||
| 289 | + </el-input> | ||
| 254 | </div> | 290 | </div> |
| 255 | </el-form-item> | 291 | </el-form-item> |
| 256 | </el-col> | 292 | </el-col> |
| 257 | - <el-col :span="4"> | ||
| 258 | - <el-form-item label="航班号" prop="flightno"> | ||
| 259 | - <el-input disabled="" v-model="ruleForm.flightno"></el-input> | 293 | + <el-col :span="6"> |
| 294 | + <el-form-item prop="flightno"> | ||
| 295 | + <el-input disabled="" v-model="ruleForm.flightno" style="width: 200px"> | ||
| 296 | + <template slot="prepend">航班号</template> | ||
| 297 | + </el-input> | ||
| 260 | </el-form-item> | 298 | </el-form-item> |
| 261 | </el-col> | 299 | </el-col> |
| 262 | - <el-col :span="5"> | ||
| 263 | - <el-form-item label="航班日期" required> | ||
| 264 | - <el-col :span="24"> | 300 | + <el-col :span="6"> |
| 301 | + <el-form-item prop="originstation"> | ||
| 302 | + <el-input disabled="" v-model="ruleForm.originstation" style="width: 200px"> | ||
| 303 | + <template slot="prepend">航段</template> | ||
| 304 | + </el-input> | ||
| 305 | + </el-form-item> | ||
| 306 | + </el-col> | ||
| 307 | + <el-col :span="6"> | ||
| 308 | + <el-form-item label="" required> | ||
| 265 | <el-form-item prop="flightdate"> | 309 | <el-form-item prop="flightdate"> |
| 310 | + <div class="ip"> | ||
| 311 | + 航班日期 | ||
| 312 | + </div> | ||
| 266 | <el-date-picker disabled="" type="date" placeholder="选择日期" :clearable="false" | 313 | <el-date-picker disabled="" type="date" placeholder="选择日期" :clearable="false" |
| 267 | v-model="ruleForm.flightdate" | 314 | v-model="ruleForm.flightdate" |
| 268 | - style="width: 100%;"></el-date-picker> | 315 | + style="width: 145px"> |
| 316 | + | ||
| 317 | + </el-date-picker> | ||
| 269 | </el-form-item> | 318 | </el-form-item> |
| 270 | - </el-col> | ||
| 271 | - </el-form-item> | ||
| 272 | - </el-col> | ||
| 273 | - <el-col :span="4"> | ||
| 274 | - <el-form-item label="航段" prop="originstation"> | ||
| 275 | - <el-input disabled="" v-model="ruleForm.originstation"></el-input> | ||
| 276 | </el-form-item> | 319 | </el-form-item> |
| 277 | </el-col> | 320 | </el-col> |
| 278 | - <el-col :span="4"> | ||
| 279 | - <el-form-item label="是否分批" prop="splitcode"> | ||
| 280 | - <el-select v-model="ruleForm.splitcode" placeholder=""> | 321 | + </el-row> |
| 322 | + <el-row class="flightInfo"> | ||
| 323 | + <el-col :span="6"> | ||
| 324 | + <el-form-item prop="splitcode"> | ||
| 325 | + <div class="ip"> | ||
| 326 | + 是否分批 | ||
| 327 | + </div> | ||
| 328 | + <el-select v-model="ruleForm.splitcode" placeholder="" style="width: 110px"> | ||
| 281 | <el-option v-for="item in splitcodes" :key="item.value" :label="item.label" | 329 | <el-option v-for="item in splitcodes" :key="item.value" :label="item.label" |
| 282 | :value="item.value"></el-option> | 330 | :value="item.value"></el-option> |
| 283 | </el-select> | 331 | </el-select> |
| 284 | </el-form-item> | 332 | </el-form-item> |
| 285 | </el-col> | 333 | </el-col> |
| 286 | - <el-col :span="3"> | ||
| 287 | - <el-button size="mini" type="primary" @click="dialogStatus==='create'?createData('ruleForm'):updateData('ruleForm')" style="float: right">保存</el-button> | 334 | + <el-col :span="1.5"> |
| 335 | + <el-form-item prop="splitcode"> | ||
| 336 | + <el-button size="mini" type="primary" @click="dialogStatus==='create'?createData('ruleForm'):updateData('ruleForm')" style="float: right">保存</el-button> | ||
| 337 | + </el-form-item> | ||
| 288 | </el-col> | 338 | </el-col> |
| 289 | </el-row> | 339 | </el-row> |
| 290 | <el-row class="flightInfo"> | 340 | <el-row class="flightInfo"> |
| 291 | - <el-col :span="4"> | 341 | + <el-col :span="6"> |
| 292 | <div v-if="FenStatus === 'addAwbh'"> | 342 | <div v-if="FenStatus === 'addAwbh'"> |
| 293 | - <el-form-item label="分单号" prop="awbh"> | ||
| 294 | - <el-input v-model="ruleForm.awbh"></el-input> | 343 | + <el-form-item prop="awbh"> |
| 344 | + <el-input v-model="ruleForm.awbh" style="width: 200px"> | ||
| 345 | + <template slot="prepend">分单号</template> | ||
| 346 | + </el-input> | ||
| 295 | </el-form-item> | 347 | </el-form-item> |
| 296 | </div> | 348 | </div> |
| 297 | <div v-else> | 349 | <div v-else> |
| 298 | - <el-form-item style="display: none" label="分单号" prop="awbh"> | ||
| 299 | - <el-input v-model="ruleForm.awbh"></el-input> | 350 | + <el-form-item style="display: none" prop="awbh" > |
| 351 | + <el-input v-model="ruleForm.awbh" style="width: 200px"> | ||
| 352 | + <template slot="prepend">分单号</template> | ||
| 353 | + </el-input> | ||
| 300 | </el-form-item> | 354 | </el-form-item> |
| 301 | </div> | 355 | </div> |
| 302 | </el-col> | 356 | </el-col> |
| @@ -315,44 +369,64 @@ | @@ -315,44 +369,64 @@ | ||
| 315 | </el-col> | 369 | </el-col> |
| 316 | </el-row> | 370 | </el-row> |
| 317 | <el-row style="margin-bottom: 0px;"> | 371 | <el-row style="margin-bottom: 0px;"> |
| 318 | - <el-col :span="3"> | ||
| 319 | - <el-form-item label="起始站" prop="awbinfo.sairportid" > | ||
| 320 | - <el-input v-model="ruleForm.awbinfo.sairportid" onkeyup="this.value=this.value.toUpperCase()"></el-input> | 372 | + <el-col :span="6"> |
| 373 | + <el-form-item prop="awbinfo.sairportid" > | ||
| 374 | + <el-input v-model="ruleForm.awbinfo.sairportid" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px"> | ||
| 375 | + <template slot="prepend">起始站</template> | ||
| 376 | + </el-input> | ||
| 321 | </el-form-item> | 377 | </el-form-item> |
| 322 | </el-col> | 378 | </el-col> |
| 323 | - <el-col :span="3"> | ||
| 324 | - <el-form-item label="承运人1" prop="awbinfo.by1"> | ||
| 325 | - <el-input v-model="ruleForm.awbinfo.by1" onkeyup="this.value=this.value.toUpperCase()"></el-input> | 379 | + <el-col :span="6"> |
| 380 | + <el-form-item prop="awbinfo.by1"> | ||
| 381 | + <el-input v-model="ruleForm.awbinfo.by1" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px"> | ||
| 382 | + <template slot="prepend">承运人1</template> | ||
| 383 | + </el-input> | ||
| 326 | </el-form-item> | 384 | </el-form-item> |
| 327 | </el-col> | 385 | </el-col> |
| 328 | - <el-col :span="3"> | ||
| 329 | - <el-form-item label="到达站1" prop="awbinfo.dest1"> | ||
| 330 | - <el-input v-model="ruleForm.awbinfo.dest1"></el-input> | 386 | + <el-col :span="6"> |
| 387 | + <el-form-item prop="awbinfo.dest1"> | ||
| 388 | + <el-input v-model="ruleForm.awbinfo.dest1" style="width: 200px"> | ||
| 389 | + <template slot="prepend">到达站1</template> | ||
| 390 | + | ||
| 391 | + </el-input> | ||
| 331 | </el-form-item> | 392 | </el-form-item> |
| 332 | </el-col> | 393 | </el-col> |
| 333 | - <el-col :span="3"> | ||
| 334 | - <el-form-item label="承运人2" prop="awbinfo.by2"> | ||
| 335 | - <el-input v-model="ruleForm.awbinfo.by2" onkeyup="this.value=this.value.toUpperCase()"></el-input> | 394 | + <el-col :span="6"> |
| 395 | + <el-form-item prop="awbinfo.by2"> | ||
| 396 | + <el-input v-model="ruleForm.awbinfo.by2" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px"> | ||
| 397 | + <template slot="prepend">承运人2</template> | ||
| 398 | + | ||
| 399 | + </el-input> | ||
| 336 | </el-form-item> | 400 | </el-form-item> |
| 337 | </el-col> | 401 | </el-col> |
| 338 | - <el-col :span="3"> | ||
| 339 | - <el-form-item label="到达站2" prop="awbinfo.dest2"> | ||
| 340 | - <el-input v-model="ruleForm.awbinfo.dest2" onkeyup="this.value=this.value.toUpperCase()"></el-input> | 402 | + </el-row> |
| 403 | + <el-row> | ||
| 404 | + <el-col :span="6"> | ||
| 405 | + <el-form-item prop="awbinfo.dest2"> | ||
| 406 | + <el-input v-model="ruleForm.awbinfo.dest2" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px"> | ||
| 407 | + <template slot="prepend">到达站2</template> | ||
| 408 | + </el-input> | ||
| 341 | </el-form-item> | 409 | </el-form-item> |
| 342 | </el-col> | 410 | </el-col> |
| 343 | - <el-col :span="3"> | ||
| 344 | - <el-form-item label="承运人3" prop="awbinfo.by3"> | ||
| 345 | - <el-input v-model="ruleForm.awbinfo.by3" onkeyup="this.value=this.value.toUpperCase()"></el-input> | 411 | + <el-col :span="6"> |
| 412 | + <el-form-item prop="awbinfo.by3"> | ||
| 413 | + <el-input v-model="ruleForm.awbinfo.by3" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px"> | ||
| 414 | + <template slot="prepend">承运人3</template> | ||
| 415 | + </el-input> | ||
| 346 | </el-form-item> | 416 | </el-form-item> |
| 347 | </el-col> | 417 | </el-col> |
| 348 | - <el-col :span="3"> | ||
| 349 | - <el-form-item label="到达站3" prop="awbinfo.dest3"> | ||
| 350 | - <el-input v-model="ruleForm.awbinfo.dest3" onkeyup="this.value=this.value.toUpperCase()"></el-input> | 418 | + <el-col :span="6"> |
| 419 | + <el-form-item prop="awbinfo.dest3"> | ||
| 420 | + <el-input v-model="ruleForm.awbinfo.dest3" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px"> | ||
| 421 | + <template slot="prepend">到达站3</template> | ||
| 422 | + </el-input> | ||
| 351 | </el-form-item> | 423 | </el-form-item> |
| 352 | </el-col> | 424 | </el-col> |
| 353 | - <el-col :span="3"> | ||
| 354 | - <el-form-item label="目的站" prop="awbinfo.eairportid"> | ||
| 355 | - <el-input v-model="ruleForm.awbinfo.eairportid" onkeyup="this.value=this.value.toUpperCase()"></el-input> | 425 | + <el-col :span="6"> |
| 426 | + <el-form-item prop="awbinfo.eairportid"> | ||
| 427 | + <el-input v-model="ruleForm.awbinfo.eairportid" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px"> | ||
| 428 | + <template slot="prepend">目的站</template> | ||
| 429 | + </el-input> | ||
| 356 | </el-form-item> | 430 | </el-form-item> |
| 357 | </el-col> | 431 | </el-col> |
| 358 | </el-row> | 432 | </el-row> |
| @@ -365,57 +439,54 @@ | @@ -365,57 +439,54 @@ | ||
| 365 | <el-row style="margin-bottom: 0px;"> | 439 | <el-row style="margin-bottom: 0px;"> |
| 366 | <el-row class="product"> | 440 | <el-row class="product"> |
| 367 | <el-col :span="6"> | 441 | <el-col :span="6"> |
| 368 | - <el-form-item label="总件数" prop="awbinfo.pcs"> | ||
| 369 | - <el-input type="number" v-model="ruleForm.awbinfo.pcs" ></el-input> | 442 | + <el-form-item label="" prop="awbinfo.pcs"> |
| 443 | + <el-input type="number" v-model="ruleForm.awbinfo.pcs" style="width: 200px"> | ||
| 444 | + <template slot="prepend">总件数</template> | ||
| 445 | + </el-input> | ||
| 370 | </el-form-item> | 446 | </el-form-item> |
| 371 | </el-col> | 447 | </el-col> |
| 372 | <el-col :span="6"> | 448 | <el-col :span="6"> |
| 373 | - <el-form-item label="总重量" prop="awbinfo.weight"> | ||
| 374 | - <el-input type="number" v-model="ruleForm.awbinfo.weight"></el-input> | 449 | + <el-form-item label="" prop="awbinfo.weight"> |
| 450 | + <el-input type="number" v-model="ruleForm.awbinfo.weight" style="width: 200px"> | ||
| 451 | + <template slot="prepend">总重量</template> | ||
| 452 | + </el-input> | ||
| 375 | </el-form-item> | 453 | </el-form-item> |
| 376 | </el-col> | 454 | </el-col> |
| 377 | <el-col :span="6"> | 455 | <el-col :span="6"> |
| 378 | - <el-form-item label="舱单件数" prop="piece"> | ||
| 379 | - <el-input type="number" v-model="ruleForm.piece"></el-input> | 456 | + <el-form-item label="" prop="piece"> |
| 457 | + <el-input type="number" v-model="ruleForm.piece" style="width: 200px"> | ||
| 458 | + <template slot="prepend">舱单件数</template> | ||
| 459 | + </el-input> | ||
| 380 | </el-form-item> | 460 | </el-form-item> |
| 381 | </el-col> | 461 | </el-col> |
| 382 | <el-col :span="6"> | 462 | <el-col :span="6"> |
| 383 | - <el-form-item label="舱单重量" prop="weight"> | ||
| 384 | - <el-input type="number" v-model="ruleForm.weight"></el-input> | 463 | + <el-form-item label="" prop="weight"> |
| 464 | + <el-input type="number" v-model="ruleForm.weight" style="width: 200px"> | ||
| 465 | + <template slot="prepend">舱单重量</template> | ||
| 466 | + </el-input> | ||
| 385 | </el-form-item> | 467 | </el-form-item> |
| 386 | </el-col> | 468 | </el-col> |
| 387 | </el-row> | 469 | </el-row> |
| 388 | <el-row class="product"> | 470 | <el-row class="product"> |
| 389 | <el-col :span="6"> | 471 | <el-col :span="6"> |
| 390 | - <el-form-item label="特货代码" prop="specopeid"> | ||
| 391 | - <el-input v-model="ruleForm.awbinfo.specopeid"></el-input> | ||
| 392 | - </el-form-item> | ||
| 393 | - </el-col> | ||
| 394 | - <el-col :span="6"> | ||
| 395 | - <el-form-item label="付费方式" prop="paymodel"> | ||
| 396 | - <el-select v-model="ruleForm.awbinfo.paymodel" placeholder="" style="display:inline"> | ||
| 397 | - <el-option v-for="item in paymodel" :key="item.value" :label="item.label" | ||
| 398 | - :value="item.value"></el-option> | ||
| 399 | - </el-select> | ||
| 400 | - </el-form-item> | ||
| 401 | - </el-col> | ||
| 402 | - <el-col :span="6"> | ||
| 403 | - <el-form-item label="海关状态" prop="awbinfo.awbtype"> | ||
| 404 | - <el-select v-model="ruleForm.awbinfo.awbtype" placeholder="" style="display:inline"> | ||
| 405 | - <el-option v-for="(item,index) in customext5" :key="index" :label="item.label" | ||
| 406 | - :value="item.value"></el-option> | ||
| 407 | - </el-select> | 472 | + <el-form-item label="" prop="specopeid"> |
| 473 | + <el-input v-model="ruleForm.awbinfo.specopeid" style="width: 200px"> | ||
| 474 | + <template slot="prepend">特货代码</template> | ||
| 475 | + </el-input> | ||
| 408 | </el-form-item> | 476 | </el-form-item> |
| 409 | </el-col> | 477 | </el-col> |
| 410 | <el-col :span="6"> | 478 | <el-col :span="6"> |
| 411 | - <el-form-item label="海关关区" prop="customcode"> | 479 | + <el-form-item label="" prop="customcode"> |
| 480 | + <div class="ip"> | ||
| 481 | + 海关关区 | ||
| 482 | + </div> | ||
| 412 | <el-select v-model="ruleForm.customcode" | 483 | <el-select v-model="ruleForm.customcode" |
| 413 | filterable | 484 | filterable |
| 414 | allow-create | 485 | allow-create |
| 415 | default-first-option | 486 | default-first-option |
| 416 | remote | 487 | remote |
| 417 | :remote-method="remoteMethod2" | 488 | :remote-method="remoteMethod2" |
| 418 | - :loading="loading" placeholder="请选择" style="display:inline"> | 489 | + :loading="loading" placeholder="请选择" style="width: 115px"> |
| 419 | <el-option | 490 | <el-option |
| 420 | v-for="item in customcodes" | 491 | v-for="item in customcodes" |
| 421 | :key="item.customcode" | 492 | :key="item.customcode" |
| @@ -427,11 +498,35 @@ | @@ -427,11 +498,35 @@ | ||
| 427 | </el-select> | 498 | </el-select> |
| 428 | </el-form-item> | 499 | </el-form-item> |
| 429 | </el-col> | 500 | </el-col> |
| 501 | + <el-col :span="6" > | ||
| 502 | + <el-form-item label="" prop="awbinfo.awbtype"> | ||
| 503 | + <div class="ip"> | ||
| 504 | + 海关状态 | ||
| 505 | + </div> | ||
| 506 | + <el-select v-model="ruleForm.awbinfo.awbtype" placeholder="" style="width: 110px"> | ||
| 507 | + <el-option v-for="(item,index) in customext5" :key="index" :label="item.label" | ||
| 508 | + :value="item.value"></el-option> | ||
| 509 | + </el-select> | ||
| 510 | + </el-form-item> | ||
| 511 | + </el-col> | ||
| 512 | + <el-col :span="6"> | ||
| 513 | + <el-form-item label="" prop="paymodel"> | ||
| 514 | + <div class="ip"> | ||
| 515 | + 付费方式 | ||
| 516 | + </div> | ||
| 517 | + <el-select v-model="ruleForm.awbinfo.paymodel" placeholder="" style="width: 120px"> | ||
| 518 | + <el-option v-for="item in paymodel" :key="item.value" :label="item.label" | ||
| 519 | + :value="item.value"></el-option> | ||
| 520 | + </el-select> | ||
| 521 | + </el-form-item> | ||
| 522 | + </el-col> | ||
| 430 | </el-row> | 523 | </el-row> |
| 431 | <el-row class="product"> | 524 | <el-row class="product"> |
| 432 | <el-col :span="12"> | 525 | <el-col :span="12"> |
| 433 | - <el-form-item label="货物描述" prop="goodsname"> | ||
| 434 | - <el-input v-model="ruleForm.goodsname"></el-input> | 526 | + <el-form-item label="" prop="goodsname"> |
| 527 | + <el-input v-model="ruleForm.goodsname" style="width: 100%"> | ||
| 528 | + <template slot="prepend">货物描述</template> | ||
| 529 | + </el-input> | ||
| 435 | </el-form-item> | 530 | </el-form-item> |
| 436 | </el-col> | 531 | </el-col> |
| 437 | </el-row> | 532 | </el-row> |
| @@ -444,18 +539,38 @@ | @@ -444,18 +539,38 @@ | ||
| 444 | </el-row> | 539 | </el-row> |
| 445 | <el-row style="margin-bottom: 0px;"> | 540 | <el-row style="margin-bottom: 0px;"> |
| 446 | <el-col :span="6"> | 541 | <el-col :span="6"> |
| 447 | - <el-form-item label="发货人称" prop="awbinfo.shprname"> | ||
| 448 | - <el-input v-model="ruleForm.awbinfo.shprname"></el-input> | 542 | + <el-form-item label="" prop="awbinfo.shprname"> |
| 543 | + <el-input v-model="ruleForm.awbinfo.shprname" style="width: 200px"> | ||
| 544 | + <template slot="prepend">发货人称</template> | ||
| 545 | + </el-input> | ||
| 449 | </el-form-item> | 546 | </el-form-item> |
| 450 | </el-col> | 547 | </el-col> |
| 548 | + | ||
| 451 | <el-col :span="6"> | 549 | <el-col :span="6"> |
| 452 | - <el-form-item label="国家代码" prop="awbinfo.shprcountyr"> | 550 | + <el-form-item label="" prop="awbinfo.shpraddress"> |
| 551 | + <el-input v-model="ruleForm.awbinfo.shpraddress" style="width: 200px"> | ||
| 552 | + <template slot="prepend">地址</template> | ||
| 553 | + </el-input> | ||
| 554 | + </el-form-item> | ||
| 555 | + </el-col> | ||
| 556 | + <el-col :span="5"> | ||
| 557 | + <el-form-item label="" prop="awbinfo.shprtel"> | ||
| 558 | + <el-input v-model="ruleForm.awbinfo.shprtel" style="width: 200px"> | ||
| 559 | + <template slot="prepend">电话</template> | ||
| 560 | + </el-input> | ||
| 561 | + </el-form-item> | ||
| 562 | + </el-col> | ||
| 563 | + <el-col :span="7"> | ||
| 564 | + <el-form-item label="" prop="awbinfo.shprcountyr"> | ||
| 565 | + <div class="ip"> | ||
| 566 | + 国家代码 | ||
| 567 | + </div> | ||
| 453 | <el-select v-model="ruleForm.awbinfo.shprcountyr" | 568 | <el-select v-model="ruleForm.awbinfo.shprcountyr" |
| 454 | filterable | 569 | filterable |
| 455 | allow-create | 570 | allow-create |
| 456 | default-first-option | 571 | default-first-option |
| 457 | remote | 572 | remote |
| 458 | - :remote-method="remoteMethod" | 573 | + :remote-method="remoteMethod" style="width: 110px" |
| 459 | :loading="loading" placeholder="请选择"> | 574 | :loading="loading" placeholder="请选择"> |
| 460 | <el-option | 575 | <el-option |
| 461 | v-for="item in shprcountyrs" | 576 | v-for="item in shprcountyrs" |
| @@ -468,16 +583,6 @@ | @@ -468,16 +583,6 @@ | ||
| 468 | </el-select> | 583 | </el-select> |
| 469 | </el-form-item> | 584 | </el-form-item> |
| 470 | </el-col> | 585 | </el-col> |
| 471 | - <el-col :span="6"> | ||
| 472 | - <el-form-item label="地址" prop="awbinfo.shpraddress"> | ||
| 473 | - <el-input v-model="ruleForm.awbinfo.shpraddress"></el-input> | ||
| 474 | - </el-form-item> | ||
| 475 | - </el-col> | ||
| 476 | - <el-col :span="6"> | ||
| 477 | - <el-form-item label="电话" prop="awbinfo.shprtel"> | ||
| 478 | - <el-input v-model="ruleForm.awbinfo.shprtel"></el-input> | ||
| 479 | - </el-form-item> | ||
| 480 | - </el-col> | ||
| 481 | </el-row> | 586 | </el-row> |
| 482 | <!--收货人信息部分--> | 587 | <!--收货人信息部分--> |
| 483 | <el-row class="flightInfo"> | 588 | <el-row class="flightInfo"> |
| @@ -487,19 +592,38 @@ | @@ -487,19 +592,38 @@ | ||
| 487 | </el-row> | 592 | </el-row> |
| 488 | <el-row style="margin-bottom: 5px"> | 593 | <el-row style="margin-bottom: 5px"> |
| 489 | <el-col :span="6"> | 594 | <el-col :span="6"> |
| 490 | - <el-form-item label="收货人称" prop="awbinfo.cnsnname"> | ||
| 491 | - <el-input v-model="ruleForm.awbinfo.cnsnname"></el-input> | 595 | + <el-form-item label="" prop="awbinfo.cnsnname"> |
| 596 | + <el-input v-model="ruleForm.awbinfo.cnsnname" style="width: 200px"> | ||
| 597 | + <template slot="prepend">收货人称</template> | ||
| 598 | + </el-input> | ||
| 492 | </el-form-item> | 599 | </el-form-item> |
| 493 | </el-col> | 600 | </el-col> |
| 494 | - <el-col :span="6"> | ||
| 495 | 601 | ||
| 496 | - <el-form-item label="国家代码" prop="awbinfo.cnscountyr"> | 602 | + <el-col :span="6"> |
| 603 | + <el-form-item label="" prop="awbinfo.cnsnaddress"> | ||
| 604 | + <el-input v-model="ruleForm.awbinfo.cnsnaddress" style="width: 200px"> | ||
| 605 | + <template slot="prepend">地址</template> | ||
| 606 | + </el-input> | ||
| 607 | + </el-form-item> | ||
| 608 | + </el-col> | ||
| 609 | + <el-col :span="5"> | ||
| 610 | + <el-form-item label="" prop="awbinfo.cnsntel"> | ||
| 611 | + <el-input v-model="ruleForm.awbinfo.cnsntel" style="width: 200px"> | ||
| 612 | + <template slot="prepend">电话</template> | ||
| 613 | + </el-input> | ||
| 614 | + </el-form-item> | ||
| 615 | + </el-col> | ||
| 616 | + <el-col :span="7"> | ||
| 617 | + <el-form-item label="" prop="awbinfo.cnscountyr"> | ||
| 618 | + <div class="ip"> | ||
| 619 | + 国家代码 | ||
| 620 | + </div> | ||
| 497 | <el-select v-model="ruleForm.awbinfo.cnscountyr" | 621 | <el-select v-model="ruleForm.awbinfo.cnscountyr" |
| 498 | filterable | 622 | filterable |
| 499 | allow-create | 623 | allow-create |
| 500 | default-first-option | 624 | default-first-option |
| 501 | remote | 625 | remote |
| 502 | - :remote-method="remoteMethod" | 626 | + :remote-method="remoteMethod" style="width: 110px" |
| 503 | :loading="loading" placeholder="请选择"> | 627 | :loading="loading" placeholder="请选择"> |
| 504 | <el-option | 628 | <el-option |
| 505 | v-for="item in cnscountyrs" | 629 | v-for="item in cnscountyrs" |
| @@ -512,16 +636,6 @@ | @@ -512,16 +636,6 @@ | ||
| 512 | </el-select> | 636 | </el-select> |
| 513 | </el-form-item> | 637 | </el-form-item> |
| 514 | </el-col> | 638 | </el-col> |
| 515 | - <el-col :span="6"> | ||
| 516 | - <el-form-item label="地址" prop="awbinfo.cnsnaddress"> | ||
| 517 | - <el-input v-model="ruleForm.awbinfo.cnsnaddress"></el-input> | ||
| 518 | - </el-form-item> | ||
| 519 | - </el-col> | ||
| 520 | - <el-col :span="6"> | ||
| 521 | - <el-form-item label="电话" prop="awbinfo.cnsntel"> | ||
| 522 | - <el-input v-model="ruleForm.awbinfo.cnsntel"></el-input> | ||
| 523 | - </el-form-item> | ||
| 524 | - </el-col> | ||
| 525 | </el-row> | 639 | </el-row> |
| 526 | <!--分单信息部分--> | 640 | <!--分单信息部分--> |
| 527 | <el-row class="flightInfo"> | 641 | <el-row class="flightInfo"> |
| @@ -542,7 +656,8 @@ | @@ -542,7 +656,8 @@ | ||
| 542 | <template> | 656 | <template> |
| 543 | <el-table | 657 | <el-table |
| 544 | :data="tableData2" | 658 | :data="tableData2" |
| 545 | - style="width: 100%"> | 659 | + style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px" |
| 660 | + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"> | ||
| 546 | <el-table-column | 661 | <el-table-column |
| 547 | prop="awbh" | 662 | prop="awbh" |
| 548 | label="分单号" | 663 | label="分单号" |
| @@ -592,7 +707,7 @@ | @@ -592,7 +707,7 @@ | ||
| 592 | <el-row style="margin-top: 20px"> | 707 | <el-row style="margin-top: 20px"> |
| 593 | <el-col :span="2.5" class="pub"> | 708 | <el-col :span="2.5" class="pub"> |
| 594 | <div class="grid-content"> | 709 | <div class="grid-content"> |
| 595 | - <el-button type="primary" size="mini" v-on:click="addOrig">新增原始舱单</el-button> | 710 | + <el-button type="primary" size="mini" v-on:click="addOrig()">新增原始舱单</el-button> |
| 596 | </div> | 711 | </div> |
| 597 | </el-col> | 712 | </el-col> |
| 598 | <el-col :span="2.5" class="pub"> | 713 | <el-col :span="2.5" class="pub"> |
| @@ -605,7 +720,7 @@ | @@ -605,7 +720,7 @@ | ||
| 605 | <el-button type="primary" size="mini" :disabled="batich" @click="batchaplly()">批量申请</el-button> | 720 | <el-button type="primary" size="mini" :disabled="batich" @click="batchaplly()">批量申请</el-button> |
| 606 | </div> | 721 | </div> |
| 607 | </el-col> | 722 | </el-col> |
| 608 | - <el-col :span="2" class="pub"> | 723 | + <el-col :span="1.5" class="pub"> |
| 609 | <div class="grid-content"> | 724 | <div class="grid-content"> |
| 610 | <el-button type="primary" @click="back" size="mini">返回</el-button> | 725 | <el-button type="primary" @click="back" size="mini">返回</el-button> |
| 611 | </div> | 726 | </div> |
| @@ -616,7 +731,7 @@ | @@ -616,7 +731,7 @@ | ||
| 616 | <el-col :span="3.5" class="pub"> | 731 | <el-col :span="3.5" class="pub"> |
| 617 | <div class="grid-content"><span>舱单总件数：{{sumNmmsPrice}}</span></div> | 732 | <div class="grid-content"><span>舱单总件数：{{sumNmmsPrice}}</span></div> |
| 618 | </el-col> | 733 | </el-col> |
| 619 | - <el-col :span="7" class="pub"> | 734 | + <el-col :span="7.5" class="pub"> |
| 620 | <div class="grid-content"><span>舱单总重量：{{sumNmmsWeight}}</span></div> | 735 | <div class="grid-content"><span>舱单总重量：{{sumNmmsWeight}}</span></div> |
| 621 | </el-col> | 736 | </el-col> |
| 622 | </el-row> | 737 | </el-row> |
| @@ -638,17 +753,35 @@ | @@ -638,17 +753,35 @@ | ||
| 638 | <el-row> | 753 | <el-row> |
| 639 | <el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible"> | 754 | <el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible"> |
| 640 | <el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm"> | 755 | <el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm"> |
| 641 | - <el-form-item label="操作原因" prop="operreason"> | ||
| 642 | - <el-input type="textarea" v-model="Udform.operreason"></el-input> | ||
| 643 | - </el-form-item> | ||
| 644 | - <el-form-item label="操作人" prop="operperson"> | ||
| 645 | - <el-input v-model="Udform.operperson"></el-input> | ||
| 646 | - </el-form-item> | ||
| 647 | - <el-form-item label="联系电话" prop="opertel"> | ||
| 648 | - <el-input v-model="Udform.opertel"></el-input> | ||
| 649 | - </el-form-item> | 756 | + <el-row style="margin: 10px auto"> |
| 757 | + <el-col :span="22"> | ||
| 758 | + <el-form-item label="" prop="operreason"> | ||
| 759 | + <div class="ip"> | ||
| 760 | + 操作原因 | ||
| 761 | + </div> | ||
| 762 | + <el-input autosize type="textarea" v-model="Udform.operreason" style="width: 80%"> | ||
| 763 | + </el-input> | ||
| 764 | + </el-form-item> | ||
| 765 | + </el-col> | ||
| 766 | + </el-row> | ||
| 767 | + <el-row> | ||
| 768 | + <el-col :span="11" style="margin-right: 10px"> | ||
| 769 | + <el-form-item label="" prop="operperson"> | ||
| 770 | + <el-input v-model="Udform.operperson" style="width: 200px"> | ||
| 771 | + <template slot="prepend">操作人</template> | ||
| 772 | + </el-input> | ||
| 773 | + </el-form-item> | ||
| 774 | + </el-col> | ||
| 775 | + <el-col :span="10"> | ||
| 776 | + <el-form-item label="" prop="opertel"> | ||
| 777 | + <el-input v-model="Udform.opertel" style="width: 250px"> | ||
| 778 | + <template slot="prepend">联系电话</template> | ||
| 779 | + </el-input> | ||
| 780 | + </el-form-item> | ||
| 781 | + </el-col> | ||
| 782 | + </el-row> | ||
| 650 | </el-form> | 783 | </el-form> |
| 651 | - <div slot="footer" class="dialog-footer"> | 784 | + <div slot="footer" class="dialog-footer" style="margin-top: 30px" align="center"> |
| 652 | <el-button @click="dialogFormVisible = false">取 消</el-button> | 785 | <el-button @click="dialogFormVisible = false">取 消</el-button> |
| 653 | <el-button type="primary" @click="udStatus==='delete'?deleteUdForm('Udform'):updateUdForm('Udform')">确 定</el-button> | 786 | <el-button type="primary" @click="udStatus==='delete'?deleteUdForm('Udform'):updateUdForm('Udform')">确 定</el-button> |
| 654 | </div> | 787 | </div> |
| @@ -657,7 +790,8 @@ | @@ -657,7 +790,8 @@ | ||
| 657 | <!--明细列表弹出框--> | 790 | <!--明细列表弹出框--> |
| 658 | <el-row> | 791 | <el-row> |
| 659 | <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%"> | 792 | <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%"> |
| 660 | - <el-table :data="gridData"> | 793 | + <el-table :data="gridData" style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px" |
| 794 | + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"> | ||
| 661 | <el-table-column property="busdate" label="时间" width="160"></el-table-column> | 795 | <el-table-column property="busdate" label="时间" width="160"></el-table-column> |
| 662 | <el-table-column property="operusername" label="操作人" width="130"></el-table-column> | 796 | <el-table-column property="operusername" label="操作人" width="130"></el-table-column> |
| 663 | <el-table-column property="buspiece" label="发送件数" width="130"></el-table-column> | 797 | <el-table-column property="buspiece" label="发送件数" width="130"></el-table-column> |
| @@ -671,6 +805,22 @@ | @@ -671,6 +805,22 @@ | ||
| 671 | </template> | 805 | </template> |
| 672 | <!--自定义CSS样式--> | 806 | <!--自定义CSS样式--> |
| 673 | <style scoped> | 807 | <style scoped> |
| 808 | + .ip{ | ||
| 809 | + max-width: 100px; | ||
| 810 | + margin-right: -4px; | ||
| 811 | + display: inline-block; | ||
| 812 | + background-color: #6F8294; | ||
| 813 | + color: #ffffff; | ||
| 814 | + border: 1px solid #DCDFE6; | ||
| 815 | + vertical-align: middle; | ||
| 816 | + padding: 0 18px; | ||
| 817 | + white-space: nowrap; | ||
| 818 | + border-top-right-radius: 0px; | ||
| 819 | + border-top-left-radius: 4px; | ||
| 820 | + border-bottom-left-radius: 4px; | ||
| 821 | + border-bottom-right-radius: 0px; | ||
| 822 | + font-size: 10px; | ||
| 823 | + } | ||
| 674 | .grid-content { | 824 | .grid-content { |
| 675 | height: 36px; | 825 | height: 36px; |
| 676 | line-height: 36px; | 826 | line-height: 36px; |
| @@ -744,6 +894,7 @@ | @@ -744,6 +894,7 @@ | ||
| 744 | data() { | 894 | data() { |
| 745 | /*初始数据*/ | 895 | /*初始数据*/ |
| 746 | return { | 896 | return { |
| 897 | + isExpansion:true, | ||
| 747 | defaultQuery:{ | 898 | defaultQuery:{ |
| 748 | flightno: undefined, | 899 | flightno: undefined, |
| 749 | flightdate: undefined, | 900 | flightdate: undefined, |
| @@ -914,6 +1065,18 @@ | @@ -914,6 +1065,18 @@ | ||
| 914 | } | 1065 | } |
| 915 | }, | 1066 | }, |
| 916 | methods: { | 1067 | methods: { |
| 1068 | + toggleRowExpansion() { | ||
| 1069 | + this.isExpansion = !this.isExpansion; | ||
| 1070 | + this.toggleRowExpansionAll(this.tableData, this.isExpansion); | ||
| 1071 | + }, | ||
| 1072 | + toggleRowExpansionAll(data, isExpansion) { | ||
| 1073 | + data.forEach((item) => { | ||
| 1074 | + this.$refs.dataTreeList.toggleRowExpansion(item, isExpansion); | ||
| 1075 | + if (item.children !== undefined && item.children !== null) { | ||
| 1076 | + this.toggleRowExpansionAll(item.children, isExpansion); | ||
| 1077 | + } | ||
| 1078 | + }); | ||
| 1079 | + }, | ||
| 917 | //导出PDF,EXCEL文件 | 1080 | //导出PDF,EXCEL文件 |
| 918 | handleCommand(command) { | 1081 | handleCommand(command) { |
| 919 | if(command=='EXCEL'){ | 1082 | if(command=='EXCEL'){ |
| @@ -1055,6 +1218,9 @@ | @@ -1055,6 +1218,9 @@ | ||
| 1055 | this.FenQuery.originstation=this.defaultQuery.originstation; | 1218 | this.FenQuery.originstation=this.defaultQuery.originstation; |
| 1056 | this.FenQuery.destinationstation=row.destinationstation; | 1219 | this.FenQuery.destinationstation=row.destinationstation; |
| 1057 | this.getFenList(this.FenQuery); | 1220 | this.getFenList(this.FenQuery); |
| 1221 | + // this.$nextTick(function () { | ||
| 1222 | + // this.$refs.formName.resetFields(); | ||
| 1223 | + // }); | ||
| 1058 | }, | 1224 | }, |
| 1059 | /*编辑分单信息*/ | 1225 | /*编辑分单信息*/ |
| 1060 | handleFen(index,row){ | 1226 | handleFen(index,row){ |
| @@ -1064,7 +1230,6 @@ | @@ -1064,7 +1230,6 @@ | ||
| 1064 | this.ruleForm=row; | 1230 | this.ruleForm=row; |
| 1065 | this.ruleForm.flightno=row.carrier+row.flightno; | 1231 | this.ruleForm.flightno=row.carrier+row.flightno; |
| 1066 | this.ruleForm.originstation=row.originstation+"-"+row.destinationstation; | 1232 | this.ruleForm.originstation=row.originstation+"-"+row.destinationstation; |
| 1067 | - | ||
| 1068 | }, | 1233 | }, |
| 1069 | //发送舱单报 | 1234 | //发送舱单报 |
| 1070 | handleSend(index,row){ | 1235 | handleSend(index,row){ |
| @@ -1241,11 +1406,13 @@ | @@ -1241,11 +1406,13 @@ | ||
| 1241 | }, | 1406 | }, |
| 1242 | /*获取默认数据列表*/ | 1407 | /*获取默认数据列表*/ |
| 1243 | getList(){ | 1408 | getList(){ |
| 1409 | + this.tableloading=true; | ||
| 1244 | getMt1201List(this.defaultQuery).then(res =>{ | 1410 | getMt1201List(this.defaultQuery).then(res =>{ |
| 1245 | this.sumNmmsCount=0; | 1411 | this.sumNmmsCount=0; |
| 1246 | this.sumNmmsPrice=0; | 1412 | this.sumNmmsPrice=0; |
| 1247 | this.sumNmmsWeight=0; | 1413 | this.sumNmmsWeight=0; |
| 1248 | let response=res.data.data; | 1414 | let response=res.data.data; |
| 1415 | + console.log(response) | ||
| 1249 | this.tableData=response; | 1416 | this.tableData=response; |
| 1250 | this.tableloading=false; | 1417 | this.tableloading=false; |
| 1251 | response.forEach((item,i) => { | 1418 | response.forEach((item,i) => { |
| @@ -24,10 +24,9 @@ | @@ -24,10 +24,9 @@ | ||
| 24 | <div class="grid-content"> | 24 | <div class="grid-content"> |
| 25 | <el-col :span="9"> | 25 | <el-col :span="9"> |
| 26 | <div class="grid-content"> | 26 | <div class="grid-content"> |
| 27 | - <span> | ||
| 28 | - 主单号: | ||
| 29 | - </span> | ||
| 30 | - <el-input v-model="defaultQuery.awba" placeholder="请输入主单号" style="width: 180px"></el-input> | 27 | + <el-input v-model="defaultQuery.awba" placeholder="请输入主单号" style="width: 250px"> |
| 28 | + <template slot="prepend">主单号</template> | ||
| 29 | + </el-input> | ||
| 31 | </div> | 30 | </div> |
| 32 | </el-col> | 31 | </el-col> |
| 33 | <el-col :span="2"><div class="grid-content"><el-button type="primary" v-on:click="getMt5201List" size="mini">查询</el-button></div></el-col> | 32 | <el-col :span="2"><div class="grid-content"><el-button type="primary" v-on:click="getMt5201List" size="mini">查询</el-button></div></el-col> |
| @@ -46,7 +45,8 @@ | @@ -46,7 +45,8 @@ | ||
| 46 | :data="tableData" | 45 | :data="tableData" |
| 47 | tooltip-effect="dark" | 46 | tooltip-effect="dark" |
| 48 | v-loading="tableLoading" | 47 | v-loading="tableLoading" |
| 49 | - style="width: 100%" | 48 | + style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px" |
| 49 | + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" | ||
| 50 | @selection-change="handleSelectionChange" | 50 | @selection-change="handleSelectionChange" |
| 51 | row-key="uuid" | 51 | row-key="uuid" |
| 52 | border | 52 | border |
| @@ -108,7 +108,16 @@ | @@ -108,7 +108,16 @@ | ||
| 108 | label="回执内容" | 108 | label="回执内容" |
| 109 | width="250"> | 109 | width="250"> |
| 110 | <template slot-scope="scope"> | 110 | <template slot-scope="scope"> |
| 111 | - <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A"> | 111 | + <span v-if="scope.row.ext5 && scope.row.ext5.indexOf('异常') != -1" style="color: #F56C6C"> |
| 112 | + {{scope.row.ext5}} | ||
| 113 | + </span> | ||
| 114 | + <span v-else-if="scope.row.ext5 && scope.row.ext5.indexOf('不通过') != -1" style="color: #F56C6C"> | ||
| 115 | + {{scope.row.ext5}} | ||
| 116 | + </span> | ||
| 117 | + <span v-else-if="scope.row.ext5 && scope.row.ext5.indexOf('不接受') != -1" style="color: #F56C6C"> | ||
| 118 | + {{scope.row.ext5}} | ||
| 119 | + </span> | ||
| 120 | + <span v-else-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A"> | ||
| 112 | {{scope.row.ext5}} | 121 | {{scope.row.ext5}} |
| 113 | </span> | 122 | </span> |
| 114 | <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C"> | 123 | <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C"> |
| @@ -125,39 +134,43 @@ | @@ -125,39 +134,43 @@ | ||
| 125 | <el-table-column | 134 | <el-table-column |
| 126 | prop="operation" | 135 | prop="operation" |
| 127 | label="操作" | 136 | label="操作" |
| 128 | - width="550" | 137 | + width="285" |
| 129 | show-overflow-tooltip> | 138 | show-overflow-tooltip> |
| 130 | <template slot-scope="scope"> | 139 | <template slot-scope="scope"> |
| 131 | - <el-button | ||
| 132 | - size="mini" | ||
| 133 | - type="info" | ||
| 134 | - @click="handleDetail(scope.$index, scope.row)">收发明细</el-button> | ||
| 135 | - <el-button | ||
| 136 | - v-if="scope.row.awbh==''||scope.row.awbh==null" | ||
| 137 | - size="mini" | ||
| 138 | - type="success" | ||
| 139 | - @click="handleMain(scope.$index, scope.row)">编辑主单</el-button> | ||
| 140 | - <el-button | ||
| 141 | - v-else | ||
| 142 | - size="mini" | ||
| 143 | - type="success" | ||
| 144 | - @click="handleFen(scope.$index, scope.row)">编辑分单 | ||
| 145 | - </el-button> | ||
| 146 | - <el-button | ||
| 147 | - size="mini" | ||
| 148 | - type="primary" | ||
| 149 | - :disabled="btSendStatusFormater(scope.row.status)" | ||
| 150 | - @click="handleCreate(scope.$index, scope.row)">发送理货报</el-button> | ||
| 151 | - <el-button | ||
| 152 | - size="mini" | ||
| 153 | - type="danger" | ||
| 154 | - :disabled="btDeleStatusFormater(scope.row.status)" | ||
| 155 | - @click="handleDelete(scope.$index, scope.row)">发送理货删除报</el-button> | ||
| 156 | - <el-button | ||
| 157 | - size="mini" | ||
| 158 | - type="warning" | ||
| 159 | - @click="UpdateStatus(scope.$index, scope.row)">更改状态 | ||
| 160 | - </el-button> | 140 | + <el-row type="flex" justify="space-between"> |
| 141 | + <el-button | ||
| 142 | + size="mini" | ||
| 143 | + type="info" | ||
| 144 | + @click="handleDetail(scope.$index, scope.row)">收发明细</el-button> | ||
| 145 | + <el-button | ||
| 146 | + v-if="scope.row.awbh==''||scope.row.awbh==null" | ||
| 147 | + size="mini" | ||
| 148 | + type="success" | ||
| 149 | + @click="handleMain(scope.$index, scope.row)">编辑主单</el-button> | ||
| 150 | + <el-button | ||
| 151 | + v-else | ||
| 152 | + size="mini" | ||
| 153 | + type="success" | ||
| 154 | + @click="handleFen(scope.$index, scope.row)">编辑分单 | ||
| 155 | + </el-button> | ||
| 156 | + </el-row> | ||
| 157 | + <el-row type="flex" justify="space-between"> | ||
| 158 | + <el-button | ||
| 159 | + size="mini" | ||
| 160 | + type="primary" | ||
| 161 | + :disabled="btSendStatusFormater(scope.row.status)" | ||
| 162 | + @click="handleCreate(scope.$index, scope.row)">发理货报</el-button> | ||
| 163 | + <el-button | ||
| 164 | + size="mini" | ||
| 165 | + type="danger" | ||
| 166 | + :disabled="btDeleStatusFormater(scope.row.status)" | ||
| 167 | + @click="handleDelete(scope.$index, scope.row)">发删除报</el-button> | ||
| 168 | + <el-button | ||
| 169 | + size="mini" | ||
| 170 | + type="warning" | ||
| 171 | + @click="UpdateStatus(scope.$index, scope.row)">更改状态 | ||
| 172 | + </el-button> | ||
| 173 | + </el-row> | ||
| 161 | </template> | 174 | </template> |
| 162 | </el-table-column> | 175 | </el-table-column> |
| 163 | </el-table> | 176 | </el-table> |
| @@ -175,56 +188,68 @@ | @@ -175,56 +188,68 @@ | ||
| 175 | </el-col> | 188 | </el-col> |
| 176 | <el-row class="flightInfo"> | 189 | <el-row class="flightInfo"> |
| 177 | <el-col :span="6"> | 190 | <el-col :span="6"> |
| 178 | - <el-form-item label="运单号" prop="awba"> | 191 | + <el-form-item label="" prop="awba"> |
| 179 | <div v-if="dialogStatus === 'update'"> | 192 | <div v-if="dialogStatus === 'update'"> |
| 180 | - <el-input disabled="" v-model="ruleForm.awba"></el-input> | 193 | + <el-input disabled="" v-model="ruleForm.awba" style="width: 200px"> |
| 194 | + <template slot="prepend">运单号</template> | ||
| 195 | + </el-input> | ||
| 181 | </div> | 196 | </div> |
| 182 | <div v-else> | 197 | <div v-else> |
| 183 | - <el-input v-model="ruleForm.awba"></el-input> | 198 | + <el-input v-model="ruleForm.awba" style="width: 200px"> |
| 199 | + <template slot="prepend">运单号</template> | ||
| 200 | + </el-input> | ||
| 184 | </div> | 201 | </div> |
| 185 | </el-form-item> | 202 | </el-form-item> |
| 186 | </el-col> | 203 | </el-col> |
| 187 | - <el-col :span="6"> | 204 | + <el-col :span="4" style="margin-right: -15px"> |
| 188 | <div v-if="FenStatus === 'addAwbh'"> | 205 | <div v-if="FenStatus === 'addAwbh'"> |
| 189 | - <el-form-item label="分单号" prop="awbh"> | ||
| 190 | - <el-input v-model="ruleForm.awbh"></el-input> | 206 | + <el-form-item label="" prop="awbh"> |
| 207 | + <el-input v-model="ruleForm.awbh" style="width: 200px"> | ||
| 208 | + <template slot="prepend">分单号</template> | ||
| 209 | + </el-input> | ||
| 191 | </el-form-item> | 210 | </el-form-item> |
| 192 | </div> | 211 | </div> |
| 193 | <div v-else> | 212 | <div v-else> |
| 194 | - <el-form-item style="display: none" label="分单号" prop="awbh"> | ||
| 195 | - <el-input v-model="ruleForm.awbh"></el-input> | 213 | + <el-form-item style="display: none" label="" prop="awbh"> |
| 214 | + <el-input v-model="ruleForm.awbh" style="width: 200px"> | ||
| 215 | + <template slot="prepend">分单号</template> | ||
| 216 | + </el-input> | ||
| 196 | </el-form-item> | 217 | </el-form-item> |
| 197 | </div> | 218 | </div> |
| 198 | </el-col> | 219 | </el-col> |
| 199 | <el-col :span="6"> | 220 | <el-col :span="6"> |
| 200 | - <el-form-item label="航班号" prop="flightno"> | ||
| 201 | - <el-input disabled="" v-model="ruleForm.flightno"></el-input> | 221 | + <el-form-item label="" prop="flightno"> |
| 222 | + <el-input disabled="" v-model="ruleForm.flightno" style="width: 200px"> | ||
| 223 | + <template slot="prepend">航班号</template> | ||
| 224 | + </el-input> | ||
| 202 | </el-form-item> | 225 | </el-form-item> |
| 203 | </el-col> | 226 | </el-col> |
| 204 | - <el-col :span="6"> | ||
| 205 | - <el-form-item label="航班日期" required> | ||
| 206 | - <el-col :span="24"> | ||
| 207 | - <el-form-item prop="flightdate"> | 227 | + <el-col :span="9"> |
| 228 | + <el-form-item label="" required prop="flightdate"> | ||
| 229 | + <div class="ip"> | ||
| 230 | + 航班日期 </div> | ||
| 208 | <el-date-picker disabled="" type="date" placeholder="选择日期" :clearable="false" | 231 | <el-date-picker disabled="" type="date" placeholder="选择日期" :clearable="false" |
| 209 | v-model="ruleForm.flightdate" | 232 | v-model="ruleForm.flightdate" |
| 210 | - style="width: 100%;"></el-date-picker> | ||
| 211 | - </el-form-item> | ||
| 212 | - </el-col> | 233 | + style="width: 120px;"></el-date-picker> |
| 213 | </el-form-item> | 234 | </el-form-item> |
| 214 | </el-col> | 235 | </el-col> |
| 215 | </el-row> | 236 | </el-row> |
| 216 | <el-row class="flightInfo"> | 237 | <el-row class="flightInfo"> |
| 217 | <el-col :span="6"> | 238 | <el-col :span="6"> |
| 218 | - <el-form-item label="起始站" prop="originstation"> | ||
| 219 | - <el-input disabled="" v-model="ruleForm.originstation" onkeyup="this.value=this.value.toUpperCase()"></el-input> | 239 | + <el-form-item label="" prop="originstation"> |
| 240 | + <el-input style="width: 200px" disabled="" v-model="ruleForm.originstation" onkeyup="this.value=this.value.toUpperCase()"> | ||
| 241 | + <template slot="prepend">起始站</template> | ||
| 242 | + </el-input> | ||
| 220 | </el-form-item> | 243 | </el-form-item> |
| 221 | </el-col> | 244 | </el-col> |
| 222 | - <el-col :span="6"> | ||
| 223 | - <el-form-item label="目的站" prop="destinationstation"> | ||
| 224 | - <el-input disabled="" v-model="ruleForm.destinationstation" onkeyup="this.value=this.value.toUpperCase()"></el-input> | 245 | + <el-col :span="7"> |
| 246 | + <el-form-item label="" prop="destinationstation"> | ||
| 247 | + <el-input style="width: 200px" disabled="" v-model="ruleForm.destinationstation" onkeyup="this.value=this.value.toUpperCase()"> | ||
| 248 | + <template slot="prepend">目的站</template> | ||
| 249 | + </el-input> | ||
| 225 | </el-form-item> | 250 | </el-form-item> |
| 226 | </el-col> | 251 | </el-col> |
| 227 | - <el-col :span="6"> | 252 | + <el-col :span="2"> |
| 228 | <el-button size="mini" type="primary" @click="dialogStatus==='create'?createData('ruleForm'):updateData('ruleForm')" style="float: right">保存</el-button> | 253 | <el-button size="mini" type="primary" @click="dialogStatus==='create'?createData('ruleForm'):updateData('ruleForm')" style="float: right">保存</el-button> |
| 229 | </el-col> | 254 | </el-col> |
| 230 | </el-row> | 255 | </el-row> |
| @@ -238,37 +263,48 @@ | @@ -238,37 +263,48 @@ | ||
| 238 | <el-row style="margin-bottom: 0px;"> | 263 | <el-row style="margin-bottom: 0px;"> |
| 239 | <el-row class="product"> | 264 | <el-row class="product"> |
| 240 | <el-col :span="6"> | 265 | <el-col :span="6"> |
| 241 | - <el-form-item label="舱单件数" prop="pcs"> | ||
| 242 | - <el-input type="number" v-model="ruleForm.pcs"></el-input> | 266 | + <el-form-item label="" prop="pcs"> |
| 267 | + <el-input type="number" v-model="ruleForm.pcs" style="width: 200px"> | ||
| 268 | + <template slot="prepend">舱单件数</template> | ||
| 269 | + </el-input> | ||
| 243 | </el-form-item> | 270 | </el-form-item> |
| 244 | </el-col> | 271 | </el-col> |
| 245 | <el-col :span="6"> | 272 | <el-col :span="6"> |
| 246 | - <el-form-item label="舱单重量" prop="wei"> | ||
| 247 | - <el-input type="number" v-model="ruleForm.wei"></el-input> | 273 | + <el-form-item label="" prop="wei"> |
| 274 | + <el-input type="number" v-model="ruleForm.wei" style="width: 200px"> | ||
| 275 | + <template slot="prepend">舱单重量</template> | ||
| 276 | + </el-input> | ||
| 248 | </el-form-item> | 277 | </el-form-item> |
| 249 | </el-col> | 278 | </el-col> |
| 250 | <el-col :span="6"> | 279 | <el-col :span="6"> |
| 251 | - <el-form-item label="理货件数" prop="piece"> | ||
| 252 | - <el-input type="number" v-model="ruleForm.piece"></el-input> | 280 | + <el-form-item label="" prop="piece"> |
| 281 | + <el-input type="number" v-model="ruleForm.piece" style="width: 200px"> | ||
| 282 | + <template slot="prepend">理货件数</template> | ||
| 283 | + </el-input> | ||
| 253 | </el-form-item> | 284 | </el-form-item> |
| 254 | </el-col> | 285 | </el-col> |
| 255 | <el-col :span="6"> | 286 | <el-col :span="6"> |
| 256 | - <el-form-item label="理货重量" prop="weight"> | ||
| 257 | - <el-input type="number" v-model="ruleForm.weight"></el-input> | 287 | + <el-form-item label="" prop="weight"> |
| 288 | + <el-input type="number" v-model="ruleForm.weight" style="width: 200px"> | ||
| 289 | + <template slot="prepend">理货重量</template> | ||
| 290 | + </el-input> | ||
| 258 | </el-form-item> | 291 | </el-form-item> |
| 259 | </el-col> | 292 | </el-col> |
| 260 | </el-row> | 293 | </el-row> |
| 261 | </el-row> | 294 | </el-row> |
| 262 | <el-row class="flightInfo"> | 295 | <el-row class="flightInfo"> |
| 263 | - <el-col :span="6"> | ||
| 264 | - <el-form-item label="海关关区" prop="customcode"> | 296 | + <el-col :span="7"> |
| 297 | + <el-form-item label="" prop="customcode"> | ||
| 298 | + <div class="ip"> | ||
| 299 | + 海关关区 | ||
| 300 | + </div> | ||
| 265 | <el-select v-model="ruleForm.customcode" | 301 | <el-select v-model="ruleForm.customcode" |
| 266 | filterable | 302 | filterable |
| 267 | allow-create | 303 | allow-create |
| 268 | default-first-option | 304 | default-first-option |
| 269 | remote | 305 | remote |
| 270 | :remote-method="remoteMethod2" | 306 | :remote-method="remoteMethod2" |
| 271 | - :loading="loading" placeholder="请选择" style="display:inline"> | 307 | + :loading="loading" placeholder="请选择" style="width: 115px"> |
| 272 | <el-option | 308 | <el-option |
| 273 | v-for="item in customcodes" | 309 | v-for="item in customcodes" |
| 274 | :key="item.customcode" | 310 | :key="item.customcode" |
| @@ -280,15 +316,16 @@ | @@ -280,15 +316,16 @@ | ||
| 280 | </el-select> | 316 | </el-select> |
| 281 | </el-form-item> | 317 | </el-form-item> |
| 282 | </el-col> | 318 | </el-col> |
| 283 | - <el-col :span="6"> | ||
| 284 | - <el-form-item label="卸货时间" required> | ||
| 285 | - <el-col :span="24"> | 319 | + <el-col :span="12" style="margin-left: -45px"> |
| 320 | + <el-form-item label="" required> | ||
| 286 | <el-form-item prop="starttime"> | 321 | <el-form-item prop="starttime"> |
| 322 | + <div class="ip"> | ||
| 323 | + 卸货时间 | ||
| 324 | + </div> | ||
| 287 | <el-date-picker type="datetime" placeholder="选择日期" :clearable="false" value-format="yyyy-MM-dd HH:mm:ss" | 325 | <el-date-picker type="datetime" placeholder="选择日期" :clearable="false" value-format="yyyy-MM-dd HH:mm:ss" |
| 288 | v-model="ruleForm.starttime" | 326 | v-model="ruleForm.starttime" |
| 289 | - style="width: 100%;"></el-date-picker> | 327 | + style="width: 200px;"></el-date-picker> |
| 290 | </el-form-item> | 328 | </el-form-item> |
| 291 | - </el-col> | ||
| 292 | </el-form-item> | 329 | </el-form-item> |
| 293 | </el-col> | 330 | </el-col> |
| 294 | </el-row> | 331 | </el-row> |
| @@ -311,7 +348,8 @@ | @@ -311,7 +348,8 @@ | ||
| 311 | <template> | 348 | <template> |
| 312 | <el-table | 349 | <el-table |
| 313 | :data="tableData2" | 350 | :data="tableData2" |
| 314 | - style="width: 100%"> | 351 | + style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px" |
| 352 | + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"> | ||
| 315 | <el-table-column | 353 | <el-table-column |
| 316 | prop="awbh" | 354 | prop="awbh" |
| 317 | label="分单号" | 355 | label="分单号" |
| @@ -354,10 +392,10 @@ | @@ -354,10 +392,10 @@ | ||
| 354 | <el-col :span="2.5"><div class="grid-content"><el-button type="primary" v-on:click="addTally" size="mini">新增进港理货</el-button></div></el-col> | 392 | <el-col :span="2.5"><div class="grid-content"><el-button type="primary" v-on:click="addTally" size="mini">新增进港理货</el-button></div></el-col> |
| 355 | <el-col :span="2.5"><div class="grid-content"><el-button type="primary" size="mini" :disabled="batich" @click="batchdel()">批量发送删除报</el-button></div></el-col> | 393 | <el-col :span="2.5"><div class="grid-content"><el-button type="primary" size="mini" :disabled="batich" @click="batchdel()">批量发送删除报</el-button></div></el-col> |
| 356 | <el-col :span="2.5"><div class="grid-content"><el-button type="primary" size="mini" :disabled="batich" @click="batchaplly()">批量申请</el-button></div></el-col> | 394 | <el-col :span="2.5"><div class="grid-content"><el-button type="primary" size="mini" :disabled="batich" @click="batchaplly()">批量申请</el-button></div></el-col> |
| 357 | - <el-col :span="2"><div class="grid-content"><el-button type="primary" @click="back" size="mini">返回</el-button></div></el-col> | 395 | + <el-col :span="1.5"><div class="grid-content"><el-button type="primary" @click="back" size="mini">返回</el-button></div></el-col> |
| 358 | <el-col :span="2.5"><div class="grid-content"><span>主单数：{{sumNmmsCount}}</span></div></el-col> | 396 | <el-col :span="2.5"><div class="grid-content"><span>主单数：{{sumNmmsCount}}</span></div></el-col> |
| 359 | <el-col :span="3.5"><div class="grid-content"><span>理货总件数：{{sumNmmsPrice}}</span></div></el-col> | 397 | <el-col :span="3.5"><div class="grid-content"><span>理货总件数：{{sumNmmsPrice}}</span></div></el-col> |
| 360 | - <el-col :span="7"><div class="grid-content"><span>理货总重量：{{sumNmmsWeight}}</span></div></el-col> | 398 | + <el-col :span="7.5"><div class="grid-content"><span>理货总重量：{{sumNmmsWeight}}</span></div></el-col> |
| 361 | </el-row> | 399 | </el-row> |
| 362 | <!--对话提示框--> | 400 | <!--对话提示框--> |
| 363 | <el-row> | 401 | <el-row> |
| @@ -377,17 +415,44 @@ | @@ -377,17 +415,44 @@ | ||
| 377 | <el-row> | 415 | <el-row> |
| 378 | <el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible"> | 416 | <el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible"> |
| 379 | <el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm"> | 417 | <el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm"> |
| 380 | - <el-form-item label="操作原因" prop="operreason"> | ||
| 381 | - <el-input type="textarea" v-model="Udform.operreason"></el-input> | ||
| 382 | - </el-form-item> | ||
| 383 | - <el-form-item label="操作人" prop="operperson"> | ||
| 384 | - <el-input v-model="Udform.operperson"></el-input> | ||
| 385 | - </el-form-item> | ||
| 386 | - <el-form-item label="联系电话" prop="opertel"> | ||
| 387 | - <el-input v-model="Udform.opertel"></el-input> | ||
| 388 | - </el-form-item> | 418 | +<!-- <el-form-item label="操作原因" prop="operreason">--> |
| 419 | +<!-- <el-input type="textarea" v-model="Udform.operreason"></el-input>--> | ||
| 420 | +<!-- </el-form-item>--> | ||
| 421 | +<!-- <el-form-item label="操作人" prop="operperson">--> | ||
| 422 | +<!-- <el-input v-model="Udform.operperson"></el-input>--> | ||
| 423 | +<!-- </el-form-item>--> | ||
| 424 | +<!-- <el-form-item label="联系电话" prop="opertel">--> | ||
| 425 | +<!-- <el-input v-model="Udform.opertel"></el-input>--> | ||
| 426 | +<!-- </el-form-item>--> | ||
| 427 | + <el-row style="margin: 10px auto"> | ||
| 428 | + <el-col :span="22"> | ||
| 429 | + <el-form-item label="" prop="operreason"> | ||
| 430 | + <div class="ip"> | ||
| 431 | + 操作原因 | ||
| 432 | + </div> | ||
| 433 | + <el-input autosize type="textarea" v-model="Udform.operreason" style="width: 80%"> | ||
| 434 | + </el-input> | ||
| 435 | + </el-form-item> | ||
| 436 | + </el-col> | ||
| 437 | + </el-row> | ||
| 438 | + <el-row> | ||
| 439 | + <el-col :span="11" style="margin-right: 10px"> | ||
| 440 | + <el-form-item label="" prop="operperson"> | ||
| 441 | + <el-input v-model="Udform.operperson" style="width: 200px"> | ||
| 442 | + <template slot="prepend">操作人</template> | ||
| 443 | + </el-input> | ||
| 444 | + </el-form-item> | ||
| 445 | + </el-col> | ||
| 446 | + <el-col :span="10"> | ||
| 447 | + <el-form-item label="" prop="opertel"> | ||
| 448 | + <el-input v-model="Udform.opertel" style="width: 250px"> | ||
| 449 | + <template slot="prepend">联系电话</template> | ||
| 450 | + </el-input> | ||
| 451 | + </el-form-item> | ||
| 452 | + </el-col> | ||
| 453 | + </el-row> | ||
| 389 | </el-form> | 454 | </el-form> |
| 390 | - <div slot="footer" class="dialog-footer"> | 455 | + <div slot="footer" class="dialog-footer" style="margin-top: 30px" align="center"> |
| 391 | <el-button @click="dialogFormVisible = false">取 消</el-button> | 456 | <el-button @click="dialogFormVisible = false">取 消</el-button> |
| 392 | <el-button type="primary" @click="deleteUdForm('Udform')">确 定</el-button> | 457 | <el-button type="primary" @click="deleteUdForm('Udform')">确 定</el-button> |
| 393 | </div> | 458 | </div> |
| @@ -396,11 +461,12 @@ | @@ -396,11 +461,12 @@ | ||
| 396 | <!--明细列表弹出框--> | 461 | <!--明细列表弹出框--> |
| 397 | <el-row> | 462 | <el-row> |
| 398 | <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%"> | 463 | <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%"> |
| 399 | - <el-table :data="gridData"> | 464 | + <el-table :data="gridData" style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px" |
| 465 | + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"> | ||
| 400 | <el-table-column property="busdate" label="时间" width="160"></el-table-column> | 466 | <el-table-column property="busdate" label="时间" width="160"></el-table-column> |
| 401 | <el-table-column property="username" label="操作人" width="130"></el-table-column> | 467 | <el-table-column property="username" label="操作人" width="130"></el-table-column> |
| 402 | - <el-table-column property="buspiece" label="发送件数" width="130"></el-table-column> | ||
| 403 | - <el-table-column property="busweight" label="发送重量" width="130"></el-table-column> | 468 | + <el-table-column property="buspiece" label="发送件数" width="100"></el-table-column> |
| 469 | + <el-table-column property="busweight" label="发送重量" width="100"></el-table-column> | ||
| 404 | <el-table-column property="cusrestext" label="回执内容"></el-table-column> | 470 | <el-table-column property="cusrestext" label="回执内容"></el-table-column> |
| 405 | </el-table> | 471 | </el-table> |
| 406 | </el-dialog> | 472 | </el-dialog> |
| @@ -409,6 +475,22 @@ | @@ -409,6 +475,22 @@ | ||
| 409 | </el-container> | 475 | </el-container> |
| 410 | </template> | 476 | </template> |
| 411 | <style scoped> | 477 | <style scoped> |
| 478 | + .ip{ | ||
| 479 | + max-width: 100px; | ||
| 480 | + margin-right: -4px; | ||
| 481 | + display: inline-block; | ||
| 482 | + background-color: #6F8294; | ||
| 483 | + color: #ffffff; | ||
| 484 | + border: 1px solid #DCDFE6; | ||
| 485 | + vertical-align: middle; | ||
| 486 | + padding: 0 18px; | ||
| 487 | + white-space: nowrap; | ||
| 488 | + border-top-right-radius: 0px; | ||
| 489 | + border-top-left-radius: 4px; | ||
| 490 | + border-bottom-left-radius: 4px; | ||
| 491 | + border-bottom-right-radius: 0px; | ||
| 492 | + font-size: 10px; | ||
| 493 | + } | ||
| 412 | .grid-content{height: 36px;line-height: 36px;margin-right: 5px;} | 494 | .grid-content{height: 36px;line-height: 36px;margin-right: 5px;} |
| 413 | .content{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px} | 495 | .content{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px} |
| 414 | .row-bg,.co{background-color: white;} | 496 | .row-bg,.co{background-color: white;} |
| @@ -450,6 +532,7 @@ | @@ -450,6 +532,7 @@ | ||
| 450 | import {mapActions, mapGetters} from 'vuex' | 532 | import {mapActions, mapGetters} from 'vuex' |
| 451 | import {loginedUserInfo} from "../../api/user"; | 533 | import {loginedUserInfo} from "../../api/user"; |
| 452 | export default { | 534 | export default { |
| 535 | + name:'Tallymster', | ||
| 453 | data() { | 536 | data() { |
| 454 | return { | 537 | return { |
| 455 | defaultQuery:{ | 538 | defaultQuery:{ |
| @@ -8,57 +8,51 @@ | @@ -8,57 +8,51 @@ | ||
| 8 | <el-row style="display: block;background-color: white"> | 8 | <el-row style="display: block;background-color: white"> |
| 9 | <el-row> | 9 | <el-row> |
| 10 | <el-col :span="6"> | 10 | <el-col :span="6"> |
| 11 | - <span> | ||
| 12 | - 主单号: | ||
| 13 | - </span> | ||
| 14 | - <el-input placeholder="" v-model="defaultQuery.awba" style="width: 150px"> | 11 | + <el-input placeholder="" v-model="defaultQuery.awba" style="width: 90%" clearable> |
| 12 | + <template slot="prepend">主单号</template> | ||
| 15 | </el-input> | 13 | </el-input> |
| 16 | </el-col> | 14 | </el-col> |
| 17 | <el-col :span="6"> | 15 | <el-col :span="6"> |
| 18 | - <span> | ||
| 19 | - 承运人: | ||
| 20 | - </span> | ||
| 21 | - <el-input placeholder="" v-model="vcarrier" style="width: 150px"> | 16 | + <el-input placeholder="" v-model="vcarrier" style="width: 90%" clearable> |
| 17 | + <template slot="prepend">承运人</template> | ||
| 22 | </el-input> | 18 | </el-input> |
| 23 | </el-col> | 19 | </el-col> |
| 24 | <el-col :span="6"> | 20 | <el-col :span="6"> |
| 25 | - <span> | ||
| 26 | - 航班号: | ||
| 27 | - </span> | ||
| 28 | - <el-input placeholder="" v-model="defaultQuery.flightno" style="width: 150px"> | 21 | + <el-input placeholder="" v-model="defaultQuery.flightno" style="width: 90%" clearable> |
| 22 | + <template slot="prepend">航班号</template> | ||
| 29 | </el-input> | 23 | </el-input> |
| 30 | </el-col> | 24 | </el-col> |
| 31 | <el-col :span="6"> | 25 | <el-col :span="6"> |
| 32 | - <span> | ||
| 33 | - 航班日期: | ||
| 34 | - </span> | 26 | + <div class="ip"> |
| 27 | + 航班日期 | ||
| 28 | + </div> | ||
| 35 | <el-date-picker | 29 | <el-date-picker |
| 36 | v-model="defaultQuery.flightdate" | 30 | v-model="defaultQuery.flightdate" |
| 37 | type="date" | 31 | type="date" |
| 38 | - value-format="yyyy-MM-dd" style="width: 150px" | 32 | + value-format="yyyy-MM-dd" style="width: 140px" |
| 39 | placeholder="航班日期"> | 33 | placeholder="航班日期"> |
| 40 | </el-date-picker> | 34 | </el-date-picker> |
| 41 | </el-col> | 35 | </el-col> |
| 42 | </el-row> | 36 | </el-row> |
| 43 | <el-row > | 37 | <el-row > |
| 44 | <el-col :span="6"> | 38 | <el-col :span="6"> |
| 45 | - <span> | ||
| 46 | - 业务状态: | ||
| 47 | - </span> | ||
| 48 | - <el-select v-model="defaultQuery.status" placeholder="选择状态" style="width: 140px"> | 39 | + <div class="ip"> |
| 40 | + 业务状态 | ||
| 41 | + </div> | ||
| 42 | + <el-select v-model="defaultQuery.status" placeholder="选择状态" style="width: 125px"> | ||
| 49 | <el-option | 43 | <el-option |
| 50 | v-for="item in options" | 44 | v-for="item in options" |
| 51 | :key="item.value" | 45 | :key="item.value" |
| 52 | - :label="item.label" style="width: 140px" | 46 | + :label="item.label" |
| 53 | :value="item.value"> | 47 | :value="item.value"> |
| 54 | </el-option> | 48 | </el-option> |
| 55 | </el-select> | 49 | </el-select> |
| 56 | </el-col> | 50 | </el-col> |
| 57 | <el-col :span="6"> | 51 | <el-col :span="6"> |
| 58 | - <span> | ||
| 59 | - 报文类型: | ||
| 60 | - </span> | ||
| 61 | - <el-select v-model="defaultQuery.messageType" placeholder="报文类型" style="width: 140px"> | 52 | + <div class="ip"> |
| 53 | + 报文类型 | ||
| 54 | + </div> | ||
| 55 | + <el-select v-model="defaultQuery.messageType" placeholder="报文类型" style="width: 125px"> | ||
| 62 | <el-option | 56 | <el-option |
| 63 | v-for="item in options2" | 57 | v-for="item in options2" |
| 64 | :key="item.value" | 58 | :key="item.value" |
| @@ -69,7 +63,7 @@ | @@ -69,7 +63,7 @@ | ||
| 69 | </el-col> | 63 | </el-col> |
| 70 | <el-col :span="6"> | 64 | <el-col :span="6"> |
| 71 | <el-col :span="8" style="margin-right: 0px"> | 65 | <el-col :span="8" style="margin-right: 0px"> |
| 72 | - <el-button type="primary" v-on:click="QueryData">查询</el-button> | 66 | + <el-button type="primary" v-on:click="QueryData" icon="el-icon-search">查 询</el-button> |
| 73 | </el-col> | 67 | </el-col> |
| 74 | <!--<el-col :span="16" style="margin-right: 0px"> | 68 | <!--<el-col :span="16" style="margin-right: 0px"> |
| 75 | <el-button type="primary">批量修改状态</el-button> | 69 | <el-button type="primary">批量修改状态</el-button> |
| @@ -81,10 +75,10 @@ | @@ -81,10 +75,10 @@ | ||
| 81 | <!--查询结果样式--> | 75 | <!--查询结果样式--> |
| 82 | <el-row style="font-size: xx-small"> | 76 | <el-row style="font-size: xx-small"> |
| 83 | <el-col :span="1" class="mark"><div class="grid-content bg" style="color: red"><span>注：</span></div></el-col> | 77 | <el-col :span="1" class="mark"><div class="grid-content bg" style="color: red"><span>注：</span></div></el-col> |
| 84 | - <el-col :span="3" class="mark"><div class="grid-content bg mainse" style="border-radius: 5px;margin-right: 5px;background-color: #63cdda" ><span>主单原始舱单</span></div></el-col> | ||
| 85 | - <el-col :span="3" class="mark"><div class="grid-content bg fense" style="border-radius: 5px;margin-right: 5px;background-color: #778beb"><span>分单原始舱单</span></div></el-col> | ||
| 86 | - <el-col :span="3" class="mark"><div class="grid-content bg tallse" style="border-radius: 5px;margin-right: 5px;background-color: #f3a683"><span>主单理货报告</span></div></el-col> | ||
| 87 | - <el-col :span="3" class="mark"><div class="grid-content bg tallfense" style="border-radius: 5px;margin-right: 5px;background-color: #f7d794"><span>分单理货报告</span></div></el-col> | 78 | + <el-col :span="3" class="mark"><div class="grid-content bg mainse" style="border-radius: 5px;margin-right: 5px;background-color: rgba(99,205,218,0.4)" ><span>主单原始舱单</span></div></el-col> |
| 79 | + <el-col :span="3" class="mark"><div class="grid-content bg fense" style="border-radius: 5px;margin-right: 5px;background-color: rgba(119,139,235,0.3)"><span>分单原始舱单</span></div></el-col> | ||
| 80 | + <el-col :span="3" class="mark"><div class="grid-content bg tallse" style="border-radius: 5px;margin-right: 5px;background-color: rgba(243,166,131,0.4)"><span>主单理货报告</span></div></el-col> | ||
| 81 | + <el-col :span="3" class="mark"><div class="grid-content bg tallfense" style="border-radius: 5px;margin-right: 5px;background-color: rgba(247,215,148,0.4)"><span>分单理货报告</span></div></el-col> | ||
| 88 | </el-row> | 82 | </el-row> |
| 89 | <!--查询列表--> | 83 | <!--查询列表--> |
| 90 | <el-row> | 84 | <el-row> |
| @@ -95,7 +89,8 @@ | @@ -95,7 +89,8 @@ | ||
| 95 | ref="multipleTable" | 89 | ref="multipleTable" |
| 96 | :data="tableData" | 90 | :data="tableData" |
| 97 | tooltip-effect="dark" | 91 | tooltip-effect="dark" |
| 98 | - style="width: 100%" | 92 | + style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px" |
| 93 | + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" | ||
| 99 | :default-sort = "{prop: 'date', order: 'descending'}" | 94 | :default-sort = "{prop: 'date', order: 'descending'}" |
| 100 | @selection-change="handleSelectionChange"> | 95 | @selection-change="handleSelectionChange"> |
| 101 | <el-table-column | 96 | <el-table-column |
| @@ -139,16 +134,16 @@ | @@ -139,16 +134,16 @@ | ||
| 139 | width="115" | 134 | width="115" |
| 140 | > | 135 | > |
| 141 | <template slot-scope="scope"> | 136 | <template slot-scope="scope"> |
| 142 | - <span v-if="scope.row.stype=='MT1201'&&scope.row.awbh==''" style="background-color:#63cdda;width: 100%;height:100%;display:block"> | 137 | + <span v-if="scope.row.stype=='MT1201'&&scope.row.awbh==''" style="background-color:rgba(99,205,218,0.4);width: 100%;height:100%;display:block;color: black"> |
| 143 | {{scope.row.awba}} | 138 | {{scope.row.awba}} |
| 144 | </span> | 139 | </span> |
| 145 | - <span v-else-if="scope.row.stype=='MT1201'&&scope.row.awbh!=''" style="background-color:#778beb;width: 100%;height:100%;display:block;"> | 140 | + <span v-else-if="scope.row.stype=='MT1201'&&scope.row.awbh!=''" style="background-color:rgba(119,139,235,0.3);width: 100%;height:100%;display:block;color: black"> |
| 146 | {{scope.row.awba}} | 141 | {{scope.row.awba}} |
| 147 | </span> | 142 | </span> |
| 148 | - <span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh==''" style="background-color:#f3a683;width: 100%;height:100%;display:block;"> | 143 | + <span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh==''" style="background-color:rgba(243,166,131,0.4);width: 100%;height:100%;display:block;color: black"> |
| 149 | {{scope.row.awba}} | 144 | {{scope.row.awba}} |
| 150 | </span> | 145 | </span> |
| 151 | - <span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh!=''" style="background-color:#f7d794;width: 100%;height:100%;display:block;"> | 146 | + <span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh!=''" style="background-color:rgba(247,215,148,0.4);width: 100%;height:100%;display:block;color: black"> |
| 152 | {{scope.row.awba}} | 147 | {{scope.row.awba}} |
| 153 | </span> | 148 | </span> |
| 154 | </template> | 149 | </template> |
| @@ -188,13 +183,22 @@ | @@ -188,13 +183,22 @@ | ||
| 188 | label="回执内容" | 183 | label="回执内容" |
| 189 | width="250"> | 184 | width="250"> |
| 190 | <template slot-scope="scope"> | 185 | <template slot-scope="scope"> |
| 191 | - <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A"> | 186 | + <span v-if="scope.row.ext5 && scope.row.ext5.indexOf('异常') != -1" style="color: #F56C6C"> |
| 187 | + {{scope.row.ext5}} | ||
| 188 | + </span> | ||
| 189 | + <span v-else-if="scope.row.ext5 && scope.row.ext5.indexOf('不通过') != -1" style="color: #F56C6C"> | ||
| 190 | + {{scope.row.ext5}} | ||
| 191 | + </span> | ||
| 192 | + <span v-else-if="scope.row.ext5 && scope.row.ext5.indexOf('不接受') != -1" style="color: #F56C6C"> | ||
| 193 | + {{scope.row.ext5}} | ||
| 194 | + </span> | ||
| 195 | + <span v-else-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A"> | ||
| 192 | {{scope.row.ext5}} | 196 | {{scope.row.ext5}} |
| 193 | </span> | 197 | </span> |
| 194 | <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C"> | 198 | <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C"> |
| 195 | {{scope.row.ext5}} | 199 | {{scope.row.ext5}} |
| 196 | </span> | 200 | </span> |
| 197 | - <span v-else-if="scope.row.status=='12' || scope.row.status=='13'" style="color: #F56C6C"> | 201 | + <span v-else-if="scope.row.status=='12' || scope.row.status=='13'" style="color: #f56c6c"> |
| 198 | {{scope.row.ext5}} | 202 | {{scope.row.ext5}} |
| 199 | </span> | 203 | </span> |
| 200 | <span v-else style="color: #909399;"> | 204 | <span v-else style="color: #909399;"> |
| @@ -202,6 +206,7 @@ | @@ -202,6 +206,7 @@ | ||
| 202 | </span> | 206 | </span> |
| 203 | </template> | 207 | </template> |
| 204 | </el-table-column> | 208 | </el-table-column> |
| 209 | +<!-- || scope.row.ext5.indexOf('不通过') != -1 || scope.row.ext5.indexOf('不接受') != -1--> | ||
| 205 | </el-table> | 210 | </el-table> |
| 206 | </template> | 211 | </template> |
| 207 | </el-col> | 212 | </el-col> |
| @@ -214,7 +219,7 @@ | @@ -214,7 +219,7 @@ | ||
| 214 | @size-change="handleSizeChange" | 219 | @size-change="handleSizeChange" |
| 215 | @current-change="handleCurrentChange" | 220 | @current-change="handleCurrentChange" |
| 216 | :current-page="currentPage" | 221 | :current-page="currentPage" |
| 217 | - :page-sizes="[100, 200, 300, 400]" | 222 | + :page-sizes="[20, 50, 100, 200]" |
| 218 | :page-size="pageSize" | 223 | :page-size="pageSize" |
| 219 | layout="total, sizes, prev, pager, next, jumper" | 224 | layout="total, sizes, prev, pager, next, jumper" |
| 220 | :total="total"> | 225 | :total="total"> |
| @@ -227,6 +232,22 @@ | @@ -227,6 +232,22 @@ | ||
| 227 | </template> | 232 | </template> |
| 228 | 233 | ||
| 229 | <style scoped> | 234 | <style scoped> |
| 235 | + .ip{ | ||
| 236 | + max-width: 100px; | ||
| 237 | + margin-right: -5px; | ||
| 238 | + display: inline-block; | ||
| 239 | + background-color: #6F8294; | ||
| 240 | + color: #ffffff; | ||
| 241 | + border: 1px solid #DCDFE6; | ||
| 242 | + vertical-align: middle; | ||
| 243 | + padding: 5px 18px; | ||
| 244 | + white-space: nowrap; | ||
| 245 | + border-top-right-radius: 0px; | ||
| 246 | + border-top-left-radius: 4px; | ||
| 247 | + border-bottom-left-radius: 4px; | ||
| 248 | + border-bottom-right-radius: 0px; | ||
| 249 | + font-size: 10px; | ||
| 250 | + } | ||
| 230 | .co{height: 36px;line-height: 36px;} | 251 | .co{height: 36px;line-height: 36px;} |
| 231 | .co{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px} | 252 | .co{border-left: 4px #409EFF solid;padding-left: 10px;background-color: #f9fafc;margin-bottom: 2px} |
| 232 | .row-bg{background-color: white;padding:0px;} | 253 | .row-bg{background-color: white;padding:0px;} |
| @@ -248,7 +269,9 @@ | @@ -248,7 +269,9 @@ | ||
| 248 | import { QueryData } from '../../api/wayDeclaration' | 269 | import { QueryData } from '../../api/wayDeclaration' |
| 249 | import {mapActions, mapGetters} from 'vuex' | 270 | import {mapActions, mapGetters} from 'vuex' |
| 250 | import {loginedUserInfo} from "../../api/user"; | 271 | import {loginedUserInfo} from "../../api/user"; |
| 272 | + import jsutil from "@/common/js/util"; | ||
| 251 | export default { | 273 | export default { |
| 274 | + name:'Waybill', | ||
| 252 | data() { | 275 | data() { |
| 253 | return { | 276 | return { |
| 254 | defaultQuery:{ | 277 | defaultQuery:{ |
| @@ -288,7 +311,7 @@ | @@ -288,7 +311,7 @@ | ||
| 288 | tableData: [], | 311 | tableData: [], |
| 289 | multipleSelection: [], | 312 | multipleSelection: [], |
| 290 | currentPage:1, | 313 | currentPage:1, |
| 291 | - pageSize:100, | 314 | + pageSize:20, |
| 292 | total:0, | 315 | total:0, |
| 293 | tableloading:false | 316 | tableloading:false |
| 294 | } | 317 | } |
| @@ -314,15 +337,26 @@ | @@ -314,15 +337,26 @@ | ||
| 314 | }, | 337 | }, |
| 315 | //条件查询方法 | 338 | //条件查询方法 |
| 316 | QueryData(){ | 339 | QueryData(){ |
| 317 | - let params={currentPage:this.currentPage,pageSize:this.pageSize,awba:this.defaultQuery.awba,carrier:this.defaultQuery.carrier, | ||
| 318 | - flightno:this.defaultQuery.flightno,flightdate:this.defaultQuery.flightdate,status:this.defaultQuery.status,messageType:this.defaultQuery.messageType,departmentid:loginedUserInfo().companyInfo.departmentid}; | ||
| 319 | - this.tableloading=true; | ||
| 320 | - QueryData(params).then(res =>{ | ||
| 321 | - let response=res.data.data; | ||
| 322 | - this.tableData=response.list; | ||
| 323 | - this.total=response.total; | ||
| 324 | - this.tableloading = false; | ||
| 325 | - }); | 340 | + if(jsutil.checkNull(this.defaultQuery.awba)||jsutil.checkNull(this.defaultQuery.flightdate)){ |
| 341 | + let params={currentPage:this.currentPage,pageSize:this.pageSize,awba:this.defaultQuery.awba,carrier:this.defaultQuery.carrier, | ||
| 342 | + flightno:this.defaultQuery.flightno,flightdate:this.defaultQuery.flightdate,status:this.defaultQuery.status,messageType:this.defaultQuery.messageType,departmentid:loginedUserInfo().companyInfo.departmentid}; | ||
| 343 | + this.tableloading=true; | ||
| 344 | + QueryData(params).then(res =>{ | ||
| 345 | + let response=res.data.data; | ||
| 346 | + this.tableData=response.list; | ||
| 347 | + this.total=response.total; | ||
| 348 | + this.tableloading = false; | ||
| 349 | + }).catch(err => { | ||
| 350 | + this.tableloading = false; | ||
| 351 | + }); | ||
| 352 | + } | ||
| 353 | + else { | ||
| 354 | + this.$confirm('主单号和航班日期至少选填一项！', '提示', { | ||
| 355 | + confirmButtonText: '确定', | ||
| 356 | + cancelButtonText: '取消', | ||
| 357 | + type: 'warning' | ||
| 358 | + }) | ||
| 359 | + } | ||
| 326 | }, | 360 | }, |
| 327 | //点击进入原始页面 | 361 | //点击进入原始页面 |
| 328 | handleClick(row){ | 362 | handleClick(row){ |
| @@ -93,7 +93,9 @@ | @@ -93,7 +93,9 @@ | ||
| 93 | </el-input> | 93 | </el-input> |
| 94 | </el-form-item> | 94 | </el-form-item> |
| 95 | </el-col> | 95 | </el-col> |
| 96 | - <el-col :span="6"style="margin-top: -28px"> | 96 | + </el-row> |
| 97 | + <el-row style="margin-top:0"> | ||
| 98 | + <el-col :span="6"> | ||
| 97 | <el-form-item> | 99 | <el-form-item> |
| 98 | <div style="display: inline-block;background-color: #6F8294;color: white; | 100 | <div style="display: inline-block;background-color: #6F8294;color: white; |
| 99 | border-top-left-radius: 4px;margin-right: -4px;padding-right: 14px;font-size: 12px; | 101 | border-top-left-radius: 4px;margin-right: -4px;padding-right: 14px;font-size: 12px; |
| @@ -106,7 +108,7 @@ | @@ -106,7 +108,7 @@ | ||
| 106 | </el-select> | 108 | </el-select> |
| 107 | </el-form-item> | 109 | </el-form-item> |
| 108 | </el-col> | 110 | </el-col> |
| 109 | - <el-col :span="10" style="margin-top: -28px"> | 111 | + <el-col :span="10"> |
| 110 | <el-form-item> | 112 | <el-form-item> |
| 111 | <div style="display: inline-block;background-color: #6F8294;color: white; | 113 | <div style="display: inline-block;background-color: #6F8294;color: white; |
| 112 | border-top-left-radius: 4px;margin-right: -4px;padding-right: 14px;font-size: 12px; | 114 | border-top-left-radius: 4px;margin-right: -4px;padding-right: 14px;font-size: 12px; |
| @@ -125,7 +127,7 @@ | @@ -125,7 +127,7 @@ | ||
| 125 | </el-date-picker> | 127 | </el-date-picker> |
| 126 | </el-form-item> | 128 | </el-form-item> |
| 127 | </el-col> | 129 | </el-col> |
| 128 | - <el-col :span="8" style="margin-top: -28px"> | 130 | + <el-col :span="8" > |
| 129 | <el-form-item> | 131 | <el-form-item> |
| 130 | <el-button type="primary" icon="el-icon-search" @click="trnList">查 询</el-button> | 132 | <el-button type="primary" icon="el-icon-search" @click="trnList">查 询</el-button> |
| 131 | </el-form-item> | 133 | </el-form-item> |
| @@ -163,7 +165,6 @@ | @@ -163,7 +165,6 @@ | ||
| 163 | border | 165 | border |
| 164 | highlight-current-row | 166 | highlight-current-row |
| 165 | @selection-change="trnSelectionChange" | 167 | @selection-change="trnSelectionChange" |
| 166 | - height="550px" | ||
| 167 | tooltip-effect="dark" | 168 | tooltip-effect="dark" |
| 168 | style="border-radius: 10px 10px 0px 0px;line-height: 25px" | 169 | style="border-radius: 10px 10px 0px 0px;line-height: 25px" |
| 169 | :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" | 170 | :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" |
| @@ -248,7 +249,7 @@ | @@ -248,7 +249,7 @@ | ||
| 248 | <span>{{ scope.row.unloadcode }}</span> | 249 | <span>{{ scope.row.unloadcode }}</span> |
| 249 | </template> | 250 | </template> |
| 250 | </el-table-column> | 251 | </el-table-column> |
| 251 | - <el-table-column label="时间" width="140"> | 252 | + <el-table-column label="时间" width="180"> |
| 252 | <template slot-scope="scope"> | 253 | <template slot-scope="scope"> |
| 253 | <span>{{ scope.row.creattime }}</span> | 254 | <span>{{ scope.row.creattime }}</span> |
| 254 | </template> | 255 | </template> |
| @@ -269,25 +270,26 @@ | @@ -269,25 +270,26 @@ | ||
| 269 | </el-table-column> | 270 | </el-table-column> |
| 270 | <el-table-column label="回执内容" width="220"> | 271 | <el-table-column label="回执内容" width="220"> |
| 271 | <template slot-scope="scope"> | 272 | <template slot-scope="scope"> |
| 272 | - <span :style="{'color':scope.row.customResponseStatus=='0'?'rgb(103,194,58)' | ||
| 273 | - :scope.row.customResponseStatus=='1'?'rgb(245,110,110)':scope.row.customResponseStatus=='S'?'rgb(103,194,58)' | ||
| 274 | - :scope.row.customResponseStatus=='F'?'rgb(245,110,110)':'rgb(60,62,66)'}">{{ scope.row.customResponseText }}</span> | 273 | + <span :style="{'color':scope.row.customResponseStatus=='0'?'rgb(103,194,58)' |
| 274 | + :scope.row.customResponseStatus=='1'?'rgb(245,110,110)':scope.row.customResponseStatus=='S'?'rgb(103,194,58)' | ||
| 275 | + :scope.row.customResponseStatus=='F'?'rgb(245,110,110)':'rgb(60,62,66)'}">{{ scope.row.customResponseText }}</span> | ||
| 276 | + <br/> | ||
| 277 | + <el-button type="text" @click="check(scope.row)"> | ||
| 278 | + 查看回执 | ||
| 279 | + </el-button> | ||
| 275 | </template> | 280 | </template> |
| 276 | </el-table-column> | 281 | </el-table-column> |
| 277 | <el-table-column label="操作" align="center" width="410" fixed="right"> | 282 | <el-table-column label="操作" align="center" width="410" fixed="right"> |
| 278 | <template slot-scope="scope"> | 283 | <template slot-scope="scope"> |
| 279 | <el-row> | 284 | <el-row> |
| 280 | - <el-button type="success" size="mini" @click="editTrn(scope.$index,scope.row)">编辑</el-button> | ||
| 281 | - <el-button type="warning" size="mini" :disabled="scope.row.customResponseText && scope.row.customResponseText !== undefined && scope.row.customResponseText.length>0" @click="declareTrn(scope.row)"> | 285 | + <el-button type="success" @click="editTrn(scope.$index,scope.row)">编辑</el-button> |
| 286 | + <el-button type="warning" :disabled="scope.row.customResponseText && scope.row.customResponseText !== undefined && scope.row.customResponseText.length>0" @click="declareTrn(scope.row)"> | ||
| 282 | 申报 | 287 | 申报 |
| 283 | </el-button> | 288 | </el-button> |
| 284 | - <el-button type="danger" size="mini" :disabled="scope.row.customResponseText && scope.row.customResponseText !== undefined && scope.row.customResponseText.length>0" @click="delTrn(scope.row)"> | 289 | + <el-button type="danger" :disabled="scope.row.customResponseText && scope.row.customResponseText !== undefined && scope.row.customResponseText.length>0" @click="delTrn(scope.row)"> |
| 285 | 删除 | 290 | 删除 |
| 286 | </el-button> | 291 | </el-button> |
| 287 | - <el-button type="primary" size="mini" @click="check(scope.row)"> | ||
| 288 | - 回执明细 | ||
| 289 | - </el-button> | ||
| 290 | - <el-button type="info" size="mini" @click="statusTrn(scope.row)"> | 292 | + <el-button type="info" @click="statusTrn(scope.row)"> |
| 291 | 修改状态 | 293 | 修改状态 |
| 292 | </el-button> | 294 | </el-button> |
| 293 | </el-row> | 295 | </el-row> |
| @@ -317,11 +319,11 @@ | @@ -317,11 +319,11 @@ | ||
| 317 | width="85%" | 319 | width="85%" |
| 318 | @close="trn_addDialogClosed" | 320 | @close="trn_addDialogClosed" |
| 319 | > | 321 | > |
| 320 | - <el-form ref="form" :inline="true" :model="form" class="demo-form-inline" label-width="110px" style="margin-top: -20px;" label-position="right" :rules="rules" > | 322 | + <el-form ref="form" :inline="true" :model="form" class="demo-form-inline" label-width="120px" style="margin-top: -20px;" label-position="right" :rules="rules" > |
| 321 | <el-divider></el-divider> | 323 | <el-divider></el-divider> |
| 322 | <el-row> | 324 | <el-row> |
| 323 | <el-col :span="24"> | 325 | <el-col :span="24"> |
| 324 | - <div class="grid-content content">信息表单 [id: {{form.autoid}}]</div> | 326 | + <div class="grid-content content">信息表单 [id: {{form.autoid}}]-[申报用户:{{form.username}}]</div> |
| 325 | </el-col> | 327 | </el-col> |
| 326 | </el-row> | 328 | </el-row> |
| 327 | <el-row> | 329 | <el-row> |
| @@ -487,7 +489,7 @@ | @@ -487,7 +489,7 @@ | ||
| 487 | 489 | ||
| 488 | </el-col> | 490 | </el-col> |
| 489 | <el-col :span="8"> | 491 | <el-col :span="8"> |
| 490 | - <el-form-item label="到达卸货地时间" prop="arrivetime" label-width="110px"> | 492 | + <el-form-item label="到达卸货地时间" prop="arrivetime"> |
| 491 | <!-- <el-input v-model="form.arrivetime" size="mini" placeholder="" />--> | 493 | <!-- <el-input v-model="form.arrivetime" size="mini" placeholder="" />--> |
| 492 | <el-date-picker | 494 | <el-date-picker |
| 493 | v-model="form.arrivetime" | 495 | v-model="form.arrivetime" |
| @@ -546,8 +548,9 @@ | @@ -546,8 +548,9 @@ | ||
| 546 | import {selectTrans,delTrans,batchSend,ediTrans,send,addTrans} from "../../api/trn"; | 548 | import {selectTrans,delTrans,batchSend,ediTrans,send,addTrans} from "../../api/trn"; |
| 547 | import DetailedLog from '@/components/detailedDialog' | 549 | import DetailedLog from '@/components/detailedDialog' |
| 548 | import uti from '@/utils' | 550 | import uti from '@/utils' |
| 549 | - import loginuserInfo from "@/api/base"; | 551 | + import loginedUserInfo from "@/api/user"; |
| 550 | import unloadingCode from "@/common/customs/trans_arrive_unloadingCode"; | 552 | import unloadingCode from "@/common/customs/trans_arrive_unloadingCode"; |
| 553 | + import {mapActions, mapGetters} from 'vuex' | ||
| 551 | 554 | ||
| 552 | 555 | ||
| 553 | export default { | 556 | export default { |
| @@ -641,7 +644,7 @@ | @@ -641,7 +644,7 @@ | ||
| 641 | trnmode:'2', | 644 | trnmode:'2', |
| 642 | notes:'', | 645 | notes:'', |
| 643 | opertype:'A', | 646 | opertype:'A', |
| 644 | - sign:'qwer', | 647 | + sign:'', |
| 645 | signdate:'', | 648 | signdate:'', |
| 646 | clientseqno:'', | 649 | clientseqno:'', |
| 647 | hostid:'', | 650 | hostid:'', |
| @@ -672,12 +675,10 @@ | @@ -672,12 +675,10 @@ | ||
| 672 | mounted() { | 675 | mounted() { |
| 673 | //获取列表 | 676 | //获取列表 |
| 674 | this.trnList(); | 677 | this.trnList(); |
| 675 | - var user = loginuserInfo; | ||
| 676 | - if (user) { | ||
| 677 | - this.form.username = user.username || ''; | ||
| 678 | - } | 678 | + |
| 679 | }, | 679 | }, |
| 680 | computed:{ | 680 | computed:{ |
| 681 | + ...mapGetters(['getUserInfoStore','getUserMenuStore']), | ||
| 681 | //海关关区 | 682 | //海关关区 |
| 682 | customscode: { | 683 | customscode: { |
| 683 | get: function () { | 684 | get: function () { |
| @@ -714,7 +715,7 @@ | @@ -714,7 +715,7 @@ | ||
| 714 | } | 715 | } |
| 715 | }, | 716 | }, |
| 716 | username: function () { | 717 | username: function () { |
| 717 | - var user = loginuserInfo; | 718 | + var user = this.getUserInfoStore; |
| 718 | if (user) { | 719 | if (user) { |
| 719 | return user.username || ''; | 720 | return user.username || ''; |
| 720 | } | 721 | } |
| @@ -739,7 +740,6 @@ | @@ -739,7 +740,6 @@ | ||
| 739 | this.dialogDetailedLogVisible = true | 740 | this.dialogDetailedLogVisible = true |
| 740 | this.autoid = row.autoid | 741 | this.autoid = row.autoid |
| 741 | this.$refs.detailedlog.check(row.autoid) | 742 | this.$refs.detailedlog.check(row.autoid) |
| 742 | - console.log('======'+this.detailedList) | ||
| 743 | }, | 743 | }, |
| 744 | updateVisible(val) { | 744 | updateVisible(val) { |
| 745 | this.dialogDetailedLogVisible = val | 745 | this.dialogDetailedLogVisible = val |
| @@ -820,6 +820,9 @@ | @@ -820,6 +820,9 @@ | ||
| 820 | this.form.arrivetime = new Date().format('yyyyMMddHHmmss') | 820 | this.form.arrivetime = new Date().format('yyyyMMddHHmmss') |
| 821 | this.form.username = this.username | 821 | this.form.username = this.username |
| 822 | this.form.ieflag = 'E' | 822 | this.form.ieflag = 'E' |
| 823 | + this.form.trnmode = '2' | ||
| 824 | + this.form.trafmode= '5' | ||
| 825 | + this.form.trafway = '5' | ||
| 823 | }, | 826 | }, |
| 824 | 827 | ||
| 825 | // 新增功能 | 828 | // 新增功能 |
| @@ -877,6 +880,7 @@ | @@ -877,6 +880,7 @@ | ||
| 877 | }, | 880 | }, |
| 878 | // 申报 | 881 | // 申报 |
| 879 | declareTrn(row) { | 882 | declareTrn(row) { |
| 883 | + row.customResponseText = '已申报' | ||
| 880 | row.opertype= "C" | 884 | row.opertype= "C" |
| 881 | send(row).then((response) => { | 885 | send(row).then((response) => { |
| 882 | const res = response.data | 886 | const res = response.data |
| @@ -964,7 +968,7 @@ | @@ -964,7 +968,7 @@ | ||
| 964 | } | 968 | } |
| 965 | </script> | 969 | </script> |
| 966 | 970 | ||
| 967 | -<style > | 971 | +<style scoped> |
| 968 | .toolbar{ | 972 | .toolbar{ |
| 969 | height: 60px; | 973 | height: 60px; |
| 970 | background-color: white; | 974 | background-color: white; |
-
请 注册 或 登录 后发表评论