Commit fb981988 by zhuzhequan

生产单搜索修改

parent 1c448d02
......@@ -37,13 +37,12 @@ export function getSubOrderBySubOrderNumber(thirdSubOrderNumber: string) {
)
}
export function getSubOrderBySubOrder(factorySubOrderNumber: string, orderFrom: string) {
export function getSubOrderBySubOrder(factorySubOrderNumber: string) {
return axios.get<never, BaseRespData<PodProductList>>(
'factory/podJomallOrderProductCnUs/getSubOrderBySubOrderNumber',
{
params: {
factorySubOrderNumber,
orderFrom,
factorySubOrderNumber
},
},
)
......
......@@ -84,20 +84,19 @@ const trackcodeInput = async () => {
}
const user = JSON.parse(localStorage.getItem('user') || '{}')
let orderNumber: string
// let orderNumber: string
const underscoreCount = (TrackingNumber.value.match(/_/g) || []).length
// const underscoreCount = (TrackingNumber.value.match(/_/g) || []).length
if (underscoreCount >= 3) {
orderNumber = TrackingNumber.value.split('_')[3]
} else {
orderNumber = TrackingNumber.value
}
// if (underscoreCount >= 3) {
// orderNumber = TrackingNumber.value.split('_')[3]
// } else {
// orderNumber = TrackingNumber.value
// }
try {
const res = await getSubOrderBySubOrder(
orderNumber,
user.factory?.countryCode.toLowerCase(),
TrackingNumber.value
)
if (!res.data) {
return ElMessage.error('生产单不存在')
......
......@@ -210,15 +210,6 @@
<template #default> US账户 </template>
</el-table-column>
<el-table-column
label="应付金额($)"
header-align="center"
prop="totalAmount"
width="130"
align="center"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
label="实付金额($)"
header-align="center"
prop="actual_amount"
......@@ -601,17 +592,23 @@
/>
<el-table-column
label="订单号"
prop="order.order_number"
prop="erp_order_number"
header-align="center"
align="center"
min-width="220"
show-overflow-tooltip
>
<template #default="{ row }">
<span>{{
row.erp_order_number || row.factory_order_number
}}</span>
</template>
</el-table-column>
<el-table-column
label="工厂订单号"
prop="order.factory_order_number"
header-align="center"
align="center"
min-width="220"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
label="店铺单号"
......@@ -945,7 +942,6 @@
<el-col :span="6">
物流总价($) {{ currentRow?.carriage_total_amount }}
</el-col>
<el-col :span="6"> 应付金额($){{ currentRow?.total_amount }}</el-col>
<el-col :span="6"> 实付金额($){{ currentRow?.actual_amount }}</el-col>
</el-row>
<el-row style="margin: 10px 0">
......
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