修改退款审核、订单详情等页面显示

src/views/yunxinwei/order/index.vue

@@ -23,6 +23,11 @@
             />
           </template>
           <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'restDay'">
+                <strong v-if="record.restDay < 0" :style="{ color: 'red' }">{{ record.restDay }}</strong>
+                <span v-else-if="record.restDay >= 0">{{ record.restDay }}</span>
+                <span> 天</span>
+            </template>
             <template v-if="column.key === 'merchantName'">
               <div style="display: flex; flex-direction: column">
                 <span>{{ record.merchantName }}</span>
@@ -84,34 +89,23 @@
               <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
-                >
+                <a-tag v-else-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
-                >
+                <a-tag v-else-if="record.receiptStatus === 20" color="success">已收货</a-tag>
+                <a-tag v-else-if="record.receiptStatus === 21" color="purple">退租中</a-tag>
+                <a-tag v-else-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
                 >
-                <a-tag v-else-if="record.expirationDay < 0" color="error"
-                  >逾期{{ record.expirationDay }}天</a-tag
-                >
-                <a-tag v-else-if="record.expirationDay >= 0" color="warning"
-                  >剩余{{ record.expirationDay }}天</a-tag
-                >
+                <!-- <a-tag v-else-if="record.expirationDay < 0" color="error">逾期{{ record.expirationDay }}天</a-tag> -->
+                <!-- <a-tag v-else-if="record.expirationDay >= 0" color="warning">剩余{{ record.expirationDay }}天</a-tag> -->
               </div>
             </template>
             <template v-if="column.key === 'comments'">
@@ -175,13 +169,19 @@
             </template>
             <template v-if="column.key === 'action'">
               <a-space>
-                <a-button @click="openInfo(record)">详情</a-button>
+                <a-button class="ele-text-primary" @click="openInfo(record)">详情</a-button>
               </a-space>
+              <view v-if="record.deliveryStatus == 40">
+                <a-divider type="vertical" />
+                <a-button class="ele-text-danger" @click="openChange(record)">换电</a-button>
+              </view>
+
             </template>
           </template>
         </ele-pro-table>
       </a-card>
     </div>
+    <battery-change v-model:visible="showChange" :data="current" @done="reload"/>
     <!-- 编辑弹窗 -->
     <Delivery v-model:visible="deliveryEdit" :data="current" @done="reload" />
     <Markdown
@@ -227,10 +227,12 @@
   import Markdown from './components/markdown.vue';
   import Field from './components/field.vue';
   import OrderInfo from './components/order-info.vue';
+  import BatteryChange from './components/battery-change.vue';
   import { pageOrder, removeOrder, removeBatchOrder } from '@/api/order';
   import { alipayQuery } from '@/api/system/payment';
   import type { Order, OrderParam } from '@/api/order/model';
   import { getDictionaryOptions } from '@/utils/common';
+  import { Equipment } from "@/api/apps/equipment/model";
 
   // 当前用户信息
   // const userStore = useUserStore();
@@ -307,11 +309,11 @@
       sorter: true
     },
     {
-      title: '逾期天数',
-      dataIndex: 'expirationDay',
-      key: 'expirationDay',
+      title: '剩余天数',
+      dataIndex: 'restDay',
+      key: 'restDay',
       align: 'center',
-      sorter: true
+      sorter: false
     },
     {
       title: '买家',
@@ -360,6 +362,32 @@
     //   dataIndex: 'orderSourceData',
     //   key: 'orderSourceData'
     // },
+    {
+      title: '推荐人手机号',
+      key: 'dealerPhone',
+      dataIndex: 'dealerPhone',
+      ellipsis: true
+    },
+    {
+      title: '收货人手机号',
+      key: 'receiptPhone',
+      dataIndex: 'receiptPhone'
+    },
+    {
+      title: '紧急联系人',
+      key: 'emergentUser',
+      dataIndex: 'emergentUser'
+    },
+    {
+      title: '单位地址',
+      key: 'officeAddress',
+      dataIndex: 'officeAddress'
+    },
+    {
+      title: '家庭地址',
+      key: 'homeAddress',
+      dataIndex: 'homeAddress'
+    },
     {
       title: '配送方式',
       key: 'deliveryType',
@@ -377,6 +405,7 @@
       ],
       filterMultiple: false
     },
+    
     {
       title: '创建时间',
       dataIndex: 'createTime',
@@ -412,6 +441,8 @@
   const showInfo = ref(false);
   // 是否显示编辑弹窗
   const showEdit = ref(false);
+  // 是否显示换电弹窗
+  const showChange = ref(false);
   const markdown = ref('请输入备注内容');
   const content = ref('请输入要修改的内容');
   const showMarkdown = ref(false);
@@ -490,6 +521,12 @@
     showInfo.value = true;
   };
 
+  /* 打开换电弹窗 */
+  const openChange = (row?: Order) => {
+    current.value = row ?? null;
+    showChange.value = true;
+  };
+
   /* 打开高级搜索 */
   const openAdvanced = () => {
     showAdvancedSearch.value = !showAdvancedSearch.value;