Commit bb03b1f5 by wusiyi

feat: pod添加已拦截

parent 2c537b23
...@@ -249,6 +249,7 @@ ...@@ -249,6 +249,7 @@
'WAIT_SHIPMENT', 'WAIT_SHIPMENT',
'TO_BE_REPLENISHMENT', 'TO_BE_REPLENISHMENT',
'INVALID', 'INVALID',
'INTERCEPTED',
].includes(status) ].includes(status)
" "
> >
...@@ -1460,20 +1461,27 @@ const CardOrderList = ref<(PodProductList | CardOrderData)[]>([]) ...@@ -1460,20 +1461,27 @@ const CardOrderList = ref<(PodProductList | CardOrderData)[]>([])
const loadCardList = async () => { const loadCardList = async () => {
loading.value = true loading.value = true
try { try {
const params = {
...searchForm.value,
timeType: searchForm.value.timeType,
startTime:
timeRange.value && timeRange.value.length > 0
? timeRange.value[0]
: null,
endTime:
timeRange.value && timeRange.value.length > 0
? timeRange.value[1]
: null,
}
if (status.value === 'INTERCEPTED') {
params.interceptedStatus = true
} else {
params.status = status.value
}
const res = await getCardOrderList( const res = await getCardOrderList(
{ params,
...searchForm.value,
status: status.value,
timeType: searchForm.value.timeType,
startTime:
timeRange.value && timeRange.value.length > 0
? timeRange.value[0]
: null,
endTime:
timeRange.value && timeRange.value.length > 0
? timeRange.value[1]
: null,
},
currentPage.value, currentPage.value,
pageSize.value, pageSize.value,
) )
...@@ -1641,6 +1649,7 @@ const loadDiffList = async () => { ...@@ -1641,6 +1649,7 @@ const loadDiffList = async () => {
'TO_BE_REPLENISHMENT', 'TO_BE_REPLENISHMENT',
'TO_BE_CONFIRMED', 'TO_BE_CONFIRMED',
'INVALID', 'INVALID',
'INTERCEPTED',
].includes(status.value) ].includes(status.value)
) { ) {
await loadCardList() await loadCardList()
......
...@@ -1944,7 +1944,6 @@ const resultRefs = ref<InstanceType<typeof ResultInfo> | null>(null) ...@@ -1944,7 +1944,6 @@ const resultRefs = ref<InstanceType<typeof ResultInfo> | null>(null)
const confirmDialogShow = ref(false) const confirmDialogShow = ref(false)
const tifDownloadLoading = ref(false) const tifDownloadLoading = ref(false)
const pngDownloadLoading = ref(false) const pngDownloadLoading = ref(false)
const reComposingLoading = ref(false)
const isChangeWay = ref(false) const isChangeWay = ref(false)
const confirmData = ref([]) const confirmData = ref([])
const logisticsWayData = ref([]) const logisticsWayData = ref([])
......
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