diff --git a/fuintAdmin/src/main.js b/fuintAdmin/src/main.js
index 365f692e2..ed5f2e4d1 100644
--- a/fuintAdmin/src/main.js
+++ b/fuintAdmin/src/main.js
@@ -55,12 +55,12 @@ Vue.prototype.getName = getName
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 Vue.prototype.imgurl = 'http://192.168.0.138:8008'
-// Vue.prototype.pcUrl = 'http://192.168.0.178:83/'
-// Vue.prototype.cashierUrl = 'http://192.168.31.178:84/homeindex' // 收银台
-// Vue.prototype.pcUrl = 'http://192.168.31.178:83/#/homeindex' // 收银台
-// Vue.prototype.ztUrl = 'http://192.168.31.178:82/' // 中台
+// Vue.prototype.pcUrl = 'http://127.0.0.1:83/'
+// Vue.prototype.cashierUrl = 'http://127.0.0.1:84/homeindex' // 收银台
+// Vue.prototype.pcUrl = 'http://127.0.0.1:83/#/homeindex' // 收银台
+// Vue.prototype.ztUrl = 'http://127.0.0.1:82/' // 中台
 Vue.prototype.cashierUrl = 'https://cashier.youkerr.com/homeindex' // 收银台
-Vue.prototype.caUrl = 'http://192.168.31.178:83/' // 收银台校色跳转链接
+Vue.prototype.caUrl = 'http://127.0.0.1:83/' // 收银台校色跳转链接
 Vue.prototype.pcUrl = 'https://www.youkerr.com/' // 收银台
 Vue.prototype.ztUrl = 'https://oil.youkerr.com/' // 中台
 const Collapse= false
diff --git a/fuintCashierWeb/.env.development b/fuintCashierWeb/.env.development
index 8829ff5eb..d5d76f22e 100644
--- a/fuintCashierWeb/.env.development
+++ b/fuintCashierWeb/.env.development
@@ -11,4 +11,4 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'http://192.168.31.96:8080/'
+VUE_APP_SERVER_URL = 'http://192.168.31.95:8080/'
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Order.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Order.vue
index 9fc1273ba..34f87959f 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Order.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Order.vue
@@ -1,73 +1,141 @@
 <template>
-    <div class="app-center">
-      <div class="app-top">
-      <el-card >
-        <el-radio-group v-model="radio1">
-          <el-radio-button label="收银台订单"></el-radio-button>
-          <el-radio-button label="油品交易订单"></el-radio-button>
-          <el-radio-button label="商品交易订单"></el-radio-button>
-          <el-radio-button label="会员充值订单"></el-radio-button>
-<!--          <el-radio-button label="小程序交易订单"></el-radio-button>-->
-          <el-radio-button label="挂账订单"></el-radio-button>
-<!--          <el-radio-button label="未支付订单"></el-radio-button>-->
-<!--          <el-radio-button label="积分兑换订单"></el-radio-button>-->
-        </el-radio-group>
-      </el-card>
+  <div class="app-center">
+
+    <div class="tab-box">
+      <div class="tab_" :class="{active:index== tabindex }" @click="getindex(index)" v-for="(item,index) in  tabs"
+           :key="index">
+        {{ item.name }}
       </div>
-      <order_Cashier v-if="radio1 == '收银台订单' "></order_Cashier>
-      <order_Oil v-if="radio1 == '油品交易订单' "></order_Oil>
-      <order_Goods v-if="radio1 == '商品交易订单' "></order_Goods>
-      <order_Vip v-if="radio1 == '会员充值订单' "></order_Vip>
-<!--      <order_Ordinary v-if="radio1 == '小程序交易订单' "></order_Ordinary>-->
-      <order_Added v-if="radio1 == '挂账订单' "></order_Added>
-<!--      <order_Unpaid v-if="radio1 == '未支付订单' "></order_Unpaid>-->
-<!--      <order_Integral v-if="radio1 == '积分兑换订单' "></order_Integral>-->
     </div>
+
+<!--    <div class="app-top">-->
+<!--      <el-card>-->
+<!--        <el-radio-group v-model="radio1">-->
+<!--          <el-radio-button label="收银台订单"></el-radio-button>-->
+<!--          <el-radio-button label="油品交易订单"></el-radio-button>-->
+<!--          <el-radio-button label="商品交易订单"></el-radio-button>-->
+<!--          <el-radio-button label="会员充值订单"></el-radio-button>-->
+<!--          &lt;!&ndash;          <el-radio-button label="小程序交易订单"></el-radio-button>&ndash;&gt;-->
+<!--          <el-radio-button label="挂账订单"></el-radio-button>-->
+<!--          &lt;!&ndash;          <el-radio-button label="未支付订单"></el-radio-button>&ndash;&gt;-->
+<!--          &lt;!&ndash;          <el-radio-button label="积分兑换订单"></el-radio-button>&ndash;&gt;-->
+<!--        </el-radio-group>-->
+<!--      </el-card>-->
+<!--    </div>-->
+
+<!--    收银台订单-->
+    <order_Cashier v-if="tabindex == 0 "></order_Cashier>
+    <!--    油品订单-->
+    <order_Oil v-if="tabindex == 1 "></order_Oil>
+    <!--    商品订单-->
+    <order_Goods v-if="tabindex == 2 "></order_Goods>
+    <!--    会员充值订单-->
+    <order_Vip v-if="tabindex == 3 "></order_Vip>
+    <!--    挂账订单-->
+    <order_Added v-if="tabindex == 4 "></order_Added>
+    <!--    积分商城订单 暂未修改-->
+    <order_Added v-if="tabindex == 5 "></order_Added>
+    <!--      <order_Ordinary v-if="radio1 == '小程序交易订单' "></order_Ordinary>-->
+    <!--      <order_Unpaid v-if="radio1 == '未支付订单' "></order_Unpaid>-->
+    <!--      <order_Integral v-if="radio1 == '积分兑换订单' "></order_Integral>-->
+  </div>
 </template>
 
 <script>
-  import order_Cashier from "../orderComponents/order_Cashier";
-  import order_Added from "../orderComponents/order_Added";
-  import order_Goods from "../orderComponents/order_Goods";
-  import order_Integral from "../orderComponents/order_Integral";
-  import order_Oil from "../orderComponents/order_Oil";
-  import order_Ordinary from "../orderComponents/order_Ordinary";
-  import order_Unpaid from "../orderComponents/order_Unpaid";
-  import order_Vip from "../orderComponents/order_Vip";
+import order_Cashier from "../orderComponents/order_Cashier";
+import order_Added from "../orderComponents/order_Added";
+import order_Goods from "../orderComponents/order_Goods";
+import order_Integral from "../orderComponents/order_Integral";
+import order_Oil from "../orderComponents/order_Oil";
+import order_Ordinary from "../orderComponents/order_Ordinary";
+import order_Unpaid from "../orderComponents/order_Unpaid";
+import order_Vip from "../orderComponents/order_Vip";
 
-    export default {
-        name: "Order",
-        data(){
-          return{
-
-            radio1:'收银台订单'
-          }
+export default {
+  name: "Order",
+  data() {
+    return {
+      radio1: '收银台订单',
+      tabindex: 0,
+      tabs: [
+        {
+          name: "收银台订单",
         },
-      components:{
-        order_Cashier,order_Added,order_Goods,order_Integral,order_Oil,order_Ordinary,order_Unpaid,order_Vip
-      },
-      methods: {
-        handleClick(tab, event) {
-          console.log(tab, event);
-        }
-      }
-
+        {
+          name: "油品订单",
+        },
+        {
+          name: "商品订单",
+        },
+        {
+          name: "会员充值订单",
+        },
+        {
+          name: "挂账订单",
+        },
+        {
+          name: "积分商城订单",
+        },
+      ],
     }
+  },
+  components: {
+    order_Cashier, order_Added, order_Goods, order_Integral, order_Oil, order_Ordinary, order_Unpaid, order_Vip
+  },
+  methods: {
+    getindex(index) {
+      this.tabindex = index
+      console.log(index,80)
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    }
+  }
+
+}
 </script>
 
 <style scoped>
-  .app-center{
-    width: 100%;
+.app-center {
+  width: 100%;
 
-    box-sizing: border-box;
-    padding: 10px;
-  }
-  .app-top{
-    width: 100%;
-    margin-bottom: 20px;
-    height: 60px;
-    box-sizing: border-box;
+  box-sizing: border-box;
+  padding: 0;
+  margin: 0;
+}
 
-  }
+.app-top {
+  width: 100%;
+  margin-bottom: 20px;
+  height: 60px;
+  box-sizing: border-box;
 
+}
+
+.tab-box {
+  width: 100%;
+  height: 50px;
+  background: #fff;
+  display: flex;
+  box-sizing: border-box;
+  margin-bottom: 25px;
+}
+
+.tab_ {
+  width: 85px;
+  height: 100%;
+  //border-bottom: 2px solid #FF770F;
+  display: flex;
+  font-weight: 500;
+  font-size: 14px;
+  color: #999999;
+  align-items: center;
+  justify-content: center;
+  margin-left: 50px;
+  cursor: pointer;
+}
+.active {
+  border-bottom: 2px solid #FF770F !important;
+  color: #FF770F !important;
+}
 </style>
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
index 9f855e3d3..594ba6aab 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
@@ -1,53 +1,78 @@
 <!-- 收银台订单-->
 <template>
   <div>
-    <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" clearable placeholder="订单号检索"></el-input>
-        </el-form-item>
-        <el-form-item label="">
+    <div  class="cot-box">
+      <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" clearable placeholder="请输入订单号"></el-input>
+          </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" clearable placeholder="请输入付款用户"></el-input>
+          </el-form-item>
+          <el-form-item label="">
 
-          <el-date-picker
-            v-model="beginTime"
-            style="width: 140px"
-            type="date"
-            placeholder="开始日期">
-          </el-date-picker>
+            <el-date-picker
+              v-model="beginTime"
+              style="width: 140px"
+              type="date"
+              placeholder="开始日期">
+            </el-date-picker>
             至
-          <el-date-picker
-            v-model="endTime"
-            style="width: 140px"
-            type="date"
-            placeholder="结束日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item style="float: right">
-          <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>
+            <el-date-picker
+              v-model="endTime"
+              style="width: 140px"
+              type="date"
+              placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item style="float: right">
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button type="primary" @click="exportExcelCashier()">导出</el-button>
+          </el-form-item>
+        </el-form>
       </div>
-      <div class="box-gang">
-<!--        <div class="box" style="display: flex;align-items: center;width: 250px">-->
+      <div>
+        <div class="box-gang">
+          <div class="box1">
+            <div class="size-bole">
+              {{ orderStatistics.theTotalAmountOfTheOrder ? orderStatistics.theTotalAmountOfTheOrder : 0 }}
+            </div>
+            <div class="size-hui">
+              <div class="nei">订单总金额</div>
+              <div class="icon-img">
+                <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
+              </div>
+            </div>
+          </div>
           <div class="box">
-            <div class="size-bole">{{ orderStatistics.numberOfStrokes?orderStatistics.numberOfStrokes:0 }}</div>
+            <div class="size-bole">{{ orderStatistics.numberOfStrokes ? orderStatistics.numberOfStrokes : 0 }}</div>
             <div class="size-hui">
               <div class="nei">笔数</div>
               <div class="icon-img">
@@ -55,8 +80,53 @@
               </div>
             </div>
           </div>
-        <div class="box">
-            <div class="size-bole">{{ orderStatistics.numberOfStrokesByOil?orderStatistics.numberOfStrokesByOil:0 }}</div>
+          <div class="box1">
+            <div class="size-bole">{{
+                orderStatistics.theTotalAmountPaid ? orderStatistics.theTotalAmountPaid : 0
+              }}
+            </div>
+            <div class="size-hui">
+              <div class="nei">实付总金额</div>
+              <div class="icon-img">
+                <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
+              </div>
+            </div>
+          </div>
+          <div class="box1">
+            <div class="size-bole">{{ orderStatistics.oilDiscounts ? orderStatistics.oilDiscounts : 0 }}</div>
+            <div class="size-hui">
+              <div class="nei">油品优惠</div>
+              <div class="icon-img">
+                <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
+              </div>
+            </div>
+          </div>
+          <div class="box1">
+            <div class="size-bole">{{ seekZeroAmount }}</div>
+            <div class="size-hui">
+              <div class="nei">找零总金额</div>
+              <div class="icon-img">
+                <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
+              </div>
+            </div>
+          </div>
+          <div class="box1">
+            <div class="size-bole">{{
+                orderStatistics.theTotalAmountOfOil ? orderStatistics.theTotalAmountOfOil : 0
+              }}
+            </div>
+            <div class="size-hui">
+              <div class="nei">油品总金额</div>
+              <div class="icon-img">
+                <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
+              </div>
+            </div>
+          </div>
+          <div class="box">
+            <div class="size-bole">{{
+                orderStatistics.numberOfStrokesByOil ? orderStatistics.numberOfStrokesByOil : 0
+              }}
+            </div>
             <div class="size-hui">
               <div class="nei">油品笔数</div>
               <div class="icon-img">
@@ -64,8 +134,10 @@
               </div>
             </div>
           </div>
-        <div class="box">
-            <div class="size-bole">{{ orderStatistics.numberOfStrokesByGoods?orderStatistics.numberOfStrokesByGoods:0 }}</div>
+          <div class="box">
+            <div class="size-bole">
+              {{ orderStatistics.numberOfStrokesByGoods ? orderStatistics.numberOfStrokesByGoods : 0 }}
+            </div>
             <div class="size-hui">
               <div class="nei">商品笔数</div>
               <div class="icon-img">
@@ -73,169 +145,111 @@
               </div>
             </div>
           </div>
-<!--        </div>-->
-        <div class="box1">
-          <div class="size-bole">{{ orderStatistics.theTotalAmountOfTheOrder?orderStatistics.theTotalAmountOfTheOrder:0 }}</div>
-          <div class="size-hui">
-            <div class="nei">订单总金额</div>
-            <div class="icon-img">
-              <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
+          <div class="box1">
+            <div class="size-bole">
+              {{ orderStatistics.theTotalAmountOfTheItem ? orderStatistics.theTotalAmountOfTheItem : 0 }}
+            </div>
+            <div class="size-hui">
+              <div class="nei">商品总金额</div>
+              <div class="icon-img">
+                <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
+              </div>
             </div>
           </div>
+
         </div>
-        <div class="box1">
-          <div class="size-bole">{{ orderStatistics.theTotalAmountPaid?orderStatistics.theTotalAmountPaid:0 }}</div>
-          <div class="size-hui">
-            <div class="nei">实付总金额</div>
-            <div class="icon-img">
-              <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
-            </div>
-          </div>
+      </div>
+      <div>
+        <div class="table-box">
+          <el-table
+            :data="orderList"
+            style="width: 100%">
+            <el-table-column type="index" width="50" align="center" label="序号"/>
+            <el-table-column prop="orderNo" align="center" label="订单号" width="220"></el-table-column>
+            <el-table-column prop="amount" align="center" label="订单金额"></el-table-column>
+            <el-table-column prop="afterDiscountAmount" align="center" label="优惠后应付金额"></el-table-column>
+            <el-table-column prop="payAmount" align="center" label="实付金额"></el-table-column>
+            <el-table-column prop="seekZero" align="center" label="找零金额"></el-table-column>
+            <el-table-column align="center" label="订单金额组成">
+              <el-table-column prop="oilOrderAmount" align="center" label="油品金额">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.oilOrderAmount ? scope.row.oilOrderAmount : '0' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="goodsOrderAmount" align="center" label="商品金额">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.goodsOrderAmount ? scope.row.goodsOrderAmount : '0' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+            <el-table-column align="center" label="实付订单金额组成">
+              <el-table-column prop="oilOrderAmount" align="center" label="油品实付金额" width="100">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.oilPayAmount ? scope.row.oilPayAmount : '0' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="goodsOrderAmount" align="center" label="商品实付金额" width="110">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.goodsPayAmount ? scope.row.goodsPayAmount : '0' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+
+            <el-table-column prop="payUser" align="center" label="付款用户" width="110"></el-table-column>
+            <el-table-column prop="status" align="center" 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-if="scope.row.status === 'refund'">已退款</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" prop="staffId">
+              <template slot-scope="scope">
+                <span>{{ getRealName(staffList, scope.row.staffId) || '--' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="240" 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"
+                           v-if="scope.row.status === 'paid'"
+                           @click="refHandleRefund(scope.row.id)"
+                           type="danger" plain round>退款
+                </el-button>
+              </template>
+            </el-table-column>
+
+          </el-table>
         </div>
-        <div class="box1">
-          <div class="size-bole">{{ orderStatistics.oilDiscounts?orderStatistics.oilDiscounts:0 }}</div>
-          <div class="size-hui">
-            <div class="nei">油品优惠</div>
-            <div class="icon-img">
-              <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
-            </div>
-          </div>
-        </div>
-        <div class="box1">
-          <div class="size-bole">{{ orderStatistics.theTotalAmountOfOil?orderStatistics.theTotalAmountOfOil:0 }}</div>
-          <div class="size-hui">
-            <div class="nei">油品总金额</div>
-            <div class="icon-img">
-              <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
-            </div>
-          </div>
-        </div>
-        <div class="box1">
-          <div class="size-bole">{{ orderStatistics.theTotalAmountOfTheItem?orderStatistics.theTotalAmountOfTheItem:0 }}</div>
-          <div class="size-hui">
-            <div class="nei">商品总金额</div>
-            <div class="icon-img">
-              <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
-            </div>
-          </div>
-        </div>
-        <div class="box1">
-          <div class="size-bole">{{ seekZeroAmount }}</div>
-          <div class="size-hui">
-            <div class="nei">找零总金额</div>
-            <div class="icon-img">
-              <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
-            </div>
-          </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>
 
       </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 type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
-          <el-table-column prop="amount" align="center" label="订单金额"> </el-table-column>
-          <el-table-column prop="afterDiscountAmount" align="center" label="优惠后应付金额"> </el-table-column>
-          <el-table-column prop="payAmount" align="center" label="实付金额"> </el-table-column>
-          <el-table-column prop="seekZero" align="center" label="找零金额"> </el-table-column>
-          <el-table-column align="center" label="订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilOrderAmount ? scope.row.oilOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品金额">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsOrderAmount ? scope.row.goodsOrderAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column align="center" label="实付订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品实付金额" width="100">
-              <template slot-scope="scope">
-                <span>{{scope.row.oilPayAmount ? scope.row.oilPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="goodsOrderAmount" align="center" label="商品实付金额" width="110">
-              <template slot-scope="scope">
-                <span>{{scope.row.goodsPayAmount ? scope.row.goodsPayAmount : '0'}}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
+    </div>
 
-          <el-table-column prop="payUser" align="center" label="付款用户" width="110"> </el-table-column>
-          <el-table-column prop="status" align="center" 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-if="scope.row.status === 'refund'">已退款</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" prop="staffId">
-            <template slot-scope="scope">
-              <span>{{ getRealName(staffList,scope.row.staffId) || '--' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" width="240" 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"
-                         v-if = "scope.row.status === 'paid'"
-                         @click="refHandleRefund(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">
@@ -254,7 +268,7 @@
             <span v-if="oilInfo.length>0">{{ oilInfo[0].activeAmount || 0 }}</span>
           </el-descriptions-item>
           <el-descriptions-item label="油品会员等级优惠">
-            <span v-if="oilInfo.length>0">{{ oilInfo[0].levelAmount || 0}}</span>
+            <span v-if="oilInfo.length>0">{{ oilInfo[0].levelAmount || 0 }}</span>
           </el-descriptions-item>
           <el-descriptions-item label="油品优惠总额">{{ cashierOrder.oilDiscountAmount }}</el-descriptions-item>
           <el-descriptions-item label="商品优惠总额">{{ cashierOrder.goodsDiscountAmount }}</el-descriptions-item>
@@ -265,10 +279,10 @@
             <span v-if="oilInfo.length>0">{{ oilInfo[0].balanceAmount }}</span>
             <span v-else>0</span>
           </el-descriptions-item>
-<!--          <el-descriptions-item label="囤油卡消费升数">-->
-<!--            <span v-if="oilInfo.length>0">{{ oilInfo[0].oilCardAmount }}</span>-->
-<!--            <span v-else>0</span>-->
-<!--          </el-descriptions-item>-->
+          <!--          <el-descriptions-item label="囤油卡消费升数">-->
+          <!--            <span v-if="oilInfo.length>0">{{ oilInfo[0].oilCardAmount }}</span>-->
+          <!--            <span v-else>0</span>-->
+          <!--          </el-descriptions-item>-->
           <el-descriptions-item label="找零金额">{{ cashierOrder.seekZero }}</el-descriptions-item>
           <el-descriptions-item label="付款方式">
             <span v-if="cashierOrder.payType == 'CASH'">现金</span>
@@ -288,7 +302,7 @@
             <el-tag type="info" v-else>退款中</el-tag>
           </el-descriptions-item>
           <el-descriptions-item label="交易时间">
-            {{ cashierOrder.payTime ? parseTime(cashierOrder.payTime):"--" }}
+            {{ cashierOrder.payTime ? parseTime(cashierOrder.payTime) : "--" }}
           </el-descriptions-item>
         </el-descriptions>
       </div>
@@ -302,7 +316,9 @@
               style="width: 100%">
               <el-table-column label="油号油枪" prop="terminal">
                 <template slot-scope="scope">
-                  <span>{{ getName(oilNameList,scope.row.oils) }}/{{ getName1(oilGunList,scope.row.oilGunNum) }}</span>
+                  <span>{{ getName(oilNameList, scope.row.oils) }}/{{
+                      getName1(oilGunList, scope.row.oilGunNum)
+                    }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="油品金额" align="center" prop="orderAmount">
@@ -310,7 +326,7 @@
                   <span>{{ scope.row.orderAmount }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="加油升数" align="center" prop="oilNum" >
+              <el-table-column label="加油升数" align="center" prop="oilNum">
                 <template slot-scope="scope">
                   <span>{{ scope.row.oilNum }}L</span>
                 </template>
@@ -320,18 +336,18 @@
                   <span>{{ scope.row.oilPrice }}/L</span>
                 </template>
               </el-table-column>
-<!--              <el-table-column label="满减活动优惠" align="center" prop="activeId">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <span v-if="scope.row.activeType==1">{{ scope.row.deductionAmount }}</span>-->
-<!--                  <span v-else>0</span>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column label="折扣活动优惠" align="center" prop="activeId">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <span v-if="scope.row.activeType==2">{{ scope.row.deductionAmount }}</span>-->
-<!--                  <span v-else>0</span>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
+              <!--              <el-table-column label="满减活动优惠" align="center" prop="activeId">-->
+              <!--                <template slot-scope="scope">-->
+              <!--                  <span v-if="scope.row.activeType==1">{{ scope.row.deductionAmount }}</span>-->
+              <!--                  <span v-else>0</span>-->
+              <!--                </template>-->
+              <!--              </el-table-column>-->
+              <!--              <el-table-column label="折扣活动优惠" align="center" prop="activeId">-->
+              <!--                <template slot-scope="scope">-->
+              <!--                  <span v-if="scope.row.activeType==2">{{ scope.row.deductionAmount }}</span>-->
+              <!--                  <span v-else>0</span>-->
+              <!--                </template>-->
+              <!--              </el-table-column>-->
             </el-table>
           </el-descriptions-item>
           <el-descriptions-item label="商品详情">
@@ -365,7 +381,7 @@
         </el-descriptions>
       </div>
     </el-dialog>
-<!--    订单退款-->
+    <!--    订单退款-->
     <el-dialog
       :close-on-click-modal="false"
       title="订单退款"
@@ -375,7 +391,7 @@
         退款密码<br/>
       </div>
       <div>
-        <el-input placeholder="请输入退款密码" v-model="refPass"  show-password></el-input>
+        <el-input placeholder="请输入退款密码" v-model="refPass" show-password></el-input>
         <br/>
       </div>
 
@@ -391,7 +407,7 @@
       width="25%"
       :visible.sync="dialogRefund">
       <div style="text-align: center;font-weight: bold">
-<!--        ￥<span style="font-size: 35px">{{ cashierOrder.payAmount }}</span>-->
+        <!--        ￥<span style="font-size: 35px">{{ cashierOrder.payAmount }}</span>-->
         ￥<span style="font-size: 35px">{{ cashierOrder.goodsPayAmount + cashierOrder.oilPayAmount }}</span>
       </div>
       <div class="tk">退款金额</div>
@@ -400,23 +416,23 @@
       <span>退款内容：</span>
       <br>
       <span>商品：</span>
-      <el-checkbox v-model="isGoods" @click="calculateRefunds()">￥{{cashierOrder.goodsPayAmount}}</el-checkbox>
+      <el-checkbox v-model="isGoods" @click="calculateRefunds()">￥{{ cashierOrder.goodsPayAmount }}</el-checkbox>
       <br>
 
 
-
       <span>油品：</span>
-      <template >
+      <template>
         <el-checkbox v-if="oilInfo.length > 0" v-model="isOil" @click="calculateRefunds()">
 
-          <span v-if="oilInfo[0].payAmount && oilInfo[0].payAmount!='0.00'"> ￥{{cashierOrder.oilPayAmount}}</span>
-          <span v-if="oilInfo[0].balanceAmount>0">储值卡：{{oilInfo[0].balanceAmount}} </span>
-          <span v-if="oilInfo[0].oilCardAmount>0">屯油卡：{{ oilInfo[0].oilCardAmount}} </span>
+          <span v-if="oilInfo[0].payAmount && oilInfo[0].payAmount!='0.00'"> ￥{{ cashierOrder.oilPayAmount }}</span>
+          <span v-if="oilInfo[0].balanceAmount>0">储值卡：{{ oilInfo[0].balanceAmount }} </span>
+          <span v-if="oilInfo[0].oilCardAmount>0">屯油卡：{{ oilInfo[0].oilCardAmount }} </span>
+        </el-checkbox>
+        <el-checkbox v-if="isOil && oilInfo.length > 0 && oilInfo[0].couponId" v-model="isOilVouchers">优惠卷
         </el-checkbox>
-        <el-checkbox v-if="isOil && oilInfo.length > 0 && oilInfo[0].couponId" v-model="isOilVouchers">优惠卷</el-checkbox>
 
-<!--        <el-checkbox v-if="oilInfo.length > 0 && oilInfo[0].balanceAmount>0" v-model="isOilCard">储值卡：{{oilInfo[0].balanceAmount}}</el-checkbox>-->
-<!--        <el-checkbox v-if="oilInfo.length > 0 && oilInfo[0].oilCardAmount>0" v-model="isOilFuel">屯油卡：{{ oilInfo[0].oilCardAmount }}</el-checkbox>-->
+        <!--        <el-checkbox v-if="oilInfo.length > 0 && oilInfo[0].balanceAmount>0" v-model="isOilCard">储值卡：{{oilInfo[0].balanceAmount}}</el-checkbox>-->
+        <!--        <el-checkbox v-if="oilInfo.length > 0 && oilInfo[0].oilCardAmount>0" v-model="isOilFuel">屯油卡：{{ oilInfo[0].oilCardAmount }}</el-checkbox>-->
       </template>
 
 
@@ -431,7 +447,7 @@
       <div>
         <el-input placeholder="请输入退款原因" v-model="refundRemark"></el-input>
         <br/>
-<!--        <span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理</span>-->
+        <!--        <span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理</span>-->
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogRefund = false">取 消</el-button>
@@ -445,7 +461,7 @@
       <div class="box-ge">
         <div v-for="item in oilInfo" :key="item.id">
           <div class="input-box">
-            <div>{{ getName(oilNameList,item.oils) }}/{{ getName1(oilGunList,item.oilGunNum) }}</div>
+            <div>{{ getName(oilNameList, item.oils) }}/{{ getName1(oilGunList, item.oilGunNum) }}</div>
             <div>￥{{ item.orderAmount }}</div>
           </div>
           <div class="input-box">
@@ -500,7 +516,7 @@
       <div class="box-ge">
         <div v-if="isOil" v-for="item in oilInfo" :key="item.id">
           <div class="input-box">
-            <div>{{ getName(oilNameList,item.oils) }}/{{ getName1(oilGunList,item.oilGunNum) }}</div>
+            <div>{{ getName(oilNameList, item.oils) }}/{{ getName1(oilGunList, item.oilGunNum) }}</div>
             <div>￥{{ item.orderAmount }}</div>
           </div>
           <div class="input-box">
@@ -509,13 +525,13 @@
           </div>
         </div>
         <div v-if="isOil">
-          <div  v-if="oilInfo[0].balanceAmount>0" class="input-box">
+          <div v-if="oilInfo[0].balanceAmount>0" class="input-box">
             <div>储值卡</div>
-            <div>{{oilInfo[0].balanceAmount}}</div>
+            <div>{{ oilInfo[0].balanceAmount }}</div>
           </div>
-          <div  v-if="oilInfo[0].oilCardAmount>0" class="input-box">
+          <div v-if="oilInfo[0].oilCardAmount>0" class="input-box">
             <div>屯油卡</div>
-            <div>{{ oilInfo[0].oilCardAmount}}</div>
+            <div>{{ oilInfo[0].oilCardAmount }}</div>
           </div>
         </div>
 
@@ -580,135 +596,138 @@ import {formatDate} from "@/utils";
 import ScanPayCodeDialog from "@/views/cashier/components/scanPayCodeDialog.vue";
 import {printOilOrderReport, rePrintOilOrderReport} from "@/api/print";
 import {ifRefPassApi} from "@/api/staff/store";
+import {getDicts} from "../../../api/dict/data";
 
-  export default {
-    name: "order_Cashier",
-    components: {ScanPayCodeDialog},
-    data(){
-      return{
-        calculateRefundsV:0,
-        // 退款备注
-        refundRemark:"",
-        refPass:"",
-        radio1:"油号选错",
-        // 油号列表
-        oilNameList:[],
-        // 油品订单详情列表
-        oilInfo:[],
-        // 商品订单详情列表
-        goodsInfo:[],
-        oilGunList:[],
-        // 收银员订单详情
-        cashierOrder:{},
-        loading:false,
-        dialogVisible:false,
-        dialogRefund:false,
-        refDialogRefund:false,
-        // 员工列表
-        staffList:[],
-        // 日期范围
-        dateRange: [],
-        beginTime:"",
-        endTime:"",
-        isOilVouchers:false,
-        isGoods: false,
-        isOil: false,
-        isOilCard: false,  // 是否推掉油卡
-        isOilFuel: false, //是否推掉储值卡
-        // 是否为当天时间
-        isSysDate:false,
-        // 收银台订单列表
-        orderList:[],
-        // 查询参数
-        queryParams: {
-          page: 1,
-          pageSize: 10,
-          beginTime:"",
-          endTime:"",
-        },
-        orderStatistics:{
-          numberOfStrokes:'0',
-          theTotalAmountOfTheOrder:'0',
-          theTotalAmountPaid:'0',
-          oilDiscounts:'0',
-          theTotalAmountOfOil:'0',
-          theTotalAmountOfTheItem:'0',
-        },
-        total:0,
-        seekZeroAmount:0,
-        getId:""
+export default {
+  name: "order_Cashier",
+  components: {ScanPayCodeDialog},
+  data() {
+    return {
+      calculateRefundsV: 0,
+      // 退款备注
+      refundRemark: "",
+      refPass: "",
+      radio1: "油号选错",
+      // 油号列表
+      oilNameList: [],
+      // 油品订单详情列表
+      oilInfo: [],
+      // 商品订单详情列表
+      goodsInfo: [],
+      oilGunList: [],
+      // 收银员订单详情
+      cashierOrder: {},
+      loading: false,
+      dialogVisible: false,
+      dialogRefund: false,
+      refDialogRefund: false,
+      // 员工列表
+      staffList: [],
+      // 日期范围
+      dateRange: [],
+      beginTime: "",
+      endTime: "",
+      isOilVouchers: false,
+      isGoods: false,
+      isOil: false,
+      isOilCard: false,  // 是否推掉油卡
+      isOilFuel: false, //是否推掉储值卡
+      // 是否为当天时间
+      isSysDate: false,
+      // 收银台订单列表
+      orderList: [],
+      // 查询参数
+      queryParams: {
+        page: 1,
+        pageSize: 10,
+        beginTime: "",
+        endTime: "",
+      },
+      orderStatistics: {
+        numberOfStrokes: '0',
+        theTotalAmountOfTheOrder: '0',
+        theTotalAmountPaid: '0',
+        oilDiscounts: '0',
+        theTotalAmountOfOil: '0',
+        theTotalAmountOfTheItem: '0',
+      },
+      // 支付类型列表
+      payList:[],
+      total: 0,
+      seekZeroAmount: 0,
+      getId: ""
+    }
+  },
+  created() {
+    let start = new Date();
+    start.setHours(0)
+    start.setMinutes(0)
+    start.setSeconds(0)
+    start.setMilliseconds(0)
+    this.dateRange = [start, new Date()];
+    this.beginTime = start
+    this.endTime = new Date()
+    this.isSysDate = true
+    this.getList();
+    // this.getOrderStatistics();
+    this.getStaffList();
+    this.getOilGunList();
+  },
+  methods: {
+
+    exportExcelCashier() {
+      let dateRange = []
+      if (this.beginTime && this.endTime) {
+        dateRange.push(this.beginTime.toLocaleDateString())
+        dateRange.push(this.endTime.toLocaleDateString())
       }
+      exportExcelCashierApi(this.addDateRange(this.queryParams, dateRange)).then(res => {
+        const blob = new Blob([res], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
+        this.$download.saveAs(blob, '收银台订单统计.xLsx')
+      })
     },
-    created() {
-      let start = new Date();
-      start.setHours(0)
-      start.setMinutes(0)
-      start.setSeconds(0)
-      start.setMilliseconds(0)
-      this.dateRange = [start,new Date()];
-      this.beginTime = start
-      this.endTime = new Date()
-      this.isSysDate = true
-      this.getList();
-      // this.getOrderStatistics();
-      this.getStaffList();
-      this.getOilGunList();
+    // 获取订单统计信息
+
+    getOrderStatistics() {
+      let dateRange = []
+      if (this.beginTime && this.endTime) {
+        dateRange.push(this.beginTime.toLocaleDateString())
+        dateRange.push(this.endTime.toLocaleDateString())
+      }
+      orderStatisticsApi(this.addDateRange(this.queryParams, dateRange)).then(res => {
+        this.orderStatistics = res.data
+      })
     },
-    methods:{
-
-      exportExcelCashier() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
+    // 获取员工姓名
+    getRealName(list, val) {
+      let name = "";
+      list.forEach(item => {
+        if (item.id == val) {
+          name = item.realName
         }
-        exportExcelCashierApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-          const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-          this.$download.saveAs(blob,'收银台订单统计.xLsx')
-        })
-      },
-      // 获取订单统计信息
-
-      getOrderStatistics() {
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
+      })
+      return name;
+    },
+    // 获取员工手机号
+    getMobile(list, val) {
+      let name = "";
+      list.forEach(item => {
+        if (item.id == val) {
+          name = item.mobile
         }
-        orderStatisticsApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
-          this.orderStatistics = res.data
-        })
-      },
-      // 获取员工姓名
-      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;
-      },
+      })
+      return name;
+    },
 
-      async printLocally(data) {
-        if (!connectFlag){
-          return
-        }
+    async printLocally(data) {
+      if (!connectFlag) {
+        return
+      }
 
-        //初始化打印函数
-        let LODOP = getLodop(); // 初始化打印
-        LODOP.PRINT_INIT();
-        var bodyStyle = `<style>
+      //初始化打印函数
+      let LODOP = getLodop(); // 初始化打印
+      LODOP.PRINT_INIT();
+      var bodyStyle = `<style>
             .input-box{
                 width: 100%;
                 display: flex;
@@ -771,582 +790,609 @@ import {ifRefPassApi} from "@/api/staff/store";
               }
             </style>
             `
-        // var fromHtml = bodyStyle+this.$refs.report.innerHTML
-        var fromHtml = ''
-        if (data == 'report') {
-          fromHtml = bodyStyle+this.$refs.report.innerHTML
-        }else {
-          fromHtml = bodyStyle+this.$refs.report2.innerHTML
+      // var fromHtml = bodyStyle+this.$refs.report.innerHTML
+      var fromHtml = ''
+      if (data == 'report') {
+        fromHtml = bodyStyle + this.$refs.report.innerHTML
+      } else {
+        fromHtml = bodyStyle + this.$refs.report2.innerHTML
 
+      }
+
+
+      LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
+
+      LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW", true);
+
+      // LODOP.ADD_PRINT_BARCODE(10,40,100,100,'QRCode','123456789');
+      // let preview = LODOP.PREVIEW();
+      // console.log("preview",preview);
+      LODOP.PRINT();
+
+    },
+
+    // 打印商品支付后的订单
+    oilOrderReport() {
+      let oilOrderR = []
+      let balanceAmount = 0
+      let oilCardAmount = 0
+
+
+      this.oilInfo.forEach(order => {
+        if (order.balanceAmount) {
+          balanceAmount += order.balanceAmount
         }
+        if (order.oilCardAmount) {
+          oilCardAmount += order.oilCardAmount
+        }
+        let o = {
+          oilName: this.getName(this.oilNameList, order.oils) + "-" + this.getName1(this.oilGunList, order.oilGunNum),
+          amount: order.orderAmount.toString(),
+          // amount : order.oilPayAmount.toString(),
+          oilNum: order.oilNum.toString()
+        }
+        oilOrderR.push(o)
+      })
 
+      let goodsOrderR = []
+      if (this.goodsInfo) {
+        this.goodsInfo.forEach(order => {
 
-        LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
-
-        LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW",true);
-
-        // LODOP.ADD_PRINT_BARCODE(10,40,100,100,'QRCode','123456789');
-        // let preview = LODOP.PREVIEW();
-        // console.log("preview",preview);
-        LODOP.PRINT();
-
-      },
-
-      // 打印商品支付后的订单
-      oilOrderReport () {
-        let oilOrderR = []
-        let balanceAmount = 0
-        let oilCardAmount = 0
-
-
-        this.oilInfo.forEach(order=>{
-          if (order.balanceAmount) {
-            balanceAmount+=order.balanceAmount
-          }
-          if (order.oilCardAmount) {
-            oilCardAmount+=order.oilCardAmount
-          }
           let o = {
-            oilName : this.getName(this.oilNameList, order.oils) + "-" + this.getName1(this.oilGunList, order.oilGunNum),
-            amount : order.orderAmount.toString(),
-            // amount : order.oilPayAmount.toString(),
-            oilNum : order.oilNum.toString()
+            oilName: order.name,
+            unit: order.num + "" + order.unit,
+            // amount : order.memberPrice.toString()
+            amount: order.retailPrice.toString()
           }
-          oilOrderR.push(o)
+          goodsOrderR.push(o)
         })
+      }
 
-        let goodsOrderR = []
-        if (this.goodsInfo) {
-          this.goodsInfo.forEach(order=>{
+      console.log("111111111111111111111111112")
 
-            let o = {
-              oilName : order.name,
-              unit : order.num+""+order.unit,
-              // amount : order.memberPrice.toString()
-              amount : order.retailPrice.toString()
-            }
-            goodsOrderR.push(o)
-          })
+      // 支付方式
+      const payTypeMap = {
+        'CASH': '现金',
+        'WECHAT': '微信',
+        'ALIPAY': '支付宝',
+        'UNIONPAY': '银联二维码',
+        'credit': '挂账',
+        'oilCard': '囤油卡',
+        'balance': '储值卡'
+      };
+      let payTypeText = payTypeMap[this.cashierOrder.payType] || '小程序码';
+      console.log("this.cashierOrder.amount", this.cashierOrder)
+      let amount = (this.cashierOrder.payAmount - this.cashierOrder.seekZero).toFixed(2)
+      // console
+      let f = {
+        oilOrder: oilOrderR,
+        goodsOrder: goodsOrderR,
+        payType: payTypeText,
+        // amount:this.cashierOrder.payAmount-this.cashierOrder.seekZero,
+        payAmount: this.cashierOrder.payAmount,
+        amount: this.cashierOrder.amount,
+        actualPay: this.cashierOrder.payAmount.toFixed(2),
+        // discount:this.cashierOrder.amount-this.cashierOrder.afterDiscountAmount,
+        seekZero: this.cashierOrder.seekZero,
+        consumeAmount: balanceAmount,// 储值卡
+        consumeRefuelMoney: oilCardAmount,// 屯油卡
+
+      }
+      // rePrintOilOrderReport(f).then(res=>{
+      printOilOrderReport(f).then(res => {
+
+      })
+      // // consumeAmount:this.consumeAmount,
+      // creditAmount: (this.oilAmount+(+this.goodsAmount)).toFixed(2),//挂账金额
+      //   // 优惠合计
+      //   discount:(this.oilDiscount + this.goodsDiscount + this.fullReduction + this.couponAmount).toFixed(2), // 油惠合计
+      //   // 储值卡付款
+      //   consumeAmount:this.consumeAmount,
+      //   // 屯油卡付款
+      //   consumeRefuelMoney:this.consumeRefuelMoney.toFixed(2),
+
+
+    },
+
+    // 打印商品支付后的订单
+    reoilOrderReport() {
+      let oilOrderR = []
+      let balanceAmount = 0
+      let oilCardAmount = 0
+      this.oilInfo.forEach(order => {
+        if (order.balanceAmount) {
+          balanceAmount += order.balanceAmount
         }
-
-        console.log("111111111111111111111111112")
-
-        // 支付方式
-        const payTypeMap = {
-          'CASH': '现金',
-          'WECHAT': '微信',
-          'ALIPAY': '支付宝',
-          'UNIONPAY': '银联二维码',
-          'credit': '挂账',
-          'oilCard': '囤油卡',
-          'balance': '储值卡'
-        };
-        let payTypeText = payTypeMap[this.cashierOrder.payType] || '小程序码';
-        console.log("this.cashierOrder.amount",this.cashierOrder)
-        let amount = (this.cashierOrder.payAmount-this.cashierOrder.seekZero).toFixed(2)
-        // console
-        let f ={
-          oilOrder:oilOrderR,
-          goodsOrder:goodsOrderR,
-          payType:payTypeText,
-          // amount:this.cashierOrder.payAmount-this.cashierOrder.seekZero,
-          payAmount:this.cashierOrder.payAmount,
-          amount:this.cashierOrder.amount,
-          actualPay:this.cashierOrder.payAmount.toFixed(2) ,
-          // discount:this.cashierOrder.amount-this.cashierOrder.afterDiscountAmount,
-          seekZero:this.cashierOrder.seekZero,
-          consumeAmount:balanceAmount,// 储值卡
-          consumeRefuelMoney:oilCardAmount,// 屯油卡
-
+        if (order.oilCardAmount) {
+          oilCardAmount += order.oilCardAmount
         }
-        // rePrintOilOrderReport(f).then(res=>{
-            printOilOrderReport(f).then(res=>{
+        let o = {
+          oilName: this.getName(this.oilNameList, order.oils) + "-" + this.getName1(this.oilGunList, order.oilGunNum),
+          amount: order.orderAmount.toString(),
+          oilNum: order.oilNum.toString()
+        }
+        oilOrderR.push(o)
+      })
+      console.log("111111111111111111111111111")
 
-        })
-        // // consumeAmount:this.consumeAmount,
-        // creditAmount: (this.oilAmount+(+this.goodsAmount)).toFixed(2),//挂账金额
-        //   // 优惠合计
-        //   discount:(this.oilDiscount + this.goodsDiscount + this.fullReduction + this.couponAmount).toFixed(2), // 油惠合计
-        //   // 储值卡付款
-        //   consumeAmount:this.consumeAmount,
-        //   // 屯油卡付款
-        //   consumeRefuelMoney:this.consumeRefuelMoney.toFixed(2),
+      let goodsOrderR = []
+      if (this.goodsInfo) {
+        this.goodsInfo.forEach(order => {
+          console.log("111111111111111111111111111")
 
-
-      },
-
-      // 打印商品支付后的订单
-      reoilOrderReport () {
-        let oilOrderR = []
-        let balanceAmount = 0
-        let oilCardAmount = 0
-        this.oilInfo.forEach(order=>{
-            if (order.balanceAmount) {
-              balanceAmount+=order.balanceAmount
-            }
-            if (order.oilCardAmount) {
-              oilCardAmount+=order.oilCardAmount
-            }
-            let o = {
-            oilName : this.getName(this.oilNameList, order.oils) + "-" + this.getName1(this.oilGunList, order.oilGunNum),
-            amount : order.orderAmount.toString(),
-            oilNum : order.oilNum.toString()
+          let o = {
+            oilName: order.name,
+            unit: order.num + "" + order.unit,
+            amount: order.memberPrice.toString()
           }
-          oilOrderR.push(o)
+          goodsOrderR.push(o)
         })
-        console.log("111111111111111111111111111")
-
-        let goodsOrderR = []
-        if (this.goodsInfo) {
-          this.goodsInfo.forEach(order=>{
-            console.log("111111111111111111111111111")
-
-            let o = {
-              oilName : order.name,
-              unit : order.num+""+order.unit,
-              amount : order.memberPrice.toString()
-            }
-            goodsOrderR.push(o)
-          })
-        }
+      }
 
 
-        // 支付方式
-        const payTypeMap = {
-          'CASH': '现金',
-          'WECHAT': '微信',
-          'ALIPAY': '支付宝',
-          'UNIONPAY': '银联二维码',
-          'credit': '挂账',
-          'oilCard': '囤油卡',
-          'balance': '储值卡'
-        };
-        let payTypeText = payTypeMap[this.cashierOrder.payType] || '小程序码';
+      // 支付方式
+      const payTypeMap = {
+        'CASH': '现金',
+        'WECHAT': '微信',
+        'ALIPAY': '支付宝',
+        'UNIONPAY': '银联二维码',
+        'credit': '挂账',
+        'oilCard': '囤油卡',
+        'balance': '储值卡'
+      };
+      let payTypeText = payTypeMap[this.cashierOrder.payType] || '小程序码';
 
 
+      let f = {
+        oilOrder: oilOrderR,
+        goodsOrder: goodsOrderR,
+        payType: payTypeText,
+        amount: this.cashierOrder.amount,
+        payAmount: this.cashierOrder.amount,
+        // seekZero:this.cashierOrder.payAmount,
+        balanceAmount: balanceAmount,// 储值卡
+        oilCardAmount: oilCardAmount,// 屯油卡
+        calculateRefundsV: this.calculateRefundsV,
+        type: "2",
+      }
+      rePrintOilOrderReport(f).then(res => {
 
-        let f ={
-          oilOrder:oilOrderR,
-          goodsOrder:goodsOrderR,
-          payType:payTypeText,
-          amount:this.cashierOrder.amount,
-          payAmount:this.cashierOrder.amount,
-          // seekZero:this.cashierOrder.payAmount,
-          balanceAmount:balanceAmount,// 储值卡
-          oilCardAmount:oilCardAmount,// 屯油卡
-          calculateRefundsV:this.calculateRefundsV,
-          type : "2",
-        }
-        rePrintOilOrderReport(f).then(res=>{
-
-        })
-      },
+      })
+    },
 
 
-      // 补打
-      patchwork(data){
-        const orderNo = data.orderNo
-        this.$modal.confirm('确定您要补打当前订单吗？当前订单号[' + orderNo + '],请确保云打印机正在运行中').then(function() {
-          // return delUser(row.id);
-        }).then(async () => {
-          await cashierOrder(data.id).then( response => {
-            this.cashierOrder = response.data
-            this.$modal.msgSuccess("打印指令已发送打印机,请查看打印结果");
-          })
-          await this.getOilList(this.cashierOrder.orderNo)
-          await this.getGoodsLists(this.cashierOrder.goodsOrderId)
-          // this.printLocally('report')
-          this.oilOrderReport()
-        }).catch(() => {});
-      },
-
-      async refHandleRefundByif(id){
-        this.refDialogRefund = true;
-        await ifRefPassApi({refPass:this.refPass}).then(res=>{
-          if (res.data) {
-            this.handleRefund(this.getId)
-            this.refDialogRefund = false;
-          } else {
-            this.$message({
-              type: 'info',
-              message: '密码错误'
-            });
-          }
-        })
-      },
-      async refHandleRefund(id){
-        this.getId = id,
-        this.refPass = ""
-        this.refDialogRefund = true;
-      },
-
-
-        // 退款
-      async handleRefund(id){
-        this.dialogRefund = true;
-        await cashierOrder(id).then( response => {
+    // 补打
+    patchwork(data) {
+      const orderNo = data.orderNo
+      this.$modal.confirm('确定您要补打当前订单吗？当前订单号[' + orderNo + '],请确保云打印机正在运行中').then(function () {
+        // return delUser(row.id);
+      }).then(async () => {
+        await cashierOrder(data.id).then(response => {
           this.cashierOrder = response.data
-
-          //
-          this.getOilList(response.data.orderNo)
-          if (response.data.status === "refund") {
-            this.$message({
-              type: 'info',
-              message: '该订单已经退款'
-            });
-            this.dialogRefund = false;
-          }
+          this.$modal.msgSuccess("打印指令已发送打印机,请查看打印结果");
         })
-        //退款确定
-        // this.$confirm('是否将该收银台下的订单全部退款, 是否继续?', '提示', {
-        //   confirmButtonText: '确定',
-        //   cancelButtonText: '取消',
-        //   type: 'warning'
-        // }).then(() => {
-        //   this.dialogRefund = true;
-        //   cashierOrder(id).then( response => {
-        //     this.cashierOrder = response.data
-        //     if (response.data.status === "refund") {
-        //       this.$message({
-        //         type: 'info',
-        //         message: '该订单已经退款'
-        //       });
-        //       this.dialogRefund = false;
-        //     }
-        //   })
-        // }).catch(() => {
-        //   this.$message({
-        //     type: 'info',
-        //     message: '已取消删除'
-        //   });
-        // });
-      },
+        await this.getOilList(this.cashierOrder.orderNo)
+        await this.getGoodsLists(this.cashierOrder.goodsOrderId)
+        // this.printLocally('report')
+        this.oilOrderReport()
+      }).catch(() => {
+      });
+    },
 
-      // 计算退款总价
-      calculateRefunds() {
-        let refundAmt = 0
-        if (this.isGoods) {
-          refundAmt += this.cashierOrder.goodsPayAmount
-        }
-        if (this.isOil && this.cashierOrder.oilPayAmount > 0) {
-          refundAmt += this.cashierOrder.oilPayAmount
-        }
-
-        this.calculateRefundsV = refundAmt;
-      },
-
-      async refundConfirmed() {
-        this.calculateRefunds();
-        if(!this.isOil && !this.isGoods) {
+    async refHandleRefundByif(id) {
+      this.refDialogRefund = true;
+      await ifRefPassApi({refPass: this.refPass}).then(res => {
+        if (res.data) {
+          this.handleRefund(this.getId)
+          this.refDialogRefund = false;
+        } else {
           this.$message({
             type: 'info',
-            message: '请选择退款项'
+            message: '密码错误'
           });
-          return
         }
-        this.dialogRefund = false;
-        this.loading = true;
-        console.log("cashierOrder",this.cashierOrder)
+      })
+    },
+    async refHandleRefund(id) {
+      this.getId = id,
+        this.refPass = ""
+      this.refDialogRefund = true;
+    },
 
 
+    // 退款
+    async handleRefund(id) {
+      this.dialogRefund = true;
+      await cashierOrder(id).then(response => {
+        this.cashierOrder = response.data
 
-        // 计算退款总价
-        let refundAmt = 0
-        if (this.isGoods) {
-          refundAmt += this.cashierOrder.goodsPayAmount
+        //
+        this.getOilList(response.data.orderNo)
+        if (response.data.status === "refund") {
+          this.$message({
+            type: 'info',
+            message: '该订单已经退款'
+          });
+          this.dialogRefund = false;
         }
-        if (this.isOil && this.cashierOrder.oilPayAmount > 0) {
-          refundAmt += this.cashierOrder.oilPayAmount
+      })
+      //退款确定
+      // this.$confirm('是否将该收银台下的订单全部退款, 是否继续?', '提示', {
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
+      //   type: 'warning'
+      // }).then(() => {
+      //   this.dialogRefund = true;
+      //   cashierOrder(id).then( response => {
+      //     this.cashierOrder = response.data
+      //     if (response.data.status === "refund") {
+      //       this.$message({
+      //         type: 'info',
+      //         message: '该订单已经退款'
+      //       });
+      //       this.dialogRefund = false;
+      //     }
+      //   })
+      // }).catch(() => {
+      //   this.$message({
+      //     type: 'info',
+      //     message: '已取消删除'
+      //   });
+      // });
+    },
+
+    // 计算退款总价
+    calculateRefunds() {
+      let refundAmt = 0
+      if (this.isGoods) {
+        refundAmt += this.cashierOrder.goodsPayAmount
+      }
+      if (this.isOil && this.cashierOrder.oilPayAmount > 0) {
+        refundAmt += this.cashierOrder.oilPayAmount
+      }
+
+      this.calculateRefundsV = refundAmt;
+    },
+
+    async refundConfirmed() {
+      this.calculateRefunds();
+      if (!this.isOil && !this.isGoods) {
+        this.$message({
+          type: 'info',
+          message: '请选择退款项'
+        });
+        return
+      }
+      this.dialogRefund = false;
+      this.loading = true;
+      console.log("cashierOrder", this.cashierOrder)
+
+
+      // 计算退款总价
+      let refundAmt = 0
+      if (this.isGoods) {
+        refundAmt += this.cashierOrder.goodsPayAmount
+      }
+      if (this.isOil && this.cashierOrder.oilPayAmount > 0) {
+        refundAmt += this.cashierOrder.oilPayAmount
+      }
+
+      // if (this.isOilCard || this.isOilFuel) {
+      //   this.isOil = true
+      // }
+
+      let map = {
+
+        orderNo: this.cashierOrder.orderNo,
+        storeId: this.cashierOrder.storeId,
+        refundRemark: this.radio1 + "-" + this.refundRemark,
+        type: "canRefund",
+        isOilVouchers: this.isOilVouchers,
+        isGoods: this.isGoods,
+        isOil: this.isOil,
+        isOilCard: this.isOilCard,  // 是否推掉油卡
+        isOilFuel: this.isOilFuel, //是否推掉储值卡
+        refundAmt: refundAmt
+      }
+      await refundApi(map).then(res => {
+        if (res.code == 200) {
+          this.$message({
+            type: 'info',
+            message: '退款成功'
+          });
+          // this.printLocally()
+          this.reoilOrderReport()
+
         }
 
-        // if (this.isOilCard || this.isOilFuel) {
-        //   this.isOil = true
-        // }
+      })
 
-        let map={
+      this.loading = false;
 
-          orderNo: this.cashierOrder.orderNo,
-          storeId: this.cashierOrder.storeId,
-          refundRemark:this.radio1 +"-"+ this.refundRemark,
-          type: "canRefund",
-          isOilVouchers:this.isOilVouchers,
-          isGoods: this.isGoods,
-          isOil: this.isOil,
-          isOilCard: this.isOilCard,  // 是否推掉油卡
-          isOilFuel: this.isOilFuel, //是否推掉储值卡
-          refundAmt: refundAmt
-        }
-        await refundApi(map).then(res=>{
-          if(res.code == 200) {
-            this.$message({
-              type: 'info',
-              message: '退款成功'
-            });
-            // this.printLocally()
-            this.reoilOrderReport()
+      this.getList();
+      // this.getOrderStatistics();
+      this.getStaffList();
+      // this.oilOrderReport()
 
-          }
-
-        })
-
-        this.loading = false;
-
-        this.getList();
-        // this.getOrderStatistics();
-        this.getStaffList();
-        // this.oilOrderReport()
-
-      },
-      // 获取油枪信息
-      getOilGunList(){
-        getOilNumberGun().then(res => {
-          res.data.forEach(item => {
-            if (item.oilGunList.length>0){
-              item.oilGunList.forEach(i => {
-                i.oilName = item.oilName
-                this.oilGunList.push(i)
-              })
-            }
-          })
-        })
-      },
-      // 获取油枪名称
-      getName1(oilNameList,id){
-        let name = ""
-        let _this = this;
-        if(oilNameList!=null && oilNameList!=""){
-          oilNameList.forEach(item => {
-            if (item.id == id){
-              name = item.gunName;
-            }
-          })
-        }
-        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;
-      },
-      // 获取订单详情
-      getOrdersInfo(id){
-        cashierOrder(id).then( response => {
-          this.cashierOrder = response.data
-          this.getOilList(this.cashierOrder.orderNo)
-          this.getGoodsLists(this.cashierOrder.goodsOrderId)
-          this.dialogVisible = true;
-        })
-      },
-      async getOilList(orderNo){
-        await oilOrderList({orderNo:orderNo}).then( response => {
-          this.oilInfo = response.data
-        })
-      },
-      async getGoodsLists(id){
-        await getOrderGoods({orderId:id}).then( response => {
-          this.goodsInfo = response.data;
-        })
-      },
-      parseTime1(dateTime) {
-        let date = new Date(dateTime);
-        let y = date.getFullYear() + "-";
-        let mon = ((date.getMonth() + 1 < 10) ? ('0' + date.getMonth()) : date.getMonth()) + "-";
-        let d = ((date.getDate() < 10) ? ('0' + date.getDate()) : date.getDate()) + " ";
-        let h = ((date.getHours() < 10) ? ('0' + date.getHours()) : date.getHours()) + ":";
-        let m = ((date.getMinutes() < 10) ? ('0' + date.getMinutes()) : date.getMinutes()) + ":";
-        let s = ((date.getSeconds() < 10) ? ('0' + date.getSeconds()) : date.getSeconds());
-        // return new Date(y , mon , d , h , m , s);
-        return y+mon+d+h+m+s;
-      },
-      // 获取列表信息
-      getList(val){
-        if (val!=undefined){
-          this.queryParams.page = val
-        }
-
-        let dateRange1 = this.dateRange
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        // if (this.isSysDate){
-        //   dateRange.push(dateRange1[0].toLocaleDateString())
-        //   dateRange.push(dateRange1[1].toLocaleDateString())
-        // }else {
-        //   dateRange = this.dateRange
-        // }
-
-        listCashierOrder(this.addDateRange(this.queryParams, dateRange)).then( response => {
-          this.orderList = response.data.records;
-          this.total = response.data.total;
-          this.isSysDate = false
-        })
-        this.getSeekZero(val)
-        this.getOrderStatistics()
-      },
-      getSeekZero(val){
-        if (val!=undefined){
-          this.queryParams.page = val
-        }
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        cashierOrderSeekZeroAmount(this.addDateRange(this.queryParams, dateRange)).then( response => {
-          if (response.data) {
-            this.seekZeroAmount = response.data
+    },
+    // 获取油枪信息
+    getOilGunList() {
+      getOilNumberGun().then(res => {
+        res.data.forEach(item => {
+          if (item.oilGunList.length > 0) {
+            item.oilGunList.forEach(i => {
+              i.oilName = item.oilName
+              this.oilGunList.push(i)
+            })
           }
         })
-      },
-      // 获取员工列表信息
-      getStaffList(){
-        queryStaffs().then( response => {
-          this.staffList = response.data;
+      })
+    },
+    // 获取油枪名称
+    getName1(oilNameList, id) {
+      let name = ""
+      let _this = this;
+      if (oilNameList != null && oilNameList != "") {
+        oilNameList.forEach(item => {
+          if (item.id == id) {
+            name = item.gunName;
+          }
         })
-        getOilNameList().then( response => {
-          this.oilNameList = response.data;
+      }
+      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;
+          }
         })
-      },
-      // 搜索按钮操作
-      handleQuery() {
-        this.queryParams.page = 1;
-        this.getList();
-      },
-      // 重置按钮操作
-      resetQuery() {
-        this.dateRange = [];
-        this.queryParams = {
-          page: 1,
-          pageSize: 10,
+      }
+      return name;
+    },
+    // 获取订单详情
+    getOrdersInfo(id) {
+      cashierOrder(id).then(response => {
+        this.cashierOrder = response.data
+        this.getOilList(this.cashierOrder.orderNo)
+        this.getGoodsLists(this.cashierOrder.goodsOrderId)
+        this.dialogVisible = true;
+      })
+    },
+    async getOilList(orderNo) {
+      await oilOrderList({orderNo: orderNo}).then(response => {
+        this.oilInfo = response.data
+      })
+    },
+    async getGoodsLists(id) {
+      await getOrderGoods({orderId: id}).then(response => {
+        this.goodsInfo = response.data;
+      })
+    },
+    parseTime1(dateTime) {
+      let date = new Date(dateTime);
+      let y = date.getFullYear() + "-";
+      let mon = ((date.getMonth() + 1 < 10) ? ('0' + date.getMonth()) : date.getMonth()) + "-";
+      let d = ((date.getDate() < 10) ? ('0' + date.getDate()) : date.getDate()) + " ";
+      let h = ((date.getHours() < 10) ? ('0' + date.getHours()) : date.getHours()) + ":";
+      let m = ((date.getMinutes() < 10) ? ('0' + date.getMinutes()) : date.getMinutes()) + ":";
+      let s = ((date.getSeconds() < 10) ? ('0' + date.getSeconds()) : date.getSeconds());
+      // return new Date(y , mon , d , h , m , s);
+      return y + mon + d + h + m + s;
+    },
+    // 获取列表信息
+    getList(val) {
+      if (val != undefined) {
+        this.queryParams.page = val
+      }
+
+      let dateRange1 = this.dateRange
+      let dateRange = []
+      if (this.beginTime && this.endTime) {
+        dateRange.push(this.beginTime.toLocaleDateString())
+        dateRange.push(this.endTime.toLocaleDateString())
+      }
+      // if (this.isSysDate){
+      //   dateRange.push(dateRange1[0].toLocaleDateString())
+      //   dateRange.push(dateRange1[1].toLocaleDateString())
+      // }else {
+      //   dateRange = this.dateRange
+      // }
+
+      listCashierOrder(this.addDateRange(this.queryParams, dateRange)).then(response => {
+        this.orderList = response.data.records;
+        this.total = response.data.total;
+        this.isSysDate = false
+      })
+      this.getSeekZero(val)
+      this.getOrderStatistics()
+    },
+    getSeekZero(val) {
+      if (val != undefined) {
+        this.queryParams.page = val
+      }
+      let dateRange = []
+      if (this.beginTime && this.endTime) {
+        dateRange.push(this.beginTime.toLocaleDateString())
+        dateRange.push(this.endTime.toLocaleDateString())
+      }
+      cashierOrderSeekZeroAmount(this.addDateRange(this.queryParams, dateRange)).then(response => {
+        if (response.data) {
+          this.seekZeroAmount = response.data
         }
-        this.beginTime = ""
-        this.endTime = ""
-        // this.resetForm("queryForm");
-        this.handleQuery();
-      },
-    }
+      })
+    },
+    // 获取员工列表信息
+    getStaffList() {
+      queryStaffs().then(response => {
+        this.staffList = response.data;
+      })
+      getOilNameList().then(response => {
+        this.oilNameList = response.data;
+      })
+      getDicts("payment_type").then( response => {
+        this.payList = response.data;
+      })
+    },
+    // 搜索按钮操作
+    handleQuery() {
+      this.queryParams.page = 1;
+      this.getList();
+    },
+    // 重置按钮操作
+    resetQuery() {
+      this.dateRange = [];
+      this.queryParams = {
+        page: 1,
+        pageSize: 10,
+      }
+      this.beginTime = ""
+      this.endTime = ""
+      // this.resetForm("queryForm");
+      this.handleQuery();
+    },
   }
+}
 </script>
 
 <style scoped>
-  .app-top{
-    width: 100%;
+.app-top {
+  width: 100%;
 
-    height: 60px;
-    box-sizing: border-box;
-    padding: 10px;
-  }
-  .clearfix{
-    width: 100%;
+  height: 60px;
+  box-sizing: border-box;
+  padding: 10px;
+}
 
-  }
-  .box-card{
-    width: 100%;
-    margin-bottom: 15px;
-  }
-  .box-gang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap; /* 允许内容换行 */
+.clearfix {
+  width: 100%;
 
-  }
-  .box{
-    padding: 5px;
-    margin-right: 20px;
-    margin-bottom: 20px;
-    padding-left: 20px;
+}
 
-    width: 211px;
-    height: 60px;
-    background: rgba(64,158,255,0.05);
-    border-radius: 6px 6px 6px 6px;
-    border: 1px solid #409EFF;
+.box-card {
+  width: 100%;
+  margin-bottom: 15px;
+}
+
+.box-gang {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap; /* 允许内容换行 */
+
+}
+
+.box {
+  padding: 5px;
+  margin-right: 20px;
+  margin-bottom: 20px;
+  padding-left: 20px;
+
+  width: 211px;
+  height: 60px;
+  background: rgba(64, 158, 255, 0.05);
+  border-radius: 6px 6px 6px 6px;
+  border: 1px solid #409EFF;
+}
+
+.box1 {
+  padding: 5px;
+  margin-right: 20px;
+  margin-bottom: 20px;
+  padding-left: 20px;
+  width: 211px;
+  height: 60px;
+  background: rgba(255, 150, 85, 0.05);
+  border-radius: 6px 6px 6px 6px;
+  border: 1px solid #FF9655;
+}
+
+.el-form--inline .el-form-item {
+  margin-right: 44px;
+}
+
+.size-hui {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-weight: 400;
+  font-size: 13px;
+  color: #888888;
+  text-align: left;
+  font-style: normal;
+  text-transform: none;
+
+  .nei {
+    width: 150px;
   }
-  .box1{
-    padding: 5px;
-    margin-right: 20px;
-    margin-bottom: 20px;
-    padding-left: 20px;
-    width: 211px;
-    height: 60px;
-    background: rgba(255,150,85,0.05);
-    border-radius: 6px 6px 6px 6px;
-    border: 1px solid #FF9655;
-  }
-  .el-form--inline .el-form-item {
-    margin-right: 44px;
-  }
-  .size-hui{
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-weight: 400;
-    font-size: 13px;
-    color: #888888;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-    .nei {
-      width: 150px;
-    }
-  }
-  .size-bole{
-    height: 31px;
-    font-family: YouSheBiaoTiHei;
-    font-weight: 400;
-    font-size: 24px;
-    color: #555555;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-  }
-  .icon-img{
+}
+
+.size-bole {
+  height: 31px;
+  font-family: YouSheBiaoTiHei;
+  font-weight: 400;
+  font-size: 24px;
+  color: #555555;
+  text-align: left;
+  font-style: normal;
+  text-transform: none;
+}
+
+.icon-img {
+  width: 20px;
+  height: 20px;
+  margin-right: 5px;
+
+  img {
+
     width: 20px;
     height: 20px;
-    margin-right: 5px;
-    img{
+  }
+}
 
-      width: 20px;
-      height: 20px;
-    }
-  }
-  .wgang{
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 20px;
+.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;
-  }
+}
 
+.table-box {
+  width: 100%;
+  height: 50vh;
+  overflow: auto;
+}
+
+.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;
+}
+.cot-box {
+  width: 98%;
+  border-radius: 8px;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 20px;
+  margin: 0 auto;
+}
 </style>
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
index 42fe3c5c3..4f60bd029 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
@@ -374,7 +374,7 @@
   import {printOilOrderReport} from "@/api/print";
 
   export default {
-    name: "order_Cashier",
+    name: "order_Oil",
     data(){
       return{
         // 会员信息