正在显示
8 个修改的文件
包含
168 行增加
和
48 行删除
| @@ -30,8 +30,8 @@ module.exports = { | @@ -30,8 +30,8 @@ module.exports = { | ||
| 30 | assetsPublicPath: '/', | 30 | assetsPublicPath: '/', |
| 31 | proxyTable: { | 31 | proxyTable: { |
| 32 | '/api':{ | 32 | '/api':{ |
| 33 | - // target: 'http://192.168.1.53:12343',//设置你调用的接口域名和端口号 别忘了加http | ||
| 34 | - target: 'http://localhost:12343',//设置你调用的接口域名和端口号 别忘了加http | 33 | + target: 'http://192.168.1.53:12343',//设置你调用的接口域名和端口号 别忘了加http |
| 34 | + // target: 'http://localhost:12343',//设置你调用的接口域名和端口号 别忘了加http | ||
| 35 | changeOrigin: true, | 35 | changeOrigin: true, |
| 36 | pathRewrite: { | 36 | pathRewrite: { |
| 37 | '^/api/': '/'//这里理解成用‘/api’代替target里面的地址,后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add',直接写‘/api/user/add’即可 | 37 | '^/api/': '/'//这里理解成用‘/api’代替target里面的地址,后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add',直接写‘/api/user/add’即可 |
| @@ -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": { |
| @@ -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,30 @@ | @@ -26,12 +26,30 @@ | ||
| 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 placeholder="请选择"> |
| 30 | + <el-option | ||
| 31 | + v-for="item in options" | ||
| 32 | + :key="item.airportid" | ||
| 33 | + :label="item.airportid" | ||
| 34 | + :value="item.airportid"> | ||
| 35 | + <span style="float: left">{{ item.airportid }}</span> | ||
| 36 | + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportdescchn }}</span> | ||
| 37 | + </el-option> | ||
| 38 | + </el-select> | ||
| 30 | </el-form-item> | 39 | </el-form-item> |
| 31 | </el-col> | 40 | </el-col> |
| 32 | <el-col :span="5"> | 41 | <el-col :span="5"> |
| 33 | <el-form-item label="目的站" prop="destinationstation"> | 42 | <el-form-item label="目的站" prop="destinationstation"> |
| 34 | - <el-input placeholder="" v-model="ruleForm.destinationstation" :disabled="true"></el-input> | 43 | + <el-select v-model="ruleForm.destinationstation" filterable placeholder="请选择"> |
| 44 | + <el-option | ||
| 45 | + v-for="item in options2" | ||
| 46 | + :key="item.airportid" | ||
| 47 | + :label="item.airportid" | ||
| 48 | + :value="item.airportid"> | ||
| 49 | + <span style="float: left">{{ item.airportid }}</span> | ||
| 50 | + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportdescchn }}</span> | ||
| 51 | + </el-option> | ||
| 52 | + </el-select> | ||
| 35 | </el-form-item> | 53 | </el-form-item> |
| 36 | </el-col> | 54 | </el-col> |
| 37 | </el-row> | 55 | </el-row> |
| @@ -56,6 +74,7 @@ | @@ -56,6 +74,7 @@ | ||
| 56 | </style> | 74 | </style> |
| 57 | 75 | ||
| 58 | <script> | 76 | <script> |
| 77 | + import { selectAirport } from '../../api/mt1201' | ||
| 59 | export default { | 78 | export default { |
| 60 | data() { | 79 | data() { |
| 61 | return { | 80 | return { |
| @@ -64,8 +83,11 @@ | @@ -64,8 +83,11 @@ | ||
| 64 | flightno:'', | 83 | flightno:'', |
| 65 | flightdate:'', | 84 | flightdate:'', |
| 66 | originstation:'', | 85 | originstation:'', |
| 67 | - destinationstation:'CGO' | 86 | + destinationstation:'' |
| 68 | }, | 87 | }, |
| 88 | + options: [], | ||
| 89 | + options2:[], | ||
| 90 | + airportid:'', | ||
| 69 | /*表单校验规则*/ | 91 | /*表单校验规则*/ |
| 70 | rules: { | 92 | rules: { |
| 71 | flightno: [ | 93 | flightno: [ |
| @@ -87,6 +109,13 @@ | @@ -87,6 +109,13 @@ | ||
| 87 | }; | 109 | }; |
| 88 | }, | 110 | }, |
| 89 | methods:{ | 111 | methods:{ |
| 112 | + getFlightList:function() { | ||
| 113 | + let params={}; | ||
| 114 | + selectAirport(params).then(res=>{ | ||
| 115 | + this.options=res.data.data; | ||
| 116 | + this.options2=res.data.data; | ||
| 117 | + }); | ||
| 118 | + }, | ||
| 90 | /*按钮点击请求方法*/ | 119 | /*按钮点击请求方法*/ |
| 91 | submitForm(formName) { | 120 | submitForm(formName) { |
| 92 | this.$refs[formName].validate((valid) => { | 121 | this.$refs[formName].validate((valid) => { |
| @@ -110,12 +139,14 @@ | @@ -110,12 +139,14 @@ | ||
| 110 | this.ruleForm.flightno=this.$route.params.row.flightno; | 139 | this.ruleForm.flightno=this.$route.params.row.flightno; |
| 111 | this.ruleForm.flightdate=this.$route.params.row.flightdate; | 140 | this.ruleForm.flightdate=this.$route.params.row.flightdate; |
| 112 | this.ruleForm.originstation=this.$route.params.row.originstation; | 141 | this.ruleForm.originstation=this.$route.params.row.originstation; |
| 142 | + this.ruleForm.destinationstation=this.$route.params.row.destinationstation; | ||
| 113 | } | 143 | } |
| 114 | } | 144 | } |
| 115 | }, | 145 | }, |
| 116 | /*渲染方法*/ | 146 | /*渲染方法*/ |
| 117 | mounted(){ | 147 | mounted(){ |
| 118 | this.getDefaultData(); | 148 | this.getDefaultData(); |
| 149 | + this.getFlightList(); | ||
| 119 | } | 150 | } |
| 120 | }; | 151 | }; |
| 121 | </script> | 152 | </script> |
| @@ -25,13 +25,37 @@ | @@ -25,13 +25,37 @@ | ||
| 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 placeholder="请选择"> | ||
| 33 | + <el-option | ||
| 34 | + v-for="item in options" | ||
| 35 | + :key="item.airportid" | ||
| 36 | + :label="item.airportid" | ||
| 37 | + :value="item.airportid"> | ||
| 38 | + <span style="float: left">{{ item.airportid }}</span> | ||
| 39 | + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportdescchn }}</span> | ||
| 40 | + </el-option> | ||
| 41 | + </el-select> | ||
| 30 | </el-form-item> | 42 | </el-form-item> |
| 31 | </el-col> | 43 | </el-col> |
| 32 | <el-col :span="5"> | 44 | <el-col :span="5"> |
| 33 | - <el-form-item label="目的站" prop="destinationstation"> | 45 | + <!--<el-form-item label="目的站" prop="destinationstation"> |
| 34 | <el-input placeholder="" v-model="ruleForm.destinationstation" :disabled="true"></el-input> | 46 | <el-input placeholder="" v-model="ruleForm.destinationstation" :disabled="true"></el-input> |
| 47 | + </el-form-item>--> | ||
| 48 | + <el-form-item label="目的站" prop="destinationstation"> | ||
| 49 | + <el-select v-model="ruleForm.destinationstation" filterable placeholder="请选择"> | ||
| 50 | + <el-option | ||
| 51 | + v-for="item in options" | ||
| 52 | + :key="item.airportid" | ||
| 53 | + :label="item.airportid" | ||
| 54 | + :value="item.airportid"> | ||
| 55 | + <span style="float: left">{{ item.airportid }}</span> | ||
| 56 | + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportdescchn }}</span> | ||
| 57 | + </el-option> | ||
| 58 | + </el-select> | ||
| 35 | </el-form-item> | 59 | </el-form-item> |
| 36 | </el-col> | 60 | </el-col> |
| 37 | </el-row> | 61 | </el-row> |
| @@ -56,6 +80,7 @@ | @@ -56,6 +80,7 @@ | ||
| 56 | </style> | 80 | </style> |
| 57 | 81 | ||
| 58 | <script> | 82 | <script> |
| 83 | + import { selectAirport } from '../../api/mt1201' | ||
| 59 | export default { | 84 | export default { |
| 60 | data() { | 85 | data() { |
| 61 | return { | 86 | return { |
| @@ -64,8 +89,10 @@ | @@ -64,8 +89,10 @@ | ||
| 64 | flightno: '', | 89 | flightno: '', |
| 65 | flightdate:'', | 90 | flightdate:'', |
| 66 | originstation:'', | 91 | originstation:'', |
| 67 | - destinationstation:'CGO' | 92 | + destinationstation:'' |
| 68 | }, | 93 | }, |
| 94 | + options: [], | ||
| 95 | + airportid:'', | ||
| 69 | /*表单验证方法*/ | 96 | /*表单验证方法*/ |
| 70 | rules: { | 97 | rules: { |
| 71 | flightno: [ | 98 | flightno: [ |
| @@ -87,6 +114,12 @@ | @@ -87,6 +114,12 @@ | ||
| 87 | }; | 114 | }; |
| 88 | }, | 115 | }, |
| 89 | methods:{ | 116 | methods:{ |
| 117 | + getFlightList:function() { | ||
| 118 | + let params={}; | ||
| 119 | + selectAirport(params).then(res=>{ | ||
| 120 | + this.options=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 | 156 |
| @@ -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,15 @@ | @@ -362,9 +361,15 @@ | ||
| 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 placeholder="请选择" style="display:inline"> |
| 365 | + <el-option | ||
| 366 | + v-for="item in customcodes" | ||
| 367 | + :key="item.customcode" | ||
| 368 | + :label="item.customcode" | ||
| 369 | + :value="item.customcode"> | ||
| 370 | + <span style="float: left">{{ item.customcode }}</span> | ||
| 371 | + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.customname }}</span> | ||
| 372 | + </el-option> | ||
| 368 | </el-select> | 373 | </el-select> |
| 369 | </el-form-item> | 374 | </el-form-item> |
| 370 | </el-col> | 375 | </el-col> |
| @@ -390,11 +395,23 @@ | @@ -390,11 +395,23 @@ | ||
| 390 | </el-form-item> | 395 | </el-form-item> |
| 391 | </el-col> | 396 | </el-col> |
| 392 | <el-col :span="6"> | 397 | <el-col :span="6"> |
| 393 | - <el-form-item label="国家代码" prop="awbinfo.shprcountyr"> | 398 | + <!--<el-form-item label="国家代码" prop="awbinfo.shprcountyr"> |
| 394 | <el-select v-model="ruleForm.awbinfo.shprcountyr" placeholder="" style="display:inline"> | 399 | <el-select v-model="ruleForm.awbinfo.shprcountyr" placeholder="" style="display:inline"> |
| 395 | <el-option v-for="item in shprcountyrs" :key="item" :label="item" | 400 | <el-option v-for="item in shprcountyrs" :key="item" :label="item" |
| 396 | :value="item"></el-option> | 401 | :value="item"></el-option> |
| 397 | </el-select> | 402 | </el-select> |
| 403 | + </el-form-item>--> | ||
| 404 | + <el-form-item label="国家代码" prop="awbinfo.shprcountyr"> | ||
| 405 | + <el-select v-model="ruleForm.awbinfo.shprcountyr" filterable placeholder="请选择"> | ||
| 406 | + <el-option | ||
| 407 | + v-for="item in shprcountyrs" | ||
| 408 | + :key="item.countryCode" | ||
| 409 | + :label="item.countryCode" | ||
| 410 | + :value="item.countryCode"> | ||
| 411 | + <span style="float: left">{{ item.countryNameCn }}</span> | ||
| 412 | + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.countryCode }}</span> | ||
| 413 | + </el-option> | ||
| 414 | + </el-select> | ||
| 398 | </el-form-item> | 415 | </el-form-item> |
| 399 | </el-col> | 416 | </el-col> |
| 400 | <el-col :span="6"> | 417 | <el-col :span="6"> |
| @@ -421,10 +438,17 @@ | @@ -421,10 +438,17 @@ | ||
| 421 | </el-form-item> | 438 | </el-form-item> |
| 422 | </el-col> | 439 | </el-col> |
| 423 | <el-col :span="6"> | 440 | <el-col :span="6"> |
| 441 | + | ||
| 424 | <el-form-item label="国家代码" prop="awbinfo.cnscountyr"> | 442 | <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> | 443 | + <el-select v-model="ruleForm.awbinfo.cnscountyr" filterable placeholder="请选择"> |
| 444 | + <el-option | ||
| 445 | + v-for="item in cnscountyrs" | ||
| 446 | + :key="item.countryCode" | ||
| 447 | + :label="item.countryCode" | ||
| 448 | + :value="item.countryCode"> | ||
| 449 | + <span style="float: left">{{ item.countryNameCn }}</span> | ||
| 450 | + <span style="float: right; color: #8492a6; font-size: 13px">{{ item.countryCode }}</span> | ||
| 451 | + </el-option> | ||
| 428 | </el-select> | 452 | </el-select> |
| 429 | </el-form-item> | 453 | </el-form-item> |
| 430 | </el-col> | 454 | </el-col> |
| @@ -522,13 +546,13 @@ | @@ -522,13 +546,13 @@ | ||
| 522 | </div> | 546 | </div> |
| 523 | </el-col> | 547 | </el-col> |
| 524 | <el-col :span="2.5" class="pub"> | 548 | <el-col :span="2.5" class="pub"> |
| 525 | - <div class="grid-content"><span>主单数:999</span></div> | 549 | + <div class="grid-content"><span>主单数:{{sumNmmsCount}}</span></div> |
| 526 | </el-col> | 550 | </el-col> |
| 527 | <el-col :span="3.5" class="pub"> | 551 | <el-col :span="3.5" class="pub"> |
| 528 | - <div class="grid-content"><span>舱单总件数:999999</span></div> | 552 | + <div class="grid-content"><span>舱单总件数:{{sumNmmsPrice}}</span></div> |
| 529 | </el-col> | 553 | </el-col> |
| 530 | <el-col :span="4" class="pub"> | 554 | <el-col :span="4" class="pub"> |
| 531 | - <div class="grid-content"><span>舱单总重量:999999</span></div> | 555 | + <div class="grid-content"><span>舱单总重量:{{sumNmmsWeight}}</span></div> |
| 532 | </el-col> | 556 | </el-col> |
| 533 | </el-row> | 557 | </el-row> |
| 534 | <!--对话提示框--> | 558 | <!--对话提示框--> |
| @@ -601,7 +625,7 @@ | @@ -601,7 +625,7 @@ | ||
| 601 | </style> | 625 | </style> |
| 602 | 626 | ||
| 603 | <script> | 627 | <script> |
| 604 | - import { getMt1201List,addMt1201,ediMt1201,getFenList } from '../../api/mt1201' | 628 | + import { getMt1201List,addMt1201,ediMt1201,getFenList,getCountryCode,selectCustomcode } from '../../api/mt1201' |
| 605 | export default { | 629 | export default { |
| 606 | data() { | 630 | data() { |
| 607 | /*初始数据*/ | 631 | /*初始数据*/ |
| @@ -712,23 +736,8 @@ | @@ -712,23 +736,8 @@ | ||
| 712 | value: '008', | 736 | value: '008', |
| 713 | label: '惰性物料' | 737 | label: '惰性物料' |
| 714 | }], | 738 | }], |
| 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 | - }], | 739 | + customcodes:[], |
| 740 | + customcode:'', | ||
| 732 | rules: { | 741 | rules: { |
| 733 | waybill: [{required: true, message: '请输入运单号', trigger: 'blur'}], | 742 | waybill: [{required: true, message: '请输入运单号', trigger: 'blur'}], |
| 734 | flightno: [{required: true, message: '航班号必须输入', trigger: 'blur'}], | 743 | flightno: [{required: true, message: '航班号必须输入', trigger: 'blur'}], |
| @@ -757,12 +766,16 @@ | @@ -757,12 +766,16 @@ | ||
| 757 | }, | 766 | }, |
| 758 | labelPosition: 'left', | 767 | labelPosition: 'left', |
| 759 | splitcodes: [{value:'T',label:'否'},{value:'P',label:'是'}], | 768 | splitcodes: [{value:'T',label:'否'},{value:'P',label:'是'}], |
| 760 | - shprcountyrs:['US','CN'], | ||
| 761 | - cnscountyrs:['US','CN'], | 769 | + shprcountyrs:[], |
| 770 | + cnscountyrs:[], | ||
| 771 | + countryCode:'', | ||
| 762 | msg:'', | 772 | msg:'', |
| 763 | code:'', | 773 | code:'', |
| 764 | centerDialogVisible:false, | 774 | centerDialogVisible:false, |
| 765 | - FenStatus:'' | 775 | + FenStatus:'', |
| 776 | + sumNmmsCount:0, | ||
| 777 | + sumNmmsPrice:0, | ||
| 778 | + sumNmmsWeight:0, | ||
| 766 | } | 779 | } |
| 767 | }, | 780 | }, |
| 768 | methods: { | 781 | methods: { |
| @@ -783,6 +796,8 @@ | @@ -783,6 +796,8 @@ | ||
| 783 | this.FenQuery.originstation=this.defaultQuery.originstation; | 796 | this.FenQuery.originstation=this.defaultQuery.originstation; |
| 784 | this.FenQuery.destinationstation=row.destinationstation; | 797 | this.FenQuery.destinationstation=row.destinationstation; |
| 785 | this.getFenList(this.FenQuery); | 798 | this.getFenList(this.FenQuery); |
| 799 | + this.getCountryCode(); | ||
| 800 | + this.selectCustomcode(); | ||
| 786 | }, | 801 | }, |
| 787 | /*编辑分单信息*/ | 802 | /*编辑分单信息*/ |
| 788 | handleFen(index,row){ | 803 | handleFen(index,row){ |
| @@ -817,8 +832,34 @@ | @@ -817,8 +832,34 @@ | ||
| 817 | getList(){ | 832 | getList(){ |
| 818 | getMt1201List(this.defaultQuery).then(res =>{ | 833 | getMt1201List(this.defaultQuery).then(res =>{ |
| 819 | //console.log(res); | 834 | //console.log(res); |
| 835 | + this.sumNmmsCount=0; | ||
| 836 | + this.sumNmmsPrice=0; | ||
| 837 | + this.sumNmmsWeight=0; | ||
| 820 | let response=res.data.data; | 838 | let response=res.data.data; |
| 821 | this.tableData=response; | 839 | this.tableData=response; |
| 840 | + response.forEach((item,i) => { | ||
| 841 | + if(item.awba!=null&&item.awbh==""); | ||
| 842 | + this.sumNmmsCount=Number(this.sumNmmsCount)+1; | ||
| 843 | + this.sumNmmsPrice=Number(this.sumNmmsPrice)+Number(item.piece); | ||
| 844 | + this.sumNmmsWeight=Number(this.sumNmmsWeight)+Number(item.weight); | ||
| 845 | + }) | ||
| 846 | + }); | ||
| 847 | + }, | ||
| 848 | + /*获取国家代码*/ | ||
| 849 | + getCountryCode(){ | ||
| 850 | + let params={}; | ||
| 851 | + getCountryCode(params).then(res =>{ | ||
| 852 | + //console.log(res); | ||
| 853 | + this.shprcountyrs=res.data.data; | ||
| 854 | + this.cnscountyrs=res.data.data; | ||
| 855 | + }); | ||
| 856 | + }, | ||
| 857 | + //获取关区代码 | ||
| 858 | + selectCustomcode(){ | ||
| 859 | + let params={}; | ||
| 860 | + selectCustomcode(params).then(res =>{ | ||
| 861 | + //console.log(res); | ||
| 862 | + this.customcodes=res.data.data; | ||
| 822 | }); | 863 | }); |
| 823 | }, | 864 | }, |
| 824 | //新增原始舱单按钮 | 865 | //新增原始舱单按钮 |
| @@ -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 | //新增理货按钮事件 |
-
请 注册 或 登录 后发表评论