朱兆平 / vue_cli · 提交

转到一个项目

作者 xudada
提交 72f4ce32ccd86076fabe258521ecd87bb7822107 1 个父辈 14d016fe

增加校验，优化

内嵌 并排对比
正在显示 9 个修改的文件 包含 185 行增加 和 47 行删除
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 - 4 +//添加回执明细
5 export const addResponse=params=>{return http.post(`${baseUrl}/InsertResponse`, params);}; 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 {
@@ -133,13 +133,13 @@ @@ -133,13 +133,13 @@
133 width="100" :formatter="formatStatus"> 133 width="100" :formatter="formatStatus">
134 </el-table-column> 134 </el-table-column>
135 <el-table-column 135 <el-table-column
136 - prop="repick" 136 + prop="ext5"
137 label="回执内容" 137 label="回执内容"
138 width="250"> 138 width="250">
139 </el-table-column> 139 </el-table-column>
140 <el-table-column 140 <el-table-column
141 label="修改状态" 141 label="修改状态"
142 - width="400"> 142 + width="550">
143 <template slot-scope="scope"> 143 <template slot-scope="scope">
144 <el-button 144 <el-button
145 v-if="scope.row.turntype=='MT6202'" 145 v-if="scope.row.turntype=='MT6202'"
@@ -157,12 +157,14 @@ @@ -157,12 +157,14 @@
157 v-if="scope.row.turntype=='MT6202'" 157 v-if="scope.row.turntype=='MT6202'"
158 size="mini" 158 size="mini"
159 type="primary" 159 type="primary"
  160 + :disabled="btSendStatusFormater(scope.row.status)"
160 @click="importSend(scope.$index, scope.row)">申请分拨 161 @click="importSend(scope.$index, scope.row)">申请分拨
161 </el-button> 162 </el-button>
162 <el-button 163 <el-button
163 v-else 164 v-else
164 size="mini" 165 size="mini"
165 type="primary" 166 type="primary"
  167 + :disabled="btSendStatusFormater(scope.row.status)"
166 @click="arriveSend(scope.$index, scope.row)">分拨运抵 168 @click="arriveSend(scope.$index, scope.row)">分拨运抵
167 </el-button> 169 </el-button>
168 <el-button 170 <el-button
@@ -181,14 +183,21 @@ @@ -181,14 +183,21 @@
181 v-if="scope.row.turntype=='MT6202'" 183 v-if="scope.row.turntype=='MT6202'"
182 size="mini" 184 size="mini"
183 type="primary" 185 type="primary"
  186 + :disabled="btDeleStatusFormater(scope.row.status)"
184 @click="importDel(scope.$index, scope.row)">申请分拨删除 187 @click="importDel(scope.$index, scope.row)">申请分拨删除
185 </el-button> 188 </el-button>
186 <el-button 189 <el-button
187 v-else 190 v-else
188 size="mini" 191 size="mini"
189 type="primary" 192 type="primary"
  193 + :disabled="btDeleStatusFormater(scope.row.status)"
190 @click="arriveDel(scope.$index, scope.row)">分拨运抵删除 194 @click="arriveDel(scope.$index, scope.row)">分拨运抵删除
191 </el-button> 195 </el-button>
  196 + <el-button
  197 + size="mini"
  198 + type="primary"
  199 + @click="UpdateStatus(scope.$index, scope.row)">更改状态
  200 + </el-button>
192 </template> 201 </template>
193 </el-table-column> 202 </el-table-column>
194 </el-table> 203 </el-table>
@@ -713,6 +722,23 @@ @@ -713,6 +722,23 @@
713 } 722 }
714 }, 723 },
715 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 + },
716 //回执收发明细 742 //回执收发明细
717 handleDetail(index,row){ 743 handleDetail(index,row){
718 if(row.flightno.length>4){ 744 if(row.flightno.length>4){
@@ -732,6 +758,21 @@ @@ -732,6 +758,21 @@
732 :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报' 758 :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
733 :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':''; 759 :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
734 }, 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 + },
735 //发送分拨申请报 776 //发送分拨申请报
736 importSend(index,row){ 777 importSend(index,row){
737 const map = {'mt6202':row} 778 const map = {'mt6202':row}
@@ -740,6 +781,8 @@ @@ -740,6 +781,8 @@
740 //console.log(res); 781 //console.log(res);
741 this.code=response.code; 782 this.code=response.code;
742 if(this.code=='200'){ 783 if(this.code=='200'){
  784 + row.status='23'
  785 + row.ext5='分拨申请发送成功';
743 this.outerVisible = false; 786 this.outerVisible = false;
744 this.centerDialogVisible=true; 787 this.centerDialogVisible=true;
745 this.msg=response.msg; 788 this.msg=response.msg;
@@ -772,6 +815,7 @@ @@ -772,6 +815,7 @@
772 //发送分拨申请删除报表单 815 //发送分拨申请删除报表单
773 deleteIdForm(formName){ 816 deleteIdForm(formName){
774 this.$refs[formName].validate((valid) => { 817 this.$refs[formName].validate((valid) => {
  818 + if (valid) {
775 const map = {'flightNo':this.rows.flightno, 819 const map = {'flightNo':this.rows.flightno,
776 'flightDate':this.rows.flightdate, 820 'flightDate':this.rows.flightdate,
777 'awba':this.rows.awba, 821 'awba':this.rows.awba,
@@ -787,6 +831,8 @@ @@ -787,6 +831,8 @@
787 //console.log(res); 831 //console.log(res);
788 this.code=response.code; 832 this.code=response.code;
789 if(this.code=='200'){ 833 if(this.code=='200'){
  834 + this.rows.status='24';
  835 + this.rows.ext5='分拨申请删除报发送成功';
790 this.dialogFormVisible=false; 836 this.dialogFormVisible=false;
791 this.outerVisible = false; 837 this.outerVisible = false;
792 this.centerDialogVisible=true; 838 this.centerDialogVisible=true;
@@ -804,6 +850,8 @@ @@ -804,6 +850,8 @@
804 //console.log(res); 850 //console.log(res);
805 this.code=response.code; 851 this.code=response.code;
806 if(this.code=='200'){ 852 if(this.code=='200'){
  853 + this.rows.status='24';
  854 + this.rows.ext5='分拨运抵删除报发送成功';
807 this.dialogFormVisible=false; 855 this.dialogFormVisible=false;
808 this.outerVisible = false; 856 this.outerVisible = false;
809 this.centerDialogVisible=true; 857 this.centerDialogVisible=true;
@@ -815,6 +863,10 @@ @@ -815,6 +863,10 @@
815 this.msg=response.msg; 863 this.msg=response.msg;
816 } 864 }
817 }); 865 });
  866 + }}
  867 + else {
  868 + console.log('error submit!!');
  869 + return false;
818 } 870 }
819 }); 871 });
820 872
@@ -828,6 +880,8 @@ @@ -828,6 +880,8 @@
828 //console.log(res); 880 //console.log(res);
829 this.code=response.code; 881 this.code=response.code;
830 if(this.code=='200'){ 882 if(this.code=='200'){
  883 + row.status='23'
  884 + row.ext5='分拨运抵发送成功';
831 this.outerVisible = false; 885 this.outerVisible = false;
832 this.centerDialogVisible=true; 886 this.centerDialogVisible=true;
833 this.msg=response.msg; 887 this.msg=response.msg;
@@ -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: [
@@ -284,12 +284,12 @@ @@ -284,12 +284,12 @@
284 <el-row style="margin-bottom: 0px;"> 284 <el-row style="margin-bottom: 0px;">
285 <el-col :span="3"> 285 <el-col :span="3">
286 <el-form-item label="起始站" prop="awbinfo.sairportid" > 286 <el-form-item label="起始站" prop="awbinfo.sairportid" >
287 - <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>
288 </el-form-item> 288 </el-form-item>
289 </el-col> 289 </el-col>
290 <el-col :span="3"> 290 <el-col :span="3">
291 <el-form-item label="承运人1" prop="awbinfo.by1"> 291 <el-form-item label="承运人1" prop="awbinfo.by1">
292 - <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>
293 </el-form-item> 293 </el-form-item>
294 </el-col> 294 </el-col>
295 <el-col :span="3"> 295 <el-col :span="3">
@@ -299,27 +299,27 @@ @@ -299,27 +299,27 @@
299 </el-col> 299 </el-col>
300 <el-col :span="3"> 300 <el-col :span="3">
301 <el-form-item label="承运人2" prop="awbinfo.by2"> 301 <el-form-item label="承运人2" prop="awbinfo.by2">
302 - <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>
303 </el-form-item> 303 </el-form-item>
304 </el-col> 304 </el-col>
305 <el-col :span="3"> 305 <el-col :span="3">
306 <el-form-item label="到达站2" prop="awbinfo.dest2"> 306 <el-form-item label="到达站2" prop="awbinfo.dest2">
307 - <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>
308 </el-form-item> 308 </el-form-item>
309 </el-col> 309 </el-col>
310 <el-col :span="3"> 310 <el-col :span="3">
311 <el-form-item label="承运人3" prop="awbinfo.by3"> 311 <el-form-item label="承运人3" prop="awbinfo.by3">
312 - <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>
313 </el-form-item> 313 </el-form-item>
314 </el-col> 314 </el-col>
315 <el-col :span="3"> 315 <el-col :span="3">
316 <el-form-item label="到达站3" prop="awbinfo.dest3"> 316 <el-form-item label="到达站3" prop="awbinfo.dest3">
317 - <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>
318 </el-form-item> 318 </el-form-item>
319 </el-col> 319 </el-col>
320 <el-col :span="3"> 320 <el-col :span="3">
321 <el-form-item label="目的站" prop="awbinfo.eairportid"> 321 <el-form-item label="目的站" prop="awbinfo.eairportid">
322 - <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>
323 </el-form-item> 323 </el-form-item>
324 </el-col> 324 </el-col>
325 </el-row> 325 </el-row>
@@ -333,7 +333,7 @@ @@ -333,7 +333,7 @@
333 <el-row class="product"> 333 <el-row class="product">
334 <el-col :span="6"> 334 <el-col :span="6">
335 <el-form-item label="总件数" prop="awbinfo.pcs"> 335 <el-form-item label="总件数" prop="awbinfo.pcs">
336 - <el-input v-model="ruleForm.awbinfo.pcs"></el-input> 336 + <el-input v-model="ruleForm.awbinfo.pcs" ></el-input>
337 </el-form-item> 337 </el-form-item>
338 </el-col> 338 </el-col>
339 <el-col :span="6"> 339 <el-col :span="6">
@@ -723,7 +723,7 @@ @@ -723,7 +723,7 @@
723 awba: undefined, 723 awba: undefined,
724 awbh: undefined, 724 awbh: undefined,
725 passage: undefined, 725 passage: undefined,
726 - customcode: '-1', 726 + customcode: undefined,
727 flightno: undefined, 727 flightno: undefined,
728 flightdate: undefined, 728 flightdate: undefined,
729 originstation: undefined, 729 originstation: undefined,
@@ -769,7 +769,8 @@ @@ -769,7 +769,8 @@
769 weight: undefined, 769 weight: undefined,
770 awbtype:'001', 770 awbtype:'001',
771 }, 771 },
772 - waybill:undefined 772 + waybill:undefined,
  773 + customText:undefined
773 }, 774 },
774 paymodel:[{value:'PP',label:'预付'},{value:'DP',label:'到付'}], 775 paymodel:[{value:'PP',label:'预付'},{value:'DP',label:'到付'}],
775 customext5: [ 776 customext5: [
@@ -844,12 +845,14 @@ @@ -844,12 +845,14 @@
844 }, 845 },
845 udStatus:'', 846 udStatus:'',
846 loading:false, 847 loading:false,
847 - rows:{}, 848 + temprows:{
  849 + },
848 dialogTableVisible:false, 850 dialogTableVisible:false,
849 gridData:[] 851 gridData:[]
850 } 852 }
851 }, 853 },
852 methods: { 854 methods: {
  855 +
853 //回执收发明细 856 //回执收发明细
854 handleDetail(index,row){ 857 handleDetail(index,row){
855 if(row.flightno.length>4){ 858 if(row.flightno.length>4){
@@ -914,7 +917,6 @@ @@ -914,7 +917,6 @@
914 }, 917 },
915 /*编辑主单信息*/ 918 /*编辑主单信息*/
916 handleEdit(index, row){ 919 handleEdit(index, row){
917 - console.log(row)  
918 this.outerVisible = true; 920 this.outerVisible = true;
919 this.dialogStatus='update'; 921 this.dialogStatus='update';
920 this.FenStatus='ediAwbh'; 922 this.FenStatus='ediAwbh';
@@ -951,6 +953,7 @@ @@ -951,6 +953,7 @@
951 this.code=response.code; 953 this.code=response.code;
952 if(this.code=='200'){ 954 if(this.code=='200'){
953 row.status='23' 955 row.status='23'
  956 + row.customText='舱单报发送成功';
954 this.outerVisible = false; 957 this.outerVisible = false;
955 this.centerDialogVisible=true; 958 this.centerDialogVisible=true;
956 this.msg=response.msg; 959 this.msg=response.msg;
@@ -978,16 +981,18 @@ @@ -978,16 +981,18 @@
978 if(row.flightno.length>4){ 981 if(row.flightno.length>4){
979 row.flightno=row.flightno.substring(2); 982 row.flightno=row.flightno.substring(2);
980 } 983 }
981 - this.rows=row; 984 + this.temprows= row;
982 }, 985 },
983 //提交发送舱单删除报表单 986 //提交发送舱单删除报表单
984 deleteUdForm(formName){ 987 deleteUdForm(formName){
985 - const map = {'flightNo':this.rows.flightno,  
986 - 'flightDate':this.rows.flightdate,  
987 - 'awba':this.rows.awba, 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,
988 'content':'', 993 'content':'',
989 - 'customCode':this.rows.customcode,  
990 - 'awbh':this.rows.awbh, 994 + 'customCode':this.temprows.customcode,
  995 + 'awbh':this.temprows.awbh,
991 'reason' :this.Udform.operreason, 996 'reason' :this.Udform.operreason,
992 'contactName':this.Udform.operperson, 997 'contactName':this.Udform.operperson,
993 'contactTel':this.Udform.opertel, 998 'contactTel':this.Udform.opertel,
@@ -997,7 +1002,8 @@ @@ -997,7 +1002,8 @@
997 //console.log(res); 1002 //console.log(res);
998 this.code=response.code; 1003 this.code=response.code;
999 if(this.code=='200'){ 1004 if(this.code=='200'){
1000 - this.rows.status='24' 1005 + this.temprows.status='24';
  1006 + this.temprows.customText='舱单删除报发送成功';
1001 this.dialogFormVisible=false; 1007 this.dialogFormVisible=false;
1002 this.outerVisible = false; 1008 this.outerVisible = false;
1003 this.centerDialogVisible=true; 1009 this.centerDialogVisible=true;
@@ -1009,6 +1015,12 @@ @@ -1009,6 +1015,12 @@
1009 this.msg=response.msg; 1015 this.msg=response.msg;
1010 } 1016 }
1011 }); 1017 });
  1018 + } else {
  1019 + console.log('error submit!!');
  1020 + return false;
  1021 + }
  1022 + });
  1023 +
1012 }, 1024 },
1013 /*发送舱单修改报*/ 1025 /*发送舱单修改报*/
1014 handleUpdate(index,row){ 1026 handleUpdate(index,row){
@@ -1029,13 +1041,13 @@ @@ -1029,13 +1041,13 @@
1029 }else{ 1041 }else{
1030 row.flightno=row.flightno; 1042 row.flightno=row.flightno;
1031 }; 1043 };
1032 - this.rows=row; 1044 + this.temprows=row;
1033 }, 1045 },
1034 //提交发送舱单修改报表单 1046 //提交发送舱单修改报表单
1035 updateUdForm(formName){ 1047 updateUdForm(formName){
1036 this.$refs[formName].validate((valid) => { 1048 this.$refs[formName].validate((valid) => {
1037 -  
1038 - const map = {'mt1201':this.rows, 1049 + if (valid) {
  1050 + const map = {'mt1201':this.temprows,
1039 'reason' :this.Udform.operreason, 1051 'reason' :this.Udform.operreason,
1040 'contactName':this.Udform.operperson, 1052 'contactName':this.Udform.operperson,
1041 'contactTel':this.Udform.opertel} 1053 'contactTel':this.Udform.opertel}
@@ -1044,7 +1056,8 @@ @@ -1044,7 +1056,8 @@
1044 //console.log(res); 1056 //console.log(res);
1045 this.code=response.code; 1057 this.code=response.code;
1046 if(this.code=='200'){ 1058 if(this.code=='200'){
1047 - this.rows.status='25' 1059 + this.temprows.status='25'
  1060 + this.temprows.customText='舱单修改报发送成功';
1048 this.dialogFormVisible=false; 1061 this.dialogFormVisible=false;
1049 this.outerVisible = false; 1062 this.outerVisible = false;
1050 this.centerDialogVisible=true; 1063 this.centerDialogVisible=true;
@@ -1056,7 +1069,12 @@ @@ -1056,7 +1069,12 @@
1056 this.msg=response.msg; 1069 this.msg=response.msg;
1057 } 1070 }
1058 }); 1071 });
  1072 + } else {
  1073 + console.log('error submit!!');
  1074 + return false;
  1075 + }
1059 }); 1076 });
  1077 +
1060 }, 1078 },
1061 /*编辑分单列表信息*/ 1079 /*编辑分单列表信息*/
1062 handleClick(row) { 1080 handleClick(row) {
@@ -1078,7 +1096,7 @@ @@ -1078,7 +1096,7 @@
1078 /*获取默认数据列表*/ 1096 /*获取默认数据列表*/
1079 getList(){ 1097 getList(){
1080 getMt1201List(this.defaultQuery).then(res =>{ 1098 getMt1201List(this.defaultQuery).then(res =>{
1081 - //console.log(res); 1099 + console.log(res);
1082 this.sumNmmsCount=0; 1100 this.sumNmmsCount=0;
1083 this.sumNmmsPrice=0; 1101 this.sumNmmsPrice=0;
1084 this.sumNmmsWeight=0; 1102 this.sumNmmsWeight=0;
@@ -1148,6 +1166,7 @@ @@ -1148,6 +1166,7 @@
1148 createData(formName){ 1166 createData(formName){
1149 this.$refs[formName].validate((valid) => { 1167 this.$refs[formName].validate((valid) => {
1150 if (valid) { 1168 if (valid) {
  1169 + this.ruleForm.status='22'
1151 addMt1201(this.ruleForm).then(res=>{ 1170 addMt1201(this.ruleForm).then(res=>{
1152 let response=res.data; 1171 let response=res.data;
1153 //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,14 +101,14 @@ @@ -93,14 +101,14 @@
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
@@ -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>
@@ -436,7 +450,7 @@ @@ -436,7 +450,7 @@
436 customcodes:[], 450 customcodes:[],
437 ruleForm:{ 451 ruleForm:{
438 awba:undefined, 452 awba:undefined,
439 - awbh:'', 453 + awbh:undefined,
440 carrier:undefined, 454 carrier:undefined,
441 flightno:undefined, 455 flightno:undefined,
442 flightdate:undefined, 456 flightdate:undefined,
@@ -446,14 +460,15 @@ @@ -446,14 +460,15 @@
446 weight:undefined, 460 weight:undefined,
447 starttime:undefined, 461 starttime:undefined,
448 endtime:undefined, 462 endtime:undefined,
449 - customcode:"-1", 463 + customcode:undefined,
450 goodsname:undefined, 464 goodsname:undefined,
451 actime:undefined, 465 actime:undefined,
452 rcfdep:"MT5201", 466 rcfdep:"MT5201",
453 - status:undefined, 467 + status:'22',
454 isdelete:undefined, 468 isdelete:undefined,
455 pcs:undefined, 469 pcs:undefined,
456 - wei:undefined 470 + wei:undefined,
  471 + ext5:undefined
457 }, 472 },
458 FenStatus:'', 473 FenStatus:'',
459 rules: { 474 rules: {
@@ -501,10 +516,42 @@ @@ -501,10 +516,42 @@
501 rows:{}, 516 rows:{},
502 loading:false, 517 loading:false,
503 dialogTableVisible:false, 518 dialogTableVisible:false,
504 - gridData:[] 519 + gridData:[],
505 } 520 }
506 }, 521 },
507 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 + },
508 //回执收发明细 555 //回执收发明细
509 handleDetail(index,row){ 556 handleDetail(index,row){
510 if(row.flightno.length>4){ 557 if(row.flightno.length>4){
@@ -557,6 +604,8 @@ @@ -557,6 +604,8 @@
557 //console.log(res); 604 //console.log(res);
558 this.code=response.code; 605 this.code=response.code;
559 if(this.code=='200'){ 606 if(this.code=='200'){
  607 + row.status='23'
  608 + row.ext5='理货报发送成功';
560 this.outerVisible = false; 609 this.outerVisible = false;
561 this.centerDialogVisible=true; 610 this.centerDialogVisible=true;
562 this.msg=response.msg; 611 this.msg=response.msg;
@@ -590,7 +639,9 @@ @@ -590,7 +639,9 @@
590 this.rows=row; 639 this.rows=row;
591 }, 640 },
592 //发送理化删除报提交表单 641 //发送理化删除报提交表单
593 - deleteUdForm(){ 642 + deleteUdForm(formName){
  643 + this.$refs[formName].validate((valid) => {
  644 + if (valid) {
594 const map = {'flightNo':this.rows.flightno, 645 const map = {'flightNo':this.rows.flightno,
595 'flightDate':this.rows.flightdate, 646 'flightDate':this.rows.flightdate,
596 'awba':this.rows.awba, 647 'awba':this.rows.awba,
@@ -607,6 +658,8 @@ @@ -607,6 +658,8 @@
607 //console.log(res); 658 //console.log(res);
608 this.code=response.code; 659 this.code=response.code;
609 if(this.code=='200'){ 660 if(this.code=='200'){
  661 + this.rows.status='24';
  662 + this.rows.ext5='理货删除报发送成功';
610 this.dialogFormVisible=false; 663 this.dialogFormVisible=false;
611 this.outerVisible = false; 664 this.outerVisible = false;
612 this.centerDialogVisible=true; 665 this.centerDialogVisible=true;
@@ -618,6 +671,12 @@ @@ -618,6 +671,12 @@
618 this.msg=response.msg; 671 this.msg=response.msg;
619 } 672 }
620 }); 673 });
  674 + } else {
  675 + console.log('error submit!!');
  676 + return false;
  677 + }
  678 + });
  679 +
621 }, 680 },
622 //批量选中事件 681 //批量选中事件
623 handleSelectionChange(val) { 682 handleSelectionChange(val) {
@@ -658,6 +717,7 @@ @@ -658,6 +717,7 @@
658 this.sumNmmsPrice=0; 717 this.sumNmmsPrice=0;
659 this.sumNmmsWeight=0; 718 this.sumNmmsWeight=0;
660 let response=res.data.data; 719 let response=res.data.data;
  720 + console.log(res)
661 this.tableData=response; 721 this.tableData=response;
662 response.forEach((item,i) => { 722 response.forEach((item,i) => {
663 if(item.awba!=null&&item.awbh==""); 723 if(item.awba!=null&&item.awbh=="");
@@ -681,6 +741,8 @@ @@ -681,6 +741,8 @@
681 createData(formName){ 741 createData(formName){
682 this.$refs[formName].validate((valid) => { 742 this.$refs[formName].validate((valid) => {
683 if (valid) { 743 if (valid) {
  744 + this.ruleForm.status='22';
  745 + //this.ruleForm.endtime=this.ruleForm.starttime.add(Calendar.MINUTE, 15);
684 addMt5201(this.ruleForm).then(res=>{ 746 addMt5201(this.ruleForm).then(res=>{
685 let response=res.data; 747 let response=res.data;
686 this.code=response.code; 748 this.code=response.code;
@@ -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>
@@ -226,8 +226,8 @@ @@ -226,8 +226,8 @@
226 }, 226 },
227 options: [ 227 options: [
228 { 228 {
229 - value: '01',  
230 - label: '选择状态' 229 + value: '',
  230 + label: '业务状态'
231 }, { 231 }, {
232 value: '22', 232 value: '22',
233 label: '未发送' 233 label: '未发送'
@@ -241,7 +241,7 @@ @@ -241,7 +241,7 @@
241 options2: [ 241 options2: [
242 { 242 {
243 value: '', 243 value: '',
244 - label: '选择状态' 244 + label: '业务类型'
245 }, { 245 }, {
246 value: 'MT1201', 246 value: 'MT1201',
247 label: '原始舱单' 247 label: '原始舱单'
@@ -259,7 +259,6 @@ @@ -259,7 +259,6 @@
259 methods:{ 259 methods:{
260 handleSelectionChange(val) { 260 handleSelectionChange(val) {
261 this.multipleSelection = val; 261 this.multipleSelection = val;
262 - console.log(val)  
263 }, 262 },
264 handleClick(row) { 263 handleClick(row) {
265 console.log(row); 264 console.log(row);