1

src/views/merchant/deposit/index.vue

@@ -107,7 +107,7 @@
             class="selWidth"
           />
         </el-form-item>
-        <el-form-item label="审核时间：" v-if="tableFrom.status == 1">
+        <el-form-item label="审核时间：">
           <el-date-picker
             v-model="auditVal"
             placeholder="选择日期"
@@ -291,7 +291,7 @@
           min-width="150"
         />
         <el-table-column
-        v-if="tableFrom.status == 1"
+        v-if="tableFrom.status == 1 || tableFrom.status == -2"
           key="13"
           prop="pay_time"
           label="审核时间"

src/views/order/refund/index.vue

@@ -66,19 +66,34 @@
             clearable
           />
         </el-form-item>
-        <el-form-item label="支付方式：" prop="pay_type">
+        <el-form-item label="退款类型：" prop="refund_type">
           <el-select
-            v-model="tableFrom.pay_type"
+            v-model="tableFrom.refund_type"
             clearable
             placeholder="请选择"
             class="selWidth"
             @change="getList(1)"
           >
-            <el-option label="支付宝" value="12" />
+            <el-option label="退款" value="1" />
-            <el-option label="扫码支付" value="9" />
+            <el-option label="退款退货" value="2" />
-            <el-option label="绑卡快捷支付" value="11" />
           </el-select>
         </el-form-item>
+        <el-form-item label="发起方：" prop="user_type">
+              <el-select
+                v-model="tableFrom.user_type"
+                placeholder="请选择"
+                class="selWidth"
+                clearable
+                @change="getList(1)"
+              >
+                <el-option
+                  v-for="item in refundUserList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
         <el-form-item>
           <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
           <el-button size="small" @click="searchReset()">重置</el-button> 
@@ -124,16 +139,16 @@
         <el-table-column prop="order.order_sn" label="订单号" min-width="130" />
         <el-table-column prop="user.nickname" label="用户信息" min-width="130" />
         <el-table-column prop="merchant.mer_name" label="商户名称" min-width="130" />
+        <el-table-column prop="merchant.ext.com.name" label="商户名称" min-width="130" />
         <el-table-column prop="mer_name" label="商户类别" min-width="90">
           <template slot-scope="scope">
             <span v-if="scope.row.merchant" class="spBlock">{{ scope.row.merchant.is_trader ? '自营' : '非自营' }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="refund_price" label="退款金额" min-width="130" />
-        <el-table-column label="支付方式" min-width="80">
+        <el-table-column label="退款类型" min-width="80">
           <template slot-scope="scope">
-            <span v-if="scope.row.paid === 1">{{ scope.row.pay_type | orderPayType }}</span>
+            <span >{{ scope.row.refund_type==1?'退款':'退款退货' }}</span>
-            <span v-else>--</span>
           </template>
         </el-table-column>
         <el-table-column prop="nickname" label="商品信息" min-width="330">
@@ -250,8 +265,14 @@ export default {
         page: 1,
         limit: 20,
         is_trader: '',
-        pay_type:''
+        refund_type:'',
+        user_type:''
       },
+      refundUserList: [
+        { value: 1, label: '用户' },
+        { value: 3, label: '商户' },
+        { value: 4, label: '平台' }
+      ],
       orderChartType: {},
       timeVal: [],
       fromList: fromList,