1

src/components/SingleAirTicket/douyinOrder.vue

@@ -172,6 +172,14 @@
               <el-input placeholder="请输入订单编号/商品名称" v-model="msg.order_id"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="4" :gutter="35">
+            <el-form-item label="订单状态" >
+              <el-select v-model="msg.order_status"  filterable :placeholder="$t('pub.pleaseSel')">
+                <el-option v-for="(item, index) in order_statusList" :label="item.Name" :value="item.Id" :key="index+2000">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="8" :gutter="35">
             <el-form-item label="支付日期">
               <el-date-picker
@@ -198,23 +206,26 @@
     </div>
     <table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
       <tr>
-        
+        <th>订单号</th>
         <th>商品名称</th>
-        <th width="180">
+        <th>
           联系电话
         </th>
         <th>订单类型</th>
         <th>原始金额</th>
         <th>支付金额</th>
         <th>订单实收</th>
-        <th>支付时间</th>
         <th>订单状态</th>
+        <th>支付时间</th>
+        <th>退款金额</th>
+        <th>退款时间</th>
         <th>标记信息</th>
         <!-- <th>发票附件</th> -->
         <th>{{$t('system.table_operation')}}</th>
       </tr>
       <template v-for="(item, index) in dataList" v-loading="loading">
         <tr>
+          <td>{{item.order_id}}</td>
           <!-- class="cursorpointer" -->
           <td>{{item.sku_name}}</td>
           <td>
@@ -232,13 +243,19 @@
           <td >{{item.original_amount | priceFormat(item.original_amount) }}</td>
           <td >{{item.pay_amount | priceFormat(item.pay_amount) }}</td>
           <td >  {{item.receipt_amount| priceFormat(item.receipt_amount)}}   </td>
-          <td>{{item.pay_time}} </td>
           <td><span v-if="item.order_status==100">待支付</span>
             <span v-else-if="item.order_status==101">支付取消</span>
             <span v-else-if="item.order_status==200">已支付</span>
             <span v-else-if="item.order_status==201">待使用</span>
             <span v-else-if="item.order_status==1">已完成</span>
             <span v-else></span></td>
+            <td>{{item.pay_time}} </td>
+            <td>
+              <span v-if="item.refund_amount>0">{{item.refund_amount | priceFormat(item.refund_amount) }}</span>
+            </td>
+            <td>
+              <span v-if="item.refund_amount>0">{{item.refund_time}}</span>
+            </td>
           <td>
                 <el-popover width="630" trigger="click">
                 <table class="PQ_detail">
@@ -254,7 +271,7 @@
           </td>
           <td class="_icon_btn" style="text-align: left;padding-left: 20px">
             <el-tooltip class="item"  effect="dark" content="标记订单信息"   placement="top">
-              <i class="iconfont icon-ico_commodity_defaul" @click="setStatus(item, 1)"></i>
+              <i class="iconfont icon-beizhu" style="background-color: #a55eea !important; border-color: #a55eea" @click="setStatus(item, 1)"></i>
             </el-tooltip>
           
           
@@ -318,6 +335,7 @@ export default {
         order_id:'',
         sDate: '',
         eDate: '',
+        order_status:0,
         pageIndex: 1,
         pageSize: 10,
       },
@@ -333,6 +351,7 @@ export default {
         OperateContentList:[],
         Id:0,
       },
+      order_statusList:[{Id:0,Name:'不限'},{Id:100,Name:'待支付'},{Id:101,Name:'支付取消'},{Id:200,Name:'已支付'},{Id:201,Name:'待使用'},{Id:1,Name:'已完成'}],
     };
   },
   filters: {