朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 0957d409852f436aaac74de3deeb9fdb471c1e4c 2 个父辈 c0240080 72f4ce32

Merge remote-tracking branch 'origin/nmms-import-dev' 

# Conflicts:
#	src/views/nmms_import/OrigMaster.vue
内嵌 并排对比
正在显示 10 个修改的文件 包含 433 行增加 和 162 行删除
1 import http from './http.js' 1 import http from './http.js'
2 2
3 let baseUrl = 'nmms-server-import/nmms/rep' 3 let baseUrl = 'nmms-server-import/nmms/rep'
4 -  
5 -export const addResponse=params=>{return http.post(`${baseUrl}/InsertResponse`, params);};  
  4 +//添加回执明细
  5 +export const addResponse=params=>{return http.post(`${baseUrl}/InsertResponse`, params);};
  6 +//查询回执明细列表
  7 +export const selectResponseList=params=>{return http.post(`${baseUrl}/selectResponseList`, params);};
@@ -128,7 +128,7 @@ let routes = [ @@ -128,7 +128,7 @@ let routes = [
128 {path:'/entertall',component:EnterTally,name:'进港理货'}, 128 {path:'/entertall',component:EnterTally,name:'进港理货'},
129 {path:'/tallymaster',component:TallyMster,name:'进港理货舱单'}, 129 {path:'/tallymaster',component:TallyMster,name:'进港理货舱单'},
130 {path:'/importallocation',component:Importallocation,name:'进港分拨'}, 130 {path:'/importallocation',component:Importallocation,name:'进港分拨'},
131 - {path:'/allocatearrive',component:Allocatearrive,name:'分拨运抵'} 131 + {path:'/allocatearrive',component:Allocatearrive,name:'分拨运抵'},
132 ] 132 ]
133 }, 133 },
134 { 134 {
@@ -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>
@@ -134,36 +133,38 @@ @@ -134,36 +133,38 @@
134 width="100" :formatter="formatStatus"> 133 width="100" :formatter="formatStatus">
135 </el-table-column> 134 </el-table-column>
136 <el-table-column 135 <el-table-column
137 - prop="repick" 136 + prop="ext5"
138 label="回执内容" 137 label="回执内容"
139 width="250"> 138 width="250">
140 </el-table-column> 139 </el-table-column>
141 <el-table-column 140 <el-table-column
142 label="修改状态" 141 label="修改状态"
143 - width="400"> 142 + width="550">
144 <template slot-scope="scope"> 143 <template slot-scope="scope">
145 <el-button 144 <el-button
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'"
159 size="mini" 158 size="mini"
160 type="primary" 159 type="primary"
  160 + :disabled="btSendStatusFormater(scope.row.status)"
161 @click="importSend(scope.$index, scope.row)">申请分拨 161 @click="importSend(scope.$index, scope.row)">申请分拨
162 </el-button> 162 </el-button>
163 <el-button 163 <el-button
164 v-else 164 v-else
165 size="mini" 165 size="mini"
166 type="primary" 166 type="primary"
  167 + :disabled="btSendStatusFormater(scope.row.status)"
167 @click="arriveSend(scope.$index, scope.row)">分拨运抵 168 @click="arriveSend(scope.$index, scope.row)">分拨运抵
168 </el-button> 169 </el-button>
169 <el-button 170 <el-button
@@ -182,14 +183,21 @@ @@ -182,14 +183,21 @@
182 v-if="scope.row.turntype=='MT6202'" 183 v-if="scope.row.turntype=='MT6202'"
183 size="mini" 184 size="mini"
184 type="primary" 185 type="primary"
  186 + :disabled="btDeleStatusFormater(scope.row.status)"
185 @click="importDel(scope.$index, scope.row)">申请分拨删除 187 @click="importDel(scope.$index, scope.row)">申请分拨删除
186 </el-button> 188 </el-button>
187 <el-button 189 <el-button
188 v-else 190 v-else
189 size="mini" 191 size="mini"
190 type="primary" 192 type="primary"
  193 + :disabled="btDeleStatusFormater(scope.row.status)"
191 @click="arriveDel(scope.$index, scope.row)">分拨运抵删除 194 @click="arriveDel(scope.$index, scope.row)">分拨运抵删除
192 </el-button> 195 </el-button>
  196 + <el-button
  197 + size="mini"
  198 + type="primary"
  199 + @click="UpdateStatus(scope.$index, scope.row)">更改状态
  200 + </el-button>
193 </template> 201 </template>
194 </el-table-column> 202 </el-table-column>
195 </el-table> 203 </el-table>
@@ -204,7 +212,7 @@ @@ -204,7 +212,7 @@
204 @size-change="handleSizeChange" 212 @size-change="handleSizeChange"
205 @current-change="handleCurrentChange" 213 @current-change="handleCurrentChange"
206 :current-page="currentPage" 214 :current-page="currentPage"
207 - :page-sizes="[10, 20, 300, 400]" 215 + :page-sizes="[100, 200, 300, 400]"
208 :page-size="pageSize" 216 :page-size="pageSize"
209 layout="total, sizes, prev, pager, next, jumper" 217 layout="total, sizes, prev, pager, next, jumper"
210 :total="total"> 218 :total="total">
@@ -481,6 +489,18 @@ @@ -481,6 +489,18 @@
481 </div> 489 </div>
482 </el-dialog> 490 </el-dialog>
483 </el-row> 491 </el-row>
  492 + <!--明细列表弹出框-->
  493 + <el-row>
  494 + <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%">
  495 + <el-table :data="gridData">
  496 + <el-table-column property="busdate" label="时间" width="160"></el-table-column>
  497 + <el-table-column property="username" label="操作人" width="130"></el-table-column>
  498 + <el-table-column property="buspiece" label="发送件数" width="130"></el-table-column>
  499 + <el-table-column property="busweight" label="发送重量" width="130"></el-table-column>
  500 + <el-table-column property="cusrestext" label="回执内容"></el-table-column>
  501 + </el-table>
  502 + </el-dialog>
  503 + </el-row>
484 </el-main> 504 </el-main>
485 </el-container> 505 </el-container>
486 </template> 506 </template>
@@ -492,8 +512,12 @@ @@ -492,8 +512,12 @@
492 .sel{display: inline;} 512 .sel{display: inline;}
493 .mark{height:24px;} 513 .mark{height:24px;}
494 .bg{height:24px;text-align: center;line-height:24px;min-height: 24px} 514 .bg{height:24px;text-align: center;line-height:24px;min-height: 24px}
  515 + .el-input-group{
  516 + display: table;
  517 + }
495 </style> 518 </style>
496 <script> 519 <script>
  520 + import{addResponse,selectResponseList} from "../../api/InResponse";
497 import { QueryData,ediAllocat,sendCreateMt6202,sendRemoveMt6202,sendCreateMt3202,sendRemoveMt3202 } from '../../api/Allocat' 521 import { QueryData,ediAllocat,sendCreateMt6202,sendRemoveMt6202,sendCreateMt3202,sendRemoveMt3202 } from '../../api/Allocat'
498 export default{ 522 export default{
499 data(){ 523 data(){
@@ -693,9 +717,40 @@ @@ -693,9 +717,40 @@
693 dialogFormVisible: false, 717 dialogFormVisible: false,
694 rows:{}, 718 rows:{},
695 loading:false, 719 loading:false,
  720 + dialogTableVisible:false,
  721 + gridData:[]
696 } 722 }
697 }, 723 },
698 methods:{ 724 methods:{
  725 + //更改状态
  726 + UpdateStatus(column,row){
  727 + this.$confirm("是否发送更改状态", "确认消息", {
  728 + distinguishCancelAndClose: true,
  729 + confirmButtonText: '确认更改',
  730 + cancelButtonText: '取消更改'
  731 + }).then(() => {
  732 + row.status = '22';
  733 + }).catch(action => {
  734 + this.$message({
  735 + type: 'info',
  736 + message: action === 'cancel'
  737 + ? '取消状态更改'
  738 + : '状态更改取消'
  739 + })
  740 + })
  741 + },
  742 + //回执收发明细
  743 + handleDetail(index,row){
  744 + if(row.flightno.length>4){
  745 + row.flightno=row.flightno.substring(2);
  746 + }
  747 + let params={awbano:row.awba,awbhno:row.awbh,carrier:row.carrier,flightno:row.flightno,flightdate:row.flightdate,bustype:row.turntype}
  748 + selectResponseList(params).then(res=>{
  749 + this.dialogTableVisible=true;
  750 + let response=res.data.data;
  751 + this.gridData=response;
  752 + });
  753 + },
699 //状态适配 754 //状态适配
700 formatStatus:function (row,column) { 755 formatStatus:function (row,column) {
701 return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单' 756 return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
@@ -703,6 +758,21 @@ @@ -703,6 +758,21 @@
703 :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报' 758 :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
704 :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':''; 759 :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
705 }, 760 },
  761 + //发送舱单报按钮判定事件
  762 + btSendStatusFormater:(status) => {
  763 + if(status=='23' || status=='24'||status=='25'){
  764 + return true;
  765 + }else if(status=='22' ) {
  766 + return false;
  767 + }
  768 + },
  769 + btDeleStatusFormater:(status) => {
  770 + if(status=='23' || status=='24'||status=='25'){
  771 + return true;
  772 + }else if(status=='22' ) {
  773 + return false;
  774 + }
  775 + },
706 //发送分拨申请报 776 //发送分拨申请报
707 importSend(index,row){ 777 importSend(index,row){
708 const map = {'mt6202':row} 778 const map = {'mt6202':row}
@@ -711,6 +781,8 @@ @@ -711,6 +781,8 @@
711 //console.log(res); 781 //console.log(res);
712 this.code=response.code; 782 this.code=response.code;
713 if(this.code=='200'){ 783 if(this.code=='200'){
  784 + row.status='23'
  785 + row.ext5='分拨申请发送成功';
714 this.outerVisible = false; 786 this.outerVisible = false;
715 this.centerDialogVisible=true; 787 this.centerDialogVisible=true;
716 this.msg=response.msg; 788 this.msg=response.msg;
@@ -730,16 +802,11 @@ @@ -730,16 +802,11 @@
730 this.Udform.carrier=row.carrier; 802 this.Udform.carrier=row.carrier;
731 this.Udform.flightno=row.flightno.substring(2); 803 this.Udform.flightno=row.flightno.substring(2);
732 this.Udform.flightdate=row.flightdate; 804 this.Udform.flightdate=row.flightdate;
733 - this.Udform.bustype='MT5201'; 805 + this.Udform.bustype='MT6202';
734 this.Udform.busdate=Date.parse(new Date()); 806 this.Udform.busdate=Date.parse(new Date());
735 this.Udform.busweight=row.weight; 807 this.Udform.busweight=row.weight;
736 this.Udform.buspiece=row.piece; 808 this.Udform.buspiece=row.piece;
737 this.Udform.opertype='发送分拨申请删除报'; 809 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){ 810 if(row.awbh==null){
744 row.awbh=""; 811 row.awbh="";
745 } 812 }
@@ -748,6 +815,7 @@ @@ -748,6 +815,7 @@
748 //发送分拨申请删除报表单 815 //发送分拨申请删除报表单
749 deleteIdForm(formName){ 816 deleteIdForm(formName){
750 this.$refs[formName].validate((valid) => { 817 this.$refs[formName].validate((valid) => {
  818 + if (valid) {
751 const map = {'flightNo':this.rows.flightno, 819 const map = {'flightNo':this.rows.flightno,
752 'flightDate':this.rows.flightdate, 820 'flightDate':this.rows.flightdate,
753 'awba':this.rows.awba, 821 'awba':this.rows.awba,
@@ -763,6 +831,8 @@ @@ -763,6 +831,8 @@
763 //console.log(res); 831 //console.log(res);
764 this.code=response.code; 832 this.code=response.code;
765 if(this.code=='200'){ 833 if(this.code=='200'){
  834 + this.rows.status='24';
  835 + this.rows.ext5='分拨申请删除报发送成功';
766 this.dialogFormVisible=false; 836 this.dialogFormVisible=false;
767 this.outerVisible = false; 837 this.outerVisible = false;
768 this.centerDialogVisible=true; 838 this.centerDialogVisible=true;
@@ -780,6 +850,8 @@ @@ -780,6 +850,8 @@
780 //console.log(res); 850 //console.log(res);
781 this.code=response.code; 851 this.code=response.code;
782 if(this.code=='200'){ 852 if(this.code=='200'){
  853 + this.rows.status='24';
  854 + this.rows.ext5='分拨运抵删除报发送成功';
783 this.dialogFormVisible=false; 855 this.dialogFormVisible=false;
784 this.outerVisible = false; 856 this.outerVisible = false;
785 this.centerDialogVisible=true; 857 this.centerDialogVisible=true;
@@ -791,18 +863,25 @@ @@ -791,18 +863,25 @@
791 this.msg=response.msg; 863 this.msg=response.msg;
792 } 864 }
793 }); 865 });
794 - } 866 + }}
  867 + else {
  868 + console.log('error submit!!');
  869 + return false;
  870 + }
795 }); 871 });
796 872
797 }, 873 },
798 //发送分拨运抵报 874 //发送分拨运抵报
799 arriveSend(index,row){ 875 arriveSend(index,row){
  876 +
800 const map = {'mt3202':row} 877 const map = {'mt3202':row}
801 sendCreateMt3202(map).then(res=>{ 878 sendCreateMt3202(map).then(res=>{
802 let response=res.data; 879 let response=res.data;
803 //console.log(res); 880 //console.log(res);
804 this.code=response.code; 881 this.code=response.code;
805 if(this.code=='200'){ 882 if(this.code=='200'){
  883 + row.status='23'
  884 + row.ext5='分拨运抵发送成功';
806 this.outerVisible = false; 885 this.outerVisible = false;
807 this.centerDialogVisible=true; 886 this.centerDialogVisible=true;
808 this.msg=response.msg; 887 this.msg=response.msg;
@@ -822,16 +901,11 @@ @@ -822,16 +901,11 @@
822 this.Udform.carrier=row.carrier; 901 this.Udform.carrier=row.carrier;
823 this.Udform.flightno=row.flightno.substring(2); 902 this.Udform.flightno=row.flightno.substring(2);
824 this.Udform.flightdate=row.flightdate; 903 this.Udform.flightdate=row.flightdate;
825 - this.Udform.bustype='MT5201'; 904 + this.Udform.bustype='MT3202';
826 this.Udform.busdate=Date.parse(new Date()); 905 this.Udform.busdate=Date.parse(new Date());
827 this.Udform.busweight=row.weight; 906 this.Udform.busweight=row.weight;
828 this.Udform.buspiece=row.piece; 907 this.Udform.buspiece=row.piece;
829 this.Udform.opertype='发送分拨运抵删除报'; 908 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){ 909 if(row.awbh==null){
836 row.awbh=""; 910 row.awbh="";
837 } 911 }
@@ -92,6 +92,7 @@ @@ -92,6 +92,7 @@
92 customcode:'', 92 customcode:'',
93 turnunloading:'', 93 turnunloading:'',
94 goodsname:'', 94 goodsname:'',
  95 + status:'22'
95 }, 96 },
96 rules: { 97 rules: {
97 awba: [ 98 awba: [
@@ -99,7 +99,8 @@ @@ -99,7 +99,8 @@
99 turnunloading:'', 99 turnunloading:'',
100 pno:'', 100 pno:'',
101 ext2:'', 101 ext2:'',
102 - ext1:'' 102 + ext1:'',
  103 + status:'22'
103 }, 104 },
104 rules: { 105 rules: {
105 awba: [ 106 awba: [
@@ -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,18 +149,20 @@ @@ -142,18 +149,20 @@
142 <el-button 149 <el-button
143 size="mini" 150 size="mini"
144 type="primary" 151 type="primary"
145 - :disabled="sendBtsStatus(scope.row.status)"  
146 - @click="handleSend(scope.$index, scope.row)">发送舱单报 152 + @click="handleSend(scope.$index, scope.row)"
  153 + :disabled="btSendStatusFormater(scope.row.status)">发送舱单报
147 </el-button> 154 </el-button>
148 <el-button 155 <el-button
149 size="mini" 156 size="mini"
150 type="primary" 157 type="primary"
151 - @click="handleUpdate(scope.$index, scope.row)">发送舱单修改报 158 + @click="handleUpdate(scope.$index, scope.row)"
  159 + :disabled="btEditStatusFormater(scope.row.status)">发送舱单修改报
152 </el-button> 160 </el-button>
153 <el-button 161 <el-button
154 size="mini" 162 size="mini"
155 type="primary" 163 type="primary"
156 - @click="handleDelete(scope.$index, scope.row)">发送舱单删除报 164 + @click="handleDelete(scope.$index, scope.row)"
  165 + :disabled="btDeleStatusFormater(scope.row.status)">发送舱单删除报
157 </el-button> 166 </el-button>
158 <el-button 167 <el-button
159 v-if="scope.row.awbh==''||scope.row.awbh==null" 168 v-if="scope.row.awbh==''||scope.row.awbh==null"
@@ -181,6 +190,11 @@ @@ -181,6 +190,11 @@
181 type="primary" 190 type="primary"
182 @click="Allocatearrive(scope.$index, scope.row)">分拨运抵 191 @click="Allocatearrive(scope.$index, scope.row)">分拨运抵
183 </el-button> 192 </el-button>
  193 + <el-button
  194 + size="mini"
  195 + type="primary"
  196 + @click="UpdateStatus(scope.$index, scope.row)">更改状态
  197 + </el-button>
184 </template> 198 </template>
185 </el-table-column> 199 </el-table-column>
186 </el-table> 200 </el-table>
@@ -270,12 +284,12 @@ @@ -270,12 +284,12 @@
270 <el-row style="margin-bottom: 0px;"> 284 <el-row style="margin-bottom: 0px;">
271 <el-col :span="3"> 285 <el-col :span="3">
272 <el-form-item label="起始站" prop="awbinfo.sairportid" > 286 <el-form-item label="起始站" prop="awbinfo.sairportid" >
273 - <el-input v-model="ruleForm.awbinfo.sairportid"></el-input> 287 + <el-input v-model="ruleForm.awbinfo.sairportid" onkeyup="this.value=this.value.toUpperCase()"></el-input>
274 </el-form-item> 288 </el-form-item>
275 </el-col> 289 </el-col>
276 <el-col :span="3"> 290 <el-col :span="3">
277 <el-form-item label="承运人1" prop="awbinfo.by1"> 291 <el-form-item label="承运人1" prop="awbinfo.by1">
278 - <el-input v-model="ruleForm.awbinfo.by1"></el-input> 292 + <el-input v-model="ruleForm.awbinfo.by1" onkeyup="this.value=this.value.toUpperCase()"></el-input>
279 </el-form-item> 293 </el-form-item>
280 </el-col> 294 </el-col>
281 <el-col :span="3"> 295 <el-col :span="3">
@@ -285,27 +299,27 @@ @@ -285,27 +299,27 @@
285 </el-col> 299 </el-col>
286 <el-col :span="3"> 300 <el-col :span="3">
287 <el-form-item label="承运人2" prop="awbinfo.by2"> 301 <el-form-item label="承运人2" prop="awbinfo.by2">
288 - <el-input v-model="ruleForm.awbinfo.by2"></el-input> 302 + <el-input v-model="ruleForm.awbinfo.by2" onkeyup="this.value=this.value.toUpperCase()"></el-input>
289 </el-form-item> 303 </el-form-item>
290 </el-col> 304 </el-col>
291 <el-col :span="3"> 305 <el-col :span="3">
292 <el-form-item label="到达站2" prop="awbinfo.dest2"> 306 <el-form-item label="到达站2" prop="awbinfo.dest2">
293 - <el-input v-model="ruleForm.awbinfo.dest2"></el-input> 307 + <el-input v-model="ruleForm.awbinfo.dest2" onkeyup="this.value=this.value.toUpperCase()"></el-input>
294 </el-form-item> 308 </el-form-item>
295 </el-col> 309 </el-col>
296 <el-col :span="3"> 310 <el-col :span="3">
297 <el-form-item label="承运人3" prop="awbinfo.by3"> 311 <el-form-item label="承运人3" prop="awbinfo.by3">
298 - <el-input v-model="ruleForm.awbinfo.by3"></el-input> 312 + <el-input v-model="ruleForm.awbinfo.by3" onkeyup="this.value=this.value.toUpperCase()"></el-input>
299 </el-form-item> 313 </el-form-item>
300 </el-col> 314 </el-col>
301 <el-col :span="3"> 315 <el-col :span="3">
302 <el-form-item label="到达站3" prop="awbinfo.dest3"> 316 <el-form-item label="到达站3" prop="awbinfo.dest3">
303 - <el-input v-model="ruleForm.awbinfo.dest3"></el-input> 317 + <el-input v-model="ruleForm.awbinfo.dest3" onkeyup="this.value=this.value.toUpperCase()"></el-input>
304 </el-form-item> 318 </el-form-item>
305 </el-col> 319 </el-col>
306 <el-col :span="3"> 320 <el-col :span="3">
307 <el-form-item label="目的站" prop="awbinfo.eairportid"> 321 <el-form-item label="目的站" prop="awbinfo.eairportid">
308 - <el-input v-model="ruleForm.awbinfo.eairportid"></el-input> 322 + <el-input v-model="ruleForm.awbinfo.eairportid" onkeyup="this.value=this.value.toUpperCase()"></el-input>
309 </el-form-item> 323 </el-form-item>
310 </el-col> 324 </el-col>
311 </el-row> 325 </el-row>
@@ -319,7 +333,7 @@ @@ -319,7 +333,7 @@
319 <el-row class="product"> 333 <el-row class="product">
320 <el-col :span="6"> 334 <el-col :span="6">
321 <el-form-item label="总件数" prop="awbinfo.pcs"> 335 <el-form-item label="总件数" prop="awbinfo.pcs">
322 - <el-input v-model="ruleForm.awbinfo.pcs"></el-input> 336 + <el-input v-model="ruleForm.awbinfo.pcs" ></el-input>
323 </el-form-item> 337 </el-form-item>
324 </el-col> 338 </el-col>
325 <el-col :span="6"> 339 <el-col :span="6">
@@ -602,6 +616,18 @@ @@ -602,6 +616,18 @@
602 </div> 616 </div>
603 </el-dialog> 617 </el-dialog>
604 </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>
605 </el-main> 631 </el-main>
606 </el-container> 632 </el-container>
607 </template> 633 </template>
@@ -659,7 +685,7 @@ @@ -659,7 +685,7 @@
659 685
660 <script> 686 <script>
661 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'
662 - import{addResponse} from "../../api/InResponse"; 688 + import{addResponse,selectResponseList} from "../../api/InResponse";
663 689
664 export default { 690 export default {
665 data() { 691 data() {
@@ -697,7 +723,7 @@ @@ -697,7 +723,7 @@
697 awba: undefined, 723 awba: undefined,
698 awbh: undefined, 724 awbh: undefined,
699 passage: undefined, 725 passage: undefined,
700 - customcode: '-1', 726 + customcode: undefined,
701 flightno: undefined, 727 flightno: undefined,
702 flightdate: undefined, 728 flightdate: undefined,
703 originstation: undefined, 729 originstation: undefined,
@@ -728,7 +754,7 @@ @@ -728,7 +754,7 @@
728 cnsrctcname: undefined, 754 cnsrctcname: undefined,
729 cnsrctctel: undefined, 755 cnsrctctel: undefined,
730 cargonm: undefined, 756 cargonm: undefined,
731 - sairportid: undefined, 757 + sairportid: '',
732 dest1city: undefined, 758 dest1city: undefined,
733 by1: undefined, 759 by1: undefined,
734 dest1: undefined, 760 dest1: undefined,
@@ -743,7 +769,8 @@ @@ -743,7 +769,8 @@
743 weight: undefined, 769 weight: undefined,
744 awbtype:'001', 770 awbtype:'001',
745 }, 771 },
746 - waybill:undefined 772 + waybill:undefined,
  773 + customText:undefined
747 }, 774 },
748 paymodel:[{value:'PP',label:'预付'},{value:'DP',label:'到付'}], 775 paymodel:[{value:'PP',label:'预付'},{value:'DP',label:'到付'}],
749 customext5: [ 776 customext5: [
@@ -809,6 +836,7 @@ @@ -809,6 +836,7 @@
809 busweight:'', 836 busweight:'',
810 buspiece:'', 837 buspiece:'',
811 opertype:'', 838 opertype:'',
  839 + cusrestext:''
812 }, 840 },
813 udrules:{ 841 udrules:{
814 operreason: [{required: true, message: '请输入操作原因', trigger: 'blur'}], 842 operreason: [{required: true, message: '请输入操作原因', trigger: 'blur'}],
@@ -817,10 +845,43 @@ @@ -817,10 +845,43 @@
817 }, 845 },
818 udStatus:'', 846 udStatus:'',
819 loading:false, 847 loading:false,
820 - rows:{} 848 + temprows:{
  849 + },
  850 + dialogTableVisible:false,
  851 + gridData:[]
821 } 852 }
822 }, 853 },
823 methods: { 854 methods: {
  855 +
  856 + //回执收发明细
  857 + handleDetail(index,row){
  858 + if(row.flightno.length>4){
  859 + row.flightno=row.flightno.substring(2);
  860 + }
  861 + let params={awbano:row.awba,awbhno:row.awbh,carrier:row.carrier,flightno:row.flightno,flightdate:row.flightdate,bustype:'MT1201'}
  862 + selectResponseList(params).then(res=>{
  863 + this.dialogTableVisible=true;
  864 + let response=res.data.data;
  865 + this.gridData=response;
  866 + });
  867 + },
  868 + //更改状态
  869 + UpdateStatus(column,row){
  870 + this.$confirm("是否发送更改状态", "确认消息", {
  871 + distinguishCancelAndClose: true,
  872 + confirmButtonText: '确认更改',
  873 + cancelButtonText: '取消更改'
  874 + }).then(() => {
  875 + row.status = '22';
  876 + }).catch(action => {
  877 + this.$message({
  878 + type: 'info',
  879 + message: action === 'cancel'
  880 + ? '取消状态更改'
  881 + : '状态更改取消'
  882 + })
  883 + })
  884 + },
824 //状态识别 885 //状态识别
825 formatStatus: function(row,column){ 886 formatStatus: function(row,column){
826 return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单' 887 return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
@@ -828,17 +889,27 @@ @@ -828,17 +889,27 @@
828 :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报' 889 :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
829 :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':''; 890 :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
830 }, 891 },
831 - //按钮禁用状态判定  
832 - sendBtsStatus:function(status){  
833 - switch (status) {  
834 - case '01':  
835 - return true;  
836 - case '22':  
837 - return false;  
838 - case '23':  
839 - return true; 892 + //发送舱单报按钮判定事件
  893 + btSendStatusFormater:(status) => {
  894 + if(status=='23' || status=='24'||status=='25'){
  895 + return true;
  896 + }else if(status=='22' ) {
  897 + return false;
  898 + }
  899 + },
  900 + btEditStatusFormater:(status) => {
  901 + if(status=='23' || status=='24'||status=='25'){
  902 + return true;
  903 + }else if(status=='22' ) {
  904 + return false;
  905 + }
  906 + },
  907 + btDeleStatusFormater:(status) => {
  908 + if(status=='23' || status=='24'||status=='25'){
  909 + return true;
  910 + }else if(status=='22' ) {
  911 + return false;
840 } 912 }
841 -  
842 }, 913 },
843 /*多选框功能*/ 914 /*多选框功能*/
844 handleSelectionChange(val) { 915 handleSelectionChange(val) {
@@ -846,7 +917,6 @@ @@ -846,7 +917,6 @@
846 }, 917 },
847 /*编辑主单信息*/ 918 /*编辑主单信息*/
848 handleEdit(index, row){ 919 handleEdit(index, row){
849 - console.log(row)  
850 this.outerVisible = true; 920 this.outerVisible = true;
851 this.dialogStatus='update'; 921 this.dialogStatus='update';
852 this.FenStatus='ediAwbh'; 922 this.FenStatus='ediAwbh';
@@ -882,6 +952,8 @@ @@ -882,6 +952,8 @@
882 //console.log(res); 952 //console.log(res);
883 this.code=response.code; 953 this.code=response.code;
884 if(this.code=='200'){ 954 if(this.code=='200'){
  955 + row.status='23'
  956 + row.customText='舱单报发送成功';
885 this.outerVisible = false; 957 this.outerVisible = false;
886 this.centerDialogVisible=true; 958 this.centerDialogVisible=true;
887 this.msg=response.msg; 959 this.msg=response.msg;
@@ -907,39 +979,48 @@ @@ -907,39 +979,48 @@
907 this.Udform.buspiece=row.piece; 979 this.Udform.buspiece=row.piece;
908 this.Udform.opertype='发送舱单删除报'; 980 this.Udform.opertype='发送舱单删除报';
909 if(row.flightno.length>4){ 981 if(row.flightno.length>4){
910 - row.flightno=row.flightno;  
911 - }else{  
912 - row.flightno=row.carrier+row.flightno;  
913 - };  
914 - this.rows=row; 982 + row.flightno=row.flightno.substring(2);
  983 + }
  984 + this.temprows= row;
915 }, 985 },
916 //提交发送舱单删除报表单 986 //提交发送舱单删除报表单
917 deleteUdForm(formName){ 987 deleteUdForm(formName){
918 - const map = {'flightNo':this.rows.flightno,  
919 - 'flightDate':this.rows.flightdate,  
920 - 'awba':this.rows.awba,  
921 - 'content':'',  
922 - 'customCode':this.rows.customcode,  
923 - 'awbh':this.rows.awbh,  
924 - 'reason' :this.Udform.operreason,  
925 - 'contactName':this.Udform.operperson,  
926 - 'contactTel':this.Udform.opertel}  
927 - sendRemoveMt1201(map).then(res=>{  
928 - let response=res.data;  
929 - //console.log(res);  
930 - this.code=response.code;  
931 - if(this.code=='200'){  
932 - this.dialogFormVisible=false;  
933 - this.outerVisible = false;  
934 - this.centerDialogVisible=true;  
935 - this.msg=response.msg;  
936 - }else{  
937 - this.dialogFormVisible=false;  
938 - this.outerVisible = false;  
939 - this.centerDialogVisible=true;  
940 - this.msg=response.msg; 988 + this.$refs[formName].validate((valid) => {
  989 + if (valid) {
  990 + const map = {'flightNo':this.temprows.flightno,
  991 + 'flightDate':this.temprows.flightdate,
  992 + 'awba':this.temprows.awba,
  993 + 'content':'',
  994 + 'customCode':this.temprows.customcode,
  995 + 'awbh':this.temprows.awbh,
  996 + 'reason' :this.Udform.operreason,
  997 + 'contactName':this.Udform.operperson,
  998 + 'contactTel':this.Udform.opertel,
  999 + 'carrier':this.Udform.carrier}
  1000 + sendRemoveMt1201(map).then(res=>{
  1001 + let response=res.data;
  1002 + //console.log(res);
  1003 + this.code=response.code;
  1004 + if(this.code=='200'){
  1005 + this.temprows.status='24';
  1006 + this.temprows.customText='舱单删除报发送成功';
  1007 + this.dialogFormVisible=false;
  1008 + this.outerVisible = false;
  1009 + this.centerDialogVisible=true;
  1010 + this.msg=response.msg;
  1011 + }else{
  1012 + this.dialogFormVisible=false;
  1013 + this.outerVisible = false;
  1014 + this.centerDialogVisible=true;
  1015 + this.msg=response.msg;
  1016 + }
  1017 + });
  1018 + } else {
  1019 + console.log('error submit!!');
  1020 + return false;
941 } 1021 }
942 }); 1022 });
  1023 +
943 }, 1024 },
944 /*发送舱单修改报*/ 1025 /*发送舱单修改报*/
945 handleUpdate(index,row){ 1026 handleUpdate(index,row){
@@ -960,33 +1041,40 @@ @@ -960,33 +1041,40 @@
960 }else{ 1041 }else{
961 row.flightno=row.flightno; 1042 row.flightno=row.flightno;
962 }; 1043 };
963 - this.rows=row; 1044 + this.temprows=row;
964 }, 1045 },
965 //提交发送舱单修改报表单 1046 //提交发送舱单修改报表单
966 updateUdForm(formName){ 1047 updateUdForm(formName){
967 this.$refs[formName].validate((valid) => { 1048 this.$refs[formName].validate((valid) => {
968 -  
969 - const map = {'mt1201':this.rows,  
970 - 'reason' :this.Udform.operreason,  
971 - 'contactName':this.Udform.operperson,  
972 - 'contactTel':this.Udform.opertel}  
973 - sendEditeMt1201(map).then(res=>{  
974 - let response=res.data;  
975 - //console.log(res);  
976 - this.code=response.code;  
977 - if(this.code=='200'){  
978 - this.dialogFormVisible=false;  
979 - this.outerVisible = false;  
980 - this.centerDialogVisible=true;  
981 - this.msg=response.msg;  
982 - }else{  
983 - this.dialogFormVisible=false;  
984 - this.outerVisible = false;  
985 - this.centerDialogVisible=true;  
986 - this.msg=response.msg;  
987 - }  
988 - }); 1049 + if (valid) {
  1050 + const map = {'mt1201':this.temprows,
  1051 + 'reason' :this.Udform.operreason,
  1052 + 'contactName':this.Udform.operperson,
  1053 + 'contactTel':this.Udform.opertel}
  1054 + sendEditeMt1201(map).then(res=>{
  1055 + let response=res.data;
  1056 + //console.log(res);
  1057 + this.code=response.code;
  1058 + if(this.code=='200'){
  1059 + this.temprows.status='25'
  1060 + this.temprows.customText='舱单修改报发送成功';
  1061 + this.dialogFormVisible=false;
  1062 + this.outerVisible = false;
  1063 + this.centerDialogVisible=true;
  1064 + this.msg=response.msg;
  1065 + }else{
  1066 + this.dialogFormVisible=false;
  1067 + this.outerVisible = false;
  1068 + this.centerDialogVisible=true;
  1069 + this.msg=response.msg;
  1070 + }
  1071 + });
  1072 + } else {
  1073 + console.log('error submit!!');
  1074 + return false;
  1075 + }
989 }); 1076 });
  1077 +
990 }, 1078 },
991 /*编辑分单列表信息*/ 1079 /*编辑分单列表信息*/
992 handleClick(row) { 1080 handleClick(row) {
@@ -1008,7 +1096,7 @@ @@ -1008,7 +1096,7 @@
1008 /*获取默认数据列表*/ 1096 /*获取默认数据列表*/
1009 getList(){ 1097 getList(){
1010 getMt1201List(this.defaultQuery).then(res =>{ 1098 getMt1201List(this.defaultQuery).then(res =>{
1011 - //console.log(res); 1099 + console.log(res);
1012 this.sumNmmsCount=0; 1100 this.sumNmmsCount=0;
1013 this.sumNmmsPrice=0; 1101 this.sumNmmsPrice=0;
1014 this.sumNmmsWeight=0; 1102 this.sumNmmsWeight=0;
@@ -1078,6 +1166,7 @@ @@ -1078,6 +1166,7 @@
1078 createData(formName){ 1166 createData(formName){
1079 this.$refs[formName].validate((valid) => { 1167 this.$refs[formName].validate((valid) => {
1080 if (valid) { 1168 if (valid) {
  1169 + this.ruleForm.status='22'
1081 addMt1201(this.ruleForm).then(res=>{ 1170 addMt1201(this.ruleForm).then(res=>{
1082 let response=res.data; 1171 let response=res.data;
1083 //console.log(res); 1172 //console.log(res);
@@ -39,6 +39,7 @@ @@ -39,6 +39,7 @@
39 <el-col :span="24"> 39 <el-col :span="24">
40 <template> 40 <template>
41 <el-table 41 <el-table
  42 + ref="multipleTable"
42 :data="tableData" 43 :data="tableData"
43 tooltip-effect="dark" 44 tooltip-effect="dark"
44 style="width: 100%" 45 style="width: 100%"
@@ -52,10 +53,17 @@ @@ -52,10 +53,17 @@
52 width="50"> 53 width="50">
53 </el-table-column> 54 </el-table-column>
54 <el-table-column 55 <el-table-column
55 - prop="waybill"  
56 label="运单号" 56 label="运单号"
57 - width="160" 57 + width="185"
58 show-overflow-tooltip> 58 show-overflow-tooltip>
  59 + <template slot-scope="scope">
  60 + <span v-if="scope.row.awbh==''||scope.row.awbh==null">
  61 + {{scope.row.awba}}
  62 + </span>
  63 + <span v-else>
  64 + {{scope.row.awbh}}
  65 + </span>
  66 + </template>
59 </el-table-column> 67 </el-table-column>
60 <el-table-column 68 <el-table-column
61 prop="totalpiece" 69 prop="totalpiece"
@@ -93,20 +101,20 @@ @@ -93,20 +101,20 @@
93 width="100" :formatter="formatStatus"> 101 width="100" :formatter="formatStatus">
94 </el-table-column> 102 </el-table-column>
95 <el-table-column 103 <el-table-column
96 - prop="receipt" 104 + prop="ext5"
97 label="回执信息" 105 label="回执信息"
98 width="180"> 106 width="180">
99 </el-table-column> 107 </el-table-column>
100 <el-table-column 108 <el-table-column
101 prop="operation" 109 prop="operation"
102 label="操作" 110 label="操作"
103 - width="450" 111 + width="550"
104 show-overflow-tooltip> 112 show-overflow-tooltip>
105 <template slot-scope="scope"> 113 <template slot-scope="scope">
106 <el-button 114 <el-button
107 size="mini" 115 size="mini"
108 type="primary" 116 type="primary"
109 - @click="handleEdit(scope.$index, scope.row)">收发明细</el-button> 117 + @click="handleDetail(scope.$index, scope.row)">收发明细</el-button>
110 <el-button 118 <el-button
111 v-if="scope.row.awbh==''||scope.row.awbh==null" 119 v-if="scope.row.awbh==''||scope.row.awbh==null"
112 size="mini" 120 size="mini"
@@ -121,11 +129,18 @@ @@ -121,11 +129,18 @@
121 <el-button 129 <el-button
122 size="mini" 130 size="mini"
123 type="primary" 131 type="primary"
  132 + :disabled="btSendStatusFormater(scope.row.status)"
124 @click="handleCreate(scope.$index, scope.row)">发送理货报</el-button> 133 @click="handleCreate(scope.$index, scope.row)">发送理货报</el-button>
125 <el-button 134 <el-button
126 size="mini" 135 size="mini"
127 type="primary" 136 type="primary"
  137 + :disabled="btDeleStatusFormater(scope.row.status)"
128 @click="handleDelete(scope.$index, scope.row)">发送理货删除报</el-button> 138 @click="handleDelete(scope.$index, scope.row)">发送理货删除报</el-button>
  139 + <el-button
  140 + size="mini"
  141 + type="primary"
  142 + @click="UpdateStatus(scope.$index, scope.row)">更改状态
  143 + </el-button>
129 </template> 144 </template>
130 </el-table-column> 145 </el-table-column>
131 </el-table> 146 </el-table>
@@ -184,12 +199,12 @@ @@ -184,12 +199,12 @@
184 <el-row class="flightInfo"> 199 <el-row class="flightInfo">
185 <el-col :span="6"> 200 <el-col :span="6">
186 <el-form-item label="起始站" prop="originstation"> 201 <el-form-item label="起始站" prop="originstation">
187 - <el-input disabled="" v-model="ruleForm.originstation"></el-input> 202 + <el-input disabled="" v-model="ruleForm.originstation" onkeyup="this.value=this.value.toUpperCase()"></el-input>
188 </el-form-item> 203 </el-form-item>
189 </el-col> 204 </el-col>
190 <el-col :span="6"> 205 <el-col :span="6">
191 <el-form-item label="目的站" prop="destinationstation"> 206 <el-form-item label="目的站" prop="destinationstation">
192 - <el-input disabled="" v-model="ruleForm.destinationstation"></el-input> 207 + <el-input disabled="" v-model="ruleForm.destinationstation" onkeyup="this.value=this.value.toUpperCase()"></el-input>
193 </el-form-item> 208 </el-form-item>
194 </el-col> 209 </el-col>
195 <el-col :span="6"> 210 <el-col :span="6">
@@ -313,7 +328,6 @@ @@ -313,7 +328,6 @@
313 </el-table-column> 328 </el-table-column>
314 </el-table> 329 </el-table>
315 </template> 330 </template>
316 -  
317 </el-col> 331 </el-col>
318 </el-row> 332 </el-row>
319 </el-form> 333 </el-form>
@@ -361,6 +375,18 @@ @@ -361,6 +375,18 @@
361 </div> 375 </div>
362 </el-dialog> 376 </el-dialog>
363 </el-row> 377 </el-row>
  378 + <!--明细列表弹出框-->
  379 + <el-row>
  380 + <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%">
  381 + <el-table :data="gridData">
  382 + <el-table-column property="busdate" label="时间" width="160"></el-table-column>
  383 + <el-table-column property="username" label="操作人" width="130"></el-table-column>
  384 + <el-table-column property="buspiece" label="发送件数" width="130"></el-table-column>
  385 + <el-table-column property="busweight" label="发送重量" width="130"></el-table-column>
  386 + <el-table-column property="cusrestext" label="回执内容"></el-table-column>
  387 + </el-table>
  388 + </el-dialog>
  389 + </el-row>
364 </el-main> 390 </el-main>
365 </el-container> 391 </el-container>
366 </template> 392 </template>
@@ -399,6 +425,7 @@ @@ -399,6 +425,7 @@
399 </style> 425 </style>
400 426
401 <script> 427 <script>
  428 + import{addResponse,selectResponseList} from "../../api/InResponse";
402 import { getMt5201List,addMt5201,ediMt5201,delMt5201,sendCreateMt520x,sendRemoveMt520x,selectCustomcode} from '../../api/mt5201' 429 import { getMt5201List,addMt5201,ediMt5201,delMt5201,sendCreateMt520x,sendRemoveMt520x,selectCustomcode} from '../../api/mt5201'
403 export default { 430 export default {
404 data() { 431 data() {
@@ -423,7 +450,7 @@ @@ -423,7 +450,7 @@
423 customcodes:[], 450 customcodes:[],
424 ruleForm:{ 451 ruleForm:{
425 awba:undefined, 452 awba:undefined,
426 - awbh:'', 453 + awbh:undefined,
427 carrier:undefined, 454 carrier:undefined,
428 flightno:undefined, 455 flightno:undefined,
429 flightdate:undefined, 456 flightdate:undefined,
@@ -433,14 +460,15 @@ @@ -433,14 +460,15 @@
433 weight:undefined, 460 weight:undefined,
434 starttime:undefined, 461 starttime:undefined,
435 endtime:undefined, 462 endtime:undefined,
436 - customcode:"-1", 463 + customcode:undefined,
437 goodsname:undefined, 464 goodsname:undefined,
438 actime:undefined, 465 actime:undefined,
439 rcfdep:"MT5201", 466 rcfdep:"MT5201",
440 - status:undefined, 467 + status:'22',
441 isdelete:undefined, 468 isdelete:undefined,
442 pcs:undefined, 469 pcs:undefined,
443 - wei:undefined 470 + wei:undefined,
  471 + ext5:undefined
444 }, 472 },
445 FenStatus:'', 473 FenStatus:'',
446 rules: { 474 rules: {
@@ -487,9 +515,55 @@ @@ -487,9 +515,55 @@
487 dialogFormVisible: false, 515 dialogFormVisible: false,
488 rows:{}, 516 rows:{},
489 loading:false, 517 loading:false,
  518 + dialogTableVisible:false,
  519 + gridData:[],
490 } 520 }
491 }, 521 },
492 methods: { 522 methods: {
  523 + //更改状态
  524 + UpdateStatus(column,row){
  525 + this.$confirm("是否发送更改状态", "确认消息", {
  526 + distinguishCancelAndClose: true,
  527 + confirmButtonText: '确认更改',
  528 + cancelButtonText: '取消更改'
  529 + }).then(() => {
  530 + row.status = '22';
  531 + }).catch(action => {
  532 + this.$message({
  533 + type: 'info',
  534 + message: action === 'cancel'
  535 + ? '取消状态更改'
  536 + : '状态更改取消'
  537 + })
  538 + })
  539 + },
  540 + //发送舱单报按钮判定事件
  541 + btSendStatusFormater:(status) => {
  542 + if(status=='23' || status=='24'||status=='25'){
  543 + return true;
  544 + }else if(status=='22' ) {
  545 + return false;
  546 + }
  547 + },
  548 + btDeleStatusFormater:(status) => {
  549 + if(status=='23' || status=='24'||status=='25'){
  550 + return true;
  551 + }else if(status=='22' ) {
  552 + return false;
  553 + }
  554 + },
  555 + //回执收发明细
  556 + handleDetail(index,row){
  557 + if(row.flightno.length>4){
  558 + row.flightno=row.flightno.substring(2);
  559 + }
  560 + let params={awbano:row.awba,awbhno:row.awbh,carrier:row.carrier,flightno:row.flightno,flightdate:row.flightdate,bustype:'MT5201'}
  561 + selectResponseList(params).then(res=>{
  562 + this.dialogTableVisible=true;
  563 + let response=res.data.data;
  564 + this.gridData=response;
  565 + });
  566 + },
493 //状态适配 567 //状态适配
494 formatStatus:function (row,column) { 568 formatStatus:function (row,column) {
495 return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单' 569 return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
@@ -530,6 +604,8 @@ @@ -530,6 +604,8 @@
530 //console.log(res); 604 //console.log(res);
531 this.code=response.code; 605 this.code=response.code;
532 if(this.code=='200'){ 606 if(this.code=='200'){
  607 + row.status='23'
  608 + row.ext5='理货报发送成功';
533 this.outerVisible = false; 609 this.outerVisible = false;
534 this.centerDialogVisible=true; 610 this.centerDialogVisible=true;
535 this.msg=response.msg; 611 this.msg=response.msg;
@@ -555,43 +631,52 @@ @@ -555,43 +631,52 @@
555 this.Udform.buspiece=row.piece; 631 this.Udform.buspiece=row.piece;
556 this.Udform.opertype='发送理货删除报'; 632 this.Udform.opertype='发送理货删除报';
557 if(row.flightno.length>4){ 633 if(row.flightno.length>4){
558 - row.flightno=row.flightno;  
559 - }else{  
560 - row.flightno=row.carrier+row.flightno;  
561 - }; 634 + row.flightno=row.flightno.substring(2);
  635 + }
562 if(row.awbh==null){ 636 if(row.awbh==null){
563 row.awbh=""; 637 row.awbh="";
564 } 638 }
565 this.rows=row; 639 this.rows=row;
566 }, 640 },
567 //发送理化删除报提交表单 641 //发送理化删除报提交表单
568 - deleteUdForm(){  
569 - const map = {'flightNo':this.rows.flightno,  
570 - 'flightDate':this.rows.flightdate,  
571 - 'awba':this.rows.awba,  
572 - 'content':'',  
573 - 'customCode':this.rows.customcode,  
574 - 'awbh':this.rows.awbh,  
575 - 'reason' :this.Udform.operreason,  
576 - 'contactName':this.Udform.operperson,  
577 - 'contactTel':this.Udform.opertel,  
578 - 'rcfdep':this.rows.rcfdep}  
579 - sendRemoveMt520x(map).then(res=>{  
580 - let response=res.data;  
581 - //console.log(res);  
582 - this.code=response.code;  
583 - if(this.code=='200'){  
584 - this.dialogFormVisible=false;  
585 - this.outerVisible = false;  
586 - this.centerDialogVisible=true;  
587 - this.msg=response.msg;  
588 - }else{  
589 - this.dialogFormVisible=false;  
590 - this.outerVisible = false;  
591 - this.centerDialogVisible=true;  
592 - this.msg=response.msg; 642 + deleteUdForm(formName){
  643 + this.$refs[formName].validate((valid) => {
  644 + if (valid) {
  645 + const map = {'flightNo':this.rows.flightno,
  646 + 'flightDate':this.rows.flightdate,
  647 + 'awba':this.rows.awba,
  648 + 'content':'',
  649 + 'customCode':this.rows.customcode,
  650 + 'awbh':this.rows.awbh,
  651 + 'reason' :this.Udform.operreason,
  652 + 'contactName':this.Udform.operperson,
  653 + 'contactTel':this.Udform.opertel,
  654 + 'rcfdep':this.rows.rcfdep,
  655 + 'carrier':this.rows.carrier}
  656 + sendRemoveMt520x(map).then(res=>{
  657 + let response=res.data;
  658 + //console.log(res);
  659 + this.code=response.code;
  660 + if(this.code=='200'){
  661 + this.rows.status='24';
  662 + this.rows.ext5='理货删除报发送成功';
  663 + this.dialogFormVisible=false;
  664 + this.outerVisible = false;
  665 + this.centerDialogVisible=true;
  666 + this.msg=response.msg;
  667 + }else{
  668 + this.dialogFormVisible=false;
  669 + this.outerVisible = false;
  670 + this.centerDialogVisible=true;
  671 + this.msg=response.msg;
  672 + }
  673 + });
  674 + } else {
  675 + console.log('error submit!!');
  676 + return false;
593 } 677 }
594 }); 678 });
  679 +
595 }, 680 },
596 //批量选中事件 681 //批量选中事件
597 handleSelectionChange(val) { 682 handleSelectionChange(val) {
@@ -632,6 +717,7 @@ @@ -632,6 +717,7 @@
632 this.sumNmmsPrice=0; 717 this.sumNmmsPrice=0;
633 this.sumNmmsWeight=0; 718 this.sumNmmsWeight=0;
634 let response=res.data.data; 719 let response=res.data.data;
  720 + console.log(res)
635 this.tableData=response; 721 this.tableData=response;
636 response.forEach((item,i) => { 722 response.forEach((item,i) => {
637 if(item.awba!=null&&item.awbh==""); 723 if(item.awba!=null&&item.awbh=="");
@@ -655,6 +741,8 @@ @@ -655,6 +741,8 @@
655 createData(formName){ 741 createData(formName){
656 this.$refs[formName].validate((valid) => { 742 this.$refs[formName].validate((valid) => {
657 if (valid) { 743 if (valid) {
  744 + this.ruleForm.status='22';
  745 + //this.ruleForm.endtime=this.ruleForm.starttime.add(Calendar.MINUTE, 15);
658 addMt5201(this.ruleForm).then(res=>{ 746 addMt5201(this.ruleForm).then(res=>{
659 let response=res.data; 747 let response=res.data;
660 this.code=response.code; 748 this.code=response.code;
@@ -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
@@ -165,7 +165,7 @@ @@ -165,7 +165,7 @@
165 width="90" :formatter="formatStatus"> 165 width="90" :formatter="formatStatus">
166 </el-table-column> 166 </el-table-column>
167 <el-table-column 167 <el-table-column
168 - prop="repick" 168 + prop="ext5"
169 label="回执内容" 169 label="回执内容"
170 width="250"> 170 width="250">
171 </el-table-column> 171 </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'
@@ -223,22 +226,22 @@ @@ -223,22 +226,22 @@
223 }, 226 },
224 options: [ 227 options: [
225 { 228 {
226 - value: '01',  
227 - label: '选择状态' 229 + value: '',
  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: [
239 { 242 {
240 value: '', 243 value: '',
241 - label: '选择状态' 244 + label: '业务类型'
242 }, { 245 }, {
243 value: 'MT1201', 246 value: 'MT1201',
244 label: '原始舱单' 247 label: '原始舱单'
@@ -256,7 +259,6 @@ @@ -256,7 +259,6 @@
256 methods:{ 259 methods:{
257 handleSelectionChange(val) { 260 handleSelectionChange(val) {
258 this.multipleSelection = val; 261 this.multipleSelection = val;
259 - console.log(val)  
260 }, 262 },
261 handleClick(row) { 263 handleClick(row) {
262 console.log(row); 264 console.log(row);
@@ -276,14 +278,13 @@ @@ -276,14 +278,13 @@
276 :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报' 278 :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
277 :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':''; 279 :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
278 }, 280 },
279 - //修改状态  
280 - handleStuts(){},  
281 //条件查询方法 281 //条件查询方法
282 QueryData(){ 282 QueryData(){
283 let params={currentPage:this.currentPage,pageSize:this.pageSize,awba:this.defaultQuery.awba,carrier:this.defaultQuery.carrier, 283 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}; 284 flightno:this.defaultQuery.flightno,flightdate:this.defaultQuery.flightdate,status:this.defaultQuery.status,messageType:this.defaultQuery.messageType};
285 this.listLoading = true; 285 this.listLoading = true;
286 QueryData(params).then(res =>{ 286 QueryData(params).then(res =>{
  287 + console.log(res)
287 let response=res.data.data; 288 let response=res.data.data;
288 this.tableData=response.list; 289 this.tableData=response.list;
289 this.total=response.total; 290 this.total=response.total;
@@ -309,7 +310,17 @@ @@ -309,7 +310,17 @@
309 var s = (date.getSeconds() < 10 ? '0'+date.getSeconds() : date.getSeconds()); 310 var s = (date.getSeconds() < 10 ? '0'+date.getSeconds() : date.getSeconds());
310 return Y+M+D+h+m+s; 311 return Y+M+D+h+m+s;
311 }, 312 },
  313 + },
  314 + computed:{
  315 + vcarrier:{
  316 + get:function () {
  317 + return this.defaultQuery.carrier;
  318 + },
  319 + set:function (val) {
  320 + this.defaultQuery.carrier=val.toUpperCase();
  321 + }
312 } 322 }
  323 + },
313 324
314 } 325 }
315 </script> 326 </script>