From f0f50652e373563e6ea9fe7edd9df6403fd5c1ef Mon Sep 17 00:00:00 2001
From: wangh <9483>
Date: Thu, 14 Dec 2023 13:39:27 +0800
Subject: [PATCH] =?UTF-8?q?pc=E7=AB=AF=20=E5=A2=9E=E5=8A=A0=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E7=BB=9F=E8=AE=A1=20=20=E5=92=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin/src/api/order/cardvaluerecord.js   |  18 +
 fuintAdmin/src/api/order/cashierorder.js      |  18 +
 fuintAdmin/src/api/order/data.js              |  52 ++
 fuintAdmin/src/api/order/exportExcel.js       |  53 ++
 fuintAdmin/src/api/order/goodsorder.js        |  28 +
 fuintAdmin/src/api/order/oilnumgun.js         |  45 ++
 fuintAdmin/src/api/order/oilorder.js          |  63 +++
 fuintAdmin/src/api/order/staff.js             |  69 +++
 fuintAdmin/src/api/order/user.js              |  78 +++
 fuintAdmin/src/api/userInfoOrder.js           |  57 ++
 fuintAdmin/src/views/order/order_Cashier.vue  | 488 ++++++++++++++++++
 fuintAdmin/src/views/order/order_Goods.vue    | 408 +++++++++++++++
 fuintAdmin/src/views/order/order_Integral.vue | 424 +++++++++++++++
 fuintAdmin/src/views/order/order_Oil.vue      | 484 +++++++++++++++++
 fuintAdmin/src/views/order/order_Ordinary.vue | 438 ++++++++++++++++
 fuintAdmin/src/views/order/order_Unpaid.vue   | 435 ++++++++++++++++
 fuintAdmin/src/views/order/order_Vip.vue      | 431 ++++++++++++++++
 17 files changed, 3589 insertions(+)
 create mode 100644 fuintAdmin/src/api/order/cardvaluerecord.js
 create mode 100644 fuintAdmin/src/api/order/cashierorder.js
 create mode 100644 fuintAdmin/src/api/order/data.js
 create mode 100644 fuintAdmin/src/api/order/exportExcel.js
 create mode 100644 fuintAdmin/src/api/order/goodsorder.js
 create mode 100644 fuintAdmin/src/api/order/oilnumgun.js
 create mode 100644 fuintAdmin/src/api/order/oilorder.js
 create mode 100644 fuintAdmin/src/api/order/staff.js
 create mode 100644 fuintAdmin/src/api/order/user.js
 create mode 100644 fuintAdmin/src/api/userInfoOrder.js
 create mode 100644 fuintAdmin/src/views/order/order_Cashier.vue
 create mode 100644 fuintAdmin/src/views/order/order_Goods.vue
 create mode 100644 fuintAdmin/src/views/order/order_Integral.vue
 create mode 100644 fuintAdmin/src/views/order/order_Oil.vue
 create mode 100644 fuintAdmin/src/views/order/order_Ordinary.vue
 create mode 100644 fuintAdmin/src/views/order/order_Unpaid.vue
 create mode 100644 fuintAdmin/src/views/order/order_Vip.vue

diff --git a/fuintAdmin/src/api/order/cardvaluerecord.js b/fuintAdmin/src/api/order/cardvaluerecord.js
new file mode 100644
index 000000000..ff5e805d9
--- /dev/null
+++ b/fuintAdmin/src/api/order/cardvaluerecord.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 查询挂账信息列表
+export function listCardValueRecord(cardValueRecord) {
+  return request({
+    url: '/business/marketingActivity/cardValueRecord',
+    method: 'get',
+    params: cardValueRecord
+  })
+}
+
+// 查询挂账信息列表
+export function cardValueRecordInfo(id) {
+  return request({
+    url: '/business/marketingActivity/cardValueRecord/'+id,
+    method: 'get',
+  })
+}
diff --git a/fuintAdmin/src/api/order/cashierorder.js b/fuintAdmin/src/api/order/cashierorder.js
new file mode 100644
index 000000000..fbcc672d3
--- /dev/null
+++ b/fuintAdmin/src/api/order/cashierorder.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 查询收银台订单列表
+export function listCashierOrder(query) {
+  return request({
+    url: '/business/cashierOrder/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据id查询收银台订单列表
+export function cashierOrder(id) {
+  return request({
+    url: '/business/cashierOrder/'+id,
+    method: 'get',
+  })
+}
diff --git a/fuintAdmin/src/api/order/data.js b/fuintAdmin/src/api/order/data.js
new file mode 100644
index 000000000..6c9eb79b4
--- /dev/null
+++ b/fuintAdmin/src/api/order/data.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询字典数据列表
+export function listData(query) {
+  return request({
+    url: '/system/dict/data/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询字典数据详细
+export function getData(dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'get'
+  })
+}
+
+// 根据字典类型查询字典数据信息
+export function getDicts(dictType) {
+  return request({
+    url: '/system/dict/data/type/' + dictType,
+    method: 'get'
+  })
+}
+
+// 新增字典数据
+export function addData(data) {
+  return request({
+    url: '/system/dict/data',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改字典数据
+export function updateData(data) {
+  return request({
+    url: '/system/dict/data',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除字典数据
+export function delData(dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'delete'
+  })
+}
diff --git a/fuintAdmin/src/api/order/exportExcel.js b/fuintAdmin/src/api/order/exportExcel.js
new file mode 100644
index 000000000..226642ca8
--- /dev/null
+++ b/fuintAdmin/src/api/order/exportExcel.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 导出收银台订单
+export function exportExcelCashierApi(data) {
+  return request({
+    url: 'business/cashierOrder/exportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明响应类型为二进制流
+    data: data // 通过 data 参数传递需要的数据
+  });
+}
+
+// 导出油品订单
+export function exportExcelOilOrderApi(data) {
+  return request({
+    url: 'business/oilOrder/exportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明响应类型为二进制流
+    // params: data
+    data: data // 通过 data 参数传递需要的数据
+  });
+}
+
+
+// 导出商品订单
+export function exportExcelGoodsOrderApi(data) {
+  return request({
+    url: 'business/order/exportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明响应类型为二进制流
+    data: data // 通过 data 参数传递需要的数据
+  });
+}
+
+// 导出会员充值订单
+export function exportExcelVipApi(data) {
+  return request({
+    url: 'business/marketingActivity/cardValueRecord/exportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明响应类型为二进制流
+    data: data // 通过 data 参数传递需要的数据
+  });
+}
+
+// 导出小程序订单
+export function exportExcelAppletApi(data) {
+  return request({
+    url: 'business/cashierOrder/exportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明响应类型为二进制流
+    data: data // 通过 data 参数传递需要的数据
+  });
+}
\ No newline at end of file
diff --git a/fuintAdmin/src/api/order/goodsorder.js b/fuintAdmin/src/api/order/goodsorder.js
new file mode 100644
index 000000000..a3942218c
--- /dev/null
+++ b/fuintAdmin/src/api/order/goodsorder.js
@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+
+// 查询商品订单列表
+export function listOrder(query) {
+  return request({
+    url: '/business/order/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据订单id查询商品订单信息
+export function getOrderGoods(data) {
+  return request({
+    url: '/business/orderGoods/orderList',
+    method: 'post',
+    data: data,
+  })
+}
+
+// 根据订单id查询商品订单信息
+export function getGoodsOrder(data) {
+  return request({
+    url: '/business/order/id',
+    method: 'post',
+    data: data,
+  })
+}
diff --git a/fuintAdmin/src/api/order/oilnumgun.js b/fuintAdmin/src/api/order/oilnumgun.js
new file mode 100644
index 000000000..5371fa1fb
--- /dev/null
+++ b/fuintAdmin/src/api/order/oilnumgun.js
@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+// 查询油号油枪列表
+export function listOilNumGun() {
+  return request({
+    url: '/api/cashier/list',
+    method: 'get',
+  })
+}
+
+// 查询油号油枪列表
+export function getOilNumGun(data) {
+  return request({
+    url: '/api/cashier/oilNum' ,
+    method: 'post',
+    data: data
+  })
+}
+
+// 根据id查询油号油枪列表
+export function getOilNumGunById(id) {
+  return request({
+    url: '/api/cashier/' +id ,
+    method: 'get',
+    // data: data
+  })
+}
+
+// 根据id油品名称
+export function getOilNameById(id) {
+  return request({
+    url: '/business/petrolStationManagement/oilName/' +id ,
+    method: 'get',
+    // data: data
+  })
+}
+
+// 根据id油品名称
+export function getOilNameList() {
+  return request({
+    url: '/business/petrolStationManagement/oilName/queryOilName' ,
+    method: 'get',
+    // data: data
+  })
+}
diff --git a/fuintAdmin/src/api/order/oilorder.js b/fuintAdmin/src/api/order/oilorder.js
new file mode 100644
index 000000000..8f4b06997
--- /dev/null
+++ b/fuintAdmin/src/api/order/oilorder.js
@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+// 查询油品订单列表
+export function listOilOrder(query) {
+  return request({
+    url: '/business/oilOrder/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据id查询油品订单信息
+export function oilOrderInfo(id) {
+  return request({
+    url: '/business/oilOrder/'+id,
+    method: 'get',
+  })
+}
+
+// 新增油品订单信息
+export function addLJGoods(data) {
+  return request({
+    url: '/business/oilOrder',
+    method: 'post',
+    data: data
+  })
+}
+
+// 根据订单号查询油品订单信息
+export function oilOrder(data) {
+  return request({
+    url: '/business/oilOrder/orderNo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 根据订单号查询油品订单信息
+export function goodsOrder(data) {
+  return request({
+    url: '/business/order/orderNo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 根据订单号模糊查询油品订单信息
+export function oilOrders(data) {
+  return request({
+    url: '/business/oilOrder/orderNos',
+    method: 'post',
+    data: data
+  })
+}
+
+// 根据订单号模糊查询油品订单信息
+export function oilOrderList(data) {
+  return request({
+    url: '/business/oilOrder/orderNoVo',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/fuintAdmin/src/api/order/staff.js b/fuintAdmin/src/api/order/staff.js
new file mode 100644
index 000000000..50988682c
--- /dev/null
+++ b/fuintAdmin/src/api/order/staff.js
@@ -0,0 +1,69 @@
+import request from '@/utils/request'
+
+// 查询员工列表
+export function listStaff(query) {
+  return request({
+    url: '/business/member/staff/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询所有员工
+export function queryStaffs() {
+  return request({
+    url: '/business/member/staff/query',
+    method: 'get'
+  })
+}
+
+// 查询员工详细
+export function getStaff(id) {
+  return request({
+    url: '/business/member/staff/' + id,
+    method: 'get'
+  })
+}
+
+// 查询当前登录账号信息
+export function staffInfo() {
+  return request({
+    url: '/business/member/staff/name',
+    method: 'get'
+  })
+}
+
+// 根据手机号查询员工详情
+export function queryStaff(data) {
+  return request({
+    url: '/business/member/staff/mobile',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增员工
+export function addStaff(data) {
+  return request({
+    url: '/business/member/staff',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改员工
+export function updateStaff(data) {
+  return request({
+    url: '/business/member/staff',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除员工
+export function delStaff(id) {
+  return request({
+    url: '/business/member/staff/' + id,
+    method: 'delete'
+  })
+}
diff --git a/fuintAdmin/src/api/order/user.js b/fuintAdmin/src/api/order/user.js
new file mode 100644
index 000000000..9a4171acb
--- /dev/null
+++ b/fuintAdmin/src/api/order/user.js
@@ -0,0 +1,78 @@
+import request from '@/utils/request'
+
+// 查询会员列表
+export function listUser(query) {
+  return request({
+    url: '/business/userManager/user/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询会员统计列表
+export function listUserStatistic(query) {
+  return request({
+    url: '/business/userManager/userStatistic/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询会员列表
+export function listStatistic(query) {
+  return request({
+    url: '/business/userManager/user/statistic',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询会员详细
+export function getUser(id) {
+  return request({
+    url: '/business/userManager/user/' + id,
+    method: 'get'
+  })
+}
+// 根据手机号查询会员详细
+export function getUserMobile(data) {
+  return request({
+    url: '/business/userManager/user/mobile' ,
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增会员
+export function addUser(data) {
+  return request({
+    url: '/business/userManager/user',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改会员
+export function updateUser(data) {
+  return request({
+    url: '/business/userManager/user',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除会员
+export function delUser(id) {
+  return request({
+    url: '/business/userManager/user/' + id,
+    method: 'delete'
+  })
+}
+
+//下载示例文件
+export function exportUsers() {
+  return request({
+    url: '/excel/export',
+    method: 'get'
+  })
+}
diff --git a/fuintAdmin/src/api/userInfoOrder.js b/fuintAdmin/src/api/userInfoOrder.js
new file mode 100644
index 000000000..0cacbc5a7
--- /dev/null
+++ b/fuintAdmin/src/api/userInfoOrder.js
@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+
+// 加油订单
+export function getOilOrderList(query) {
+    return request({
+        url: 'business/oilOrder/userOrders2',
+        method: 'get',
+        params: query
+    })
+  }
+
+// 商品订单
+export function getMtOrderList(query) {
+    return request({
+        url: 'business/order/getMtOrderList',
+        method: 'get',
+        params: query
+    })
+  }
+
+// 余额记录
+export function getCardRecordList(query) {
+    return request({
+        url: '/business/CardBalanceChange/getCardRecordList',
+        method: 'get',
+        params: query
+    })
+  }
+
+// 屯油卡
+export function getFuelRecordList(query) {
+    return request({
+        url: 'business/marketingActivity/cardFuelChange/getFuelRecordList',
+        method: 'get',
+        params: query
+    })
+  }
+
+// 积分记录
+export function getIntegralDetailList(query) {
+    return request({
+        url: 'business/integral/integralDetail/queryByPageUni2',
+        method: 'get',
+        params: query
+    })
+  }
+
+// 卡券列表
+export function getCardFavorableList(query) {
+    return request({
+        url: 'business/marketingActivity/cardFavorableRecord/getCardFavorableList',
+        method: 'get',
+        params: query
+    })
+  }
+// 成长值记录
\ No newline at end of file
diff --git a/fuintAdmin/src/views/order/order_Cashier.vue b/fuintAdmin/src/views/order/order_Cashier.vue
new file mode 100644
index 000000000..9928e736c
--- /dev/null
+++ b/fuintAdmin/src/views/order/order_Cashier.vue
@@ -0,0 +1,488 @@
+<!-- 收银台订单-->
+<template>
+  <div  class="app-container">
+    <el-card class="box-card">
+<!--      <div style="display: flex;">-->
+<!--        <div class="top-app-sou">-->
+<!--          <el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">-->
+<!--            <el-form-item label="名称">-->
+<!--              <el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-form>-->
+<!--        </div>-->
+<!--        <div style="margin-left: 10px">-->
+<!--          <el-button type="primary" icon="el-icon-search">搜索</el-button>-->
+<!--        </div>-->
+<!--      </div>-->
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+        <el-form-item label="交易员工" prop="staffId">
+          <el-select
+            v-model="queryParams.staffId"
+            clearable
+            placeholder="全部"
+          >
+            <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
+              <span style="float: left">{{ item.realName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="订单号">
+          <el-input v-model="queryParams.orderNo" placeholder="订单号、官方单号检索"></el-input>
+        </el-form-item>
+        <el-form-item label="交易时间">
+          <el-date-picker
+            v-model="dateRange"
+            style="width: 240px"
+            size="medium"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>收银台订单统计</span>
+      </div>
+      <div class="box-gang">
+        <div class="box" v-for="(item,index) in 7" :key="index">
+          <div class="size-hui">订单总数</div>
+          <div class="size-bole">55</div>
+        </div>
+
+      </div>
+    </el-card>
+    <el-card class="box-card">
+      <div class="wgang">
+        <div>收银台订单列表</div>
+       <div style="display: flex ">
+
+         <el-button type="primary" size="mini" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>
+       </div>
+      </div>
+      <div class="table-box">
+        <el-table
+          :data="orderList"
+          style="width: 100%">
+          <el-table-column type="expand">
+            <template slot-scope="props">
+              <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">
+                <el-form-item label="收银员">
+                  <span>{{ getRealName(staffList,props.row.staffId) }}</span>
+                </el-form-item>
+                <el-form-item label="收银员手机号">
+                  <span>{{ getMobile(staffList,props.row.staffId) }}</span>
+                </el-form-item>
+              </el-form>
+            </template>
+          </el-table-column>
+          <el-table-column prop="orderNo" label="订单号" width="180"> </el-table-column>
+          <el-table-column prop="amount" label="订单金额"> </el-table-column>
+          <el-table-column
+            prop="payAmount"
+            label="实付金额">
+          </el-table-column>
+          <el-table-column label="订单金额组成">
+            <el-table-column
+              prop="oilOrderAmount"
+              label="油品金额">
+            </el-table-column>
+            <el-table-column
+              prop="goodsOrderAmount"
+              label="商品金额">
+            </el-table-column>
+          </el-table-column>
+
+          <el-table-column
+            prop="payUser"
+            label="付款用户">
+          </el-table-column>
+
+          <el-table-column
+            prop="status"
+            label="状态">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
+              <el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
+              <el-tag type="danger" v-else>支付失败</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="交易时间" align="center" width="160" prop="payTime">
+            <template slot-scope="scope">
+              <span>{{ scope.row.payTime ? parseTime(scope.row.payTime):"--" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button style="width: 60px" size="mini"
+                         @click="getOrdersInfo(scope.row.id)"
+                         type="success" plain round>详情</el-button>
+              <el-button style="width: 60px" size="mini"
+                         @click="patchwork(scope.row)"
+                         type="primary" plain round>补打</el-button>
+              <el-button style="width: 60px" size="mini"
+                         @click="handleRefund(scope.row.id)"
+                         type="danger" plain round>退款</el-button>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </div>
+      <div class="pagination-box">
+        <el-pagination
+          background
+          v-show="total>0"
+          layout="prev, pager, next"
+          :total="total"
+          :page.sync="queryParams.page"
+          :limit.sync="queryParams.pageSize"
+          @current-change="getList">
+        </el-pagination>
+      </div>
+
+    </el-card>
+
+<!--    订单详情-->
+    <el-dialog
+      title="订单详情"
+      :visible.sync="dialogVisible">
+      <div>
+        <el-descriptions>
+          <el-descriptions-item label="收银员姓名">{{ cashierOrder.realName }}</el-descriptions-item>
+          <el-descriptions-item label="收银员账号">{{ cashierOrder.mobile }}</el-descriptions-item>
+          <el-descriptions-item label="订单编号">{{ cashierOrder.orderNo }}</el-descriptions-item>
+          <el-descriptions-item label="订单金额">{{ cashierOrder.amount }}</el-descriptions-item>
+          <el-descriptions-item label="油品金额">{{ cashierOrder.oilOrderAmount }}</el-descriptions-item>
+          <el-descriptions-item label="商品金额">{{ cashierOrder.goodsOrderAmount }}</el-descriptions-item>
+          <el-descriptions-item label="油品优惠总额">{{ cashierOrder.oilDiscountAmount }}</el-descriptions-item>
+          <el-descriptions-item label="商品优惠总额">{{ cashierOrder.goodsDiscountAmount }}</el-descriptions-item>
+          <el-descriptions-item label="实付金额">{{ cashierOrder.payAmount }}</el-descriptions-item>
+          <el-descriptions-item label="付款方式">
+            <el-tag v-if="cashierOrder.status == 'unpaid'">未支付</el-tag>
+            <el-tag type="success" v-else-if="cashierOrder.status == 'paid'">已支付</el-tag>
+            <el-tag type="danger" v-else>支付失败</el-tag>
+          </el-descriptions-item>
+          <el-descriptions-item label="交易时间">
+            {{ cashierOrder.payTime ? parseTime(cashierOrder.payTime):"--" }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+      <div>
+        <el-descriptions :column="1" direction="vertical">
+          <el-descriptions-item label="油品详情">
+            <el-table
+              :data="oilInfo"
+              style="width: 100%">
+              <el-table-column label="油品金额" prop="orderAmount">
+                <template slot-scope="scope">
+                  <span>￥{{ scope.row.orderAmount }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="油号油枪" align="center" prop="terminal">
+                <template slot-scope="scope">
+                  <span>{{ getName(oilNameList,scope.row.oils) }}/{{ scope.row.oilGunNum }}号枪</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="加油升数" align="center" prop="oilNum" >
+                <template slot-scope="scope">
+                  <span>{{ scope.row.oilNum }}L</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="油品单价" align="center" prop="amount">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.oilPrice }}/L</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-descriptions-item>
+          <el-descriptions-item label="商品详情">
+            <el-table
+              :data="goodsInfo"
+              style="width: 100%">
+              <el-table-column label="商品名称" prop="name"/>
+              <el-table-column label="单价" align="center" prop="retailPrice">
+                <template slot-scope="scope">
+                  <span v-if="cashierOrder.payUser == '散客'">{{ scope.row.retailPrice }}</span>
+                  <span v-else>{{ scope.row.memberPrice }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="数量" align="center" prop="num"/>
+              <el-table-column label="合计" align="center" prop="num">
+                <template slot-scope="scope">
+                  <span v-if="cashierOrder.payUser == '散客'">{{ scope.row.retailPrice * scope.row.num }}</span>
+                  <span v-else>{{ scope.row.memberPrice * scope.row.num }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+    </el-dialog>
+<!--    订单退款-->
+    <el-dialog
+      title="订单退款"
+      width="25%"
+      :visible.sync="dialogRefund">
+      <div style="text-align: center;font-weight: bold">
+        ￥<span style="font-size: 35px">{{ cashierOrder.amount }}</span>
+      </div>
+      <div class="tk">退款金额</div>
+      <div class="tk">退款单号：{{ cashierOrder.orderNo }}</div>
+      <div style="margin: 10px 0">
+        退款原因<br/>
+        <el-radio-group v-model="radio1" style="margin: 10px 0">
+          <el-radio-button label="油号选错"></el-radio-button>
+          <el-radio-button label="金额错误"></el-radio-button>
+          <el-radio-button label="其他原因"></el-radio-button>
+        </el-radio-group>
+      </div>
+      <div>
+        <el-input placeholder="请输入密码" v-model="password" show-password></el-input>
+        <br/>
+        <span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理</span>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogRefund = false">取 消</el-button>
+        <el-button type="primary" @click="dialogRefund = false">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {cashierOrder, listCashierOrder} from "@/api/order/cashierorder";
+  import {queryStaffs} from "@/api/order/staff";
+import {oilOrderList, oilOrders} from "@/api/order/oilorder";
+import {getOilNameList} from "@/api/order/oilnumgun";
+import {getOrderGoods} from "@/api/order/goodsorder";
+import {exportExcelCashierApi} from "@/api/order/exportExcel";
+
+  export default {
+    name: "order_Cashier",
+    data(){
+      return{
+        // 退款密码
+        password:"",
+        radio1:"油号选错",
+        // 油号列表
+        oilNameList:[],
+        // 油品订单详情列表
+        oilInfo:[],
+        // 商品订单详情列表
+        goodsInfo:[],
+        // 收银员订单详情
+        cashierOrder:{},
+        dialogVisible:false,
+        dialogRefund:false,
+        // 员工列表
+        staffList:[],
+        // 日期范围
+        dateRange: [],
+        // 收银台订单列表
+        orderList:[],
+        // 查询参数
+        queryParams: {
+          page: 1,
+          pageSize: 10,
+        },
+        total:0,
+    
+      }
+    },
+    created() {
+      this.getList();
+      this.getStaffList();
+    },
+    methods:{
+      exportExcelCashier() {
+        exportExcelCashierApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
+          const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+          this.$download.saveAs(blob,'收银台订单统计.xLsx')
+        })
+    },
+      // 获取员工姓名
+      getRealName(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.id == val){
+            name = item.realName
+          }
+        })
+        return name;
+      },
+      // 获取员工手机号
+      getMobile(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.id == val){
+            name = item.mobile
+          }
+        })
+        return name;
+      },
+      // 补打
+      patchwork(data){
+        const orderNo = data.orderNo
+        this.$modal.confirm('确定您要补打当前订单吗？当前订单号[' + orderNo + '],请确保云打印机正在运行中').then(function() {
+          // return delUser(row.id);
+        }).then(() => {
+          this.$modal.msgSuccess("打印指令已发送打印机,请查看打印结果");
+        }).catch(() => {});
+      },
+      // 退款
+      handleRefund(id){
+        this.dialogRefund = true;
+        cashierOrder(id).then( response => {
+          this.cashierOrder = response.data
+        })
+      },
+      // 获取油号名称
+      getName(oilNameList,id){
+        let name = ""
+        let _this = this;
+        if(oilNameList!=null && oilNameList!=""){
+          oilNameList.forEach(item => {
+            if (item.id == id){
+              name = item.oilName;
+              _this.oilType = item.oilType;
+            }
+          })
+        }
+        return name;
+      },
+      // 获取订单详情
+      getOrdersInfo(id){
+        this.dialogVisible = true;
+        cashierOrder(id).then( response => {
+          this.cashierOrder = response.data
+          this.getOilList(this.cashierOrder.orderNo)
+          this.getGoodsLists(this.cashierOrder.goodsOrderId)
+        })
+      },
+      getOilList(orderNo){
+        oilOrderList({orderNo:orderNo}).then( response => {
+          this.oilInfo = response.data
+        })
+      },
+      getGoodsLists(id){
+        getOrderGoods({orderId:id}).then( response => {
+          this.goodsInfo = response.data;
+        })
+      },
+      // 获取列表信息
+      getList(val){
+        if (val!=undefined){
+          this.queryParams.page = val
+        }
+        listCashierOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
+          this.orderList = response.data.records;
+          this.total = response.data.total;
+        })
+      },
+      // 获取员工列表信息
+      getStaffList(){
+        queryStaffs().then( response => {
+          this.staffList = response.data;
+        })
+        getOilNameList().then( response => {
+          this.oilNameList = response.data;
+        })
+      },
+      // 搜索按钮操作
+      handleQuery() {
+        this.queryParams.page = 1;
+        this.getList();
+      },
+      // 重置按钮操作
+      resetQuery() {
+        this.dateRange = [];
+        this.queryParams = {
+          page: 1,
+          pageSize: 10,
+        }
+        // this.resetForm("queryForm");
+        this.handleQuery();
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+.app-container{
+    width: 100%;
+    height: 100%;
+    background: #f6f8f9;
+  }
+  .app-top{
+    width: 100%;
+
+    height: 60px;
+    box-sizing: border-box;
+    padding: 10px;
+  }
+  .clearfix{
+    width: 100%;
+
+  }
+  .box-card{
+    width: 100%;
+    margin-bottom: 15px;
+  }
+  .box-gang{
+    width: 100%;
+    display: flex;
+    align-items: center;
+  }
+  .box{
+    width: 200px;
+    box-sizing: border-box;
+    padding: 10px;
+    background: #f9f9f9;
+    height: 86px;
+    margin-right: 10px;
+  }
+  .size-hui{
+    font-size: 14px;
+    margin-bottom: 10px;
+    margin-top: 10px;
+  }
+  .size-bole{
+    font-weight: bold;
+  }
+  .wgang{
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 20px;
+
+  }
+  .table-box{
+    width: 100%;
+  }
+  .pagination-box{
+    width: 100%;
+    margin: 10px auto;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .top-app-sou{
+    width: 20%;
+  }
+  .tk{
+    text-align: center;
+    color: grey;
+    margin: 10px 0;
+  }
+
+</style>
diff --git a/fuintAdmin/src/views/order/order_Goods.vue b/fuintAdmin/src/views/order/order_Goods.vue
new file mode 100644
index 000000000..e7b74e22a
--- /dev/null
+++ b/fuintAdmin/src/views/order/order_Goods.vue
@@ -0,0 +1,408 @@
+<!--商品交易列表-->
+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="交易员工" prop="staffId">
+          <el-select
+            v-model="queryParams.staffId"
+            clearable
+            placeholder="全部"
+          >
+            <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
+              <span style="float: left">{{ item.realName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="支付类型" prop="payType">
+          <el-select
+            v-model="queryParams.payType"
+            placeholder="全部"
+            clearable
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in payList"
+              :key="item.id"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="订单号" prop="orderNo">
+          <el-input
+            v-model="queryParams.orderNo"
+            placeholder="请输入订单号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="手机号" prop="payUser">
+          <el-input
+            v-model="queryParams.payUser"
+            placeholder="请输入会员手机号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="交易时间">
+          <el-date-picker
+            v-model="dateRange"
+            style="width: 240px"
+            size="medium"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <!--      <div style="display: flex;">-->
+      <!--        <div class="top-app-sou">-->
+      <!--          <el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">-->
+      <!--            <el-form-item label="名称">-->
+      <!--              <el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>-->
+      <!--            </el-form-item>-->
+      <!--          </el-form>-->
+      <!--        </div>-->
+      <!--        <div style="margin-left: 10px">-->
+      <!--          <el-button type="primary" icon="el-icon-search">搜索</el-button>-->
+      <!--        </div>-->
+      <!--      </div>-->
+    </el-card>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>商品交易统计</span>
+      </div>
+      <div class="box-gang">
+        <div class="box" v-for="(item,index) in 7" :key="index">
+          <div class="size-hui">订单总数</div>
+          <div class="size-bole">55</div>
+        </div>
+
+      </div>
+    </el-card>
+    <el-card class="box-card">
+      <div class="wgang">
+        <div>商品交易列表</div>
+       <div style="display: flex ">
+         <el-button type="primary" size="mini" icon="el-icon-plus" @click="exportExcelGoodsOrder()">导出订单</el-button>
+       </div>
+      </div>
+      <div class="table-box">
+        <el-table
+          :data="list"
+          style="width: 100%">
+          <el-table-column type="expand">
+            <template slot-scope="props">
+              <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">
+                <el-form-item label="收银员">
+                  <span>{{ queryStaf(staffList,props.row.staffId) }}</span>
+                </el-form-item>
+                <el-form-item label="来源终端">
+                  <span>{{ getVal(terminalList,props.row.terminal) }}</span>
+                </el-form-item>
+              </el-form>
+            </template>
+          </el-table-column>
+          <el-table-column label="订单ID" prop="id" width="80"/>
+          <el-table-column label="终端" align="center" prop="terminal"/>
+          <el-table-column label="订单号" align="center" prop="orderNo" width="200"/>
+          <el-table-column label="订单金额" align="center" prop="amount"/>
+          <el-table-column label="优惠金额" align="center" prop="discount"/>
+          <el-table-column label="商品数量" align="center" prop="goodsNum">
+            <template slot-scope="scope">
+              <el-tag @click="getGoods(scope.row.id)">{{ scope.row.goodsNum }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="实付金额" align="center" prop="payAmount"/>
+          <el-table-column label="付款用户" align="center" prop="payUser"/>
+          <el-table-column label="付款类型" align="center" prop="payType">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
+              <el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
+              <el-tag type="danger" v-else>支付失败</el-tag>
+            </template>
+          </el-table-column>
+          <!--        <el-table-column label="订单类型" align="center" prop="type"/>-->
+          <el-table-column label="交易员工" align="center" prop="staffId">
+            <template slot-scope="scope">
+              <span>{{ getRealName(staffList,scope.row.staffId) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="交易时间" align="center" width="150" prop="payTime">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.payTime) }}</span>
+            </template>
+          </el-table-column>
+
+<!--          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-button-->
+<!--                size="mini"-->
+<!--                type="text"-->
+<!--                icon="el-icon-edit"-->
+<!--              >更多操作</el-button>-->
+
+<!--            </template>-->
+<!--          </el-table-column>-->
+
+        </el-table>
+      </div>
+      <div class="pagination-box">
+        <el-pagination
+          background
+          layout="prev, pager, next"
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.page"
+          :limit.sync="queryParams.pageSize"
+          @current-change="getList">
+        </el-pagination>
+      </div>
+
+
+      <!-- 商品购买详情 -->
+      <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+        <el-table ref="tables" v-loading="loading" :data="goodsList" :default-sort="defaultSort">
+          <el-table-column label="商品名称" align="center" prop="name"/>
+          <el-table-column label="商品数量" align="center" prop="num"/>
+          <el-table-column label="商品单价" align="center" prop="retailPrice"/>
+          <el-table-column label="会员价" align="center" prop="memberPrice"/>
+        </el-table>
+        <div style="height: 20px"></div>
+      </el-dialog>
+
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { getOrderGoods, listOrder} from "@/api/order/goodsorder";
+import { queryStaffs } from "@/api/order/staff";
+import { getDicts } from "@/api/order/data";
+import { exportExcelGoodsOrderApi } from "@/api/order/exportExcel";
+
+export default {
+  name: "order_Cashier",
+  data(){
+    return{
+      // 终端列表
+      terminalList:[],
+      // 员工列表
+      staffList:[],
+      // 日期范围
+      dateRange: [],
+      // 遮罩层
+      loading: true,
+      // 标题
+      title: "",
+      // 选中数组
+      ids: [],
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      list: [],
+      goodsList:[],
+      // 是否显示弹出层
+      open: false,
+      // 默认排序
+      defaultSort: {prop: 'createTime', order: 'descending'},
+      // 查询参数
+      queryParams: {
+        page: 1,
+        pageSize: 10,
+      },
+      // 支付列表
+      payList:[],
+
+    }
+  },
+  created() {
+    this.getList();
+    this.getStaffList();
+    this.getPayList();
+  },
+  methods:{
+    exportExcelGoodsOrder() {
+      exportExcelGoodsOrderApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
+          const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+          this.$download.saveAs(blob,'商品订单统计.xLsx')
+        })
+    },
+
+    // 根据员工id查询员工信息
+    queryStaf(list,id){
+      let name = "";
+      list.forEach(item => {
+        if (item.id == id){
+          name = `${item.realName}(${item.mobile})`
+        }
+      })
+      return name;
+    },
+    getVal(list,val){
+      let name = "";
+      list.forEach(item => {
+        if (item.dictValue == val){
+          name = item.dictLabel
+        }
+      })
+      return name;
+    },
+    // 获取付款类型列表
+    getPayList(){
+      getDicts("payment_type").then( response => {
+        this.payList = response.data;
+      })
+      getDicts("terminal").then( response => {
+        this.terminalList = response.data;
+      })
+    },
+    // 获取商品详情
+    getGoods(id){
+      this.open = true;
+      this.title = "商品详情"
+      getOrderGoods(id).then( response => {
+        this.goodsList = response.data
+      })
+    },
+    // 获取员工姓名
+    getRealName(list,id){
+      var name = "";
+      list.forEach(item => {
+        if (item.id == id){
+          name = item.realName;
+        }
+      })
+      return name;
+    },
+    // 获取员工列表
+    getStaffList(){
+      queryStaffs().then( response => {
+        this.staffList = response.data;
+      })
+    },
+    // 查询订单
+    getList(val){
+      if (val!=undefined){
+        this.queryParams.page = val
+      }
+      this.loading = true;
+      listOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
+        this.list = response.data.records;
+        this.total = response.data.total;
+        this.loading = false;
+      })
+      // const app = this;
+      // app.loading = true;
+      // app.queryParams.storeIds = app.storeIds ? app.storeIds.join(",") : '';
+      // getOrderList(app.queryParams).then( response => {
+      //     this.list = response.data.paginationResponse.content;
+      //     this.total = response.data.paginationResponse.totalElements;
+      //     this.typeList = response.data.typeList;
+      //     this.statusList = response.data.statusList;
+      //     this.payStatusList = response.data.payStatusList;
+      //     this.orderModeList = response.data.orderModeList;
+      //     this.payTypeList = response.data.payTypeList;
+      //     this.storeList = response.data.storeList;
+      //     this.loading = false;
+      //   }
+      // );
+    },
+    // 搜索按钮操作
+    handleQuery() {
+      this.queryParams.page = 1;
+      this.getList();
+    },
+    // 重置按钮操作
+    resetQuery() {
+      this.dateRange = [];
+      this.queryParams.status = '';
+      this.queryParams.mobile = '';
+      this.queryParams.orderMode = '';
+      this.queryParams.orderSn = '';
+      this.queryParams.storeIds = '';
+      this.storeIds = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+.app-container{
+    width: 100%;
+    height: 100%;
+    background: #f6f8f9;
+  }
+.app-top{
+  width: 100%;
+
+  height: 60px;
+  box-sizing: border-box;
+  padding: 10px;
+}
+.clearfix{
+  width: 100%;
+
+}
+.box-card{
+  width: 100%;
+  margin-bottom: 15px;
+}
+.box-gang{
+  width: 100%;
+  display: flex;
+  align-items: center;
+}
+.box{
+  width: 200px;
+  box-sizing: border-box;
+  padding: 10px;
+  background: #f9f9f9;
+  height: 86px;
+  margin-right: 10px;
+}
+.size-hui{
+  font-size: 14px;
+  margin-bottom: 10px;
+  margin-top: 10px;
+}
+.size-bole{
+  font-weight: bold;
+}
+.wgang{
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 20px;
+
+}
+.table-box{
+  width: 100%;
+}
+.pagination-box{
+  width: 100%;
+  margin: 10px auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.top-app-sou{
+  width: 20%;
+}
+
+
+</style>
diff --git a/fuintAdmin/src/views/order/order_Integral.vue b/fuintAdmin/src/views/order/order_Integral.vue
new file mode 100644
index 000000000..27fe04b33
--- /dev/null
+++ b/fuintAdmin/src/views/order/order_Integral.vue
@@ -0,0 +1,424 @@
+<!--积分兑换订单-->
+<template>
+    <div class="app-container">
+      <el-tabs type="border-card">
+        <el-tab-pane label="积分商城订单">
+          <el-alert
+            title="当前页面订单为油站小程序端用户在积分商城兑换的订单记录,如有付款金额,付款订单请在增值性订单列表中查看,类型为:积分商城"
+            type="error">
+          </el-alert>
+
+          <points-mall></points-mall>
+
+<!--            <div class="top-dis">-->
+<!--              <div class="top-app-sou">-->
+<!--                <el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">-->
+<!--                  <el-form-item label="名称">-->
+<!--                    <el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>-->
+<!--                  </el-form-item>-->
+<!--                </el-form>-->
+<!--              </div>-->
+<!--              <div style="margin-left: 10px">-->
+<!--                <el-button type="primary" icon="el-icon-search">查询</el-button>-->
+<!--              </div>-->
+<!--            </div>-->
+
+<!--&lt;!&ndash;          列表&ndash;&gt;-->
+<!--          <div class="bottom-dis">-->
+<!--            <div class="wgang">-->
+<!--              <el-tabs v-model="activeName" @tab-click="handleClick">-->
+<!--                <el-tab-pane label="全部订单" name="first"></el-tab-pane>-->
+<!--                <el-tab-pane name="first1">-->
+<!--                  <div slot="label" class="hgang"> 待处理/待发货 <span class="hongdian">1</span>  </div>-->
+<!--                </el-tab-pane>-->
+<!--                <el-tab-pane name="first2">-->
+<!--                  <div slot="label" class="hgang"> 已完成/已发货 <span class="hongdian">1</span>  </div>-->
+<!--                </el-tab-pane>-->
+<!--                <el-tab-pane name="first3">-->
+<!--                  <div slot="label" class="hgang"> 已拒绝/已退款 <span class="hongdian">1</span>  </div>-->
+<!--                </el-tab-pane>-->
+<!--                <el-tab-pane name="first4">-->
+<!--                  <div slot="label" class="hgang"> 未付款订单 <span class="hongdian">1</span>  </div>-->
+<!--                </el-tab-pane>-->
+
+<!--              </el-tabs>-->
+<!--            </div>-->
+<!--            <div class="table-box">-->
+<!--              <el-table-->
+<!--                :data="tableData"-->
+<!--                style="width: 100%">-->
+<!--                <el-table-column type="expand">-->
+<!--                  <template slot-scope="props">-->
+<!--                    <el-form label-position="left" inline class="demo-table-expand">-->
+<!--                      <el-form-item label="名称">-->
+<!--                        <span>{{ props.row.name }}</span>-->
+<!--                      </el-form-item>-->
+<!--                    </el-form>-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="date"-->
+<!--                  label="用户信息"-->
+<!--                  width="150">-->
+<!--                </el-table-column>-->
+<!--                <el-table-column label="余额">-->
+<!--                  <el-table-column-->
+<!--                    prop="name"-->
+<!--                    label="储值卡"-->
+<!--                    width="120">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                    prop="name"-->
+<!--                    label="升值卡"-->
+<!--                    width="120">-->
+<!--                  </el-table-column>-->
+
+<!--                </el-table-column>-->
+<!--                <el-table-column label="会员等级">-->
+<!--                  <el-table-column-->
+<!--                    prop="province"-->
+<!--                    label="汽油"-->
+<!--                    width="120">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                    prop="city"-->
+<!--                    label="柴油"-->
+<!--                    width="120">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                    prop="city"-->
+<!--                    label="天然气"-->
+<!--                    width="120">-->
+<!--                  </el-table-column>-->
+<!--                </el-table-column>-->
+<!--                <el-table-column label="统计">-->
+<!--                  <el-table-column-->
+<!--                    prop="province"-->
+<!--                    label="加油金"-->
+<!--                    width="120">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                    prop="city"-->
+<!--                    label="积分"-->
+<!--                    width="120">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                    prop="city"-->
+<!--                    label="消费次数"-->
+<!--                    width="120">-->
+<!--                  </el-table-column>-->
+<!--                </el-table-column>-->
+
+<!--                <el-table-column-->
+<!--                  prop="zip"-->
+<!--                  label="实体卡号"-->
+<!--                  width="220">-->
+<!--                </el-table-column>-->
+
+<!--                <el-table-column-->
+<!--                  prop="zip"-->
+<!--                  label="状态"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
+
+<!--                <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--                  <template slot-scope="scope">-->
+<!--                    <el-button-->
+<!--                      size="mini"-->
+<!--                      type="text"-->
+<!--                      icon="el-icon-edit"-->
+<!--                    >更多操作</el-button>-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
+<!--              </el-table>-->
+<!--            </div>-->
+<!--            <div class="pagination-box">-->
+<!--              <el-pagination-->
+<!--                background-->
+<!--                layout="prev, pager, next"-->
+<!--                :total="1000">-->
+<!--              </el-pagination>-->
+<!--            </div>-->
+<!--          </div>-->
+
+        </el-tab-pane>
+        <el-tab-pane label="积分收银台订单">
+          <el-alert
+            title="PC积分收银台在线兑换订单记录,收银台订单无需确认操作,如有付款金额,付款订单请在增值性订单列表中查看,类型为:积分收银"
+            type="error">
+          </el-alert>
+
+          <points-cashier></points-cashier>
+
+<!--          <div class="bottom-dis">-->
+<!--          <div slot="header" class="clearfix">-->
+<!--            <span>统计</span>-->
+<!--          </div>-->
+<!--          <div class="box-gang">-->
+<!--            <div class="box" v-for="(item,index) in 7" :key="index">-->
+<!--              <div class="size-hui">订单总数</div>-->
+<!--              <div class="size-bole">55</div>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--          </div>-->
+<!--          <div class="table-box">-->
+<!--            <el-table-->
+<!--              :data="tableData"-->
+<!--              style="width: 100%">-->
+<!--              <el-table-column type="expand">-->
+<!--                <template slot-scope="props">-->
+<!--                  <el-form label-position="left" inline class="demo-table-expand">-->
+<!--                    <el-form-item label="名称">-->
+<!--                      <span>{{ props.row.name }}</span>-->
+<!--                    </el-form-item>-->
+<!--                  </el-form>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column-->
+<!--                prop="date"-->
+<!--                label="用户信息"-->
+<!--                width="150">-->
+<!--              </el-table-column>-->
+<!--              <el-table-column label="余额">-->
+<!--                <el-table-column-->
+<!--                  prop="name"-->
+<!--                  label="储值卡"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="name"-->
+<!--                  label="升值卡"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
+<!--          -->
+<!--              </el-table-column>-->
+<!--              <el-table-column label="会员等级">-->
+<!--                <el-table-column-->
+<!--                  prop="province"-->
+<!--                  label="汽油"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="city"-->
+<!--                  label="柴油"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="city"-->
+<!--                  label="天然气"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column label="统计">-->
+<!--                <el-table-column-->
+<!--                  prop="province"-->
+<!--                  label="加油金"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="city"-->
+<!--                  label="积分"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="city"-->
+<!--                  label="消费次数"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
+<!--              </el-table-column>-->
+<!--          -->
+<!--              <el-table-column-->
+<!--                prop="zip"-->
+<!--                label="实体卡号"-->
+<!--                width="220">-->
+<!--              </el-table-column>-->
+<!--          -->
+<!--              <el-table-column-->
+<!--                prop="zip"-->
+<!--                label="状态"-->
+<!--                width="120">-->
+<!--              </el-table-column>-->
+<!--          -->
+<!--              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <el-button-->
+<!--                    size="mini"-->
+<!--                    type="text"-->
+<!--                    icon="el-icon-edit"-->
+<!--                  >更多操作</el-button>-->
+<!--          -->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--          -->
+<!--            </el-table>-->
+<!--          </div>-->
+<!--          <div class="pagination-box">-->
+<!--          <el-pagination-->
+<!--            background-->
+<!--            layout="prev, pager, next"-->
+<!--            :total="1000">-->
+<!--          </el-pagination>-->
+<!--          </div>-->
+        </el-tab-pane>
+
+      </el-tabs>
+    </div>
+</template>
+
+<script>
+import PointsMall from '@/views/integral/order/pointsMall'
+import PointsCashier from "@/views/integral/order/pointsCashier";
+
+export default {
+  name: "order_Integral",
+  components: {PointsCashier, PointsMall},
+  data(){
+    return{
+      labelPosition: 'right',
+      radio1:'',
+      activeName: 'first',
+      formLabelAlign: {
+        name: '',
+        },
+      tableData: [{
+        date: '2016-05-03',
+        name: '王小狼',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-02',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-04',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-01',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-08',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-06',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-07',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }]
+    }
+  },
+  methods:{
+    handleClick(tab, event) {
+      console.log(tab, event);
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+.app-container{
+    width: 100%;
+    height: 100%;
+    background: #f6f8f9;
+  }
+  .clearfix{
+    width: 100%;
+    margin-bottom: 10px;
+  }
+  .box-card{
+    width: 100%;
+    margin-bottom: 15px;
+  }
+  .box-gang{
+    width: 100%;
+    display: flex;
+    align-items: center;
+  }
+  .box{
+    width: 200px;
+    box-sizing: border-box;
+    padding: 10px;
+    background: #f9f9f9;
+    height: 86px;
+    margin-right: 10px;
+  }
+  .size-hui{
+    font-size: 14px;
+    margin-bottom: 10px;
+    margin-top: 10px;
+  }
+  .size-bole{
+    font-weight: bold;
+  }
+  .wgang{
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 20px;
+
+  }
+  .table-box{
+    width: 100%;
+  }
+  .pagination-box{
+    width: 100%;
+    margin: 10px auto;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .top-app-sou{
+    width: 20%;
+  }
+  .top-dis{
+    display: flex;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 15px;
+  }
+  .bottom-dis{
+    width: 100%;
+    box-sizing: border-box;
+    padding: 15px;
+  }
+  .hongdian{
+    width: 16px;
+    height: 16px;
+    border-radius: 50%;
+    background: crimson;
+    color: white;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .hgang{
+    display: flex;
+  }
+</style>
diff --git a/fuintAdmin/src/views/order/order_Oil.vue b/fuintAdmin/src/views/order/order_Oil.vue
new file mode 100644
index 000000000..5faf7387d
--- /dev/null
+++ b/fuintAdmin/src/views/order/order_Oil.vue
@@ -0,0 +1,484 @@
+<!--油品订单-->
+
+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+<!--      <div style="display: flex;">-->
+<!--        <div class="top-app-sou">-->
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+            <el-form-item label="交易员工" prop="staffId">
+              <el-select
+                v-model="queryParams.staffId"
+                clearable
+                placeholder="全部"
+              >
+                <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
+                  <span style="float: left">{{ item.realName }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="终端" prop="terminal">
+              <el-select
+                v-model="queryParams.terminal"
+                clearable
+                placeholder="全部"
+              >
+                <el-option v-for="item in terminalList"
+                           :key="item.id"
+                           :label="item.dictLabel"
+                           :value="item.dictValue">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="支付类型" prop="payType">
+              <el-select
+                v-model="queryParams.payType"
+                clearable
+                placeholder="全部"
+              >
+                <el-option v-for="item in payList"
+                           :key="item.id"
+                           :label="item.dictLabel"
+                           :value="item.dictValue">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="手机号">
+              <el-input v-model="queryParams.payUser" placeholder="请输入手机号"></el-input>
+            </el-form-item>
+            <el-form-item label="油枪号" prop="oilGunNum">
+              <el-select
+                v-model="queryParams.oilGunNum"
+                filterable
+                clearable
+                placeholder="全部"
+              >
+                <el-option v-for="item in oilNumList"
+                           :key="item.id"
+                           :label="item.oilGunNum"
+                           :value="item.id">
+                  <span style="float: left">{{ getName(oilNameList,item.oilName) }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.oilGunNum }}号枪</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="订单号">
+              <el-input v-model="queryParams.orderNo" placeholder="订单号、官方单号检索"></el-input>
+            </el-form-item>
+            <el-form-item label="交易时间">
+              <el-date-picker
+                v-model="dateRange"
+                style="width: 240px"
+                size="medium"
+                value-format="yyyy-MM-dd"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+              <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+<!--        </div>-->
+<!--        <div style="margin-left: 10px">-->
+<!--          <el-button type="primary" icon="el-icon-search">搜索</el-button>-->
+<!--        </div>-->
+<!--      </div>-->
+    </el-card>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>油品订单统计</span>
+      </div>
+      <div class="box-gang">
+        <div class="box" v-for="(item,index) in 7" :key="index">
+          <div class="size-hui">订单总数</div>
+          <div class="size-bole">55</div>
+        </div>
+
+      </div>
+    </el-card>
+    <el-card class="box-card">
+      <div class="wgang">
+        <div>油品订单列表</div>
+       <div style="display: flex ">
+
+         <el-button type="primary" size="mini" icon="el-icon-plus" @click="exportExcelOilOrder()">导出订单</el-button>
+       </div>
+      </div>
+      <div class="table-box">
+        <el-table
+          :data="oilOrderList"
+          style="width: 100%">
+          <el-table-column type="expand">
+            <template slot-scope="props">
+              <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">
+                <el-form-item label="用户信息">
+                  <span>{{ props.row.userId ? queryUser(props.row.userId):"--" }}</span>
+                </el-form-item>
+                <el-form-item label="收银员">
+                  <span>{{ queryStaf(staffList,props.row.staffId) }}</span>
+                </el-form-item>
+                <el-form-item label="来源终端">
+                  <span>{{ getVal(terminalList,props.row.terminal) }}</span>
+                </el-form-item>
+                <el-form-item label="订单备注">
+                  <span>{{ props.row.remark ? props.row.remark:"--" }}</span>
+                  <div style="color: grey;font-size: 12px">订单备注为系统后台操作备注信息,非用户提交信息</div>
+                </el-form-item>
+              </el-form>
+            </template>
+          </el-table-column>
+          <el-table-column prop="terminal" label="终端" align="center" width="80">
+            <template slot-scope="props">
+              <span>{{ getVal(terminalList,props.row.terminal) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="orderNo"
+            label="订单号"
+            width="200">
+          </el-table-column>
+          <el-table-column label="订单信息" align="center">
+            <el-table-column
+              prop="oilGunNum"
+              label="油品/油枪" align="center"
+              width="120">
+              <template slot-scope="props">
+                <span>{{ getName(oilNameList,props.row.oils) }}/{{ props.row.oilGunNum }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="orderAmount"
+              label="订单金额" align="center"
+              width="120">
+            </el-table-column>
+            <el-table-column
+              prop="discountAmount"
+              label="优惠金额" align="center"
+              width="120">
+            </el-table-column>
+
+          </el-table-column>
+          <el-table-column label="付款信息" align="center">
+            <el-table-column
+              prop="payAmount"
+              label="实付金额" align="center"
+              width="120">
+            </el-table-column>
+            <el-table-column
+              prop="payUser"
+              label="付款用户" align="center"
+              width="120">
+            </el-table-column>
+            <el-table-column
+              prop="orderStatus"
+              label="付款状态" align="center"
+              width="120">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.orderStatus == 'unpaid'">未支付</el-tag>
+                <el-tag type="success" v-else-if="scope.row.orderStatus == 'paid'">已支付</el-tag>
+                <el-tag type="danger" v-else>支付失败</el-tag>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            prop="invoicing"
+            label="开票标识" align="center"
+            width="180">
+          </el-table-column>
+
+            <el-table-column label="交易时间" align="center" width="160" prop="payTime">
+              <template slot-scope="scope">
+                <span>{{ scope.row.payTime ? parseTime(scope.row.payTime):"--" }}</span>
+              </template>
+            </el-table-column>
+
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+<!--              <el-button size="mini" type="text" icon="el-icon-edit" >更多操作</el-button>-->
+              <el-button style="width: 60px" size="mini"
+                         @click="patchwork(scope.row)"
+                         type="primary" plain round>补打</el-button>
+              <el-button style="width: 60px" size="mini"
+                         @click="handleRefund(scope.row.id)"
+                         type="danger" plain round>退款</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="pagination-box">
+        <el-pagination
+          background
+          v-show="total>0"
+          layout="prev, pager, next"
+          :total="total"
+          :page.sync="queryParams.page"
+          :limit.sync="queryParams.pageSize"
+          @current-change="getList">
+        </el-pagination>
+      </div>
+    </el-card>
+
+<!--    订单退款-->
+    <el-dialog
+      title="订单退款"
+      width="25%"
+      :visible.sync="dialogRefund">
+      <div style="text-align: center;font-weight: bold">
+        ￥<span style="font-size: 35px">{{ oilOrder.payAmount }}</span>
+      </div>
+      <div class="tk">退款金额</div>
+      <div class="tk">退款单号：{{ oilOrder.orderNo }}</div>
+      <div style="margin: 10px 0">
+        退款原因<br/>
+        <el-radio-group v-model="radio1" style="margin: 10px 0">
+          <el-radio-button label="油号选错"></el-radio-button>
+          <el-radio-button label="金额错误"></el-radio-button>
+          <el-radio-button label="其他原因"></el-radio-button>
+        </el-radio-group>
+      </div>
+      <div>
+        <el-input placeholder="请输入密码" v-model="password" show-password></el-input>
+        <br/>
+        <span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理</span>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogRefund = false">取 消</el-button>
+        <el-button type="primary" @click="dialogRefund = false">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {queryStaffs} from "@/api/order/staff";
+  import {getDicts} from "@/api/order/data";
+  import {getOilNameList, getOilNumGun } from "@/api/order/oilnumgun";
+  import {listOilOrder, oilOrderInfo} from "@/api/order/oilorder";
+  import {getUser} from "@/api/order/user";
+  import {exportExcelOilOrderApi} from "@/api/order/exportExcel";
+
+  export default {
+    name: "order_Oil",
+    data(){
+      return{
+        oilOrder:{},
+        // 退款密码
+        password:"",
+        radio1:"油号选错",
+        dialogRefund:false,
+        // 员工列表
+        staffList:[],
+        // 终端列表
+        terminalList:[],
+        // 支付类型列表
+        payList:[],
+        // 油号列表
+        oilNameList:[],
+        // 油枪列表
+        oilNumList:[],
+        // 日期范围
+        dateRange: [],
+        // 油品订单列表
+        oilOrderList:[],
+        // 查询参数
+        queryParams: {
+          page: 1,
+          pageSize: 10,
+        },
+        total:0,
+
+     
+      }
+    },
+    created() {
+      this.getStaffList();
+      this.getList();
+    },
+    methods:{
+      exportExcelOilOrder() {
+        exportExcelOilOrderApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
+          const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+          this.$download.saveAs(blob,'油品订单统计.xLsx')
+        })
+    },
+      // 补打
+      patchwork(data){
+        const orderNo = data.orderNo
+        this.$modal.confirm('确定您要补打当前订单吗？当前订单号[' + orderNo + '],请确保云打印机正在运行中').then(function() {
+          // return delUser(row.id);
+        }).then(() => {
+          this.$modal.msgSuccess("打印指令已发送打印机,请查看打印结果");
+        }).catch(() => {});
+      },
+      // 退款
+      handleRefund(id){
+        this.dialogRefund = true;
+        oilOrderInfo(id).then( response => {
+          this.oilOrder = response.data
+        })
+      },
+      // 根据员工id查询员工信息
+      queryStaf(list,id){
+        let name = "";
+        list.forEach(item => {
+          if (item.id == id){
+            name = `${item.realName}(${item.mobile})`
+          }
+        })
+        return name;
+      },
+      // 根据id查询会员信息
+      async queryUser(id){
+        let result = "";
+        if (id!=null && id!=""){
+          let data = await getUser(id);
+          result = data.data.name + "|" + data.data.mobile
+        }
+        return result.toString();
+      },
+      getVal(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.dictValue == val){
+            name = item.dictLabel
+          }
+        })
+        return name;
+      },
+      // 获取订单列表信息
+      getList(val){
+        if (val!=undefined){
+          this.queryParams.page = val
+        }
+        listOilOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
+          this.oilOrderList = response.data.records;
+          this.total = response.data.total;
+        })
+      },
+      // 搜索按钮操作
+      handleQuery() {
+        this.queryParams.page = 1;
+        this.getList();
+      },
+      // 重置按钮操作
+      resetQuery() {
+        this.dateRange = [];
+        this.queryParams = {
+          page: 1,
+          pageSize: 10,
+        }
+        // this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 获取列表信息
+      getStaffList(){
+        queryStaffs().then( response => {
+          this.staffList = response.data;
+        })
+        getDicts("terminal").then( response => {
+          this.terminalList = response.data;
+        })
+        getDicts("payment_type").then( response => {
+          this.payList = response.data;
+        })
+        getOilNameList().then( response => {
+          this.oilNameList = response.data;
+        })
+        getOilNumGun({oilNum : "全部"}).then( response => {
+          this.oilNumList = response.data
+        })
+      },
+      // 获取油号名称
+      getName(oilNameList,id){
+        let name = ""
+        let _this = this;
+        if(oilNameList!=null && oilNameList!=""){
+          oilNameList.forEach(item => {
+            if (item.id == id){
+              name = item.oilName;
+              _this.oilType = item.oilType;
+            }
+          })
+        }
+        return name;
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+.app-container{
+    width: 100%;
+    height: 100%;
+    background: #f6f8f9;
+  }
+  .app-top{
+    width: 100%;
+
+    height: 60px;
+    box-sizing: border-box;
+    padding: 10px;
+  }
+  .clearfix{
+    width: 100%;
+
+  }
+  .box-card{
+    width: 100%;
+    margin-bottom: 15px;
+  }
+  .box-gang{
+    width: 100%;
+    display: flex;
+    align-items: center;
+  }
+  .box{
+    width: 200px;
+    box-sizing: border-box;
+    padding: 10px;
+    background: #f9f9f9;
+    height: 86px;
+    margin-right: 10px;
+  }
+  .size-hui{
+    font-size: 14px;
+    margin-bottom: 10px;
+    margin-top: 10px;
+  }
+  .size-bole{
+    font-weight: bold;
+  }
+  .wgang{
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 20px;
+
+  }
+  .table-box{
+    width: 100%;
+  }
+  .pagination-box{
+    width: 100%;
+    margin: 10px auto;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .top-app-sou{
+    width: 20%;
+  }
+  .tk{
+    text-align: center;
+    color: grey;
+    margin: 10px 0;
+  }
+
+</style>
diff --git a/fuintAdmin/src/views/order/order_Ordinary.vue b/fuintAdmin/src/views/order/order_Ordinary.vue
new file mode 100644
index 000000000..4aa743d38
--- /dev/null
+++ b/fuintAdmin/src/views/order/order_Ordinary.vue
@@ -0,0 +1,438 @@
+<!--普通收款订单-->
+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+        <el-form-item label="交易员工" prop="staffId">
+          <el-select
+            v-model="queryParams.staffId"
+            clearable
+            placeholder="全部"
+          >
+            <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
+              <span style="float: left">{{ item.realName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="订单号">
+          <el-input v-model="queryParams.orderNo" placeholder="订单号、官方单号检索"></el-input>
+        </el-form-item>
+        <el-form-item label="交易时间">
+          <el-date-picker
+            v-model="dateRange"
+            style="width: 240px"
+            size="medium"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+<!--    统计-->
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>小程序订单统计</span>
+      </div>
+      <div class="box-gang">
+        <div class="box" v-for="(item,index) in 7" :key="index">
+          <div class="size-hui">订单总数</div>
+          <div class="size-bole">55</div>
+        </div>
+
+      </div>
+    </el-card>
+    <el-card class="box-card">
+      <div class="wgang">
+        <div>小程序订单列表</div>
+       <div style="display: flex ">
+         <el-button type="primary" size="mini" icon="el-icon-plus" @click="exportExcelApplet()">导出订单</el-button>
+       </div>
+      </div>
+      <div class="table-box">
+        <el-table
+          :data="list"
+          style="width: 100%">
+          <el-table-column type="expand">
+            <template slot-scope="props">
+              <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">
+                <el-form-item label="收银员">
+                  <span>{{ getRealName(staffList,props.row.staffId) }}</span>
+                </el-form-item>
+                <el-form-item label="收银员">
+                  <span>{{ getMobile(staffList,props.row.staffId) }}</span>
+                </el-form-item>
+              </el-form>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="terminal"
+            label="终端"
+            width="180">
+            <template slot-scope="scope">
+              <span>{{getType(terminalList,scope.row.terminal)}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="orderNo"
+            label="订单号"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="amount"
+            label="订单金额">
+          </el-table-column>
+          <el-table-column
+            prop="payAmount"
+            label="实付金额">
+          </el-table-column>
+          <el-table-column label="订单金额组成">
+            <el-table-column
+              prop="oilOrderAmount"
+              label="油品金额">
+            </el-table-column>
+            <el-table-column
+              prop="goodsOrderAmount"
+              label="商品金额">
+            </el-table-column>
+          </el-table-column>
+
+          <el-table-column
+            prop="payUser"
+            label="付款用户">
+          </el-table-column>
+
+          <el-table-column
+            prop="status"
+            label="状态">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
+              <el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
+              <el-tag type="danger" v-else>支付失败</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="交易时间" align="center" width="160" prop="payTime">
+            <template slot-scope="scope">
+              <span>{{ scope.row.payTime ? parseTime(scope.row.payTime):"--" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+<!--              <el-button style="width: 60px" size="mini"-->
+<!--                         @click="getOrdersInfo(scope.row.id)"-->
+<!--                         type="success" plain round>详情</el-button>-->
+              <el-button style="width: 60px" size="mini"
+                         @click="patchwork(scope.row)"
+                         type="primary" plain round>补打</el-button>
+              <el-button style="width: 60px" size="mini"
+                         @click="handleRefund(scope.row.id)"
+                         type="danger" plain round>退款</el-button>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </div>
+      <div class="pagination-box">
+        <el-pagination
+          background
+          v-show="total>0"
+          layout="prev, pager, next"
+          :total="total"
+          :page.sync="queryParams.page"
+          :limit.sync="queryParams.pageSize"
+          @current-change="getList">
+        </el-pagination>
+      </div>
+
+
+    </el-card>
+
+<!--    订单退款-->
+    <el-dialog
+      title="订单退款"
+      width="25%"
+      :visible.sync="dialogRefund">
+      <div style="text-align: center;font-weight: bold">
+        ￥<span style="font-size: 35px">{{ cashierOrder.amount }}</span>
+      </div>
+      <div class="tk">退款金额</div>
+      <div class="tk">退款单号：{{ cashierOrder.orderNo }}</div>
+      <div style="margin: 10px 0">
+        退款原因<br/>
+        <el-radio-group v-model="radio1" style="margin: 10px 0">
+          <el-radio-button label="油号选错"></el-radio-button>
+          <el-radio-button label="金额错误"></el-radio-button>
+          <el-radio-button label="其他原因"></el-radio-button>
+        </el-radio-group>
+      </div>
+      <div>
+        <el-input placeholder="请输入密码" v-model="password" show-password></el-input>
+        <br/>
+        <span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理</span>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogRefund = false">取 消</el-button>
+        <el-button type="primary" @click="dialogRefund = false">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {cashierOrder, listCashierOrder} from "@/api/order/cashierorder";
+import {getDicts} from "@/api/order/data";
+import {queryStaffs} from "@/api/order/staff";
+import { exportExcelCashierApi } from "@/api/order/exportExcel";
+
+  export default {
+    name: "order_Cashier",
+    data(){
+      return{
+        // 查询参数
+        queryParams: {
+          page: 1,
+          pageSize: 10,
+          terminal:"applet",
+        },
+        // 总条数
+        total:0,
+        // 列表信息
+        list:[],
+        dialogRefund:false,
+        // 收银员订单详情
+        cashierOrder:{},
+        // 退款密码
+        password:"",
+        radio1:"油号选错",
+        // 终端列表
+        terminalList:[],
+        // 员工列表
+        staffList:[],
+        // 日期范围
+        dateRange: [],
+
+        labelPosition: 'right',
+        formLabelAlign: {
+          name: '',
+        },
+        // tableData: [{
+        //   date: '2016-05-03',
+        //   name: '王小狼',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-02',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-04',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-01',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-08',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-06',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-07',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }]
+      }
+    },
+    created() {
+      this.getList();
+      this.getTerList();
+    },
+    methods:{
+      exportExcelApplet() {
+        exportExcelCashierApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
+            const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+            this.$download.saveAs(blob,'小程序订单统计.xLsx')
+          })
+      },
+      // 获取员工姓名
+      getRealName(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.id == val){
+            name = item.realName
+          }
+        })
+        return name;
+      },
+      // 获取员工手机号
+      getMobile(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.id == val){
+            name = item.mobile
+          }
+        })
+        return name;
+      },
+      getType(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.dictValue == val){
+            name = item.dictLabel
+          }
+        })
+        return name;
+      },
+      // 获取终端列表信息
+      getTerList(){
+        getDicts("terminal").then( response => {
+          this.terminalList = response.data;
+        })
+        queryStaffs().then( response => {
+          this.staffList = response.data;
+        })
+      },
+      // 补打
+      patchwork(data){
+        const orderNo = data.orderNo
+        this.$modal.confirm('确定您要补打当前订单吗？当前订单号[' + orderNo + '],请确保云打印机正在运行中').then(function() {
+          // return delUser(row.id);
+        }).then(() => {
+          this.$modal.msgSuccess("打印指令已发送打印机,请查看打印结果");
+        }).catch(() => {});
+      },
+      // 退款
+      handleRefund(id){
+        this.dialogRefund = true;
+        cashierOrder(id).then( response => {
+          this.cashierOrder = response.data
+        })
+      },
+      // 获取列表信息
+      getList(){
+        listCashierOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
+          this.list = response.data.records;
+          this.total = response.data.total;
+        })
+      },
+      // 搜索按钮操作
+      handleQuery() {
+        this.queryParams.page = 1;
+        this.getList();
+      },
+      // 重置按钮操作
+      resetQuery() {
+        this.dateRange = [];
+        this.queryParams = {
+          page: 1,
+          pageSize: 10,
+          terminal:"applet",
+        }
+        // this.resetForm("queryForm");
+        this.handleQuery();
+      },
+    }
+  }
+</script>
+
+<style scoped>
+.app-container{
+    width: 100%;
+    height: 100%;
+    background: #f6f8f9;
+  }
+  .app-top{
+    width: 100%;
+
+    height: 60px;
+    box-sizing: border-box;
+    padding: 10px;
+  }
+  .clearfix{
+    width: 100%;
+
+  }
+  .box-card{
+    width: 100%;
+    margin-bottom: 15px;
+  }
+  .box-gang{
+    width: 100%;
+    display: flex;
+    align-items: center;
+  }
+  .box{
+    width: 200px;
+    box-sizing: border-box;
+    padding: 10px;
+    background: #f9f9f9;
+    height: 86px;
+    margin-right: 10px;
+  }
+  .size-hui{
+    font-size: 14px;
+    margin-bottom: 10px;
+    margin-top: 10px;
+  }
+  .size-bole{
+    font-weight: bold;
+  }
+  .wgang{
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 20px;
+
+  }
+  .table-box{
+    width: 100%;
+  }
+  .pagination-box{
+    width: 100%;
+    margin: 10px auto;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .top-app-sou{
+    width: 20%;
+  }
+  .tk{
+    text-align: center;
+    color: grey;
+    margin: 10px 0;
+  }
+
+</style>
diff --git a/fuintAdmin/src/views/order/order_Unpaid.vue b/fuintAdmin/src/views/order/order_Unpaid.vue
new file mode 100644
index 000000000..9c72bbe11
--- /dev/null
+++ b/fuintAdmin/src/views/order/order_Unpaid.vue
@@ -0,0 +1,435 @@
+<!--未支付订单-->
+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+<!--      <div style="display: flex;">-->
+<!--        <div class="top-app-sou">-->
+<!--          <el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">-->
+<!--            <el-form-item label="名称">-->
+<!--              <el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-form>-->
+<!--        </div>-->
+<!--        <div style="margin-left: 10px">-->
+<!--          <el-button type="primary" icon="el-icon-search">搜索</el-button>-->
+<!--        </div>-->
+<!--      </div>-->
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+        <el-form-item label="交易员工" prop="staffId">
+          <el-select
+            v-model="queryParams.staffId"
+            clearable
+            placeholder="全部"
+          >
+            <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
+              <span style="float: left">{{ item.realName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="支付类型" prop="payType">-->
+<!--          <el-select-->
+<!--            v-model="queryParams.payType"-->
+<!--            clearable-->
+<!--            placeholder="全部"-->
+<!--          >-->
+<!--            <el-option v-for="item in payList"-->
+<!--                       :key="item.id"-->
+<!--                       :label="item.dictLabel"-->
+<!--                       :value="item.dictValue">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+        <el-form-item label="手机号">
+          <el-input v-model="queryParams.payUser" placeholder="请输入手机号"></el-input>
+        </el-form-item>
+        <el-form-item label="油枪号" prop="oilGunNum">
+          <el-select
+            v-model="queryParams.oilGunNum"
+            filterable
+            clearable
+            placeholder="全部"
+          >
+            <el-option v-for="item in oilNumList"
+                       :key="item.id"
+                       :label="item.oilGunNum"
+                       :value="item.id">
+              <span style="float: left">{{ getName(oilNameList,item.oilName) }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.oilGunNum }}号枪</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="订单号">
+          <el-input v-model="queryParams.orderNo" placeholder="订单号、官方单号检索"></el-input>
+        </el-form-item>
+<!--        <el-form-item label="交易时间">-->
+<!--          <el-date-picker-->
+<!--            v-model="dateRange"-->
+<!--            style="width: 240px"-->
+<!--            size="medium"-->
+<!--            value-format="yyyy-MM-dd"-->
+<!--            type="daterange"-->
+<!--            range-separator="-"-->
+<!--            start-placeholder="开始日期"-->
+<!--            end-placeholder="结束日期"-->
+<!--          ></el-date-picker>-->
+<!--        </el-form-item>-->
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>未支付订单统计</span>
+      </div>
+      <div class="box-gang">
+        <div class="box" v-for="(item,index) in 7" :key="index">
+          <div class="size-hui">订单总数</div>
+          <div class="size-bole">55</div>
+        </div>
+
+      </div>
+    </el-card>
+    <el-card class="box-card">
+      <div class="wgang">
+        <div>未支付订单列表</div>
+       <div style="display: flex ">
+         <el-button type="primary" size="mini" icon="el-icon-plus" @click="exportExcelOilOrder()">导出订单</el-button>
+       </div>
+      </div>
+      <div class="table-box">
+        <el-table
+          :data="list"
+          style="width: 100%">
+          <el-table-column type="expand">
+            <template slot-scope="props">
+              <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">
+                <el-form-item label="收银员">
+                  <span>{{ getRealName(staffList,props.row.staffId) }}</span>
+                </el-form-item>
+                <el-form-item label="收银员手机号">
+                  <span>{{ getMobile(staffList,props.row.staffId) }}</span>
+                </el-form-item>
+              </el-form>
+            </template>
+          </el-table-column>
+          <el-table-column prop="terminal" label="终端" align="center" width="80"></el-table-column>
+          <el-table-column prop="oils" label="油品/油枪" align="center">
+            <template slot-scope="props">
+              <span>{{ getName(oilNameList,props.row.oils) }}/{{ props.row.oilGunNum }}号枪</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="订单信息" align="center">
+            <el-table-column prop="orderNo" label="订单号" align="center"> </el-table-column>
+            <el-table-column prop="orderAmount" label="交易金额" align="center"> </el-table-column>
+          </el-table-column>
+
+          <el-table-column prop="payType" label="付款类型" align="center">
+            <template slot-scope="scope">
+              <span>{{getPayType(payTypeList,scope.row.payType)}}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="payUser" label="付款用户" align="center">
+          </el-table-column>
+
+          <el-table-column prop="createTime" label="交易时间" align="center"></el-table-column>
+
+          <el-table-column prop="orderStatus" align="center" label="支付状态">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.orderStatus == 'unpaid'">未支付</el-tag>
+              <el-tag type="info" v-else>支付失败</el-tag>
+            </template>
+          </el-table-column>
+
+<!--          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-button-->
+<!--                size="mini"-->
+<!--                type="text"-->
+<!--                icon="el-icon-edit"-->
+<!--              >更多操作</el-button>-->
+
+<!--            </template>-->
+<!--          </el-table-column>-->
+
+        </el-table>
+      </div>
+      <div class="pagination-box">
+        <el-pagination
+          background
+          v-show="total>0"
+          layout="prev, pager, next"
+          :total="total"
+          :page.sync="queryParams.page"
+          :limit.sync="queryParams.pageSize"
+          @current-change="getList">
+        </el-pagination>
+      </div>
+
+
+    </el-card>
+  </div>
+</template>
+
+<script>
+  import {listOilOrder} from "@/api/order/oilorder";
+  import {getDicts} from "@/api/order/data";
+  import {getOilNameList, getOilNumGun} from "@/api/order/oilnumgun";
+  import {queryStaffs} from "@/api/order/staff";
+  import {exportExcelOilOrderApi} from "@/api/order/exportExcel";
+
+  export default {
+    name: "order_Cashier",
+    data(){
+      return{
+        // 查询参数
+        queryParams: {
+          page: 1,
+          pageSize: 10,
+          orderStatus:"paid",
+        },
+        // 总条数
+        total:0,
+        // 列表信息
+        list:[],
+        // 支付状态列表
+        payList:[],
+        // 支付类型列表
+        payTypeList:[],
+        oilNameList:[],
+        // 员工列表
+        staffList:[],
+        // 油枪列表
+        oilNumList:[],
+        // 日期范围
+        dateRange: [],
+
+        labelPosition: 'right',
+        formLabelAlign: {
+          name: '',
+        },
+        // tableData: [{
+        //   date: '2016-05-03',
+        //   name: '王小狼',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-02',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-04',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-01',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-08',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-06',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-07',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }]
+      }
+    },
+    created() {
+      this.getList();
+      this.getPayList();
+    },
+    methods:{
+      exportExcelOilOrder() {
+
+        exportExcelOilOrderApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
+          const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+          this.$download.saveAs(blob,'未支付订单统计.xLsx')
+        })
+      },
+      // 获取员工姓名
+      getRealName(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.id == val){
+            name = item.realName
+          }
+        })
+        return name;
+      },
+      // 获取员工手机号
+      getMobile(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.id == val){
+            name = item.mobile
+          }
+        })
+        return name;
+      },
+      // 获取油号名称
+      getName(oilNameList,id){
+        let name = ""
+        let _this = this;
+        if(oilNameList!=null && oilNameList!=""){
+          oilNameList.forEach(item => {
+            if (item.id == id){
+              name = item.oilName;
+              _this.oilType = item.oilType;
+            }
+          })
+        }
+        return name;
+      },
+      // 获取付款类型
+      getPayType(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.dictValue == val){
+            name = item.dictLabel
+          }
+        })
+        return name;
+      },
+      // 获取支付信息列表
+      getPayList(){
+        getDicts("pay_status").then( response => {
+          this.payList = response.data;
+        })
+        getDicts("payment_type").then( response => {
+          this.payTypeList = response.data;
+        })
+        getOilNameList().then( response => {
+          this.oilNameList = response.data;
+        })
+        getOilNumGun({oilNum : "全部"}).then( response => {
+          this.oilNumList = response.data
+        })
+        queryStaffs().then( response => {
+          this.staffList = response.data;
+        })
+      },
+      // 获取列表信息
+      getList(val){
+        if (val!=undefined){
+          this.queryParams.page = val
+        }
+        listOilOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
+          this.list = response.data.records;
+          this.total = response.data.total;
+        })
+      },
+      // 搜索按钮操作
+      handleQuery() {
+        this.queryParams.page = 1;
+        this.getList();
+      },
+      // 重置按钮操作
+      resetQuery() {
+        this.dateRange = [];
+        this.queryParams = {
+          page: 1,
+          pageSize: 10,
+          orderStatus:"paid",
+        }
+        // this.resetForm("queryForm");
+        this.handleQuery();
+      },
+    }
+  }
+</script>
+
+<style scoped>
+.app-container{
+    width: 100%;
+    height: 100%;
+    background: #f6f8f9;
+  }
+  .app-top{
+    width: 100%;
+
+    height: 60px;
+    box-sizing: border-box;
+    padding: 10px;
+  }
+  .clearfix{
+    width: 100%;
+
+  }
+  .box-card{
+    width: 100%;
+    margin-bottom: 15px;
+  }
+  .box-gang{
+    width: 100%;
+    display: flex;
+    align-items: center;
+  }
+  .box{
+    width: 200px;
+    box-sizing: border-box;
+    padding: 10px;
+    background: #f9f9f9;
+    height: 86px;
+    margin-right: 10px;
+  }
+  .size-hui{
+    font-size: 14px;
+    margin-bottom: 10px;
+    margin-top: 10px;
+  }
+  .size-bole{
+    font-weight: bold;
+  }
+  .wgang{
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 20px;
+
+  }
+  .table-box{
+    width: 100%;
+  }
+  .pagination-box{
+    width: 100%;
+    margin: 10px auto;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .top-app-sou{
+    width: 20%;
+  }
+
+
+</style>
diff --git a/fuintAdmin/src/views/order/order_Vip.vue b/fuintAdmin/src/views/order/order_Vip.vue
new file mode 100644
index 000000000..e8d5fccda
--- /dev/null
+++ b/fuintAdmin/src/views/order/order_Vip.vue
@@ -0,0 +1,431 @@
+<!--会员充值订单-->
+<template>
+  <div class="app-container">
+<!--    条件查询-->
+    <el-card class="box-card">
+<!--      <div style="display: flex;">-->
+<!--        <div class="top-app-sou">-->
+<!--          <el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">-->
+<!--            <el-form-item label="名称">-->
+<!--              <el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-form>-->
+<!--        </div>-->
+<!--        <div style="margin-left: 10px">-->
+<!--          <el-button type="primary" icon="el-icon-search">搜索</el-button>-->
+<!--        </div>-->
+<!--      </div>-->
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+        <el-form-item label="交易员工" prop="staffId">
+          <el-select
+            v-model="queryParams.mtStaffId"
+            clearable
+            placeholder="全部"
+          >
+            <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
+              <span style="float: left">{{ item.realName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="支付类型" prop="paymentType">
+          <el-select
+            v-model="queryParams.paymentType"
+            clearable
+            placeholder="全部"
+          >
+            <el-option v-for="item in payList"
+                       :key="item.id"
+                       :label="item.dictLabel"
+                       :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="手机号">
+          <el-input v-model="queryParams.mobile" placeholder="请输入会员手机号"></el-input>
+        </el-form-item>
+<!--        <el-form-item label="交易时间">-->
+<!--          <el-date-picker-->
+<!--            v-model="dateRange"-->
+<!--            style="width: 240px"-->
+<!--            size="medium"-->
+<!--            value-format="yyyy-MM-dd"-->
+<!--            type="daterange"-->
+<!--            range-separator="-"-->
+<!--            start-placeholder="开始日期"-->
+<!--            end-placeholder="结束日期"-->
+<!--          ></el-date-picker>-->
+<!--        </el-form-item>-->
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+<!--    统计-->
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>会员充值统计</span>
+      </div>
+      <div class="box-gang">
+        <div class="box" v-for="(item,index) in 7" :key="index">
+          <div class="size-hui">订单总数</div>
+          <div class="size-bole">55</div>
+        </div>
+
+      </div>
+    </el-card>
+<!--    表格-->
+    <el-card class="box-card">
+      <div class="wgang">
+        <div>会员充值列表</div>
+       <div style="display: flex ">
+
+         <el-button type="primary" size="mini" icon="el-icon-plus" @click="exportExcelVip()">导出订单</el-button>
+       </div>
+      </div>
+      <div class="table-box">
+        <el-table
+          :data="list"
+          style="width: 100%">
+          <el-table-column type="expand">
+            <template slot-scope="props">
+              <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">
+                <el-form-item label="会员名称">
+                  <span>{{ props.row.name }}</span>
+                </el-form-item>
+                <el-form-item label="会员手机号">
+                  <span>{{ props.row.mobile }}</span>
+                </el-form-item>
+                <el-form-item label="操作人">
+                  <span>{{ props.row.realName }}</span>
+                </el-form-item>
+                <el-form-item label="操作人手机号">
+                  <span>{{ props.row.staffMobile }}</span>
+                </el-form-item>
+                <el-form-item label="储值优惠">
+                  <span>充值满{{ props.row.rechargeBalance }}元赠送{{ props.row.giftBalance }}元</span>
+                </el-form-item>
+              </el-form>
+            </template>
+          </el-table-column>
+          <el-table-column prop="name" label="会员名称"> </el-table-column>
+          <el-table-column prop="bidBalance" label="储值卡面值"> </el-table-column>
+          <el-table-column prop="rechargeBalance" label="储值卡实售金额"> </el-table-column>
+          <el-table-column prop="giftBalance" label="储值卡赠送金额"></el-table-column>
+          <el-table-column prop="paymentType" label="支付方式">
+            <template slot-scope="scope">
+              <span>{{getType(payList,scope.row.paymentType)}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="payStatus" label="支付状态">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.payStatus == 'unpaid'">未支付</el-tag>
+              <el-tag type="success" v-else-if="scope.row.payStatus == 'paid'">已支付</el-tag>
+              <el-tag type="danger" v-else>支付失败</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="realName" label="交易员工"></el-table-column>
+          <el-table-column prop="remark" label="充值备注">
+            <template slot-scope="scope">
+              <span>{{ scope.row.remark ? scope.row.remark:"--" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="fringeBenefit" label="附加福利">
+            <template slot-scope="scope">
+              <span>{{ scope.row.fringeBenefit ? scope.row.fringeBenefit:"--" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+<!--              <el-button size="mini" type="text" icon="el-icon-edit">更多操作</el-button>-->
+              <el-button style="width: 60px" size="mini"
+                         @click="patchwork(scope.row)"
+                         type="primary" plain round>补打</el-button>
+              <el-button style="width: 60px" size="mini"
+                         @click="handleRefund(scope.row.id)"
+                         type="danger" plain round>退款</el-button>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </div>
+      <div class="pagination-box">
+        <el-pagination
+          background
+          v-show="total>0"
+          layout="prev, pager, next"
+          :total="total"
+          :page.sync="queryParams.pageNo"
+          :limit.sync="queryParams.pageSize"
+          @current-change="getList">
+        </el-pagination>
+      </div>
+
+
+    </el-card>
+
+<!--    订单退款-->
+    <el-dialog
+      title="订单退款"
+      width="25%"
+      :visible.sync="dialogRefund">
+      <div style="text-align: center;font-weight: bold">
+        ￥<span style="font-size: 35px">{{ oilOrder.rechargeBalance }}</span>
+      </div>
+      <div class="tk">退款金额</div>
+      <div class="tk">会员手机号：{{ oilOrder.mobile }}</div>
+      <div style="margin: 10px 0">
+        退款原因<br/>
+        <el-radio-group v-model="radio1" style="margin: 10px 0">
+          <el-radio-button label="充值类型选错"></el-radio-button>
+          <el-radio-button label="充值金额错误"></el-radio-button>
+          <el-radio-button label="其他原因"></el-radio-button>
+        </el-radio-group>
+      </div>
+      <div>
+        <el-input placeholder="请输入密码" v-model="password" show-password></el-input>
+        <br/>
+        <span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理</span>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogRefund = false">取 消</el-button>
+        <el-button type="primary" @click="dialogRefund = false">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {cardValueRecordInfo, listCardValueRecord} from "@/api/order/cardvaluerecord";
+import {getDicts} from "@/api/order/data";
+import {queryStaffs} from "@/api/order/staff";
+import { exportExcelVipApi } from "@/api/order/exportExcel";
+
+
+export default {
+  name: "order_Cashier",
+  data(){
+    return{
+      // 员工列表
+      staffList:[],
+      // 日期范围
+      dateRange: [],
+      oilOrder:{},
+      // 退款密码
+      password:"",
+      radio1:"充值类型选错",
+      dialogRefund:false,
+      // 支付方式列表
+      payList:[],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+      },
+      // 列表信息
+      list:[],
+      // 总条数
+      total:0,
+
+      labelPosition: 'right',
+      formLabelAlign: {
+        name: '',
+      },
+      // tableData: [{
+      //   date: '2016-05-03',
+      //   name: '王小狼',
+      //   province: '上海',
+      //   city: '普陀区',
+      //   address: '上海市普陀区金沙江路 1518 弄',
+      //   zip: 200333
+      // }, {
+      //   date: '2016-05-02',
+      //   name: '王小虎',
+      //   province: '上海',
+      //   city: '普陀区',
+      //   address: '上海市普陀区金沙江路 1518 弄',
+      //   zip: 200333
+      // }, {
+      //   date: '2016-05-04',
+      //   name: '王小虎',
+      //   province: '上海',
+      //   city: '普陀区',
+      //   address: '上海市普陀区金沙江路 1518 弄',
+      //   zip: 200333
+      // }, {
+      //   date: '2016-05-01',
+      //   name: '王小虎',
+      //   province: '上海',
+      //   city: '普陀区',
+      //   address: '上海市普陀区金沙江路 1518 弄',
+      //   zip: 200333
+      // }, {
+      //   date: '2016-05-08',
+      //   name: '王小虎',
+      //   province: '上海',
+      //   city: '普陀区',
+      //   address: '上海市普陀区金沙江路 1518 弄',
+      //   zip: 200333
+      // }, {
+      //   date: '2016-05-06',
+      //   name: '王小虎',
+      //   province: '上海',
+      //   city: '普陀区',
+      //   address: '上海市普陀区金沙江路 1518 弄',
+      //   zip: 200333
+      // }, {
+      //   date: '2016-05-07',
+      //   name: '王小虎',
+      //   province: '上海',
+      //   city: '普陀区',
+      //   address: '上海市普陀区金沙江路 1518 弄',
+      //   zip: 200333
+      // }]
+    }
+  },
+  created() {
+    this.getList();
+    this.getPayList();
+  },
+  methods:{
+    exportExcelVip() {
+      exportExcelVipApi(this.queryParams).then(res=>{
+          const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+          this.$download.saveAs(blob,'商品订单统计.xLsx')
+        })
+    },
+    // 补打
+    patchwork(data){
+      const orderNo = data.name
+      this.$modal.confirm('确定您要补打当前订单吗？当前会员[' + orderNo + '],请确保云打印机正在运行中').then(function() {
+        // return delUser(row.id);
+      }).then(() => {
+        this.$modal.msgSuccess("打印指令已发送打印机,请查看打印结果");
+      }).catch(() => {});
+    },
+    // 退款
+    handleRefund(id){
+      this.dialogRefund = true;
+      cardValueRecordInfo(id).then( response => {
+        this.oilOrder = response.data
+      })
+    },
+    getType(list,val){
+      let name = "";
+      list.forEach(item => {
+        if (item.dictValue == val){
+          name = item.dictLabel
+        }
+      })
+      return name;
+    },
+    // 获取支付列表信息
+    getPayList(){
+      getDicts("payment_type").then( response => {
+        this.payList = response.data;
+      })
+      queryStaffs().then( response => {
+        this.staffList = response.data;
+      })
+    },
+    // 搜索按钮操作
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    // 重置按钮操作
+    resetQuery() {
+      this.dateRange = [];
+      this.queryParams = {
+        pageNo: 1,
+        pageSize: 10,
+      }
+      // this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 获取列表信息
+    getList(val){
+      if (val!=undefined){
+        this.queryParams.pageNo = val
+      }
+      listCardValueRecord(this.queryParams).then( response => {
+        this.list = response.data.records;
+        this.total = response.data.total;
+      })
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+.app-container{
+    width: 100%;
+    height: 100%;
+    background: #f6f8f9;
+  }
+  .app-top{
+    width: 100%;
+
+    height: 60px;
+    box-sizing: border-box;
+    padding: 10px;
+  }
+  .clearfix{
+    width: 100%;
+
+  }
+  .box-card{
+    width: 100%;
+    margin-bottom: 15px;
+  }
+  .box-gang{
+    width: 100%;
+    display: flex;
+    align-items: center;
+  }
+  .box{
+    width: 200px;
+    box-sizing: border-box;
+    padding: 10px;
+    background: #f9f9f9;
+    height: 86px;
+    margin-right: 10px;
+  }
+  .size-hui{
+    font-size: 14px;
+    margin-bottom: 10px;
+    margin-top: 10px;
+  }
+  .size-bole{
+    font-weight: bold;
+  }
+  .wgang{
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 20px;
+
+  }
+  .table-box{
+    width: 100%;
+  }
+  .pagination-box{
+    width: 100%;
+    margin: 10px auto;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .top-app-sou{
+    width: 20%;
+  }
+  .tk{
+    text-align: center;
+    color: grey;
+    margin: 10px 0;
+  }
+
+</style>