Commit 8ed3c797 by qinjianhui

fix: 获取物流接口修改

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