朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 0c3860436fc1d116b5da5a050978e236c3a2acfc 1 个父辈 bdf0da3a

装载bug修复

内嵌 并排对比
正在显示 4 个修改的文件 包含 53 行增加 和 21 行删除
... ... @@ -99,3 +99,14 @@ export function validatorNum(value) {
const reg = /^(\d*)+(\.[0-9]{1,2})?$/
return reg.test(value)
}
/**
* 关区校验 4位数字
* @param value
* @returns {boolean}
*/
export function validatorCustomsNum(value) {
const reg = /^(\d{4})$/
return reg.test(value)
}
\ No newline at end of file
... ...
... ... @@ -31,13 +31,14 @@
:loading="listLoading"
v-model="flight.originstation"
allow-create
default-first-option
filterable
remote
placeholder="请选择起始站" clearable>
<el-option
v-for="item in airportCode"
:key="item.airportid"
:label="item.airportid"
:label="item.airportdescchn"
:value="item.airportid">
<span style="float: left">{{ item.airportdescchn }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportid }}</span>
... ... @@ -49,7 +50,9 @@
:remote-method="remoteMethodAirport"
:loading="listLoading"
v-model="flight.destinationstation"
@blur = "elblur"
allow-create
default-first-option
filterable
remote
placeholder="请选择目的站" clearable>
... ... @@ -217,6 +220,10 @@
this.airportCode = []
}
},
elblur: e => {
// this.destinationstation = "CGO"
console.log(e)
}
}
};
</script>
... ... @@ -229,7 +236,7 @@
margin: 0 auto;
height: 400px;
}
flight
p {
font-size: 25px;
font-weight: bold;
... ...
... ... @@ -49,7 +49,7 @@
<div class="grid-content content" style="margin-top: 6px">出港装载明细</div>
</el-col>
</el-row>
<el-table v-loading="listLoading" :data="loadingData"stripe style="font-size: 12px"
<el-table v-loading="listLoading" :data="loadingData" stripe style="font-size: 12px"
border @selection-change="handleSelectionChange">
<el-table-column type="selection" width="60"></el-table-column>
<el-table-column label="主单号" width="160" align="center">
... ... @@ -179,7 +179,7 @@
</el-form-item>
</el-col>
<el-col :span="7.5">
<el-form-item label="目的站" prop="originstation">
<el-form-item label="目的站" prop="destinationstation">
<el-select filterable clearable placeholder="请选择起始站" :remote-method="remoteMethodAirport"
allow-create v-model="destinationstation" remote :disabled="dialogStatus ==='update'">
<el-option v-for="item in airportCode"
... ... @@ -203,13 +203,13 @@
</div>
<el-row>
<el-col :span="7.5">
<el-form-item label="装载件数" prop="piece">
<el-form-item label="装载件数" prop="lodingpiece">
<el-input v-model.number="loadingModel.lodingpiece"></el-input>
</el-form-item>
</el-col>
<el-col :span="7.5">
<el-form-item label="装载重量" prop="weight">
<el-input v-model.number="loadingModel.lodingweight"></el-input>
<el-form-item label="装载重量" prop="lodingweight">
<el-input v-model="loadingModel.lodingweight"></el-input>
</el-form-item>
</el-col>
<el-col :span="7.5">
... ... @@ -222,12 +222,12 @@
</el-row>
<el-row>
<el-col :span="7.5">
<el-form-item label="运单件数" prop="price">
<el-input v-model="loadingModel.awbprice"></el-input>
<el-form-item label="运单件数" prop="awbprice">
<el-input v-model.number="loadingModel.awbprice"></el-input>
</el-form-item>
</el-col>
<el-col :span="7.5">
<el-form-item label="运单重量" prop="weight">
<el-form-item label="运单重量" prop="awbweight">
<el-input v-model="loadingModel.awbweight"></el-input>
</el-form-item>
</el-col>
... ... @@ -235,7 +235,9 @@
<el-form-item label="海关关区" prop="customcode">
<el-select v-model="loadingModel.customcode" placeholder="请选择关区代码"
filterable clearable remote :remote-method="remoteMethodCustomCode" :loading="customLoading"
:disabled="dialogStatus === 'addAwbh'">
allow-create
default-first-option
>
<el-option v-for="item in customCodeList" :key="item.customcode" :label="item.customcode"
:value="item.customcode">
<span style="float: left">{{ item.customcode }}</span>
... ... @@ -247,7 +249,7 @@
</el-row>
<el-row>
<el-col :span="7.5">
<el-form-item label="特货代码" prop="awbh">
<el-form-item label="特货代码" prop="specialgoods">
<el-input v-model="loadingModel.specialgoods"></el-input>
</el-form-item>
</el-col>
... ... @@ -339,7 +341,8 @@
validAlphabets,
validAlphabetsAndNum,
validAlphabetsAndSpanceKey,
validatorNum
validatorNum,
validatorCustomsNum
} from "@/utils/validate"
import {getResponseForParam} from '@/api/responseDetail'
export default {
... ... @@ -349,7 +352,7 @@
data() {
const validatorAwb = (rule, value, callback) => {
if (!validAwb(value)) {
callback("请正确书写主单号")
callback("请正确书写主单号格式为xxx-xxxxxxxx")
}
callback()
}
... ... @@ -377,6 +380,12 @@
}
callback()
}
const validatorCustomsNums = (rule, value, callback) => {
if (!validatorCustomsNum(value)) {
callback(new Error("只能输入4位数字"))
}
callback()
}
return {
total: 1,
isAdmin: false,
... ... @@ -410,11 +419,16 @@
goodsname: [{required: true, trigger: 'blur', validator: validAlphabetsSpanceKey}],
carrier: [{required: true, trigger: 'blur', validator: validatorAwbh}],
flightno: [{required: true, trigger: 'blur', validator: validatorAwbh}],
flightdate: [{required: true, trigger: 'blur'}],
loadingtime: [{required: true, trigger: 'blur'}],
originstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}],
destinationstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}],
piece: [{type: 'number', required: true, trigger: 'change', message: '只能输入数字'}],
weight: [{type: 'number', required: true, trigger: 'change', message: '只能输入数字'}],
customcode: [{required: true, trigger: 'change', message: '不能为空'}]
lodingpiece: [{type: 'number',required: true, trigger: 'change', message: '只能输入数字'}],
lodingweight: [{required: true, trigger: 'change', message: '只能输入数字，并且小数位最多两位',validator: validatorNums}],
customcode: [
{required: true, message: '关区号不能为空'},
{validator: validatorCustomsNums,trigger: 'change',message: '关区号为4位整数'}
]
},
loadingData: [],
detailData: [],
... ...
... ... @@ -435,7 +435,7 @@
filterable
allow-create
remote
placeholder="请选择" clearable>
placeholder="请选择" clearable>目的站
<el-option
v-for="item in countryOption"
:key="item.value"
... ... @@ -1050,10 +1050,10 @@
},
by1: {
get: function () {
return util.checkNull(this.preModel.awbinfo.by1)?'':this.preModel.awbinfo.by1
return util.checkNull(this.preModel.awbinfo.by1)?this.preModel.awbinfo.by1:''
},
set: function (val) {
this.preModel.awbinfo.by1 = util.checkNull(val)?'':val.toUpperCase().trim()
this.preModel.awbinfo.by1 = util.checkNull(val)?val.toUpperCase().trim():''
}
},
dest1: {
... ... @@ -1196,7 +1196,7 @@
this.preModel.flightno = this.preQuery.flightno
this.preModel.flightdate = this.preQuery.flightdate
this.preModel.originstation = this.preQuery.originstation
this.preModel.destinationstation = this.preQuery.carrier
this.preModel.destinationstation = this.preQuery.destinationstation
this.preModel.customcode = this.preQuery.customcode
this.dialogStatus = 'create'
this.dialogFormVisible = true
... ...