e 5 лет назад
Родитель
Сommit
1be0e0b315

+ 1 - 1
src/views/order/list.vue

@@ -131,7 +131,7 @@
         </template>
       </el-table-column>
       <el-table-column align="center" label="下单时间" prop="orderTime">
-        <template slot-scope="{row}">
+        <template v-if="row.orderTime" slot-scope="{row}">
           <i class="el-icon-time" />
           <span>{{ row.orderTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
         </template>

+ 3 - 3
src/views/order/refund-detail.vue

@@ -11,7 +11,7 @@
     <el-card v-for="refund in refundList" :key="refund.orderID" class="box-card">
       <el-row :gutter="24" class="box-row">
         <el-col :span="6"><b>退款编号:</b> {{ refund.returnedNo }}</el-col>
-        <el-col :span="6"><b>申请时间:</b> {{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</el-col>
+        <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
         <el-col :span="6"><b>申请金额:</b> ¥{{ refund.refundFee | toThousandFilter }}</el-col>
         <el-col :span="6"><b>退款状态:</b>
           <el-tag v-if="refund.status*1===1" type="warning" size="small">待审核</el-tag>
@@ -56,7 +56,7 @@
     <el-card v-if="order" class="box-card">
       <el-row :gutter="24" class="box-row">
         <el-col :span="6"><b>订单编号(ID):</b> {{ order.orderNo + '(' + order.orderID + ')' }}</el-col>
-        <el-col :span="6"><b>下单时间:</b> {{ order.orderTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</el-col>
+        <el-col :span="6"><b>下单时间:</b> <template v-if="refund.returnTime">{{ order.orderTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
         <el-col :span="6"><b>订单状态:</b>
           <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(order.status)>=0">
             <el-tag type="success" size="small">{{ '交易中('+statusObj[order.status]+')' }}</el-tag>
@@ -175,7 +175,7 @@
         <h3>申请信息</h3>
         <el-row :gutter="24" class="box-row">
           <el-col :span="7"><b>申请人:</b> {{ refund.applicationUserName }}</el-col>
-          <el-col :span="7"><b>申请时间:</b> {{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</el-col>
+          <el-col :span="7"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
           <el-col :span="7"><b>退款备注:</b> {{ refund.remarks ? refund.remarks : '无' }}</el-col>
         </el-row>
         <el-row v-if="refund.image1 || refund.image2 || refund.image3 || refund.image4 || refund.image5 " :gutter="24" class="box-row">

+ 3 - 3
src/views/order/refund-record.vue

@@ -9,7 +9,7 @@
     <el-card v-if="order" class="box-card">
       <el-row :gutter="24" class="box-row">
         <el-col :span="6"><b>订单编号(ID):</b> {{ order.orderNo + '(' + order.orderID + ')' }}</el-col>
-        <el-col :span="6"><b>下单时间:</b> {{ order.orderTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</el-col>
+        <el-col :span="6"><b>下单时间:</b> <template v-if="order.orderTime">{{ order.orderTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
       </el-row>
       <el-row :gutter="24" class="box-row">
         <el-col :span="6"><b>订单状态:</b>
@@ -77,7 +77,7 @@
         </template>
       </el-table-column>
       <el-table-column label="收款时间" align="center" prop="receiptDate">
-        <template slot-scope="{row}">
+        <template v-if="row.receiptDate" slot-scope="{row}">
           <i class="el-icon-time" />
           <span>{{ row.receiptDate | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
         </template>
@@ -107,7 +107,7 @@
         </template>
       </el-table-column>
       <el-table-column label="申请时间" align="center" prop="returnTime">
-        <template slot-scope="{row}">
+        <template v-if="row.returnTime" slot-scope="{row}">
           <i class="el-icon-time" />
           <span>{{ row.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
         </template>

+ 3 - 3
src/views/order/refund-return.vue

@@ -30,7 +30,7 @@
         <h3>申请信息</h3>
         <el-row :gutter="24" class="box-row">
           <el-col :span="7"><b>申请人:</b> {{ refund.applicationUserName }}</el-col>
-          <el-col :span="7"><b>申请时间:</b> {{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</el-col>
+          <el-col :span="7"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
           <el-col :span="7"><b>退款备注:</b> {{ refund.remarks ? refund.remarks : '无' }}</el-col>
         </el-row>
         <el-row v-if="refund.image1 || refund.image2 || refund.image3 || refund.image4 || refund.image5 " :gutter="24" class="box-row">
@@ -48,7 +48,7 @@
       <el-card :key="'refund' + refund.orderID" class="box-card">
         <el-row :gutter="24" class="box-row">
           <el-col :span="6"><b>退款编号:</b> {{ refund.returnedNo }}</el-col>
-          <el-col :span="6"><b>申请时间:</b> {{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</el-col>
+          <el-col :span="6"><b>申请时间:</b> <template v-if="refund.returnTime">{{ refund.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
           <el-col :span="6"><b>申请金额:</b> ¥{{ refund.refundFee | toThousandFilter }}</el-col>
           <el-col :span="6"><b>退款状态:</b>
             <el-tag v-if="refund.status*1===1" type="warning" size="small">待审核</el-tag>
@@ -95,7 +95,7 @@
     <el-card v-if="order" class="box-card">
       <el-row :gutter="24" class="box-row">
         <el-col :span="6"><b>订单编号:</b> {{ order.orderID }}</el-col>
-        <el-col :span="6"><b>下单时间:</b> {{ order.orderTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</el-col>
+        <el-col :span="6"><b>下单时间:</b> <template v-if="order.orderTime">{{ order.orderTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</template></el-col>
         <el-col :span="6"><b>订单状态:</b>
           <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(order.status)>=0">
             <el-tag type="success" size="small">{{ '交易中('+statusObj[order.status]+')' }}</el-tag>

+ 2 - 2
src/views/order/refund.vue

@@ -78,14 +78,14 @@
       </el-table-column>
       <el-table-column label="申请人" align="center" prop="applicationUserName" />
       <el-table-column align="center" label="申请时间" prop="returnTime">
-        <template slot-scope="{row}">
+        <template v-if="row.returnTime" slot-scope="{row}">
           <i class="el-icon-time" />
           <span>{{ row.returnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="审核人" align="center" prop="reviewUserName" />
       <el-table-column align="center" label="审核时间" prop="confirmReturnTime">
-        <template slot-scope="{row}">
+        <template v-if="row.confirmReturnTime" slot-scope="{row}">
           <i class="el-icon-time" />
           <span>{{ row.confirmReturnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
         </template>