联动组件优化

2022-07-13 20:15:35 +08:00
parent 33016fca85
commit b8f78eea71
22 changed files with 117 additions and 48 deletions
@@ -9,6 +9,8 @@ import styles  from './index.module.scss'
 type OrderParam = {
    estimate_amount: number, //预估金额
    list: any[], 
+    product_list: any[],
+    quality_check_pass_product: any[],
    sale_mode: number,
    sale_mode_name: string,
    unit: string,
@@ -23,6 +25,9 @@ type OrderParam = {
    total_weight_error_discount: number, //空差优惠
    the_previous_status: number, //取消订单时的订单状态
    actual_amount: number //实付金额
+    quality_check_pass_colors: number, //验布后的颜色总数
+    quality_check_pass_fabrics: number, //验布后的面料数量
+    quality_check_pass_number: number, //验布后的总数量
 }

 type Param = {
@@ -39,15 +44,24 @@ export default memo(({order, comfirm = false}:Param) => {
    const standardPrice = useCallback(price => {
        return formatPriceDiv(price).toLocaleString() + '/' + (order?.sale_mode == 1?'m':'kg')
    }, [order])
-
    //数量格式
    const numText = useMemo(() => {
        if(order) {
-            let total_number = order?.sale_mode == 0?order?.total_number:(order?.total_number/100)
-            return `${order?.total_fabrics}种面料，${order?.total_colors}种颜色，共${total_number}${order?.unit}`
+            if(!order?.quality_check_pass_fabrics&&!order?.quality_check_pass_number&&!order?.quality_check_pass_colors) {
+                let total_number = order?.sale_mode == 0?order?.total_number:(order?.total_number/100)
+                return `${order?.total_fabrics}种面料，${order?.total_colors}种颜色，共${total_number}${order?.unit}`
+            } else {
+                let total_number = order?.sale_mode == 0?order?.quality_check_pass_number:(order?.quality_check_pass_number/100)
+                return `${order?.quality_check_pass_fabrics}种面料，${order?.quality_check_pass_colors}种颜色，共${total_number}${order?.unit}`
+            }   
        }
    }, [order])

+    //获取面料数组
+    const list = useMemo(() => {
+        return order?.quality_check_pass_product.length > 0?order?.quality_check_pass_product:order?.product_list
+    }, [order])
+
    //售后单状态枚举
    const  {
        ReturnStageApplying, // 申请中
@@ -137,7 +151,6 @@ export default memo(({order, comfirm = false}:Param) => {
        } else {
            return priceInfo[key[order?.sale_mode]].includes(order?.stage)
        }
-        
    }, [order])

    const priceConDom = useMemo(() => {
@@ -168,7 +181,7 @@ export default memo(({order, comfirm = false}:Param) => {
            <View className={styles.orders_list_con}>
                <View className={styles.orders_return_title}>{order?.type == 1?'退货信息':'退款信息'}</View>
                {
-                    order?.list?.map(item => {
+                    list?.map(item => {
                        return <View key={item.product_code} className={styles.order_list}>
                            <View className={styles.order_list_title}>
                                <View className={styles.tag}>{order.sale_mode_name}</View>
@@ -52,8 +52,13 @@ import styles  from './index.module.scss'
            total_colors: orderDetail.total_colors, //总颜色数量
            total_number: orderDetail.total_number, //总数量
            total_fabrics: orderDetail.total_fabrics, //面料数量
+            quality_check_pass_colors: orderDetail.quality_check_pass_colors, //验布后的颜色总数
+            quality_check_pass_fabrics: orderDetail.quality_check_pass_fabrics, //验布后的面料数量
+            quality_check_pass_number: orderDetail.quality_check_pass_number, //验布后的总数量
            unit: orderDetail.sale_mode == 0?'条':'m', //单位
-            list: orderDetail.quality_check_pass_product,
+            // list: orderDetail.quality_check_pass_product.length > 0?orderDetail.quality_check_pass_product:orderDetail.product_list,
+            product_list: orderDetail.product_list,
+            quality_check_pass_product: orderDetail.quality_check_pass_product,
            stage: orderDetail.stage, //订单状态
            type: orderDetail.type, //退货or退款
            total_sale_price: orderDetail.total_sale_price, //销售金额