朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 6098bbe9e61d8e55046b7682ad195167bac01273 2 个父辈 9bbba7a6 941e04e8

Merge remote-tracking branch 'origin/master'

内嵌 并排对比
正在显示 9 个修改的文件 包含 241 行增加 和 156 行删除
@@ -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()">查&emsp;&emsp;询</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">新&emsp;&emsp;增</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)">编&emsp;&emsp;辑</el-button>
  41 + <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDel(scope.$index, scope.row)">删&emsp;&emsp;除</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()">查&emsp;&emsp;询</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">新&emsp;&emsp;增</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)">编&emsp;&emsp;辑</el-button>
  41 + <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDel(scope.$index, scope.row)">删&emsp;&emsp;除</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
@@ -138,24 +138,24 @@ @@ -138,24 +138,24 @@
138 </el-tag> 138 </el-tag>
139 </template> 139 </template>
140 </el-table-column> 140 </el-table-column>
141 - <el-table-column prop="operation" fixed="right" label="操作" align="center" width="285"> 141 + <el-table-column prop="operation" fixed="right" label="操作" align="center" width="350">
142 <template slot-scope="scope"> 142 <template slot-scope="scope">
143 <el-row type="flex" justify="space-between"> 143 <el-row type="flex" justify="space-between">
144 <!-- <el-button type="success" @click="handleEdit(scope.row)">编辑运单</el-button>--> 144 <!-- <el-button type="success" @click="handleEdit(scope.row)">编辑运单</el-button>-->
145 - <el-button @click="handleSendDesc(scope.row)">收发明细</el-button>  
146 - <el-button type="success" v-if="scope.row.awbh ===''" 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)">新增分单 147 @click="handleAddAwbh(scope.row)">新增分单
148 </el-button> 148 </el-button>
149 - <el-button type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button> 149 + <el-button type="danger" icon="el-icon-delete" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
150 </el-row> 150 </el-row>
151 <el-row type="flex" justify="space-between"> 151 <el-row type="flex" justify="space-between">
152 - <el-button type="primary" @click="handleSendAwb(scope.row)" 152 + <el-button type="primary" icon="el-icon-plus" @click="handleSendAwb(scope.row)"
153 :disabled="scope.row.status ==='23'">运抵申报 153 :disabled="scope.row.status ==='23'">运抵申报
154 </el-button> 154 </el-button>
155 - <el-button type="warning" @click="handleAwbStatus(scope.row)" 155 + <el-button type="warning" icon="el-icon-edit" @click="handleAwbStatus(scope.row)"
156 :disabled="scope.row.status ==='22'">更改状态 156 :disabled="scope.row.status ==='22'">更改状态
157 </el-button> 157 </el-button>
158 - <el-button type="danger" @click="handleSendDelete(scope.row)" 158 + <el-button type="danger" icon="el-icon-delete" @click="handleSendDelete(scope.row)"
159 :disabled="scope.row.status ==='24'">删除申报 159 :disabled="scope.row.status ==='24'">删除申报
160 </el-button> 160 </el-button>
161 </el-row> 161 </el-row>
@@ -164,11 +164,11 @@ @@ -164,11 +164,11 @@
164 </el-table> 164 </el-table>
165 <div class="btnFoot"> 165 <div class="btnFoot">
166 <el-row> 166 <el-row>
167 - <el-button icon="el-icon-document" type="success" v-if="arriveQuery.flightno !==undefined || arriveData.length>0"  
168 - @click="handelAddArriveInfo">新增出港运抵 167 + <el-button icon="el-icon-plus" type="success" v-if="arriveQuery.flightno !==undefined || arriveData.length>0"
  168 + @click="handelAddArriveInfo">新增运抵
169 </el-button> 169 </el-button>
170 <el-button icon="el-icon-back" type="primary" v-if="arriveQuery.flightno !== undefined || arriveData.length>0" 170 <el-button icon="el-icon-back" type="primary" v-if="arriveQuery.flightno !== undefined || arriveData.length>0"
171 - @click="handelBackStep">返回 171 + @click="handelBackStep">返&emsp;&emsp;回
172 </el-button> 172 </el-button>
173 </el-row> 173 </el-row>
174 </div> 174 </div>
@@ -531,6 +531,19 @@ @@ -531,6 +531,19 @@
531 this.arriveQuery.originstation = this.$route.params.flightData.originstation 531 this.arriveQuery.originstation = this.$route.params.flightData.originstation
532 this.arriveQuery.destinationstation = this.$route.params.flightData.destinationstation 532 this.arriveQuery.destinationstation = this.$route.params.flightData.destinationstation
533 this.getList() 533 this.getList()
  534 + }else {
  535 + this.arriveQuery= {
  536 + pageSize: 1,
  537 + limitSize: 10,
  538 + awba: undefined,
  539 + carrier: undefined,
  540 + flightno: undefined,
  541 + flightdate: undefined,
  542 + originstation: undefined,
  543 + destinationstation: undefined,
  544 + customcode: undefined,
  545 + messageType: undefined,
  546 + }
534 } 547 }
535 let username = loginedUserInfo().username 548 let username = loginedUserInfo().username
536 if (username === 'admin') { 549 if (username === 'admin') {
@@ -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">查&emsp;&emsp;询</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">查&emsp;&emsp;询</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,46 +113,52 @@ @@ -103,46 +113,52 @@
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'">发送出港装载报 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'">更改状态
120 </el-button> 138 </el-button>
121 -  
122 - <br><br>  
123 - <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单 139 + <el-button size="mini" icon="el-icon-delete" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单
124 </el-button> 140 </el-button>
125 -  
126 - <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"  
127 - :disabled="scope.row.status ==='22'">更改状态 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'">装载申报
128 </el-button> 145 </el-button>
129 -  
130 - <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"  
131 - :disabled="scope.row.status ==='24'">发送删除报 146 + <el-button size="mini" icon="el-icon-delete" type="danger" @click="handleSendDelete(scope.row)"
  147 + :disabled="scope.row.status ==='24'">删除申报
132 </el-button> 148 </el-button>
133 - 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">返&emsp;&emsp;回
146 </el-button> 162 </el-button>
147 </el-row> 163 </el-row>
148 </div> 164 </div>
@@ -541,6 +557,19 @@ @@ -541,6 +557,19 @@
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 + carrier: undefined,
  566 + flightno: undefined,
  567 + flightdate: undefined,
  568 + originstation: undefined,
  569 + destinationstation: undefined,
  570 + customcode: undefined,
  571 + messageType: undefined
  572 + }
544 } 573 }
545 let username = loginedUserInfo().username 574 let username = loginedUserInfo().username
546 if (username === 'admin') { 575 if (username === 'admin') {
@@ -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">查&emsp;&emsp;询</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">
@@ -220,7 +228,6 @@ @@ -220,7 +228,6 @@
220 228
221 }, 229 },
222 handleUpdate(row){ 230 handleUpdate(row){
223 - console.log(row.messageType )  
224 if(row.messageType === 'MT2201'){ 231 if(row.messageType === 'MT2201'){
225 this.$router.push({name: '出港航班信息', params: {scopeRow: row}}) 232 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
226 } 233 }
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <div class="grid-content"> 15 <div class="grid-content">
16 <span class="titleSpan">航班号：{{this.preQuery.carrier}}{{this.preQuery.flightno}}</span> 16 <span class="titleSpan">航班号：{{this.preQuery.carrier}}{{this.preQuery.flightno}}</span>
17 <span class="titleSpan">航班日期：{{this.preQuery.flightdate}}</span> 17 <span class="titleSpan">航班日期：{{this.preQuery.flightdate}}</span>
18 -<!-- <span class="titleSpan">航段：{{this.preQuery.originstation}}-{{this.preQuery.destinationstation}}</span>--> 18 + <span class="titleSpan">航段：{{this.preQuery.originstation}}-{{this.preQuery.destinationstation}}</span>
19 </div> 19 </div>
20 </el-col> 20 </el-col>
21 </div> 21 </div>
@@ -38,21 +38,21 @@ @@ -38,21 +38,21 @@
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="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" 41 + <el-button type="warning" style="width:150px" icon="el-icon-search" @click="handleSerach">查&emsp;&emsp;询</el-button>
  42 + <el-button v-if="preQuery.flightno === undefined && preData.length<1" type="success"
43 style="width:150px" icon="el-icon-plus" 43 style="width:150px" icon="el-icon-plus"
44 @click="handleAddpre">新增预配舱单 44 @click="handleAddpre">新增预配舱单
45 </el-button> 45 </el-button>
46 - <el-button @click="handleAwbSend('')" v-if="batchChooseFlag" style="width:150px" type="primary">  
47 - 批量发送申报 46 + <el-button icon="el-icon-plus" @click="handleAwbSend('')" v-if="batchChooseFlag" style="width:150px" type="primary">
  47 + 批量申报
48 </el-button> 48 </el-button>
49 - <el-button @click="handleAwbEdit('')" v-if="batchChooseFlag" style="width:150px" type="success">  
50 - 批量发送修改申报 49 + <el-button icon="el-icon-edit" @click="handleAwbEdit('')" v-if="batchChooseFlag" style="width:150px" type="success">
  50 + 批量修改申报
51 </el-button> 51 </el-button>
52 - <el-button @click="handleSendDelete('')" v-if="batchChooseFlag" style="width:150px" type="danger">  
53 - 批量发送删除申报 52 + <el-button icon="el-icon-delete" @click="handleSendDelete('')" v-if="batchChooseFlag" style="width:150px" type="danger">
  53 + 批量删除申报
54 </el-button> 54 </el-button>
55 - <el-button @click="download" style="width:150px" type="success"> 55 + <el-button icon="el-icon-download" @click="download" style="width:150px" type="success">
56 模板下载 56 模板下载
57 </el-button> 57 </el-button>
58 <el-upload 58 <el-upload
@@ -117,7 +117,7 @@ @@ -117,7 +117,7 @@
117 {{scope.row.weight}} 117 {{scope.row.weight}}
118 </template> 118 </template>
119 </el-table-column> 119 </el-table-column>
120 - <el-table-column label="货物描述" width="120" align="center"> 120 + <el-table-column label="货物描述" width="120" align="center" show-overflow-tooltip>
121 <template slot-scope="scope"> 121 <template slot-scope="scope">
122 {{scope.row.goodsname}} 122 {{scope.row.goodsname}}
123 </template> 123 </template>
@@ -156,58 +156,55 @@ @@ -156,58 +156,55 @@
156 <span v-if="scope.row.status ==='25'">已发送修改报</span> 156 <span v-if="scope.row.status ==='25'">已发送修改报</span>
157 </template> 157 </template>
158 </el-table-column> 158 </el-table-column>
159 - <el-table-column prop="receipt" label="回执信息" align="center"> 159 + <el-table-column prop="receipt" label="回执信息" align="center" show-overflow-tooltip>
160 <template slot-scope="scope"> 160 <template slot-scope="scope">
  161 + <el-tag v-if="scope.row.status=='01' || scope.row.status=='11'" type="success">
161 {{scope.row.ext5}} 162 {{scope.row.ext5}}
  163 + </el-tag>
  164 + <el-tag v-else-if="scope.row.status=='02' || scope.row.status=='03'" type="warning">
  165 + {{scope.row.ext5}}
  166 + </el-tag>
  167 + <el-tag v-else-if="scope.row.status=='12' || scope.row.status=='13'" type="danger">
  168 + {{scope.row.ext5}}
  169 + </el-tag>
  170 + <el-tag v-else>
  171 + {{scope.row.ext5}}
  172 + </el-tag>
162 </template> 173 </template>
163 </el-table-column> 174 </el-table-column>
164 <el-table-column label="操作" width="450px" fixed="right" align="center"> 175 <el-table-column label="操作" width="450px" fixed="right" align="center">
165 <template slot-scope="scope" > 176 <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 ===''" 177 + <el-row type="flex" justify="space-between">
  178 + <el-button icon="el-icon-view" @click="handleSend(scope.row)">收发明细</el-button>
  179 + <el-button type="success" icon="el-icon-plus" v-if="scope.row.awbh ===''"
180 @click="handleAddAwbh(scope.row)">新增分单 180 @click="handleAddAwbh(scope.row)">新增分单
181 </el-button> 181 </el-button>
182 - </el-col> 182 + <el-button type="warning" icon="el-icon-edit" @click="handleAwbStatus(scope.row)"
  183 + :disabled="scope.row.status === '22'">更改状态
  184 + </el-button>
  185 +
  186 + <el-button type="danger" icon="el-icon-delete" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
183 </el-row> 187 </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-row type="flex" justify="space-between">
  189 + <el-button type="primary" icon="el-icon-plus" @click="handleAwbSend(scope.row.uuid)"
  190 + :disabled="addStatus(scope.row.status)">预配申报
188 </el-button> 191 </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> 192 + <el-button type="success" icon="el-icon-edit" @click="handleAwbEdit(scope.row.uuid)"
  193 + :disabled="editStatus(scope.row.status)">修改申报</el-button>
  194 + <el-button type="danger" icon="el-icon-delete" @click="handleSendDelete(scope.row.uuid)"
  195 + :disabled="deleteStatus(scope.row.status)">删除申报</el-button>
198 </el-row> 196 </el-row>
199 -  
200 </template> 197 </template>
201 </el-table-column> 198 </el-table-column>
202 </el-table> 199 </el-table>
203 200
204 <div class="btnFoot"> 201 <div class="btnFoot">
205 <el-row> 202 <el-row>
206 - <el-button type="primary" v-if="preQuery.flightno !== undefined || preData.length >0" 203 + <el-button type="success" icon="el-icon-plus" v-if="preQuery.flightno !== undefined || preData.length >0"
207 @click="handleAddpreInfo">新增预配舱单 204 @click="handleAddpreInfo">新增预配舱单
208 </el-button> 205 </el-button>
209 - <el-button type="primary" @click="handelBackStep"  
210 - v-if="preQuery.flightno !== undefined || preData.length >0">返回 206 + <el-button type="primary" icon="el-icon-back" @click="handelBackStep"
  207 + v-if="preQuery.flightno !== undefined || preData.length >0">返&emsp;&emsp;回
211 </el-button> 208 </el-button>
212 </el-row> 209 </el-row>
213 </div> 210 </div>
@@ -728,10 +725,12 @@ @@ -728,10 +725,12 @@
728 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> 725 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
729 <el-form :inline="true" :model="consignerQuery"> 726 <el-form :inline="true" :model="consignerQuery">
730 <el-form-item> 727 <el-form-item>
731 - <el-input v-model="consignerQuery.companyName" placeholder="关键字查询" size="small"></el-input> 728 + <el-input v-model="consignerQuery.companyName" placeholder="公司名称" size="small">
  729 + <template slot="prepend">公司名称</template>
  730 + </el-input>
732 </el-form-item> 731 </el-form-item>
733 <el-form-item> 732 <el-form-item>
734 - <el-button type="primary" size="small" v-on:click="consignerSelect()">查询</el-button> 733 + <el-button type="primary" icon="el-icon-plus" size="small" v-on:click="consignerSelect()">查&emsp;&emsp;询</el-button>
735 </el-form-item> 734 </el-form-item>
736 </el-form> 735 </el-form>
737 </el-col> 736 </el-col>
@@ -753,7 +752,7 @@ @@ -753,7 +752,7 @@
753 </el-table-column> 752 </el-table-column>
754 <el-table-column label="操作"> 753 <el-table-column label="操作">
755 <template slot-scope="scope"> 754 <template slot-scope="scope">
756 - <el-button type="success" size="mini" @click="consignerClick(scope.row)">选择</el-button> 755 + <el-button type="success" size="mini" icon="el-icon-thumb" @click="consignerClick(scope.row)">选&emsp;&emsp;择</el-button>
757 </template> 756 </template>
758 </el-table-column> 757 </el-table-column>
759 </el-table> 758 </el-table>
@@ -765,10 +764,12 @@ @@ -765,10 +764,12 @@
765 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> 764 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
766 <el-form :inline="true" :model="consignerQuery"> 765 <el-form :inline="true" :model="consignerQuery">
767 <el-form-item> 766 <el-form-item>
768 - <el-input v-model="consigneeQuery.companyName" placeholder="关键字查询" size="small"></el-input> 767 + <el-input v-model="consigneeQuery.companyName" placeholder="公司名称" size="small">
  768 + <template slot="prepend">公司名称</template>
  769 + </el-input>
769 </el-form-item> 770 </el-form-item>
770 <el-form-item> 771 <el-form-item>
771 - <el-button type="primary" v-on:click="consigneeSelect()" size="small">查询</el-button> 772 + <el-button type="primary" icon="el-icon-plus" v-on:click="consigneeSelect()" size="small">查&emsp;&emsp;询</el-button>
772 </el-form-item> 773 </el-form-item>
773 </el-form> 774 </el-form>
774 </el-col> 775 </el-col>
@@ -790,7 +791,7 @@ @@ -790,7 +791,7 @@
790 </el-table-column> 791 </el-table-column>
791 <el-table-column label="操作"> 792 <el-table-column label="操作">
792 <template slot-scope="scope"> 793 <template slot-scope="scope">
793 - <el-button type="success" @click="consigneeClick(scope.row)" size="small">选择</el-button> 794 + <el-button type="success" icon="el-icon-thumb" @click="consigneeClick(scope.row)" size="small">选&emsp;&emsp;择</el-button>
794 </template> 795 </template>
795 </el-table-column> 796 </el-table-column>
796 </el-table> 797 </el-table>
@@ -1127,6 +1128,21 @@ @@ -1127,6 +1128,21 @@
1127 this.preQuery.awba = this.$route.params.flightData.awba.substring(0, 3) + "-" + this.$route.params.flightData.awba.substring(3) 1128 this.preQuery.awba = this.$route.params.flightData.awba.substring(0, 3) + "-" + this.$route.params.flightData.awba.substring(3)
1128 } 1129 }
1129 this.getList() 1130 this.getList()
  1131 + }else {
  1132 + this.preQuery= {
  1133 + pageSize: 1,
  1134 + limitSize: 30,
  1135 + awba: '',
  1136 + carrier: '',
  1137 + flightno: '',
  1138 + flightdate: '',
  1139 + originstation: '',
  1140 + destinationstation: '',
  1141 + userId:loginedUserInfo().userId,
  1142 + customCode:'',
  1143 + enterpriseId:loginedUserInfo().companyId,
  1144 + messageType: ''
  1145 + }
1130 } 1146 }
1131 this.getCountryList() 1147 this.getCountryList()
1132 let username = JSON.parse(sessionStorage.getItem('user')).username 1148 let username = JSON.parse(sessionStorage.getItem('user')).username
@@ -1551,7 +1567,6 @@ @@ -1551,7 +1567,6 @@
1551 }, 1567 },
1552 // 收货人信息赋值 1568 // 收货人信息赋值
1553 consigneeClick(val){ 1569 consigneeClick(val){
1554 - console.log(val);  
1555 this.preModel.awbinfo.cnsnname=val.conName; 1570 this.preModel.awbinfo.cnsnname=val.conName;
1556 this.preModel.awbinfo.cnsnaddress=val.conAddress; 1571 this.preModel.awbinfo.cnsnaddress=val.conAddress;
1557 this.preModel.awbinfo.ecityid=val.conCity; 1572 this.preModel.awbinfo.ecityid=val.conCity;
@@ -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">查&emsp;&emsp;询</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>  
136 -  
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 ===''" 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 ===''"
142 @click="handleAddAwbh(scope.row)">新增分单</el-button> 136 @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> 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>
  144 +
  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">返&emsp;&emsp;回
155 </el-button> 158 </el-button>
156 </el-row> 159 </el-row>
157 </div> 160 </div>
@@ -484,7 +487,7 @@ @@ -484,7 +487,7 @@
484 awbweight: undefined, 487 awbweight: undefined,
485 rcfdep: 'MT5202', 488 rcfdep: 'MT5202',
486 userinfo: { 489 userinfo: {
487 - username : JSON.parse(sessionStorage.getItem('user')).username 490 + username : loginedUserInfo().username
488 } 491 }
489 }, 492 },
490 respModel : { 493 respModel : {
@@ -520,7 +523,7 @@ @@ -520,7 +523,7 @@
520 rows:{}, 523 rows:{},
521 } 524 }
522 }, 525 },
523 - created() { 526 + activated() {
524 if (this.$route.params.flightData !== undefined) { 527 if (this.$route.params.flightData !== undefined) {
525 this.tidyQuery.carrier = this.$route.params.flightData.flightno.substring(0, 2) 528 this.tidyQuery.carrier = this.$route.params.flightData.flightno.substring(0, 2)
526 this.tidyQuery.flightno = this.$route.params.flightData.flightno.substring(2) 529 this.tidyQuery.flightno = this.$route.params.flightData.flightno.substring(2)
@@ -531,8 +534,21 @@ @@ -531,8 +534,21 @@
531 this.tidyQuery.awba = this.$route.params.flightData.awba.substring(0, 3) + "-" + this.$route.params.flightData.awba.substring(3) 534 this.tidyQuery.awba = this.$route.params.flightData.awba.substring(0, 3) + "-" + this.$route.params.flightData.awba.substring(3)
532 } 535 }
533 this.getList() 536 this.getList()
  537 + }else {
  538 + this.tidyQuery = {
  539 + pageSize: 1,
  540 + limitSize: 10,
  541 + awba: undefined,
  542 + carrier: undefined,
  543 + flightno: undefined,
  544 + flightdate: undefined,
  545 + originstation: undefined,
  546 + destinationstation: undefined,
  547 + customcode: undefined,
  548 + rcfdep: "5202"
  549 + }
534 } 550 }
535 - let username = JSON.parse(sessionStorage.getItem('user')).username 551 + let username = loginedUserInfo().username
536 if(username === 'admin'){ 552 if(username === 'admin'){
537 this.isAdmin = true 553 this.isAdmin = true
538 } 554 }
@@ -677,7 +693,7 @@ @@ -677,7 +693,7 @@
677 cancelButtonText: '取消' 693 cancelButtonText: '取消'
678 }).then(() => { 694 }).then(() => {
679 row.userinfo = { 695 row.userinfo = {
680 - username : JSON.parse(sessionStorage.getItem('user')).username 696 + username : loginedUserInfo().username
681 } 697 }
682 sendCreateMt5202(row).then(res => { 698 sendCreateMt5202(row).then(res => {
683 if (res.data.count > 0) { 699 if (res.data.count > 0) {
@@ -739,7 +755,7 @@ @@ -739,7 +755,7 @@
739 flightDate: undefined, 755 flightDate: undefined,
740 awbh: undefined, 756 awbh: undefined,
741 rcfdep: 'MT5202', 757 rcfdep: 'MT5202',
742 - username: JSON.parse(sessionStorage.getItem('user')).username, 758 + username: loginedUserInfo().username
743 } 759 }
744 this.dialogDeleteVisible = true 760 this.dialogDeleteVisible = true
745 this.respModel.carrier = row.carrier 761 this.respModel.carrier = row.carrier
@@ -861,7 +877,7 @@ @@ -861,7 +877,7 @@
861 awbweight: undefined, 877 awbweight: undefined,
862 rcfdep: 'MT5202', 878 rcfdep: 'MT5202',
863 userinfo: { 879 userinfo: {
864 - username: JSON.parse(sessionStorage.getItem('user')).username 880 + username: loginedUserInfo().username
865 } 881 }
866 } 882 }
867 }, 883 },
@@ -921,10 +937,10 @@ @@ -921,10 +937,10 @@
921 delete this.tidyModel.children 937 delete this.tidyModel.children
922 938
923 _this.tidyModel.user= { 939 _this.tidyModel.user= {
924 - username : JSON.parse(sessionStorage.getItem('user')).username 940 + username : loginedUserInfo().username
925 } 941 }
926 this.tidyModel.userinfo = { 942 this.tidyModel.userinfo = {
927 - username : loginUserInfo().username 943 + username : loginedUserInfo().username
928 } 944 }
929 945
930 updateMt520X(this.tidyModel).then(res => { 946 updateMt520X(this.tidyModel).then(res => {