朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 0be4b9c05dd6156ba865eb59fa8fb50a9ec3590d 2 个父辈 1974b6f4 bff2ec05

Merge branch 'master' of 118.31.66.166:zp260/vue_cli

内嵌 并排对比
正在显示 11 个修改的文件 包含 270 行增加 和 45 行删除
@@ -6313,7 +6313,7 @@ @@ -6313,7 +6313,7 @@
6313 }, 6313 },
6314 "normalize-wheel": { 6314 "normalize-wheel": {
6315 "version": "1.0.1", 6315 "version": "1.0.1",
6316 - "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", 6316 + "resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
6317 "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" 6317 "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
6318 }, 6318 },
6319 "npm": { 6319 "npm": {
  1 +import http from './http.js'
  2 +
  3 +let baseUrl = 'nmms-server-import/nmms/rep'
  4 +
  5 +export const addResponse=params=>{return http.post(`${baseUrl}/InsertResponse`, params);};
@@ -6,4 +6,6 @@ export const getMt1201List=params=>{return http.get(`${baseUrl}/getMt1201List`, @@ -6,4 +6,6 @@ export const getMt1201List=params=>{return http.get(`${baseUrl}/getMt1201List`,
6 export const getFenList=params=>{return http.get(`${baseUrl}/getFenList`, params);}; 6 export const getFenList=params=>{return http.get(`${baseUrl}/getFenList`, params);};
7 export const addMt1201=params=>{return http.post(`${baseUrl}/addMt1201`, params);}; 7 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 - 9 +export const selectAirport=params=>{return http.get(`${baseUrl}/selectList`, params);};
  10 +export const getCountryCode=params=>{return http.get(`${baseUrl}/getCountryCode`, params);};
  11 +export const selectCustomcode=params=>{return http.get(`${baseUrl}/selectCustomcode`, params);};
@@ -26,12 +26,34 @@ @@ -26,12 +26,34 @@
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-input placeholder="" v-model="ruleForm.originstation"></el-input> 29 + <el-select v-model="ruleForm.originstation" filterable
  30 + allow-create
  31 + default-first-option filterable placeholder="请选择">
  32 + <el-option
  33 + v-for="item in options"
  34 + :key="item.airportid"
  35 + :label="item.airportid"
  36 + :value="item.airportid">
  37 + <span style="float: left">{{ item.airportid }}</span>
  38 + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportdescchn }}</span>
  39 + </el-option>
  40 + </el-select>
30 </el-form-item> 41 </el-form-item>
31 </el-col> 42 </el-col>
32 <el-col :span="5"> 43 <el-col :span="5">
33 <el-form-item label="目的站" prop="destinationstation"> 44 <el-form-item label="目的站" prop="destinationstation">
34 - <el-input placeholder="" v-model="ruleForm.destinationstation" :disabled="true"></el-input> 45 + <el-select v-model="ruleForm.destinationstation" filterable
  46 + allow-create
  47 + default-first-option filterable placeholder="请选择">
  48 + <el-option
  49 + v-for="item in options2"
  50 + :key="item.airportid"
  51 + :label="item.airportid"
  52 + :value="item.airportid">
  53 + <span style="float: left">{{ item.airportid }}</span>
  54 + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportdescchn }}</span>
  55 + </el-option>
  56 + </el-select>
35 </el-form-item> 57 </el-form-item>
36 </el-col> 58 </el-col>
37 </el-row> 59 </el-row>
@@ -56,6 +78,7 @@ @@ -56,6 +78,7 @@
56 </style> 78 </style>
57 79
58 <script> 80 <script>
  81 + import { selectAirport } from '../../api/mt1201'
59 export default { 82 export default {
60 data() { 83 data() {
61 return { 84 return {
@@ -64,8 +87,11 @@ @@ -64,8 +87,11 @@
64 flightno:'', 87 flightno:'',
65 flightdate:'', 88 flightdate:'',
66 originstation:'', 89 originstation:'',
67 - destinationstation:'CGO' 90 + destinationstation:''
68 }, 91 },
  92 + options: [],
  93 + options2:[],
  94 + airportid:'',
69 /*表单校验规则*/ 95 /*表单校验规则*/
70 rules: { 96 rules: {
71 flightno: [ 97 flightno: [
@@ -87,6 +113,13 @@ @@ -87,6 +113,13 @@
87 }; 113 };
88 }, 114 },
89 methods:{ 115 methods:{
  116 + getFlightList:function() {
  117 + let params={};
  118 + selectAirport(params).then(res=>{
  119 + this.options=res.data.data;
  120 + this.options2=res.data.data;
  121 + });
  122 + },
90 /*按钮点击请求方法*/ 123 /*按钮点击请求方法*/
91 submitForm(formName) { 124 submitForm(formName) {
92 this.$refs[formName].validate((valid) => { 125 this.$refs[formName].validate((valid) => {
@@ -110,12 +143,14 @@ @@ -110,12 +143,14 @@
110 this.ruleForm.flightno=this.$route.params.row.flightno; 143 this.ruleForm.flightno=this.$route.params.row.flightno;
111 this.ruleForm.flightdate=this.$route.params.row.flightdate; 144 this.ruleForm.flightdate=this.$route.params.row.flightdate;
112 this.ruleForm.originstation=this.$route.params.row.originstation; 145 this.ruleForm.originstation=this.$route.params.row.originstation;
  146 + this.ruleForm.destinationstation=this.$route.params.row.destinationstation;
113 } 147 }
114 } 148 }
115 }, 149 },
116 /*渲染方法*/ 150 /*渲染方法*/
117 mounted(){ 151 mounted(){
118 this.getDefaultData(); 152 this.getDefaultData();
  153 + this.getFlightList();
119 } 154 }
120 }; 155 };
121 </script> 156 </script>
@@ -25,13 +25,41 @@ @@ -25,13 +25,41 @@
25 </el-form-item> 25 </el-form-item>
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-input placeholder="" v-model="ruleForm.originstation"></el-input> 29 <el-input placeholder="" v-model="ruleForm.originstation"></el-input>
  30 + </el-form-item>-->
  31 + <el-form-item label="始发站" prop="originstation">
  32 + <el-select v-model="ruleForm.originstation" filterable
  33 + allow-create
  34 + default-first-option filterable placeholder="请选择">
  35 + <el-option
  36 + v-for="item in options"
  37 + :key="item.airportid"
  38 + :label="item.airportid"
  39 + :value="item.airportid">
  40 + <span style="float: left">{{ item.airportid }}</span>
  41 + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportdescchn }}</span>
  42 + </el-option>
  43 + </el-select>
30 </el-form-item> 44 </el-form-item>
31 </el-col> 45 </el-col>
32 <el-col :span="5"> 46 <el-col :span="5">
33 - <el-form-item label="目的站" prop="destinationstation"> 47 + <!--<el-form-item label="目的站" prop="destinationstation">
34 <el-input placeholder="" v-model="ruleForm.destinationstation" :disabled="true"></el-input> 48 <el-input placeholder="" v-model="ruleForm.destinationstation" :disabled="true"></el-input>
  49 + </el-form-item>-->
  50 + <el-form-item label="目的站" prop="destinationstation">
  51 + <el-select v-model="ruleForm.destinationstation" filterable
  52 + allow-create
  53 + default-first-option filterable placeholder="请选择">
  54 + <el-option
  55 + v-for="item in options"
  56 + :key="item.airportid"
  57 + :label="item.airportid"
  58 + :value="item.airportid">
  59 + <span style="float: left">{{ item.airportid }}</span>
  60 + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportdescchn }}</span>
  61 + </el-option>
  62 + </el-select>
35 </el-form-item> 63 </el-form-item>
36 </el-col> 64 </el-col>
37 </el-row> 65 </el-row>
@@ -56,6 +84,7 @@ @@ -56,6 +84,7 @@
56 </style> 84 </style>
57 85
58 <script> 86 <script>
  87 + import { selectAirport } from '../../api/mt1201'
59 export default { 88 export default {
60 data() { 89 data() {
61 return { 90 return {
@@ -64,8 +93,10 @@ @@ -64,8 +93,10 @@
64 flightno: '', 93 flightno: '',
65 flightdate:'', 94 flightdate:'',
66 originstation:'', 95 originstation:'',
67 - destinationstation:'CGO' 96 + destinationstation:''
68 }, 97 },
  98 + options: [],
  99 + airportid:'',
69 /*表单验证方法*/ 100 /*表单验证方法*/
70 rules: { 101 rules: {
71 flightno: [ 102 flightno: [
@@ -87,6 +118,12 @@ @@ -87,6 +118,12 @@
87 }; 118 };
88 }, 119 },
89 methods:{ 120 methods:{
  121 + getFlightList:function() {
  122 + let params={};
  123 + selectAirport(params).then(res=>{
  124 + this.options=res.data.data;
  125 + });
  126 + },
90 /*按钮点击请求方法*/ 127 /*按钮点击请求方法*/
91 submitForm(formName) { 128 submitForm(formName) {
92 this.$refs[formName].validate((valid) => { 129 this.$refs[formName].validate((valid) => {
@@ -110,12 +147,14 @@ @@ -110,12 +147,14 @@
110 this.ruleForm.flightno=this.$route.params.row.flightno; 147 this.ruleForm.flightno=this.$route.params.row.flightno;
111 this.ruleForm.flightdate=this.$route.params.row.flightdate; 148 this.ruleForm.flightdate=this.$route.params.row.flightdate;
112 this.ruleForm.originstation=this.$route.params.row.originstation; 149 this.ruleForm.originstation=this.$route.params.row.originstation;
  150 + this.ruleForm.destinationstation=this.$route.params.row.destinationstation;
113 } 151 }
114 } 152 }
115 }, 153 },
116 /*渲染方法*/ 154 /*渲染方法*/
117 mounted(){ 155 mounted(){
118 this.getDefaultData(); 156 this.getDefaultData();
  157 + this.getFlightList();
119 } 158 }
120 }; 159 };
121 160
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <!--检索条件--> 4 <!--检索条件-->
5 <el-row> 5 <el-row>
6 <el-col :span="4"> 6 <el-col :span="4">
7 - <div class="grid-content bg-purple"> 7 + <div>
8 <el-input v-model="carrier" placeholder=""> 8 <el-input v-model="carrier" placeholder="">
9 <template slot="prepend">航班号</template> 9 <template slot="prepend">航班号</template>
10 </el-input> 10 </el-input>
@@ -116,7 +116,6 @@ @@ -116,7 +116,6 @@
116 label="回执信息" 116 label="回执信息"
117 width="180"> 117 width="180">
118 </el-table-column> 118 </el-table-column>
119 - </el-table-column>  
120 <el-table-column 119 <el-table-column
121 prop="operation" 120 prop="operation"
122 label="操作" 121 label="操作"
@@ -362,9 +361,17 @@ @@ -362,9 +361,17 @@
362 </el-col> 361 </el-col>
363 <el-col :span="6"> 362 <el-col :span="6">
364 <el-form-item label="海关关区" prop="customcode"> 363 <el-form-item label="海关关区" prop="customcode">
365 - <el-select v-model="ruleForm.customcode" placeholder="" style="display:inline">  
366 - <el-option v-for="(item,index) in customcodes" :key="index" :label="item.label"  
367 - :value="item.value"></el-option> 364 + <el-select v-model="ruleForm.customcode" filterable
  365 + allow-create
  366 + default-first-option filterable placeholder="请选择" style="display:inline">
  367 + <el-option
  368 + v-for="item in customcodes"
  369 + :key="item.customcode"
  370 + :label="item.customcode"
  371 + :value="item.customcode">
  372 + <span style="float: left">{{ item.customcode }}</span>
  373 + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.customname }}</span>
  374 + </el-option>
368 </el-select> 375 </el-select>
369 </el-form-item> 376 </el-form-item>
370 </el-col> 377 </el-col>
@@ -390,11 +397,25 @@ @@ -390,11 +397,25 @@
390 </el-form-item> 397 </el-form-item>
391 </el-col> 398 </el-col>
392 <el-col :span="6"> 399 <el-col :span="6">
393 - <el-form-item label="国家代码" prop="awbinfo.shprcountyr"> 400 + <!--<el-form-item label="国家代码" prop="awbinfo.shprcountyr">
394 <el-select v-model="ruleForm.awbinfo.shprcountyr" placeholder="" style="display:inline"> 401 <el-select v-model="ruleForm.awbinfo.shprcountyr" placeholder="" style="display:inline">
395 <el-option v-for="item in shprcountyrs" :key="item" :label="item" 402 <el-option v-for="item in shprcountyrs" :key="item" :label="item"
396 :value="item"></el-option> 403 :value="item"></el-option>
397 </el-select> 404 </el-select>
  405 + </el-form-item>-->
  406 + <el-form-item label="国家代码" prop="awbinfo.shprcountyr">
  407 + <el-select v-model="ruleForm.awbinfo.shprcountyr" filterable
  408 + allow-create
  409 + default-first-option filterable placeholder="请选择">
  410 + <el-option
  411 + v-for="item in shprcountyrs"
  412 + :key="item.countryCode"
  413 + :label="item.countryCode"
  414 + :value="item.countryCode">
  415 + <span style="float: left">{{ item.countryNameCn }}</span>
  416 + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.countryCode }}</span>
  417 + </el-option>
  418 + </el-select>
398 </el-form-item> 419 </el-form-item>
399 </el-col> 420 </el-col>
400 <el-col :span="6"> 421 <el-col :span="6">
@@ -421,10 +442,19 @@ @@ -421,10 +442,19 @@
421 </el-form-item> 442 </el-form-item>
422 </el-col> 443 </el-col>
423 <el-col :span="6"> 444 <el-col :span="6">
  445 +
424 <el-form-item label="国家代码" prop="awbinfo.cnscountyr"> 446 <el-form-item label="国家代码" prop="awbinfo.cnscountyr">
425 - <el-select v-model="ruleForm.awbinfo.cnscountyr" placeholder="" style="display:inline">  
426 - <el-option v-for="item in cnscountyrs" :key="item" :label="item"  
427 - :value="item"></el-option> 447 + <el-select v-model="ruleForm.awbinfo.cnscountyr" filterable
  448 + allow-create
  449 + default-first-option filterable placeholder="请选择">
  450 + <el-option
  451 + v-for="item in cnscountyrs"
  452 + :key="item.countryCode"
  453 + :label="item.countryCode"
  454 + :value="item.countryCode">
  455 + <span style="float: left">{{ item.countryNameCn }}</span>
  456 + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.countryCode }}</span>
  457 + </el-option>
428 </el-select> 458 </el-select>
429 </el-form-item> 459 </el-form-item>
430 </el-col> 460 </el-col>
@@ -522,13 +552,13 @@ @@ -522,13 +552,13 @@
522 </div> 552 </div>
523 </el-col> 553 </el-col>
524 <el-col :span="2.5" class="pub"> 554 <el-col :span="2.5" class="pub">
525 - <div class="grid-content"><span>主单数：999</span></div> 555 + <div class="grid-content"><span>主单数：{{sumNmmsCount}}</span></div>
526 </el-col> 556 </el-col>
527 <el-col :span="3.5" class="pub"> 557 <el-col :span="3.5" class="pub">
528 - <div class="grid-content"><span>舱单总件数：999999</span></div> 558 + <div class="grid-content"><span>舱单总件数：{{sumNmmsPrice}}</span></div>
529 </el-col> 559 </el-col>
530 <el-col :span="4" class="pub"> 560 <el-col :span="4" class="pub">
531 - <div class="grid-content"><span>舱单总重量：999999</span></div> 561 + <div class="grid-content"><span>舱单总重量：{{sumNmmsWeight}}</span></div>
532 </el-col> 562 </el-col>
533 </el-row> 563 </el-row>
534 <!--对话提示框--> 564 <!--对话提示框-->
@@ -545,6 +575,26 @@ @@ -545,6 +575,26 @@
545 </span> 575 </span>
546 </el-dialog> 576 </el-dialog>
547 </el-row> 577 </el-row>
  578 + <!--发送删除报修改报提示框-->
  579 + <el-row>
  580 + <el-dialog title="提交修改信息" :visible.sync="dialogFormVisible">
  581 + <el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm">
  582 + <el-form-item label="操作原因" prop="operreason">
  583 + <el-input type="textarea" v-model="Udform.operreason"></el-input>
  584 + </el-form-item>
  585 + <el-form-item label="操作人" prop="operperson">
  586 + <el-input v-model="Udform.operperson"></el-input>
  587 + </el-form-item>
  588 + <el-form-item label="联系电话" prop="opertel">
  589 + <el-input v-model="Udform.opertel"></el-input>
  590 + </el-form-item>
  591 + </el-form>
  592 + <div slot="footer" class="dialog-footer">
  593 + <el-button @click="dialogFormVisible = false">取 消</el-button>
  594 + <el-button type="primary" @click="submitUdForm('Udform')">确 定</el-button>
  595 + </div>
  596 + </el-dialog>
  597 + </el-row>
548 </el-main> 598 </el-main>
549 </el-container> 599 </el-container>
550 </template> 600 </template>
@@ -601,7 +651,9 @@ @@ -601,7 +651,9 @@
601 </style> 651 </style>
602 652
603 <script> 653 <script>
604 - import { getMt1201List,addMt1201,ediMt1201,getFenList } from '../../api/mt1201' 654 + import { getMt1201List,addMt1201,ediMt1201,getFenList,getCountryCode,selectCustomcode } from '../../api/mt1201'
  655 + import{addResponse} from "../../api/InResponse";
  656 +
605 export default { 657 export default {
606 data() { 658 data() {
607 /*初始数据*/ 659 /*初始数据*/
@@ -712,23 +764,8 @@ @@ -712,23 +764,8 @@
712 value: '008', 764 value: '008',
713 label: '惰性物料' 765 label: '惰性物料'
714 }], 766 }],
715 - customcodes:[  
716 - {  
717 - value: '-1',  
718 - label: '请选择'  
719 - },  
720 - {  
721 - value: '4604',  
722 - label: '4604'  
723 - },  
724 - {  
725 - value: '4620',  
726 - label: '4620'  
727 - },  
728 - {  
729 - value: '4613',  
730 - label: '4613'  
731 - }], 767 + customcodes:[],
  768 + customcode:'',
732 rules: { 769 rules: {
733 waybill: [{required: true, message: '请输入运单号', trigger: 'blur'}], 770 waybill: [{required: true, message: '请输入运单号', trigger: 'blur'}],
734 flightno: [{required: true, message: '航班号必须输入', trigger: 'blur'}], 771 flightno: [{required: true, message: '航班号必须输入', trigger: 'blur'}],
@@ -757,12 +794,38 @@ @@ -757,12 +794,38 @@
757 }, 794 },
758 labelPosition: 'left', 795 labelPosition: 'left',
759 splitcodes: [{value:'T',label:'否'},{value:'P',label:'是'}], 796 splitcodes: [{value:'T',label:'否'},{value:'P',label:'是'}],
760 - shprcountyrs:['US','CN'],  
761 - cnscountyrs:['US','CN'], 797 + shprcountyrs:[],
  798 + cnscountyrs:[],
  799 + countryCode:'',
762 msg:'', 800 msg:'',
763 code:'', 801 code:'',
764 centerDialogVisible:false, 802 centerDialogVisible:false,
765 - FenStatus:'' 803 + FenStatus:'',
  804 + sumNmmsCount:0,
  805 + sumNmmsPrice:0,
  806 + sumNmmsWeight:0,
  807 + dialogFormVisible: false,
  808 + formLabelWidth: '100px',
  809 + Udform:{
  810 + operreason:'',
  811 + operperson:'',
  812 + opertel:'',
  813 + flightdate:'',
  814 + flightno:'',
  815 + carrier:'',
  816 + awbano:'',
  817 + awbhno:'',
  818 + bustype:'',
  819 + busdate:'',
  820 + busweight:'',
  821 + buspiece:'',
  822 + opertype:'',
  823 + },
  824 + udrules:{
  825 + operreason: [{required: true, message: '请输入操作原因', trigger: 'blur'}],
  826 + operperson: [{required: true, message: '请输入操作人', trigger: 'blur'}],
  827 + opertel: [{required: true, message: '请输入操作人联系电话', trigger: 'blur'}],
  828 + },
766 } 829 }
767 }, 830 },
768 methods: { 831 methods: {
@@ -783,6 +846,8 @@ @@ -783,6 +846,8 @@
783 this.FenQuery.originstation=this.defaultQuery.originstation; 846 this.FenQuery.originstation=this.defaultQuery.originstation;
784 this.FenQuery.destinationstation=row.destinationstation; 847 this.FenQuery.destinationstation=row.destinationstation;
785 this.getFenList(this.FenQuery); 848 this.getFenList(this.FenQuery);
  849 + this.getCountryCode();
  850 + this.selectCustomcode();
786 }, 851 },
787 /*编辑分单信息*/ 852 /*编辑分单信息*/
788 handleFen(index,row){ 853 handleFen(index,row){
@@ -796,6 +861,48 @@ @@ -796,6 +861,48 @@
796 }, 861 },
797 //发送舱单报 862 //发送舱单报
798 handleSend(index,row){}, 863 handleSend(index,row){},
  864 + /*发送舱单修改报*/
  865 + handleUpdate(index,row){
  866 + this.dialogFormVisible=true;
  867 + //console.log(row);
  868 + this.Udform.awbano=row.awba;
  869 + this.Udform.awbhno=row.awbh;
  870 + this.Udform.carrier=row.carrier;
  871 + this.Udform.flightno=row.flightno.substring(2);
  872 + this.Udform.flightdate=row.flightdate;
  873 + this.Udform.bustype='MT1201';
  874 + this.Udform.busdate=Date.parse(new Date());
  875 + this.Udform.busweight=row.weight;
  876 + this.Udform.buspiece=row.piece;
  877 + this.Udform.opertype='发送舱单修改报';
  878 + },
  879 + //提交发送舱单修改报表单
  880 + submitUdForm(formName){
  881 + this.$refs[formName].validate((valid) => {
  882 + if (valid) {
  883 + console.log(this.Udform)
  884 + addResponse(this.Udform).then(res=>{
  885 + let response=res.data;
  886 + this.code=response.code;
  887 + if(this.code=='200'){
  888 + this.outerVisible = false;
  889 + this.$refs[formName].resetFields();
  890 + this.centerDialogVisible=true;
  891 + this.msg=response.msg;
  892 + this.dialogFormVisible=false;
  893 + }else{
  894 + this.outerVisible = false;
  895 + this.centerDialogVisible=true;
  896 + this.$refs[formName].resetFields();
  897 + this.msg=response.msg;
  898 + }
  899 + });
  900 + } else {
  901 + console.log('error submit!!');
  902 + return false;
  903 + }
  904 + });
  905 + },
799 /*编辑分单列表信息*/ 906 /*编辑分单列表信息*/
800 handleClick(row) { 907 handleClick(row) {
801 this.outerVisible = true; 908 this.outerVisible = true;
@@ -817,8 +924,34 @@ @@ -817,8 +924,34 @@
817 getList(){ 924 getList(){
818 getMt1201List(this.defaultQuery).then(res =>{ 925 getMt1201List(this.defaultQuery).then(res =>{
819 //console.log(res); 926 //console.log(res);
  927 + this.sumNmmsCount=0;
  928 + this.sumNmmsPrice=0;
  929 + this.sumNmmsWeight=0;
820 let response=res.data.data; 930 let response=res.data.data;
821 this.tableData=response; 931 this.tableData=response;
  932 + response.forEach((item,i) => {
  933 + if(item.awba!=null&&item.awbh=="");
  934 + this.sumNmmsCount=Number(this.sumNmmsCount)+1;
  935 + this.sumNmmsPrice=Number(this.sumNmmsPrice)+Number(item.piece);
  936 + this.sumNmmsWeight=Number(this.sumNmmsWeight)+Number(item.weight);
  937 + })
  938 + });
  939 + },
  940 + /*获取国家代码*/
  941 + getCountryCode(){
  942 + let params={};
  943 + getCountryCode(params).then(res =>{
  944 + //console.log(res);
  945 + this.shprcountyrs=res.data.data;
  946 + this.cnscountyrs=res.data.data;
  947 + });
  948 + },
  949 + //获取关区代码
  950 + selectCustomcode(){
  951 + let params={};
  952 + selectCustomcode(params).then(res =>{
  953 + //console.log(res);
  954 + this.customcodes=res.data.data;
822 }); 955 });
823 }, 956 },
824 //新增原始舱单按钮 957 //新增原始舱单按钮
@@ -311,9 +311,9 @@ @@ -311,9 +311,9 @@
311 <el-col :span="2.5"><div class="grid-content"><el-button type="primary" v-on:click="addTally" size="mini">新增进港理货</el-button></div></el-col> 311 <el-col :span="2.5"><div class="grid-content"><el-button type="primary" v-on:click="addTally" size="mini">新增进港理货</el-button></div></el-col>
312 <el-col :span="2.5"><div class="grid-content"><el-button type="primary" size="mini">批量发送删除报</el-button></div></el-col> 312 <el-col :span="2.5"><div class="grid-content"><el-button type="primary" size="mini">批量发送删除报</el-button></div></el-col>
313 <el-col :span="2"><div class="grid-content"><el-button type="primary" size="mini">返回</el-button></div></el-col> 313 <el-col :span="2"><div class="grid-content"><el-button type="primary" size="mini">返回</el-button></div></el-col>
314 - <el-col :span="2.5"><div class="grid-content"><span>主单数：999</span></div></el-col>  
315 - <el-col :span="3.5"><div class="grid-content"><span>理货总件数：999999</span></div></el-col>  
316 - <el-col :span="4"><div class="grid-content"><span>理货总重量：999999</span></div></el-col> 314 + <el-col :span="2.5"><div class="grid-content"><span>主单数：{{sumNmmsCount}}</span></div></el-col>
  315 + <el-col :span="3.5"><div class="grid-content"><span>理货总件数：{{sumNmmsPrice}}</span></div></el-col>
  316 + <el-col :span="4"><div class="grid-content"><span>理货总重量：{{sumNmmsWeight}}</span></div></el-col>
317 </el-row> 317 </el-row>
318 <!--对话提示框--> 318 <!--对话提示框-->
319 <el-row> 319 <el-row>
@@ -440,6 +440,9 @@ @@ -440,6 +440,9 @@
440 }, 440 },
441 centerDialogVisible:false, 441 centerDialogVisible:false,
442 msg:'', 442 msg:'',
  443 + sumNmmsCount:0,
  444 + sumNmmsPrice:0,
  445 + sumNmmsWeight:0,
443 } 446 }
444 }, 447 },
445 methods: { 448 methods: {
@@ -478,9 +481,17 @@ @@ -478,9 +481,17 @@
478 //获取进港理货列表 481 //获取进港理货列表
479 getMt5201List(){ 482 getMt5201List(){
480 getMt5201List(this.defaultQuery).then(res =>{ 483 getMt5201List(this.defaultQuery).then(res =>{
481 - console.log(res); 484 + this.sumNmmsCount=0;
  485 + this.sumNmmsPrice=0;
  486 + this.sumNmmsWeight=0;
482 let response=res.data.data; 487 let response=res.data.data;
483 this.tableData=response; 488 this.tableData=response;
  489 + response.forEach((item,i) => {
  490 + if(item.awba!=null&&item.awbh=="");
  491 + this.sumNmmsCount=Number(this.sumNmmsCount)+1;
  492 + this.sumNmmsPrice=Number(this.sumNmmsPrice)+Number(item.piece);
  493 + this.sumNmmsWeight=Number(this.sumNmmsWeight)+Number(item.weight);
  494 + })
484 }); 495 });
485 }, 496 },
486 //新增理货按钮事件 497 //新增理货按钮事件