朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 649ce421d8ffc890df9ecc470d9e982f7cfebe0c 1 个父辈 4c491d53

完善页面展示问题 修改支付方式 字段名称 paymodel

内嵌 并排对比
正在显示 4 个修改的文件 包含 19 行增加 和 12 行删除
@@ -17,3 +17,6 @@ export const addMt4201 = params => { return http.post(`${baseUrl}/addMt4201`,par @@ -17,3 +17,6 @@ export const addMt4201 = params => { return http.post(`${baseUrl}/addMt4201`,par
17 export const sendCreateMt4201 = params => { return http.post(`${baseUrl}/sendCreateMt4201`,params)}; 17 export const sendCreateMt4201 = params => { return http.post(`${baseUrl}/sendCreateMt4201`,params)};
18 18
19 export const sendDeleteMt4201 = params => { return http.post(`${baseUrl}/sendDeleteMt4201`,params)}; 19 export const sendDeleteMt4201 = params => { return http.post(`${baseUrl}/sendDeleteMt4201`,params)};
  20 +
  21 +
  22 +
@@ -128,7 +128,7 @@ @@ -128,7 +128,7 @@
128 <el-button size="mini" @click="handleSendDesc(scope.row)">收发明细</el-button> 128 <el-button size="mini" @click="handleSendDesc(scope.row)">收发明细</el-button>
129 <el-button size="mini" type="success" @click="handleEdit(scope.row)">编辑</el-button> 129 <el-button size="mini" type="success" @click="handleEdit(scope.row)">编辑</el-button>
130 <el-button size="mini" type="primary" @click="handleSendAwb(scope.row)" 130 <el-button size="mini" type="primary" @click="handleSendAwb(scope.row)"
131 - :disabled="scope.row.status ==='23'">发送舱单报 131 + :disabled="scope.row.status ==='23'">发送出港运抵报
132 </el-button> 132 </el-button>
133 <p></p> 133 <p></p>
134 <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单 134 <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单
@@ -409,7 +409,7 @@ @@ -409,7 +409,7 @@
409 isAdmin: false, 409 isAdmin: false,
410 arriveQuery: { 410 arriveQuery: {
411 pageSize: 1, 411 pageSize: 1,
412 - limitSize: 100, 412 + limitSize: 30,
413 awba: undefined, 413 awba: undefined,
414 carrier: undefined, 414 carrier: undefined,
415 flightno: undefined, 415 flightno: undefined,
@@ -106,7 +106,7 @@ @@ -106,7 +106,7 @@
106 <span>{{scope.row.ext5}}</span> 106 <span>{{scope.row.ext5}}</span>
107 </template> 107 </template>
108 </el-table-column> 108 </el-table-column>
109 - <el-table-column label="操作" align="center" fixed="right" width="245"> 109 + <el-table-column label="操作" align="center" fixed="right">
110 <template slot-scope="scope"> 110 <template slot-scope="scope">
111 <el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button> 111 <el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button>
112 112
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 </el-button> 114 </el-button>
115 115
116 <el-button size="mini" type="primary" @click="handleSendAwb(scope.row)" 116 <el-button size="mini" type="primary" @click="handleSendAwb(scope.row)"
117 - :disabled="scope.row.status ==='23'">发送舱单报 117 + :disabled="scope.row.status ==='23'">发送出港装载报
118 </el-button> 118 </el-button>
119 119
120 <br><br> 120 <br><br>
@@ -346,9 +346,9 @@ @@ -346,9 +346,9 @@
346 import {getCustomCode,getAirportCode} from "@/api/country"; 346 import {getCustomCode,getAirportCode} from "@/api/country";
347 import { 347 import {
348 getMt4201ListForParam, deleteByIsDelete, updateStatus, 348 getMt4201ListForParam, deleteByIsDelete, updateStatus,
349 - updateMT4201, addMt4201, sendCreateMt4201, sendDeleteMt4201 349 + updateMT4201, addMt4201, sendCreateMt4201, sendDeleteMt4201, test
350 } from '@/api/exitLoading' 350 } from '@/api/exitLoading'
351 - import {Message} from "element-ui"; 351 + import {Message} from "element-ui"
352 import { 352 import {
353 validAwb, 353 validAwb,
354 validAlphabets, 354 validAlphabets,
@@ -363,8 +363,8 @@ @@ -363,8 +363,8 @@
363 </el-form-item> 363 </el-form-item>
364 </el-col> 364 </el-col>
365 <el-col :span="7.5"> 365 <el-col :span="7.5">
366 - <el-form-item label="付费方式" prop="awbinfo.collected">  
367 - <el-select v-model="preModel.awbinfo.collected" class="filter-item" placeholder="付费方式"> 366 + <el-form-item label="付费方式" prop="awbinfo.paymodel">
  367 + <el-select v-model="preModel.awbinfo.paymodel" class="filter-item" placeholder="付费方式">
368 <el-option 368 <el-option
369 v-for="item in payTypes" 369 v-for="item in payTypes"
370 :key="item.value" 370 :key="item.value"
@@ -778,7 +778,7 @@ @@ -778,7 +778,7 @@
778 customcode: [{required: true, message: '关区代码必须选择', trigger: 'change'}], 778 customcode: [{required: true, message: '关区代码必须选择', trigger: 'change'}],
779 awba: [{required: true, trigger: 'blur', validator: validatorAwb}], 779 awba: [{required: true, trigger: 'blur', validator: validatorAwb}],
780 awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}], 780 awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}],
781 - 'awbinfo.collected': [{required: true, message: '付款方式必选', trigger: 'change'}], 781 + 'awbinfo.paymodel': [{required: true, message: '付款方式必选', trigger: 'change'}],
782 goodsname: [{required: true, trigger: 'change', validator: validAlphabetsSpanceKey}], 782 goodsname: [{required: true, trigger: 'change', validator: validAlphabetsSpanceKey}],
783 ex5: [{required: true, message: '货物描述不能为空', trigger: 'blur'}], 783 ex5: [{required: true, message: '货物描述不能为空', trigger: 'blur'}],
784 reason:[{required: true, message: '修改原因不能为空', trigger: 'blur'}], 784 reason:[{required: true, message: '修改原因不能为空', trigger: 'blur'}],
@@ -854,7 +854,7 @@ @@ -854,7 +854,7 @@
854 dest3: undefined, 854 dest3: undefined,
855 eairportid: undefined, 855 eairportid: undefined,
856 csgcustomerid: undefined, 856 csgcustomerid: undefined,
857 - collected: '0', 857 + paymodel: '0',
858 awbtype: undefined 858 awbtype: undefined
859 } 859 }
860 }, 860 },
@@ -1203,7 +1203,7 @@ @@ -1203,7 +1203,7 @@
1203 dest3: undefined, 1203 dest3: undefined,
1204 eairportid: undefined, 1204 eairportid: undefined,
1205 csgcustomerid: undefined, 1205 csgcustomerid: undefined,
1206 - collected: '0', 1206 + paymodel: '0',
1207 } 1207 }
1208 } 1208 }
1209 }, 1209 },
@@ -1300,9 +1300,13 @@ @@ -1300,9 +1300,13 @@
1300 }, 1300 },
1301 // >>>>>>>>>>>>>>>>更新运单数据<<<<<<<<<<<<<<<<<< 1301 // >>>>>>>>>>>>>>>>更新运单数据<<<<<<<<<<<<<<<<<<
1302 handleEdit(row) { 1302 handleEdit(row) {
  1303 + console.log(row)
1303 this.preModel = Object.assign({}, row) 1304 this.preModel = Object.assign({}, row)
1304 this.dialogStatus = 'update' 1305 this.dialogStatus = 'update'
  1306 + if (row.awbh !== undefined && row.awbh !== ""){
1305 this.fenStatus = 'addAwbh' 1307 this.fenStatus = 'addAwbh'
  1308 + }
  1309 +
1306 this.dialogFormVisible = true 1310 this.dialogFormVisible = true
1307 this.$nextTick(() => { 1311 this.$nextTick(() => {
1308 this.$refs.preFormData.clearValidate() 1312 this.$refs.preFormData.clearValidate()
@@ -1514,7 +1518,7 @@ @@ -1514,7 +1518,7 @@
1514 this.preModel.carrier = template.carrier 1518 this.preModel.carrier = template.carrier
1515 this.preModel.awbinfo.shprcountyr = template.awbinfo.shprcountyr 1519 this.preModel.awbinfo.shprcountyr = template.awbinfo.shprcountyr
1516 this.preModel.originstation = template.originstation 1520 this.preModel.originstation = template.originstation
1517 - this.preModel.awbinfo.collected = template.awbinfo.collected 1521 + this.preModel.awbinfo.paymodel = template.awbinfo.paymodel
1518 this.preModel.awbinfo.sairportid = template.awbinfo.sairportid 1522 this.preModel.awbinfo.sairportid = template.awbinfo.sairportid
1519 this.preModel.awbinfo.eairportid = template.awbinfo.eairportid 1523 this.preModel.awbinfo.eairportid = template.awbinfo.eairportid
1520 this.preModel.awbinfo.ex5 = template.awbinfo.ex5 1524 this.preModel.awbinfo.ex5 = template.awbinfo.ex5