Commit 2bf4ba5d authored by zhengyi's avatar zhengyi

出货阶段订单编辑逻辑bug修复

parent 8495b147
...@@ -119,12 +119,12 @@ ...@@ -119,12 +119,12 @@
<div class="form-section"> <div class="form-section">
<el-form-item :label="$t('运输方式')" prop="transportId"> <el-form-item :label="$t('运输方式')" prop="transportId">
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="form.transportId" formatter="number" <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="form.transportId" formatter="number"
clearable @input="updateRoutes('transportId')" :disabled="form.shipmentState"/> clearable @input="updateRoutes('transportId')" :disabled="form.shipmentState > 0"/>
</el-form-item> </el-form-item>
</div> </div>
<div class="form-section"> <div class="form-section">
<el-form-item :label="$t('始发城市')" prop="departureId" :disabled="false"> <el-form-item :label="$t('始发城市')" prop="departureId" :disabled="false">
<el-select v-model="form.departureId" :placeholder="$t('请选择始发地')" :disabled="form.shipmentState" <el-select v-model="form.departureId" :placeholder="$t('请选择始发地')" :disabled="form.shipmentState > 0"
clearable @input="updateRoutes('departureId')"> clearable @input="updateRoutes('departureId')">
<el-option v-for="item in exportCityList" :label="$l(item, 'title')" :value="item.id" <el-option v-for="item in exportCityList" :label="$l(item, 'title')" :value="item.id"
:key="item.id"></el-option> :key="item.id"></el-option>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的国家')" prop="destCountryId"> <el-form-item :label="$t('目的国家')" prop="destCountryId">
<el-select v-model="form.destCountryId" :placeholder="$t('请选择目的国家')" <el-select v-model="form.destCountryId" :placeholder="$t('请选择目的国家')"
@change="handleChangeDestCountry" clearable :disabled="form.shipmentState"> @change="handleChangeDestCountry" clearable :disabled="form.shipmentState > 0">
<el-option v-for="item in showDestCountryList" :label="$l(item, 'guojiaName')" :value="item.guojia" <el-option v-for="item in showDestCountryList" :label="$l(item, 'guojiaName')" :value="item.guojia"
:key="item.guojia"></el-option> :key="item.guojia"></el-option>
</el-select> </el-select>
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
v-if="routeOtherServices.indexOf('1') > -1 || routeOtherServices.indexOf('4') > -1"> v-if="routeOtherServices.indexOf('1') > -1 || routeOtherServices.indexOf('4') > -1">
<el-checkbox-group v-model="form.type"> <el-checkbox-group v-model="form.type">
<el-checkbox label="1" v-if="routeOtherServices.indexOf('1') > -1">{{ $t('集运') }}</el-checkbox> <el-checkbox label="1" v-if="routeOtherServices.indexOf('1') > -1">{{ $t('集运') }}</el-checkbox>
<el-checkbox label="2" v-if="routeOtherServices.indexOf('4') > -1" :disabled="form.shipmentState"> <el-checkbox label="2" v-if="routeOtherServices.indexOf('4') > -1" :disabled="form.shipmentState > 0">
{{ $t('海外仓') }} {{ $t('海外仓') }}
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
...@@ -1237,6 +1237,7 @@ export default { ...@@ -1237,6 +1237,7 @@ export default {
} }
['1', '4'].forEach(service => { ['1', '4'].forEach(service => {
if (this.routeOtherServices.indexOf(service) < 0 && this.form.type.indexOf(service == 4 ? 2 : service) > -1) { if (this.routeOtherServices.indexOf(service) < 0 && this.form.type.indexOf(service == 4 ? 2 : service) > -1) {
console.log("当前集运服务选择", this.form.type)
this.form.type.splice(this.form.type.findIndex(item => item == (service == 4 ? 2 : service)), 1) this.form.type.splice(this.form.type.findIndex(item => item == (service == 4 ? 2 : service)), 1)
} }
}) })
...@@ -1380,7 +1381,7 @@ export default { ...@@ -1380,7 +1381,7 @@ export default {
isUnpack: this.form.isUnpack, isUnpack: this.form.isUnpack,
isSingleTicketTransport: this.form.isSingleTicketTransport, isSingleTicketTransport: this.form.isSingleTicketTransport,
}) */ }) */
console.log("集运服务类型", this.form.type)
this.form.type = this.form.type ? this.form.type.split(',').filter(item => item != '') : [] this.form.type = this.form.type ? this.form.type.split(',').filter(item => item != '') : []
this.form.packageTypeArr = this.form.packageType ? this.form.packageType.split(',').filter(item => item != '') : [] this.form.packageTypeArr = this.form.packageType ? this.form.packageType.split(',').filter(item => item != '') : []
// 每次编辑订单详情需要实时获取发货人当前信息 // 每次编辑订单详情需要实时获取发货人当前信息
......
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