朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 dacfe41e3f1d6b72ba8b3d702a16a41c03dbed68 1 个父辈 f19448cd

预配优化 批量发送报文 批量修改报文 

出港运抵 优化 测试
预配 excel 导入模板
内嵌 并排对比
正在显示 3 个修改的文件 包含 171 行增加 和 118 行删除
@@ -32,13 +32,15 @@ @@ -32,13 +32,15 @@
32 <div class="grid-content"> 32 <div class="grid-content">
33 <el-col :span="4"> 33 <el-col :span="4">
34 <div class="grid-content"> 34 <div class="grid-content">
35 - <el-input v-model="awba" clearable placeholder="请输入主单号"></el-input> 35 + <el-input v-model="awba" clearable placeholder="请输入主单号">
  36 + <template slot="prepend">主单号</template>
  37 + </el-input>
36 </div> 38 </div>
37 </el-col> 39 </el-col>
38 <div class="grid-content el-btn"> 40 <div class="grid-content el-btn">
39 - <el-button type="primary" size="mini" @click="handleSerach">查询</el-button> 41 + <el-button type="primary" @click="handleSerach">查询</el-button>
40 <el-button v-if="arriveQuery.flightno ===undefined && arriveData.length<1" 42 <el-button v-if="arriveQuery.flightno ===undefined && arriveData.length<1"
41 - type="primary" size="mini" 43 + type="primary"
42 @click="handleAddArrive">新增运抵 44 @click="handleAddArrive">新增运抵
43 </el-button> 45 </el-button>
44 </div> 46 </div>
@@ -59,21 +61,23 @@ @@ -59,21 +61,23 @@
59 :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> 61 :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
60 <el-table-column type="selection" width="55"> 62 <el-table-column type="selection" width="55">
61 </el-table-column> 63 </el-table-column>
62 - <el-table-column label="航班号" width="100" align="center"> 64 + <el-table-column label="航班号" width="110" align="center">
63 <template slot-scope="scope"> 65 <template slot-scope="scope">
64 <span>{{scope.row.carrier}}{{scope.row.flightno}}</span> 66 <span>{{scope.row.carrier}}{{scope.row.flightno}}</span>
65 </template> 67 </template>
66 </el-table-column> 68 </el-table-column>
67 <el-table-column label="运单号" width="110" align="center"> 69 <el-table-column label="运单号" width="110" align="center">
68 <template slot-scope="scope"> 70 <template slot-scope="scope">
69 - <span>{{scope.row.awba}}</span>  
70 - </template>  
71 - </el-table-column>  
72 - <el-table-column label="分单号" width="120" align="center">  
73 - <template slot-scope="scope">  
74 - <span>{{scope.row.awbh}}</span> 71 +<!-- <span>{{scope.row.awba}}</span>-->
  72 + <a type="text" style="color: #409eff;text-decoration: underline" class="tableInline" @click="handleEdit(scope.row)" v-if="scope.row.awbh !==''">{{scope.row.awbh}}</a>
  73 + <a type="text" style="color: #409eff;text-decoration: underline" class="tableInline" @click="handleEdit(scope.row)" v-else>{{scope.row.awba}}</a>
75 </template> 74 </template>
76 </el-table-column> 75 </el-table-column>
  76 +<!-- <el-table-column label="分单号" width="120" align="center">-->
  77 +<!-- <template slot-scope="scope">-->
  78 +<!-- <span>{{scope.row.awbh}}</span>-->
  79 +<!-- </template>-->
  80 +<!-- </el-table-column>-->
77 <el-table-column label="运抵件数" width="70" align="center"> 81 <el-table-column label="运抵件数" width="70" align="center">
78 <template slot-scope="scope"> 82 <template slot-scope="scope">
79 <span>{{scope.row.piece}}</span> 83 <span>{{scope.row.piece}}</span>
@@ -89,7 +93,7 @@ @@ -89,7 +93,7 @@
89 <span>{{scope.row.goodsname}}</span> 93 <span>{{scope.row.goodsname}}</span>
90 </template> 94 </template>
91 </el-table-column> 95 </el-table-column>
92 - <el-table-column label="运抵时间" width="140" align="center"> 96 + <el-table-column label="运抵时间" width="150" align="center">
93 <template slot-scope="scope"> 97 <template slot-scope="scope">
94 <span>{{scope.row.arrivetime}}</span> 98 <span>{{scope.row.arrivetime}}</span>
95 </template> 99 </template>
@@ -125,21 +129,21 @@ @@ -125,21 +129,21 @@
125 </el-table-column> 129 </el-table-column>
126 <el-table-column prop="operation" fixed="right" label="操作" align="center" width="400"> 130 <el-table-column prop="operation" fixed="right" label="操作" align="center" width="400">
127 <template slot-scope="scope"> 131 <template slot-scope="scope">
128 - <el-button size="mini" @click="handleSendDesc(scope.row)">收发明细</el-button>  
129 - <el-button size="mini" type="success" @click="handleEdit(scope.row)">编辑</el-button>  
130 - <el-button size="mini" type="primary" @click="handleSendAwb(scope.row)" 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)"
131 :disabled="scope.row.status ==='23'">发送出港运抵报 135 :disabled="scope.row.status ==='23'">发送出港运抵报
132 </el-button> 136 </el-button>
133 <p></p> 137 <p></p>
134 - <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单 138 + <el-button type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单
135 </el-button> 139 </el-button>
136 - <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)" 140 + <el-button type="warning" @click="handleAwbStatus(scope.row)"
137 :disabled="scope.row.status ==='22'">更改状态 141 :disabled="scope.row.status ==='22'">更改状态
138 </el-button> 142 </el-button>
139 - <el-button size="mini" type="primary" v-if="scope.row.awbh ===''" 143 + <el-button type="primary" v-if="scope.row.awbh ===''"
140 @click="handleAddAwbh(scope.row)">新增分单 144 @click="handleAddAwbh(scope.row)">新增分单
141 </el-button> 145 </el-button>
142 - <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)" 146 + <el-button type="danger" @click="handleSendDelete(scope.row)"
143 :disabled="scope.row.status ==='24'">发删除报 147 :disabled="scope.row.status ==='24'">发删除报
144 </el-button> 148 </el-button>
145 </template> 149 </template>
@@ -147,10 +151,10 @@ @@ -147,10 +151,10 @@
147 </el-table> 151 </el-table>
148 <div class="btnFoot"> 152 <div class="btnFoot">
149 <el-row> 153 <el-row>
150 - <el-button type="primary" size="mini" v-if="arriveQuery.flightno !==undefined || arriveData.length>0" 154 + <el-button type="primary" v-if="arriveQuery.flightno !==undefined || arriveData.length>0"
151 @click="handelAddArriveInfo">新增出港运抵 155 @click="handelAddArriveInfo">新增出港运抵
152 </el-button> 156 </el-button>
153 - <el-button type="primary" size="mini" v-if="arriveQuery.flightno !== undefined || arriveData.length>0" 157 + <el-button type="primary" v-if="arriveQuery.flightno !== undefined || arriveData.length>0"
154 @click="handelBackStep">返回 158 @click="handelBackStep">返回
155 </el-button> 159 </el-button>
156 </el-row> 160 </el-row>
@@ -166,8 +170,8 @@ @@ -166,8 +170,8 @@
166 </div> 170 </div>
167 <el-row> 171 <el-row>
168 <el-col :span="7.5"> 172 <el-col :span="7.5">
169 - <el-form-item label="主单号" prop="awba">  
170 - <el-input v-model="arriveModel.awba"></el-input> 173 + <el-form-item label="主单号" prop="awba" >
  174 + <el-input v-model="arriveModel.awba" :disabled="dialogStatus === 'update'"></el-input>
171 </el-form-item> 175 </el-form-item>
172 </el-col> 176 </el-col>
173 <el-col :span="7.5" v-if="fenStatus === 'addAwbh'"> 177 <el-col :span="7.5" v-if="fenStatus === 'addAwbh'">
@@ -183,20 +187,20 @@ @@ -183,20 +187,20 @@
183 <el-col :span="7.5"> 187 <el-col :span="7.5">
184 <el-form-item label="承运人" prop="carrier"> 188 <el-form-item label="承运人" prop="carrier">
185 <el-input v-model="carrier" 189 <el-input v-model="carrier"
186 - :disabled="dialogFormVisible === 'update'"></el-input> 190 + :disabled="fenStatus === 'addAwbh'"></el-input>
187 </el-form-item> 191 </el-form-item>
188 </el-col> 192 </el-col>
189 <el-col :span="7.5"> 193 <el-col :span="7.5">
190 <el-form-item label="航班号" prop="flightno"> 194 <el-form-item label="航班号" prop="flightno">
191 <el-input v-model="flightno" 195 <el-input v-model="flightno"
192 - :disabled="dialogFormVisible === 'update'"></el-input> 196 + :disabled="fenStatus === 'addAwbh'"></el-input>
193 </el-form-item> 197 </el-form-item>
194 </el-col> 198 </el-col>
195 <el-col :span="7.5"> 199 <el-col :span="7.5">
196 <el-form-item label="航班日期" prop="flightdate"> 200 <el-form-item label="航班日期" prop="flightdate">
197 <el-date-picker v-model="arriveModel.flightdate" value-format="yyyy-MM-dd" type="date" 201 <el-date-picker v-model="arriveModel.flightdate" value-format="yyyy-MM-dd" type="date"
198 placeholder="请输入" 202 placeholder="请输入"
199 - :disabled="dialogFormVisible === 'update'"></el-date-picker> 203 + :disabled="fenStatus === 'addAwbh'"></el-date-picker>
200 </el-form-item> 204 </el-form-item>
201 </el-col> 205 </el-col>
202 </el-row> 206 </el-row>
@@ -366,7 +370,8 @@ @@ -366,7 +370,8 @@
366 validAlphabetsAndSpanceKey, 370 validAlphabetsAndSpanceKey,
367 validatorNum 371 validatorNum
368 } from "@/utils/validate"; 372 } from "@/utils/validate";
369 - import {getResponseForParam} from '@/api/responseDetail' 373 + import {getResponseForParam} from '@/api/responseDetail';
  374 + import loginUserInfo from '../../api/base';
370 375
371 export default { 376 export default {
372 name: "ExitArrive", 377 name: "ExitArrive",
@@ -437,13 +442,18 @@ @@ -437,13 +442,18 @@
437 arriveRoles: { 442 arriveRoles: {
438 awba: [{required: true, trigger: 'blur', validator: validatorAwb}], 443 awba: [{required: true, trigger: 'blur', validator: validatorAwb}],
439 awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}], 444 awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}],
440 - goodsname: [{required: true, trigger: 'blur', validator: validAlphabetsSpanceKey}], 445 + goodsname: [
  446 + {required: true, trigger: 'blur', message:'货物描述不能为空'},
  447 + {required: true, trigger: 'blur', validator: validAlphabetsSpanceKey}
  448 + ],
441 carrier: [{required: true, trigger: 'blur', validator: validatorAwbh}], 449 carrier: [{required: true, trigger: 'blur', validator: validatorAwbh}],
442 flightno: [{required: true, trigger: 'blur', validator: validatorAwbh}], 450 flightno: [{required: true, trigger: 'blur', validator: validatorAwbh}],
443 originstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}], 451 originstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}],
444 destinationstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}], 452 destinationstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}],
445 weight: [{required: true, trigger: 'change', validator: validatorNums}], 453 weight: [{required: true, trigger: 'change', validator: validatorNums}],
446 piece: [{required: true, trigger: 'change', validator: validatorNums}], 454 piece: [{required: true, trigger: 'change', validator: validatorNums}],
  455 + arrivetime: [{required: true, trigger: 'blur', message:'请选择运抵时间'}],
  456 + customcode: [{required: true, trigger: 'blur', message:'海关关区不能为空'}],
447 }, 457 },
448 arriveData: [], 458 arriveData: [],
449 detailData: [], 459 detailData: [],
@@ -462,7 +472,7 @@ @@ -462,7 +472,7 @@
462 arrivetime: undefined, 472 arrivetime: undefined,
463 messageType: 'MT3201', 473 messageType: 'MT3201',
464 user :{ 474 user :{
465 - username : JSON.parse(sessionStorage.getItem('user')).username 475 + username : loginUserInfo.username
466 } 476 }
467 }, 477 },
468 respModel: { 478 respModel: {
@@ -478,9 +488,20 @@ @@ -478,9 +488,20 @@
478 awbh: '' 488 awbh: ''
479 }, 489 },
480 arriveDeleteRules: { 490 arriveDeleteRules: {
481 - reason: [{required: true, message: '删除原因不能为空', trigger: 'blur'}],  
482 - contactName: [{required: true, message: '删除操作人不能为空', trigger: 'blur'}],  
483 - contactTel: [{required: true, message: '操作人联系方式不能为空', trigger: 'blur'}] 491 + reason:[{required:true,message:'原因不能为空',trigger:'blur'}],
  492 + contactName:[{required:true,message:'操作人不能为空',trigger:'blur'}],
  493 + contactTel:[
  494 + { 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 + }}
  504 + ],
484 }, 505 },
485 } 506 }
486 }, 507 },
@@ -497,7 +518,7 @@ @@ -497,7 +518,7 @@
497 this.arriveQuery.destinationstation = this.$route.params.flightData.destinationstation 518 this.arriveQuery.destinationstation = this.$route.params.flightData.destinationstation
498 this.getList() 519 this.getList()
499 } 520 }
500 - let username = JSON.parse(sessionStorage.getItem('user')).username 521 + let username = loginUserInfo.username
501 if (username === 'admin') { 522 if (username === 'admin') {
502 this.isAdmin = true 523 this.isAdmin = true
503 } 524 }
@@ -612,6 +633,7 @@ @@ -612,6 +633,7 @@
612 this.arriveModel.destinationstation = this.arriveQuery.destinationstation 633 this.arriveModel.destinationstation = this.arriveQuery.destinationstation
613 this.arriveModel.customcode = this.arriveQuery.customcode 634 this.arriveModel.customcode = this.arriveQuery.customcode
614 this.dialogStatus = 'create' 635 this.dialogStatus = 'create'
  636 + this.fenStatus = ''
615 this.dialogFormVisible = true 637 this.dialogFormVisible = true
616 this.$nextTick(() => { 638 this.$nextTick(() => {
617 this.$refs.arriveFormData.clearValidate() 639 this.$refs.arriveFormData.clearValidate()
@@ -632,7 +654,7 @@ @@ -632,7 +654,7 @@
632 this.fenStatus = 'addAwbh' 654 this.fenStatus = 'addAwbh'
633 this.dialogFormVisible = true, 655 this.dialogFormVisible = true,
634 row.user = { 656 row.user = {
635 - username: JSON.parse(sessionStorage.getItem('user')).username 657 + username: loginUserInfo.username
636 } 658 }
637 this.$nextTick(() => { 659 this.$nextTick(() => {
638 this.$refs.arriveFormData.clearValidate() 660 this.$refs.arriveFormData.clearValidate()
@@ -642,12 +664,16 @@ @@ -642,12 +664,16 @@
642 this.$refs.arriveFormData.validate(valid => { 664 this.$refs.arriveFormData.validate(valid => {
643 if (valid) { 665 if (valid) {
644 addMt3201(this.arriveModel).then(res => { 666 addMt3201(this.arriveModel).then(res => {
645 - if (res.data.count > 0) { 667 + if (res.data.code == "200") {
646 this.dialogFormVisible = false 668 this.dialogFormVisible = false
647 - Message.success("出港运抵新增成功") 669 + Message.success(res.data.msg);
648 this.getList() 670 this.getList()
649 - } else {  
650 - Message.error("数据更新失败，请检查数据") 671 + }else if (res.data.code == "201"){
  672 + Message.error(res.data.msg);
  673 + }else if (res.data.code == "202"){
  674 + Message.error(res.data.msg);
  675 + }else {
  676 + Message.error("数据有误，请检查数据");
651 } 677 }
652 }) 678 })
653 } 679 }
@@ -671,14 +697,13 @@ @@ -671,14 +697,13 @@
671 customcode: undefined, 697 customcode: undefined,
672 arrivetime: undefined, 698 arrivetime: undefined,
673 user: { 699 user: {
674 - username: JSON.parse(sessionStorage.getItem('user')).username 700 + username: loginUserInfo.username
675 } 701 }
676 } 702 }
677 }, 703 },
678 // 编辑 704 // 编辑
679 handleEdit(row) { 705 handleEdit(row) {
680 this.arriveModel = Object.assign({}, row) // copy obj 706 this.arriveModel = Object.assign({}, row) // copy obj
681 -  
682 if (row.awbh === ''){ 707 if (row.awbh === ''){
683 this.fenStatus = undefined 708 this.fenStatus = undefined
684 }else { 709 }else {
@@ -695,16 +720,20 @@ @@ -695,16 +720,20 @@
695 var _this = this 720 var _this = this
696 this.$refs.arriveFormData.validate(valid => { 721 this.$refs.arriveFormData.validate(valid => {
697 _this.arriveModel.user= { 722 _this.arriveModel.user= {
698 - username : JSON.parse(sessionStorage.getItem('user')).username 723 + username : loginUserInfo.username
699 } 724 }
700 if (valid) { 725 if (valid) {
701 updateMT3201(this.arriveModel).then(res => { 726 updateMT3201(this.arriveModel).then(res => {
702 - if (res.data.count > 0) { 727 + if (res.data.code == "200") {
703 this.dialogFormVisible = false 728 this.dialogFormVisible = false
704 - Message.success("出港运抵修改成功") 729 + Message.success(res.data.msg);
705 this.getList() 730 this.getList()
706 - } else {  
707 - Message.error("数据更新失败，请检查数据") 731 + }else if (res.data.code == "201"){
  732 + Message.error(res.data.msg);
  733 + }else if (res.data.code == "202"){
  734 + Message.error(res.data.msg);
  735 + }else {
  736 + Message.error("数据更新失败，请检查数据");
708 } 737 }
709 }) 738 })
710 } 739 }
@@ -725,7 +754,7 @@ @@ -725,7 +754,7 @@
725 delete row.children 754 delete row.children
726 755
727 row.user = { 756 row.user = {
728 - username : JSON.parse(sessionStorage.getItem('user')).username 757 + username : loginUserInfo.username
729 } 758 }
730 759
731 sendCreateMt3201(row).then(res => { 760 sendCreateMt3201(row).then(res => {
@@ -754,7 +783,7 @@ @@ -754,7 +783,7 @@
754 customCode: undefined, 783 customCode: undefined,
755 flightDate: undefined, 784 flightDate: undefined,
756 awbh: undefined, 785 awbh: undefined,
757 - username: JSON.parse(sessionStorage.getItem('user')).username, 786 + username: loginUserInfo.username,
758 } 787 }
759 this.dialogDeleteVisible = true 788 this.dialogDeleteVisible = true
760 this.respModel.flightNo = row.flightno 789 this.respModel.flightNo = row.flightno
@@ -805,22 +834,25 @@ @@ -805,22 +834,25 @@
805 }, 834 },
806 //删除运单 835 //删除运单
807 handleAwbDelete(row) { 836 handleAwbDelete(row) {
  837 + row.user = {
  838 + username: loginUserInfo.username
  839 + }
808 this.$confirm("是否删除", "确认消息", { 840 this.$confirm("是否删除", "确认消息", {
809 distinguishCancelAndClose: true, 841 distinguishCancelAndClose: true,
810 confirmButtonText: '删除', 842 confirmButtonText: '删除',
811 cancelButtonText: '取消' 843 cancelButtonText: '取消'
812 }).then(() => { 844 }).then(() => {
813 deleteByIsDelete(row).then(res => { 845 deleteByIsDelete(row).then(res => {
814 - if (res.data.count > 0) { 846 + if (res.data.code == "200") {
815 this.$message({ 847 this.$message({
816 type: 'success', 848 type: 'success',
817 - message: '删除成功' 849 + message: res.data.msg
818 }) 850 })
819 this.getList() 851 this.getList()
820 } else { 852 } else {
821 this.$message({ 853 this.$message({
822 type: 'danger', 854 type: 'danger',
823 - message: '删除异常，请稍后重试' 855 + message: res.data.msg
824 }) 856 })
825 } 857 }
826 }) 858 })
@@ -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>
@@ -32,25 +32,27 @@ @@ -32,25 +32,27 @@
32 <div class="grid-content"> 32 <div class="grid-content">
33 <el-col :span="3"> 33 <el-col :span="3">
34 <div class="grid-content"> 34 <div class="grid-content">
35 - <el-input size="small" v-model="preQuery.awba" placeholder="请输入主单号" clearable></el-input> 35 + <el-input v-model="preQuery.awba" placeholder="请输入主单号" clearable>
  36 + <template slot="prepend">主单号</template>
  37 + </el-input>
36 </div> 38 </div>
37 </el-col> 39 </el-col>
38 <div class="grid-content el-btn"> 40 <div class="grid-content el-btn">
39 - <el-button size="small" type="warning" style="width:150px" icon="el-icon-search" @click="handleSerach">查询</el-button>  
40 - <el-button size="small" v-if="preQuery.flightno === undefined && preData.length<1" type="primary" 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 style="width:150px" icon="el-icon-plus" 43 style="width:150px" icon="el-icon-plus"
42 @click="handleAddpre">新增预配舱单 44 @click="handleAddpre">新增预配舱单
43 </el-button> 45 </el-button>
44 - <el-button @click="handleAwbSend('')" v-if="batchChooseFlag" style="width:150px" size="small" type="primary"> 46 + <el-button @click="handleAwbSend('')" v-if="batchChooseFlag" style="width:150px" type="primary">
45 批量发送申报 47 批量发送申报
46 </el-button> 48 </el-button>
47 - <el-button @click="handleAwbEdit('')" v-if="batchChooseFlag" style="width:150px" size="small" type="success"> 49 + <el-button @click="handleAwbEdit('')" v-if="batchChooseFlag" style="width:150px" type="success">
48 批量发送修改申报 50 批量发送修改申报
49 </el-button> 51 </el-button>
50 - <el-button @click="download" v-if="batchChooseFlag" style="width:150px" size="small" type="danger"> 52 + <el-button @click="handleSendDelete('')" v-if="batchChooseFlag" style="width:150px" type="danger">
51 批量发送删除申报 53 批量发送删除申报
52 </el-button> 54 </el-button>
53 - <el-button @click="download" style="width:150px" size="small" type="success"> 55 + <el-button @click="download" style="width:150px" type="success">
54 模板下载 56 模板下载
55 </el-button> 57 </el-button>
56 <el-upload 58 <el-upload
@@ -61,7 +63,7 @@ @@ -61,7 +63,7 @@
61 :on-exceed="fileExceed" 63 :on-exceed="fileExceed"
62 accept="application/vnd.ms-excel,application/vnd.ms-excels" 64 accept="application/vnd.ms-excel,application/vnd.ms-excels"
63 ref="fileupload"> 65 ref="fileupload">
64 - <el-button slot="trigger" style="width:150px" size="small" icon="el-icon-folder-add" type="primary">导入excel</el-button> 66 + <el-button slot="trigger" style="width:150px" icon="el-icon-folder-add" type="primary">导入excel</el-button>
65 </el-upload> 67 </el-upload>
66 </div> 68 </div>
67 </div> 69 </div>
@@ -84,20 +86,35 @@ @@ -84,20 +86,35 @@
84 :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> 86 :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
85 <el-table-column type="selection" width="55"> 87 <el-table-column type="selection" width="55">
86 </el-table-column> 88 </el-table-column>
87 - <el-table-column label="运单号" width="130" align="center"> 89 + <el-table-column label="运单号" width="140" align="center">
88 <template slot-scope="scope"> 90 <template slot-scope="scope">
89 <a type="text" style="color: #409eff;text-decoration: underline" class="tableInline" @click="handleEdit(scope.row)" v-if="scope.row.awbh !==''">{{scope.row.awbh}}</a> 91 <a type="text" style="color: #409eff;text-decoration: underline" class="tableInline" @click="handleEdit(scope.row)" v-if="scope.row.awbh !==''">{{scope.row.awbh}}</a>
90 <a type="text" style="color: #409eff;text-decoration: underline" class="tableInline" @click="handleEdit(scope.row)" v-else>{{scope.row.awba}}</a> 92 <a type="text" style="color: #409eff;text-decoration: underline" class="tableInline" @click="handleEdit(scope.row)" v-else>{{scope.row.awba}}</a>
91 </template> 93 </template>
92 </el-table-column> 94 </el-table-column>
93 - <el-table-column label="运单件数/重量" width="100" align="center"> 95 + <el-table-column label="航班号" width="70" align="center">
  96 + <template slot-scope="scope">
  97 + <span class="tableInline">{{scope.row.carrier}}{{scope.row.flightno}}</span>
  98 + </template>
  99 + </el-table-column>
  100 + <el-table-column label="航班日期" width="100" align="center">
94 <template slot-scope="scope"> 101 <template slot-scope="scope">
95 - {{scope.row.awbinfo.pcs}}/{{scope.row.awbinfo.weight}} 102 + <span class="tableInline">{{scope.row.flightdate}}</span>
96 </template> 103 </template>
97 </el-table-column> 104 </el-table-column>
98 - <el-table-column label="预配件数/重量" width="100" align="center"> 105 + <el-table-column label="目的站" width="80" align="center">
99 <template slot-scope="scope"> 106 <template slot-scope="scope">
100 - {{scope.row.piece}}/{{scope.row.weight}} 107 + <span class="tableInline">{{scope.row.destinationstation}}</span>
  108 + </template>
  109 + </el-table-column>
  110 + <el-table-column label="件数" width="50" align="center">
  111 + <template slot-scope="scope">
  112 + {{scope.row.piece}}
  113 + </template>
  114 + </el-table-column>
  115 + <el-table-column label="重量" width="60" align="center">
  116 + <template slot-scope="scope">
  117 + {{scope.row.weight}}
101 </template> 118 </template>
102 </el-table-column> 119 </el-table-column>
103 <el-table-column label="货物描述" width="120" align="center"> 120 <el-table-column label="货物描述" width="120" align="center">
@@ -105,6 +122,11 @@ @@ -105,6 +122,11 @@
105 {{scope.row.goodsname}} 122 {{scope.row.goodsname}}
106 </template> 123 </template>
107 </el-table-column> 124 </el-table-column>
  125 + <el-table-column label="海关关区" width="70" align="center">
  126 + <template slot-scope="scope">
  127 + {{scope.row.customcode}}
  128 + </template>
  129 + </el-table-column>
108 <el-table-column label="配载时间" width="150" align="center"> 130 <el-table-column label="配载时间" width="150" align="center">
109 <template slot-scope="scope"> 131 <template slot-scope="scope">
110 {{scope.row.actime}} 132 {{scope.row.actime}}
@@ -143,34 +165,34 @@ @@ -143,34 +165,34 @@
143 <template slot-scope="scope" > 165 <template slot-scope="scope" >
144 <el-row> 166 <el-row>
145 <el-col :span="5" style="margin-right: 10px"> 167 <el-col :span="5" style="margin-right: 10px">
146 - <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button> 168 + <el-button type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
147 </el-col> 169 </el-col>
148 <el-col :span="5" style="margin-right: 10px"> 170 <el-col :span="5" style="margin-right: 10px">
149 - <el-button type="warning" icon="el-icon-view" size="mini" @click="handleSend(scope.row)">收发明细</el-button> 171 + <el-button type="warning" icon="el-icon-view" @click="handleSend(scope.row)">收发明细</el-button>
150 </el-col> 172 </el-col>
151 <el-col :span="5" style="margin-right: 10px"> 173 <el-col :span="5" style="margin-right: 10px">
152 - <el-button type="info" icon="el-icon-edit" size="mini" @click="handleAwbStatus(scope.row)" 174 + <el-button type="info" icon="el-icon-edit" @click="handleAwbStatus(scope.row)"
153 :disabled="scope.row.status === '22'">更改状态 175 :disabled="scope.row.status === '22'">更改状态
154 </el-button> 176 </el-button>
155 </el-col> 177 </el-col>
156 <el-col :span="5" style="margin-right: 10px"> 178 <el-col :span="5" style="margin-right: 10px">
157 - <el-button type="primary" icon="el-icon-plus" size="mini" v-if="scope.row.awbh ===''" 179 + <el-button type="primary" icon="el-icon-plus" v-if="scope.row.awbh ===''"
158 @click="handleAddAwbh(scope.row)">新增分单 180 @click="handleAddAwbh(scope.row)">新增分单
159 </el-button> 181 </el-button>
160 </el-col> 182 </el-col>
161 </el-row> 183 </el-row>
162 <el-row> 184 <el-row>
163 <el-col :span="7" style="margin-right: 10px"> 185 <el-col :span="7" style="margin-right: 10px">
164 - <el-button type="primary" icon="el-icon-plus" size="mini" style="width: 130px" @click="handleAwbSend(scope.row.uuid)" 186 + <el-button type="primary" icon="el-icon-plus" style="width: 130px" @click="handleAwbSend(scope.row.uuid)"
165 :disabled="addStatus(scope.row.status)">发送预配舱单报 187 :disabled="addStatus(scope.row.status)">发送预配舱单报
166 </el-button> 188 </el-button>
167 </el-col> 189 </el-col>
168 <el-col :span="7" style="margin-right: 10px"> 190 <el-col :span="7" style="margin-right: 10px">
169 - <el-button type="success" icon="el-icon-plus" size="mini" style="width: 130px" @click="handleAwbEdit(scope.row.uuid)" 191 + <el-button type="success" icon="el-icon-plus" style="width: 130px" @click="handleAwbEdit(scope.row.uuid)"
170 :disabled="editStatus(scope.row.status)">发送预配修改报</el-button> 192 :disabled="editStatus(scope.row.status)">发送预配修改报</el-button>
171 </el-col> 193 </el-col>
172 <el-col :span="7"> 194 <el-col :span="7">
173 - <el-button type="danger" icon="el-icon-delete" size="mini" style="width: 130px;margin-bottom: 10px" @click="handleSendDelete(scope.row)" 195 + <el-button type="danger" icon="el-icon-delete" style="width: 130px;margin-bottom: 10px" @click="handleSendDelete(scope.row.uuid)"
174 :disabled="deleteStatus(scope.row.status)">发送预配删除报</el-button> 196 :disabled="deleteStatus(scope.row.status)">发送预配删除报</el-button>
175 </el-col> 197 </el-col>
176 </el-row> 198 </el-row>
@@ -181,10 +203,10 @@ @@ -181,10 +203,10 @@
181 203
182 <div class="btnFoot"> 204 <div class="btnFoot">
183 <el-row> 205 <el-row>
184 - <el-button type="primary" size="mini" v-if="preQuery.flightno !== undefined || preData.length >0" 206 + <el-button type="primary" v-if="preQuery.flightno !== undefined || preData.length >0"
185 @click="handleAddpreInfo">新增预配舱单 207 @click="handleAddpreInfo">新增预配舱单
186 </el-button> 208 </el-button>
187 - <el-button type="primary" size="mini" @click="handelBackStep" 209 + <el-button type="primary" @click="handelBackStep"
188 v-if="preQuery.flightno !== undefined || preData.length >0">返回 210 v-if="preQuery.flightno !== undefined || preData.length >0">返回
189 </el-button> 211 </el-button>
190 </el-row> 212 </el-row>
@@ -386,19 +408,19 @@ @@ -386,19 +408,19 @@
386 </el-col> 408 </el-col>
387 </el-row> 409 </el-row>
388 410
389 - <el-row style="margin-bottom: 10px">  
390 - <el-col :span="7" v-if="fenStatus ==='addAwbh'">  
391 - <span>  
392 - 货物剩余信息：  
393 - </span>  
394 - </el-col>  
395 - <el-col :span="7" v-if="fenStatus ==='addAwbh'">  
396 - <span>剩余件数:{{awbPiece}}</span>  
397 - </el-col>  
398 - <el-col :span="7" v-if="fenStatus ==='addAwbh'">  
399 - <span>剩余重量:{{awbWeight}}</span>  
400 - </el-col>  
401 - </el-row> 411 +<!-- <el-row style="margin-bottom: 10px">-->
  412 +<!-- <el-col :span="7" v-if="fenStatus ==='addAwbh'">-->
  413 +<!-- <span>-->
  414 +<!-- 货物剩余信息：-->
  415 +<!-- </span>-->
  416 +<!-- </el-col>-->
  417 +<!-- <el-col :span="7" v-if="fenStatus ==='addAwbh'">-->
  418 +<!-- <span>剩余件数:{{awbPiece}}</span>-->
  419 +<!-- </el-col>-->
  420 +<!-- <el-col :span="7" v-if="fenStatus ==='addAwbh'">-->
  421 +<!-- <span>剩余重量:{{awbWeight}}</span>-->
  422 +<!-- </el-col>-->
  423 +<!-- </el-row>-->
402 <div style="font-size: 10px;background-color: #F0F0F0;color: #6459A5"> 424 <div style="font-size: 10px;background-color: #F0F0F0;color: #6459A5">
403 <span style="text-align:center;display:inline-block;width:100px;border-bottom: 2px solid #6459A5"> 425 <span style="text-align:center;display:inline-block;width:100px;border-bottom: 2px solid #6459A5">
404 发货人 426 发货人
@@ -698,7 +720,7 @@ @@ -698,7 +720,7 @@
698 <el-button @click="dialogDeleteVisble = false" size="medium" 720 <el-button @click="dialogDeleteVisble = false" size="medium"
699 style="width: 100px;background-color: #6F8294;color: #ffffff">取消</el-button> 721 style="width: 100px;background-color: #6F8294;color: #ffffff">取消</el-button>
700 <el-button type="success" size="medium" style="width: 100px" 722 <el-button type="success" size="medium" style="width: 100px"
701 - @click="sendStatus ==='edit'? sendUpdate():sendDelete()">发送</el-button> 723 + @click="sendStatus =='edit'? sendUpdate():sendDelete()">发送</el-button>
702 </div> 724 </div>
703 </el-dialog> 725 </el-dialog>
704 <el-dialog title="发货人信息" :visible.sync="dialogSelectVisible" width="70%"> 726 <el-dialog title="发货人信息" :visible.sync="dialogSelectVisible" width="70%">
@@ -1677,6 +1699,8 @@ @@ -1677,6 +1699,8 @@
1677 } 1699 }
1678 }, 1700 },
1679 sendUpdate(){ 1701 sendUpdate(){
  1702 + this.$refs.sendDeleteForm.validate(valid =>{
  1703 + if(valid){
1680 let checkArr = ""; 1704 let checkArr = "";
1681 let ids = []; 1705 let ids = [];
1682 if (this.restModel.uuid !== undefined && this.restModel.uuid !== ""){ 1706 if (this.restModel.uuid !== undefined && this.restModel.uuid !== ""){
@@ -1687,8 +1711,6 @@ @@ -1687,8 +1711,6 @@
1687 ids.push(item.uuid); 1711 ids.push(item.uuid);
1688 }) 1712 })
1689 } 1713 }
1690 - this.$refs.sendDeleteForm.validate(valid =>{  
1691 - if(valid){  
1692 const form = new FormData() 1714 const form = new FormData()
1693 form.append("username", loginUserInfo.username); 1715 form.append("username", loginUserInfo.username);
1694 form.append("ids", ids); 1716 form.append("ids", ids);
@@ -1710,28 +1732,11 @@ @@ -1710,28 +1732,11 @@
1710 }, 1732 },
1711 1733
1712 // >>>>>>>>>>>>>>>>发送删除报<<<<<<<<<<<<<<<<<< 1734 // >>>>>>>>>>>>>>>>发送删除报<<<<<<<<<<<<<<<<<<
1713 - handleSendDelete(row) {  
1714 - this.respModel = {  
1715 - carrier: undefined,  
1716 - reason: undefined,  
1717 - contactName: undefined,  
1718 - contactTel: undefined,  
1719 - content: '',  
1720 - flightNo: undefined,  
1721 - awba: undefined,  
1722 - customCode: undefined,  
1723 - flightDate: undefined,  
1724 - awbh: '',  
1725 - username: JSON.parse(sessionStorage.getItem('user')).username,  
1726 - }  
1727 - this.rows = row;  
1728 - this.dialogDeleteVisble = true  
1729 - this.respModel.awba = row.awba  
1730 - this.respModel.flightNo = row.flightno  
1731 - this.respModel.customCode = row.customcode  
1732 - this.respModel.awbh = row.awbh  
1733 - this.respModel.flightDate = row.flightdate  
1734 - this.respModel.carrier = row.carrier 1735 + handleSendDelete(id) {
  1736 + this.batchModel();
  1737 + this.restModel.uuid = id;
  1738 + this.sendStatus = "remove";
  1739 + this.dialogDeleteVisble = true;
1735 this.$nextTick(()=>{ 1740 this.$nextTick(()=>{
1736 this.$refs.sendDeleteForm.clearValidate() 1741 this.$refs.sendDeleteForm.clearValidate()
1737 }) 1742 })
@@ -1747,14 +1752,31 @@ @@ -1747,14 +1752,31 @@
1747 sendDelete() { 1752 sendDelete() {
1748 this.$refs.sendDeleteForm.validate(valid =>{ 1753 this.$refs.sendDeleteForm.validate(valid =>{
1749 if(valid){ 1754 if(valid){
1750 - sendDeleteMt2201(this.respModel).then(res => {  
1751 - if(res.data.count>0){  
1752 - Message.success(res.data.respMessage)  
1753 - this.dialogDeleteVisble = false 1755 + let checkArr = "";
  1756 + let ids = [];
  1757 + if (this.restModel.uuid !== undefined && this.restModel.uuid !== ""){
  1758 + ids.push(this.restModel.uuid);
  1759 + }else {
  1760 + checkArr = this.batchChooseSelection;
  1761 + checkArr.forEach(function (item) {
  1762 + ids.push(item.uuid);
  1763 + })
  1764 + }
  1765 + const form = new FormData()
  1766 + form.append("username", loginUserInfo.username);
  1767 + form.append("ids", ids);
  1768 + form.append("reason", this.respModel.reason);
  1769 + form.append("contactName", this.respModel.contactName);
  1770 + form.append("contactTel", this.respModel.contactTel);
  1771 + form.append("content", this.respModel.content);
  1772 + sendDeleteMt2201(form).then(res => {
  1773 + if(res.data.code=="200"){
  1774 + Message.success(res.data.msg)
1754 this.rows.status="24"; 1775 this.rows.status="24";
1755 this.rows.ext5="删除报发送成功"; 1776 this.rows.ext5="删除报发送成功";
  1777 + this.dialogDeleteVisble = false
1756 }else { 1778 }else {
1757 - Message.error(res.data.respMessage) 1779 + Message.error(res.data.msg)
1758 } 1780 }
1759 }) 1781 })
1760 } 1782 }
@@ -1953,10 +1975,10 @@ @@ -1953,10 +1975,10 @@
1953 form.append("username", loginUserInfo.username); 1975 form.append("username", loginUserInfo.username);
1954 uploadFileExcel(form).then(res =>{ 1976 uploadFileExcel(form).then(res =>{
1955 if(res.data.code =='200'){ 1977 if(res.data.code =='200'){
1956 - Message.success(res.data.respMessage) 1978 + Message.success(res.data.msg)
1957 this.getList(); 1979 this.getList();
1958 }else { 1980 }else {
1959 - Message.error(res.data.respMessage) 1981 + Message.error(res.data.msg)
1960 } 1982 }
1961 }) 1983 })
1962 }, 1984 },
@@ -1979,7 +2001,6 @@ @@ -1979,7 +2001,6 @@
1979 flightDate: this.preModel.flightdate 2001 flightDate: this.preModel.flightdate
1980 } 2002 }
1981 selectPredictionInterface(params).then(res =>{ 2003 selectPredictionInterface(params).then(res =>{
1982 - console.log(res.data.data+"-------------");  
1983 if(res.data.data != undefined && res.data.data != ""){ 2004 if(res.data.data != undefined && res.data.data != ""){
1984 const span = document.getElementById("message"); 2005 const span = document.getElementById("message");
1985 span.innerHTML = res.data.data[0].statusMsg; 2006 span.innerHTML = res.data.data[0].statusMsg;
不能预览此文件类型