Commit 8ed3c797 by qinjianhui

fix: 获取物流接口修改

parent a715c3c5
......@@ -3,13 +3,8 @@ import axios from './axios'
import { LogisticsData } from '@/types/api/order'
// 获取物流公司
export function getLogisticsCompanyList(query?: string) {
export function getLogisticsCompanyList() {
return axios.get<never, BaseRespData<LogisticsData[]>>(
'factory/customJomallOrder/getLogisticsList',
{
params: {
name: query,
},
},
)
}
......@@ -3,10 +3,10 @@ import type { TableColumnCtx } from 'element-plus'
export interface SearchForm {
mainSku: string
endProductId: string
orderOnlineNo: string
shopNumber: string
internalMemo: string
status?: number
erpOrderNumber: string
}
export interface Tab {
status: string
......
......@@ -21,7 +21,7 @@
</ElFormItem>
<ElFormItem label="第三方订单号">
<ElInput
v-model="searchForm.orderOnlineNo"
v-model="searchForm.erpOrderNumber"
placeholder="请输入第三方订单号"
clearable
style="width: 160px"
......@@ -260,9 +260,9 @@
<span class="value">{{ scope.row.orderNumber }}</span>
</div>
<div class="order-detail_item">
<span class="label">工厂:</span>
<span class="value" :title="scope.row.facotoryNo">{{
scope.row.facotoryNo || '--'
<span class="label">第三方订单号:</span>
<span class="value" :title="scope.row.erpOrderNumber">{{
scope.row.erpOrderNumber || '--'
}}</span>
</div>
<div class="order-detail_item">
......@@ -367,13 +367,9 @@
<ElSelect
v-model="shipmentForm.carriageName"
filterable
remote
reserve-keyword
placeholder="请输入关键字"
clearable
remote-show-suffix
style="width: 100%"
:remote-method="getLogisticsList"
>
<ElOption
v-for="item in logisticsCompanyList"
......@@ -481,15 +477,14 @@ import ProductInfo from './ProductInfo.vue'
import SendOrder from './SendOrder.vue'
import LogList from '@/components/LogList.vue'
import OrderDetail from './OrderDetail.vue'
import { debounce } from 'lodash-es'
import useShipment from './hook/useShipment'
const [searchForm, resetSearchForm] = useValue<SearchForm>({
mainSku: '',
endProductId: '',
orderOnlineNo: '',
shopNumber: '',
internalMemo: '',
erpOrderNumber: '',
})
const tabsNav = ref<Tab[]>([])
......@@ -564,18 +559,17 @@ const {
})
onMounted(() => {
loadTabData()
getLogisticsList()
})
// 获取物流公司
const getLogisticsList = debounce(async (query?: string) => {
if (query) {
try {
const res = await getLogisticsCompanyList(query)
logisticsCompanyList.value = res.data
} catch (error) {
showError(error)
}
const getLogisticsList = async () => {
try {
const res = await getLogisticsCompanyList()
logisticsCompanyList.value = res.data
} catch (error) {
showError(error)
}
}, 500)
}
const sendOrderList = ref<SendOrderData[]>([])
const sendOrderVisible = ref(false)
// 获取发货单列表
......
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