退款退货详情等

src/api/order.js

@@ -32,6 +32,14 @@ export function saveRemarks(query) {
   })
 }
 
+export function getRefundReturn(query) {
+  return request({
+    url: '/order/organize/toRecturnRecordByOrderID',
+    method: 'get',
+    params: query
+  })
+}
+
 /** 用户退款管理 */
 export function getRefundList(query) {
   return request({

src/router/index.js

@@ -167,13 +167,6 @@ export const constantRoutes = [
         component: () => import('@/views/order/list'),
         meta: { title: '订单列表', icon: 'list' }
       },
-      {
-        path: 'detail/:id(\\d+)',
-        name: 'Detail',
-        component: () => import('@/views/order/detail'),
-        meta: { title: '订单详情', noCache: true, activeMenu: '/order/list' },
-        hidden: true
-      },
       {
         path: 'refund',
         name: 'Refund',
@@ -186,6 +179,34 @@ export const constantRoutes = [
         component: () => import('@/views/order/refund-detail'),
         meta: { title: '用户退款详情', noCache: true, activeMenu: '/order/refund' },
         hidden: true
+      },
+      {
+        path: 'detail/:id(\\d+)',
+        name: 'Detail',
+        component: () => import('@/views/order/detail'),
+        meta: { title: '订单详情', noCache: true, activeMenu: '/order/list' },
+        hidden: true
+      },
+      {
+        path: 'logistics/:id(\\d+)',
+        name: 'logistics',
+        component: () => import('@/views/order/logistics'),
+        meta: { title: '发货记录', noCache: true, activeMenu: '/order/list' },
+        hidden: true
+      },
+      {
+        path: 'refund-record/:id(\\d+)',
+        name: 'RefundRecord',
+        component: () => import('@/views/order/refund-record'),
+        meta: { title: '收退款记录', noCache: true, activeMenu: '/order/list' },
+        hidden: true
+      },
+      {
+        path: 'refund-return/:id(\\d+)',
+        name: 'RefundRreturn',
+        component: () => import('@/views/order/refund-return'),
+        meta: { title: '退款（退货）记录', noCache: true, activeMenu: '/order/list' },
+        hidden: true
       }
     ]
   },

src/views/order/detail.vue

@@ -42,10 +42,10 @@
               功能<i class="el-icon-arrow-down el-icon--right" />
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item><div @click="RemarksOrder(order.orderID)">备注</div></el-dropdown-item>
-              <el-dropdown-item>发货记录</el-dropdown-item>
-              <el-dropdown-item>收退款记录</el-dropdown-item>
-              <el-dropdown-item>退款（退货）记录</el-dropdown-item>
+              <el-dropdown-item><div @click="RemarksOrder(row.orderID)">备注</div></el-dropdown-item>
+              <el-dropdown-item><router-link :to="'/order/logistics/' + row.orderID ">发货记录</router-link></el-dropdown-item>
+              <el-dropdown-item><router-link :to="'/order/refund-record/' + row.orderID ">收退款记录</router-link></el-dropdown-item>
+              <el-dropdown-item><router-link :to="'/order/refund-return/' + row.orderID ">退款（退货）记录</router-link></el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </el-col>

src/views/order/list.vue

@@ -16,22 +16,36 @@
       <el-input v-model="listQuery.buyer" placeholder="买家" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
       <el-input v-model="listQuery.receiver" placeholder="收货人" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
       <el-select v-model="listQuery.status" placeholder="订单状态" clearable style="width: 110px" class="filter-item" value="" @change="handleFilter">
-        <!-- <el-option v-for="item in statusList" :key="item.id" :label="item.status" :value="item.id" /> -->
+        <el-option label="待确认" value="0" />
+        <el-option label="交易中" value="99" />
+        <el-option label="交易完成" value="4" />
+        <el-option label="订单完成" value="5" />
+        <el-option label="已关闭" value="6" />
+        <el-option label="交易全退" value="7" />
       </el-select>
       <el-select v-model="listQuery.receiptStatus" placeholder="收款状态" clearable style="width: 110px" class="filter-item" value="" @change="handleFilter">
-        <!-- <el-option v-for="item in statusList" :key="item.id" :label="item.status" :value="item.id" /> -->
+        <el-option label="待收款" value="1" />
+        <el-option label="部分收款" value="2" />
+        <el-option label="已收款" value="3" />
       </el-select>
       <el-select v-model="listQuery.sendOutStatus" placeholder="发货状态" clearable style="width: 110px" class="filter-item" value="" @change="handleFilter">
-        <!-- <el-option v-for="item in statusList" :key="item.id" :label="item.status" :value="item.id" /> -->
+        <el-option label="待发货" value="1" />
+        <el-option label="部分发货" value="2" />
+        <el-option label="已发货" value="3" />
       </el-select>
       <el-select v-model="listQuery.payStatus" placeholder="付款状态" clearable style="width: 110px" class="filter-item" value="" @change="handleFilter">
-        <!-- <el-option v-for="item in statusList" :key="item.id" :label="item.status" :value="item.id" /> -->
+        <el-option label="待付款" value="1" />
+        <el-option label="部分付款" value="2" />
+        <el-option label="已付款" value="3" />
       </el-select>
       <el-select v-model="listQuery.refundType" placeholder="退款状态" clearable style="width: 110px" class="filter-item" value="" @change="handleFilter">
-        <!-- <el-option v-for="item in statusList" :key="item.id" :label="item.status" :value="item.id" /> -->
+        <el-option label="无退款" value="0" />
+        <el-option label="部分退款" value="1" />
+        <el-option label="已退款" value="2" />
       </el-select>
-      <el-select v-model="listQuery.returnedPurchaseStatus" placeholder="待审核退款" clearable style="width: 110px" class="filter-item" value="" @change="handleFilter">
-        <!-- <el-option v-for="item in statusList" :key="item.id" :label="item.status" :value="item.id" /> -->
+      <el-select v-model="listQuery.returnedPurchaseStatus" placeholder="待审核退款" clearable style="width: 120px" class="filter-item" value="" @change="handleFilter">
+        <el-option label="有" value="1" />
+        <el-option label="无" value="0" />
       </el-select>
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查询</el-button>
     </div>
@@ -88,7 +102,7 @@
       <el-table-column label="退款状态" align="center" prop="refundType">
         <template slot-scope="{row}">
           <el-tag v-if="row.refundType*1===1" type="info" size="small">部分退</el-tag>
-          <el-tag v-if="row.refundType*1===2" type="info" size="small">全部退</el-tag>
+          <el-tag v-else-if="row.refundType*1===2" type="info" size="small">全部退</el-tag>
           <el-tag v-else type="info" size="small">无退款</el-tag>
         </template>
       </el-table-column>
@@ -118,9 +132,9 @@
             </el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item><div @click="RemarksOrder(row.orderID)">备注</div></el-dropdown-item>
-              <el-dropdown-item>发货记录</el-dropdown-item>
-              <el-dropdown-item>收退款记录</el-dropdown-item>
-              <el-dropdown-item>退款（退货）记录</el-dropdown-item>
+              <el-dropdown-item><router-link :to="'/order/logistics/' + row.orderID ">发货记录</router-link></el-dropdown-item>
+              <el-dropdown-item><router-link :to="'/order/refund-record/' + row.orderID ">收退款记录</router-link></el-dropdown-item>
+              <el-dropdown-item><router-link :to="'/order/refund-return/' + row.orderID ">退款（退货）记录</router-link></el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>

src/views/order/refund-return.vue

@@ -0,0 +1,261 @@
+<template>
+  <div class="app-container">
+
+    <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal">
+      <el-menu-item index="1"><router-link to="/order/list">订单列表</router-link></el-menu-item>
+      <el-menu-item index="2">退款退货详情</el-menu-item>
+    </el-menu>
+
+    <h1>退款单</h1>
+
+    <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> ¥{{ 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>
+          <el-tag v-if="refund.status*1===2" type="danger" size="small">审核不通过</el-tag>
+          <el-tag v-if="refund.status*1===3" type="success" size="small">审核通过</el-tag>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="box-row">
+        <el-col :span="20"><b>退款方式:</b>
+          <template v-if="refund.returnedWay*1===4">未支付无退款</template>
+          <template v-else-if="refund.returnedWay*1===1">
+            <span v-if="refund.refundBalanceFee*1 !== 0">余额账户:¥{{ refund.refundBalanceFee | toThousandFilter }}</span>
+            <span v-if="refund.refundOnlineFee*1 !== 0">线上退回:¥{{ refund.refundOnlineFee | toThousandFilter }}</span>
+            <span v-if="refund.refundOfflineFee*1 !== 0">线下转账:¥{{ refund.refundOfflineFee | toThousandFilter }}</span>
+          </template>
+          <template v-else>----</template>
+        </el-col>
+      </el-row>
+      <template v-if="refund.returnedWay*1===1 && refund.refundOfflineFee*1!==0">
+        <el-row :gutter="24" class="box-row">
+          <el-col v-if="refund.refundFee" :span="12"><b>退款银行:</b>
+            <template v-if="refund.payType*1===1">建设银行7297</template>
+            <template v-else-if="refund.payType*1===2">中信银行0897</template>
+            <template v-else-if="refund.payType*1===3">中信银行7172</template>
+            <template v-else-if="refund.payType*1===4">广发银行0115</template>
+            <template v-else-if="refund.payType*1===5">广发银行5461</template>
+          </el-col>
+          <el-col v-else :span="12">暂无支付方式</el-col>
+        </el-row>
+        <el-row :gutter="24" class="box-row">
+          <el-col :span="6"><b>开户名:</b> {{ refund.bankAccountName ? refund.bankAccountName : '' }}</el-col>
+          <el-col :span="6"><b>账号:</b> {{ refund.bankAccountNo ? refund.bankAccountNo : '' }}</el-col>
+          <el-col :span="6"><b>开户行:</b> {{ refund.openBank ? refund.openBank : '' }}</el-col>
+          <el-col :span="6"><b>账户类型:</b>
+            <el-tag v-if="refund.bankAccountType*1===1" type="warning" size="small">公账</el-tag>
+            <el-tag v-if="refund.bankAccountType*1===2" type="danger" size="small">私账</el-tag>
+          </el-col>
+        </el-row>
+      </template>
+    </el-card>
+
+    <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="['11','12','13','21','22','23','31','32','33'].indexOf(order.status)>=0">
+            <el-tag type="success" size="small">{{ '交易中('+statusObj[order.status]+')' }}</el-tag>
+          </template>
+          <template v-else>
+            <el-tag :type="row.status*1===6?'info':''" size="small">{{ statusObj[order.status] }}</el-tag>
+          </template>
+        </el-col>
+        <el-col v-if="order.bpOrderUserinfo" :span="6"><b>买家:</b> {{ order.bpOrderUserinfo.name }}</el-col>
+      </el-row>
+      <el-row :gutter="24" class="box-row">
+        <el-col :span="6"><b>收款状态:</b>
+          <el-tag v-if="order.receiptStatus*1===1" type="danger" size="small">待收款</el-tag>
+          <el-tag v-if="order.receiptStatus*1===2" type="warning" size="small">部分收款</el-tag>
+          <el-tag v-if="order.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
+        </el-col>
+        <el-col :span="6"><b>退款状态:</b>
+          <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退</el-tag>
+          <el-tag v-else-if="order.refundType*1===2" type="danger" size="small">全部退</el-tag>
+          <el-tag v-else type="info" size="small">无退款</el-tag>
+        </el-col>
+        <el-col :span="6"><b>发货状态:</b>
+          <el-tag v-if="order.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
+          <el-tag v-if="order.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
+          <el-tag v-if="order.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
+        </el-col>
+      </el-row>
+      <el-row v-if="order.bpOrderUserinfo" :gutter="24" class="box-row">
+        <el-col :span="6"><b>收货人:</b> {{ order.bpOrderUserinfo.shouHuoRen }}</el-col>
+        <el-col :span="6"><b>手机:</b> {{ order.bpOrderUserinfo.mobile }}</el-col>
+        <el-col :span="12"><b>地址:</b> {{ order.bpOrderUserinfo.province +' '+ order.bpOrderUserinfo.city +' '+ order.bpOrderUserinfo.town +' '+ order.bpOrderUserinfo.address }}</el-col>
+      </el-row>
+
+      <div v-for="shopOrder in order.newShopOrders" :key="shopOrder.shopOrderID" class="order-item">
+        <el-row :gutter="22" class="box-row">
+          <el-col :span="9"><b>子订单号(ID):</b> {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderID + ')' }}</el-col>
+          <el-col :span="5"><b>下单时间:</b> {{ shopOrder.orderTime }}</el-col>
+          <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFilter }}</el-col>
+          <el-col :span="5"><b>发货状态:</b>
+            <el-tag v-if="shopOrder.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
+            <el-tag v-if="shopOrder.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
+            <el-tag v-if="shopOrder.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
+          </el-col>
+        </el-row>
+        <el-row :gutter="22" class="box-row">
+          <el-col :span="22"><b>供应商:</b> {{ shopOrder.shopName }}</el-col>
+        </el-row>
+        <el-row v-for="op in shopOrder.newOrderProducts" :key="op.orderProductID" :gutter="22" class="product-row">
+          <el-col :span="2">
+            <img :src="op.productImage" width="60" alt="">
+          </el-col>
+          <el-col :span="7">{{ op.name }}</el-col>
+          <el-col :span="5">
+            <div class="op-item"><b>数量</b>{{ op.productID*1!==999 ? ('(赠品数): x'+op.num+'('+op.presentNum+')') : (': x'+op.num) }}</div>
+            <div v-if="op.productID*1!==999" class="op-item">规格: {{ op.unit }}</div>
+          </el-col>
+          <el-col v-if="op.productID*1!==999" :span="5">
+            <div class="op-item"><b>单价:</b> ¥{{ op.price | toThousandFilter }}</div>
+            <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFilter }}</div>
+          </el-col>
+          <el-col v-if="op.productID*1!==999" :span="5">
+            <div v-if="order.sendOutStatus*1 === 2 || order.sendOutStatus*1 === 3" class="op-item"><b>已发/已收:</b> {{ ((op.num ? op.num : 0) - (op.notOutStore ? op.notOutStore : 0)) + '/' + op.receivedNum }}</div>
+          </el-col>
+        </el-row>
+      </div>
+    </el-card>
+
+    <template v-for="refund in refundList">
+      <el-card :key="'review'+refund.orderID" class="box-card">
+        <h3>审核信息</h3>
+        <el-row :gutter="24" class="box-row">
+          <el-col :span="7"><b>审核人:</b> {{ refund.reviewUserName }}</el-col>
+          <el-col :span="7"><b>审核时间:</b> {{ refund.confirmReturnTime }}</el-col>
+          <el-col :span="7"><b>审核备注:</b> {{ refund.reviewRemarks ? refund.reviewRemarks : '无' }}</el-col>
+        </el-row>
+        <el-row v-if="refund.reviewImage1 || refund.reviewImage2 || refund.reviewImage3 || refund.reviewImage4 || refund.reviewImage5 " :gutter="24" class="box-row">
+          <el-col :span="4"><b>审核凭证:</b></el-col>
+          <el-col :span="20">
+            <img v-if="refund.reviewImage1" :src="refund.reviewImage1" width="65" alt="">
+            <img v-if="refund.reviewImage2" :src="refund.reviewImage2" width="65" alt="">
+            <img v-if="refund.reviewImage3" :src="refund.reviewImage3" width="65" alt="">
+            <img v-if="refund.reviewImage4" :src="refund.reviewImage4" width="65" alt="">
+            <img v-if="refund.reviewImage5" :src="refund.reviewImage5" width="65" alt="">
+          </el-col>
+        </el-row>
+      </el-card>
+      <el-card :key="'application'+refund.orderID" class="box-card">
+        <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> {{ 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">
+          <el-col :span="4"><b>申请凭证:</b></el-col>
+          <el-col :span="20">
+            <img v-if="refund.image1" :src="refund.image1" width="65" alt="">
+            <img v-if="refund.image2" :src="refund.image2" width="65" alt="">
+            <img v-if="refund.image3" :src="refund.image3" width="65" alt="">
+            <img v-if="refund.image4" :src="refund.image4" width="65" alt="">
+            <img v-if="refund.image5" :src="refund.image5" width="65" alt="">
+          </el-col>
+        </el-row>
+      </el-card>
+      <el-card :key="'end'+refund.orderID" class="box-card">
+        <el-row :gutter="24" class="box-row">
+          <el-col :span="7"><b>申请退款金额:</b> ¥{{ refund.refundFee | toThousandFilter }}</el-col>
+          <el-col :span="7"><b>财务签名:</b></el-col>
+          <el-col :span="7"><b>总经理签名:</b></el-col>
+        </el-row>
+      </el-card>
+    </template>
+
+  </div>
+</template>
+
+<script>
+import { getRefundReturn } from '@/api/order'
+export default {
+  data() {
+    return {
+      activeIndex: '2',
+      bpClauses: [],
+      order: null,
+      refundList: [],
+      statusObj: {
+        '0': '待确认',
+        '4': '交易完成',
+        '5': '订单完成',
+        '6': '已关闭',
+        '7': '交易全退',
+        '11': '待收待发',
+        '12': '待收部发',
+        '13': '待收全发',
+        '21': '部收待发',
+        '22': '部收部发',
+        '23': '部收全发',
+        '31': '已收待发',
+        '32': '已收部发',
+        '33': '已收全发'
+      }
+    }
+  },
+  computed: {
+    orderID: function() {
+      return window.location.href.split('/').reverse()[0] * 1
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getRefundReturn({ orderID: this.orderID }).then(response => {
+        this.order = response.data.order
+        this.bpClauses = response.data.bpClauses
+        this.refundList = response.data.cmReturnedPurchaseList
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+  h1{
+    color: #409EFF;
+    font-size: 24px;
+    text-align: center;
+  }
+  h3{
+    color: #409EFF;
+    font-size: 16px;
+    margin: 0;
+  }
+  .box-card{
+    margin-top: 20px;
+    font-size: 14px;
+  }
+  .box-row{
+    padding: 10px 0;
+  }
+  .order-item{
+    border-bottom: 1px solid #DCDFE6;
+    background:#F2F6FC;
+    margin-top: 20px;
+    padding: 5px 15px 0;
+    border-radius: 5px;
+  }
+  .product-row{
+    padding: 10px 0;
+    background: #EBEEF5;
+    border-top: 1px dashed #DCDFE6;
+  }
+  .op-item{
+    padding: 5px 0;
+  }
+</style>
+