Commit 6614790e by linjinhong

修改发货地址国家代码和国家名称 可筛选,修改podus 待发货状态创建物流为创建物流订单

parent abc936e0
...@@ -250,6 +250,7 @@ const formConfig = computed<IFormConfig[]>(() => [ ...@@ -250,6 +250,7 @@ const formConfig = computed<IFormConfig[]>(() => [
options: countryList.value, options: countryList.value,
label: 'countryCode', label: 'countryCode',
value: 'countryCode', value: 'countryCode',
filterable: true,
placeholder: '请选择国家代码', placeholder: '请选择国家代码',
onChange: (val: ICountryObj) => { onChange: (val: ICountryObj) => {
editForm.value.countryName = val.nameCn editForm.value.countryName = val.nameCn
...@@ -265,6 +266,7 @@ const formConfig = computed<IFormConfig[]>(() => [ ...@@ -265,6 +266,7 @@ const formConfig = computed<IFormConfig[]>(() => [
options: countryList.value, options: countryList.value,
label: 'nameCn', label: 'nameCn',
value: 'nameCn', value: 'nameCn',
filterable: true,
placeholder: '请选择国家名称', placeholder: '请选择国家名称',
onChange: (val: ICountryObj) => { onChange: (val: ICountryObj) => {
editForm.value.countryCode = val.countryCode editForm.value.countryCode = val.countryCode
......
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
<template #dropdown> <template #dropdown>
<ElDropdownMenu> <ElDropdownMenu>
<ElDropdownItem @click="getOrderByIdApi('createLogisticsOrder')" <ElDropdownItem @click="getOrderByIdApi('createLogisticsOrder')"
>创建物流</ElDropdownItem >创建物流订单</ElDropdownItem
> >
<ElDropdownItem @click="getOrderByIdApi('getTrackingNumber')" <ElDropdownItem @click="getOrderByIdApi('getTrackingNumber')"
>获取跟踪号</ElDropdownItem >获取跟踪号</ElDropdownItem
...@@ -1698,7 +1698,7 @@ const getOrderByIdApi = async (type: string) => { ...@@ -1698,7 +1698,7 @@ const getOrderByIdApi = async (type: string) => {
wayDialogTitle.value = wayDialogTitle.value =
type === 'batchChangeLogistics' type === 'batchChangeLogistics'
? `切换物流(当前物流方式:${selection.value[0]?.logisticsWayName})` ? `切换物流(当前物流方式:${selection.value[0]?.logisticsWayName})`
: '创建物流' : '创建物流订单'
isChangeWay.value = true isChangeWay.value = true
const { data } = await getLogisticsCalculation(selection.value[0]?.id) const { data } = await getLogisticsCalculation(selection.value[0]?.id)
...@@ -1758,7 +1758,7 @@ const wayDialogTitle = ref('') ...@@ -1758,7 +1758,7 @@ const wayDialogTitle = ref('')
const rowClick = (row: LogisticsData, title: string) => { const rowClick = (row: LogisticsData, title: string) => {
try { try {
if (title == '创建物流') { if (title == '创建物流订单') {
changeWayRow.value = row changeWayRow.value = row
} else { } else {
if (row.logisticsWayId === selection.value[0]?.logisticsWayId) { if (row.logisticsWayId === selection.value[0]?.logisticsWayId) {
...@@ -1789,7 +1789,7 @@ const changeWaySubmit = async (title: string) => { ...@@ -1789,7 +1789,7 @@ const changeWaySubmit = async (title: string) => {
return ElMessage.warning('请选择状态为成功的物流方式') return ElMessage.warning('请选择状态为成功的物流方式')
} }
let Fn let Fn
if (title !== '创建物流') { if (title !== '创建物流订单') {
if ( if (
changeWayRow.value.logisticsWayId === selection.value[0]?.logisticsWayId changeWayRow.value.logisticsWayId === selection.value[0]?.logisticsWayId
) { ) {
......
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