From 033a66f12da36b9a0eb4662b4f976f88b32e7fc9 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Sun, 4 Feb 2024 13:37:04 +0800
Subject: [PATCH] bug

---
 fuintAdmin/src/api/staff/user/creditunit.js   |  27 +
 fuintAdmin/src/views/member/creditIndex.vue   | 147 ++-
 fuintAdmin/src/views/order/order_Cashier.vue  |  60 +-
 .../fuyou/service/impl/FyPayServiceImpl.java  |   8 -
 .../controller/CreditUnitController.java      |  30 +
 .../business/order/entity/CreditUnit.java     |   6 +-
 .../order/service/CreditUnitService.java      |  12 +
 .../service/impl/CreditUnitServiceImpl.java   |  21 +-
 fuintCashierWeb/src/api/cashier/creditunit.js |  28 +
 .../views/cashier/NewComponents/homeindex.vue | 985 +++++++++++++++++-
 fuintCashierWeb/src/views/cashier/index.vue   |   4 +-
 .../cashier/orderComponents/order_Cashier.vue |  33 +-
 12 files changed, 1286 insertions(+), 75 deletions(-)

diff --git a/fuintAdmin/src/api/staff/user/creditunit.js b/fuintAdmin/src/api/staff/user/creditunit.js
index 1bd48a133..cbe8a1d5e 100644
--- a/fuintAdmin/src/api/staff/user/creditunit.js
+++ b/fuintAdmin/src/api/staff/user/creditunit.js
@@ -26,3 +26,30 @@ export function addCreditUnit(data) {
     data: data
   })
 }
+
+// 修改挂账记录
+export function editCreditUnit(data) {
+  return request({
+    url: '/business/creditUnit',
+    method: 'put',
+    data: data
+  })
+}
+
+
+// 根据id查询挂账记录
+export function creditUnitInfo(id) {
+  return request({
+    url: '/business/creditUnit/' + id,
+    method: 'get',
+  })
+}
+
+
+// 根据id删除挂账记录
+export function deleteCreditUnit(id) {
+  return request({
+    url: '/business/creditUnit/' + id,
+    method: 'delete',
+  })
+}
diff --git a/fuintAdmin/src/views/member/creditIndex.vue b/fuintAdmin/src/views/member/creditIndex.vue
index 393f04623..ef39e737a 100644
--- a/fuintAdmin/src/views/member/creditIndex.vue
+++ b/fuintAdmin/src/views/member/creditIndex.vue
@@ -2,24 +2,48 @@
   <div>
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-        <el-form-item label="会员号" prop="userNo">
+        <el-form-item label="单位名称" prop="unitName">
           <el-input
-            v-model="queryParams.userNo"
-            placeholder="请输入会员号"
+            v-model="queryParams.unitName"
+            placeholder="请输入单位名称"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="手机号" prop="mobile">
+        <el-form-item label="挂账人" prop="personCredit">
           <el-input
-            v-model="queryParams.mobile"
-            placeholder="请输入会员手机号"
+            v-model="queryParams.personCredit"
+            placeholder="请输入挂账人名称"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
+        <el-form-item label="联系电话" prop="contactMobile">
+          <el-input
+            v-model="queryParams.contactMobile"
+            placeholder="请输入挂账人联系电话"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select
+            v-model="queryParams.status"
+            placeholder="全部"
+            clearable
+            style="width: 240px"
+          >
+            <el-option
+              v-for="dict in dict.type.zhzt"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
 
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -69,7 +93,7 @@
               size="mini"
               type="text"
               icon="el-icon-delete"
-              @click="handleDelete(scope.row,1)"
+              @click="handleDelete(scope.row)"
             >删除</el-button>
           </template>
         </el-table-column>
@@ -85,7 +109,7 @@
     </el-card>
 
     <!--      新增挂账单位信息-->
-    <el-dialog title="新增挂账单位" :visible.sync="open1" width="700px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open1" width="700px" append-to-body>
       <el-form ref="formName" :model="form1" :rules="rules1" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -110,12 +134,36 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="挂账额度" prop="creditLimit">
-              <el-input v-model="form1.creditLimit" placeholder="请输入挂账额度，为0则不限额" maxlength="30">
+            <el-form-item label="预设挂账额度" prop="creditLimit">
+              <el-input v-model="form1.creditLimit" @input="changeCreditAmount" placeholder="请输入挂账额度，为0则不限额" maxlength="30">
                 <template slot="append">元</template>
               </el-input>
               <span style="font-size: 12px;color: grey">
-                0为不限额,额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还
+                额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还
+              </span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="已使用挂账额度" prop="creditLimit">
+              <el-input v-model="form1.usedCreditLimit" disabled placeholder="0" maxlength="30">
+                <template slot="append">元</template>
+              </el-input>
+              <span style="font-size: 12px;color: grey">
+                额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还
+              </span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="剩余挂账额度" prop="creditLimit">
+              <el-input v-model="form1.residueCreditLimit" disabled placeholder="0" maxlength="30">
+                <template slot="append">元</template>
+              </el-input>
+              <span style="font-size: 12px;color: grey">
+                额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还
               </span>
             </el-form-item>
           </el-col>
@@ -144,9 +192,16 @@
 </template>
 
 <script>
-import {addCreditUnit, listsCreditUnit} from "@/api/staff/user/creditunit";
+import {
+  addCreditUnit,
+  creditUnitInfo,
+  deleteCreditUnit,
+  editCreditUnit,
+  listsCreditUnit
+} from "@/api/staff/user/creditunit";
 
 export default {
+  dicts: ['zhzt'],
   data(){
     return {
       list:[],
@@ -154,9 +209,14 @@ export default {
       total:0,
       form1:{},
       open1:false,
+      title:"",
       queryParams:{
         page:1,
         pageSize: 10,
+        unitName:"",
+        personCredit:"",
+        contactMobile:"",
+        status:"",
       },
       rules1: {
         unitName: [ { required: true, message: "请填写挂账单位名称", trigger: "blur" }, ],
@@ -171,6 +231,15 @@ export default {
     this.getList()
   },
   methods: {
+    changeCreditAmount(){
+      if (this.title = "新增挂账单位") {
+        this.form1.usedCreditLimit = this.form1.creditLimit
+        this.form1.residueCreditLimit = 0
+      }
+      if (this.title = "修改挂账单位") {
+        this.form1.usedCreditLimit = this.form1.creditLimit - this.form1.residueCreditLimit
+      }
+    },
     getList(){
       this.loading = true;
       listsCreditUnit(this.queryParams).then(res => {
@@ -180,23 +249,57 @@ export default {
       })
     },
     handleAdd(){
-
+      this.title = "新增挂账单位"
+      this.open1 = true
     },
-    handleUpdate(){
-
+    handleUpdate(data){
+      creditUnitInfo(data.id).then(res => {
+        this.form1 = res.data
+        this.title = "修改挂账单位"
+        this.open1 = true
+      })
     },
-    handleDelete(){
-
+    handleDelete(row){
+      const name = row.unitName
+      this.$modal.confirm('确定删除"' + name + '"的挂账单位信息？').then(function() {
+        // return deleteMember(row.id);
+        return deleteCreditUnit(row.id);
+      }).then(() => {
+        this.queryParams.page = 1
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
     },
     // 添加挂账单位信息
     addCredit(){
       this.$refs["formName"].validate((valid) => {
         if (valid) {
-          addCreditUnit(this.form1).then( response => {
-            this.$modal.msgSuccess("挂账单位信息创建成功");
-            this.open1 = false;
-            this.getList();
-          })
+          if (this.form1.id){
+            if (this.form1.creditLimit < this.form1.residueCreditLimit){
+              this.$modal.msgError("请确保预设挂账额度大于剩余挂账额度");
+              return ;
+            }
+            editCreditUnit(this.form1).then(res => {
+              if (res.data==1) {
+                this.$modal.msgSuccess("挂账单位信息修改成功");
+                this.open1 = false;
+                this.getList();
+              }else {
+                this.$modal.msgError("挂账单位信息修改失败");
+              }
+            })
+          }else {
+            addCreditUnit(this.form1).then( response => {
+              if (response.data==1) {
+                this.$modal.msgSuccess("挂账单位信息创建成功");
+                this.open1 = false;
+                this.getList();
+              }else {
+                this.$modal.msgError("挂账单位信息创建失败，挂站单位名称不可重复");
+              }
+            })
+          }
+
         }else {
           return false;
         }
diff --git a/fuintAdmin/src/views/order/order_Cashier.vue b/fuintAdmin/src/views/order/order_Cashier.vue
index 8e954ecd2..0d131b3d8 100644
--- a/fuintAdmin/src/views/order/order_Cashier.vue
+++ b/fuintAdmin/src/views/order/order_Cashier.vue
@@ -83,37 +83,50 @@
         <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="220"> </el-table-column>
-          <el-table-column prop="amount" label="订单金额"> </el-table-column>
-          <el-table-column prop="payAmount" label="实付金额"> </el-table-column>
-          <el-table-column prop="seekZero" label="找零金额"> </el-table-column>
-          <el-table-column label="订单金额组成">
-            <el-table-column prop="oilOrderAmount" label="油品金额">
+<!--          <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="80" 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="payAmount" align="center" label="实付金额"> </el-table-column>
+          <el-table-column prop="seekZero" align="center" label="找零金额"> </el-table-column>
+          <el-table-column label="订单金额组成" align="center">
+            <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" label="商品金额">
+            <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.oilOrderAmount ? scope.row.oilOrderAmount : '0'}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="goodsOrderAmount" align="center" label="商品实付金额" width="110">
               <template slot-scope="scope">
                 <span>{{scope.row.goodsOrderAmount ? scope.row.goodsOrderAmount : '0'}}</span>
               </template>
             </el-table-column>
           </el-table-column>
 
-          <el-table-column prop="payUser" label="付款用户"> </el-table-column>
-          <el-table-column prop="status" label="状态">
+          <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>
@@ -126,6 +139,11 @@
               <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="200" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button style="width: 60px" size="mini"
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
index ed90ecf64..96ffdcdac 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
@@ -262,14 +262,6 @@ public class FyPayServiceImpl implements FyPayService {
                                 for (JSONObject jsonObject : jsonObjects) {
                                     oilOrderService.addOilTrack(jsonObject,oilOrder.getStoreId());
                                 }
-//                              修改优惠券使用状态
-                                if (oilOrder.getCouponId()!=null) {
-                                    CardFavorableRecord byId = cardFavorableRecordService.getById(oilOrder.getCouponId());
-                                    if (!ObjectUtil.isEmpty(byId)) {
-                                        byId.setStatus("1");
-                                        cardFavorableRecordService.updateById(byId);
-                                    }
-                                }
                             }
                         }
                     }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CreditUnitController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CreditUnitController.java
index c9c39f93c..4b5ffa56c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CreditUnitController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CreditUnitController.java
@@ -45,4 +45,34 @@ public class CreditUnitController extends BaseController {
     private ResponseObject add(@Validated @RequestBody CreditUnit creditUnit){
         return getSuccessResult(creditUnitService.insertCreditUnit(creditUnit));
     }
+
+    /**
+     * 修改挂账单位信息
+     * @param creditUnit
+     * @return
+     */
+    @PutMapping
+    private ResponseObject edit(@Validated @RequestBody CreditUnit creditUnit){
+        return getSuccessResult(creditUnitService.updateCreditUnit(creditUnit));
+    }
+
+    /**
+     * 修改挂账单位信息
+     * @param id
+     * @return
+     */
+    @GetMapping("{id}")
+    private ResponseObject creditUnitInfo(@PathVariable Integer id){
+        return getSuccessResult(creditUnitService.selectCreditUnitById(id));
+    }
+
+    /**
+     * 修改挂账单位信息
+     * @param id
+     * @return
+     */
+    @DeleteMapping("{id}")
+    private ResponseObject delete(@PathVariable Integer id){
+        return getSuccessResult(creditUnitService.deleteCreditUnitById(id));
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java
index fc85668df..b610b2ef9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java
@@ -50,15 +50,15 @@ public class CreditUnit extends BaseEntity implements Serializable {
      */
     private String contactMobile;
     /**
-     * 挂账额度
+     * 预设挂账额度
      */
     private Double creditLimit;
     /**
-     * 挂账额度
+     * 可使用挂账额度
      */
     private Double usedCreditLimit;
     /**
-     * 挂账额度
+     * 剩余挂账额度
      */
     private Double residueCreditLimit;
     /**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CreditUnitService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CreditUnitService.java
index 49df45d53..c62ec14c6 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CreditUnitService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CreditUnitService.java
@@ -27,6 +27,18 @@ public interface CreditUnitService extends IService<CreditUnit> {
      */
     public List<CreditUnit> selectCreditUnitList();
 
+    /**
+     * 根据id查询挂账单位信息
+     * @return
+     */
+    public CreditUnit selectCreditUnitById(Integer id);
+
+    /**
+     * 根据id删除挂账单位信息
+     * @return
+     */
+    public int deleteCreditUnitById(Integer id);
+
     /**
      * 根据id查询挂账单位信息
      * @return
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java
index 421d75243..d9296a439 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java
@@ -1,5 +1,6 @@
 package com.fuint.business.order.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -38,6 +39,16 @@ public class CreditUnitServiceImpl extends ServiceImpl<CreditUnitMapper, CreditU
         return list;
     }
 
+    @Override
+    public CreditUnit selectCreditUnitById(Integer id) {
+        return baseMapper.selectById(id);
+    }
+
+    @Override
+    public int deleteCreditUnitById(Integer id) {
+        return baseMapper.deleteById(id);
+    }
+
     @Override
     public CreditUnit selectCreditUnitListById(int id) {
         CreditUnit creditUnit = baseMapper.selectById(id);
@@ -50,7 +61,15 @@ public class CreditUnitServiceImpl extends ServiceImpl<CreditUnitMapper, CreditU
         LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId());
         creditUnit.setStoreId(store.getId());
         creditUnit.setChainStoreId(store.getChainStoreId());
-        int row = baseMapper.insert(creditUnit);
+//        查询挂账单位是否存在
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("unit_name",creditUnit.getUnitName());
+        queryWrapper.eq("store_id",store.getId());
+        CreditUnit creditUnit1 = baseMapper.selectOne(queryWrapper);
+        int row = 0;
+        if (ObjectUtil.isEmpty(creditUnit1)){
+            row = baseMapper.insert(creditUnit);
+        }
         return row;
     }
 
diff --git a/fuintCashierWeb/src/api/cashier/creditunit.js b/fuintCashierWeb/src/api/cashier/creditunit.js
index f4c8a1dd7..a48f79a3a 100644
--- a/fuintCashierWeb/src/api/cashier/creditunit.js
+++ b/fuintCashierWeb/src/api/cashier/creditunit.js
@@ -17,3 +17,31 @@ export function addCreditUnit(data) {
     data: data
   })
 }
+
+// 修改挂账记录
+export function editCreditUnit(data) {
+  return request({
+    url: '/business/creditUnit',
+    method: 'put',
+    data: data
+  })
+}
+
+
+// 根据id查询挂账记录
+export function creditUnitInfo(id) {
+  return request({
+    url: '/business/creditUnit/' + id,
+    method: 'get',
+  })
+}
+
+
+// 根据id删除挂账记录
+export function deleteCreditUnit(id) {
+  return request({
+    url: '/business/creditUnit/' + id,
+    method: 'delete',
+  })
+}
+
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index bc17ee3b1..bcf3d91cb 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -555,8 +555,8 @@
         </el-descriptions>
         <el-descriptions title="储值余额">
           <template slot="extra">
-<!--            <span style="color: red;margin-right: 20px">余额充值</span>-->
-            <span style="font-weight: bold">￥{{member.cardBalance ? member.cardBalance : "--"}}</span>
+            <span style="color: red;margin-right: 20px" @click="userRecharge">余额充值</span>
+            <span style="font-weight: bold">￥{{member.cardBalance ? member.cardBalance : "0"}}</span>
           </template>
           <el-descriptions-item v-if="member.cardBalance!=0" label="账户余额">{{member.cardBalance ? member.cardBalance : "--"}}元</el-descriptions-item>
         </el-descriptions>
@@ -567,6 +567,344 @@
       </span>
     </el-dialog>
 
+
+    <!--    会员充值-->
+    <el-dialog :close-on-click-modal="false" width="60%" title="会员充值" :visible.sync="openRecharge" append-to-body>
+      <template>
+        <el-tabs v-model="activeRecharge" type="card" @tab-click="handleClick">
+          <el-tab-pane label="储值卡" name="balance">
+            <div style="font-size: 14px">
+              <el-row>
+                <el-col :span="1.5">
+                  <div style="font-size: 14px;height: 50px;line-height: 50px">充值金额</div>
+                </el-col>
+                <el-col :span="22">
+                  <div v-if="cardValueList.length>0"
+                       style="display: flex;margin: 13px 5px;box-sizing: border-box;flex-wrap: wrap; ">
+                    <div class="mon"
+                         v-for="(item,index) in cardValueList" :key="index"
+                         :class="activeKey === index ? 'select' : ''"
+                         @click="rechargeCard(index)">
+                      <div class="top1"><span class="amount1">{{ item.rechargeBalance }}</span>元</div>
+                      <div>赠送<span class="amount">{{ item.giftBalance }}</span>元</div>
+                    </div>
+                  </div>
+
+                  <div style="font-size: 16px;width: 30%;margin-left: 13px;margin-top: 8px;"
+                       :class="activeKey === cardValueList.length ? 'select' : ''"
+                       @click="rechargeCard(cardValueList.length,-1)">
+                    <el-input placeholder="请输入充值金额"
+                              size="medium"
+                              v-model="cardValueForm.amount"
+                              @input="valueAmoutChange(cardValueForm.amount)"
+                              oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                    >
+                      <template slot="prepend">自定义</template>
+                      <template slot="append">元</template>
+                    </el-input>
+                  </div>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="24">
+                  <div style="display: flex;justify-content: space-between;margin: 20px 0;height: 200px">
+                    <div class="jine">
+                      <div class="zeng">赠送金额</div>
+                      <div>
+                        <el-input placeholder="0.00"
+                                  v-model="cardValueForm.giftBalance"
+                                  disabled>
+                          <template slot="append">元</template>
+                        </el-input>
+                        <span class="bom">赠送金额 仅自定义金额模式下可手动输入赠送、活动充值赠送金额不可手动更改</span>
+                      </div>
+                    </div>
+
+                    <div class="jine">
+                      <div class="zeng">赠送积分</div>
+                      <div>
+                        <el-input placeholder="0"
+                                  v-model="cardValueForm.points"
+                                  disabled>
+                          <template slot="append">积分</template>
+                        </el-input>
+                        <span
+                          class="bom">赠送积分 仅自定义金额模式下可手动输入,活动充值赠送积分不可手动更改[需开启积分活动有效]</span>
+                      </div>
+                    </div>
+
+                    <div class="jine">
+                      <div class="zeng" style="width: 100px;">赠成长值</div>
+                      <div>
+                        <el-input placeholder="0"
+                                  v-model="cardValueForm.growthValue"
+                                  disabled>
+                          <template slot="append">成长值</template>
+                        </el-input>
+                        <!-- <span class="bom">赠送加油金金额 仅自定义金额模式下可手动输入赠送、活动充值赠送金额不可手动更改</span> -->
+                      </div>
+                    </div>
+
+                    <div class="jine">
+                      <div class="zeng">提成员工</div>
+                      <div>
+                        <el-input :readonly="true" placeholder="请选择提成员工" v-model="cardValueForm.realName">
+                          <el-button slot="append" @click="openStaff = true">选择员工</el-button>
+                        </el-input>
+                        <span class="bom">仅系统储值档次支持提成员工选择、自定义充值金额匹配低一档次</span>
+                      </div>
+                    </div>
+                  </div>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="24">
+                  <div style="display: flex;margin-top: 20px">
+                    <div style="font-size: 14px;width: 7%">充值备注</div>
+                    <el-input
+                      type="textarea"
+                      placeholder=""
+                      v-model="cardValueForm.remark"
+                      maxlength="255"
+                      show-word-limit
+                    >
+                    </el-input>
+                  </div>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="24">
+                  <div style="display: flex;margin: 20px 0">
+                    <div style="font-size: 14px;width: 7%">支付方式</div>
+                    <div>
+                      <el-radio v-for="dict in payList" v-model="cardValueForm.paymentType"
+                                v-if="dict.dictValue!='APPLET_CODE'"
+                                :key="dict.dictValue" :label="dict.dictValue" :value="dict.dictValue" border>
+                        {{ dict.dictLabel }}
+                      </el-radio>
+                    </div>
+                  </div>
+                </el-col>
+              </el-row>
+              <div style="margin: 20px 0;text-align: center">
+                <el-button type="primary" @click="confirm(1)">确认充值</el-button>
+                <el-button @click="cancel1">取 消</el-button>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="存油卡" name="literCard">
+            <el-row>
+              <el-col :span="24">
+                <div style="display: flex">
+                  <div style="font-size: 14px;width: 7%;line-height: 40px">油品类型</div>
+                  <el-radio-group v-model="tabOilType" style="margin-bottom: 30px;">
+                    <el-radio-button v-for="(item,index) in oilTypeList" :label="item.oilType"
+                                     @click.native="tabOilTypeClick(item.oilType)">
+                      {{ item.type }}
+                    </el-radio-button>
+                  </el-radio-group>
+                </div>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="1.5">
+                <div style="font-size: 14px;height: 50px;line-height: 50px;">充值金额</div>
+              </el-col>
+              <el-col :span="22">
+                <div style="display: flex;margin: 20px 5px;box-sizing: border-box;flex-wrap: wrap;">
+                  <div class="mon2"
+                       v-for="(item,index) in cardFuelDieselList" :key="index"
+                       :class="activeKey === index ? 'select' : ''"
+                       @click="recharge(index)">
+                    <div class="top1"><span class="amount1">{{ item.incomeLitres }}</span>L</div>
+                    <div>售价<span class="amount">{{ item.rechargeBalance }}</span>元</div>
+                    <div>锁价<span class="amount">{{ item.lockupPrice }}</span>/升</div>
+                  </div>
+                </div>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div style="display: flex;margin: 20px 0">
+                  <div class="jine">
+                    <div class="zeng">赠送积分</div>
+                    <div>
+                      <el-input placeholder="0" disabled v-model="cardFuelDieselForm.points">
+                        <template slot="append">积分</template>
+                      </el-input>
+                      <span
+                        class="bom">升数卡充值不支持自定义积分,选择对应充值活动获得对应积分[需开启积分活动有效]</span>
+                    </div>
+                  </div>
+                  <div style="display:flex;margin-left: 20px">
+                    <div style="font-size: 14px;line-height: 40px;width: 20%">提成员工</div>
+                    <div>
+                      <el-input :readonly="true" placeholder="请选择提成员工" v-model="cardFuelDieselForm.realName">
+                        <el-button slot="append" @click="openStaff = true">选择员工</el-button>
+                      </el-input>
+                    </div>
+                  </div>
+                </div>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div style="display: flex">
+                  <div style="font-size: 14px;width: 7%">充值备注</div>
+                  <el-input
+                    type="textarea"
+                    placeholder=""
+                    v-model="rechargeDesc"
+                    maxlength="255"
+                    show-word-limit
+                  >
+                  </el-input>
+                </div>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div style="display: flex;margin: 20px 0">
+                  <div style="font-size: 14px;width: 7%">支付方式</div>
+                  <div>
+                    <el-radio v-for="dict in payList" v-model="cardFuelDieselForm.paymentType"
+                              v-if="dict.dictValue!=='APPLET_CODE'"
+                              :key="dict.dictValue" :label="dict.dictValue" :value="dict.dictValue" border>{{ dict.dictLabel }}
+                    </el-radio>
+                  </div>
+                </div>
+              </el-col>
+            </el-row>
+            <div style="margin: 20px 0;text-align: center">
+              <el-button type="primary" @click="confirm(2)">确认充值</el-button>
+              <el-button @click="cancel1">取 消</el-button>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="礼品卡兑换电子储值卡余额" name="giftCard">
+            <el-form ref="form" :model="form3" :rules="rules2" label-width="120px">
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item label="卡号" prop="number" style="width: 500px">
+                    <el-input v-model="form3.number" placeholder="请输入卡号" maxlength="30" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item label="卡密" prop="cardPassword" style="width: 500px">
+                    <el-input v-model="form3.cardPassword" placeholder="请输入卡密" maxlength="30" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+            <div style="margin: 20px 0;text-align: center">
+              <el-button type="primary" @click="confirm1()">确认充值</el-button>
+              <el-button @click="cancel1">取 消</el-button>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </template>
+    </el-dialog>
+
+
+    <!--    确认充值-->
+    <el-dialog :close-on-click-modal="false" title="确认充值" :visible.sync="openConfirm" width="500px" append-to-body>
+      <div v-if="isPay"
+           v-loading="loading">
+
+        <div style="text-align: center;font-size: 15px;font-weight: bold">付款金额</div>
+        <div style="text-align: center;font-size: 30px;font-weight: bold;color: red;margin: 10px 0">
+          ￥{{ realyPayBills }}
+          <!-- <el-tag
+            effect="dark">
+            汽油
+          </el-tag> -->
+        </div>
+        <!-- <div style="text-align: center;margin-bottom: 10px">赠送金额</div> -->
+        <div v-if="(cardValueForm.paymentType !== 'CASH' && flag === 1) || (cardFuelDieselForm.paymentType !== 'CASH' && flag ===2)  ">
+          <div>
+            <el-input v-model="authCode"
+                      v-focus ref="getFocus"
+                      autofocus
+                      @keydown.enter.native="collection"
+                      placeholder="扫描或输入付款码、支持微信、支付宝、云闪付">
+              <i
+                slot="suffix">
+                <svg t="1697791915471" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                     xmlns="http://www.w3.org/2000/svg" p-id="1479" width="32" height="32">
+                  <path
+                    d="M149.333333 170.858667A21.546667 21.546667 0 0 1 170.858667 149.333333H384V106.666667H170.858667A64.213333 64.213333 0 0 0 106.666667 170.858667V384h42.666666V170.858667zM170.858667 874.666667A21.546667 21.546667 0 0 1 149.333333 853.141333V640H106.666667v213.141333A64.213333 64.213333 0 0 0 170.858667 917.333333H384v-42.666666H170.858667zM853.12 149.333333A21.546667 21.546667 0 0 1 874.666667 170.858667V384h42.666666V170.858667A64.213333 64.213333 0 0 0 853.141333 106.666667H640v42.666666h213.141333zM874.666667 853.141333A21.546667 21.546667 0 0 1 853.141333 874.666667H640v42.666666h213.141333A64.213333 64.213333 0 0 0 917.333333 853.141333V640h-42.666666v213.141333zM106.666667 490.666667h810.666666v42.666666H106.666667v-42.666666z"
+                    fill="#3D3D3D" p-id="1480"></path>
+                </svg>
+              </i>
+            </el-input>
+          </div>
+          <div class="demo-image">
+            <div class="block" style="text-align: center">
+              <el-image
+                style="width: 200px; height: 200px"
+                fit="cover"
+                src="https://oil.wudb.cn/static/img/scan-demo.fcb8b1ab.png"></el-image>
+            </div>
+          </div>
+        </div>
+        <div v-else>
+          <div>
+            <el-input v-model="authCode"
+                      v-focus ref="getFocus"
+                      autofocus
+                      @input="changeSeekZero"
+                      @keydown.enter.native="collection"
+                      placeholder="请输入收款金额">
+            </el-input>
+          </div>
+          <div style="text-align: right;margin: 10px 0">
+            <span>应找零</span>
+            <span style="color: red;font-size: 18px"> ￥{{ seekZero }}</span>
+          </div>
+        </div>
+        <el-divider></el-divider>
+        <div style="display: flex;justify-content: space-around">
+          <el-button @click="cancelCollection">取消收款</el-button>
+          <el-button type="primary" @click="collection1">确定收款</el-button>
+        </div>
+      </div>
+
+      <div v-else>
+        <div v-if="isPaySuccess">
+          <el-result icon="success" title="收款成功">
+            <template slot="extra">
+              <el-button type="primary" @click="handClose">关 闭</el-button>
+            </template>
+          </el-result>
+        </div>
+        <div v-else-if="isAwait">
+          <el-result icon="warning" title="支付等待超时，请前往订单列表查看是否支付成功！">
+            <template slot="extra">
+              <el-button type="primary" @click="handClose">关 闭</el-button>
+            </template>
+          </el-result>
+        </div>
+        <div v-else>
+          <el-result icon="error" title="支付失败，请重新支付">
+            <template slot="extra">
+              <el-button type="primary" @click="handClose">关 闭</el-button>
+            </template>
+          </el-result>
+        </div>
+      </div>
+
+    </el-dialog>
+
+
+    <!--    选择员工-->
+    <el-dialog :close-on-click-modal="false" width="50%" height="50%" title="选择员工" :visible.sync="openStaff"
+               append-to-body>
+      <select-staff @send-data="handleDataFromChild">
+
+      </select-staff>
+    </el-dialog>
+
 <!--    加油枪加油金额-->
     <el-dialog
       title="加油金额"
@@ -815,12 +1153,70 @@
   import {getSysConfig} from "@/api/staff/user/sysconfig";
   import {cashierOrderByOrderNo} from "@/api/cashier/cashierorder";
   import {getLodop} from "@/api/LodopFuncs";
+  import {giftCardExchange} from "@/api/cashier/giftCard/giftcard";
+  import BigNumber from "bignumber.js";
+  import {
+    getCardValueListApi,
+    getCheckTheStatusOfYourPaymentApi, getCheckTheStatusOfYourPaymentByFuelApi,
+    getCountOilTypeApi,
+    getList,
+    getPrepaidCardTopUpApi, getPrepaidFuelTopUpApi
+  } from "@/api/cashier/cardSet";
+  import SelectStaff from "@/components/local/selectStaff.vue";
 
   const cityOptions = ['上海', '北京'];
   export default {
     name: "homeindex",
+    components: {SelectStaff},
     data(){
       return{
+        openStaff:false,
+        cardFuelDieselForm: {
+          mtStaffId: '',
+          realName: '',
+          staffMobile: '',
+          points: '',
+          remark: '',
+          rechargeBalance: '', //实际支付
+          paymentType: 'WECHAT',
+          payType:'',
+          oilType: '',
+          type: '',
+          chainStorId: '',
+          incomeLitres: '',
+        },
+        cardValueForm: {
+          cardValueId: '', // 储值卡id
+          mtStaffId: '', //
+          realName: '',
+          staffMobile: '',
+          amount: '', // 自定义充值字段
+          bidBalance: '', // 储值卡面值
+          rechargeBalance: '', // 实际支付
+          giftBalance: '',// 赠送金额
+          points: '', //赠送积分
+          growthValue: '', // 赠送成长值
+          remark: '',
+          paymentType: 'WECHAT', // 支付方式
+          payType:'',
+          royaltyType: '',// 提成类型
+          percentageCommissions: null,
+          amountCommission: null,
+          rechargeType: '0'
+        },
+        realyPayBills: 0,
+        flag: null,
+        isAwait: false,
+        // 充值余额列表
+        cardValueList: [],
+        activeKey: 0,
+        tabOilType: '92',
+        oilTypeList: {},
+        // 充值备注
+        rechargeDesc: '',
+        // 存油卡列表
+        cardFuelDieselList: [],
+        activeRecharge: 'balance',
         gunIndex:[],
         inputKey:'111',
         autofocus:false,
@@ -879,6 +1275,8 @@
         seekZero:0,
         // 等待中
         loading:false,
+        openRecharge:false,
+        openConfirm:false,
         // 油号
         oilType:'',
         oilNameID:'',
@@ -945,6 +1343,7 @@
           remark:'',
           status:'qy',
         },
+        form3: {},
         oilNumGunList:[],
         authCode:'',
         // 油号列表
@@ -1109,6 +1508,11 @@
           creditLimit: [ { required: true, message: "请填写挂账额度", trigger: "blur" }, ],
           status: [ { required: true, message: "请选择挂账单位状态", trigger: "blur" }, ],
         },
+        // 表单校验
+        rules2: {
+          number: [{required: true, message: "请输入卡号", trigger: "blur"}],
+          cardPassword: [{required: true, message: "请输入卡密", trigger: "blur"}],
+        }
       }
     },
     created() {
@@ -1144,6 +1548,489 @@
       }
     },
     methods:{
+      handleDataFromChild(data) {
+        this.openStaff = false
+        // this.cardFuelDieselForm= {
+        //   mtStaffId: data.mtStaffId,
+        //   realName: data.realName,
+        //   staffMobile: data.staffMobile,
+        // },
+
+        // this.cardValueForm= {
+        //   mtStaffId: data.mtStaffId,
+        //   realName: data.realName,
+        //   staffMobile: data.staffMobile,
+        // },
+        // console.log('Received data in parent:', data);
+
+        this.cardFuelDieselForm.mtStaffId = data.mtStaffId
+        this.cardFuelDieselForm.realName = data.realName
+        this.cardFuelDieselForm.staffMobile = data.staffMobile
+        this.cardValueForm.mtStaffId = data.mtStaffId
+        this.cardValueForm.realName = data.realName
+        this.cardValueForm.staffMobile = data.staffMobile
+
+      },
+      // 存油卡查询
+      async getCardFuelDieselList() {
+        let quy = {
+          pageNo: 1,
+          pageSize: 10000,
+          activeStatus: 1,
+          status: 1,
+          activityProgress: 1
+        }
+        await getList(quy).then(res => {
+          this.sourceCardFuelDieselList = res.data.records
+        })
+      },
+      // 储值卡查询
+      async getCardValueList() {
+        let quy = {
+          pageNo: 1,
+          pageSize: 10000,
+          isonline: 0
+        }
+        await getCardValueListApi(quy).then(res => {
+          this.cardValueList = res.data.records;
+          this.cardValueList.sort((a, b) => a.rechargeBalance - b.rechargeBalance);
+          // console.log("this.grade.name",this.grade)
+        })
+        // console.log("this.cardValueList", this.grade)
+
+        if (this.cardValueList.length > 0) {
+          // 过滤
+          if (this.grade && this.grade.name) {
+            this.cardValueList = this.cardValueList.filter(item => {
+              return item.groupOriented === "1" || item.membershipLevel.includes(this.grade.id);
+            });
+            this.rechargeCard(0);
+          } else {
+            this.cardValueList = this.cardValueList.filter(item => {
+              return item.groupOriented === "1";
+            });
+            if (this.cardValueList.length > 0) {
+              this.rechargeCard(0);
+            }
+          }
+        }
+        this.$forceUpdate();
+      },
+      // 查询参加存油卡油品
+      getCountOilType() {
+        getCountOilTypeApi().then(res => {
+          this.oilTypeList = res.data
+          if (this.oilTypeList.length > 0) {
+            // 默认选中第一个
+            this.tabOilType = this.oilTypeList[0].oilType
+            this.selectOilType(this.oilTypeList[0].status, this.oilTypeList[0].oilType);
+          }
+        })
+      },
+      selectOilType(status, oilType) {
+        this.tabOilType = oilType;
+        // console.log("453",oilType)
+        this.tabOilTypeClick(oilType);
+      },
+      // 会员充值
+      async userRecharge() {
+        if (this.isSure){
+          this.$message.error("请先选择会员")
+          return;
+        }
+
+        await this.getCardFuelDieselList()
+        await this.getCardValueList()
+        await this.getCountOilType()
+
+        await this.getPayList();
+        this.openRecharge = true;
+
+        // 存油卡列表
+      },
+      valueAmoutChange(data) {
+        // this.cardValueForm.amount = null
+        this.$set(this.cardValueForm, 'amount', data);
+
+        // console.log("data17.16", this.cardValueForm.amount)
+        if (!data) {
+          this.cardValueForm.amount = ''
+
+        } else {
+          this.cardValueForm.amount = data
+        }
+
+
+        this.cardValueForm.points = ''
+        this.cardValueForm.bidBalance = ''
+        this.cardValueForm.giftBalance = ''
+        this.cardValueForm.growthValue = ''
+        this.cardValueForm.rechargeBalance = ''
+
+        this.cardValueForm.royaltyType = ''
+        this.cardValueForm.percentageCommissions = ''
+        this.cardValueForm.amountCommission = ''
+        this.cardValueForm.rechargeType = 1
+
+
+        this.cardValueForm.rechargeBalance = data
+
+        if (this.cardValueList.length > 0) {
+          // const changeList = this.cardValueList
+          this.cardValueList.forEach(change => {
+            if (data >= change.rechargeBalance) {
+              this.cardValueForm.points = change.points
+              this.cardValueForm.bidBalance = change.bidBalance
+              this.cardValueForm.giftBalance = change.giftBalance
+              this.cardValueForm.growthValue = change.growthValue
+              this.cardValueForm.rechargeBalance = change.rechargeBalance
+
+              this.cardValueForm.royaltyType = change.royaltyType
+              this.cardValueForm.percentageCommissions = change.percentageCommissions
+              this.cardValueForm.amountCommission = change.amountCommission
+              this.cardValueForm.cardValueId = change.id
+              // this.cardValueForm.rechargeBalance
+
+              // 计算员工提成金额
+              if (change.royaltyType === "3") {
+                // 当按比例提成时 计算对应的金额
+                const percentageCommissions = new BigNumber(change.percentageCommissions);
+                const totalAmount = new BigNumber(data);
+
+                const commissionAmount = totalAmount.multipliedBy(percentageCommissions).dividedBy(100).decimalPlaces(2);
+                this.cardValueForm.amountCommission = commissionAmount
+              }
+
+            }
+          })
+        }
+      },
+      async collection1() {
+        let actualPayment = 0
+        let makeChange = 0
+
+        let userForm = this.member
+
+        if (this.flag === 1) {
+          if (!this.authCode && this.cardValueForm.paymentType !== "CASH") {
+            this.$message.error('请先扫码');
+            return
+          }else {
+            if (this.authCode<this.cardValueForm.amount || this.seekZero<0){
+              this.$modal.msgError("请输入正确的金额");
+              return;
+            }
+            if (!this.authCode){
+              this.$modal.msgError("请输入正确的金额");
+              return;
+            }
+            actualPayment = this.authCode
+            makeChange = this.seekZero
+          }
+          // 会员id  会员名字会员手机号码
+          this.cardValueForm.mtUserId = userForm.id
+          this.cardValueForm.name = userForm.name
+          this.cardValueForm.mobile = userForm.mobile
+          // 支付码
+          this.cardValueForm.authCode = this.authCode
+          this.cardValueForm.realyPayBills = this.realyPayBills
+          this.cardValueForm.actualPayment = actualPayment
+          this.cardValueForm.makeChange = makeChange
+
+
+          let id;
+          await getPrepaidCardTopUpApi(this.cardValueForm).then(response => {
+            if (response.data != null) {
+              this.loading = true;
+              id = response.data.id
+            }
+          });
+          let this_ = this
+          //
+          let timer = setInterval(async () => {
+            await getCheckTheStatusOfYourPaymentApi(id).then(response => {
+              if (response.data != null) {
+                const payStatus = response.data.payStatus
+                if (payStatus === "unpaid") {
+                  this_.isQuery = true;
+                }else if (payStatus === "paid") {
+                  // 当支付成功时
+                  this_.isPaySuccess = true;
+                  this_.isQuery = false;
+                }else if (payStatus === "payFail") {
+                  this_.isPaySuccess = false;
+                  this_.isQuery = false;
+                }
+              }
+            })
+          }, 1000);
+
+          let timer2 = setInterval(function () {
+            if (!this_.isQuery || !this_.openConfirm) {
+              this_.loading = false;
+              this_.isPay = false;
+              clearInterval(timer);
+              clearTimeout(timer3);
+
+            }
+          }, 500)
+
+          var timer3 = setTimeout(function () {
+            clearInterval(timer2);
+            clearInterval(timer);
+            this_.loading = false;
+            this_.isPay = false;
+            this_.isPaySuccess = false;
+            this_.isAwait = true;
+            console.log("t3")
+          }, 15000)
+
+        } else if (this.flag === 2) {
+          if (!this.authCode && this.cardFuelDieselForm.paymentType !== "CASH") {
+            this.$message.error('请先扫码');
+            return
+          }else {
+            if (this.authCode<this.cardValueForm.amount || this.seekZero<0){
+              this.$modal.msgError("请输入正确的金额");
+              return;
+            }
+            if (!this.authCode){
+              this.$modal.msgError("请输入正确的金额");
+              return;
+            }
+            actualPayment = this.authCode
+            makeChange = this.seekZero
+          }
+          // console.log("cardFuelDieselForm",this.cardFuelDieselForm)
+          this.cardFuelDieselForm.mtUserId = userForm.id
+          this.cardFuelDieselForm.name = userForm.name
+          this.cardFuelDieselForm.mobile = userForm.mobile
+          this.cardFuelDieselForm.authCode = this.authCode
+          this.cardFuelDieselForm.actualPayment = actualPayment
+          this.cardFuelDieselForm.makeChange = makeChange
+
+          // console.log("this.cardFuelDieselForm",this.cardFuelDieselForm)
+
+
+          let id;
+          await getPrepaidFuelTopUpApi(this.cardFuelDieselForm).then(response => {
+            if (response.data != null) {
+              this.loading = true;
+              id = response.data.id
+            }
+          });
+
+
+          let timer = setInterval(async () => {
+            getCheckTheStatusOfYourPaymentByFuelApi(id).then(response => {
+              if (response.data != null) {
+                if (response.data.payStatus == "unpaid") {
+                  this_.isQuery = true;
+                }
+                if (response.data.payStatus == "paid") {
+                  this_.isPaySuccess = true;
+                  this_.isQuery = false;
+                }
+                if (response.data.payStatus == "payFail") {
+                  this_.isPaySuccess = false;
+                  this_.isQuery = false;
+                }
+              }
+            })
+          }, 500);
+
+          let timer2 = setInterval(function () {
+            if (this_.isQuery == false || !this_.openConfirm) {
+              this_.loading = false;
+              this_.isPay = false;
+              clearInterval(timer);
+              clearInterval(timer2);
+            }
+          }, 500)
+
+          setTimeout(function () {
+            clearInterval(timer2);
+            clearInterval(timer);
+            this_.loading = false;
+            this_.isPay = false;
+            this_.isPaySuccess = false;
+            this_.isAwait = true;
+
+          }, 15000)
+
+          let this_ = this
+        }
+        this.$forceUpdate();
+
+      },
+      cancelCollection() {
+        this.openConfirm = false;
+      },
+      // 选择余额充值金额
+      rechargeCard(index, item) {
+        // console.log("index", index)
+        // this.cardValueForm.amount = null,
+        this.cardValueForm.rechargeType = 0
+
+        this.activeKey = index;
+
+        if (item === -1) {
+          this.cardValueForm.points = 0
+          this.cardValueForm.giftBalance = 0
+          this.cardValueForm.growthValue = 0
+          this.cardValueForm.bidBalance = 0
+
+          // this.cardValueForm.bidBalance = 1
+          // this.cardValueForm.amount = 0
+
+        } else {
+          if (this.cardValueList <= 0) return
+          let file = {}
+          // 拿到金额
+          file = this.cardValueList[index]
+
+          this.realyPayBills = file.rechargeBalance
+          this.cardValueForm.rechargeBalance = file.rechargeBalance
+          this.cardValueForm.bidBalance = file.bidBalance
+          this.cardValueForm.points = file.points
+          this.cardValueForm.giftBalance = file.giftBalance
+          this.cardValueForm.growthValue = file.growthValue
+          this.cardValueForm.cardValueId = file.id
+          this.cardValueForm.amount = null
+
+          this.cardValueForm.royaltyType = file.royaltyType
+          this.cardValueForm.percentageCommissions = file.percentageCommissions
+          this.cardValueForm.amountCommission = file.amountCommission
+
+          // console.log("file.royaltyType ", file.royaltyType )
+
+          // 计算员工提成金额
+          if (file.royaltyType === "3") {
+
+            // 当按比例提成时 计算对应的金额
+            const percentageCommissions = new BigNumber(file.percentageCommissions);
+            const totalAmount = new BigNumber(file.rechargeBalance);
+
+            const commissionAmount = totalAmount.multipliedBy(percentageCommissions).dividedBy(100).decimalPlaces(2);
+            this.cardValueForm.amountCommission = commissionAmount
+          }
+        }
+      },
+      // 根据油品过滤查询存油卡
+      async tabOilTypeClick(data) {
+        // console.log("aaaaaaaaaaaaaa",data)
+        await this.getCardFuelDieselList()
+
+        this.cardFuelDieselList = this.sourceCardFuelDieselList.filter(item => {
+          return item.oilType === data;
+        });
+        if (this.cardFuelDieselList.length > 0) {
+          this.recharge(0)
+        }
+      },
+      confirm1(){
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            giftCardExchange(this.form2).then(res => {
+              if (res.data.id == '' || res.data.id == null) {
+                this.$message.error('兑换失败！');
+              } else {
+                this.$message.success('兑换成功！');
+                this.openRecharge = false
+                this.form2.number = ''
+                this.form2.cardPassword = ''
+              }
+            })
+          }
+        })
+      },
+      // 取消按钮
+      cancel1() {
+        this.openRecharge = false;
+
+        this.isPay = true;
+        this.openConfirm = false
+        this.openRecharge = false
+
+        this.isPaySuccess = false;
+        this.authCode = null
+        this.activeRecharge = 'balance'
+        this.cardValueForm = {}
+        this.cardFuelDieselForm = {}
+
+        this.iniz()
+      },
+      iniz() {
+        this.cardValueForm = {
+          cardValueId: '', // 储值卡id
+          mtStaffId: '', //
+          realName: '',
+          staffMobile: '',
+          amount: '', // 自定义充值字段
+          bidBalance: '', // 储值卡面值
+          rechargeBalance: '', // 实际支付
+          giftBalance: '',// 赠送金额
+          points: '', //赠送积分
+          growthValue: '', // 赠送成长值
+          remark: '',
+          paymentType: 'WECHAT', // 支付方式
+          royaltyType: '',// 提成类型
+          percentageCommissions: null,
+          amountCommission: null,
+          rechargeType: '0'
+        }
+      },
+      // 选择充值金额
+      recharge(index, item) {
+        this.activeKey = index;
+        let file = {}
+        // 拿到金额
+        file = this.cardFuelDieselList[index]
+        // console.log("file",file)
+        this.cardFuelDieselForm.points = file.points
+        this.cardFuelDieselForm.rechargeBalance = file.rechargeBalance
+        this.cardFuelDieselForm.oilType = file.oilType
+        this.cardFuelDieselForm.type = file.type
+        this.cardFuelDieselForm.chainStorId = file.chainStorId
+        this.cardFuelDieselForm.incomeLitres = file.incomeLitres
+        this.cardFuelDieselForm.lockupPrice = file.lockupPrice
+        this.cardFuelDieselForm.cardFuelId = file.id
+
+        // this.realyPayBills = file.rechargeBalance
+
+      },
+      // 确认充值
+      confirm(flag) {
+        this.flag = flag
+
+        if (flag === 1) {
+          if (this.cardValueForm.paymentType === '') {
+            this.$message.error('请选择支付方式');
+            return
+          }
+          if (this.cardValueForm.amount != null) {
+            this.cardValueForm.rechargeType = 1
+            if (!this.cardValueForm.amount || this.cardValueForm.amount < 0) {
+              this.$message.error('请选择输入自定义金额');
+              return
+            }
+            this.realyPayBills = this.cardValueForm.amount
+          } else {
+            this.cardValueForm.rechargeType = 0
+            this.realyPayBills = this.cardValueForm.rechargeBalance
+          }
+        } else if (flag === 2) {
+          if (this.cardFuelDieselForm.paymentType === '') {
+            this.$message.error('请选择支付方式');
+            return
+          }
+
+          this.realyPayBills = this.cardFuelDieselForm.rechargeBalance
+        }
+        this.openConfirm = true;
+        this.isPay = true
+
+      },
       async printLocally() {
         //初始化打印函数
         let LODOP = getLodop(); // 初始化打印
@@ -3157,6 +4044,9 @@
     background-color: white;
 
 
+  }
+  .top1 {
+    font-size: 16px;
   }
   .center-left-top{
     width: 100%;
@@ -3339,6 +4229,9 @@
     color: white;
     cursor: pointer;
   }
+  .amount {
+    color: #00afff;
+  }
   .el-row {
     margin-top: 20px;
     margin-bottom: 20px;
@@ -3382,4 +4275,92 @@
     color: grey;
     font-size: 12px;
   }
+  .mon {
+    width: 20%;
+    height: 50px;
+    border: 0.5px #dadfe6 solid;
+    line-height: 25px;
+    border-radius: 5px;
+    text-align: center;
+    margin: 0 10px;
+    margin-bottom: 10px;
+  }
+  .amount1 {
+    color: #00afff;
+    font-size: 20px;
+  }
+  .select {
+    position: relative;
+    background-color: #fff;
+    box-shadow: 0px 2px 7px 0px rgba(85, 110, 97, 0.35);
+    border-radius: 5px;
+    border: 1px solid #00aaff;
+  }
+
+  .select:before {
+    content: '';
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    border: 10px solid #00aaff;
+    border-top-color: transparent;
+    border-left-color: transparent;
+  }
+  .select:after {
+    content: '';
+    width: 4px;
+    height: 6px;
+    position: absolute;
+    right: 4px;
+    bottom: 3px;
+    border: 2px solid #fff;
+    border-top-color: transparent;
+    border-left-color: transparent;
+    transform: rotate(45deg);
+  }
+  .jine {
+    width: 24%;
+    display: flex;
+  }
+
+  .bom {
+    font-size: 12px;
+    color: grey;
+    height: 60px !important;
+    line-height: 12px !important;
+  }
+
+  .zeng {
+    width: 255px;
+    line-height: 40px;
+    font-size: 14px;
+  }
+  .mon2 {
+    width: 20%;
+    height: 75px;
+    border: 0.5px #dadfe6 solid;
+    line-height: 25px;
+    border-radius: 5px;
+    text-align: center;
+    margin: 0 10px;
+    margin-bottom: 20px;
+  }
+  .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;
+    color: grey;
+  }
+  .size-bole{
+    font-weight: 400;
+    font-size: 20px;
+  }
 </style>
diff --git a/fuintCashierWeb/src/views/cashier/index.vue b/fuintCashierWeb/src/views/cashier/index.vue
index da62b9949..33dc18236 100644
--- a/fuintCashierWeb/src/views/cashier/index.vue
+++ b/fuintCashierWeb/src/views/cashier/index.vue
@@ -263,11 +263,11 @@ export default {
       activeName: 'second',
       tabarr:[
         {name:'收银台',icon:'el-icon-s-platform',path:'/homeindex'},
-        {name:'充值',icon: 'el-icon-s-finance',path:'/Recharge'},
+        // {name:'充值',icon: 'el-icon-s-finance',path:'/Recharge'},
         {name:'订单',icon: 'el-icon-s-order',path:'/Order'},
         {name:'会员',icon: 'el-icon-s-custom',path:'/Vip'},
         {name:'核销',icon: 'el-icon-s-check',path:'/WriteOff'},
-        {name:'挂账',icon:'el-icon-s-claim',path:'/credit'},
+        {name:'挂账管理',icon:'el-icon-s-claim',path:'/credit'},
         {name:'积分',icon:'el-icon-s-data',path:'/Integral'},
         {name:'交班',icon: 'el-icon-s-flag',path:'/Handover'},
       ],
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
index 5630a3b3e..145108551 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
@@ -94,18 +94,19 @@
         <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="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="80" 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="payAmount" align="center" label="实付金额"> </el-table-column>
@@ -123,19 +124,19 @@
             </el-table-column>
           </el-table-column>
           <el-table-column align="center" label="实付订单金额组成">
-            <el-table-column prop="oilOrderAmount" align="center" label="油品实付金额">
+            <el-table-column prop="oilOrderAmount" align="center" label="油品实付金额" width="100">
               <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="商品实付金额">
+            <el-table-column prop="goodsOrderAmount" align="center" label="商品实付金额" width="110">
               <template slot-scope="scope">
                 <span>{{scope.row.goodsOrderAmount ? scope.row.goodsOrderAmount : '0'}}</span>
               </template>
             </el-table-column>
           </el-table-column>
 
-          <el-table-column prop="payUser" align="center" label="付款用户"> </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>
@@ -154,7 +155,7 @@
               <span>{{ getRealName(staffList,scope.row.staffId) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
+          <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)"