Commit b11d3795 authored by wh's avatar wh

Merge remote-tracking branch 'origin/dev' into dev

parents 9089ee5f 8268a227
......@@ -64,14 +64,15 @@
</el-input>
</el-form-item>
<el-form-item label="新运费" required>
<el-input v-model.number="form.seaFreight">
<el-input v-model.number="form.seaFreight" :readonly="readonly">
<dict-selector
slot="prepend"
v-model="form.seaFreightCurrency"
:type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"
style="width: 100px"
:disabled="readonly"
></dict-selector>
<el-select v-model="form.seaFreightVolume" placeholder="请选择" slot="append" style="width: 100px">
<el-select v-model="form.seaFreightVolume" placeholder="请选择" slot="append" style="width: 100px" :disabled="readonly">
<el-option
v-for="item in unitList"
:key="item.id"
......@@ -82,14 +83,15 @@
</el-input>
</el-form-item>
<el-form-item label="新清关费" required>
<el-input v-model.number="form.clearanceFreight">
<el-input v-model.number="form.clearanceFreight" :readonly="readonly">
<dict-selector
slot="prepend"
v-model="form.clearanceFreightCurrency"
:type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"
style="width: 100px"
:disabled="readonly"
></dict-selector>
<el-select v-model="form.clearanceFreightVolume" placeholder="请选择" slot="append" style="width: 100px">
<el-select v-model="form.clearanceFreightVolume" placeholder="请选择" slot="append" style="width: 100px" :disabled="readonly">
<el-option
v-for="item in unitList"
:key="item.id"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment