Commit 7349ebe7 by zhuzhequan

feat:tt物流方式接口数据处理

parent 5fafe2bd
...@@ -148,7 +148,7 @@ export function getUniuniList() { ...@@ -148,7 +148,7 @@ export function getUniuniList() {
} }
// 获取tictok物流承运商 // 获取tictok物流承运商
export function getTiktokCarrier() { export function getTiktokCarrier() {
return axios.get<never, BaseRespData<{ name: string; id: number }[]>>( return axios.get<never, BaseRespData<{ name: string; id: string,typeCode:string,label:string }[]>>(
'logisticsWay/getTiktokShippingProvider', 'logisticsWay/getTiktokShippingProvider',
) )
} }
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
v-model="editForm" v-model="editForm"
:config="formConfig" :config="formConfig"
form-item-width="100%" form-item-width="100%"
labelWidth="110" label-width="110"
> >
</CustomizeForm> </CustomizeForm>
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
defineOptions({ defineOptions({
name: 'LogisticsMethod', name: 'LogisticsMethod',
}) })
import LogisticsWaySelect from './components/LogisticsWaySelect.tsx'
import { import {
getLogisticsWayList, getLogisticsWayList,
addLogisticsWay, addLogisticsWay,
...@@ -103,6 +104,7 @@ import { showConfirm } from '@/utils/ui' ...@@ -103,6 +104,7 @@ import { showConfirm } from '@/utils/ui'
import { Edit, Delete, List, WarningFilled } from '@element-plus/icons-vue' import { Edit, Delete, List, WarningFilled } from '@element-plus/icons-vue'
import { debounce } from 'lodash-es' import { debounce } from 'lodash-es'
import UPARCELImage from '@/assets/images/UPARCEL物流编码.png' import UPARCELImage from '@/assets/images/UPARCEL物流编码.png'
const [searchForm] = useValue({}) const [searchForm] = useValue({})
const [editForm, resetEditForm] = useValue<LogisticsMethod>({ const [editForm, resetEditForm] = useValue<LogisticsMethod>({
platformList: [ platformList: [
...@@ -140,6 +142,7 @@ const warehouseList = ref<WarehouseListData[]>([]) ...@@ -140,6 +142,7 @@ const warehouseList = ref<WarehouseListData[]>([])
interface ImageList { interface ImageList {
[key: string]: string [key: string]: string
} }
const imgeList = ref<ImageList>({ const imgeList = ref<ImageList>({
UPARCEL: UPARCELImage, UPARCEL: UPARCELImage,
}) })
...@@ -418,18 +421,10 @@ const formConfig = computed<IFormConfig[]>(() => [ ...@@ -418,18 +421,10 @@ const formConfig = computed<IFormConfig[]>(() => [
}, },
]} ]}
> >
<el-select <LogisticsWaySelect
v-model={item.logisticsName} v-model={item.logisticsName}
placeholder="请选择物流名称" companyList={tiktokCarriers.value}
> ></LogisticsWaySelect>
{tiktokCarriers.value?.map((el) => (
<el-option
label={el.name}
value={el.name}
key={el.id}
></el-option>
))}{' '}
</el-select>
</el-form-item> </el-form-item>
) : ( ) : (
<el-form-item <el-form-item
...@@ -455,14 +450,14 @@ const formConfig = computed<IFormConfig[]>(() => [ ...@@ -455,14 +450,14 @@ const formConfig = computed<IFormConfig[]>(() => [
<div style="display: flex;flex:17%"> <div style="display: flex;flex:17%">
{(formData?.platformList as platformObj[])?.length - 1 === {(formData?.platformList as platformObj[])?.length - 1 ===
index && ( index && (
<el-button <el-button
style="margin-left: 10px" style="margin-left: 10px"
type="primary" type="primary"
onClick={() => addCol()} onClick={() => addCol()}
> >
新增 新增
</el-button> </el-button>
)} )}
{index >= 1 && ( {index >= 1 && (
<el-button <el-button
style="margin-left: 10px" style="margin-left: 10px"
...@@ -868,13 +863,32 @@ async function getAllList() { ...@@ -868,13 +863,32 @@ async function getAllList() {
} }
} }
const tiktokCarriers = ref<{ name: string; id: number }[]>([]) interface ICompanyList {
warehouseName: string
wayList: IwayList[]
}
interface IwayList {
name: string
id: string
}
const tiktokCarriers = ref<ICompanyList[]>([])
/** /**
* @description: 获取tictok物流承运商 * @description: 获取tictok物流承运商
*/ */
async function getTiktokCarriers() { async function getTiktokCarriers() {
const { data } = await getTiktokCarrier() const { data } = await getTiktokCarrier()
tiktokCarriers.value = data const labelTypeList = Array.from(new Set(data.map(e => e.label)))
const result:ICompanyList[] = []
labelTypeList.forEach(label => {
result.push({
warehouseName: label,
wayList: data.filter(e => e.label === label)
})
})
tiktokCarriers.value = result
} }
/** /**
...@@ -885,7 +899,9 @@ interface LogList { ...@@ -885,7 +899,9 @@ interface LogList {
createTime?: string createTime?: string
description?: string description?: string
} }
const logList = ref<LogList[]>([]) const logList = ref<LogList[]>([])
async function showLog(row: LogisticsMethod) { async function showLog(row: LogisticsMethod) {
logDialogVisible.value = true logDialogVisible.value = true
try { try {
...@@ -909,9 +925,11 @@ async function showLog(row: LogisticsMethod) { ...@@ -909,9 +925,11 @@ async function showLog(row: LogisticsMethod) {
margin-bottom: 10px; margin-bottom: 10px;
} }
} }
.user-operate-btn { .user-operate-btn {
margin-bottom: 10px; margin-bottom: 10px;
} }
.dialog-footer { .dialog-footer {
text-align: center; text-align: center;
} }
......
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