fix(cas): 厂家索赔提报和确认，配件数量展示优化

杜志良
1 parent 0a450031
Showing 6 changed files with 49 additions and 8 deletions
src/pages/cas/ClaimConfirmation/components/DetailModal.tsx
src/pages/cas/ClaimConfirmation/components/SpecialFeeConfirm.tsx
src/pages/cas/ClaimFiling/api.ts
src/pages/cas/ClaimFiling/components/DetailModal.tsx
src/pages/cas/ClaimFiling/components/SpecialFeeSubmit.tsx
src/pages/cas/utils.ts
@@ -131,7 +131,7 @@ export default function DetailMOdal({ current, visible, setVisible, setLoading: 
       dataIndex: 'partCnt',
       title: '配件数量',
       align: 'center',
-      render: (partCnt: number, record: any) => formatPartCnt(record.divisionRate, partCnt, record.capacity),
+      render: (partCnt: number, record: any) => formatPartCnt(record.divisionRate, partCnt, record.capacity, record.oilUnit),
     },
     {
       dataIndex: 'partCode',
@@ -108,7 +108,7 @@ export default function SpecialFeeDetail({ current, visible, setVisible, setLoad
     {
       dataIndex: 'partCnt',
       title: '配件数量',
-      render: (partCnt: number, record: any) => formatPartCnt(record.divisionRate, partCnt, record.capacity),
+      render: (partCnt: number, record: any) => formatPartCnt(record.divisionRate, partCnt, record.capacity, record.oilUnit),
     },
     {
       dataIndex: 'unitPrice',
@@ -41,6 +41,10 @@ export interface Parts {
   unitPrice: number; //配件单价
   partCnt: number; //配件数量
   totalPrice: number; //配件总价
+  divisionRate?: 1 | 100; // 机油出库方式
+  capacity?: number; // 容量
+  oilUnit?: string; // 容量单位
+  unit?: string; // 单位
 }
  
 export interface Items {
@@ -47,7 +47,7 @@ export default function DetailMOdal({ current, visible, setVisible, setLoading: 
  
   // let position = 0; // 表格合并的位置,哪一行需要展示
   // let workposition = 0;
-  const optRecordsColums: ColumnsType<any> = [
+  const optRecordsColums: ColumnsType<Detail> = [
     {
       dataIndex: 'itemName',
       title: '作业项',
@@ -98,7 +98,7 @@ export default function DetailMOdal({ current, visible, setVisible, setLoading: 
       dataIndex: 'partCnt',
       title: '配件数量',
       align: 'center',
-      render: (partCnt: number, record: any) => formatPartCnt(record.divisionRate, partCnt, record.capacity),
+      render: (partCnt: number, record: Parts) => formatPartCnt(record.divisionRate, partCnt, record.capacity, record.oilUnit),
     },
     {
       dataIndex: 'partCode',
@@ -278,6 +278,8 @@ export default function DetailMOdal({ current, visible, setVisible, setLoading: 
       });
   }
  
+  console.log('log=>optRecords', optRecords);
+
   return (
     <Modal
       title="厂家索赔提报"
@@ -12,7 +12,7 @@ import { formatPartCnt } from &#39;@/pages/cas/utils&#39;;
  
 import { getUnitCompanyListApi } from '@/common/api';
 import { getSpecialFeeDetail, SpecialFee, SpecialItem } from '@/pages/cas/ClaimConfirmation/api';
-import { authToShopApi, saveApi } from '../api';
+import {authToShopApi, Parts, saveApi} from '../api';
  
 import st from '../style.less';
  
@@ -173,7 +173,7 @@ export default function DetailMOdal({ current, visible, setVisible, setLoading: 
       dataIndex: 'partCnt',
       title: '配件数量',
       align: 'center',
-      render: (partCnt: number, record: any) => formatPartCnt(record.divisionRate, partCnt, record.capacity),
+      render: (partCnt: number, record: Parts) => formatPartCnt(record.divisionRate, partCnt, record.capacity, record.oilUnit),
     },
     {
       dataIndex: 'partCode',
@@ -39,9 +39,10 @@ export function calculateOilUnit(type: OilOutType, partCnt: number, capacity?: n
  *
  * @param rate 1：capacity 不为空，按桶、否则为配件数量，100：机油按升计算
  * @param partCnt
- * @param capacity
+ * @param capacity 容量
+ * @param capacityUnit 容量单位
  */
-export function formatPartCnt(rate: 1 | 100 = 1, partCnt: number, capacity?: number) {
+export function formatPartCnt(rate: 1 | 100 = 1, partCnt: number, capacity?: number, capacityUnit?: string) {
   // 1. 按桶计算
   if (rate === 1) {
     // 有容量，展示为桶
@@ -60,6 +61,10 @@ export function formatPartCnt(rate: 1 | 100 = 1, partCnt: number, capacity?: num
       }
       return `${partCnt}${OilOutTypeName[1]}`;
     }
+    // 有容量单位，则展示对应单位，否则走后面逻辑，按通/L展示
+    if (capacityUnit) {
+      return `${partCnt / 100}${capacityUnit}`;
+    }
     // 按升出库，机油用量转换为 L
     const perAmount = currency(partCnt).divide(100).value;
     // 使用量小于容量: 展示 x L
@@ -75,3 +80,33 @@ export function formatPartCnt(rate: 1 | 100 = 1, partCnt: number, capacity?: num
     return `${partCnt / 100}${OilOutTypeName[2]} (${currency(currency(perAmount).subtract(remain).value).divide(capacity).value}桶 + ${remain}L)`;
   }
 }
+
+/**
+ * 格式化配件价格单位
+ * @param rate
+ * @param capacity
+ * @param capacityUnit
+ * @param unit (后期若需要展示对应配件单位时再做处理)
+ */
+export function formatPriceUnit(rate: 1 | 100 = 1, capacity?: number, capacityUnit?: string, unit?: string) {
+  if (rate === 1) {
+    if (capacity && capacity > 0) {
+      return '元/桶';
+    }
+    return '元';
+  }
+  if (rate === 100 && capacityUnit) {
+    return `元/${capacityUnit}`;
+  }
+  return '元/L'; // unit
+}
+
+/**
+ * 格式化普通配件容量及单位
+ * @param capacity 容量
+ * @param oilUnit 容量单位
+ * @param unit 配件单位
+ */
+export function formatCommonPartCapacity(capacity?: number, oilUnit?: string, unit?: string) {
+  return `${capacity}${oilUnit || ''}/${unit || ''}`;
+}