1

src/views/yunxinwei/order/index.vue

@@ -73,7 +73,7 @@
             </template>
             <template v-if="column.key === 'payStatus'">
               <div class="ele-text-placeholder">
-                付款状态：
+                <!--                付款状态：-->
                 <a-tag
                   v-if="record.payStatus === 10"
                   @click="onAlipayQuery(record.orderId)"
@@ -84,24 +84,27 @@
                 >
               </div>
               <div class="ele-text-placeholder">
-                发货状态：
+                <!--                发货状态：-->
                 <a-tag v-if="record.deliveryStatus === 10">未发货</a-tag>
                 <a-tag v-if="record.deliveryStatus === 20" color="success"
                   >已发货</a-tag
                 >
               </div>
               <div class="ele-text-placeholder">
-                收货状态：
+                <!--                收货状态：-->
                 <a-tag v-if="record.receiptStatus === 10">未收货</a-tag>
                 <a-tag v-if="record.receiptStatus === 20" color="success"
                   >已收货</a-tag
                 >
+                <a-tag v-if="record.receiptStatus === 21" color="purple"
+                  >退租中</a-tag
+                >
                 <a-tag v-if="record.receiptStatus === 30" color="error"
                   >已退租</a-tag
                 >
               </div>
               <div class="ele-text-placeholder" v-if="record.orderSource != 10">
-                分期状态：
+                <!--                分期状态：-->
                 <a-tag v-if="record.fenqiStatus == 1" color="success"
                   >已完成</a-tag
                 >
@@ -163,6 +166,12 @@
             <template v-if="column.key === 'nickname'">
               <User :record="record" />
             </template>
+            <template v-if="column.key === 'batteryModel'">
+              {{ record.equipmentGoods.batteryModel }}
+            </template>
+            <template v-if="column.key === 'equipmentCode'">
+              {{ record.equipment?.equipmentCode }}
+            </template>
             <template v-if="column.key === 'createTime'">
               {{ record.createTime }}
             </template>
@@ -261,8 +270,8 @@
     },
     {
       title: '订单号',
-      dataIndex: 'orderId',
-      key: 'orderId',
+      dataIndex: 'orderNo',
+      key: 'orderNo',
       sorter: true
     },
     {
@@ -270,6 +279,16 @@
       dataIndex: 'goodsId',
       key: 'goodsId'
     },
+    {
+      title: '电池型号',
+      dataIndex: 'batteryModel',
+      key: 'batteryModel'
+    },
+    {
+      title: '电池编号',
+      dataIndex: 'equipmentCode',
+      key: 'equipmentCode'
+    },
     {
       title: '所属商户',
       dataIndex: 'merchantName',
@@ -419,6 +438,7 @@
     }
     where.tenantId = localStorage.getItem('tenantId');
     where.isRenew = 0;
+    where.isFreeze = 1;
     return pageOrder({
       ...where,
       ...orders,