Skip to content

F
factory_front
Commit e2438fa4 by zhuzhequan
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !78
parents 9149ef8b 7f59d288
Showing with 33 additions and 16 deletions
src/types/api/billOrder.ts
...@@ -47,6 +47,10 @@ export interface AccountStatementNote { ...@@ -47,6 +47,10 @@ export interface AccountStatementNote {
factory_code?: string factory_code?: string
total_amount?: string | number total_amount?: string | number
totalAmount?: string | number totalAmount?: string | number
order?:{
total_amount?:string
adjusted_amount?:string
};
actual_amount?: string | number actual_amount?: string | number
num?: number num?: number
end_time?: string end_time?: string
......
src/views/podUsBillOrder/index.vue
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<template #top> <template #top>
<div class="header-filter-form"> <div class="header-filter-form">
<ElForm :model="searchForm" inline> <ElForm :model="searchForm" inline>
<ElFormItem label="账期(发货时间)"> <ElFormItem label="账期(创建时间)">
<div style="display: flex"> <div style="display: flex">
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
...@@ -71,21 +71,21 @@ ...@@ -71,21 +71,21 @@
<ElFormItem> <ElFormItem>
<ElButton @click="reset">重置</ElButton> <ElButton @click="reset">重置</ElButton>
</ElFormItem> </ElFormItem>
<ElFormItem v-if="nodeId === 15"> <!-- <ElFormItem v-if="nodeId === 10">-->
<el-button type="warning" @click="rejectOrder"> <!-- <el-button type="warning" @click="rejectOrder">-->
驳回 <!-- 驳回-->
</el-button> <!-- </el-button>-->
</ElFormItem> <!-- </ElFormItem>-->
<ElFormItem> <ElFormItem>
<el-button type="success" @click="exportExcel"> <el-button type="success" @click="exportExcel">
导出 导出
</el-button> </el-button>
</ElFormItem> </ElFormItem>
<ElFormItem v-if="nodeId === 30"> <!-- <ElFormItem v-if="nodeId === 10">-->
<el-button type="danger" @click="auditOrder('archive')"> <!-- <el-button type="danger" @click="auditOrder('archive')">-->
归档 <!-- 归档-->
</el-button> <!-- </el-button>-->
</ElFormItem> <!-- </ElFormItem>-->
</ElForm> </ElForm>
</div> </div>
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="账期(发货时间)" label="账期(创建时间)"
header-align="center" header-align="center"
align="center" align="center"
min-width="340" min-width="340"
...@@ -202,7 +202,6 @@ ...@@ -202,7 +202,6 @@
<el-table-column <el-table-column
label="付款类型" label="付款类型"
header-align="center" header-align="center"
prop="actual_amount"
width="110" width="110"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
...@@ -699,6 +698,17 @@ ...@@ -699,6 +698,17 @@
min-width="120" min-width="120"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column
label="已付金额($)"
header-align="center"
align="center"
min-width="120"
show-overflow-tooltip
>
<template #default="{row}">
{{formatPrice(row)}}
</template>
</el-table-column>
<!-- <el-table-column <!-- <el-table-column
label="运费($)" label="运费($)"
prop="order.pay_freight" prop="order.pay_freight"
...@@ -928,7 +938,7 @@ ...@@ -928,7 +938,7 @@
<el-row> <el-row>
<el-col :span="6"> 对账单号：{{ currentRow?.rec_number }}</el-col> <el-col :span="6"> 对账单号：{{ currentRow?.rec_number }}</el-col>
<el-col :span="12"> <el-col :span="12">
账期(发货时间)： {{ currentRow?.start_time }} - 账期(创建时间)： {{ currentRow?.start_time }} -
{{ currentRow?.end_time }} {{ currentRow?.end_time }}
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -1274,7 +1284,10 @@ const tabsClick = async () => { ...@@ -1274,7 +1284,10 @@ const tabsClick = async () => {
await searchDetail() await searchDetail()
} }
} }
const formatPrice = (row:AccountStatementNote) => {
const price = BigNumber(row.order?.total_amount || 0).plus(BigNumber(row.order?.adjusted_amount || 0))
return price.toString()
}
// 删除 // 删除
const handleDelete = async (id: string) => { const handleDelete = async (id: string) => {
await ElMessageBox.confirm('确定要删除吗？', '提示', { await ElMessageBox.confirm('确定要删除吗？', '提示', {
...@@ -1456,7 +1469,7 @@ const submitConfirmOrder = async (type: number) => { ...@@ -1456,7 +1469,7 @@ const submitConfirmOrder = async (type: number) => {
description: auditForm.value.description, description: auditForm.value.description,
pass: 0, pass: 0,
} }
await confirmPodOrderApi(apiPayload) await confirmPodUsOrderApi(apiPayload)
} }
confirmOrderVisible.value = false confirmOrderVisible.value = 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