Commit c39a4db4 authored by dragondean@qq.com's avatar dragondean@qq.com

解决冲突

parents 418ee805 b7c4bdde
<template> <template>
<div> <div>
<el-select v-model="formData.country" :disabled="readonly"> <el-select v-model="formData.country" :disabled="readonly" :style="{width: inputWidth}">
<el-option v-for="(item) in treeList" :key="item.id" :value="item.id" :label="$l(item, 'title')" /> <el-option v-for="(item) in treeList" :key="item.id" :value="item.id" :label="$l(item, 'title')" />
</el-select> </el-select>
<el-select v-model="formData.province" class="ml-10" :disabled="readonly"> <el-select v-model="formData.province" class="ml-10" :disabled="readonly" :style="{width: inputWidth}">
<el-option v-for="(item) in provinceList" :key="item.id" :value="item.id" :label="$l(item, 'title')" /> <el-option v-for="(item) in provinceList" :key="item.id" :value="item.id" :label="$l(item, 'title')" />
</el-select> </el-select>
<el-select v-model="formData.city" class="ml-10" :disabled="readonly"> <el-select v-model="formData.city" class="ml-10" :disabled="readonly" :style="{width: inputWidth}">
<el-option v-for="(item) in cityList" :key="item.id" :value="item.id" :label="$l(item, 'title')" /> <el-option v-for="(item) in cityList" :key="item.id" :value="item.id" :label="$l(item, 'title')" />
</el-select> </el-select>
</div> </div>
...@@ -19,7 +19,8 @@ export default { ...@@ -19,7 +19,8 @@ export default {
country: Number, country: Number,
city: Number, city: Number,
province: Number, province: Number,
readonly: Boolean readonly: Boolean,
inputWidth: String
}, },
data() { data() {
return { return {
...@@ -60,9 +61,12 @@ export default { ...@@ -60,9 +61,12 @@ export default {
}, },
'formData.country'(country) { 'formData.country'(country) {
this.$emit('countryChange', country) this.$emit('countryChange', country)
this.formData.province = null
this.formData.city = null
}, },
'formData.province'(province) { 'formData.province'(province) {
this.$emit('provinceChange', province) this.$emit('provinceChange', province)
this.formData.city = null
} }
}, },
created() { created() {
......
...@@ -1058,113 +1058,110 @@ export default { ...@@ -1058,113 +1058,110 @@ export default {
info: "info~", info: "info~",
}, },
delivery: { delivery: {
header: "delivery", header: 'delivery',
orderType: "orderType", orderType: 'orderType',
orderType1: "Cargo service", orderType1: 'Cargo service',
orderType2: "Overseas warehouse", orderType2: 'Overseas warehouse',
consigneeName: "consigneeName", consigneeName: 'consigneeName',
consigneeNameNotice: "Please enter the name of the consignee", consigneeNameNotice: 'Please enter the name of the consignee',
consigneeNameNoticeEn: "Please enter the name of the consignee in English", consigneeNameNoticeEn: 'Please enter the name of the consignee in English',
openConsignee: "Select the consignee", openConsignee: 'Select the consignee',
consigneePhone: "consigneePhone", consigneePhone: 'consigneePhone',
consigneePhoneNotice: "Please enter the telephone number", consigneePhoneNotice: 'Please enter the telephone number',
consigneeCompany: "Name of consignee company", consigneeCompany: 'Name of consignee company',
consigneeCompanyNotice: "Please enter the company name", consigneeCompanyNotice: 'Please enter the company name',
consigneeCompanyNoticeEn: "Please enter the company name in English", consigneeCompanyNoticeEn: 'Please enter the company name in English',
consignorConfirm: "Please confirm the freight be paid by sender?", consignorConfirm: 'Please confirm the freight be paid by sender?',
emailNotice: "Please enter email address", emailNotice: 'Please enter email address',
transport: "*transport", transport: '*transport',
transportNotice: "Please select the mode of transportation", transportNotice: 'Please select the mode of transportation',
channel: "channel", channel: 'channel',
channelNotice: "Please select the shipping channel", channelNotice: 'Please select the shipping channel',
departure: "*departure", departure: '*departure',
departureRules: "The place of origin is mandatory", destCountryRules: 'destination country must be chosen',
departureNotice: "Please select the place of departure", departureRules: 'The place of origin is mandatory',
objective: "*objective", departureNotice: 'Please select the place of departure',
objectiveRules: "Destination City This parameter is mandatory", objective: '*objective',
objectiveNotice: "Please select a destination", objectiveRules: 'Destination City This parameter is mandatory',
router: "*Please select a line", objectiveNotice: 'Please select a destination',
routerNotice: "Select a line on the right", router: '*Please select a line',
goods: "goods info", routerNotice: 'Select a line on the right',
addPro: "addPro", goods: 'goods info',
addPros: "addPros", addPro: 'addPro',
index: "index", addPros: 'addPros',
proZh: "proZh", index: 'index',
proEn: "proEn", proZh: 'proZh',
proRules: "Please select product", proEn: 'proEn',
brand: "brand", proRules: 'Please select product',
num: "num", brand: 'brand',
unit: "unit", num: 'num',
quantity: "quantity", unit: 'unit',
volume: "volume", quantity: 'quantity',
weight: "weight", volume: 'volume',
worth: "worth", weight: 'weight',
worthRules: "The worth cannot be empty", worth: 'worth',
prodAttrArr: "prodAttrArr", worthRules: 'The worth cannot be empty',
isPayAdvance: "isPayAdvance", prodAttrArr: 'prodAttrArr',
link: "link", isPayAdvance: 'isPayAdvance',
linkedit: "edit link", link: 'link',
linkadd: "add link", linkedit: 'edit link',
sum: "sum", linkadd: 'add link',
totalNum: "total Num", sum: 'sum',
totalWorth: "total Worth", totalNum: 'total Num',
insuranceFee: "insuranceFee", totalWorth: 'total Worth',
rmb: "rmb", insuranceFee: 'insuranceFee',
dollar: "dollar", rmb: 'rmb',
common: "common", dollar: 'dollar',
marks: "*marks", common: 'common',
marksRules: "Please enter the shipping mark", marks: '*marks',
marksRules1: "The shipping mark must start with a letter", marksRules: 'Please enter the shipping mark',
isCargoControl: "*isCargoControl", marksRules1: 'The shipping mark must start with a letter',
isCollection: "*isCollection", isCargoControl: '*isCargoControl',
collectionProxy: "collectionProxy", isCollection: '*isCollection',
customsType: "*customsType", collectionProxy: 'collectionProxy',
issuingMethod: "*issuingMethod", customsType: '*customsType',
deliveryDate: "*deliveryDate", issuingMethod: '*issuingMethod',
deliveryDateRules: "The delivery date cannot be empty", deliveryDate: '*deliveryDate',
warehouseType: "*warehouseType", deliveryDateRules: 'The delivery date cannot be empty',
harvestMethod: "*harvestMethod", warehouseType: '*warehouseType',
deliveryaddress: "deliveryaddress", harvestMethod: '*harvestMethod',
deliveryaddressRules: "The receiving area cannot be empty", deliveryaddress: 'deliveryaddress',
addressdetail: "addressdetail", deliveryaddressRules: 'The receiving area cannot be empty',
addressdetailRules: "The shipping address cannot be blank", addressdetail: 'addressdetail',
drawee: "*drawee", addressdetailRules: 'The shipping address cannot be blank',
customDraweeList: "customDraweeList", drawee: '*drawee',
number: "number", customDraweeList: 'customDraweeList',
numberNotice: "Please enter the tracking number of your purchase", number: 'number',
getNumber: "getNumber", numberNotice: 'Please enter the tracking number of your purchase',
doubleClear: "doubleClear", getNumber: 'getNumber',
airlineCompany: "airlineCompany", doubleClear: 'doubleClear',
shippingCompany: "shippingCompany", airlineCompany: 'airlineCompany',
customsClearCert: "customsClearCert", shippingCompany: 'shippingCompany',
clearCertRemark: "clearCertRemark", customsClearCert: 'customsClearCert',
isUnpack: "isUnpack", clearCertRemark: 'clearCertRemark',
isSingleTicketTransport: "isSingleTicketTransport", isUnpack: 'isUnpack',
notice: isSingleTicketTransport: 'isSingleTicketTransport',
'Note: If there is only one piece, the goods will be sent to the warehouse immediately, select "Yes"; If there are more pieces to be collected and shipped in the warehouse, select "No".', notice: 'Note: If there is only one piece, the goods will be sent to the warehouse immediately, select "Yes"; If there are more pieces to be collected and shipped in the warehouse, select "No".',
packageType: "packageType", packageType: 'packageType',
packageRemarks: "packageRemarks", packageRemarks: 'packageRemarks',
select: "select", select: 'select',
addCustomer: "add Customer", addCustomer: 'add Customer',
batchImport: "batch Import", batchImport: 'batch Import',
uoloadBox: "uoload Box", uoloadBox: 'uoload Box',
startImport: "start Import", startImport: 'start Import',
complete: "complete", complete: 'complete',
upload: "upload", upload: 'upload',
boxTpl: "box Tpl", boxTpl: 'box Tpl',
material: "material", material: 'material',
next: "next", next: 'next',
none: "none", none: 'none',
realName: "Please complete the real-name authentication first", realName: 'Please complete the real-name authentication first',
linkRules: "Please enter the product link", linkRules: 'Please enter the product link',
delPro: "Are you sure to delete this content?", delPro: 'Are you sure to delete this content?',
isContainNotice: "The order contains non-acceptable goods, please check", isContainNotice: 'The order contains non-acceptable goods, please check',
isCargoControlNotice: isCargoControlNotice: 'This refers to a transaction where the shipper and consignee agree that our company acts as a third party to control the ownership of the goods during international transportation. The consignee can only collect the goods if authorized by the shipper to release them.',
"This refers to a transaction where the shipper and consignee agree that our company acts as a third party to control the ownership of the goods during international transportation. The consignee can only collect the goods if authorized by the shipper to release them.", customsTypeNotice: 'Full agency: Our company handles the export procedures of the goods on behalf of the shipper. Self-declaration: The shipper provides the relevant export documents and entrusts our company to handle them. Mixed declaration: This situation may involve the above two cases.',
customsTypeNotice: packageTypeNotice: 'If you require packaging by our company, please select the appropriate option. Payment details and packaging requirements can be noted in the remarks section.'
"Full agency: Our company handles the export procedures of the goods on behalf of the shipper. Self-declaration: The shipper provides the relevant export documents and entrusts our company to handle them. Mixed declaration: This situation may involve the above two cases.",
packageTypeNotice:
"If you require packaging by our company, please select the appropriate option. Payment details and packaging requirements can be noted in the remarks section.",
}, },
deliverysuccess: { deliverysuccess: {
success: "Order has been generated", success: "Order has been generated",
...@@ -1182,54 +1179,53 @@ export default { ...@@ -1182,54 +1179,53 @@ export default {
productCount: "Product Count", productCount: "Product Count",
copy: "Copy Order Info", copy: "Copy Order Info",
}, },
请输入商品关键词: "Please enter the product keyword", '请输入商品关键词': 'Please enter the product keyword',
运费: "estSeaFreight", '运费': 'estSeaFreight',
清关费: "estClearanceFreight", '清关费': 'estClearanceFreight',
请输入数字: "Please enter the number", '请输入数字': 'Please enter the number',
请输入有效数字: "Please enter a significant number", '请输入有效数字': 'Please enter a significant number',
货值错误: "Error of value", '货值错误': 'Error of value',
重量错误: "Weight error", '重量错误': 'Weight error',
体积错误: "Volume error", '体积错误': 'Volume error',
请选择运输方式: "Please select a mode of transportation", '请选择运输方式': 'Please select a mode of transportation',
请输入件数: "Please enter the number of pieces", '请输入件数': 'Please enter the number of pieces',
提示: "Notice", '提示': 'Notice',
"您的密码过于简单,请前往修改密码": '您的密码过于简单,请前往修改密码': 'Your password is too simple, please go to change the password',
"Your password is too simple, please go to change the password", '修改密码': 'Change password',
修改密码: "Change password", '知道了': 'know',
知道了: "know", '旧订单': 'old order',
旧订单: "old order", '周一到周六': 'Monday to Saturday',
周一到周六: "Monday to Saturday", '保存草稿成功': 'Save draft successfully',
保存草稿成功: "Save draft successfully", '提交': 'submit',
提交: "submit", '存草稿': 'Save draft',
存草稿: "Save draft", '加载中': 'Loading',
加载中: "Loading", '起始标签': 'Start label',
起始标签: "Start label", '结束标签': 'End tag',
结束标签: "End tag", '去打印': 'Go to print',
去打印: "Go to print", '确定打印': 'OK to print',
确定打印: "OK to print", '打印标签': 'Print label',
打印标签: "Print label", '结束标签不对': 'Wrong end tag',
结束标签不对: "Wrong end tag", '没有可打印的内容': 'Nothing to print',
没有可打印的内容: "Nothing to print", '是否确认删除订单': 'Confirm whether to delete the order',
是否确认删除订单: "Confirm whether to delete the order", '报关退税,请备齐材料': 'Customs declaration and tax refund, please prepare all necessary materials',
"报关退税,请备齐材料": '控货日志': 'Cargo control log',
"Customs declaration and tax refund, please prepare all necessary materials", '操作时间': 'Operating time',
控货日志: "Cargo control log", '操作人': 'Operator',
操作时间: "Operating time", '操作人类型': 'Operator type',
操作人: "Operator", '操作类型': 'Type of operation',
操作人类型: "Operator type", '备注': 'remarks',
操作类型: "Type of operation", '请输入6-32位数字与字母组合的密码': 'Please enter a password of 6-32 digits and letters',
备注: "remarks", '关联报价单': 'Related quotation',
"请输入6-32位数字与字母组合的密码": '请选择': 'Please select',
"Please enter a password of 6-32 digits and letters", '复制成功': 'Copy successfully',
关联报价单: "Related quotation", '复制失败': 'Copy failed',
请选择: "Please select", '特殊要求': 'special requirements',
复制成功: "Copy successfully", '特殊要求备注': 'Special Requirements Remarks',
复制失败: "Copy failed", '提单号': 'B/L NO',
特殊要求: "special requirements", '入仓箱数': 'Number of inbound boxes',
特殊要求备注: "Special Requirements Remarks", '已放箱数': 'Number of boxes placed',
提单号: "B/L NO", '收货人': 'Consignee',
入仓箱数: "Number of inbound boxes", '收货人电话': 'Consignee telephone number',
已放箱数: "Number of boxes placed", '如需海外仓服务,请联系客服,服务热线:{tel}': '如需海外仓服务,请联系客服,服务热线:{tel}',
收货人: "Consignee", '搜索': 'Search'
收货人电话: "Consignee telephone number", }
};
...@@ -987,129 +987,125 @@ export default { ...@@ -987,129 +987,125 @@ export default {
info: "暂无数据~", info: "暂无数据~",
}, },
delivery: { delivery: {
header: "我要发货", header: '我要发货',
orderType: "订单类型", orderType: '订单类型',
orderType1: "集运服务", orderType1: '集运服务',
orderType2: "海外仓", orderType2: '海外仓',
consigneeName: "收货人", consigneeName: '收货人',
consigneeNameNotice: "请输入收货人姓名", consigneeNameNotice: '请输入收货人姓名',
consigneeNameNoticeEn: "请输入收货人英文名称", consigneeNameNoticeEn: '请输入收货人英文名称',
openConsignee: "选择收货人", openConsignee: '选择收货人',
consigneePhone: "电话", consigneePhone: '电话',
consigneePhoneNotice: "请输入电话", consigneePhoneNotice: '请输入电话',
consigneeCompany: "收货人公司名称", consigneeCompany: '公司名称',
consigneeCompanyNotice: "请输入公司名称", consigneeCompanyNotice: '请输入公司名称',
consigneeCompanyNoticeEn: "请输入公司英文名称", consigneeCompanyNoticeEn: '请输入公司英文名称',
emailNotice: "请输入邮箱", emailNotice: '请输入邮箱',
transport: "运输方式", transport: '运输方式',
transportNotice: "请选择运输方式", transportNotice: '请选择运输方式',
channel: "出货渠道", channel: '出货渠道',
channelNotice: "请选择出货渠道", channelNotice: '请选择出货渠道',
departure: "始发城市", departure: '始发城市',
departureRules: "始发城市必选", destCountryRules: '目的国必选',
departureNotice: "请选择始发地", departureRules: '始发城市必选',
objective: "目的城市", departureNotice: '请选择始发地',
objectiveRules: "目的城市必选", objective: '目的城市',
objectiveNotice: "请选择目的地", objectiveRules: '目的城市必选',
router: "请选择线路", objectiveNotice: '请选择目的地',
routerNotice: "请在右侧选择线路", router: '请选择线路',
goods: "商品信息", routerNotice: '请在右侧选择线路',
addPro: "添加货物", goods: '商品',
addPros: "批量添加货物", addPro: '添加货物',
index: "序号", addPros: '批量添加货物',
proZh: "中文品名", index: '序号',
proEn: "英文品名", proZh: '中文品名',
proRules: "请选择产品", proEn: '英文品名',
brand: "品牌", proRules: '请选择产品',
num: "件数", brand: '品牌',
unit: "包装单位", num: '件数',
quantity: "数量", unit: '包装单位',
volume: "体积", quantity: '数量',
weight: "重量", volume: '体积',
worth: "货值", weight: '重量',
worthRules: "货值不能为空", worth: '货值',
prodAttrArr: "商品特性", worthRules: '货值不能为空',
isPayAdvance: "是否预付", prodAttrArr: '商品特性',
link: "商品链接", isPayAdvance: '是否预付',
linkedit: "编辑商品链接", link: '商品链接',
linkadd: "添加商品链接", linkedit: '编辑商品链接',
sum: "合计", linkadd: '添加商品链接',
totalNum: "总件数", sum: '合计',
totalWorth: "总货值", totalNum: '总件数',
insuranceFee: "保价费", totalWorth: '总货值',
rmb: "", insuranceFee: '保价费',
dollar: "美元", rmb: '',
common: "通用", dollar: '美元',
marks: "唛头", common: '通用',
marksRules: "请输入唛头", marks: '唛头',
marksRules1: "唛头首位必须为字母", marksRules: '请输入唛头',
isCargoControl: "是否控货", marksRules1: '唛头首位必须为字母',
isCollection: "是否代收货款", isCargoControl: '是否控货',
collectionProxy: "代收货款金额", isCollection: '是否代收货款',
customsType: "单证报关", collectionProxy: '代收货款金额',
issuingMethod: "出单方式", customsType: '单证报关',
deliveryDate: "送货日期", issuingMethod: '出单方式',
deliveryDateRules: "送货日期不能为空", deliveryDate: '送货日期',
warehouseType: "入仓类型", deliveryDateRules: '送货日期不能为空',
harvestMethod: "收货方式", warehouseType: '入仓类型',
deliveryaddress: "收货地区", harvestMethod: '收货方式',
deliveryaddressRules: "收货地区不能为空", deliveryaddress: '收货地区',
addressdetail: "收货详细地址", deliveryaddressRules: '收货地区不能为空',
addressdetailRules: "收货详细地址不能为空", addressdetail: '收货详细地址',
drawee: "付款人", addressdetailRules: '收货详细地址不能为空',
customDraweeList: "费用类型", drawee: '付款人',
number: "快递单号", customDraweeList: '费用类型',
numberNotice: "请输入购买商品的快递单号", number: '快递单号',
getNumber: "生成单号", numberNotice: '请输入购买商品的快递单号',
doubleClear: "是否双清", getNumber: '生成单号',
airlineCompany: "航空公司", doubleClear: '是否双清',
shippingCompany: "船公司", airlineCompany: '航空公司',
customsClearCert: "清关证书", shippingCompany: '船公司',
clearCertRemark: "清关证书备注", customsClearCert: '清关证书',
isUnpack: "是否拆包", clearCertRemark: '清关证书备注',
isSingleTicketTransport: "单票立刻转运", isUnpack: '是否拆包',
notice: isSingleTicketTransport: '单票立刻转运',
"注:若只有一件,货到仓库立即发,选“是”,多件需仓库集运待发,选“否”", notice: '注:若只有一件,货到仓库立即发,选“是”,多件需仓库集运待发,选“否”',
packageType: "特殊要求", packageType: '特殊要求',
packageRemarks: "特殊要求备注", packageRemarks: '特殊要求备注',
select: "选择", select: '选择',
addCustomer: "新建收货人", addCustomer: '新建收货人',
batchImport: "批量导入", batchImport: '批量导入',
uoloadBox: "上传集装箱", uoloadBox: '上传集装箱',
startImport: "开始导入", startImport: '开始导入',
complete: "完成", complete: '完成',
upload: "点击上传", upload: '点击上传',
boxTpl: "装箱单模板", boxTpl: '装箱单模板',
material: "材质", material: '材质',
next: "下一步", next: '下一步',
none: "", none: '',
realName: "请先完成实名认证", realName: '请先完成实名认证',
linkRules: "请输入商品链接", linkRules: '请输入商品链接',
delPro: "确定删除此条内容么?", delPro: '确定删除此条内容么?',
isContainNotice: "订单包含不接受货物,请检查", isContainNotice: '订单包含不接受货物,请检查',
consignorConfirm: "请再次确认国际运费是否由您支付?", consignorConfirm: '请再次确认国际运费是否由您支付?',
isCargoControlNotice: isCargoControlNotice: '是指由发货人与收货人约定在货物的国际运输过程中,我司作为第三方对该货物货权的控制;需由发货人授权我司放货的情况下收货人才能提取该票货物的一种交易方式',
"是指由发货人与收货人约定在货物的国际运输过程中,我司作为第三方对该货物货权的控制;需由发货人授权我司放货的情况下收货人才能提取该票货物的一种交易方式", customsTypeNotice: '我司全代 : 该货物的出口手续由我司代为办理 ; 自单代报: 该货物由发货人提供相关出口单证并委托我司代为办理 ;混单代报该货物有以上两种情况出现',
customsTypeNotice: packageTypeNotice: '如需我司打包,请勾选相应选项,费用付款人及打包要求可备注补充'
"我司全代 : 该货物的出口手续由我司代为办理 ; 自单代报: 该货物由发货人提供相关出口单证并委托我司代为办理 ;混单代报该货物有以上两种情况出现",
packageTypeNotice:
"如需我司打包,请勾选相应选项,费用付款人及打包要求可备注补充",
}, },
deliverysuccess: { deliverysuccess: {
success: "新建订单成功", success: '新建订单成功',
orderNo: "您的订舱号", orderNo: '您的订舱号',
startAddress: "仓库地址", startAddress: '仓库地址',
startTell: "仓库电话", startTell: '仓库电话',
text: "您的订单已提交,谢谢您选择捷道物流!", text: '您的订单已提交,谢谢您选择捷道物流!',
delivery: "再来一单", delivery: '再来一单',
profile: "个人中心", profile: '个人中心',
detail: "查看订单", detail: '查看订单',
push: "入仓须知", push: '入仓须知',
notice: notice: '为保证入仓数据准确性,入仓请带上一份装箱单(品名,件数,毛重,尺寸方数,是否有牌)',
"为保证入仓数据准确性,入仓请带上一份装箱单(品名,件数,毛重,尺寸方数,是否有牌)", products: '商品列表',
products: "商品列表", productCount: '总件数',
productCount: "总件数", copy: '复制订单信息'
copy: "复制订单信息",
}, },
exchange: { exchange: {
confirmNumberLabel: `已选{value}件,合计积分:`, confirmNumberLabel: `已选{value}件,合计积分:`,
...@@ -1196,4 +1192,5 @@ export default { ...@@ -1196,4 +1192,5 @@ export default {
remark: "备注", remark: "备注",
errorMsg: "地址提交后无法修改,如需修改地址请联系客服", errorMsg: "地址提交后无法修改,如需修改地址请联系客服",
}, },
'如需海外仓服务,请联系客服,服务热线:{tel}': '如需海外仓服务,请联系客服,服务热线:{tel}'
}; };
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
/> />
</div> </div>
<el-form ref="form" :model="form" :rules="rules"> <el-form ref="form" :model="form" :rules="rules" :validate-on-rule-change="false">
<section-title lang-key="delivery.header"> <section-title lang-key="delivery.header">
{{$t('delivery.consigneeName')}} {{$t('delivery.consigneeName')}}
<el-radio-group v-if="noConsignee" v-model="hasConsignee"> <el-radio-group v-if="noConsignee" v-model="hasConsignee">
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
prop="consigneeName" prop="consigneeName"
> >
<el-input <el-input
:disabled="!hasConsignee"
v-model="form.consigneeName" v-model="form.consigneeName"
:placeholder="$t('delivery.consigneeNameNotice')" :placeholder="$t('delivery.consigneeNameNotice')"
style="width: 200px" style="width: 200px"
...@@ -53,6 +54,7 @@ ...@@ -53,6 +54,7 @@
style="margin-left: 5px" style="margin-left: 5px"
type="text" type="text"
@click="openConsignee" @click="openConsignee"
:disabled="!hasConsignee"
>{{ $t("delivery.openConsignee") }}</el-button> >{{ $t("delivery.openConsignee") }}</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -62,6 +64,7 @@ ...@@ -62,6 +64,7 @@
prop="consigneePhone" prop="consigneePhone"
> >
<el-select <el-select
:disabled="!hasConsignee"
v-model="form.countryCode" v-model="form.countryCode"
style="width: 100px" style="width: 100px"
@change="(val) => changeArea(val, form.consigneePhone)" @change="(val) => changeArea(val, form.consigneePhone)"
...@@ -76,6 +79,7 @@ ...@@ -76,6 +79,7 @@
</el-option> </el-option>
</el-select> </el-select>
<el-input <el-input
:disabled="!hasConsignee"
v-model="form.consigneePhone" v-model="form.consigneePhone"
:placeholder="$t('delivery.consigneePhoneNotice')" :placeholder="$t('delivery.consigneePhoneNotice')"
style="width: 180px" style="width: 180px"
...@@ -96,6 +100,7 @@ ...@@ -96,6 +100,7 @@
prop="consigneeNameEn" prop="consigneeNameEn"
> >
<el-input <el-input
:disabled="!hasConsignee"
v-model="form.consigneeNameEn" v-model="form.consigneeNameEn"
:placeholder="$t('delivery.consigneeNameNoticeEn')" :placeholder="$t('delivery.consigneeNameNoticeEn')"
style="width: 200px" style="width: 200px"
...@@ -105,6 +110,7 @@ ...@@ -105,6 +110,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('delivery.consigneeCompany')"> <el-form-item :label="$t('delivery.consigneeCompany')">
<el-input <el-input
:disabled="!hasConsignee"
v-model="form.consigneeCompany" v-model="form.consigneeCompany"
:placeholder="$t('delivery.consigneeCompanyNotice')" :placeholder="$t('delivery.consigneeCompanyNotice')"
style="width: 150px" style="width: 150px"
...@@ -114,6 +120,7 @@ ...@@ -114,6 +120,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('orderdetail.consigneeCompanyEn')"> <el-form-item :label="$t('orderdetail.consigneeCompanyEn')">
<el-input <el-input
:disabled="!hasConsignee"
v-model="form.consigneeCompanyEn" v-model="form.consigneeCompanyEn"
:placeholder="$t('delivery.consigneeCompanyNoticeEn')" :placeholder="$t('delivery.consigneeCompanyNoticeEn')"
style="width: 150px" style="width: 150px"
...@@ -123,6 +130,7 @@ ...@@ -123,6 +130,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="Email"> <el-form-item label="Email">
<el-input <el-input
:disabled="!hasConsignee"
v-model="form.consigneeEmail" v-model="form.consigneeEmail"
:placeholder="$t('delivery.emailNotice')" :placeholder="$t('delivery.emailNotice')"
style="width: 200px" style="width: 200px"
...@@ -138,7 +146,7 @@ ...@@ -138,7 +146,7 @@
<el-descriptions :column="2" border> <el-descriptions :column="2" border>
<el-descriptions-item <el-descriptions-item
:label="$t('delivery.transport')" :label="$t('delivery.transport')"
label-style="width:100px" :label-style="{width: '100px'}"
> >
<span <span
slot="label" slot="label"
...@@ -164,7 +172,7 @@ ...@@ -164,7 +172,7 @@
<!--始发城市--> <!--始发城市-->
<el-descriptions-item <el-descriptions-item
:label="$t('delivery.departure')" :label="$t('delivery.departure')"
label-style="width:100px" :label-style="{width: '100px'}"
> >
<span <span
slot="label" slot="label"
...@@ -195,7 +203,7 @@ ...@@ -195,7 +203,7 @@
<!--目的国--> <!--目的国-->
<el-descriptions-item <el-descriptions-item
:label="$t('delivery.objective')" :label="$t('delivery.objective')"
label-style="width:100px" :label-style="{width: '100px'}"
> >
<span <span
slot="label" slot="label"
...@@ -227,7 +235,7 @@ ...@@ -227,7 +235,7 @@
<!--目的城市--> <!--目的城市-->
<el-descriptions-item <el-descriptions-item
:label="$t('delivery.objective')" :label="$t('delivery.objective')"
label-style="width:100px" :label-style="{width: '100px'}"
> >
<span <span
slot="label" slot="label"
...@@ -260,7 +268,7 @@ ...@@ -260,7 +268,7 @@
<el-descriptions-item <el-descriptions-item
:label="$t('delivery.router')" :label="$t('delivery.router')"
:span="3" :span="3"
label-style="width:100px" :label-style="{width: '100px'}"
> >
<span <span
slot="label" slot="label"
...@@ -296,7 +304,7 @@ ...@@ -296,7 +304,7 @@
.cssClass == 'channel' .cssClass == 'channel'
" "
:label="$t('delivery.channel')" :label="$t('delivery.channel')"
label-style="width:100px" :label-style="{width: '100px'}"
> >
<span slot="label">{{ $t("delivery.channel") }}</span> <span slot="label">{{ $t("delivery.channel") }}</span>
<el-form-item <el-form-item
...@@ -742,7 +750,7 @@ ...@@ -742,7 +750,7 @@
required required
:error="$t('delivery.marksRules')" :error="$t('delivery.marksRules')"
> >
<el-input v-model="form.marks" placeholder="" /> <el-input v-model="form.marks" placeholder="" class="w-150" />
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<!--单证报关--> <!--单证报关-->
...@@ -799,6 +807,7 @@ ...@@ -799,6 +807,7 @@
:type="DICT_TYPE.INFRA_BOOLEAN_STRING" :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
formatter="bool" formatter="bool"
form-type="radio" form-type="radio"
:disabled="!hasConsignee"
/> />
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
...@@ -851,6 +860,7 @@ ...@@ -851,6 +860,7 @@
required required
> >
<dict-selector <dict-selector
class="w-150"
v-model="form.warehouseType" v-model="form.warehouseType"
:type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :type="DICT_TYPE.ECW_WAREHOUSING_TYPE"
defaultable defaultable
...@@ -863,7 +873,7 @@ ...@@ -863,7 +873,7 @@
<el-checkbox label="" v-model="form.isExternalWarehouse" @change="form.isExternalWarehouse=$event" :disabled="false"></el-checkbox> <el-checkbox label="" v-model="form.isExternalWarehouse" @change="form.isExternalWarehouse=$event" :disabled="false"></el-checkbox>
</el-form-item> </el-form-item>
<div v-if="form.isExternalWarehouse"> <div v-if="form.isExternalWarehouse">
<div v-for="(item, index) in form.externalWarehouseDtoList" class="" :key="index" <div v-for="(item, index) in form.externalWarehouseDtoList" :key="index"
style="border-bottom: 1px solid #ccc; margin-bottom: 10px"> style="border-bottom: 1px solid #ccc; margin-bottom: 10px">
<div class="flex-1"> <div class="flex-1">
<el-form-item :label="$t('装货时间')" <el-form-item :label="$t('装货时间')"
...@@ -872,7 +882,7 @@ ...@@ -872,7 +882,7 @@
required: true, message: '装货时间不能为空', trigger: 'blur' required: true, message: '装货时间不能为空', trigger: 'blur'
}" }"
> >
<el-date-picker v-model="item.estLoadingTime" value-format="yyyy-MM-dd HH:mm:ss" class="w-200"></el-date-picker> <el-date-picker v-model="item.estLoadingTime" value-format="yyyy-MM-dd HH:mm:ss" class="w-150"></el-date-picker>
</el-form-item> </el-form-item>
</div> </div>
<div class="flex-1"> <div class="flex-1">
...@@ -882,7 +892,7 @@ ...@@ -882,7 +892,7 @@
required: true, message: '装货地址不能为空', trigger: 'blur' required: true, message: '装货地址不能为空', trigger: 'blur'
}" }"
> >
<el-input v-model="item.loadingAddress" placeholder="" class="w-200"></el-input> <el-input v-model="item.loadingAddress" placeholder="" class="w-150"></el-input>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
...@@ -907,6 +917,7 @@ ...@@ -907,6 +917,7 @@
:error="$t('delivery.deliveryDateRules')" :error="$t('delivery.deliveryDateRules')"
> >
<el-date-picker <el-date-picker
class="w-150"
v-model="form.deliveryDate" v-model="form.deliveryDate"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
/> />
...@@ -972,6 +983,7 @@ ...@@ -972,6 +983,7 @@
required required
> >
<dict-selector <dict-selector
class="w-150"
v-model="form.harvestMethod" v-model="form.harvestMethod"
:type="DICT_TYPE.ECW_HARVEST_METHOD" :type="DICT_TYPE.ECW_HARVEST_METHOD"
:filter="(item) => item.value == 1 || homeDeliveryService" :filter="(item) => item.value == 1 || homeDeliveryService"
...@@ -995,12 +1007,9 @@ ...@@ -995,12 +1007,9 @@
prop="city" prop="city"
> >
<area-selector <area-selector
:country=" input-width="150px"
form.consigneeVO ? form.consigneeVO.country : undefined :country="form.consigneeVO ? form.consigneeVO.country : undefined"
" :province="form.consigneeVO ? form.consigneeVO.province : undefined"
:province="
form.consigneeVO ? form.consigneeVO.province : undefined
"
:city="form.consigneeVO ? form.consigneeVO.city : undefined" :city="form.consigneeVO ? form.consigneeVO.city : undefined"
@countryChange="onAreaChange('country', $event)" @countryChange="onAreaChange('country', $event)"
@provinceChange="onAreaChange('province', $event)" @provinceChange="onAreaChange('province', $event)"
...@@ -1029,7 +1038,7 @@ ...@@ -1029,7 +1038,7 @@
<template #header> <template #header>
<section-title :title="$t('其他')"></section-title> <section-title :title="$t('其他')"></section-title>
</template> </template>
<el-descriptions :column="2" label-style="width: 120px" border> <el-descriptions :column="2" :label-style="{width: '100px'}" border>
<el-descriptions-item> <el-descriptions-item>
<span <span
slot="label" slot="label"
...@@ -1055,7 +1064,7 @@ ...@@ -1055,7 +1064,7 @@
<el-descriptions-item :label="$t('特殊要求备注')"> <el-descriptions-item :label="$t('特殊要求备注')">
<!--包装备注--> <!--包装备注-->
<el-form-item prop="packageRemarks"> <el-form-item prop="packageRemarks">
<el-input v-model="form.packageRemarks" type="textarea" class="w-200" /> <el-input v-model="form.packageRemarks" type="textarea" class="w-150" />
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :span="2" :label="$t('delivery.number')"> <el-descriptions-item :span="2" :label="$t('delivery.number')">
...@@ -1064,13 +1073,13 @@ ...@@ -1064,13 +1073,13 @@
<el-input <el-input
v-model="form.number" v-model="form.number"
:placeholder="$t('delivery.numberNotice')" :placeholder="$t('delivery.numberNotice')"
> class="w-150"
></el-input>
<el-button <el-button
slot="append" class="ml-10"
type="primary" type="default"
@click="getOrderCourierNumber" @click="getOrderCourierNumber"
>{{ $t("delivery.getNumber") }}</el-button> >{{ $t("delivery.getNumber") }}</el-button>
</el-input>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<template v-if="isAir"> <template v-if="isAir">
...@@ -1120,7 +1129,7 @@ ...@@ -1120,7 +1129,7 @@
</template> </template>
<!--出单方式,新的原型没有提现,暂时隐藏显示--> <!--出单方式,新的原型没有提现,暂时隐藏显示-->
<el-descriptions-item :label="$t('delivery.issuingMethod')" v-false> <el-descriptions-item :label="$t('delivery.issuingMethod')" v-if="false">
<span <span
slot="label" slot="label"
><span style="color: red">*</span>{{ $t("delivery.issuingMethod") }}</span> ><span style="color: red">*</span>{{ $t("delivery.issuingMethod") }}</span>
...@@ -1181,14 +1190,19 @@ ...@@ -1181,14 +1190,19 @@
v-if="editFlag || form.status == 0" v-if="editFlag || form.status == 0"
type="primary" type="primary"
@click="submitForm(2)" @click="submitForm(2)"
:disabled="isOverSeaWareHouse"
>{{ $t("提交") }}</el-button> >{{ $t("提交") }}</el-button>
<el-button <el-button
v-if="form.status == 2 && !editFlag" v-if="form.status == 2 && !editFlag"
type="primary" type="primary"
@click="submitForm(2, false)" @click="submitForm(2, false)"
:disabled="isOverSeaWareHouse"
>{{ $t("提交") }}</el-button> >{{ $t("提交") }}</el-button>
<el-button @click="$router.back()">{{ $t("common.cancel") }}</el-button> <el-button @click="$router.back()">{{ $t("common.cancel") }}</el-button>
</el-form-item> </el-form-item>
<div style="padding-bottom: 20px; font-size: 12px; color: red" v-if="isOverSeaWareHouse">
{{$t('如需海外仓服务,请联系客服,服务热线:{tel}', {tel: '400-900-9962'})}}
</div>
</el-form> </el-form>
<!-- 收货人列表弹窗 --> <!-- 收货人列表弹窗 -->
<el-dialog <el-dialog
...@@ -1198,6 +1212,21 @@ ...@@ -1198,6 +1212,21 @@
append-to-body append-to-body
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<div class="mb-10">
<el-input
class="w-200"
v-model="customeParams.searchKey"
placeholder="请输入姓名/公司/电话"
clearable
@clear="getCustomerList(true)"
@change="getCustomerList(true)"
/>
<el-button
type="primary"
@click="getCustomerList(true)"
style="margin-left: 10px"
>{{ $t("搜索") }}</el-button>
</div>
<div v-if="!addCustomerShow"> <div v-if="!addCustomerShow">
<el-table <el-table
ref="consigneeTable" ref="consigneeTable"
...@@ -1616,7 +1645,8 @@ export default { ...@@ -1616,7 +1645,8 @@ export default {
// 查询参数 // 查询参数
customeParams: { customeParams: {
page: 1, page: 1,
rows: 10 rows: 10,
searchKey: ''
}, },
editFlag: true, editFlag: true,
consigneeVisdle: false, consigneeVisdle: false,
...@@ -1625,57 +1655,6 @@ export default { ...@@ -1625,57 +1655,6 @@ export default {
defaultContact: false defaultContact: false
}, },
groupList: [], groupList: [],
rules: {
consigneeName: [
{
required: true,
message: this.$t('delivery.consigneeNameNotice'),
trigger: 'blur'
}
],
consigneeCompany: [
{
required: true,
message: this.$t('delivery.consigneeCompanyNotice'),
trigger: 'blur'
}
],
consigneePhone: [
{
required: true,
message: this.$t('delivery.consigneePhoneNotice'),
trigger: 'blur'
},
{ pattern: /^[0-9]\d*$/, message: this.$t('customer.phoneRules2') }
],
transportId: [
{
required: true,
message: this.$t('delivery.transportNotice'),
trigger: 'blur'
}
],
marks: [
{ required: true, message: this.$t('delivery.marksRules') },
// { pattern: /[A-z]/, message: this.$t('delivery.marksRules1') }
],
departureId: [
{ required: true, message: this.$t('delivery.departureRules') }
],
objectiveId: [
{ required: true, message: this.$t('delivery.objectiveRules') }
],
lineId: [{ required: true, message: this.$t('delivery.router') }],
deliveryDate: [
{ required: true, message: this.$t('delivery.deliveryDateRules') }
],
consigneeAddress: [
{ required: true, message: this.$t('delivery.addressdetailRules') }
],
city: [
{ required: true, message: this.$t('delivery.deliveryaddressRules') }
]
},
addCustomerRules: { addCustomerRules: {
name: [ name: [
{ {
...@@ -1720,7 +1699,9 @@ export default { ...@@ -1720,7 +1699,9 @@ export default {
// 仓库区域树形列表 // 仓库区域树形列表
warehouseTreeList: [], warehouseTreeList: [],
// 选择的路线对象 // 选择的路线对象
selectedRouter: null selectedRouter: null,
// 客户搜索关键词
customerSearchKey: ''
} }
}, },
computed: { computed: {
...@@ -1871,6 +1852,68 @@ export default { ...@@ -1871,6 +1852,68 @@ export default {
showDestCityList(){ showDestCityList(){
if(!this.form.destCountryId) return this.destCityList if(!this.form.destCountryId) return this.destCityList
return this.destCityList.filter(item => item.guojia === this.form.destCountryId) || [] return this.destCityList.filter(item => item.guojia === this.form.destCountryId) || []
},
isOverSeaWareHouse(){
return this.form.type?.indexOf('2') > -1
},
rules(){
const rules = {
transportId: [
{
required: true,
message: this.$t('delivery.transportNotice'),
trigger: 'blur'
}
],
marks: [
{ required: true, message: this.$t('delivery.marksRules') },
// { pattern: /[A-z]/, message: this.$t('delivery.marksRules1') }
],
destCountryId: [
{ required: true, message: this.$t('delivery.destCountryRules') }
],
departureId: [
{ required: true, message: this.$t('delivery.departureRules') }
],
objectiveId: [
{ required: true, message: this.$t('delivery.objectiveRules') }
],
lineId: [{ required: true, message: this.$t('delivery.router') }],
deliveryDate: [
{ required: true, message: this.$t('delivery.deliveryDateRules') }
],
consigneeAddress: [
{ required: true, message: this.$t('delivery.addressdetailRules') }
],
city: [
{ required: true, message: this.$t('delivery.deliveryaddressRules') }
]
}
if(this.hasConsignee){
rules.consigneeName = [
{
required: true,
message: this.$t('delivery.consigneeNameNotice'),
trigger: 'blur'
}
]
rules.consigneeCompany = [
{
required: true,
message: this.$t('delivery.consigneeCompanyNotice'),
trigger: 'blur'
}
]
rules.consigneePhone = [
{
required: true,
message: this.$t('delivery.consigneePhoneNotice'),
trigger: 'blur'
},
{ pattern: /^[0-9]\d*$/, message: this.$t('customer.phoneRules2') }
]
}
return rules
} }
}, },
watch: { watch: {
...@@ -1920,7 +1963,7 @@ export default { ...@@ -1920,7 +1963,7 @@ export default {
// 服务 // 服务
'form.type'(type){ 'form.type'(type){
if(type.indexOf('2') > -1){ if(type.indexOf('2') > -1){
this.$alert(this.$t('如需海外仓服务,请联系客服,服务热线:400-900-9962')) this.$alert(this.$t('如需海外仓服务,请联系客服,服务热线:{tel}', {tel: '400-900-9962'}))
} }
}, },
'form.isExternalWarehouse'(isExternalWarehouse){ 'form.isExternalWarehouse'(isExternalWarehouse){
...@@ -1952,9 +1995,48 @@ export default { ...@@ -1952,9 +1995,48 @@ export default {
if (!enable && this.form.harvestMethod != 1) { if (!enable && this.form.harvestMethod != 1) {
this.form.harvestMethod = 1 this.form.harvestMethod = 1
} }
},
hasConsignee(){
// 无收货人,默认发货人付款,而且必须控货
if(!this.hasConsignee){
this.form.drawee = 1
this.form.isCargoControl = true
this.$refs.form.clearValidate("consigneeName")
this.$refs.form.clearValidate("consigneePhone")
this.$refs.form.clearValidate("consigneeCompany")
}
} }
}, },
async created() { async created() {
await this.getCustomerList()
await getCountryList().then((r) => {
this.countryList = r.data
})
await getListTree({treeType: 1}).then(res => {
this.dstCountryList = res.data
})
await getData({ page: 1, rows: 100, dictType: 'transport_type' }).then((r) => {
this.transportTypeList = r.data.list
})
await getData({ page: 1, rows: 100, dictType: 'coupon_type' }).then((r) => {
this.couponTypeList = r.data.list
})
await getGroupList({ page: 1, rows: 100 }).then((r) => {
this.groupList = r.data.list
this.groupList.push({ id: 0, title: this.$t('delivery.none') })
})
await getProductAttrList().then((res) => (this.productAttrList = res.data))
// getChannelList().then((res) => (this.channelList = res.data))
await await this.getTradeCity()
await await this.getChannelList()
await getCurrencyList().then((res) => (this.currencyList = res.data))
await getGuojiaAndShiAndWarehouseList({tradeType: 1}).then(res => {
this.destCountryList = res.data.guojiaList
this.destCityList = res.data.shiList
// this.destWarehoustList = res.data.warehouseList
})
// this.getIdCard() // this.getIdCard()
if (this.$route.query.tranfId) { if (this.$route.query.tranfId) {
setTimeout(() => { setTimeout(() => {
...@@ -1962,7 +2044,7 @@ export default { ...@@ -1962,7 +2044,7 @@ export default {
}, 500) }, 500)
} }
if (this.$route.query.id) { if (this.$route.query.id) {
getOrderDetail(this.$route.query.id).then((res) => { await getOrderDetail(this.$route.query.id).then((res) => {
this.form = Object.assign({}, res.data, { orderItemVOList: [] }) this.form = Object.assign({}, res.data, { orderItemVOList: [] })
this.form.deliveryDate = res.data.deliveryDate this.form.deliveryDate = res.data.deliveryDate
this.$set(this.form, 'consigneePhone', res.data.consigneeVO.phone) this.$set(this.form, 'consigneePhone', res.data.consigneeVO.phone)
...@@ -1993,34 +2075,9 @@ export default { ...@@ -1993,34 +2075,9 @@ export default {
}) })
}) })
} else this.addProduct() } else this.addProduct()
this.getCustomerList()
getCountryList().then((r) => {
this.countryList = r.data
})
getListTree({treeType: 1}).then(res => {
this.dstCountryList = res.data
})
getData({ page: 1, rows: 100, dictType: 'transport_type' }).then((r) => {
this.transportTypeList = r.data.list
})
getData({ page: 1, rows: 100, dictType: 'coupon_type' }).then((r) => {
this.couponTypeList = r.data.list
})
getGroupList({ page: 1, rows: 100 }).then((r) => {
this.groupList = r.data.list
this.groupList.push({ id: 0, title: this.$t('delivery.none') })
})
getProductAttrList().then((res) => (this.productAttrList = res.data))
// getChannelList().then((res) => (this.channelList = res.data))
await this.getTradeCity()
await this.getChannelList()
getCurrencyList().then((res) => (this.currencyList = res.data))
getGuojiaAndShiAndWarehouseList({tradeType: 1}).then(res => { await this.$nextTick()
this.destCountryList = res.data.guojiaList this.$refs.form.clearValidate()
this.destCityList = res.data.shiList
// this.destWarehoustList = res.data.warehouseList
})
}, },
methods: { methods: {
async getTradeCity() { async getTradeCity() {
...@@ -2102,7 +2159,11 @@ export default { ...@@ -2102,7 +2159,11 @@ export default {
} }
}) })
}, },
getCustomerList() { getCustomerList(reload = false) {
if(reload){
this.customeParams.page = 1
this.customerList = []
}
getCustomerList(this.customeParams).then((r) => { getCustomerList(this.customeParams).then((r) => {
this.customerList = r.data.list this.customerList = r.data.list
this.total = r.data.total this.total = r.data.total
...@@ -2151,7 +2212,7 @@ export default { ...@@ -2151,7 +2212,7 @@ export default {
openConsignee() { openConsignee() {
this.consigneeVisdle = true this.consigneeVisdle = true
}, },
selectConsignee(val) { async selectConsignee(val) {
if (val) { if (val) {
console.log(val) console.log(val)
this.form.consigneeName = val.name this.form.consigneeName = val.name
...@@ -2166,6 +2227,9 @@ export default { ...@@ -2166,6 +2227,9 @@ export default {
} }
this.consigneeVisdle = false this.consigneeVisdle = false
this.$refs.consigneeTable.setCurrentRow() this.$refs.consigneeTable.setCurrentRow()
await this.$nextTick()
this.$refs.form.clearValidate('consigneeName')
this.$refs.form.clearValidate('consigneePhone')
} }
}, },
updateCustomer(row) { updateCustomer(row) {
...@@ -2568,7 +2632,7 @@ export default { ...@@ -2568,7 +2632,7 @@ export default {
color: #ffffff; color: #ffffff;
} }
::v-deep .el-descriptions-item__content .el-form-item{ ::v-deep .el-descriptions-item__content .el-form-item{
margin-bottom: 0; /*margin-bottom: 0;*/
} }
.card-title { .card-title {
display: flex; display: flex;
......
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