From cd8588a021bfc5b9ee0f18eb3cc952278c7ddd56 Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Sun, 15 Sep 2024 18:31:35 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=87=8C=E9=9D=A2=EF=BC=8C=E5=AD=A6=E8=B4=B9=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C=E6=9C=9F=E6=95=B0=E5=80=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/order/model/index.ts                  |  4 ++
 .../yunxinwei/order/components/order-info.vue | 46 +++++++++++--------
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/api/order/model/index.ts b/src/api/order/model/index.ts
index c4ebe1c..4cdbb5f 100644
--- a/src/api/order/model/index.ts
+++ b/src/api/order/model/index.ts
@@ -80,6 +80,8 @@ export interface Order {
   address?: string;
   //是否申请退租，1为申请，2为取消
   isRefund?:number;
+
+  currPeriods?:number;//当前期数
 }
 
 export interface OrderPay {
@@ -113,6 +115,8 @@ export interface OrderPay {
 
   //关联订单（即内部订单）
   rentOrderNo?:string;
+
+  currPeriods?:number;//当前期数
 }
 
 
diff --git a/src/views/yunxinwei/order/components/order-info.vue b/src/views/yunxinwei/order/components/order-info.vue
index 6773e8a..ec2457d 100644
--- a/src/views/yunxinwei/order/components/order-info.vue
+++ b/src/views/yunxinwei/order/components/order-info.vue
@@ -313,6 +313,16 @@
                 >续费该设备</a-button>
               </view>
             </template>
+
+            <template v-if="column.key === 'currPeriods'">
+              <view v-if="record.orderSource === 10" >
+                <span>一次性购买</span>
+              </view>
+              <view v-else>
+                <span>第{{ record.currPeriods }}期</span>
+              </view>
+            </template>
+
           </template>
 
         </a-table>
@@ -571,24 +581,24 @@ const tableRef2 = ref<InstanceType<typeof EleProTable> | null>(null);
 const columns2 = ref<ColumnItem[]>([
   {
     title: '当前期数',
-    dataIndex: 'index',
-    key: 'index',
-    customRender: ({index}) => {
-      console.log({...order});
-
-      if (props.data.orderSource == 20) {
-        if (index == 0) {
-          return '首期';
-        } else {
-          return '第' + index + '期';
-        }
-      } else if (props.data.orderSource == 30 || props.data.orderSource == 40) {
-        return '第' + (index + 1) + '期';
-      } else if (props.data.orderSource == 10) {
-        return '一次性购买';
-      }
-
-    }
+    dataIndex: 'currPeriods',
+    key: 'currPeriods'
+    // customRender: ({currPeriods}) => {
+    //   console.log({...order});
+    //
+    //   if (props.data.orderSource == 20) {
+    //     if (currPeriods == 0) {
+    //       return '首期';
+    //     } else {
+    //       return '第' + currPeriods + '期';
+    //     }
+    //   } else if (props.data.orderSource == 30 || props.data.orderSource == 40) {
+    //     return '第' + (currPeriods + 1) + '期';
+    //   } else if (props.data.orderSource == 10) {
+    //     return '一次性购买';
+    //   }
+    //
+    // }
   },
   {
     title: '订单号',