对账单功能开发

src/types/api/billOrder.ts

@@ -47,6 +47,10 @@ export interface AccountStatementNote {
   factory_code?: string
   total_amount?: string | number
   totalAmount?: string | number
+  order?:{
+    total_amount?:string
+    adjusted_amount?:string
+  };
   actual_amount?: string | number
   num?: number
   end_time?: string

src/views/podUsBillOrder/index.vue

@@ -29,7 +29,7 @@
           <template #top>
             <div class="header-filter-form">
               <ElForm :model="searchForm" inline>
-                <ElFormItem label="账期(发货时间)">
+                <ElFormItem label="账期(创建时间)">
                   <div style="display: flex">
                     <el-date-picker
                       v-model="dateRange"
@@ -71,21 +71,21 @@
                 <ElFormItem>
                   <ElButton @click="reset">重置</ElButton>
                 </ElFormItem>
-                <ElFormItem v-if="nodeId === 15">
-                  <el-button type="warning" @click="rejectOrder">
-                    驳回
-                  </el-button>
-                </ElFormItem>
+<!--                <ElFormItem v-if="nodeId === 10">-->
+<!--                  <el-button type="warning" @click="rejectOrder">-->
+<!--                    驳回-->
+<!--                  </el-button>-->
+<!--                </ElFormItem>-->
                 <ElFormItem>
                   <el-button type="success" @click="exportExcel">
                     导出
                   </el-button>
                 </ElFormItem>
-                <ElFormItem v-if="nodeId === 30">
-                  <el-button type="danger" @click="auditOrder('archive')">
-                    归档
-                  </el-button>
-                </ElFormItem>
+<!--                <ElFormItem v-if="nodeId === 10">-->
+<!--                  <el-button type="danger" @click="auditOrder('archive')">-->
+<!--                    归档-->
+<!--                  </el-button>-->
+<!--                </ElFormItem>-->
               </ElForm>
             </div>
 
@@ -129,7 +129,7 @@
                     show-overflow-tooltip
                   ></el-table-column>
                   <el-table-column
-                    label="账期(发货时间)"
+                    label="账期(创建时间)"
                     header-align="center"
                     align="center"
                     min-width="340"
@@ -202,7 +202,6 @@
                   <el-table-column
                     label="付款类型"
                     header-align="center"
-                    prop="actual_amount"
                     width="110"
                     align="center"
                     show-overflow-tooltip
@@ -699,6 +698,17 @@
                       min-width="120"
                       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
                       label="运费($)"
                       prop="order.pay_freight"
@@ -928,7 +938,7 @@
     <el-row>
       <el-col :span="6"> 对账单号：{{ currentRow?.rec_number }}</el-col>
       <el-col :span="12">
-        账期(发货时间)： {{ currentRow?.start_time }} -
+        账期(创建时间)： {{ currentRow?.start_time }} -
         {{ currentRow?.end_time }}
       </el-col>
       <el-col :span="6">
@@ -1274,7 +1284,10 @@ const tabsClick = async () => {
     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) => {
   await ElMessageBox.confirm('确定要删除吗？', '提示', {
@@ -1456,7 +1469,7 @@ const submitConfirmOrder = async (type: number) => {
       description: auditForm.value.description,
       pass: 0,
     }
-    await confirmPodOrderApi(apiPayload)
+    await confirmPodUsOrderApi(apiPayload)
   }
 
   confirmOrderVisible.value = false