朱兆平 / vue_cli · 提交

转到一个项目

作者 xudada
提交 14d016fec397353d8fd9398e33a41849ca487e74 1 个父辈 b27bc99c

更新优化

内嵌 并排对比
正在显示 5 个修改的文件 包含 193 行增加 和 47 行删除
@@ -81,9 +81,8 @@ @@ -81,9 +81,8 @@
81 <el-table-column 81 <el-table-column
82 fixed="left" 82 fixed="left"
83 label="修改状态" 83 label="修改状态"
84 - width="140"> 84 + width="100">
85 <template slot-scope="scope"> 85 <template slot-scope="scope">
86 - <el-button @click="handleClick(scope.row)" type="text" size="small">修改状态</el-button>  
87 <el-button v-if="scope.row.turntype=='MT6202'" type="text" @click="seeimport(scope.row)" size="mini">分拨申请</el-button> 86 <el-button v-if="scope.row.turntype=='MT6202'" type="text" @click="seeimport(scope.row)" size="mini">分拨申请</el-button>
88 <el-button v-else type="text" @click="seearrive(scope.row)" size="mini">分拨运抵</el-button> 87 <el-button v-else type="text" @click="seearrive(scope.row)" size="mini">分拨运抵</el-button>
89 </template> 88 </template>
@@ -146,13 +145,13 @@ @@ -146,13 +145,13 @@
146 v-if="scope.row.turntype=='MT6202'" 145 v-if="scope.row.turntype=='MT6202'"
147 size="mini" 146 size="mini"
148 type="primary" 147 type="primary"
149 - @click="importDetail(scope.$index, scope.row)">收发明细 148 + @click="handleDetail(scope.$index, scope.row)">收发明细
150 </el-button> 149 </el-button>
151 <el-button 150 <el-button
152 v-else 151 v-else
153 size="mini" 152 size="mini"
154 type="primary" 153 type="primary"
155 - @click="arriveDetail(scope.$index, scope.row)">收发明细 154 + @click="handleDetail(scope.$index, scope.row)">收发明细
156 </el-button> 155 </el-button>
157 <el-button 156 <el-button
158 v-if="scope.row.turntype=='MT6202'" 157 v-if="scope.row.turntype=='MT6202'"
@@ -204,7 +203,7 @@ @@ -204,7 +203,7 @@
204 @size-change="handleSizeChange" 203 @size-change="handleSizeChange"
205 @current-change="handleCurrentChange" 204 @current-change="handleCurrentChange"
206 :current-page="currentPage" 205 :current-page="currentPage"
207 - :page-sizes="[10, 20, 300, 400]" 206 + :page-sizes="[100, 200, 300, 400]"
208 :page-size="pageSize" 207 :page-size="pageSize"
209 layout="total, sizes, prev, pager, next, jumper" 208 layout="total, sizes, prev, pager, next, jumper"
210 :total="total"> 209 :total="total">
@@ -481,6 +480,18 @@ @@ -481,6 +480,18 @@
481 </div> 480 </div>
482 </el-dialog> 481 </el-dialog>
483 </el-row> 482 </el-row>
  483 + <!--明细列表弹出框-->
  484 + <el-row>
  485 + <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%">
  486 + <el-table :data="gridData">
  487 + <el-table-column property="busdate" label="时间" width="160"></el-table-column>
  488 + <el-table-column property="username" label="操作人" width="130"></el-table-column>
  489 + <el-table-column property="buspiece" label="发送件数" width="130"></el-table-column>
  490 + <el-table-column property="busweight" label="发送重量" width="130"></el-table-column>
  491 + <el-table-column property="cusrestext" label="回执内容"></el-table-column>
  492 + </el-table>
  493 + </el-dialog>
  494 + </el-row>
484 </el-main> 495 </el-main>
485 </el-container> 496 </el-container>
486 </template> 497 </template>
@@ -492,8 +503,12 @@ @@ -492,8 +503,12 @@
492 .sel{display: inline;} 503 .sel{display: inline;}
493 .mark{height:24px;} 504 .mark{height:24px;}
494 .bg{height:24px;text-align: center;line-height:24px;min-height: 24px} 505 .bg{height:24px;text-align: center;line-height:24px;min-height: 24px}
  506 + .el-input-group{
  507 + display: table;
  508 + }
495 </style> 509 </style>
496 <script> 510 <script>
  511 + import{addResponse,selectResponseList} from "../../api/InResponse";
497 import { QueryData,ediAllocat,sendCreateMt6202,sendRemoveMt6202,sendCreateMt3202,sendRemoveMt3202 } from '../../api/Allocat' 512 import { QueryData,ediAllocat,sendCreateMt6202,sendRemoveMt6202,sendCreateMt3202,sendRemoveMt3202 } from '../../api/Allocat'
498 export default{ 513 export default{
499 data(){ 514 data(){
@@ -693,9 +708,23 @@ @@ -693,9 +708,23 @@
693 dialogFormVisible: false, 708 dialogFormVisible: false,
694 rows:{}, 709 rows:{},
695 loading:false, 710 loading:false,
  711 + dialogTableVisible:false,
  712 + gridData:[]
696 } 713 }
697 }, 714 },
698 methods:{ 715 methods:{
  716 + //回执收发明细
  717 + handleDetail(index,row){
  718 + if(row.flightno.length>4){
  719 + row.flightno=row.flightno.substring(2);
  720 + }
  721 + let params={awbano:row.awba,awbhno:row.awbh,carrier:row.carrier,flightno:row.flightno,flightdate:row.flightdate,bustype:row.turntype}
  722 + selectResponseList(params).then(res=>{
  723 + this.dialogTableVisible=true;
  724 + let response=res.data.data;
  725 + this.gridData=response;
  726 + });
  727 + },
699 //状态适配 728 //状态适配
700 formatStatus:function (row,column) { 729 formatStatus:function (row,column) {
701 return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单' 730 return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
@@ -730,16 +759,11 @@ @@ -730,16 +759,11 @@
730 this.Udform.carrier=row.carrier; 759 this.Udform.carrier=row.carrier;
731 this.Udform.flightno=row.flightno.substring(2); 760 this.Udform.flightno=row.flightno.substring(2);
732 this.Udform.flightdate=row.flightdate; 761 this.Udform.flightdate=row.flightdate;
733 - this.Udform.bustype='MT5201'; 762 + this.Udform.bustype='MT6202';
734 this.Udform.busdate=Date.parse(new Date()); 763 this.Udform.busdate=Date.parse(new Date());
735 this.Udform.busweight=row.weight; 764 this.Udform.busweight=row.weight;
736 this.Udform.buspiece=row.piece; 765 this.Udform.buspiece=row.piece;
737 this.Udform.opertype='发送分拨申请删除报'; 766 this.Udform.opertype='发送分拨申请删除报';
738 - if(row.flightno.length>4){  
739 - row.flightno=row.flightno;  
740 - }else{  
741 - row.flightno=row.carrier+row.flightno;  
742 - };  
743 if(row.awbh==null){ 767 if(row.awbh==null){
744 row.awbh=""; 768 row.awbh="";
745 } 769 }
@@ -797,6 +821,7 @@ @@ -797,6 +821,7 @@
797 }, 821 },
798 //发送分拨运抵报 822 //发送分拨运抵报
799 arriveSend(index,row){ 823 arriveSend(index,row){
  824 +
800 const map = {'mt3202':row} 825 const map = {'mt3202':row}
801 sendCreateMt3202(map).then(res=>{ 826 sendCreateMt3202(map).then(res=>{
802 let response=res.data; 827 let response=res.data;
@@ -822,16 +847,11 @@ @@ -822,16 +847,11 @@
822 this.Udform.carrier=row.carrier; 847 this.Udform.carrier=row.carrier;
823 this.Udform.flightno=row.flightno.substring(2); 848 this.Udform.flightno=row.flightno.substring(2);
824 this.Udform.flightdate=row.flightdate; 849 this.Udform.flightdate=row.flightdate;
825 - this.Udform.bustype='MT5201'; 850 + this.Udform.bustype='MT3202';
826 this.Udform.busdate=Date.parse(new Date()); 851 this.Udform.busdate=Date.parse(new Date());
827 this.Udform.busweight=row.weight; 852 this.Udform.busweight=row.weight;
828 this.Udform.buspiece=row.piece; 853 this.Udform.buspiece=row.piece;
829 this.Udform.opertype='发送分拨运抵删除报'; 854 this.Udform.opertype='发送分拨运抵删除报';
830 - if(row.flightno.length>4){  
831 - row.flightno=row.flightno;  
832 - }else{  
833 - row.flightno=row.carrier+row.flightno;  
834 - };  
835 if(row.awbh==null){ 855 if(row.awbh==null){
836 row.awbh=""; 856 row.awbh="";
837 } 857 }
@@ -3,8 +3,8 @@ @@ -3,8 +3,8 @@
3 <el-main > 3 <el-main >
4 <!--检索条件--> 4 <!--检索条件-->
5 <el-row> 5 <el-row>
6 - <el-col :span="4">  
7 - <div> 6 + <el-col :span="5">
  7 + <div class="block">
8 <el-input v-model="vcarrier" placeholder=""> 8 <el-input v-model="vcarrier" placeholder="">
9 <template slot="prepend">航班号</template> 9 <template slot="prepend">航班号</template>
10 </el-input> 10 </el-input>
@@ -90,6 +90,11 @@ @@ -90,6 +90,11 @@
90 </el-container> 90 </el-container>
91 91
92 </template> 92 </template>
  93 +<style scoped>
  94 + .el-input-group{
  95 + display: table;
  96 + }
  97 +</style>
93 98
94 <script> 99 <script>
95 import { selectFlightLists } from '../../api/mt1201' 100 import { selectFlightLists } from '../../api/mt1201'
@@ -72,10 +72,17 @@ @@ -72,10 +72,17 @@
72 width="50"> 72 width="50">
73 </el-table-column> 73 </el-table-column>
74 <el-table-column 74 <el-table-column
75 - prop="waybill"  
76 label="运单号" 75 label="运单号"
77 - width="160" 76 + width="185"
78 show-overflow-tooltip> 77 show-overflow-tooltip>
  78 + <template slot-scope="scope">
  79 + <span v-if="scope.row.awbh==''||scope.row.awbh==null">
  80 + {{scope.row.awba}}
  81 + </span>
  82 + <span v-else>
  83 + {{scope.row.awbh}}
  84 + </span>
  85 + </template>
79 </el-table-column> 86 </el-table-column>
80 <el-table-column 87 <el-table-column
81 prop="awbinfo.pcs" 88 prop="awbinfo.pcs"
@@ -119,7 +126,7 @@ @@ -119,7 +126,7 @@
119 <el-table-column 126 <el-table-column
120 prop="operation" 127 prop="operation"
121 label="操作" 128 label="操作"
122 - width="750" 129 + width="850"
123 show-overflow-tooltip> 130 show-overflow-tooltip>
124 <template slot-scope="scope"> 131 <template slot-scope="scope">
125 <el-button 132 <el-button
@@ -142,17 +149,20 @@ @@ -142,17 +149,20 @@
142 <el-button 149 <el-button
143 size="mini" 150 size="mini"
144 type="primary" 151 type="primary"
145 - @click="handleSend(scope.$index, scope.row)">发送舱单报 152 + @click="handleSend(scope.$index, scope.row)"
  153 + :disabled="btSendStatusFormater(scope.row.status)">发送舱单报
146 </el-button> 154 </el-button>
147 <el-button 155 <el-button
148 size="mini" 156 size="mini"
149 type="primary" 157 type="primary"
150 - @click="handleUpdate(scope.$index, scope.row)">发送舱单修改报 158 + @click="handleUpdate(scope.$index, scope.row)"
  159 + :disabled="btEditStatusFormater(scope.row.status)">发送舱单修改报
151 </el-button> 160 </el-button>
152 <el-button 161 <el-button
153 size="mini" 162 size="mini"
154 type="primary" 163 type="primary"
155 - @click="handleDelete(scope.$index, scope.row)">发送舱单删除报 164 + @click="handleDelete(scope.$index, scope.row)"
  165 + :disabled="btDeleStatusFormater(scope.row.status)">发送舱单删除报
156 </el-button> 166 </el-button>
157 <el-button 167 <el-button
158 v-if="scope.row.awbh==''||scope.row.awbh==null" 168 v-if="scope.row.awbh==''||scope.row.awbh==null"
@@ -180,6 +190,11 @@ @@ -180,6 +190,11 @@
180 type="primary" 190 type="primary"
181 @click="Allocatearrive(scope.$index, scope.row)">分拨运抵 191 @click="Allocatearrive(scope.$index, scope.row)">分拨运抵
182 </el-button> 192 </el-button>
  193 + <el-button
  194 + size="mini"
  195 + type="primary"
  196 + @click="UpdateStatus(scope.$index, scope.row)">更改状态
  197 + </el-button>
183 </template> 198 </template>
184 </el-table-column> 199 </el-table-column>
185 </el-table> 200 </el-table>
@@ -601,6 +616,18 @@ @@ -601,6 +616,18 @@
601 </div> 616 </div>
602 </el-dialog> 617 </el-dialog>
603 </el-row> 618 </el-row>
  619 + <!--明细列表弹出框-->
  620 + <el-row>
  621 + <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%">
  622 + <el-table :data="gridData">
  623 + <el-table-column property="busdate" label="时间" width="160"></el-table-column>
  624 + <el-table-column property="username" label="操作人" width="130"></el-table-column>
  625 + <el-table-column property="buspiece" label="发送件数" width="130"></el-table-column>
  626 + <el-table-column property="busweight" label="发送重量" width="130"></el-table-column>
  627 + <el-table-column property="cusrestext" label="回执内容"></el-table-column>
  628 + </el-table>
  629 + </el-dialog>
  630 + </el-row>
604 </el-main> 631 </el-main>
605 </el-container> 632 </el-container>
606 </template> 633 </template>
@@ -658,7 +685,7 @@ @@ -658,7 +685,7 @@
658 685
659 <script> 686 <script>
660 import { getMt1201List,addMt1201,ediMt1201,getFenList,getCountryCode,selectCustomcode,sendCreateMt1201,sendEditeMt1201,sendRemoveMt1201 } from '../../api/mt1201' 687 import { getMt1201List,addMt1201,ediMt1201,getFenList,getCountryCode,selectCustomcode,sendCreateMt1201,sendEditeMt1201,sendRemoveMt1201 } from '../../api/mt1201'
661 - import{addResponse} from "../../api/InResponse"; 688 + import{addResponse,selectResponseList} from "../../api/InResponse";
662 689
663 export default { 690 export default {
664 data() { 691 data() {
@@ -727,7 +754,7 @@ @@ -727,7 +754,7 @@
727 cnsrctcname: undefined, 754 cnsrctcname: undefined,
728 cnsrctctel: undefined, 755 cnsrctctel: undefined,
729 cargonm: undefined, 756 cargonm: undefined,
730 - sairportid: undefined, 757 + sairportid: '',
731 dest1city: undefined, 758 dest1city: undefined,
732 by1: undefined, 759 by1: undefined,
733 dest1: undefined, 760 dest1: undefined,
@@ -808,6 +835,7 @@ @@ -808,6 +835,7 @@
808 busweight:'', 835 busweight:'',
809 buspiece:'', 836 buspiece:'',
810 opertype:'', 837 opertype:'',
  838 + cusrestext:''
811 }, 839 },
812 udrules:{ 840 udrules:{
813 operreason: [{required: true, message: '请输入操作原因', trigger: 'blur'}], 841 operreason: [{required: true, message: '请输入操作原因', trigger: 'blur'}],
@@ -816,10 +844,41 @@ @@ -816,10 +844,41 @@
816 }, 844 },
817 udStatus:'', 845 udStatus:'',
818 loading:false, 846 loading:false,
819 - rows:{} 847 + rows:{},
  848 + dialogTableVisible:false,
  849 + gridData:[]
820 } 850 }
821 }, 851 },
822 methods: { 852 methods: {
  853 + //回执收发明细
  854 + handleDetail(index,row){
  855 + if(row.flightno.length>4){
  856 + row.flightno=row.flightno.substring(2);
  857 + }
  858 + let params={awbano:row.awba,awbhno:row.awbh,carrier:row.carrier,flightno:row.flightno,flightdate:row.flightdate,bustype:'MT1201'}
  859 + selectResponseList(params).then(res=>{
  860 + this.dialogTableVisible=true;
  861 + let response=res.data.data;
  862 + this.gridData=response;
  863 + });
  864 + },
  865 + //更改状态
  866 + UpdateStatus(column,row){
  867 + this.$confirm("是否发送更改状态", "确认消息", {
  868 + distinguishCancelAndClose: true,
  869 + confirmButtonText: '确认更改',
  870 + cancelButtonText: '取消更改'
  871 + }).then(() => {
  872 + row.status = '22';
  873 + }).catch(action => {
  874 + this.$message({
  875 + type: 'info',
  876 + message: action === 'cancel'
  877 + ? '取消状态更改'
  878 + : '状态更改取消'
  879 + })
  880 + })
  881 + },
823 //状态识别 882 //状态识别
824 formatStatus: function(row,column){ 883 formatStatus: function(row,column){
825 return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单' 884 return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
@@ -827,6 +886,28 @@ @@ -827,6 +886,28 @@
827 :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报' 886 :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
828 :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':''; 887 :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
829 }, 888 },
  889 + //发送舱单报按钮判定事件
  890 + btSendStatusFormater:(status) => {
  891 + if(status=='23' || status=='24'||status=='25'){
  892 + return true;
  893 + }else if(status=='22' ) {
  894 + return false;
  895 + }
  896 + },
  897 + btEditStatusFormater:(status) => {
  898 + if(status=='23' || status=='24'||status=='25'){
  899 + return true;
  900 + }else if(status=='22' ) {
  901 + return false;
  902 + }
  903 + },
  904 + btDeleStatusFormater:(status) => {
  905 + if(status=='23' || status=='24'||status=='25'){
  906 + return true;
  907 + }else if(status=='22' ) {
  908 + return false;
  909 + }
  910 + },
830 /*多选框功能*/ 911 /*多选框功能*/
831 handleSelectionChange(val) { 912 handleSelectionChange(val) {
832 this.multipleSelection = val; 913 this.multipleSelection = val;
@@ -869,6 +950,7 @@ @@ -869,6 +950,7 @@
869 //console.log(res); 950 //console.log(res);
870 this.code=response.code; 951 this.code=response.code;
871 if(this.code=='200'){ 952 if(this.code=='200'){
  953 + row.status='23'
872 this.outerVisible = false; 954 this.outerVisible = false;
873 this.centerDialogVisible=true; 955 this.centerDialogVisible=true;
874 this.msg=response.msg; 956 this.msg=response.msg;
@@ -894,10 +976,8 @@ @@ -894,10 +976,8 @@
894 this.Udform.buspiece=row.piece; 976 this.Udform.buspiece=row.piece;
895 this.Udform.opertype='发送舱单删除报'; 977 this.Udform.opertype='发送舱单删除报';
896 if(row.flightno.length>4){ 978 if(row.flightno.length>4){
897 - row.flightno=row.flightno;  
898 - }else{  
899 - row.flightno=row.carrier+row.flightno;  
900 - }; 979 + row.flightno=row.flightno.substring(2);
  980 + }
901 this.rows=row; 981 this.rows=row;
902 }, 982 },
903 //提交发送舱单删除报表单 983 //提交发送舱单删除报表单
@@ -910,12 +990,14 @@ @@ -910,12 +990,14 @@
910 'awbh':this.rows.awbh, 990 'awbh':this.rows.awbh,
911 'reason' :this.Udform.operreason, 991 'reason' :this.Udform.operreason,
912 'contactName':this.Udform.operperson, 992 'contactName':this.Udform.operperson,
913 - 'contactTel':this.Udform.opertel} 993 + 'contactTel':this.Udform.opertel,
  994 + 'carrier':this.Udform.carrier}
914 sendRemoveMt1201(map).then(res=>{ 995 sendRemoveMt1201(map).then(res=>{
915 let response=res.data; 996 let response=res.data;
916 //console.log(res); 997 //console.log(res);
917 this.code=response.code; 998 this.code=response.code;
918 if(this.code=='200'){ 999 if(this.code=='200'){
  1000 + this.rows.status='24'
919 this.dialogFormVisible=false; 1001 this.dialogFormVisible=false;
920 this.outerVisible = false; 1002 this.outerVisible = false;
921 this.centerDialogVisible=true; 1003 this.centerDialogVisible=true;
@@ -962,6 +1044,7 @@ @@ -962,6 +1044,7 @@
962 //console.log(res); 1044 //console.log(res);
963 this.code=response.code; 1045 this.code=response.code;
964 if(this.code=='200'){ 1046 if(this.code=='200'){
  1047 + this.rows.status='25'
965 this.dialogFormVisible=false; 1048 this.dialogFormVisible=false;
966 this.outerVisible = false; 1049 this.outerVisible = false;
967 this.centerDialogVisible=true; 1050 this.centerDialogVisible=true;
@@ -106,7 +106,7 @@ @@ -106,7 +106,7 @@
106 <el-button 106 <el-button
107 size="mini" 107 size="mini"
108 type="primary" 108 type="primary"
109 - @click="handleEdit(scope.$index, scope.row)">收发明细</el-button> 109 + @click="handleDetail(scope.$index, scope.row)">收发明细</el-button>
110 <el-button 110 <el-button
111 v-if="scope.row.awbh==''||scope.row.awbh==null" 111 v-if="scope.row.awbh==''||scope.row.awbh==null"
112 size="mini" 112 size="mini"
@@ -361,6 +361,18 @@ @@ -361,6 +361,18 @@
361 </div> 361 </div>
362 </el-dialog> 362 </el-dialog>
363 </el-row> 363 </el-row>
  364 + <!--明细列表弹出框-->
  365 + <el-row>
  366 + <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%">
  367 + <el-table :data="gridData">
  368 + <el-table-column property="busdate" label="时间" width="160"></el-table-column>
  369 + <el-table-column property="username" label="操作人" width="130"></el-table-column>
  370 + <el-table-column property="buspiece" label="发送件数" width="130"></el-table-column>
  371 + <el-table-column property="busweight" label="发送重量" width="130"></el-table-column>
  372 + <el-table-column property="cusrestext" label="回执内容"></el-table-column>
  373 + </el-table>
  374 + </el-dialog>
  375 + </el-row>
364 </el-main> 376 </el-main>
365 </el-container> 377 </el-container>
366 </template> 378 </template>
@@ -399,6 +411,7 @@ @@ -399,6 +411,7 @@
399 </style> 411 </style>
400 412
401 <script> 413 <script>
  414 + import{addResponse,selectResponseList} from "../../api/InResponse";
402 import { getMt5201List,addMt5201,ediMt5201,delMt5201,sendCreateMt520x,sendRemoveMt520x,selectCustomcode} from '../../api/mt5201' 415 import { getMt5201List,addMt5201,ediMt5201,delMt5201,sendCreateMt520x,sendRemoveMt520x,selectCustomcode} from '../../api/mt5201'
403 export default { 416 export default {
404 data() { 417 data() {
@@ -487,9 +500,23 @@ @@ -487,9 +500,23 @@
487 dialogFormVisible: false, 500 dialogFormVisible: false,
488 rows:{}, 501 rows:{},
489 loading:false, 502 loading:false,
  503 + dialogTableVisible:false,
  504 + gridData:[]
490 } 505 }
491 }, 506 },
492 methods: { 507 methods: {
  508 + //回执收发明细
  509 + handleDetail(index,row){
  510 + if(row.flightno.length>4){
  511 + row.flightno=row.flightno.substring(2);
  512 + }
  513 + let params={awbano:row.awba,awbhno:row.awbh,carrier:row.carrier,flightno:row.flightno,flightdate:row.flightdate,bustype:'MT5201'}
  514 + selectResponseList(params).then(res=>{
  515 + this.dialogTableVisible=true;
  516 + let response=res.data.data;
  517 + this.gridData=response;
  518 + });
  519 + },
493 //状态适配 520 //状态适配
494 formatStatus:function (row,column) { 521 formatStatus:function (row,column) {
495 return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单' 522 return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
@@ -555,10 +582,8 @@ @@ -555,10 +582,8 @@
555 this.Udform.buspiece=row.piece; 582 this.Udform.buspiece=row.piece;
556 this.Udform.opertype='发送理货删除报'; 583 this.Udform.opertype='发送理货删除报';
557 if(row.flightno.length>4){ 584 if(row.flightno.length>4){
558 - row.flightno=row.flightno;  
559 - }else{  
560 - row.flightno=row.carrier+row.flightno;  
561 - }; 585 + row.flightno=row.flightno.substring(2);
  586 + }
562 if(row.awbh==null){ 587 if(row.awbh==null){
563 row.awbh=""; 588 row.awbh="";
564 } 589 }
@@ -575,7 +600,8 @@ @@ -575,7 +600,8 @@
575 'reason' :this.Udform.operreason, 600 'reason' :this.Udform.operreason,
576 'contactName':this.Udform.operperson, 601 'contactName':this.Udform.operperson,
577 'contactTel':this.Udform.opertel, 602 'contactTel':this.Udform.opertel,
578 - 'rcfdep':this.rows.rcfdep} 603 + 'rcfdep':this.rows.rcfdep,
  604 + 'carrier':this.rows.carrier}
579 sendRemoveMt520x(map).then(res=>{ 605 sendRemoveMt520x(map).then(res=>{
580 let response=res.data; 606 let response=res.data;
581 //console.log(res); 607 //console.log(res);
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 </el-col> 15 </el-col>
16 <el-col :span="5"> 16 <el-col :span="5">
17 <div class="grid-content"> 17 <div class="grid-content">
18 - <el-input placeholder="" v-model="defaultQuery.carrier"> 18 + <el-input placeholder="" v-model="vcarrier">
19 <template slot="prepend">承运人</template> 19 <template slot="prepend">承运人</template>
20 </el-input> 20 </el-input>
21 </div> 21 </div>
@@ -89,6 +89,7 @@ @@ -89,6 +89,7 @@
89 :data="tableData" 89 :data="tableData"
90 tooltip-effect="dark" 90 tooltip-effect="dark"
91 style="width: 100%" 91 style="width: 100%"
  92 + :default-sort = "{prop: 'date', order: 'descending'}"
92 @selection-change="handleSelectionChange"> 93 @selection-change="handleSelectionChange">
93 <el-table-column 94 <el-table-column
94 type="selection" 95 type="selection"
@@ -97,7 +98,7 @@ @@ -97,7 +98,7 @@
97 <el-table-column 98 <el-table-column
98 fixed="left" 99 fixed="left"
99 label="操作" 100 label="操作"
100 - width="135"> 101 + width="75">
101 <template slot-scope="scope"> 102 <template slot-scope="scope">
102 <el-button 103 <el-button
103 v-if="scope.row.stype=='MT1201'" 104 v-if="scope.row.stype=='MT1201'"
@@ -105,7 +106,6 @@ @@ -105,7 +106,6 @@
105 <el-button 106 <el-button
106 v-else 107 v-else
107 @click="handleTally(scope.row)" type="text" size="small">进港理货</el-button> 108 @click="handleTally(scope.row)" type="text" size="small">进港理货</el-button>
108 - <el-button @click="handleStuts(scope.row)" type="text" size="small">修改状态</el-button>  
109 </template> 109 </template>
110 </el-table-column> 110 </el-table-column>
111 <el-table-column 111 <el-table-column
@@ -207,6 +207,9 @@ @@ -207,6 +207,9 @@
207 .tallfense{background-color: #C55124} 207 .tallfense{background-color: #C55124}
208 .cell{background: #5BB75B} 208 .cell{background: #5BB75B}
209 .cell2{background-color: #12B399} 209 .cell2{background-color: #12B399}
  210 + .el-input-group{
  211 + display: table;
  212 + }
210 </style> 213 </style>
211 <script> 214 <script>
212 import { QueryData } from '../../api/wayDeclaration' 215 import { QueryData } from '../../api/wayDeclaration'
@@ -226,13 +229,13 @@ @@ -226,13 +229,13 @@
226 value: '01', 229 value: '01',
227 label: '选择状态' 230 label: '选择状态'
228 }, { 231 }, {
229 - value: '02', 232 + value: '22',
230 label: '未发送' 233 label: '未发送'
231 }, { 234 }, {
232 - value: '03', 235 + value: '23',
233 label: '已发舱单报' 236 label: '已发舱单报'
234 }, { 237 }, {
235 - value: '04', 238 + value: '03',
236 label: '舱单报退单' 239 label: '舱单报退单'
237 }], 240 }],
238 options2: [ 241 options2: [
@@ -276,14 +279,13 @@ @@ -276,14 +279,13 @@
276 :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报' 279 :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
277 :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':''; 280 :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
278 }, 281 },
279 - //修改状态  
280 - handleStuts(){},  
281 //条件查询方法 282 //条件查询方法
282 QueryData(){ 283 QueryData(){
283 let params={currentPage:this.currentPage,pageSize:this.pageSize,awba:this.defaultQuery.awba,carrier:this.defaultQuery.carrier, 284 let params={currentPage:this.currentPage,pageSize:this.pageSize,awba:this.defaultQuery.awba,carrier:this.defaultQuery.carrier,
284 flightno:this.defaultQuery.flightno,flightdate:this.defaultQuery.flightdate,status:this.defaultQuery.status,messageType:this.defaultQuery.messageType}; 285 flightno:this.defaultQuery.flightno,flightdate:this.defaultQuery.flightdate,status:this.defaultQuery.status,messageType:this.defaultQuery.messageType};
285 this.listLoading = true; 286 this.listLoading = true;
286 QueryData(params).then(res =>{ 287 QueryData(params).then(res =>{
  288 + console.log(res)
287 let response=res.data.data; 289 let response=res.data.data;
288 this.tableData=response.list; 290 this.tableData=response.list;
289 this.total=response.total; 291 this.total=response.total;
@@ -309,7 +311,17 @@ @@ -309,7 +311,17 @@
309 var s = (date.getSeconds() < 10 ? '0'+date.getSeconds() : date.getSeconds()); 311 var s = (date.getSeconds() < 10 ? '0'+date.getSeconds() : date.getSeconds());
310 return Y+M+D+h+m+s; 312 return Y+M+D+h+m+s;
311 }, 313 },
  314 + },
  315 + computed:{
  316 + vcarrier:{
  317 + get:function () {
  318 + return this.defaultQuery.carrier;
  319 + },
  320 + set:function (val) {
  321 + this.defaultQuery.carrier=val.toUpperCase();
  322 + }
312 } 323 }
  324 + },
313 325
314 } 326 }
315 </script> 327 </script>