朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 69f7202a02ee2edd8d07941b4f739e8e4eefd7dd 2 个父辈 243d3fba 69e2ff99

Merge remote-tracking branch 'origin/master'

内嵌 并排对比
正在显示 12 个修改的文件 包含 653 行增加 和 126 行删除
@@ -5,4 +5,9 @@ let baseUrl = 'nmms-server-import/nmms/allocat' @@ -5,4 +5,9 @@ let baseUrl = 'nmms-server-import/nmms/allocat'
5 export const addAllocatImport=params=>{return http.post(`${baseUrl}/addAllocatImport`, params);}; 5 export const addAllocatImport=params=>{return http.post(`${baseUrl}/addAllocatImport`, params);};
6 export const addAllocatArrive=params=>{return http.post(`${baseUrl}/addAllocatArrive`, params);}; 6 export const addAllocatArrive=params=>{return http.post(`${baseUrl}/addAllocatArrive`, params);};
7 export const QueryData=params=>{return http.get(`${baseUrl}/QueryData`, params);}; 7 export const QueryData=params=>{return http.get(`${baseUrl}/QueryData`, params);};
8 -export const ediAllocat=params=>{return http.put(`${baseUrl}/ediAllocat`, params);};  
  8 +export const ediAllocat=params=>{return http.put(`${baseUrl}/ediAllocat`, params);};
  9 +
  10 +export const sendCreateMt6202=params=>{return http.post(`${baseUrl}/sendCreateMt6202`, params);};
  11 +export const sendRemoveMt6202=params=>{return http.post(`${baseUrl}/sendRemoveMt6202`, params);};
  12 +export const sendCreateMt3202=params=>{return http.post(`${baseUrl}/sendCreateMt3202`, params);};
  13 +export const sendRemoveMt3202=params=>{return http.post(`${baseUrl}/sendRemoveMt3202`, params);};
@@ -8,4 +8,8 @@ export const addMt1201=params=>{return http.post(`${baseUrl}/addMt1201`, params @@ -8,4 +8,8 @@ export const addMt1201=params=>{return http.post(`${baseUrl}/addMt1201`, params
8 export const ediMt1201=params=>{return http.put(`${baseUrl}/ediMt1201`, params);}; 8 export const ediMt1201=params=>{return http.put(`${baseUrl}/ediMt1201`, params);};
9 export const selectAirport=params=>{return http.get(`${baseUrl}/selectList`, params);}; 9 export const selectAirport=params=>{return http.get(`${baseUrl}/selectList`, params);};
10 export const getCountryCode=params=>{return http.get(`${baseUrl}/getCountryCode`, params);}; 10 export const getCountryCode=params=>{return http.get(`${baseUrl}/getCountryCode`, params);};
11 -export const selectCustomcode=params=>{return http.get(`${baseUrl}/selectCustomcode`, params);};  
  11 +export const selectCustomcode=params=>{return http.get(`${baseUrl}/selectCustomcode`, params);};
  12 +
  13 +export const sendCreateMt1201=params=>{return http.post(`${baseUrl}/sendCreateMt1201`, params);};
  14 +export const sendEditeMt1201=params=>{return http.post(`${baseUrl}/sendEditeMt1201`, params);};
  15 +export const sendRemoveMt1201=params=>{return http.post(`${baseUrl}/sendRemoveMt1201`, params);};
1 import http from './http.js' 1 import http from './http.js'
2 let baseUrl = 'nmms-server-import/nmms/mt5201' 2 let baseUrl = 'nmms-server-import/nmms/mt5201'
  3 +let baseUrl2='nmms-server-import/nmms/mt1201'
3 4
4 export const getMt5201List=params=>{return http.get(`${baseUrl}/getMt5201List`, params);}; 5 export const getMt5201List=params=>{return http.get(`${baseUrl}/getMt5201List`, params);};
5 export const addMt5201=params=>{return http.post(`${baseUrl}/addMt5201`, params);}; 6 export const addMt5201=params=>{return http.post(`${baseUrl}/addMt5201`, params);};
6 export const ediMt5201=params=>{return http.put(`${baseUrl}/ediMt5201`, params);}; 7 export const ediMt5201=params=>{return http.put(`${baseUrl}/ediMt5201`, params);};
7 export const delMt5201 = params => { return http.del(`${baseUrl}/delMt5201`,params)}; 8 export const delMt5201 = params => { return http.del(`${baseUrl}/delMt5201`,params)};
8 9
  10 +export const sendCreateMt520x=params=>{return http.post(`${baseUrl}/sendCreateMt520x`, params);};
  11 +export const sendRemoveMt520x=params=>{return http.post(`${baseUrl}/sendRemoveMt520x`, params);};
  12 +export const selectCustomcode=params=>{return http.get(`${baseUrl2}/selectCustomcode`, params);};
  13 +
  14 +
@@ -131,7 +131,7 @@ @@ -131,7 +131,7 @@
131 <el-table-column 131 <el-table-column
132 prop="status" 132 prop="status"
133 label="状态" 133 label="状态"
134 - width="100"> 134 + width="100" :formatter="formatStatus">
135 </el-table-column> 135 </el-table-column>
136 <el-table-column 136 <el-table-column
137 prop="repick" 137 prop="repick"
@@ -182,7 +182,7 @@ @@ -182,7 +182,7 @@
182 v-if="scope.row.turntype=='MT6202'" 182 v-if="scope.row.turntype=='MT6202'"
183 size="mini" 183 size="mini"
184 type="primary" 184 type="primary"
185 - @click="arriveDel(scope.$index, scope.row)">申请分拨删除 185 + @click="importDel(scope.$index, scope.row)">申请分拨删除
186 </el-button> 186 </el-button>
187 <el-button 187 <el-button
188 v-else 188 v-else
@@ -204,7 +204,7 @@ @@ -204,7 +204,7 @@
204 @size-change="handleSizeChange" 204 @size-change="handleSizeChange"
205 @current-change="handleCurrentChange" 205 @current-change="handleCurrentChange"
206 :current-page="currentPage" 206 :current-page="currentPage"
207 - :page-sizes="[100, 200, 300, 400]" 207 + :page-sizes="[10, 20, 300, 400]"
208 :page-size="pageSize" 208 :page-size="pageSize"
209 layout="total, sizes, prev, pager, next, jumper" 209 layout="total, sizes, prev, pager, next, jumper"
210 :total="total"> 210 :total="total">
@@ -424,6 +424,26 @@ @@ -424,6 +424,26 @@
424 </div> 424 </div>
425 </el-form-item> 425 </el-form-item>
426 </el-col> 426 </el-col>
  427 + <el-col :span="5">
  428 + <el-form-item label="卸货地" prop="ext2">
  429 + <div v-if="dialogStatus === 'update'">
  430 + <el-input v-model="IruleForm.ext2"></el-input>
  431 + </div>
  432 + <div v-else>
  433 + <el-input disabled="" v-model="IruleForm.ext2"></el-input>
  434 + </div>
  435 + </el-form-item>
  436 + </el-col>
  437 + <el-col :span="5">
  438 + <el-form-item label="车辆所属" prop="ext1">
  439 + <div v-if="dialogStatus === 'update'">
  440 + <el-input v-model="IruleForm.ext1"></el-input>
  441 + </div>
  442 + <div v-else>
  443 + <el-input disabled="" v-model="IruleForm.ext1"></el-input>
  444 + </div>
  445 + </el-form-item>
  446 + </el-col>
427 </el-row> 447 </el-row>
428 </el-form> 448 </el-form>
429 </el-dialog> 449 </el-dialog>
@@ -441,6 +461,26 @@ @@ -441,6 +461,26 @@
441 </span> 461 </span>
442 </el-dialog> 462 </el-dialog>
443 </el-row> 463 </el-row>
  464 + <!--发送删除报修改报提示框-->
  465 + <el-row>
  466 + <el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible">
  467 + <el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm">
  468 + <el-form-item label="操作原因" prop="operreason">
  469 + <el-input type="textarea" v-model="Udform.operreason"></el-input>
  470 + </el-form-item>
  471 + <el-form-item label="操作人" prop="operperson">
  472 + <el-input v-model="Udform.operperson"></el-input>
  473 + </el-form-item>
  474 + <el-form-item label="联系电话" prop="opertel">
  475 + <el-input v-model="Udform.opertel"></el-input>
  476 + </el-form-item>
  477 + </el-form>
  478 + <div slot="footer" class="dialog-footer">
  479 + <el-button @click="dialogFormVisible = false">取 消</el-button>
  480 + <el-button type="primary" @click="deleteIdForm('Udform')">确 定</el-button>
  481 + </div>
  482 + </el-dialog>
  483 + </el-row>
444 </el-main> 484 </el-main>
445 </el-container> 485 </el-container>
446 </template> 486 </template>
@@ -454,7 +494,7 @@ @@ -454,7 +494,7 @@
454 .bg{height:24px;text-align: center;line-height:24px;min-height: 24px} 494 .bg{height:24px;text-align: center;line-height:24px;min-height: 24px}
455 </style> 495 </style>
456 <script> 496 <script>
457 - import { QueryData,ediAllocat } from '../../api/Allocat' 497 + import { QueryData,ediAllocat,sendCreateMt6202,sendRemoveMt6202,sendCreateMt3202,sendRemoveMt3202 } from '../../api/Allocat'
458 export default{ 498 export default{
459 data(){ 499 data(){
460 return{ 500 return{
@@ -494,7 +534,8 @@ @@ -494,7 +534,8 @@
494 }, { 534 }, {
495 value: '08', 535 value: '08',
496 label: '舱单删除报转人工' 536 label: '舱单删除报转人工'
497 - }], 537 + }
  538 + ],
498 options2: [ 539 options2: [
499 { 540 {
500 value: '', 541 value: '',
@@ -505,7 +546,8 @@ @@ -505,7 +546,8 @@
505 }, { 546 }, {
506 value: 'MT3202', 547 value: 'MT3202',
507 label: '分拨运抵' 548 label: '分拨运抵'
508 - }], 549 + }
  550 + ],
509 options3: [ 551 options3: [
510 { 552 {
511 value: '4604', 553 value: '4604',
@@ -521,7 +563,7 @@ @@ -521,7 +563,7 @@
521 multipleSelection: [], 563 multipleSelection: [],
522 labelPosition:'left', 564 labelPosition:'left',
523 currentPage:1, 565 currentPage:1,
524 - pageSize:10, 566 + pageSize:100,
525 total:0, 567 total:0,
526 dialogStatus:'', 568 dialogStatus:'',
527 IouterVisible: false, 569 IouterVisible: false,
@@ -542,7 +584,9 @@ @@ -542,7 +584,9 @@
542 turnpiece:'', 584 turnpiece:'',
543 turnweight:'', 585 turnweight:'',
544 turnunloading:'', 586 turnunloading:'',
545 - goodsname:'' 587 + goodsname:'',
  588 + ext2:'',
  589 + ext1:''
546 }, 590 },
547 Arules: { 591 Arules: {
548 awba: [ 592 awba: [
@@ -582,7 +626,9 @@ @@ -582,7 +626,9 @@
582 turnpiece:undefined, 626 turnpiece:undefined,
583 turnweight:undefined, 627 turnweight:undefined,
584 turnunloading:undefined, 628 turnunloading:undefined,
585 - pno:undefined 629 + pno:undefined,
  630 + ext1:undefined,
  631 + ext2:undefined
586 }, 632 },
587 Irules: { 633 Irules: {
588 awba: [ 634 awba: [
@@ -612,10 +658,185 @@ @@ -612,10 +658,185 @@
612 turnunLoading: [ 658 turnunLoading: [
613 { required: true, message: '请选择分拨到达地', trigger: 'change' } 659 { required: true, message: '请选择分拨到达地', trigger: 'change' }
614 ], 660 ],
  661 + ext2: [
  662 + { required: true, message: '请输入卸货地代码', trigger: 'change' }
  663 + ],
  664 + ext1: [
  665 + { required: true, message: '请输入车辆所属承运人代码', trigger: 'change' }
  666 + ],
  667 + },
  668 + Udform:{
  669 + operreason:'',
  670 + operperson:'',
  671 + opertel:'',
  672 + flightdate:'',
  673 + flightno:'',
  674 + carrier:'',
  675 + awbano:'',
  676 + awbhno:'',
  677 + bustype:'',
  678 + busdate:'',
  679 + busweight:'',
  680 + buspiece:'',
  681 + opertype:'',
615 }, 682 },
  683 + udrules:{
  684 + operreason: [{required: true, message: '请输入操作原因', trigger: 'blur'}],
  685 + operperson: [{required: true, message: '请输入操作人', trigger: 'blur'}],
  686 + opertel: [{required: true, message: '请输入操作人联系电话', trigger: 'blur'}],
  687 + },
  688 + Reason:{
  689 + update: '修改',
  690 + delete: '删除'
  691 + },
  692 + udStatus:'',
  693 + dialogFormVisible: false,
  694 + rows:{},
  695 + loading:false,
616 } 696 }
617 }, 697 },
618 methods:{ 698 methods:{
  699 + //状态适配
  700 + formatStatus:function (row,column) {
  701 + return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
  702 + :row.status=='11'?'放行':row.status=='12'?'拒装':row.status=='13'?'禁卸'
  703 + :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
  704 + :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
  705 + },
  706 + //发送分拨申请报
  707 + importSend(index,row){
  708 + const map = {'mt6202':row}
  709 + sendCreateMt6202(map).then(res=>{
  710 + let response=res.data;
  711 + //console.log(res);
  712 + this.code=response.code;
  713 + if(this.code=='200'){
  714 + this.outerVisible = false;
  715 + this.centerDialogVisible=true;
  716 + this.msg=response.msg;
  717 + }else{
  718 + this.outerVisible = false;
  719 + this.centerDialogVisible=true;
  720 + this.msg=response.msg;
  721 + }
  722 + });
  723 + },
  724 + //发送分拨申请删除报
  725 + importDel(index,row){
  726 + this.dialogFormVisible=true;
  727 + this.udStatus='delete';
  728 + this.Udform.awbano=row.awba;
  729 + this.Udform.awbhno=row.awbh;
  730 + this.Udform.carrier=row.carrier;
  731 + this.Udform.flightno=row.flightno.substring(2);
  732 + this.Udform.flightdate=row.flightdate;
  733 + this.Udform.bustype='MT5201';
  734 + this.Udform.busdate=Date.parse(new Date());
  735 + this.Udform.busweight=row.weight;
  736 + this.Udform.buspiece=row.piece;
  737 + 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){
  744 + row.awbh="";
  745 + }
  746 + this.rows=row;
  747 + },
  748 + //发送分拨申请删除报表单
  749 + deleteIdForm(formName){
  750 + this.$refs[formName].validate((valid) => {
  751 + const map = {'flightNo':this.rows.flightno,
  752 + 'flightDate':this.rows.flightdate,
  753 + 'awba':this.rows.awba,
  754 + 'content':'',
  755 + 'customCode':this.rows.customcode,
  756 + 'reason' :this.Udform.operreason,
  757 + 'contactName':this.Udform.operperson,
  758 + 'contactTel':this.Udform.opertel,
  759 + 'carrier':this.rows.carrier}
  760 + if(this.rows.turntype=='MT6202'){
  761 + sendRemoveMt6202(map).then(res=>{
  762 + let response=res.data;
  763 + //console.log(res);
  764 + this.code=response.code;
  765 + if(this.code=='200'){
  766 + this.dialogFormVisible=false;
  767 + this.outerVisible = false;
  768 + this.centerDialogVisible=true;
  769 + this.msg=response.msg;
  770 + }else{
  771 + this.dialogFormVisible=false;
  772 + this.outerVisible = false;
  773 + this.centerDialogVisible=true;
  774 + this.msg=response.msg;
  775 + }
  776 + });
  777 + }else{
  778 + sendRemoveMt3202(map).then(res=>{
  779 + let response=res.data;
  780 + //console.log(res);
  781 + this.code=response.code;
  782 + if(this.code=='200'){
  783 + this.dialogFormVisible=false;
  784 + this.outerVisible = false;
  785 + this.centerDialogVisible=true;
  786 + this.msg=response.msg;
  787 + }else{
  788 + this.dialogFormVisible=false;
  789 + this.outerVisible = false;
  790 + this.centerDialogVisible=true;
  791 + this.msg=response.msg;
  792 + }
  793 + });
  794 + }
  795 + });
  796 +
  797 + },
  798 + //发送分拨运抵报
  799 + arriveSend(index,row){
  800 + const map = {'mt3202':row}
  801 + sendCreateMt3202(map).then(res=>{
  802 + let response=res.data;
  803 + //console.log(res);
  804 + this.code=response.code;
  805 + if(this.code=='200'){
  806 + this.outerVisible = false;
  807 + this.centerDialogVisible=true;
  808 + this.msg=response.msg;
  809 + }else{
  810 + this.outerVisible = false;
  811 + this.centerDialogVisible=true;
  812 + this.msg=response.msg;
  813 + }
  814 + });
  815 + },
  816 + //发送分拨返抵删除报
  817 + arriveDel(index,row){
  818 + this.dialogFormVisible=true;
  819 + this.udStatus='delete';
  820 + this.Udform.awbano=row.awba;
  821 + this.Udform.awbhno=row.awbh;
  822 + this.Udform.carrier=row.carrier;
  823 + this.Udform.flightno=row.flightno.substring(2);
  824 + this.Udform.flightdate=row.flightdate;
  825 + this.Udform.bustype='MT5201';
  826 + this.Udform.busdate=Date.parse(new Date());
  827 + this.Udform.busweight=row.weight;
  828 + this.Udform.buspiece=row.piece;
  829 + 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){
  836 + row.awbh="";
  837 + }
  838 + this.rows=row;
  839 + },
619 handleClick(row) { 840 handleClick(row) {
620 console.log(row); 841 console.log(row);
621 }, 842 },
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 turnweight:'', 91 turnweight:'',
92 customcode:'', 92 customcode:'',
93 turnunloading:'', 93 turnunloading:'',
94 - goodsname:'' 94 + goodsname:'',
95 }, 95 },
96 rules: { 96 rules: {
97 awba: [ 97 awba: [
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <el-row type="flex" class="row-bg" justify="center"> 12 <el-row type="flex" class="row-bg" justify="center">
13 <el-col :span="5"> 13 <el-col :span="5">
14 <el-form-item label="航班号" prop="flightno"> 14 <el-form-item label="航班号" prop="flightno">
15 - <el-input placeholder="" v-model="ruleForm.flightno" style="width:100%"></el-input> 15 + <el-input placeholder="" v-model="flightno" style="width:100%"></el-input>
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 <el-col :span="5"> 18 <el-col :span="5">
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 </el-col> 26 </el-col>
27 <el-col :span="5"> 27 <el-col :span="5">
28 <el-form-item label="始发站" prop="originstation"> 28 <el-form-item label="始发站" prop="originstation">
29 - <el-select v-model="ruleForm.originstation" 29 + <el-select v-model="originstation"
30 filterable 30 filterable
31 allow-create 31 allow-create
32 default-first-option 32 default-first-option
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 </el-col> 47 </el-col>
48 <el-col :span="5"> 48 <el-col :span="5">
49 <el-form-item label="目的站" prop="destinationstation"> 49 <el-form-item label="目的站" prop="destinationstation">
50 - <el-select v-model="ruleForm.destinationstation" filterable 50 + <el-select v-model="destinationstation" filterable
51 allow-create 51 allow-create
52 default-first-option 52 default-first-option
53 remote 53 remote
@@ -109,11 +109,11 @@ @@ -109,11 +109,11 @@
109 ], 109 ],
110 originstation: [ 110 originstation: [
111 {required: true, message: '请输入航班起始站', trigger: 'blur'}, 111 {required: true, message: '请输入航班起始站', trigger: 'blur'},
112 - {min: 3, max: 5, message: '长度为 3 ', trigger: 'blur'} 112 + {min: 3, max: 3, message: '长度为 3 ', trigger: 'blur'}
113 ], 113 ],
114 destinationstation: [ 114 destinationstation: [
115 {required: true, message: '请输入目的站', trigger: 'blur'}, 115 {required: true, message: '请输入目的站', trigger: 'blur'},
116 - {min: 3, max: 5, message: '长度为 3 ', trigger: 'blur'} 116 + {min: 3, max: 3, message: '长度为 3 ', trigger: 'blur'}
117 ], 117 ],
118 flightdate: [ 118 flightdate: [
119 { required: true, message: '请选择日期', trigger: 'blur' } 119 { required: true, message: '请选择日期', trigger: 'blur' }
@@ -169,10 +169,36 @@ @@ -169,10 +169,36 @@
169 } 169 }
170 } 170 }
171 }, 171 },
  172 + computed:{
  173 + originstation:{
  174 + get:function () {
  175 + return this.ruleForm.originstation;
  176 + },
  177 + set:function (val) {
  178 + this.ruleForm.originstation=val.toUpperCase();
  179 + }
  180 + },
  181 + destinationstation:{
  182 + get:function () {
  183 + return this.ruleForm.destinationstation;
  184 + },
  185 + set:function (val) {
  186 + this.ruleForm.destinationstation=val.toUpperCase();
  187 + }
  188 + },
  189 + flightno:{
  190 + get:function () {
  191 + return this.ruleForm.flightno;
  192 + },
  193 + set:function (val) {
  194 + this.ruleForm.flightno=val.toUpperCase();
  195 + }
  196 + }
  197 + },
172 /*渲染方法*/ 198 /*渲染方法*/
173 mounted(){ 199 mounted(){
174 this.getDefaultData(); 200 this.getDefaultData();
175 //this.getFlightList(); 201 //this.getFlightList();
176 - } 202 + },
177 }; 203 };
178 </script> 204 </script>
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <el-row type="flex" class="row-bg" justify="center"> 12 <el-row type="flex" class="row-bg" justify="center">
13 <el-col :span="5"> 13 <el-col :span="5">
14 <el-form-item label="航班号" prop="flightno"> 14 <el-form-item label="航班号" prop="flightno">
15 - <el-input placeholder="" v-model="ruleForm.flightno" style="width:100%"></el-input> 15 + <el-input onkeyup="value=value.replace(/[\u4e00-\u9fa5]/ig,'')" placeholder="" v-model="flightno" style="width:100%"></el-input>
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 <el-col :span="5"> 18 <el-col :span="5">
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 <el-input placeholder="" v-model="ruleForm.originstation"></el-input> 29 <el-input placeholder="" v-model="ruleForm.originstation"></el-input>
30 </el-form-item>--> 30 </el-form-item>-->
31 <el-form-item label="始发站" prop="originstation"> 31 <el-form-item label="始发站" prop="originstation">
32 - <el-select v-model="ruleForm.originstation" filterable 32 + <el-select v-model="originstation" filterable
33 allow-create 33 allow-create
34 default-first-option 34 default-first-option
35 remote 35 remote
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 <el-input placeholder="" v-model="ruleForm.destinationstation" :disabled="true"></el-input> 52 <el-input placeholder="" v-model="ruleForm.destinationstation" :disabled="true"></el-input>
53 </el-form-item>--> 53 </el-form-item>-->
54 <el-form-item label="目的站" prop="destinationstation"> 54 <el-form-item label="目的站" prop="destinationstation">
55 - <el-select v-model="ruleForm.destinationstation" 55 + <el-select v-model="destinationstation"
56 filterable 56 filterable
57 allow-create 57 allow-create
58 default-first-option 58 default-first-option
@@ -106,6 +106,7 @@ @@ -106,6 +106,7 @@
106 }, 106 },
107 options: [], 107 options: [],
108 airportid:'', 108 airportid:'',
  109 + loading: false,
109 /*表单验证方法*/ 110 /*表单验证方法*/
110 rules: { 111 rules: {
111 flightno: [ 112 flightno: [
@@ -114,11 +115,11 @@ @@ -114,11 +115,11 @@
114 ], 115 ],
115 originstation: [ 116 originstation: [
116 {required: true, message: '请输入航班起始站', trigger: 'blur'}, 117 {required: true, message: '请输入航班起始站', trigger: 'blur'},
117 - {min: 3, max: 5, message: '长度为 3 ', trigger: 'blur'} 118 + {min: 3, max: 3, message: '长度为 3 ', trigger: 'blur'}
118 ], 119 ],
119 destinationstation: [ 120 destinationstation: [
120 {required: true, message: '请输入目的站', trigger: 'blur'}, 121 {required: true, message: '请输入目的站', trigger: 'blur'},
121 - {min: 3, max: 5, message: '长度为 3 ', trigger: 'blur'} 122 + {min: 3, max: 3, message: '长度为 3 ', trigger: 'blur'}
122 ], 123 ],
123 flightdate: [ 124 flightdate: [
124 { required: true, message: '请选择日期', trigger: 'change' } 125 { required: true, message: '请选择日期', trigger: 'change' }
@@ -126,6 +127,32 @@ @@ -126,6 +127,32 @@
126 } 127 }
127 }; 128 };
128 }, 129 },
  130 + computed:{
  131 + originstation:{
  132 + get:function () {
  133 + return this.ruleForm.originstation;
  134 + },
  135 + set:function (val) {
  136 + this.ruleForm.originstation=val.toUpperCase();
  137 + }
  138 + },
  139 + destinationstation:{
  140 + get:function () {
  141 + return this.ruleForm.destinationstation;
  142 + },
  143 + set:function (val) {
  144 + this.ruleForm.destinationstation=val.toUpperCase();
  145 + }
  146 + },
  147 + flightno:{
  148 + get:function () {
  149 + return this.ruleForm.flightno;
  150 + },
  151 + set:function (val) {
  152 + this.ruleForm.flightno=val.toUpperCase();
  153 + }
  154 + }
  155 + },
129 methods:{ 156 methods:{
130 remoteMethod:function(query) { 157 remoteMethod:function(query) {
131 this.options = []; 158 this.options = [];
@@ -173,7 +200,6 @@ @@ -173,7 +200,6 @@
173 /*渲染方法*/ 200 /*渲染方法*/
174 mounted(){ 201 mounted(){
175 this.getDefaultData(); 202 this.getDefaultData();
176 - this.getFlightList();  
177 } 203 }
178 }; 204 };
179 205
@@ -48,6 +48,12 @@ @@ -48,6 +48,12 @@
48 </el-select> 48 </el-select>
49 </el-col> 49 </el-col>
50 </el-form-item> 50 </el-form-item>
  51 + <el-form-item label="卸货地" prop="ext2">
  52 + <el-input v-model="ruleForm.ext2"></el-input>
  53 + </el-form-item>
  54 + <el-form-item label="车辆所发属" prop="ext1">
  55 + <el-input v-model="ruleForm.ext1"></el-input>
  56 + </el-form-item>
51 </el-form> 57 </el-form>
52 </el-col> 58 </el-col>
53 <el-col :span="12"> 59 <el-col :span="12">
@@ -91,7 +97,9 @@ @@ -91,7 +97,9 @@
91 turnweight:'', 97 turnweight:'',
92 customcode:'', 98 customcode:'',
93 turnunloading:'', 99 turnunloading:'',
94 - pno:'' 100 + pno:'',
  101 + ext2:'',
  102 + ext1:''
95 }, 103 },
96 rules: { 104 rules: {
97 awba: [ 105 awba: [
@@ -117,6 +125,12 @@ @@ -117,6 +125,12 @@
117 ], 125 ],
118 turnunloading: [ 126 turnunloading: [
119 { required: true, message: '请选择分拨到达地', trigger: 'change' } 127 { required: true, message: '请选择分拨到达地', trigger: 'change' }
  128 + ],
  129 + ext2: [
  130 + { required: true, message: '请输入卸货地', trigger: 'change' }
  131 + ],
  132 + ext1: [
  133 + { required: true, message: '请输入运输车辆所属承运人代码', trigger: 'change' }
120 ] 134 ]
121 }, 135 },
122 options2: [ 136 options2: [
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <el-row> 5 <el-row>
6 <el-col :span="4"> 6 <el-col :span="4">
7 <div> 7 <div>
8 - <el-input v-model="carrier" placeholder=""> 8 + <el-input v-model="vcarrier" placeholder="">
9 <template slot="prepend">航班号</template> 9 <template slot="prepend">航班号</template>
10 </el-input> 10 </el-input>
11 </div> 11 </div>
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
97 data() { 97 data() {
98 /*初始化值*/ 98 /*初始化值*/
99 return { 99 return {
100 - carrier:undefined, 100 + carrier:'',
101 tableData: [], 101 tableData: [],
102 flighttime: undefined, 102 flighttime: undefined,
103 currentPage:1, 103 currentPage:1,
@@ -125,6 +125,7 @@ @@ -125,6 +125,7 @@
125 this.listLoading = true; 125 this.listLoading = true;
126 selectFlightLists(params).then(res=>{ 126 selectFlightLists(params).then(res=>{
127 let response=res.data.data; 127 let response=res.data.data;
  128 + console.log(response)
128 this.tableData=response.list; 129 this.tableData=response.list;
129 this.total=response.total; 130 this.total=response.total;
130 this.listLoading = false; 131 this.listLoading = false;
@@ -139,6 +140,16 @@ @@ -139,6 +140,16 @@
139 this.$router.push({name:'进港理货',params:{index,row}}) 140 this.$router.push({name:'进港理货',params:{index,row}})
140 } 141 }
141 }, 142 },
  143 + computed:{
  144 + vcarrier:{
  145 + get:function () {
  146 + return this.carrier;
  147 + },
  148 + set:function (val) {
  149 + this.carrier=val.toUpperCase();
  150 + }
  151 + }
  152 + },
142 /*渲染方法*/ 153 /*渲染方法*/
143 mounted() { 154 mounted() {
144 let that=this; 155 let that=this;
@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
109 <el-table-column 109 <el-table-column
110 prop="status" 110 prop="status"
111 label="状态" 111 label="状态"
112 - width="100"> 112 + width="100" :formatter="formatStatus">
113 </el-table-column> 113 </el-table-column>
114 <el-table-column 114 <el-table-column
115 prop="customText" 115 prop="customText"
@@ -352,8 +352,8 @@ @@ -352,8 +352,8 @@
352 </el-form-item> 352 </el-form-item>
353 </el-col> 353 </el-col>
354 <el-col :span="6"> 354 <el-col :span="6">
355 - <el-form-item label="海关状态" prop="ext5">  
356 - <el-select v-model="ruleForm.ext5" placeholder="" style="display:inline"> 355 + <el-form-item label="海关状态" prop="awbinfo.awbtype">
  356 + <el-select v-model="ruleForm.awbinfo.awbtype" placeholder="" style="display:inline">
357 <el-option v-for="(item,index) in customext5" :key="index" :label="item.label" 357 <el-option v-for="(item,index) in customext5" :key="index" :label="item.label"
358 :value="item.value"></el-option> 358 :value="item.value"></el-option>
359 </el-select> 359 </el-select>
@@ -401,12 +401,6 @@ @@ -401,12 +401,6 @@
401 </el-form-item> 401 </el-form-item>
402 </el-col> 402 </el-col>
403 <el-col :span="6"> 403 <el-col :span="6">
404 - <!--<el-form-item label="国家代码" prop="awbinfo.shprcountyr">  
405 - <el-select v-model="ruleForm.awbinfo.shprcountyr" placeholder="" style="display:inline">  
406 - <el-option v-for="item in shprcountyrs" :key="item" :label="item"  
407 - :value="item"></el-option>  
408 - </el-select>  
409 - </el-form-item>-->  
410 <el-form-item label="国家代码" prop="awbinfo.shprcountyr"> 404 <el-form-item label="国家代码" prop="awbinfo.shprcountyr">
411 <el-select v-model="ruleForm.awbinfo.shprcountyr" 405 <el-select v-model="ruleForm.awbinfo.shprcountyr"
412 filterable 406 filterable
@@ -589,7 +583,7 @@ @@ -589,7 +583,7 @@
589 </el-row> 583 </el-row>
590 <!--发送删除报修改报提示框--> 584 <!--发送删除报修改报提示框-->
591 <el-row> 585 <el-row>
592 - <el-dialog title="提交修改信息" :visible.sync="dialogFormVisible"> 586 + <el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible">
593 <el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm"> 587 <el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm">
594 <el-form-item label="操作原因" prop="operreason"> 588 <el-form-item label="操作原因" prop="operreason">
595 <el-input type="textarea" v-model="Udform.operreason"></el-input> 589 <el-input type="textarea" v-model="Udform.operreason"></el-input>
@@ -603,7 +597,7 @@ @@ -603,7 +597,7 @@
603 </el-form> 597 </el-form>
604 <div slot="footer" class="dialog-footer"> 598 <div slot="footer" class="dialog-footer">
605 <el-button @click="dialogFormVisible = false">取 消</el-button> 599 <el-button @click="dialogFormVisible = false">取 消</el-button>
606 - <el-button type="primary" @click="submitUdForm('Udform')">确 定</el-button> 600 + <el-button type="primary" @click="udStatus==='delete'?deleteUdForm('Udform'):updateUdForm('Udform')">确 定</el-button>
607 </div> 601 </div>
608 </el-dialog> 602 </el-dialog>
609 </el-row> 603 </el-row>
@@ -663,7 +657,7 @@ @@ -663,7 +657,7 @@
663 </style> 657 </style>
664 658
665 <script> 659 <script>
666 - import { getMt1201List,addMt1201,ediMt1201,getFenList,getCountryCode,selectCustomcode } from '../../api/mt1201' 660 + import { getMt1201List,addMt1201,ediMt1201,getFenList,getCountryCode,selectCustomcode,sendCreateMt1201,sendEditeMt1201,sendRemoveMt1201 } from '../../api/mt1201'
667 import{addResponse} from "../../api/InResponse"; 661 import{addResponse} from "../../api/InResponse";
668 662
669 export default { 663 export default {
@@ -694,6 +688,10 @@ @@ -694,6 +688,10 @@
694 update: '编辑', 688 update: '编辑',
695 create: '添加' 689 create: '添加'
696 }, 690 },
  691 + Reason:{
  692 + update: '修改',
  693 + delete: '删除'
  694 + },
697 ruleForm: { 695 ruleForm: {
698 awba: undefined, 696 awba: undefined,
699 awbh: undefined, 697 awbh: undefined,
@@ -709,8 +707,7 @@ @@ -709,8 +707,7 @@
709 splitcode: 'T', 707 splitcode: 'T',
710 uldType: undefined, 708 uldType: undefined,
711 uldNo: undefined, 709 uldNo: undefined,
712 - status: undefined,  
713 - ext5:'-1', 710 + status: '22',
714 awbinfo: { 711 awbinfo: {
715 specopeid: undefined, 712 specopeid: undefined,
716 shprname: undefined, 713 shprname: undefined,
@@ -742,41 +739,18 @@ @@ -742,41 +739,18 @@
742 csgcustomerid: undefined, 739 csgcustomerid: undefined,
743 paymodel: 'PP', 740 paymodel: 'PP',
744 pcs: undefined, 741 pcs: undefined,
745 - weight: undefined 742 + weight: undefined,
  743 + awbtype:'001',
746 }, 744 },
747 waybill:undefined 745 waybill:undefined
748 }, 746 },
749 paymodel:[{value:'PP',label:'预付'},{value:'DP',label:'到付'}], 747 paymodel:[{value:'PP',label:'预付'},{value:'DP',label:'到付'}],
750 - customext5: [  
751 - {  
752 - value: '-1',  
753 - label: '请选择'  
754 - },  
755 - {  
756 - value: '001',  
757 - label: '进出口货物'  
758 - },  
759 - {  
760 - value: '002',  
761 - label: '国际转运货物'  
762 - },  
763 - {  
764 - value: '003',  
765 - label: '过境货物'  
766 - },  
767 - {  
768 - value: '004',  
769 - label: '暂时进出境集装箱'  
770 - },  
771 - {  
772 - value: '007',  
773 - label: '互市贸易'  
774 - },  
775 - {  
776 - value: '008',  
777 - label: '惰性物料'  
778 - }  
779 - ], 748 + customext5: [
  749 + {value:'001',label:'普通货物'},
  750 + {value:'002',label:'国际转运货物'},
  751 + {value:'003',label:'国内转关'},
  752 + {value:'004',label:'空箱'},
  753 + {value:'005',label:'快件'}],
780 customcodes:[], 754 customcodes:[],
781 customcode:'', 755 customcode:'',
782 rules: { 756 rules: {
@@ -802,6 +776,7 @@ @@ -802,6 +776,7 @@
802 'awbinfo.cnsnaddress': [{required: true, message: '收获地址不能为空', trigger: 'blur'}], 776 'awbinfo.cnsnaddress': [{required: true, message: '收获地址不能为空', trigger: 'blur'}],
803 'awbinfo.cnscountyr': [{required: true, message: '国家代码不能为空', trigger: 'change'}], 777 'awbinfo.cnscountyr': [{required: true, message: '国家代码不能为空', trigger: 'change'}],
804 'awbinfo.paymodel':[{required: true, message: '付费方式必须选择', trigger: 'change'}], 778 'awbinfo.paymodel':[{required: true, message: '付费方式必须选择', trigger: 'change'}],
  779 + 'awbinfo.awbtype':[{required: true, message: '海关状态必须选择', trigger: 'change'}],
805 customcode:[{required: true, message: '海关关区必须选择', trigger: 'change'}], 780 customcode:[{required: true, message: '海关关区必须选择', trigger: 'change'}],
806 goodsname:[{required: true, message: '货物描述必须填写', trigger: 'blur'}] 781 goodsname:[{required: true, message: '货物描述必须填写', trigger: 'blur'}]
807 }, 782 },
@@ -839,15 +814,26 @@ @@ -839,15 +814,26 @@
839 operperson: [{required: true, message: '请输入操作人', trigger: 'blur'}], 814 operperson: [{required: true, message: '请输入操作人', trigger: 'blur'}],
840 opertel: [{required: true, message: '请输入操作人联系电话', trigger: 'blur'}], 815 opertel: [{required: true, message: '请输入操作人联系电话', trigger: 'blur'}],
841 }, 816 },
  817 + udStatus:'',
  818 + loading:false,
  819 + rows:{}
842 } 820 }
843 }, 821 },
844 methods: { 822 methods: {
  823 + //状态识别
  824 + formatStatus: function(row,column){
  825 + return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
  826 + :row.status=='11'?'放行':row.status=='12'?'拒装':row.status=='13'?'禁卸'
  827 + :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
  828 + :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
  829 + },
845 /*多选框功能*/ 830 /*多选框功能*/
846 handleSelectionChange(val) { 831 handleSelectionChange(val) {
847 this.multipleSelection = val; 832 this.multipleSelection = val;
848 }, 833 },
849 /*编辑主单信息*/ 834 /*编辑主单信息*/
850 handleEdit(index, row){ 835 handleEdit(index, row){
  836 + console.log(row)
851 this.outerVisible = true; 837 this.outerVisible = true;
852 this.dialogStatus='update'; 838 this.dialogStatus='update';
853 this.FenStatus='ediAwbh'; 839 this.FenStatus='ediAwbh';
@@ -859,8 +845,6 @@ @@ -859,8 +845,6 @@
859 this.FenQuery.originstation=this.defaultQuery.originstation; 845 this.FenQuery.originstation=this.defaultQuery.originstation;
860 this.FenQuery.destinationstation=row.destinationstation; 846 this.FenQuery.destinationstation=row.destinationstation;
861 this.getFenList(this.FenQuery); 847 this.getFenList(this.FenQuery);
862 - this.getCountryCode();  
863 - this.selectCustomcode();  
864 }, 848 },
865 /*编辑分单信息*/ 849 /*编辑分单信息*/
866 handleFen(index,row){ 850 handleFen(index,row){
@@ -873,11 +857,81 @@ @@ -873,11 +857,81 @@
873 857
874 }, 858 },
875 //发送舱单报 859 //发送舱单报
876 - handleSend(index,row){}, 860 + handleSend(index,row){
  861 + if(row.flightno.length>4){
  862 + row.flightno=row.flightno.substring(2)
  863 + }else{
  864 + row.flightno=row.flightno;
  865 + }
  866 + const map = {'mt1201':row}
  867 + sendCreateMt1201(map).then(res=>{
  868 + let response=res.data;
  869 + //console.log(res);
  870 + this.code=response.code;
  871 + if(this.code=='200'){
  872 + this.outerVisible = false;
  873 + this.centerDialogVisible=true;
  874 + this.msg=response.msg;
  875 + }else{
  876 + this.outerVisible = false;
  877 + this.centerDialogVisible=true;
  878 + this.msg=response.msg;
  879 + }
  880 + });
  881 + },
  882 + //发送舱单删除报
  883 + handleDelete(index,row){
  884 + this.udStatus='delete';
  885 + this.dialogFormVisible=true;
  886 + this.Udform.awbano=row.awba;
  887 + this.Udform.awbhno=row.awbh;
  888 + this.Udform.carrier=row.carrier;
  889 + this.Udform.flightno=row.flightno.substring(2);
  890 + this.Udform.flightdate=row.flightdate;
  891 + this.Udform.bustype='MT1201';
  892 + this.Udform.busdate=Date.parse(new Date());
  893 + this.Udform.busweight=row.weight;
  894 + this.Udform.buspiece=row.piece;
  895 + this.Udform.opertype='发送舱单删除报';
  896 + if(row.flightno.length>4){
  897 + row.flightno=row.flightno;
  898 + }else{
  899 + row.flightno=row.carrier+row.flightno;
  900 + };
  901 + this.rows=row;
  902 + },
  903 + //提交发送舱单删除报表单
  904 + deleteUdForm(formName){
  905 + const map = {'flightNo':this.rows.flightno,
  906 + 'flightDate':this.rows.flightdate,
  907 + 'awba':this.rows.awba,
  908 + 'content':'',
  909 + 'customCode':this.rows.customcode,
  910 + 'awbh':this.rows.awbh,
  911 + 'reason' :this.Udform.operreason,
  912 + 'contactName':this.Udform.operperson,
  913 + 'contactTel':this.Udform.opertel}
  914 + sendRemoveMt1201(map).then(res=>{
  915 + let response=res.data;
  916 + //console.log(res);
  917 + this.code=response.code;
  918 + if(this.code=='200'){
  919 + this.dialogFormVisible=false;
  920 + this.outerVisible = false;
  921 + this.centerDialogVisible=true;
  922 + this.msg=response.msg;
  923 + }else{
  924 + this.dialogFormVisible=false;
  925 + this.outerVisible = false;
  926 + this.centerDialogVisible=true;
  927 + this.msg=response.msg;
  928 + }
  929 + });
  930 + },
877 /*发送舱单修改报*/ 931 /*发送舱单修改报*/
878 handleUpdate(index,row){ 932 handleUpdate(index,row){
  933 + this.udStatus='update';
879 this.dialogFormVisible=true; 934 this.dialogFormVisible=true;
880 - //console.log(row);  
881 this.Udform.awbano=row.awba; 935 this.Udform.awbano=row.awba;
882 this.Udform.awbhno=row.awbh; 936 this.Udform.awbhno=row.awbh;
883 this.Udform.carrier=row.carrier; 937 this.Udform.carrier=row.carrier;
@@ -888,32 +942,37 @@ @@ -888,32 +942,37 @@
888 this.Udform.busweight=row.weight; 942 this.Udform.busweight=row.weight;
889 this.Udform.buspiece=row.piece; 943 this.Udform.buspiece=row.piece;
890 this.Udform.opertype='发送舱单修改报'; 944 this.Udform.opertype='发送舱单修改报';
  945 + if(row.flightno.length>4){
  946 + row.flightno=row.flightno.substring(2);
  947 + }else{
  948 + row.flightno=row.flightno;
  949 + };
  950 + this.rows=row;
891 }, 951 },
892 //提交发送舱单修改报表单 952 //提交发送舱单修改报表单
893 - submitUdForm(formName){ 953 + updateUdForm(formName){
894 this.$refs[formName].validate((valid) => { 954 this.$refs[formName].validate((valid) => {
895 - if (valid) {  
896 - console.log(this.Udform)  
897 - addResponse(this.Udform).then(res=>{  
898 - let response=res.data;  
899 - this.code=response.code;  
900 - if(this.code=='200'){  
901 - this.outerVisible = false;  
902 - this.$refs[formName].resetFields();  
903 - this.centerDialogVisible=true;  
904 - this.msg=response.msg;  
905 - this.dialogFormVisible=false;  
906 - }else{  
907 - this.outerVisible = false;  
908 - this.centerDialogVisible=true;  
909 - this.$refs[formName].resetFields();  
910 - this.msg=response.msg;  
911 - }  
912 - });  
913 - } else {  
914 - console.log('error submit!!');  
915 - return false;  
916 - } 955 +
  956 + const map = {'mt1201':this.rows,
  957 + 'reason' :this.Udform.operreason,
  958 + 'contactName':this.Udform.operperson,
  959 + 'contactTel':this.Udform.opertel}
  960 + sendEditeMt1201(map).then(res=>{
  961 + let response=res.data;
  962 + //console.log(res);
  963 + this.code=response.code;
  964 + if(this.code=='200'){
  965 + this.dialogFormVisible=false;
  966 + this.outerVisible = false;
  967 + this.centerDialogVisible=true;
  968 + this.msg=response.msg;
  969 + }else{
  970 + this.dialogFormVisible=false;
  971 + this.outerVisible = false;
  972 + this.centerDialogVisible=true;
  973 + this.msg=response.msg;
  974 + }
  975 + });
917 }); 976 });
918 }, 977 },
919 /*编辑分单列表信息*/ 978 /*编辑分单列表信息*/
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 <el-table-column 90 <el-table-column
91 prop="status" 91 prop="status"
92 label="状态" 92 label="状态"
93 - width="100"> 93 + width="100" :formatter="formatStatus">
94 </el-table-column> 94 </el-table-column>
95 <el-table-column 95 <el-table-column
96 prop="receipt" 96 prop="receipt"
@@ -121,11 +121,11 @@ @@ -121,11 +121,11 @@
121 <el-button 121 <el-button
122 size="mini" 122 size="mini"
123 type="primary" 123 type="primary"
124 - @click="handleDelete(scope.$index, scope.row)">发送理货报</el-button> 124 + @click="handleCreate(scope.$index, scope.row)">发送理货报</el-button>
125 <el-button 125 <el-button
126 size="mini" 126 size="mini"
127 type="primary" 127 type="primary"
128 - @click="handleDelete(scope.$index, scope.row)">发送舱单删除报</el-button> 128 + @click="handleDelete(scope.$index, scope.row)">发送理货删除报</el-button>
129 </template> 129 </template>
130 </el-table-column> 130 </el-table-column>
131 </el-table> 131 </el-table>
@@ -230,9 +230,21 @@ @@ -230,9 +230,21 @@
230 <el-row class="flightInfo"> 230 <el-row class="flightInfo">
231 <el-col :span="6"> 231 <el-col :span="6">
232 <el-form-item label="海关关区" prop="customcode"> 232 <el-form-item label="海关关区" prop="customcode">
233 - <el-select v-model="ruleForm.customcode" placeholder="" style="display:inline">  
234 - <el-option v-for="(item,index) in customcodes" :key="index" :label="item.label"  
235 - :value="item.value"></el-option> 233 + <el-select v-model="ruleForm.customcode"
  234 + filterable
  235 + allow-create
  236 + default-first-option
  237 + remote
  238 + :remote-method="remoteMethod2"
  239 + :loading="loading" placeholder="请选择" style="display:inline">
  240 + <el-option
  241 + v-for="item in customcodes"
  242 + :key="item.customcode"
  243 + :label="item.customcode"
  244 + :value="item.customcode">
  245 + <span style="float: left">{{ item.customcode }}</span>
  246 + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.customname }}</span>
  247 + </el-option>
236 </el-select> 248 </el-select>
237 </el-form-item> 249 </el-form-item>
238 </el-col> 250 </el-col>
@@ -329,6 +341,26 @@ @@ -329,6 +341,26 @@
329 </span> 341 </span>
330 </el-dialog> 342 </el-dialog>
331 </el-row> 343 </el-row>
  344 + <!--发送删除报修改报提示框-->
  345 + <el-row>
  346 + <el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible">
  347 + <el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm">
  348 + <el-form-item label="操作原因" prop="operreason">
  349 + <el-input type="textarea" v-model="Udform.operreason"></el-input>
  350 + </el-form-item>
  351 + <el-form-item label="操作人" prop="operperson">
  352 + <el-input v-model="Udform.operperson"></el-input>
  353 + </el-form-item>
  354 + <el-form-item label="联系电话" prop="opertel">
  355 + <el-input v-model="Udform.opertel"></el-input>
  356 + </el-form-item>
  357 + </el-form>
  358 + <div slot="footer" class="dialog-footer">
  359 + <el-button @click="dialogFormVisible = false">取 消</el-button>
  360 + <el-button type="primary" @click="deleteUdForm('Udform')">确 定</el-button>
  361 + </div>
  362 + </el-dialog>
  363 + </el-row>
332 </el-main> 364 </el-main>
333 </el-container> 365 </el-container>
334 </template> 366 </template>
@@ -367,7 +399,7 @@ @@ -367,7 +399,7 @@
367 </style> 399 </style>
368 400
369 <script> 401 <script>
370 - import { getMt5201List,addMt5201,ediMt5201,delMt5201} from '../../api/mt5201' 402 + import { getMt5201List,addMt5201,ediMt5201,delMt5201,sendCreateMt520x,sendRemoveMt520x,selectCustomcode} from '../../api/mt5201'
371 export default { 403 export default {
372 data() { 404 data() {
373 return { 405 return {
@@ -388,26 +420,10 @@ @@ -388,26 +420,10 @@
388 update: '编辑', 420 update: '编辑',
389 create: '添加' 421 create: '添加'
390 }, 422 },
391 - customcodes:[  
392 - {  
393 - value: '-1',  
394 - label: '请选择'  
395 - },  
396 - {  
397 - value: '4604',  
398 - label: '4604'  
399 - },  
400 - {  
401 - value: '4620',  
402 - label: '4620'  
403 - },  
404 - {  
405 - value: '4613',  
406 - label: '4613'  
407 - }], 423 + customcodes:[],
408 ruleForm:{ 424 ruleForm:{
409 awba:undefined, 425 awba:undefined,
410 - awbh:undefined, 426 + awbh:'',
411 carrier:undefined, 427 carrier:undefined,
412 flightno:undefined, 428 flightno:undefined,
413 flightdate:undefined, 429 flightdate:undefined,
@@ -443,9 +459,140 @@ @@ -443,9 +459,140 @@
443 sumNmmsCount:0, 459 sumNmmsCount:0,
444 sumNmmsPrice:0, 460 sumNmmsPrice:0,
445 sumNmmsWeight:0, 461 sumNmmsWeight:0,
  462 + Udform:{
  463 + operreason:'',
  464 + operperson:'',
  465 + opertel:'',
  466 + flightdate:'',
  467 + flightno:'',
  468 + carrier:'',
  469 + awbano:'',
  470 + awbhno:'',
  471 + bustype:'',
  472 + busdate:'',
  473 + busweight:'',
  474 + buspiece:'',
  475 + opertype:'',
  476 + },
  477 + udrules:{
  478 + operreason: [{required: true, message: '请输入操作原因', trigger: 'blur'}],
  479 + operperson: [{required: true, message: '请输入操作人', trigger: 'blur'}],
  480 + opertel: [{required: true, message: '请输入操作人联系电话', trigger: 'blur'}],
  481 + },
  482 + Reason:{
  483 + update: '修改',
  484 + delete: '删除'
  485 + },
  486 + udStatus:'',
  487 + dialogFormVisible: false,
  488 + rows:{},
  489 + loading:false,
446 } 490 }
447 }, 491 },
448 methods: { 492 methods: {
  493 + //状态适配
  494 + formatStatus:function (row,column) {
  495 + return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
  496 + :row.status=='11'?'放行':row.status=='12'?'拒装':row.status=='13'?'禁卸'
  497 + :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
  498 + :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
  499 + },
  500 + //获取关区代码
  501 + remoteMethod2:function(query){
  502 + this.customcodes=[];
  503 + let params={customcode:query};
  504 + this.loading = true;
  505 + selectCustomcode(params).then(res =>{
  506 + if (res !== '') {
  507 + setTimeout(() => {
  508 + this.loading = false;
  509 + this.customcodes=res.data.data;
  510 + }, 200);
  511 + } else {
  512 + this.customcodes = [];
  513 + }
  514 +
  515 + });
  516 + },
  517 + //发送理货报
  518 + handleCreate(index,row){
  519 + if(row.flightno.length>4){
  520 + row.flightno=row.flightno.substring(2)
  521 + }else{
  522 + row.flightno=row.flightno;
  523 + }
  524 + if(row.awbh==null){
  525 + row.awbh="";
  526 + }
  527 + const map = {'mt520x':row}
  528 + sendCreateMt520x(map).then(res=>{
  529 + let response=res.data;
  530 + //console.log(res);
  531 + this.code=response.code;
  532 + if(this.code=='200'){
  533 + this.outerVisible = false;
  534 + this.centerDialogVisible=true;
  535 + this.msg=response.msg;
  536 + }else{
  537 + this.outerVisible = false;
  538 + this.centerDialogVisible=true;
  539 + this.msg=response.msg;
  540 + }
  541 + });
  542 + },
  543 + //发送理货删除报
  544 + handleDelete(index,row){
  545 + this.dialogFormVisible=true;
  546 + this.udStatus='delete';
  547 + this.Udform.awbano=row.awba;
  548 + this.Udform.awbhno=row.awbh;
  549 + this.Udform.carrier=row.carrier;
  550 + this.Udform.flightno=row.flightno.substring(2);
  551 + this.Udform.flightdate=row.flightdate;
  552 + this.Udform.bustype='MT5201';
  553 + this.Udform.busdate=Date.parse(new Date());
  554 + this.Udform.busweight=row.weight;
  555 + this.Udform.buspiece=row.piece;
  556 + this.Udform.opertype='发送理货删除报';
  557 + if(row.flightno.length>4){
  558 + row.flightno=row.flightno;
  559 + }else{
  560 + row.flightno=row.carrier+row.flightno;
  561 + };
  562 + if(row.awbh==null){
  563 + row.awbh="";
  564 + }
  565 + this.rows=row;
  566 + },
  567 + //发送理化删除报提交表单
  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;
  593 + }
  594 + });
  595 + },
449 //批量选中事件 596 //批量选中事件
450 handleSelectionChange(val) { 597 handleSelectionChange(val) {
451 this.multipleSelection = val; 598 this.multipleSelection = val;
@@ -162,7 +162,7 @@ @@ -162,7 +162,7 @@
162 <el-table-column 162 <el-table-column
163 prop="status" 163 prop="status"
164 label="状态" 164 label="状态"
165 - width="90"> 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="repick"
@@ -249,13 +249,14 @@ @@ -249,13 +249,14 @@
249 tableData: [], 249 tableData: [],
250 multipleSelection: [], 250 multipleSelection: [],
251 currentPage:1, 251 currentPage:1,
252 - pageSize:10, 252 + pageSize:100,
253 total:0 253 total:0
254 } 254 }
255 }, 255 },
256 methods:{ 256 methods:{
257 handleSelectionChange(val) { 257 handleSelectionChange(val) {
258 this.multipleSelection = val; 258 this.multipleSelection = val;
  259 + console.log(val)
259 }, 260 },
260 handleClick(row) { 261 handleClick(row) {
261 console.log(row); 262 console.log(row);
@@ -268,6 +269,13 @@ @@ -268,6 +269,13 @@
268 this.currentPage=val; 269 this.currentPage=val;
269 this.QueryData(); 270 this.QueryData();
270 }, 271 },
  272 + //状态适配
  273 + formatStatus:function (row,column) {
  274 + return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
  275 + :row.status=='11'?'放行':row.status=='12'?'拒装':row.status=='13'?'禁卸'
  276 + :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
  277 + :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
  278 + },
271 //修改状态 279 //修改状态
272 handleStuts(){}, 280 handleStuts(){},
273 //条件查询方法 281 //条件查询方法