Skip to content

F
factory_front
Commit 4ab17647 by linjinhong
Options

修改podus对账

parent 0d5acd12
Showing with 289 additions and 217 deletions
src/types/api/billOrder.ts
......@@ -12,8 +12,8 @@ export interface AccountStatementNoteSearchForm {
billNumber?: string
subOrderNumber?: string
shipmentNumber?: string
recNumber?: string
orderNumber?: string
rec_number?: string
order_number?: string
factory_status?: string
erp_status?: string
startTime?: string
......@@ -29,6 +29,7 @@ export interface AccountStatementNote {
pass_num?: number
factory_code?: string
total_amount?: string | number
totalAmount?: string | number
actual_amount?: string | number
num?: number
end_time?: string
......@@ -96,143 +97,143 @@ export interface ItemList {
factory_order_number?: string
}
export interface OrderDetails {
pass_num: number;
num: number;
not_pass_num: number;
erp_order_number: string | null;
product_total_amount: number;
carriage_total_amount: number;
craft_total_price: number;
info_id: number;
template_total_price: number;
id: number;
order_id: string;
factory_order_number: string;
pass_num: number
num: number
not_pass_num: number
erp_order_number: string | null
product_total_amount: number
carriage_total_amount: number
craft_total_price: number
info_id: number
template_total_price: number
id: number
order_id: string
factory_order_number: string
order: {
receiver_post_code: string;
payment_time: string | null;
actual_amount: number;
adjusted_amount: number;
factory_no: number;
factory_online_id: string | null;
total_product_amount: number | null;
process_number: string;
track_status: number;
id: string;
receiver_country: string;
factory_order_number: string;
prepaid_amount: number;
receiver_province: string;
create_time: string;
weight: number;
product_num: number;
version: number;
finish_time: string;
start_stocking_time: string;
payment_type: string | null;
warehouse_name: string;
total_amount: number;
logistics_way_code: string;
third_order_number: string;
shop_number: string;
express_sheet: string;
status: string;
production_client: string;
statusStr: string;
receiver_city: string;
remark: string | null;
exception_reason: string | null;
platform: string;
update_time: string;
receiver_address2: string;
receiver_address1: string;
receiver_name: string;
tracking_number: string;
product_amount: number;
carriage_amount: number | null;
pay_freight: number;
logistics_way_name: string;
factory_code: string;
receiver_district: string | null;
temu_logistics_way_id: string | null;
logistics_way_id: number;
user_mark: string;
namespace: string;
receiver_phone: string;
exception_handling: number;
shipment_type: number;
warehouse_id: number;
};
receiver_post_code: string
payment_time: string | null
actual_amount: number
adjusted_amount: number
factory_no: number
factory_online_id: string | null
total_product_amount: number | null
process_number: string
track_status: number
id: string
receiver_country: string
factory_order_number: string
prepaid_amount: number
receiver_province: string
create_time: string
weight: number
product_num: number
version: number
finish_time: string
start_stocking_time: string
payment_type: string | null
warehouse_name: string
total_amount: number
logistics_way_code: string
third_order_number: string
shop_number: string
express_sheet: string
status: string
production_client: string
statusStr: string
receiver_city: string
remark: string | null
exception_reason: string | null
platform: string
update_time: string
receiver_address2: string
receiver_address1: string
receiver_name: string
tracking_number: string
product_amount: number
carriage_amount: number | null
pay_freight: number
logistics_way_name: string
factory_code: string
receiver_district: string | null
temu_logistics_way_id: string | null
logistics_way_id: number
user_mark: string
namespace: string
receiver_phone: string
exception_handling: number
shipment_type: number
warehouse_id: number
}
}
export interface ProductDetails {
diy_id: string;
diy_bianma: string;
base_sku: string;
sub_order_number: string;
price_update_remark: string | null;
price_status: boolean;
template_item_sku: string | null;
product_id: string;
id: number;
shipment_num: number;
product_item_id: string | null;
template_price: number;
diy_id: string
diy_bianma: string
base_sku: string
sub_order_number: string
price_update_remark: string | null
price_status: boolean
template_item_sku: string | null
product_id: string
id: number
shipment_num: number
product_item_id: string | null
template_price: number
product: {
diy_id: string;
end_product_id: string;
category_name: string;
craft_name: string;
base_sku: string;
num: number;
is_production: boolean;
pick_finish: number;
remark: string | null;
product_price: number;
third_stock_sku: string | null;
customized_quantity: number;
template_price: number;
tag_ids: string | null;
create_time: string;
third_sub_order_number: string;
factory_sub_order_number: string;
variant_image: string;
craft_code: string;
pass_num: number;
factory_code: string;
pay_amount: number;
weight: number;
is_replenishment: number;
image_ary: Array<{ title: string; url: string }>;
diy_id: string
end_product_id: string
category_name: string
craft_name: string
base_sku: string
num: number
is_production: boolean
pick_finish: number
remark: string | null
product_price: number
third_stock_sku: string | null
customized_quantity: number
template_price: number
tag_ids: string | null
create_time: string
third_sub_order_number: string
factory_sub_order_number: string
variant_image: string
craft_code: string
pass_num: number
factory_code: string
pay_amount: number
weight: number
is_replenishment: number
image_ary: Array<{ title: string; url: string }>
design_images: Array<{
imageUrl: string;
fileUrl: string;
id: string;
title: string;
materialId: string;
materialImage: string;
}>;
not_pass_num: number;
version: number;
supplier_product_no: string | null;
pod_jomall_order_us_id: string;
craft_price: number;
customs_value: number;
variant_sku: string;
batch_arrange_number: string;
trim_design_images: string | null;
};
product_item_sku: string | null;
item_id: number;
variant_image: string;
pass_num: number;
not_pass_num: number | null;
craft_price: number;
price_update_time: string | null;
variant_sku: string;
info_id: number;
shop_number: string;
template_item_id: string | null;
order_id: string;
imageUrl: string
fileUrl: string
id: string
title: string
materialId: string
materialImage: string
}>
not_pass_num: number
version: number
supplier_product_no: string | null
pod_jomall_order_us_id: string
craft_price: number
customs_value: number
variant_sku: string
batch_arrange_number: string
trim_design_images: string | null
}
product_item_sku: string | null
item_id: number
variant_image: string
pass_num: number
not_pass_num: number | null
craft_price: number
price_update_time: string | null
variant_sku: string
info_id: number
shop_number: string
template_item_id: string | null
order_id: string
}
export interface ConfirmOrderForm {
......
src/types/api/deliveryNote.ts
......@@ -189,55 +189,55 @@ export interface DbFactory {
}
export interface IDetailData {
statusStr?: string;
id: string;
erp_id?: string;
namespace?: string;
dbFactory?: DbFactory | null;
factory?: DbFactory | null;
productList?: Product[];
order_number?: string;
factory_order_number?: string;
erp_order_number?: string;
third_order_number?: string;
shop_number?: string;
product_num?: string | number;
start_stocking_time?: string;
finish_time?: string;
delivery_type?: string;
logistics_way_name?: string;
lanshou_name?: string;
receiver_name?: string;
lanshou_phone?: string;
receiver_phone?: string;
lanshou_region?: string;
receiver_province?: string;
lanshou_address?: string;
receiver_city?: string;
receiver_district?: string;
receiver_address1?: string;
lanshou_post?: string;
receiver_post_code?: string;
user_mark?: string;
statusStr?: string
id: string
erp_id?: string
namespace?: string
dbFactory?: DbFactory | null
factory?: DbFactory | null
productList?: Product[]
order_number?: string
factory_order_number?: string
erp_order_number?: string
third_order_number?: string
shop_number?: string
product_num?: string | number
start_stocking_time?: string
finish_time?: string
delivery_type?: string
logistics_way_name?: string
lanshou_name?: string
receiver_name?: string
lanshou_phone?: string
receiver_phone?: string
lanshou_region?: string
receiver_province?: string
lanshou_address?: string
receiver_city?: string
receiver_district?: string
receiver_address1?: string
lanshou_post?: string
receiver_post_code?: string
user_mark?: string
price?: number
customized_quantityStr?: string
product_price?:string
customized_quantity:number
image_ary?:string | null
[propName: string]: string | number | boolean | undefined | unknown;
product_price?: string
customized_quantity: number
image_ary?: string | null
[propName: string]: string | number | boolean | undefined | unknown
}
export interface PodUsDetailData {
id: number
erp_id?: string;
price?: number;
customized_quantityStr?: string;
product_price?: number;
erp_id?: string
price?: number
customized_quantityStr?: string
product_price?: number
// 其他已有属性...
customized_quantity: number; // 添加缺失属性
image_ary?: string | null; // 添加缺失属性
productList:IDetailData[]
[propName: string]: string | number | boolean | undefined | unknown;
customized_quantity: number // 添加缺失属性
image_ary?: string | null // 添加缺失属性
productList: IDetailData[]
[propName: string]: string | number | boolean | undefined | unknown
}
export interface LogListsData {
id: number
......@@ -259,17 +259,18 @@ export interface LogListData {
employee_account?: string
}
export interface DetailForm {
shop_number?: string
billNumber?: string
orderNumber?: string
craftCode?: string
baseSku?: string
shipmentNumber?: string
order_number?: string
craft_code?: string
base_sku?: string
shipment_number?: string
process?: string
supplierItemNo?: string
dateRange?: string[]
endTime?: string
startTime?: string
subOrderNumber?: string
sub_order_number?: string
rows?: number
page?: number
currentPage?: number
......
src/views/podUsBillOrder/index.vue
......@@ -50,7 +50,7 @@
</ElFormItem>
<ElFormItem style="margin-right: 10px" label="对账单号">
<ElInput
v-model="searchForm.recNumber"
v-model="searchForm.rec_number"
clearable
placeholder="对账单号"
style="width: 160px"
......@@ -58,7 +58,7 @@
</ElFormItem>
<ElFormItem style="margin-right: 10px" label="订单号">
<ElInput
v-model="searchForm.orderNumber"
v-model="searchForm.order_number"
clearable
placeholder="订单号"
style="width: 160px"
......@@ -139,6 +139,14 @@
</template>
</el-table-column>
<el-table-column
:label="'工厂编码'"
prop="name"
header-align="center"
align="center"
width="100"
show-overflow-tooltip
></el-table-column>
<!-- <el-table-column
label="底胚总价($)"
header-align="center"
prop="product_total_amount"
......@@ -146,7 +154,7 @@
align="center"
show-overflow-tooltip
>
</el-table-column>
</el-table-column> -->
<el-table-column
label="总发货(件)"
header-align="center"
......@@ -156,6 +164,15 @@
show-overflow-tooltip
>
</el-table-column>
<!-- <el-table-column
label="成本总价($)"
header-align="center"
prop="template_total_price"
width="110"
align="center"
show-overflow-tooltip
>
</el-table-column> -->
<el-table-column
label="工艺总价($)"
header-align="center"
......@@ -183,9 +200,19 @@
show-overflow-tooltip
></el-table-column>
<el-table-column
label="付款类型"
header-align="center"
prop="actual_amount"
width="110"
align="center"
show-overflow-tooltip
>
<template #default> US账户 </template>
</el-table-column>
<el-table-column
label="应付金额($)"
header-align="center"
prop="total_amount"
prop="totalAmount"
width="130"
align="center"
show-overflow-tooltip
......@@ -199,14 +226,14 @@
align="center"
show-overflow-tooltip
></el-table-column>
<el-table-column
<!-- <el-table-column
label="已付金额($)"
header-align="center"
prop="total_amount_str"
width="130"
align="center"
show-overflow-tooltip
></el-table-column>
></el-table-column> -->
<el-table-column
label="水单"
header-align="center"
......@@ -220,10 +247,7 @@
style="display: flex; gap: 2px; align-items: center"
>
<div
v-for="item in (typeof row.water_list === 'string'
? row.water_list
: ''
).split(',')"
v-for="item in row.water_list.split(',')"
:key="item"
style="width: 30px"
>
......@@ -281,31 +305,34 @@
<el-form :model="detailForm" inline>
<el-form-item label="生产单号">
<el-input
v-model="detailForm.subOrderNumber"
placeholder="请输入订单号"
v-model="detailForm.sub_order_number"
placeholder="请输入生产单号"
clearable
style="width: 130px"
/>
</el-form-item>
<el-form-item label="底胚Sku">
<el-form-item label="工艺编码">
<el-input
v-model="detailForm.baseSku"
placeholder="请输入底胚Sku"
v-model="detailForm.craft_code"
placeholder="请输入工艺编码"
clearable
style="width: 130px"
/>
</el-form-item>
<el-form-item label="工艺编码">
<el-form-item label="底胚Sku">
<el-input
v-model="detailForm.craftCode"
placeholder="请输入工艺编码"
v-model="detailForm.base_sku"
placeholder="请输入底胚Sku"
clearable
style="width: 130px"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="searchDetail"
<el-button
:disabled="!currentRow?.id"
type="primary"
@click="searchDetail"
>查询
</el-button>
</el-form-item>
......@@ -421,7 +448,7 @@
<el-table-column
show-overflow-tooltip
label="产品价格($)"
width="100"
width="130"
align="center"
prop="product_price"
>
......@@ -434,14 +461,14 @@
<el-table-column
show-overflow-tooltip
label="底胚价格($)"
width="100"
width="130"
align="center"
prop="template_price"
></el-table-column>
<el-table-column
show-overflow-tooltip
label="工艺价格($)"
width="100"
width="130"
align="center"
prop="craft_price"
></el-table-column>
......@@ -507,25 +534,27 @@
</el-tab-pane>
<el-tab-pane name="1" label="订单详情">
<el-form :model="orderForm" inline>
<el-form-item label="订单号">
<el-form-item label="店铺单号" label-width="80px">
<el-input
v-model="orderForm.orderNumber"
placeholder="请输入订单号"
v-model="orderForm.shop_number"
placeholder="请输入店铺单号"
clearable
style="width: 130px"
style="width: 200px"
/>
</el-form-item>
<el-form-item label="生产单号">
<el-form-item label="订单号" label-width="60px">
<el-input
v-model="orderForm.subOrderNumber"
v-model="orderForm.order_number"
placeholder="请输入订单号"
clearable
style="width: 130px"
style="width: 200px"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getUsOrderList"
<el-button
:disabled="!currentRow?.id"
type="primary"
@click="getUsOrderList"
>查询
</el-button>
</el-form-item>
......@@ -642,29 +671,61 @@
show-overflow-tooltip
/>
<el-table-column
label="预收运费($)"
prop="order.prepaid_amount"
header-align="center"
align="center"
min-width="120"
show-overflow-tooltip
/>
<el-table-column
label="实际运费($)"
prop="order.actual_amount"
header-align="center"
align="center"
min-width="120"
show-overflow-tooltip
/>
<el-table-column
label="调整运费($)"
prop="order.adjusted_amount"
header-align="center"
align="center"
min-width="120"
show-overflow-tooltip
/>
<el-table-column
label="运费总价($)"
prop="carriage_total_amount"
header-align="center"
align="center"
min-width="120"
show-overflow-tooltip
/>
<!-- <el-table-column
label="运费($)"
prop="order.pay_freight"
header-align="center"
align="center"
min-width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
></el-table-column> -->
<!-- <el-table-column
label="物流总价($)"
prop="carriage_total_amount"
header-align="center"
align="center"
min-width="120"
show-overflow-tooltip
/>
<el-table-column
/> -->
<!-- <el-table-column
label="实付金额($)"
prop="order.actual_amount"
header-align="center"
align="center"
min-width="120"
show-overflow-tooltip
/>
/> -->
<el-table-column
label="完成时间"
prop="order.finish_time"
......@@ -1136,11 +1197,20 @@ watch(
() => tableData.value,
() => {
;(tableData.value as AccountStatementNote[]).forEach((item) => {
item.totalAmount = amountPayable(item)
item.total_amount = computedPrice(item)
})
},
{ immediate: true, deep: true },
)
const amountPayable = (row: AccountStatementNote) => {
const totalAmount = new BigNumber(row.product_total_amount as number).plus(
new BigNumber(row.carriage_total_amount || 0),
)
return totalAmount.toString()
}
const reset = () => {
dateRange.value = []
resetSearchForm()
......
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