Commit 3c81b0f3 authored by zhengyi's avatar zhengyi

无论是新增还是编辑,订单始终默认回显有收货人,需要填写收货人

parent 29ddc9f1
...@@ -754,7 +754,7 @@ import Selector from '@/components/Selector' ...@@ -754,7 +754,7 @@ import Selector from '@/components/Selector'
import CustomerContactSelector from '@/components/CustomerContactSelector' import CustomerContactSelector from '@/components/CustomerContactSelector'
import {getGuojiaAndShiAndWarehouseList, openedRouterList as getOpenedRouterList} from '@/api/ecw/warehouse' import {getGuojiaAndShiAndWarehouseList, openedRouterList as getOpenedRouterList} from '@/api/ecw/warehouse'
import {checkCountryCode, getTradeCityList} from '@/api/ecw/region' import {checkCountryCode, getTradeCityList} from '@/api/ecw/region'
import {getDictData, getDictDatas} from '@/utils/dict' import {DICT_TYPE, getDictData, getDictDatas} from '@/utils/dict'
import {getCurrencyList} from '@/api/ecw/currency' import {getCurrencyList} from '@/api/ecw/currency'
import {getUnitList} from '@/api/ecw/unit' import {getUnitList} from '@/api/ecw/unit'
import AreaSelector from '@/components/AreaSelector' import AreaSelector from '@/components/AreaSelector'
...@@ -819,6 +819,7 @@ export default { ...@@ -819,6 +819,7 @@ export default {
callback(); callback();
} }
return { return {
DICT_TYPE,
validatorPositiveNumber, validatorPositiveNumber,
customDraweeList: [], customDraweeList: [],
// draweeList: [], // draweeList: [],
...@@ -1348,11 +1349,11 @@ export default { ...@@ -1348,11 +1349,11 @@ export default {
// 默认不允许控货无收货人 // 默认不允许控货无收货人
this.noConsignee = false this.noConsignee = false
} }
// 如果订单无收货人,但是最新的发货人允许无收货人则重置状态 // // 如果订单无收货人,但是最新的发货人允许无收货人则重置状态
if (this.noConsignee && !this.hasConsignee) { // if (this.noConsignee && !this.hasConsignee) {
// 最新的发货人允许无收货人,则重置为有收货人 // // 最新的发货人允许无收货人,则重置为有收货人
this.hasConsignee = true // this.hasConsignee = true
} // }
}) })
}, },
async getOrder() { async getOrder() {
...@@ -1415,7 +1416,7 @@ export default { ...@@ -1415,7 +1416,7 @@ export default {
// 是否有收货人 // 是否有收货人
this.hasConsignee = !!res.data.consigneeVO // this.hasConsignee = !!res.data.consigneeVO
if (this.form.channelId == 0) { if (this.form.channelId == 0) {
delete this.form.channelId delete this.form.channelId
...@@ -1516,9 +1517,9 @@ export default { ...@@ -1516,9 +1517,9 @@ export default {
this.hasConsignee = false this.hasConsignee = false
}*/ }*/
// 如果发货人不允许无收货人,则重置为有收货人 // 如果发货人不允许无收货人,则重置为有收货人
if (!this.noConsignee && !this.hasConsignee) { // if (!this.noConsignee && !this.hasConsignee) {
this.$set(this, 'hasConsignee', true) // this.$set(this, 'hasConsignee', true)
} // }
// 如果默认付款则设置为发货人付款 // 如果默认付款则设置为发货人付款
if (contact.defaultPay) { if (contact.defaultPay) {
this.$set(this.form, 'drawee', 1) this.$set(this.form, 'drawee', 1)
......
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