首页数据图表

.env.development

@@ -3,8 +3,8 @@ ENV = 'development'
 
 # base api
 # VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://192.168.1.22:8108'
-# VUE_APP_BASE_API = 'http://127.0.0.1:8108'
+# VUE_APP_BASE_API = 'http://192.168.1.22:8108'
+VUE_APP_BASE_API = 'http://127.0.0.1:8108'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

src/api/order.js

@@ -16,3 +16,35 @@ export function getDetail(query) {
   })
 }
 
+export function getRemarks(query) {
+  return request({
+    url: '/order/cmOrderRemark/remarksView',
+    method: 'get',
+    params: query
+  })
+}
+
+export function saveRemarks(query) {
+  return request({
+    url: '/order/cmOrderRemark/addRemarks',
+    method: 'post',
+    data: query
+  })
+}
+
+/** 用户退款管理 */
+export function getRefundList(query) {
+  return request({
+    url: '/order/cmReturnedPurchase/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getRefundDetail(query) {
+  return request({
+    url: '/order/cmReturnedPurchase/toRecturnRecord',
+    method: 'get',
+    params: query
+  })
+}

src/layout/components/Navbar.vue

@@ -21,12 +21,6 @@
           <router-link to="/">
             <el-dropdown-item>Dashboard</el-dropdown-item>
           </router-link>
-          <a target="_blank" href="https://github.com/PanJiaChen/vue-element-admin/">
-            <el-dropdown-item>Github</el-dropdown-item>
-          </a>
-          <a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/">
-            <el-dropdown-item>Docs</el-dropdown-item>
-          </a>
           <el-dropdown-item divided @click.native="logout">
             <span style="display:block;">Log Out</span>
           </el-dropdown-item>
@@ -40,19 +34,13 @@
 import { mapGetters } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
-import ErrorLog from '@/components/ErrorLog'
 import Screenfull from '@/components/Screenfull'
-import SizeSelect from '@/components/SizeSelect'
-import Search from '@/components/HeaderSearch'
 
 export default {
   components: {
     Breadcrumb,
     Hamburger,
-    ErrorLog,
-    Screenfull,
-    SizeSelect,
-    Search
+    Screenfull
   },
   computed: {
     ...mapGetters([

src/router/index.js

@@ -167,6 +167,13 @@ 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',
@@ -174,10 +181,10 @@ export const constantRoutes = [
         meta: { title: '用户退款列表', icon: 'skill' }
       },
       {
-        path: 'detail/:id(\\d+)',
-        name: 'Detail',
-        component: () => import('@/views/order/detail'),
-        meta: { title: '订单详情', noCache: true, activeMenu: '/order/list' },
+        path: 'refund/detail/:id(\\d+)',
+        name: 'RefundDeatil',
+        component: () => import('@/views/order/refund-detail'),
+        meta: { title: '用户退款详情', noCache: true, activeMenu: '/order/refund' },
         hidden: true
       }
     ]

src/store/modules/user.js

@@ -1,7 +1,8 @@
-import { login, logout, getInfo } from '@/api/user'
+// import { login, logout, getInfo } from '@/api/user'
+import { login, getInfo } from '@/api/user'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import router, { resetRouter } from '@/router'
-import store from '@/store'
+// import store from '@/store'
 
 const state = {
   token: getToken(),

src/views/finance/refund.vue

@@ -16,4 +16,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/views/order/components/discount.vue

@@ -1,74 +0,0 @@
-<template>
-  <el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible">
-    <el-form ref="dataForm" :rules="rules" :model="dialog" label-position="left" label-width="220px" style="width:360px; margin:0 auto;">
-      <el-form-item label="商品分类" prop="classifyID">
-        <el-select v-model="dialog.classifyID" placeholder="商品分类" :label="dialog.productClassifyName" clearable class="filter-item" :value="dialog.classifyID*1">
-          <template v-for="item in classify">
-            <el-option v-if="item.status*1 === 1" :key="item.id" :label="item.classifyName" :value="item.id" />
-          </template>
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="'市场价(' + dialog.normalPrice + ')，修改为：'" prop="normalPrice">
-        <el-input v-model="dialog.normalPrice" />
-      </el-form-item>
-      <el-form-item :label="'成本价(' + dialog.costPrice + ')，修改为：'" prop="costPrice">
-        <el-input v-model="dialog.costPrice" />
-      </el-form-item>
-      <el-form-item :label="'售价(' + dialog.retailPrice + ')，修改为：'" prop="retailPrice">
-        <el-input v-model="dialog.retailPrice" />
-      </el-form-item>
-      <el-form-item :label="'起订量(' + dialog.minBuyNumber + ')，修改为：'" prop="minBuyNumber">
-        <el-input v-model="dialog.minBuyNumber" />
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="dialogFormVisible = false">
-        关闭
-      </el-button>
-      <el-button type="primary" @click="updateGoods">
-        确认
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-export default {
-  props: {
-    dialogTitle: {
-      type: String,
-      default: '编辑经理折扣'
-    },
-    dialogFormVisible: {
-      type: Boolean,
-      default: false
-    },
-    dialog: {
-      type: Object,
-      default: {
-        id: '',
-        classifyID: 0,
-        normalPrice: '',
-        costPrice: '',
-        retailPrice: '',
-        minBuyNumber: '',
-        productClassifyName: ''
-      }
-    },
-
-    dialog: {
-      id: '',
-      classifyID: 0,
-      normalPrice: '',
-      costPrice: '',
-      retailPrice: '',
-      minBuyNumber: '',
-      productClassifyName: ''
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/order/components/remarks.vue

@@ -0,0 +1,114 @@
+<template>
+  <el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible">
+    <div v-if="remarkList.length>0">
+      <div v-for="item in remarkList" :key="item.id" class="info">
+        <div class="clearfix">
+          <span class="title">{{ item.sysUserName }}</span>
+          <time class="time">{{ new Date(item.createDate) | parseTime('{y}-{m}-{d} {h}:{i}') }}</time>
+        </div>
+        <p class="content">{{ item.remarks }}</p>
+      </div>
+    </div>
+    <div v-else class="info">
+      <p class="title">暂无信息,有需要请备注！</p>
+    </div>
+    <el-form label-position="left" label-width="100px">
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="remark" type="textarea" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="dialogFormVisible = false">关闭</el-button>
+      <el-button type="primary" @click="submitRemark">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { saveRemarks } from '@/api/order'
+export default {
+  props: {
+    dialogTitle: {
+      type: String,
+      default: '备注'
+    },
+    isVisible: {
+      type: Boolean,
+      default: false
+    },
+    orderId: {
+      type: Number,
+      default: 0
+    },
+    remarkList: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  data: function() {
+    return {
+      listLoading: true,
+      remark: ''
+    }
+  },
+  computed: {
+    dialogFormVisible: {
+      get() {
+        return this.isVisible
+      },
+      set(val) {
+        this.$emit('update:isVisible', val)
+      }
+    }
+  },
+  created() {
+
+  },
+  methods: {
+    submitRemark() {
+      if (this.remark) {
+        saveRemarks({ remarks: this.remark, orderID: this.orderId }).then(response => {
+          this.$notify({
+            title: response.code * 1 === 1 ? 'Success' : 'Error',
+            message: response.msg,
+            type: response.code * 1 === 1 ? 'success' : 'error',
+            duration: 2000
+          })
+          this.dialogFormVisible = false
+        })
+      } else {
+        this.dialogFormVisible = false
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .clearfix:before,
+  .clearfix:after {
+      display: table;
+      content: "";
+  }
+  .clearfix:after {
+      clear: both
+  }
+  .info{
+    margin-bottom: 20px;
+    border-bottom: 1px dashed #DCDFE6;
+  }
+  .time {
+    font-size: 13px;
+    color: #999;
+    float: right;
+  }
+  .title {
+    line-height: 12px;
+    color: blue;
+  }
+  .content{
+    margin-top: 13px;
+  }
+</style>

src/views/order/detail.vue

@@ -8,9 +8,9 @@
 
     <el-card v-if="order" class="box-card">
       <el-row :gutter="24" class="box-row">
-        <el-col :span="6">订单编号: {{ order.orderID }}</el-col>
-        <el-col :span="6">下单时间: {{ order.orderTime }}</el-col>
-        <el-col :span="6">订单状态:
+        <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>
@@ -18,101 +18,120 @@
             <el-tag :type="row.status*1===6?'info':''" size="small">{{ statusObj[order.status] }}</el-tag>
           </template>
         </el-col>
-        <el-col :span="6">收款状态:
+        <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-row>
-      <el-row :gutter="24" class="box-row">
-        <el-col :span="6">付款状态:
-          <el-tag v-if="order.payStatus*1===1" type="danger" size="small">待付款</el-tag>
-          <el-tag v-if="order.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
-          <el-tag v-if="order.payStatus*1===3" type="success" size="small">已付款</el-tag>
-        </el-col>
-        <el-col :span="6">退款状态:
+        <el-col :span="6"><b>退款状态:</b>
           <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退</el-tag>
-          <el-tag v-if="order.refundType*1===2" type="danger" 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">发货状态:
+        <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-col :span="6">买家: {{ order.bpOrderUserinfo.name }}</el-col>
+        <el-col :span="6">
+          <el-dropdown class="dropdown">
+            <el-button type="primary" round>
+              功能<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-menu>
+          </el-dropdown>
+        </el-col>
       </el-row>
     </el-card>
 
-    <el-card class="box-card">
-      <el-row :gutter="24" class="box-row">
-        <el-col :span="6">收货人: {{ order.bpOrderUserinfo.shouHuoRen }}</el-col>
-        <el-col :span="6">手机: {{ order.bpOrderUserinfo.mobile }}</el-col>
-        <el-col :span="12">地址: {{ order.bpOrderUserinfo.province +' '+ order.bpOrderUserinfo.city +' '+ order.bpOrderUserinfo.town +' '+ order.bpOrderUserinfo.address }}</el-col>
+    <el-card v-if="order" class="box-card">
+      <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>
       <el-row :gutter="24" class="box-row">
-        <el-col :span="6">订单金额: ¥{{ order.payTotalFee | toThousandFilter }}</el-col>
-        <el-col :span="6">应收金额: ¥{{ order.payableAmount | toThousandFilter }}<span style="color:red;"> (账户余额抵扣:¥{{ order.balancePayFee | toThousandFilter }})</span></el-col>
-        <el-col :span="6">已收金额:
+        <el-col :span="6"><b>订单金额:</b> ¥{{ order.payTotalFee | toThousandFilter }}</el-col>
+        <el-col :span="6"><b>应收金额:</b> ¥{{ order.payableAmount | toThousandFilter }}<span style="color:red;"> (账户余额抵扣:¥{{ order.balancePayFee | toThousandFilter }})</span></el-col>
+        <el-col :span="6"><b>已收金额:</b>
           <template v-if="order.receiptStatus*1===1">¥0</template>
           <template v-else>¥{{ receiptAmount | toThousandFilter }}</template>
         </el-col>
-        <el-col :span="6">退款金额(已完成): ¥{{ returnValue | toThousandFilter }}
+        <el-col :span="6"><b>退款金额(已完成):</b> ¥{{ returnValue | toThousandFilter }}
           <span style="color:red;">({{ '原:¥' + returnedPurchaseFee + '，折扣取消:¥' + (order.discountFee>returnedPurchaseFee ? returnedPurchaseFee : order.discountFee) }})</span>
         </el-col>
       </el-row>
       <el-row :gutter="24" class="box-row">
-        <el-col :span="6">经理折扣:
+        <el-col :span="6"><b>经理折扣:</b>
           <template v-if="order.discountFee<0">¥0</template>
           <template v-else>
             ¥{{ order.discountFee>returnedPurchaseFee ? (order.discountFee - returnedPurchaseFee) : '0' }}
             <span style="color:red;">({{ '原:¥' + order.discountFee + '，折扣取消:¥' + (order.discountFee>returnedPurchaseFee ? returnedPurchaseFee : order.discountFee) }})</span>
           </template>
         </el-col>
-        <el-col :span="6">运费:
+        <el-col :span="6"><b>运费:</b>
           <template v-if="order.freight*1===0">包邮</template>
           <template v-else-if="order.freight*1===-1">到付</template>
           <template v-else-if="order.freight*1===-2">仪器到付-产品包邮</template>
           <template v-else>¥{{ order.freight }}</template>
         </el-col>
       </el-row>
-    </el-card>
 
-    <el-card class="box-card grey">
       <div v-for="shopOrder in order.newShopOrders" :key="shopOrder.shopOrderID" class="order-item">
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="6">子订单号(ID): {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderID + ')' }}</el-col>
-          <el-col :span="6">下单时间: {{ shopOrder.orderTime }}</el-col>
-          <el-col :span="6">子订单金额: {{ shopOrder.needPayAmount }}</el-col>
-          <el-col :span="6">发货状态:
+        <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="24" class="box-row">
-          <el-col :span="24">留言: {{ shopOrder.note }}</el-col>
+        <el-row :gutter="22" class="box-row">
+          <el-col :span="22"><b>留言:</b> {{ shopOrder.note ? shopOrder.note : '无' }}</el-col>
         </el-row>
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="24">供应商: {{ shopOrder.shopName }}</el-col>
+        <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="24" class="box-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" />
-          <el-col :span="5" />
-          <el-col :span="5" />
+          <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>
+
+    <Remarks dialog-title="订单备注信息" :is-visible.sync="dialogRemarksVisible" :order-id="dialogRemarksOrderId" :remark-list="dialogRemarkList" />
+
   </div>
 </template>
 
 <script>
-import { getDetail } from '@/api/order'
+import { getDetail, getRemarks } from '@/api/order'
+import Remarks from './components/remarks'
 export default {
+  components: { Remarks },
   data() {
     return {
       activeIndex: '2',
@@ -120,6 +139,10 @@ export default {
       receiptAmount: 0,
       returnValue: 0,
       returnedPurchaseFee: 0,
+      bpClauses: null,
+      dialogRemarkList: [],
+      dialogRemarksVisible: false,
+      dialogRemarksOrderId: 0,
       statusObj: {
         '0': '待确认',
         '4': '交易完成',
@@ -151,6 +174,7 @@ export default {
       this.listLoading = true
       getDetail({ id: this.orderID }).then(response => {
         this.order = response.data.order
+        this.bpClauses = response.data.bpClauses
         this.receiptAmount = response.data.receiptAmount
         this.returnValue = response.data.returnValue
         this.returnedPurchaseFee = response.data.returnedPurchaseFee
@@ -158,6 +182,13 @@ export default {
       }).catch(() => {
         this.listLoading = false
       })
+    },
+    RemarksOrder: function(id) {
+      getRemarks({ orderID: id }).then(response => {
+        this.dialogRemarkList = response.data
+      })
+      this.dialogRemarksOrderId = id
+      this.dialogRemarksVisible = true
     }
   }
 }
@@ -171,11 +202,23 @@ export default {
   .box-row{
     padding: 10px 0;
   }
-  .box-card.grey{
-    background:#F2F6FC;
+  .box-row .dropdown{
+    margin-top: -10px;
   }
   .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>
 

src/views/order/list.vue

@@ -10,6 +10,7 @@
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
         />
       </el-form-item>
       <el-input v-model="listQuery.buyer" placeholder="买家" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
@@ -116,8 +117,7 @@
               功能<i class="el-icon-arrow-down el-icon--right" />
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <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>发货记录</el-dropdown-item>
               <el-dropdown-item>收退款记录</el-dropdown-item>
               <el-dropdown-item>退款（退货）记录</el-dropdown-item>
@@ -129,20 +129,26 @@
 
     <pagination v-show="total>0" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
+    <Remarks dialog-title="订单备注信息" :is-visible.sync="dialogRemarksVisible" :order-id="dialogRemarksOrderId" :remark-list="dialogRemarkList" />
+
   </div>
 </template>
 
 <script>
-import { getList } from '@/api/order'
+import { getList, getRemarks } from '@/api/order'
 import Pagination from '@/components/Pagination'
+import Remarks from './components/remarks'
 export default {
-  components: { Pagination },
+  components: { Pagination, Remarks },
   data() {
     return {
       list: null,
       listLoading: true,
       total: 0,
       searchTimeVal: '',
+      dialogRemarkList: [],
+      dialogRemarksVisible: false,
+      dialogRemarksOrderId: 0,
       listQuery: {
         index: 1,
         pageSize: 20,
@@ -192,6 +198,13 @@ export default {
     },
     handleFilter() {
       this.fetchData()
+    },
+    RemarksOrder: function(id) {
+      getRemarks({ orderID: id }).then(response => {
+        this.dialogRemarkList = response.data
+      })
+      this.dialogRemarksOrderId = id
+      this.dialogRemarksVisible = true
     }
   }
 }

src/views/order/refund-detail.vue

@@ -0,0 +1,289 @@
+<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/refund">用户退款列表</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>
+
+    <!--<el-card v-if="order && order.orderInvoice" class="box-card">
+      <el-row :gutter="24" class="box-row">
+        <b>发票信息:</b>
+        <template v-if="order.orderInvoice.type*1===0">不需要发票</template>
+        <template v-else-if="order.orderInvoice.type*1===1">普通发票</template>
+        <template v-else-if="order.orderInvoice.type*1===2">增值税发票</template>
+      </el-row>
+      <el-row v-if="order.orderInvoice.invoiceTitleType*1===0" :gutter="24" class="box-row">
+        <el-col :span="7"><b>个人抬头:</b>{{ order.orderInvoice.invoiceTitle }}</el-col>
+      </el-row>
+      <el-row v-if="order.orderInvoice.invoiceTitleType*1===1" :gutter="24" class="box-row">
+        <el-col :span="7"><b>企业抬头:</b>{{ order.orderInvoice.invoiceTitle }}</el-col>
+        <el-col :span="7"><b>纳税人识别号:</b>{{ order.orderInvoice.corporationTaxNum }}</el-col>
+      </el-row>
+      <template v-if="order.orderInvoice.type*1===2">
+        <el-row :gutter="24" class="box-row">
+          <el-col :span="7"><b>单位名称:</b>{{ order.orderInvoice.invoiceTitle }}</el-col>
+          <el-col :span="7"><b>纳税人识别号:</b>{{ order.orderInvoice.corporationTaxNum }}</el-col>
+          <el-col :span="7"><b>注册地址:</b>{{ order.orderInvoice.registeredAddress }}</el-col>
+        </el-row>
+        <el-row :gutter="24" class="box-row">
+          <el-col :span="7"><b>注册电话:</b>{{ order.orderInvoice.registeredPhone }}</el-col>
+          <el-col :span="7"><b>开户银行:</b>{{ order.orderInvoice.openBank }}</el-col>
+          <el-col :span="7"><b>银行账号:</b>{{ order.orderInvoice.bankAccountNo }}</el-col>
+        </el-row>
+      </template>
+    </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 { getRefundDetail } 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
+      getRefundDetail({ 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>
+

src/views/order/refund.vue

@@ -1,14 +1,146 @@
 <template>
   <div class="app-container">
-    {{ msg }}
+    <div class="filter-container">
+      <el-form ref="searchForm" :inline="true" class="demo-form-inline">
+        <el-input v-model="listQuery.returnedNo" placeholder="退款编号" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
+        <el-input v-model="listQuery.orderID" placeholder="订单ID" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
+        <el-input v-model="listQuery.orderNo" placeholder="订单编号" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
+        <el-input v-model="listQuery.userName" placeholder="买家" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
+        <el-select v-model="listQuery.status" placeholder="退款审核状态" clearable style="width: 130px" class="filter-item" value="" @change="handleFilter">
+          <el-option label="待审核" value="1" />
+          <el-option label="审核通过" value="2" />
+          <el-option label="审核不通过" value="3" />
+        </el-select>
+        <el-form-item label="  申请时间:">
+          <el-date-picker
+            v-model="listQuery.beginReturnTime"
+            style="width:150px"
+            type="date"
+            placeholder="选择日期"
+            format="yyyy/MM/dd"
+            value-format="yyyy-MM-dd"
+          />
+          至
+          <el-date-picker
+            v-model="listQuery.endReturnTime"
+            style="width:150px"
+            type="date"
+            placeholder="选择日期"
+            format="yyyy/MM/dd"
+            value-format="yyyy-MM-dd"
+          />
+        </el-form-item>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查询</el-button>
+      </el-form>
+    </div>
+
+    <el-table
+      v-loading="listLoading"
+      :data="list"
+      element-loading-text="Loading"
+      border
+      fit
+      highlight-current-row
+      style="width:100%;margin-top:20px;"
+    >
+      <el-table-column align="center" label="序号" width="50">
+        <template slot-scope="scope">
+          {{ scope.$index }}
+        </template>
+      </el-table-column>
+      <el-table-column label="退款编号" align="center" prop="returnedNo" />
+      <el-table-column label="退款审核状态" align="center" prop="status">
+        <template slot-scope="{row}">
+          <el-tag v-if="row.status*1===1" type="warning" size="small">待审核</el-tag>
+          <el-tag v-if="row.status*1===2" type="success" size="small">审核通过</el-tag>
+          <el-tag v-if="row.status*1===3" type="danger" size="small">审核不通过</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="买家" align="center" prop="userName" />
+      <el-table-column label="订单编号(ID)" align="center" prop="orderNo">
+        <template slot-scope="{row}">{{ row.orderNo + '(' + row.orderID + ')' }}</template>
+      </el-table-column>
+      <el-table-column label="退款金额" align="center" prop="refundFee">
+        <template slot-scope="{row}">{{ row.refundFee | toThousandFilter }}</template>
+      </el-table-column>
+      <el-table-column label="退款方式" align="center" prop="returnedWay">
+        <template slot-scope="{row}">
+          <template v-if="row.returnedWay*1===4">未支付无退款</template>
+          <template v-else-if="row.returnedWay*1===1">
+            <span v-if="row.refundBalanceFee*1 !== 0">余额账户:¥{{ row.refundBalanceFee | toThousandFilter }}</span>
+            <span v-if="row.refundOnlineFee*1 !== 0">线上退回:¥{{ row.refundOnlineFee | toThousandFilter }}</span>
+            <span v-if="row.refundOfflineFee*1 !== 0">线下转账:¥{{ row.refundOfflineFee | toThousandFilter }}</span>
+          </template>
+          <template v-else>----</template>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请人" align="center" prop="applicationUserName" />
+      <el-table-column align="center" label="申请时间" prop="returnTime">
+        <template 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}">
+          <i class="el-icon-time" />
+          <span>{{ row.confirmReturnTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="{row}">
+          <router-link :to="'/order/refund/detail/' + row.orderID "><el-button type="primary" size="small">查看详情</el-button></router-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
+
   </div>
 </template>
 
 <script>
+import { getRefundList } from '@/api/order'
+import Pagination from '@/components/Pagination'
 export default {
+  components: { Pagination },
   data() {
     return {
-      msg: '用户退款列表'
+      list: null,
+      listLoading: true,
+      total: 0,
+      searchTimeVal: '',
+      listQuery: {
+        index: 1,
+        pageSize: 20,
+        organizeID: this.organizeID,
+        returnedNo: '',
+        orderID: '',
+        orderNo: '',
+        userName: '',
+        beginReturnTime: '',
+        endReturnTime: '',
+        status: ''
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getRefundList(this.listQuery).then(response => {
+        this.list = response.data.results
+        this.total = response.data.totalRecord
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+      })
+    },
+    handleFilter() {
+      this.fetchData()
     }
   }
 }
@@ -16,4 +148,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>