diff --git a/fuintAdmin/src/api/order/hangbill.js b/fuintAdmin/src/api/order/hangbill.js
new file mode 100644
index 000000000..de5533365
--- /dev/null
+++ b/fuintAdmin/src/api/order/hangbill.js
@@ -0,0 +1,98 @@
+import request from '@/utils/request'
+
+// 查询挂账信息列表
+export function listHangBill(query) {
+  return request({
+    url: '/business/hangBill/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询挂账信息列表
+export function hangBillInfo(id) {
+  return request({
+    url: '/business/hangBill/'+id,
+    method: 'get',
+  })
+}
+
+// 查询所有挂账信息列表
+export function hangBills() {
+  return request({
+    url: '/business/hangBill/hangBills',
+    method: 'get',
+  })
+}
+
+// 新增挂账记录
+export function addHangBill(data) {
+  return request({
+    url: '/business/hangBill',
+    method: 'post',
+    data: data
+  })
+}
+
+// 批量归还挂账信息
+export function batchHangBill(data) {
+  return request({
+    url: '/business/hangBill/batch',
+    method: 'post',
+    data: data
+  })
+}
+
+// 根据订单号查询挂账记录信息
+export function queryHangBill(data) {
+  return request({
+    url: '/business/hangBill/orderNo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改挂账记录及收款
+export function editHangBill(data) {
+  return request({
+    url: '/business/hangBill',
+    method: 'put',
+    data: data
+  })
+}
+
+// 当前店铺归还账单的数量
+export function hangBillReturnTotal(query) {
+  return request({
+    url: '/business/hangBill/returnTotal',
+    method: 'get',
+    params: query
+  })
+}
+
+// 当前店铺归还账单的数量
+export function hangBillAllAmount(query) {
+  return request({
+    url: '/business/hangBill/allAmount',
+    method: 'get',
+    params: query
+  })
+}
+
+// 当前店铺归还账单的数量
+export function hangBillAllReturnAmount(query) {
+  return request({
+    url: '/business/hangBill/allReturnAmount',
+    method: 'get',
+    params: query
+  })
+}
+
+// 当前店铺归还账单的数量
+export function hangBillAllNoReturnAmount(query) {
+  return request({
+    url: '/business/hangBill/allNoReturnAmount',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/fuintAdmin/src/api/order/returnrecord.js b/fuintAdmin/src/api/order/returnrecord.js
new file mode 100644
index 000000000..ab20be3ad
--- /dev/null
+++ b/fuintAdmin/src/api/order/returnrecord.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 根据挂账记录id查询归还记录信息
+export function listReturnRecord(query) {
+  return request({
+    url: '/business/returnRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据id查询挂账归还信息
+export function returnRecordInfo(id) {
+  return request({
+    url: '/business/returnRecord/' + id,
+    method: 'get',
+  })
+}
+
+// 根据订单号查询挂账归还信息
+export function returnRecordByOrderNo(data) {
+  return request({
+    url: '/business/returnRecord/order',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/fuintAdmin/src/api/staff/user/creditunit.js b/fuintAdmin/src/api/staff/user/creditunit.js
new file mode 100644
index 000000000..cbe8a1d5e
--- /dev/null
+++ b/fuintAdmin/src/api/staff/user/creditunit.js
@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+// 查询挂账信息列表
+export function listCreditUnit(query) {
+  return request({
+    url: '/business/creditUnit/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询挂账信息列表
+export function listsCreditUnit(query) {
+  return request({
+    url: '/business/creditUnit/queryList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增挂账记录
+export function addCreditUnit(data) {
+  return request({
+    url: '/business/creditUnit',
+    method: 'post',
+    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/convenienceStore/goodsFile.vue b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
index 2b53dbbf7..2eceb4425 100644
--- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
@@ -8,7 +8,7 @@
         </el-tabs>
         <el-form-item label="商品分类" prop="cvsGoodId">
           <el-select
-            v-model="form.cvsGoodId"
+            v-model="queryParams.cvsGoodId"
             placeholder="全部"
             clearable
             style="width: 300px"
@@ -73,12 +73,14 @@
             clearable
             style="width: 240px"
           >
-            <el-option
-              v-for="dict in dict.type.zhzt"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
+<!--            <el-option-->
+<!--              v-for="dict in dict.type.zhzt"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            />-->
+            <el-option label="上架" value="qy"/>
+            <el-option label="下架" value="jy"/>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -263,7 +265,15 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          <el-col :span="8">
+            <el-form-item label="是否使用兑换券兑换" prop="canUsePoint" label-width="110">
+              <el-radio-group v-model="form.canUseExchange">
+                <el-radio  label="0">是</el-radio>
+                <el-radio  label="1">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="初始库存" prop="stock">
               <el-input v-model="form.stock" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" :disabled="true" placeholder="0"/>
             </el-form-item>
@@ -403,7 +413,7 @@ export default {
       // 表单参数
       form: {
         id:'',goodsNo:'',name:'',cvsGoodId:"",buyingPrice:'',retailPrice:"",memberPrice:'',pinyinCode:"",
-        unit:'',shelfNumber:'',canUsePoint:'no',stock:0,supplierId:'',sort:0,status:'qy'
+        unit:'',shelfNumber:'',canUsePoint:'no',canUseExchange:'1',stock:0,supplierId:'',sort:0,status:'qy'
       },
       // 显示搜索条件
       showSearch: true,
@@ -603,11 +613,11 @@ export default {
     // 搜索按钮操作
     handleQuery() {
       this.queryParams.page = 1;
-      if (this.cvsGoodId.length==1){
-        this.queryParams.cvsGoodId = this.cvsGoodId[0]
-      }else {
-        this.queryParams.cvsGoodId = this.cvsGoodId[1]
-      }
+      // if (this.cvsGoodId.length==1){
+      //   this.queryParams.cvsGoodId = this.cvsGoodId[0]
+      // }else {
+      //   this.queryParams.cvsGoodId = this.cvsGoodId[1]
+      // }
       this.getList();
     },
     // 重置按钮操作
@@ -622,7 +632,7 @@ export default {
       this.resetForm("form");
       this.form= {
         id:'',goodsNo:'',name:'',cvsGoodId:"",buyingPrice:'',retailPrice:"",memberPrice:'',pinyinCode:"",
-        unit:'',shelfNumber:'',canUsePoint:'no',stock:0,supplierId:'',sort:0,status:'qy'
+        unit:'',shelfNumber:'',canUsePoint:'no',canUseExchange:'1',stock:0,supplierId:'',sort:0,status:'qy'
       }
     },
     // 是否移至回收站
@@ -632,6 +642,7 @@ export default {
       if (recovery==1){
         name = "确定要将此商品移至回收站吗?移出后将无法售卖当前商品！"
         prompt = "商品已移至回收站,收银台商品信息页面刷新后实时生效！"
+        form.status = 'jy'
       }else {
         name = "确定要将此商品从回收站移至商品档案里吗?移出后将可售卖当前商品！"
         prompt = "商品已移至商品档案,收银台商品信息页面刷新后实时生效！"
@@ -664,20 +675,20 @@ export default {
       const id = row.id;
       getLJGoods(id).then(response => {
         this.form = response.data;
-        this.cvsGoodOptions.forEach(item => {
-          if (item.value == response.data.cvsGoodId){
-            this.cvsGoodId.push(item.value)
-          }else {
-            if (item.children.length>0){
-              item.children.forEach(i => {
-                if (i.value == response.data.cvsGoodId){
-                  this.cvsGoodId.push(item.value)
-                  this.cvsGoodId.push(i.value)
-                }
-              })
-            }
-          }
-        })
+        // this.cvsGoodOptions.forEach(item => {
+        //   if (item.value == response.data.cvsGoodId){
+        //     this.cvsGoodId.push(item.value)
+        //   }else {
+        //     if (item.children.length>0){
+        //       item.children.forEach(i => {
+        //         if (i.value == response.data.cvsGoodId){
+        //           this.cvsGoodId.push(item.value)
+        //           this.cvsGoodId.push(i.value)
+        //         }
+        //       })
+        //     }
+        //   }
+        // })
         this.supplierList.forEach(item => {
           if (item.id == response.data.supplierId){
             this.supplier = item.name
@@ -709,10 +720,10 @@ export default {
       }
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.stock==0){
-            this.$modal.msgError("库存不可为0");
-            return;
-          }
+          // if (this.form.stock==0){
+          //   this.$modal.msgError("库存不可为0");
+          //   return;
+          // }
           if (this.form.id) {
             updateLJGoods(this.form).then(response => {
               this.$modal.msgSuccess("商品信息更新成功");
diff --git a/fuintAdmin/src/views/convenienceStore/index.vue b/fuintAdmin/src/views/convenienceStore/index.vue
index 0a6fe9343..718e82989 100644
--- a/fuintAdmin/src/views/convenienceStore/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/index.vue
@@ -203,15 +203,15 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="是否使用积分抵扣" prop="canUsePoint" label-width="110">
-              <el-radio-group v-model="form1.canUsePoint">
-                <el-radio  v-for="dict in dict.type.yes_or_no"  :label="dict.value">{{ dict.label }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="是否使用积分抵扣" prop="canUsePoint" label-width="110">-->
+<!--              <el-radio-group v-model="form1.canUsePoint">-->
+<!--                <el-radio  v-for="dict in dict.type.yes_or_no"  :label="dict.value">{{ dict.label }}</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
         <el-row>
           <el-col :span="24">
             <el-form-item label="供应商" prop="supplierId">
diff --git a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
index 6547274dd..ca64a0bcc 100644
--- a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
+++ b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
@@ -101,7 +101,7 @@
             <span>{{ getName(supplierList, scope.row.supplierId) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="分类名称" align="center" prop="cvsGoodId">
+        <el-table-column label="分类名称" align="center" prop="cvsGoodId" width="160">
           <template slot-scope="scope">
             <span>{{ getName(cvsGoodList, scope.row.cvsGoodId) }}</span>
           </template>
@@ -116,8 +116,8 @@
         <el-table-column label="成本金额" align="center" prop="costAmount" />
         <el-table-column label="状态" align="center" prop="status">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.status=='qy'">启用</el-tag>
-            <el-tag type="info" v-if="scope.row.status=='jy'">禁用</el-tag>
+            <el-tag v-if="scope.row.status=='qy'">上架</el-tag>
+            <el-tag type="info" v-if="scope.row.status=='jy'">下架</el-tag>
 <!--            <dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>-->
           </template>
         </el-table-column>
@@ -288,6 +288,15 @@ export default {
     this.getTree();
   },
   methods: {
+    getName(list,id){
+      let name = ""
+      list.forEach(item => {
+        if (item.id==id){
+          name = item.name;
+        }
+      })
+      return name;
+    },
     // 获取分类菜单
     getTree(){
       cvsGoodsTree().then(response => {
diff --git a/fuintAdmin/src/views/member/creditIndex.vue b/fuintAdmin/src/views/member/creditIndex.vue
new file mode 100644
index 000000000..2f4842fa2
--- /dev/null
+++ b/fuintAdmin/src/views/member/creditIndex.vue
@@ -0,0 +1,324 @@
+<template>
+  <div>
+    <el-card >
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+        <el-form-item label="单位名称" prop="unitName">
+          <el-input
+            v-model="queryParams.unitName"
+            placeholder="请输入单位名称"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="挂账人" prop="personCredit">
+          <el-input
+            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>
+          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <el-card style="margin-top: 20px">
+      <div>
+        <el-button
+          type="primary"
+          @click="handleAdd"
+        >新增挂账单位</el-button>
+      </div>
+
+      <el-table ref="tables" v-loading="loading" :data="list">
+        <el-table-column type="index" width="80" align="center" label="序号"/>
+        <el-table-column label="单位名称" prop="unitName" align="center" width="120"/>
+        <el-table-column label="挂账人" prop="personCredit" align="center" width="160"/>
+        <el-table-column label="联系电话" prop="contactMobile" align="center" width="120"/>
+        <el-table-column label="预设挂账额度" prop="creditLimit" align="center" width="160"/>
+        <el-table-column label="已使用挂账额度" prop="usedCreditLimit" align="center" width="160"/>
+        <el-table-column label="剩余可挂账额度" prop="residueCreditLimit" align="center" width="160"/>
+        <el-table-column label="备注" prop="remark" align="center" width="120"/>
+        <el-table-column label="状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.status=='qy'">启用</el-tag>
+            <el-tag type="info" v-if="scope.row.status=='jy'">禁用</el-tag>
+            <!--            <dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>-->
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" width="160" prop="createTime">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="190" fixed='right'>
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-card>
+
+    <!--      新增挂账单位信息-->
+    <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">
+            <el-form-item label="挂账单位" prop="unitName">
+              <el-input v-model="form1.unitName" show-word-limit placeholder="请输入挂账单位名称" maxlength="50" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="负责人" prop="personCredit">
+              <el-input v-model="form1.personCredit" show-word-limit placeholder="请输入挂账单位负责人姓名" maxlength="10" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="联系电话" prop="contactMobile">
+              <el-input v-model="form1.contactMobile" show-word-limit placeholder="请输入挂账单位联系电话" maxlength="15" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="预设挂账额度" prop="creditLimit">
+              <el-input v-model="form1.creditLimit" @input="changeCreditAmount" placeholder="请输入预设挂账额度" maxlength="10">
+                <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.usedCreditLimit" disabled placeholder="0" maxlength="10">
+                <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="10">
+                <template slot="append">元</template>
+              </el-input>
+              <span style="font-size: 12px;color: grey">
+                额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还
+              </span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="备注信息" prop="remark">
+          <el-input v-model="form1.remark" type="textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="单位状态" prop="status">
+              <el-radio-group v-model="form1.status">
+                <el-radio label="qy" value="qy">启用</el-radio>
+                <el-radio label="jy" value="jy">禁用</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="open1 = false">取 消</el-button>
+        <el-button type="primary" @click="addCredit">确 定</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {
+  addCreditUnit,
+  creditUnitInfo,
+  deleteCreditUnit,
+  editCreditUnit,
+  listsCreditUnit
+} from "@/api/staff/user/creditunit";
+
+export default {
+  dicts: ['zhzt'],
+  data(){
+    return {
+      list:[],
+      loading:false,
+      total:0,
+      form1:{},
+      open1:false,
+      title:"",
+      queryParams:{
+        page:1,
+        pageSize: 10,
+        unitName:"",
+        personCredit:"",
+        contactMobile:"",
+        status:"",
+      },
+      rules1: {
+        unitName: [ { required: true, message: "请填写挂账单位名称", trigger: "blur" }, ],
+        personCredit: [{ required: true, message: "请填写挂账单位负责人姓名", trigger: "blur" }],
+        contactMobile: [ { required: true, message: "请填写挂账单位联系电话", trigger: "blur" }, ],
+        creditLimit: [ { required: true, message: "请填写挂账额度", trigger: "blur" }, ],
+        status: [ { required: true, message: "请选择挂账单位状态", trigger: "blur" }, ],
+      },
+    }
+  },
+  created() {
+    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 => {
+        this.list = res.data.records;
+        this.total = res.data.total;
+        this.loading = false;
+      })
+    },
+    handleAdd(){
+      this.title = "新增挂账单位"
+      this.open1 = true
+    },
+    handleUpdate(data){
+      creditUnitInfo(data.id).then(res => {
+        this.form1 = res.data
+        this.title = "修改挂账单位"
+        this.open1 = true
+      })
+    },
+    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) {
+          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;
+        }
+      })
+    },
+    // 搜索按钮操作
+    handleQuery() {
+      this.queryParams.page = 1;
+      this.getList();
+    },
+    // 重置按钮操作
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/fuintAdmin/src/views/order/order_Added.vue b/fuintAdmin/src/views/order/order_Added.vue
new file mode 100644
index 000000000..c27578aed
--- /dev/null
+++ b/fuintAdmin/src/views/order/order_Added.vue
@@ -0,0 +1,490 @@
+<!--增值交易订单-->
+<template>
+  <div>
+    <!--    表单查询-->
+    <el-card class="box-card">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+        <el-form-item label="归还状态" prop="returnType">
+          <el-select
+            v-model="queryParams.returnType"
+            clearable
+            placeholder="全部"
+          >
+            <el-option label="挂账" value="0"></el-option>
+            <el-option label="归还" value="1"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="订单状态" prop="status">
+          <el-select
+            v-model="queryParams.status"
+            placeholder="全部"
+            clearable
+          >
+            <el-option label="未归还" value="0"></el-option>
+            <el-option label="已归还" value="1"></el-option>
+            <el-option label="部分归还" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="单位名称" prop="unitName">
+          <el-input
+            v-model="queryParams.unitName"
+            placeholder="请输入挂账单位名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="挂账人" prop="personCredit">
+          <el-input
+            v-model="queryParams.personCredit"
+            placeholder="请输入挂账人名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="contactMobile">
+          <el-input
+            v-model="queryParams.contactMobile"
+            placeholder="请输入挂账人联系电话"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="操作人手机号" prop="mobile">
+          <el-input
+            v-model="queryParams.mobile"
+            placeholder="请输入操作人手机号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="创建时间">
+          <el-date-picker
+            v-model="dateRange"
+            style="width: 240px"
+            size="medium"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <!--    统计-->
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>统计</span>
+      </div>
+      <div class="box-gang">
+        <div class="box">
+          <div class="size-hui">挂账笔数</div>
+          <div class="size-bole">{{ total }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">挂账总额</div>
+          <div class="size-bole">{{ allAmount }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">归还笔数</div>
+          <div class="size-bole">{{ returnTotal }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">归还总额</div>
+          <div class="size-bole">{{ returnAllAmount }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">未还金额</div>
+          <div class="size-bole">{{ noReturnAllAmount }}</div>
+        </div>
+      </div>
+    </el-card>
+    <!--    列表-->
+    <el-card class="box-card">
+      <div class="wgang">
+        <div>挂账订单列表</div>
+        <div style="display: flex ">
+
+          <el-button type="primary" size="mini" icon="el-icon-plus">导出订单</el-button>
+        </div>
+      </div>
+      <div class="table-box">
+        <el-table
+          :data="hangBillList"
+          style="width: 100%">
+          <el-table-column type="expand">
+            <template slot-scope="props">
+              <el-form label-position="left" style="margin-left: 20px" inline class="demo-table-expand">
+                <el-form-item label="操作人手机号">
+                  <span>{{ props.row.mobile }}</span>
+                </el-form-item><br/>
+                <el-form-item label="更新时间">
+                  <span>{{ props.row.updateTime ? props.row.updateTime:"--" }}</span>
+                </el-form-item><br/>
+                <el-form-item label="单据备注">
+                  <span>{{ props.row.remark ? props.row.remark:"--" }}</span>
+                </el-form-item><br/>
+                <el-form-item label="单据金额">
+                  <span>{{ props.row.amount ? props.row.amount:"0" }}</span>
+                </el-form-item>
+                <el-form-item label="已还金额">
+                  <span>{{ props.row.repaidAmount ? props.row.repaidAmount:"0" }}</span>
+                </el-form-item>
+                <el-form-item label="未还金额">
+                  <span>{{ props.row.outstandAmount ? props.row.outstandAmount:"0" }}</span>
+                </el-form-item>
+              </el-form>
+            </template>
+          </el-table-column>
+          <el-table-column prop="orderNo" align="center" label="单据号" width="220"></el-table-column>
+          <el-table-column align="center" label="挂账单位">
+            <el-table-column prop="unitName" align="center" label="单位名称"> </el-table-column>
+            <el-table-column prop="personCredit" align="center" label="挂账人"> </el-table-column>
+            <el-table-column prop="contactMobile" align="center" label="联系电话"> </el-table-column>
+          </el-table-column>
+          <el-table-column label="记录明细" align="center">
+            <el-table-column prop="returnType" align="center" label="类型">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.returnType == 0">挂账</el-tag>
+                <el-tag v-else type="success">归还</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column prop="amount" align="center" label="金额"> </el-table-column>
+            <el-table-column prop="status" align="center" label="状态">
+              <template slot-scope="scope">
+                <span v-if="scope.row.status == 0">未归还</span>
+                <span v-else-if="scope.row.status == 1" type="success">已归还</span>
+                <span v-else type="success">部分归还</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="repaidAmount" align="center" label="已归还金额"> </el-table-column>
+            <el-table-column prop="outstandAmount" align="center" label="未归还金额"> </el-table-column>
+          </el-table-column>
+          <el-table-column prop="realName" align="center" label="操作人"> </el-table-column>
+          <el-table-column prop="createTime" align="center" label="创建时间" width="220">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                @click="returnRecord(scope.row.id)"
+              >归还详情</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-drawer
+      title="归还详情"
+      :visible.sync="drawer"
+      direction="rtl"
+      size="55%"
+      :before-close="handleClose">
+      <div style="display: grid; place-items: center;">
+        <el-card style="background-color: #f5f5f5;width: 90%">
+          <div slot="header" class="clearfix">
+            <div style="position: relative;">
+              <div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);">
+                <h2>单据号：{{record.orderNo}}</h2>
+              </div>
+            </div>
+            <br>
+            <div style="display: flex; justify-content: space-between;">
+              <span>操作员工：</span>
+              <span>{{  record.realName }}</span>
+            </div>
+          </div>
+          <div >
+            <div  style="display: flex; justify-content: space-between;">
+              <span>挂账单位</span>
+              <span>{{record.unitName}}</span>
+            </div>
+            <div  style="display: flex; justify-content: space-between;margin: 10px 0">
+              <span>挂账人</span>
+              <span>{{record.personCredit}}</span>
+            </div>
+            <div  style="display: flex; justify-content: space-between;">
+              <span>联系电话</span>
+              <span>{{record.contactMobile}}</span>
+            </div>
+          </div>
+        </el-card>
+        <el-card style="margin-top: 15px;width: 90%">
+          <el-table ref="tables"
+                    v-loading="loading"
+                    :data="returnRecordList">
+            <el-table-column label="单据号" align="center" prop="orderNo" width="200"></el-table-column>
+            <el-table-column label="类型" align="center" prop="returnType">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.returnType == 0">挂账</el-tag>
+                <el-tag v-else type="success">归还</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="归还金额" align="center" prop="amount" />
+            <el-table-column label="找零金额" align="center" prop="seekZero" />
+            <el-table-column label="归还方式" align="center" prop="status">
+              <template slot-scope="scope">
+                <span>{{ getPayMeth(payList,scope.row.status) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="支付状态" align="center" prop="payStatus">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.payStatus == 'unpaid'">未支付</el-tag>
+                <el-tag type="success" v-else-if="scope.row.payStatus == 'paid'">已支付</el-tag>
+                <el-tag type="danger" v-else>支付失败</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作人" align="center" prop="realName" />
+            <el-table-column label="支付时间" align="center" prop="payTime" width="200">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.payTime) }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <div class="pagination-box">
+            <el-pagination
+              background
+              layout="prev, pager, next"
+              v-show="total2>0"
+              :total="total2"
+              :page.sync="queryParams1.page"
+              :limit.sync="queryParams1.pageSize"
+              @current-change="getRecordList">
+            </el-pagination>
+          </div>
+        </el-card>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import {
+  hangBillAllAmount,
+  hangBillAllNoReturnAmount,
+  hangBillAllReturnAmount, hangBillInfo, hangBillReturnTotal,
+  listHangBill
+} from "@/api/order/hangbill";
+import {getDicts} from "@/api/order/data";
+import {listReturnRecord} from "@/api/order/returnrecord";
+
+export default {
+  name: "order_Cashier",
+  data(){
+    return{
+      queryParams1: {
+        page: 1,
+        pageSize: 10,
+        hangBillId:"",
+      },
+      hangBillList:[],
+      total:0,
+      total2:0,
+      loading:false,
+      queryParams:{
+        page:1,
+        pageSize:10,
+        returnType:"",
+        status:"",
+        unitName:"",
+        personCredit:"",
+        contactMobile:"",
+        mobile:"",
+      },
+      dateRange:[],
+      returnRecordList:[],
+      payList:[],
+      // 归还账单总数
+      returnTotal:0,
+      // 挂账总额
+      allAmount:0,
+      // 归还总额
+      returnAllAmount:0,
+      // 未归还总额
+      noReturnAllAmount:0,
+      drawer:false,
+      // 挂账信息
+      record:{},
+    }
+  },
+  created() {
+    this.getList()
+    this.getPayList()
+  },
+  methods: {
+
+    // 归还记录详情弹框
+    returnRecord(id){
+      this.record = {}
+      this.drawer = true
+      hangBillInfo(id).then(response => {
+        this.record = response.data
+      })
+      this.getRecordList(id,1);
+    },
+    getRecordList(id,val){
+      if (val!=1){
+        this.queryParams1.page = id
+        this.queryParams1.hangBillId = this.record.id
+      }else {
+        this.queryParams1.hangBillId = id
+      }
+      listReturnRecord(this.queryParams1).then(response => {
+        this.returnRecordList = response.data.records
+        this.total2 = response.data.total
+      })
+    },
+    // 获取支付方式
+    getPayList() {
+      getDicts("payment_type").then(response => {
+        this.payList = response.data;
+      })
+    },
+    getPayMeth(list,val){
+      let name = "";
+      if (list!=null && list!=""){
+        list.forEach(item => {
+          if (item.dictValue == val){
+            name = item.dictLabel
+          }
+        })
+      }
+      return name;
+    },
+    // 是否关闭弹框
+    handleClose(done) {
+      done();
+    },
+    getList(val){
+      if (val!=undefined){
+        this.queryParams.page = val
+      }
+      listHangBill(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
+        this.hangBillList = response.data.records
+        this.total = response.data.total;
+      })
+      this.getStatistic();
+    },
+    // 获取挂账统计信息
+    getStatistic(){
+      hangBillReturnTotal(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
+        this.returnTotal = res.data
+      })
+      hangBillAllAmount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
+        if (res.data) {
+          this.allAmount = res.data
+        }
+      })
+      hangBillAllReturnAmount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
+        if (res.data) {
+          this.returnAllAmount = res.data
+        }
+      })
+      hangBillAllNoReturnAmount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
+        if (res.data) {
+          this.noReturnAllAmount = res.data
+        }
+      })
+    },
+    // 搜索按钮操作
+    handleQuery() {
+      this.queryParams.page = 1;
+      this.getList();
+    },
+    // 重置按钮操作
+    resetQuery() {
+      this.dateRange = [];
+      this.queryParams.page = 1;
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+  }
+}
+</script>
+
+<style scoped>
+.app-top{
+  width: 100%;
+
+  height: 60px;
+  box-sizing: border-box;
+  padding: 10px;
+}
+.clearfix{
+  width: 100%;
+
+}
+.box-card{
+  width: 100%;
+  margin-bottom: 15px;
+}
+.box-gang{
+  width: 100%;
+  display: flex;
+  align-items: center;
+}
+.box{
+  width: 200px;
+  box-sizing: border-box;
+  padding: 10px;
+  background: #f9f9f9;
+  height: 86px;
+  margin-right: 10px;
+}
+.size-hui{
+  font-size: 14px;
+  margin-bottom: 10px;
+  margin-top: 10px;
+}
+.size-bole{
+  font-weight: bold;
+}
+.wgang{
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 20px;
+
+}
+.table-box{
+  width: 100%;
+}
+.pagination-box{
+  width: 100%;
+  margin: 10px auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.top-app-sou{
+  width: 20%;
+}
+
+
+</style>
diff --git a/fuintAdmin/src/views/order/order_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/fuintAdmin/src/views/order/order_Oil.vue b/fuintAdmin/src/views/order/order_Oil.vue
index 4e12f373f..75847caae 100644
--- a/fuintAdmin/src/views/order/order_Oil.vue
+++ b/fuintAdmin/src/views/order/order_Oil.vue
@@ -141,54 +141,51 @@
         <el-table
           :data="oilOrderList"
           style="width: 100%">
-          <el-table-column type="expand">
-            <template slot-scope="props">
-              <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">
-                <el-form-item label="用户信息">
-                  <span>{{ props.row.userId ? queryUser(userList,props.row.userId):"--" }}</span>
-                </el-form-item>
-                <el-form-item label="收银员">
-                  <span>{{ queryStaf(staffList,props.row.staffId) }}</span>
-                </el-form-item>
-                <el-form-item label="来源终端">
-                  <span>{{ getVal(terminalList,props.row.terminal) }}</span>
-                </el-form-item>
-                <el-form-item label="用户评价">
-                  <span>{{ props.row.remark ? props.row.remark:"--" }}</span>
-                </el-form-item>
-<!--                <el-form-item label="订单备注">-->
-<!--                  <span>{{ props.row.remark ? props.row.remark:"&#45;&#45;" }}</span>-->
-<!--                  <div style="color: grey;font-size: 12px">订单备注为系统后台操作备注信息,非用户提交信息</div>-->
+<!--          <el-table-column type="expand">-->
+<!--            <template slot-scope="props">-->
+<!--              <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">-->
+<!--                <el-form-item label="用户信息">-->
+<!--                  <span>{{ props.row.userId ? queryUser(userList,props.row.userId):"&#45;&#45;" }}</span>-->
 <!--                </el-form-item>-->
-              </el-form>
-            </template>
-          </el-table-column>
+<!--                <el-form-item label="收银员">-->
+<!--                  <span>{{ queryStaf(staffList,props.row.staffId) }}</span>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="来源终端">-->
+<!--                  <span>{{ getVal(terminalList,props.row.terminal) }}</span>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="用户评价">-->
+<!--                  <span>{{ props.row.remark ? props.row.remark:"&#45;&#45;" }}</span>-->
+<!--                </el-form-item>-->
+<!--&lt;!&ndash;                <el-form-item label="订单备注">&ndash;&gt;-->
+<!--&lt;!&ndash;                  <span>{{ props.row.remark ? props.row.remark:"&#45;&#45;" }}</span>&ndash;&gt;-->
+<!--&lt;!&ndash;                  <div style="color: grey;font-size: 12px">订单备注为系统后台操作备注信息,非用户提交信息</div>&ndash;&gt;-->
+<!--&lt;!&ndash;                </el-form-item>&ndash;&gt;-->
+<!--              </el-form>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column type="index" width="80" align="center" label="序号"/>
           <el-table-column prop="terminal" label="终端" align="center" width="80">
             <template slot-scope="props">
               <span>{{ getVal(terminalList,props.row.terminal) }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="orderNo" label="订单号" width="220"> </el-table-column>
+          <el-table-column prop="orderNo" label="订单号" align="center" width="220"> </el-table-column>
           <el-table-column label="订单信息" align="center">
-            <el-table-column prop="oilGunNum" label="油品/油枪" align="center" width="120">
+            <el-table-column prop="oilGunNum" label="油品/油枪" align="center" width="90">
               <template slot-scope="props">
                 <span>{{ getName(oilNameList,props.row.oils) }}/{{ getName1(oilGunList,props.row.oilGunNum) }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="orderAmount" label="订单金额" align="center" width="120">  </el-table-column>
-            <el-table-column prop="discountAmount" label="优惠金额" align="center" width="120">  </el-table-column>
+            <el-table-column prop="orderAmount" label="订单金额" align="center">  </el-table-column>
+            <el-table-column prop="discountAmount" label="优惠金额" align="center">  </el-table-column>
 
           </el-table-column>
           <el-table-column label="付款信息" align="center">
-            <el-table-column prop="payAmount" label="实付金额" align="center" width="120"> </el-table-column>
-            <el-table-column prop="payAmount" label="储值卡或囤油卡付款金额" align="center" width="120">
-              <template slot-scope="props">
-                <span v-if="props.row.orderAmount - props.row.discountAmount - props.row.payAmount>0 && props.row.userId && props.row.orderStatus=='paid'">{{ (props.row.orderAmount - props.row.discountAmount - props.row.payAmount).toFixed(2) || 0 }}</span>
-                <span v-else>0</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="payUser" label="付款用户" align="center" width="120" > </el-table-column>
-            <el-table-column prop="payType" label="付款方式" align="center" width="120">
+            <el-table-column prop="payAmount" label="实付金额" align="center"> </el-table-column>
+            <el-table-column prop="balanceAmount" label="储值卡付款金额" align="center" width="115"/>
+            <el-table-column prop="oilCardAmount" label="囤油卡付款升数" align="center" width="115"/>
+            <el-table-column prop="payUser" label="付款用户" align="center" width="110" > </el-table-column>
+            <el-table-column prop="payType" label="付款方式" align="center">
               <template slot-scope="scope">
                 <span>{{getType(payList,scope.row.payType)}}</span>
               </template>
@@ -203,6 +200,11 @@
             </el-table-column>
           </el-table-column>
           <el-table-column prop="orderType" label="订单类型" align="center" > </el-table-column>
+          <el-table-column prop="orderType" label="用户评价" align="center" >
+            <template slot-scope="scope">
+              <span>{{scope.row.remark || "--"}}</span>
+            </template>
+          </el-table-column>
 
           <el-table-column label="交易时间" align="center" width="160" prop="payTime">
             <template slot-scope="scope">
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/convenienceSore/entity/LJGoods.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/LJGoods.java
index 827ab6901..9f0d5e230 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/LJGoods.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/LJGoods.java
@@ -114,6 +114,10 @@ public class LJGoods extends BaseEntity implements Serializable {
      * 是否删除：0未删除，1已删除
      */
     private String ifDelete;
+    /**
+     * 可否使用兑换券兑换；0可以，1不可以
+     */
+    private String canUseExchange;
 
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/LJGoodsMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/LJGoodsMapper.xml
index b752fae61..b98818c5e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/LJGoodsMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/LJGoodsMapper.xml
@@ -32,6 +32,9 @@
             <if test="goods.status != null and goods.status != ''">
                 and mg.status = #{goods.status}
             </if>
+            <if test="goods.canUseExchange != null and goods.canUseExchange != ''">
+                and mg.can_use_exchange = #{goods.canUseExchange}
+            </if>
             <if test="goods.remark != null and goods.remark != ''">
                 and(
                 mg.name like concat('%', #{goods.remark}, '%')
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 90ec94daa..c0b6dd8dc 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
@@ -1,5 +1,6 @@
 package com.fuint.business.order.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.order.entity.CreditUnit;
 import com.fuint.business.order.service.CreditUnitService;
 import com.fuint.framework.web.BaseController;
@@ -14,6 +15,30 @@ public class CreditUnitController extends BaseController {
     @Autowired
     private CreditUnitService creditUnitService;
 
+    /**
+     * 查询所有挂账单位信息
+     * @return
+     */
+    @GetMapping("/queryList")
+    private ResponseObject queryList(CreditUnit creditUnit,
+                                     @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                                     @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,pageSize);
+        return getSuccessResult(creditUnitService.selectCreditUnitList(page,creditUnit));
+    }
+
+    /**
+     * 查询所有挂账单位信息
+     * @return
+     */
+    @GetMapping("/selectList")
+    private ResponseObject selectList(CreditUnit creditUnit,
+                                     @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                                     @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,pageSize);
+        return getSuccessResult(creditUnitService.selectCreditUnitOrderList(page,creditUnit));
+    }
+
     /**
      * 查询所有挂账单位信息
      * @return
@@ -32,4 +57,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/controller/HangBillController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java
index b5d14b75a..9b3a2ed36 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java
@@ -2,6 +2,7 @@ package com.fuint.business.order.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.order.entity.CashierOrder;
 import com.fuint.business.order.entity.HangBill;
 import com.fuint.business.order.service.HangBillService;
 import com.fuint.business.order.vo.HangBillVo;
@@ -11,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 /**
@@ -135,4 +137,13 @@ public class HangBillController extends BaseController {
     public ResponseObject returnTotal(){
         return getSuccessResult(hangBillService.selectCountReturn());
     }
+
+    /**
+     * 导出订单
+     * @param response
+     */
+    @PostMapping("exportExcel")
+    public void exportExcel(HttpServletResponse response, @RequestBody HangBillVo hangBillVo) {
+        hangBillService.export(response, hangBillVo);
+    }
 }
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 07d612346..019d20f66 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
@@ -1,8 +1,10 @@
 package com.fuint.business.order.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fuint.business.order.vo.HangBillVo;
 import com.fuint.framework.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,6 +12,7 @@ import lombok.Data;
 
 import java.util.Date;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 挂账单位信息表(CreditUnit)实体类
@@ -50,9 +53,17 @@ public class CreditUnit extends BaseEntity implements Serializable {
      */
     private String contactMobile;
     /**
-     * 挂账额度
+     * 预设挂账额度
      */
     private Double creditLimit;
+    /**
+     * 可使用挂账额度
+     */
+    private Double usedCreditLimit;
+    /**
+     * 剩余挂账额度
+     */
+    private Double residueCreditLimit;
     /**
      * 单据备注
      */
@@ -61,6 +72,10 @@ public class CreditUnit extends BaseEntity implements Serializable {
      * 单位状态：启用禁用
      */
     private String status;
-
+    /**
+     * 挂账订单列表
+     */
+    @TableField(exist = false)
+    private List<HangBillVo> hangBillVos;
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CreditUnitMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CreditUnitMapper.java
index 1d39b3b01..135dc366f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CreditUnitMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CreditUnitMapper.java
@@ -1,10 +1,20 @@
 package com.fuint.business.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.order.entity.CreditUnit;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 挂账单位信息 mapper层
  */
 public interface CreditUnitMapper extends BaseMapper<CreditUnit> {
+    /**
+     * 根据条件分页查询挂账单位信息
+     * @param page
+     * @param creditUnit
+     * @return
+     */
+    public IPage<CreditUnit> selectCreditUnitList(Page page,@Param("creditUnit") CreditUnit creditUnit);
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/HangBillMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/HangBillMapper.java
index d857d4924..fa3bc5b47 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/HangBillMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/HangBillMapper.java
@@ -21,6 +21,12 @@ public interface HangBillMapper extends BaseMapper<HangBill> {
      */
     public IPage<HangBillVo> selectHangBillList(Page page,@Param("hangBill") HangBillVo hangBill);
 
+    /**
+     * 查询所有挂账记录信息
+     * @return
+     */
+    public List<HangBillVo> selectHangBillsByCreditUnit(@Param("hangBill") HangBillVo hangBill);
+
     /**
      * 查询所有挂账信息
      * @param storeId
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CreditUnitMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CreditUnitMapper.xml
new file mode 100644
index 000000000..e9a64d4de
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CreditUnitMapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fuint.business.order.mapper.CreditUnitMapper">
+
+    <select id="selectCreditUnitList" resultType="com.fuint.business.order.entity.CreditUnit">
+        select * from credit_unit
+        <where>
+            <if test="creditUnit.storeId != null and creditUnit.storeId != ''">
+                and store_id = #{creditUnit.storeId}
+            </if>
+            <if test="creditUnit.status != null and creditUnit.status != ''">
+                and status = #{creditUnit.status}
+            </if>
+            <if test="creditUnit.unitName != null and creditUnit.unitName != ''">
+                and unit_name  like concat('%',  #{creditUnit.unitName}, '%')
+            </if>
+            <if test="creditUnit.personCredit != null and creditUnit.personCredit != ''">
+                and person_credit  like concat('%',  #{creditUnit.personCredit}, '%')
+            </if>
+            <if test="creditUnit.contactMobile != null and creditUnit.contactMobile != ''">
+                and contact_mobile  like concat('%',  #{creditUnit.contactMobile}, '%')
+            </if>
+        </where>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HangBillMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HangBillMapper.xml
index b30b80191..d42603c71 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HangBillMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HangBillMapper.xml
@@ -36,8 +36,8 @@
             <if test="hangBill.params.endTime != null and hangBill.params.endTime != ''"><!-- 结束时间检索 -->
                 and date_format(hb.create_time,'%y%m%d') &lt;= date_format(#{hangBill.params.endTime},'%y%m%d')
             </if>
-            order by create_time desc
         </where>
+        order by create_time desc
     </select>
     <select id="selectHangBillById" resultType="com.fuint.business.order.vo.HangBillVo" parameterType="int">
         <include refid="selectHangBill"></include>
@@ -62,4 +62,39 @@
     <select id="selectNoReturnAmount" resultType="java.lang.Double">
         select sum(outstand_amount) from hang_bill where store_id = #{storeId}
     </select>
+    <select id="selectHangBillsByCreditUnit" resultType="com.fuint.business.order.vo.HangBillVo"
+            parameterType="com.fuint.business.order.vo.HangBillVo">
+        <include refid="selectHangBill"></include>
+        <where>
+            hb.store_id = #{hangBill.storeId}
+            <if test="hangBill.status != null and hangBill.status != ''">
+                and hb.status = #{hangBill.status}
+            </if>
+            <if test="hangBill.returnType != null and hangBill.returnType != ''">
+                and hb.return_type = #{hangBill.returnType}
+            </if>
+            <if test="hangBill.creditUnitId != null and hangBill.creditUnitId != ''">
+                and hb.credit_unit_id like concat('%', #{hangBill.creditUnitId}, '%')
+            </if>
+            <if test="hangBill.unitName != null and hangBill.unitName != ''">
+                and cu.unit_name like concat('%', #{hangBill.unitName}, '%')
+            </if>
+            <if test="hangBill.personCredit != null and hangBill.personCredit != ''">
+                and cu.person_credit like concat('%', #{hangBill.personCredit}, '%')
+            </if>
+            <if test="hangBill.contactMobile != null and hangBill.contactMobile != ''">
+                and cu.contact_mobile like concat('%', #{hangBill.contactMobile}, '%')
+            </if>
+            <if test="hangBill.mobile != null and hangBill.mobile != ''">
+                and ms.mobile like concat('%', #{hangBill.mobile}, '%')
+            </if>
+            <if test="hangBill.params.beginTime != null and hangBill.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(hb.create_time,'%y%m%d') &gt;= date_format(#{hangBill.params.beginTime},'%y%m%d')
+            </if>
+            <if test="hangBill.params.endTime != null and hangBill.params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(hb.create_time,'%y%m%d') &lt;= date_format(#{hangBill.params.endTime},'%y%m%d')
+            </if>
+        </where>
+        order by create_time desc
+    </select>
 </mapper>
\ No newline at end of file
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 9a9857417..22af11589 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
@@ -1,5 +1,7 @@
 package com.fuint.business.order.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fuint.business.order.entity.CreditUnit;
 import org.springframework.transaction.annotation.Transactional;
@@ -11,12 +13,40 @@ import java.util.List;
  */
 @Transactional
 public interface CreditUnitService extends IService<CreditUnit> {
+    /**
+     * 根据条件分页查询挂账单位信息
+     * @param page
+     * @param creditUnit
+     * @return
+     */
+    public IPage<CreditUnit> selectCreditUnitList(Page page, CreditUnit creditUnit);
+
+    /**
+     * 根据条件分页查询挂账单位信息和挂账单位下的订单信息
+     * @param page
+     * @param creditUnit
+     * @return
+     */
+    public IPage<CreditUnit> selectCreditUnitOrderList(Page page, CreditUnit creditUnit);
+
     /**
      * 查询所有挂账单位信息
      * @return
      */
     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/HangBillService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HangBillService.java
index bc738c913..e114384b4 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HangBillService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HangBillService.java
@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fuint.business.order.entity.HangBill;
-import com.fuint.business.order.entity.ReturnRecord;
 import com.fuint.business.order.vo.HangBillVo;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -24,6 +24,12 @@ public interface HangBillService extends IService<HangBill> {
      */
     public IPage<HangBillVo> selectHangBillList(Page page, HangBillVo hangBill);
 
+    /**
+     * 查询所有挂账记录信息
+     * @return
+     */
+    public List<HangBillVo> selectHangBillsByCreditUnit(HangBillVo hangBill);
+
     /**
      * 查询所有挂账记录信息
      * @return
@@ -104,4 +110,6 @@ public interface HangBillService extends IService<HangBill> {
      * @return
      */
     Double selectNoReturnAmount();
+
+    void export(HttpServletResponse response, HangBillVo hangBill);
 }
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 0c2f4b187..65f76e168 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,15 +1,21 @@
 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;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.business.order.entity.CreditUnit;
 import com.fuint.business.order.mapper.CreditUnitMapper;
 import com.fuint.business.order.service.CreditUnitService;
+import com.fuint.business.order.service.HangBillService;
+import com.fuint.business.order.vo.HangBillVo;
 import com.fuint.business.storeInformation.entity.LJStore;
 import com.fuint.business.storeInformation.service.ILJStoreService;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.TokenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -18,17 +24,51 @@ import java.util.List;
 public class CreditUnitServiceImpl extends ServiceImpl<CreditUnitMapper, CreditUnit> implements CreditUnitService {
     @Autowired
     private ILJStoreService storeService;
+    @Autowired
+    @Lazy
+    private HangBillService hangBillService;
+
+    @Override
+    public IPage<CreditUnit> selectCreditUnitList(Page page, CreditUnit creditUnit) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        creditUnit.setStoreId(nowAccountInfo.getStoreId());
+        return baseMapper.selectCreditUnitList(page,creditUnit);
+    }
+
+    @Override
+    public IPage<CreditUnit> selectCreditUnitOrderList(Page page, CreditUnit creditUnit) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        creditUnit.setStoreId(nowAccountInfo.getStoreId());
+        IPage<CreditUnit> creditUnitIPage = baseMapper.selectCreditUnitList(page, creditUnit);
+        for (CreditUnit record : creditUnitIPage.getRecords()) {
+            HangBillVo hangBillVo = new HangBillVo();
+            hangBillVo.setCreditUnitId(record.getId());
+            List<HangBillVo> hangBillVos = hangBillService.selectHangBillsByCreditUnit(hangBillVo);
+            record.setHangBillVos(hangBillVos);
+        }
+        return creditUnitIPage;
+    }
+
     @Override
     public List<CreditUnit> selectCreditUnitList() {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
-        LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId());
         QueryWrapper queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("status","qy");
-        queryWrapper.eq("chain_store_id",store.getChainStoreId());
+        queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
         List<CreditUnit> list = baseMapper.selectList(queryWrapper);
         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);
@@ -41,7 +81,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/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java
index d5e5b5827..34f73d0fe 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java
@@ -1,6 +1,7 @@
 package com.fuint.business.order.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,12 +21,14 @@ import com.fuint.business.order.service.AllOrderInfoService;
 import com.fuint.business.order.service.CreditUnitService;
 import com.fuint.business.order.service.HangBillService;
 import com.fuint.business.order.service.ReturnRecordService;
+import com.fuint.business.order.vo.Excel.CashierOrderExcel;
 import com.fuint.business.order.vo.HangBillVo;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.TokenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -46,6 +49,14 @@ public class HangBillServiceImpl extends ServiceImpl<HangBillMapper, HangBill> i
         return hangBillVoIPage;
     }
 
+    @Override
+    public List<HangBillVo> selectHangBillsByCreditUnit(HangBillVo hangBill) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        hangBill.setStoreId(storeId);
+        return baseMapper.selectHangBillsByCreditUnit(hangBill);
+    }
+
     @Override
     public List<HangBillVo> selectHangBills() {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
@@ -280,6 +291,31 @@ public class HangBillServiceImpl extends ServiceImpl<HangBillMapper, HangBill> i
         return baseMapper.selectNoReturnAmount(nowAccountInfo.getStoreId());
     }
 
+    @Override
+    public void export(HttpServletResponse response, HangBillVo hangBill) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        hangBill.setStoreId(storeId);
+//        List<CashierOrderExcel> cashierOrderExcels = baseMapper.selectCashierOrderListExport(hangBill);
+
+        // 设置文件名字
+        String fileName = "订单"+System.currentTimeMillis() + ".xlsx";
+
+        // 设置响应头信息
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=demo.xlsx");
+
+
+        try{
+            // 写入文件数据
+//            EasyExcel.write(response.getOutputStream(), CashierOrderExcel.class).sheet("download").doWrite(cashierOrderExcels);
+        }catch(Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+
     /**
      * 调用支付接口
      * @param map
diff --git a/fuintCashierWeb/src/api/cashier/creditunit.js b/fuintCashierWeb/src/api/cashier/creditunit.js
index f4c8a1dd7..74052fc73 100644
--- a/fuintCashierWeb/src/api/cashier/creditunit.js
+++ b/fuintCashierWeb/src/api/cashier/creditunit.js
@@ -8,6 +8,14 @@ export function listCreditUnit(query) {
     params: query
   })
 }
+// 查询挂账信息列表
+export function creditUnits(query) {
+  return request({
+    url: '/business/creditUnit/selectList',
+    method: 'get',
+    params: query
+  })
+}
 
 // 新增挂账记录
 export function addCreditUnit(data) {
@@ -17,3 +25,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/Order.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Order.vue
index c92e418ce..9fc1273ba 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Order.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Order.vue
@@ -7,10 +7,10 @@
           <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-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>
@@ -18,10 +18,10 @@
       <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>
+<!--      <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>
 </template>
 
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
index ad02e5344..ebeb2db0b 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
@@ -5,18 +5,6 @@
       <div slot="header" class="clearfix">
         <span>挂账</span>
       </div>
-<!--        <div style="display: flex;">-->
-<!--          <div class="top-app-sou">-->
-<!--            <el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">-->
-<!--              <el-form-item label="名称">-->
-<!--                <el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>-->
-<!--              </el-form-item>-->
-<!--            </el-form>-->
-<!--          </div>-->
-<!--          <div style="margin-left: 10px">-->
-<!--            <el-button type="primary" icon="el-icon-search">搜索</el-button>-->
-<!--          </div>-->
-<!--        </div>-->
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
         <el-form-item label="归还状态" prop="returnType">
           <el-select
@@ -122,85 +110,93 @@
       <div class="wgang">
            <div>列表</div>
            <div style="display: flex ">
-             <el-button type="primary" size="mini" @click="addRecord">新增挂账记录</el-button>
+             <el-button type="primary" size="mini" @click="open1 = true">新增挂账单位</el-button>
              <el-button type="success" size="mini" @click="batchReturn">批量挂账归还</el-button>
            </div>
          </div>
       <div class="table-box">
           <el-table
-            :data="hangBillList"
+            :data="creditUnitList"
             style="width: 100%">
-            <el-table-column type="expand">
+            <el-table-column type="expand" >
               <template slot-scope="props">
-                <el-form label-position="left" style="margin-left: 20px" inline class="demo-table-expand">
-                  <el-form-item label="操作人手机号">
-                    <span>{{ props.row.mobile }}</span>
-                  </el-form-item><br/>
-                  <el-form-item label="更新时间">
-                    <span>{{ props.row.updateTime ? props.row.updateTime:"--" }}</span>
-                  </el-form-item><br/>
-                  <el-form-item label="单据备注">
-                    <span>{{ props.row.remark ? props.row.remark:"--" }}</span>
-                  </el-form-item><br/>
-                  <el-form-item label="单据金额">
-                    <span>{{ props.row.amount ? props.row.amount:"0" }}</span>
-                  </el-form-item>
-                  <el-form-item label="已还金额">
-                    <span>{{ props.row.repaidAmount ? props.row.repaidAmount:"0" }}</span>
-                  </el-form-item>
-                  <el-form-item label="未还金额">
-                    <span>{{ props.row.outstandAmount ? props.row.outstandAmount:"0" }}</span>
-                  </el-form-item>
-                </el-form>
+                <el-table ref="tables" :data="props.row.hangBillVos">
+                  <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="returnType" align="center" label="类型">
+                      <template slot-scope="scope">
+                        <el-tag v-if="scope.row.returnType == 0">挂账</el-tag>
+                        <el-tag v-else type="success">归还</el-tag>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="amount" align="center" label="金额"> </el-table-column>
+                    <el-table-column prop="status" align="center" label="状态">
+                      <template slot-scope="scope">
+                        <span v-if="scope.row.status == 0">未归还</span>
+                        <span v-else-if="scope.row.status == 1" type="success">已归还</span>
+                        <span v-else type="success">部分归还</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="repaidAmount" align="center" label="已归还金额"> </el-table-column>
+                    <el-table-column prop="outstandAmount" align="center" label="未归还金额"> </el-table-column>
+                  <el-table-column prop="realName" align="center" label="操作人"> </el-table-column>
+                  <el-table-column prop="createTime" align="center" label="创建时间" width="220">
+                    <template slot-scope="scope">
+                      <span>{{ parseTime(scope.row.createTime) }}</span>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                    <template slot-scope="scope">
+                      <el-button
+                        size="mini"
+                        type="text"
+                        :disabled="scope.row.status == 1"
+                        @click="repay(scope.row.id)"
+                      >归还</el-button>
+                      <el-button
+                        size="mini"
+                        type="text"
+                        @click="returnRecord(scope.row.id)"
+                      >归还详情</el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
               </template>
             </el-table-column>
-            <el-table-column prop="orderNo" align="center" label="单据号" width="220"></el-table-column>
-            <el-table-column align="center" label="挂账单位">
-              <el-table-column prop="unitName" align="center" label="单位名称"> </el-table-column>
-              <el-table-column prop="personCredit" align="center" label="挂账人"> </el-table-column>
-              <el-table-column prop="contactMobile" align="center" label="联系电话"> </el-table-column>
+            <el-table-column label="单位名称" prop="unitName" align="center" width="120"/>
+            <el-table-column label="挂账人" prop="personCredit" align="center" width="160"/>
+            <el-table-column label="联系电话" prop="contactMobile" align="center" width="120"/>
+            <el-table-column label="预设挂账额度" prop="creditLimit" align="center" width="160"/>
+            <el-table-column label="已使用挂账额度" prop="usedCreditLimit" align="center" width="160"/>
+            <el-table-column label="剩余可挂账额度" prop="residueCreditLimit" align="center" width="160"/>
+            <el-table-column label="备注" prop="remark" align="center" width="120"/>
+            <el-table-column label="状态" align="center" prop="status">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.status=='qy'">启用</el-tag>
+                <el-tag type="info" v-if="scope.row.status=='jy'">禁用</el-tag>
+                <!--            <dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>-->
+              </template>
             </el-table-column>
-            <el-table-column label="记录明细" align="center">
-              <el-table-column prop="returnType" align="center" label="类型">
-                <template slot-scope="scope">
-                  <el-tag v-if="scope.row.returnType == 0">挂账</el-tag>
-                  <el-tag v-else type="success">归还</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column prop="amount" align="center" label="金额"> </el-table-column>
-              <el-table-column prop="status" align="center" label="状态">
-                <template slot-scope="scope">
-                  <span v-if="scope.row.status == 0">未归还</span>
-                  <span v-else-if="scope.row.status == 1" type="success">已归还</span>
-                  <span v-else type="success">部分归还</span>
-                </template>
-              </el-table-column>
-              <el-table-column prop="outstandAmount" align="center" label="未归还金额"> </el-table-column>
-            </el-table-column>
-            <el-table-column prop="realName" align="center" label="操作人"> </el-table-column>
-            <el-table-column prop="createTime" align="center" label="创建时间" width="220">
+            <el-table-column label="创建时间" align="center" width="160" prop="createTime">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime) }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="190" fixed='right'>
               <template slot-scope="scope">
-<!--                  <el-button-->
-<!--                    size="mini"-->
-<!--                    type="text"-->
-<!--                    icon="el-icon-edit"-->
-<!--                  >修改</el-button>-->
                 <el-button
                   size="mini"
                   type="text"
-                  :disabled="scope.row.status == 1"
-                  @click="repay(scope.row.id)"
-                >归还</el-button>
+                  icon="el-icon-edit"
+                  @click="handleUpdate(scope.row)"
+                >修改</el-button>
                 <el-button
                   size="mini"
                   type="text"
-                  @click="returnRecord(scope.row.id)"
-                >归还详情</el-button>
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)"
+                >删除</el-button>
               </template>
             </el-table-column>
 
@@ -218,6 +214,107 @@
         </el-pagination>
       </div>
     </el-card>
+<!--&lt;!&ndash;    挂账列表&ndash;&gt;-->
+<!--    <el-card class="box-card">-->
+<!--      <div class="wgang">-->
+<!--           <div>列表</div>-->
+<!--           <div style="display: flex ">-->
+<!--             <el-button type="primary" size="mini" @click="addRecord">新增挂账记录</el-button>-->
+<!--             <el-button type="success" size="mini" @click="batchReturn">批量挂账归还</el-button>-->
+<!--           </div>-->
+<!--         </div>-->
+<!--      <div class="table-box">-->
+<!--          <el-table-->
+<!--            :data="hangBillList"-->
+<!--            style="width: 100%">-->
+<!--            <el-table-column type="expand">-->
+<!--              <template slot-scope="props">-->
+<!--                <el-form label-position="left" style="margin-left: 20px" inline class="demo-table-expand">-->
+<!--                  <el-form-item label="操作人手机号">-->
+<!--                    <span>{{ props.row.mobile }}</span>-->
+<!--                  </el-form-item><br/>-->
+<!--                  <el-form-item label="更新时间">-->
+<!--                    <span>{{ props.row.updateTime ? props.row.updateTime:"&#45;&#45;" }}</span>-->
+<!--                  </el-form-item><br/>-->
+<!--                  <el-form-item label="单据备注">-->
+<!--                    <span>{{ props.row.remark ? props.row.remark:"&#45;&#45;" }}</span>-->
+<!--                  </el-form-item><br/>-->
+<!--                  <el-form-item label="单据金额">-->
+<!--                    <span>{{ props.row.amount ? props.row.amount:"0" }}</span>-->
+<!--                  </el-form-item>-->
+<!--                  <el-form-item label="已还金额">-->
+<!--                    <span>{{ props.row.repaidAmount ? props.row.repaidAmount:"0" }}</span>-->
+<!--                  </el-form-item>-->
+<!--                  <el-form-item label="未还金额">-->
+<!--                    <span>{{ props.row.outstandAmount ? props.row.outstandAmount:"0" }}</span>-->
+<!--                  </el-form-item>-->
+<!--                </el-form>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
+<!--            <el-table-column prop="orderNo" align="center" label="单据号" width="220"></el-table-column>-->
+<!--            <el-table-column align="center" label="挂账单位">-->
+<!--              <el-table-column prop="unitName" align="center" label="单位名称"> </el-table-column>-->
+<!--              <el-table-column prop="personCredit" align="center" label="挂账人"> </el-table-column>-->
+<!--              <el-table-column prop="contactMobile" align="center" label="联系电话"> </el-table-column>-->
+<!--            </el-table-column>-->
+<!--            <el-table-column label="记录明细" align="center">-->
+<!--              <el-table-column prop="returnType" align="center" label="类型">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <el-tag v-if="scope.row.returnType == 0">挂账</el-tag>-->
+<!--                  <el-tag v-else type="success">归还</el-tag>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column prop="amount" align="center" label="金额"> </el-table-column>-->
+<!--              <el-table-column prop="status" align="center" label="状态">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <span v-if="scope.row.status == 0">未归还</span>-->
+<!--                  <span v-else-if="scope.row.status == 1" type="success">已归还</span>-->
+<!--                  <span v-else type="success">部分归还</span>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column prop="outstandAmount" align="center" label="未归还金额"> </el-table-column>-->
+<!--            </el-table-column>-->
+<!--            <el-table-column prop="realName" align="center" label="操作人"> </el-table-column>-->
+<!--            <el-table-column prop="createTime" align="center" label="创建时间" width="220">-->
+<!--              <template slot-scope="scope">-->
+<!--                <span>{{ parseTime(scope.row.createTime) }}</span>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
+<!--            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--              <template slot-scope="scope">-->
+<!--&lt;!&ndash;                  <el-button&ndash;&gt;-->
+<!--&lt;!&ndash;                    size="mini"&ndash;&gt;-->
+<!--&lt;!&ndash;                    type="text"&ndash;&gt;-->
+<!--&lt;!&ndash;                    icon="el-icon-edit"&ndash;&gt;-->
+<!--&lt;!&ndash;                  >修改</el-button>&ndash;&gt;-->
+<!--                <el-button-->
+<!--                  size="mini"-->
+<!--                  type="text"-->
+<!--                  :disabled="scope.row.status == 1"-->
+<!--                  @click="repay(scope.row.id)"-->
+<!--                >归还</el-button>-->
+<!--                <el-button-->
+<!--                  size="mini"-->
+<!--                  type="text"-->
+<!--                  @click="returnRecord(scope.row.id)"-->
+<!--                >归还详情</el-button>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
+
+<!--          </el-table>-->
+<!--        </div>-->
+<!--      <div class="pagination-box">-->
+<!--        <el-pagination-->
+<!--          background-->
+<!--          layout="prev, pager, next"-->
+<!--          v-show="total>0"-->
+<!--          :total="total"-->
+<!--          :page.sync="queryParams.page"-->
+<!--          :limit.sync="queryParams.pageSize"-->
+<!--          @current-change="getList">-->
+<!--        </el-pagination>-->
+<!--      </div>-->
+<!--    </el-card>-->
 
 <!--    归还记录信息-->
     <el-drawer
@@ -377,12 +474,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" placeholder="请输入预设挂账额度" maxlength="10">
                 <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="10">
+                <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="10">
+                <template slot="append">元</template>
+              </el-input>
+              <span style="font-size: 12px;color: grey">
+                额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还
               </span>
             </el-form-item>
           </el-col>
@@ -683,7 +804,14 @@ import {
   listHangBill,
   queryHangBill
 } from "@/api/cashier/hangbill";
-import {addCreditUnit, listCreditUnit} from "@/api/cashier/creditunit";
+import {
+  addCreditUnit,
+  creditUnitInfo,
+  creditUnits,
+  deleteCreditUnit,
+  editCreditUnit,
+  listCreditUnit
+} from "@/api/cashier/creditunit";
 import {getDicts} from "@/api/dict/data";
 import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/cashier/returnrecord";
 
@@ -761,6 +889,8 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c
         hangBillList:[],
         // 归还记录列表
         returnRecordList:[],
+        // 挂账单位列表
+        creditUnitList:[],
         // 总条数
         total: 0,
         total1: 0,
@@ -796,11 +926,11 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c
       }
     },
     created() {
-      this.getList();
-      this.getUnitList();
+      // this.getList();
+      // this.getUnitList();
       this.getPayList();
       this.getLists();
-      // this.getStatistic();
+      this.getCreditUnits();
     },
     directives: {
       // 注册一个局部的自定义指令 v-focus
@@ -816,6 +946,34 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c
       },
     },
     methods:{
+      handleUpdate(data){
+        creditUnitInfo(data.id).then(res => {
+          this.form1 = res.data
+          this.title = "修改挂账单位"
+          this.open1 = true
+        })
+      },
+      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(() => {});
+      },
+      getCreditUnits(val){
+        if (val!=undefined){
+          this.queryParams.page = val
+        }
+        creditUnits().then(res => {
+          this.creditUnitList = res.data.records
+          this.total = res.data.total;
+        })
+
+      },
       // 获取挂账统计信息
       getStatistic(){
         hangBillReturnTotal(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
@@ -1138,11 +1296,31 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c
       addCredit(){
         this.$refs["formName"].validate((valid) => {
             if (valid) {
-              addCreditUnit(this.form1).then( response => {
-                this.$modal.msgSuccess("挂账单位信息创建成功");
-                this.open1 = false;
-                this.getUnitList();
-              })
+              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.getCreditUnits();
+                  }else {
+                    this.$modal.msgError("挂账单位信息修改失败");
+                  }
+                })
+              }else {
+                addCreditUnit(this.form1).then( response => {
+                  if (response.data==1) {
+                    this.$modal.msgSuccess("挂账单位信息创建成功");
+                    this.open1 = false;
+                    this.getCreditUnits();
+                  }else {
+                    this.$modal.msgError("挂账单位信息创建失败，挂站单位名称不可重复");
+                  }
+                })
+              }
             }else {
               return false;
             }
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_Added.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue
index 2d77cd51f..f207e6b7a 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue
@@ -1,116 +1,174 @@
 <!--增值交易订单-->
 <template>
   <div>
+<!--    表单查询-->
     <el-card class="box-card">
-      <div style="display: flex;">
-        <div class="top-app-sou">
-          <el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">
-            <el-form-item label="名称">
-              <el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div style="margin-left: 10px">
-          <el-button type="primary" icon="el-icon-search">搜索</el-button>
-        </div>
-      </div>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+        <el-form-item label="归还状态" prop="returnType">
+          <el-select
+            v-model="queryParams.returnType"
+            clearable
+            placeholder="全部"
+          >
+            <el-option label="挂账" value="0"></el-option>
+            <el-option label="归还" value="1"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="订单状态" prop="status">
+          <el-select
+            v-model="queryParams.status"
+            placeholder="全部"
+            clearable
+          >
+            <el-option label="未归还" value="0"></el-option>
+            <el-option label="已归还" value="1"></el-option>
+            <el-option label="部分归还" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="单位名称" prop="unitName">
+          <el-input
+            v-model="queryParams.unitName"
+            placeholder="请输入挂账单位名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="挂账人" prop="personCredit">
+          <el-input
+            v-model="queryParams.personCredit"
+            placeholder="请输入挂账人名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="contactMobile">
+          <el-input
+            v-model="queryParams.contactMobile"
+            placeholder="请输入挂账人联系电话"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="操作人手机号" prop="mobile">
+          <el-input
+            v-model="queryParams.mobile"
+            placeholder="请输入操作人手机号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="创建时间">
+          <el-date-picker
+            v-model="dateRange"
+            style="width: 240px"
+            size="medium"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
     </el-card>
+<!--    统计-->
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>增值交易统计</span>
+        <span>统计</span>
       </div>
       <div class="box-gang">
-        <div class="box" v-for="(item,index) in 7" :key="index">
-          <div class="size-hui">订单总数</div>
-          <div class="size-bole">55</div>
+        <div class="box">
+          <div class="size-hui">挂账笔数</div>
+          <div class="size-bole">{{ total }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">挂账总额</div>
+          <div class="size-bole">{{ allAmount }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">归还笔数</div>
+          <div class="size-bole">{{ returnTotal }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">归还总额</div>
+          <div class="size-bole">{{ returnAllAmount }}</div>
+        </div>
+        <div class="box">
+          <div class="size-hui">未还金额</div>
+          <div class="size-bole">{{ noReturnAllAmount }}</div>
         </div>
-
       </div>
     </el-card>
+<!--    列表-->
     <el-card class="box-card">
       <div class="wgang">
-        <div>增值交易列表</div>
+        <div>挂账订单列表</div>
         <div style="display: flex ">
 
-          <el-button type="primary" size="mini" icon="el-icon-plus">新增会员</el-button>
+          <el-button type="primary" size="mini" icon="el-icon-plus">导出订单</el-button>
         </div>
       </div>
       <div class="table-box">
         <el-table
-          :data="tableData"
+          :data="hangBillList"
           style="width: 100%">
           <el-table-column type="expand">
             <template slot-scope="props">
-              <el-form label-position="left" inline class="demo-table-expand">
-                <el-form-item label="名称">
-                  <span>{{ props.row.name }}</span>
+              <el-form label-position="left" style="margin-left: 20px" inline class="demo-table-expand">
+                <el-form-item label="操作人手机号">
+                  <span>{{ props.row.mobile }}</span>
+                </el-form-item><br/>
+                <el-form-item label="更新时间">
+                  <span>{{ props.row.updateTime ? props.row.updateTime:"--" }}</span>
+                </el-form-item><br/>
+                <el-form-item label="单据备注">
+                  <span>{{ props.row.remark ? props.row.remark:"--" }}</span>
+                </el-form-item><br/>
+                <el-form-item label="单据金额">
+                  <span>{{ props.row.amount ? props.row.amount:"0" }}</span>
+                </el-form-item>
+                <el-form-item label="已还金额">
+                  <span>{{ props.row.repaidAmount ? props.row.repaidAmount:"0" }}</span>
+                </el-form-item>
+                <el-form-item label="未还金额">
+                  <span>{{ props.row.outstandAmount ? props.row.outstandAmount:"0" }}</span>
                 </el-form-item>
               </el-form>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="date"
-            label="用户信息"
-            width="150">
+          <el-table-column prop="orderNo" align="center" label="单据号" width="220"></el-table-column>
+          <el-table-column align="center" label="挂账单位">
+            <el-table-column prop="unitName" align="center" label="单位名称"> </el-table-column>
+            <el-table-column prop="personCredit" align="center" label="挂账人"> </el-table-column>
+            <el-table-column prop="contactMobile" align="center" label="联系电话"> </el-table-column>
           </el-table-column>
-          <el-table-column label="余额">
-            <el-table-column
-              prop="name"
-              label="储值卡"
-              width="120">
+          <el-table-column label="记录明细" align="center">
+            <el-table-column prop="returnType" align="center" label="类型">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.returnType == 0">挂账</el-tag>
+                <el-tag v-else type="success">归还</el-tag>
+              </template>
             </el-table-column>
-            <el-table-column
-              prop="name"
-              label="升值卡"
-              width="120">
+            <el-table-column prop="amount" align="center" label="金额"> </el-table-column>
+            <el-table-column prop="status" align="center" label="状态">
+              <template slot-scope="scope">
+                <span v-if="scope.row.status == 0">未归还</span>
+                <span v-else-if="scope.row.status == 1" type="success">已归还</span>
+                <span v-else type="success">部分归还</span>
+              </template>
             </el-table-column>
-
+            <el-table-column prop="repaidAmount" align="center" label="已归还金额"> </el-table-column>
+            <el-table-column prop="outstandAmount" align="center" label="未归还金额"> </el-table-column>
           </el-table-column>
-          <el-table-column label="会员等级">
-            <el-table-column
-              prop="province"
-              label="汽油"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="city"
-              label="柴油"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="city"
-              label="天然气"
-              width="120">
-            </el-table-column>
-          </el-table-column>
-          <el-table-column label="统计">
-            <el-table-column
-              prop="province"
-              label="加油金"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="city"
-              label="积分"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="city"
-              label="消费次数"
-              width="120">
-            </el-table-column>
-          </el-table-column>
-
-          <el-table-column
-            prop="zip"
-            label="实体卡号"
-            width="220">
-          </el-table-column>
-
-          <el-table-column
-            prop="zip"
-            label="状态"
-            width="120">
+          <el-table-column prop="realName" align="center" label="操作人"> </el-table-column>
+          <el-table-column prop="createTime" align="center" label="创建时间" width="220">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
           </el-table-column>
 
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -118,87 +176,253 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
-              >更多操作</el-button>
-
+                @click="returnRecord(scope.row.id)"
+              >归还详情</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="1000">
+          :total="total"
+          :page.sync="queryParams.page"
+          :limit.sync="queryParams.pageSize"
+          @current-change="getList">
         </el-pagination>
       </div>
 
 
     </el-card>
+
+    <!--    归还记录信息-->
+    <el-drawer
+      title="归还详情"
+      :visible.sync="drawer"
+      direction="rtl"
+      size="55%"
+      :before-close="handleClose">
+      <div style="display: grid; place-items: center;">
+        <el-card style="background-color: #f5f5f5;width: 90%">
+          <div slot="header" class="clearfix">
+            <div style="position: relative;">
+              <div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);">
+                <h2>单据号：{{record.orderNo}}</h2>
+              </div>
+            </div>
+            <br>
+            <div style="display: flex; justify-content: space-between;">
+              <span>操作员工：</span>
+              <span>{{  record.realName }}</span>
+            </div>
+          </div>
+          <div >
+            <div  style="display: flex; justify-content: space-between;">
+              <span>挂账单位</span>
+              <span>{{record.unitName}}</span>
+            </div>
+            <div  style="display: flex; justify-content: space-between;margin: 10px 0">
+              <span>挂账人</span>
+              <span>{{record.personCredit}}</span>
+            </div>
+            <div  style="display: flex; justify-content: space-between;">
+              <span>联系电话</span>
+              <span>{{record.contactMobile}}</span>
+            </div>
+          </div>
+        </el-card>
+        <el-card style="margin-top: 15px;width: 90%">
+          <el-table ref="tables"
+                    v-loading="loading"
+                    :data="returnRecordList">
+            <el-table-column label="单据号" align="center" prop="orderNo" width="200"></el-table-column>
+            <el-table-column label="类型" align="center" prop="returnType">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.returnType == 0">挂账</el-tag>
+                <el-tag v-else type="success">归还</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="归还金额" align="center" prop="amount" />
+            <el-table-column label="找零金额" align="center" prop="seekZero" />
+            <el-table-column label="归还方式" align="center" prop="status">
+              <template slot-scope="scope">
+                <span>{{ getPayMeth(payList,scope.row.status) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="支付状态" align="center" prop="payStatus">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.payStatus == 'unpaid'">未支付</el-tag>
+                <el-tag type="success" v-else-if="scope.row.payStatus == 'paid'">已支付</el-tag>
+                <el-tag type="danger" v-else>支付失败</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作人" align="center" prop="realName" />
+            <el-table-column label="支付时间" align="center" prop="payTime" width="200">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.payTime) }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <div class="pagination-box">
+            <el-pagination
+              background
+              layout="prev, pager, next"
+              v-show="total2>0"
+              :total="total2"
+              :page.sync="queryParams1.page"
+              :limit.sync="queryParams1.pageSize"
+              @current-change="getRecordList">
+            </el-pagination>
+          </div>
+        </el-card>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
 <script>
+import {
+  hangBillAllAmount,
+  hangBillAllNoReturnAmount,
+  hangBillAllReturnAmount, hangBillInfo, hangBillReturnTotal,
+  listHangBill
+} from "@/api/cashier/hangbill";
+import {getDicts} from "@/api/dict/data";
+import {listReturnRecord} from "@/api/cashier/returnrecord";
+
   export default {
     name: "order_Cashier",
     data(){
       return{
-        labelPosition: 'right',
-        formLabelAlign: {
-          name: '',
+        queryParams1: {
+          page: 1,
+          pageSize: 10,
+          hangBillId:"",
         },
-        tableData: [{
-          date: '2016-05-03',
-          name: '王小狼',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-02',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-04',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-01',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-08',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-06',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-07',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }]
+        hangBillList:[],
+        total:0,
+        total2:0,
+        loading:false,
+        queryParams:{
+          page:1,
+          pageSize:10,
+          returnType:"",
+          status:"",
+          unitName:"",
+          personCredit:"",
+          contactMobile:"",
+          mobile:"",
+        },
+        dateRange:[],
+        returnRecordList:[],
+        payList:[],
+        // 归还账单总数
+        returnTotal:0,
+        // 挂账总额
+        allAmount:0,
+        // 归还总额
+        returnAllAmount:0,
+        // 未归还总额
+        noReturnAllAmount:0,
+        drawer:false,
+        // 挂账信息
+        record:{},
       }
+    },
+    created() {
+      this.getList()
+      this.getPayList()
+    },
+    methods: {
+
+      // 归还记录详情弹框
+      returnRecord(id){
+        this.record = {}
+        this.drawer = true
+        hangBillInfo(id).then(response => {
+          this.record = response.data
+        })
+        this.getRecordList(id,1);
+      },
+      getRecordList(id,val){
+        if (val!=1){
+          this.queryParams1.page = id
+          this.queryParams1.hangBillId = this.record.id
+        }else {
+          this.queryParams1.hangBillId = id
+        }
+        listReturnRecord(this.queryParams1).then(response => {
+          this.returnRecordList = response.data.records
+          this.total2 = response.data.total
+        })
+      },
+      // 获取支付方式
+      getPayList() {
+        getDicts("payment_type").then(response => {
+          this.payList = response.data;
+        })
+      },
+      getPayMeth(list,val){
+        let name = "";
+        if (list!=null && list!=""){
+          list.forEach(item => {
+            if (item.dictValue == val){
+              name = item.dictLabel
+            }
+          })
+        }
+        return name;
+      },
+      // 是否关闭弹框
+      handleClose(done) {
+        done();
+      },
+      getList(val){
+        if (val!=undefined){
+          this.queryParams.page = val
+        }
+        listHangBill(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
+          this.hangBillList = response.data.records
+          this.total = response.data.total;
+        })
+        this.getStatistic();
+      },
+      // 获取挂账统计信息
+      getStatistic(){
+        hangBillReturnTotal(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
+          this.returnTotal = res.data
+        })
+        hangBillAllAmount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
+          if (res.data) {
+            this.allAmount = res.data
+          }
+        })
+        hangBillAllReturnAmount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
+          if (res.data) {
+            this.returnAllAmount = res.data
+          }
+        })
+        hangBillAllNoReturnAmount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
+          if (res.data) {
+            this.noReturnAllAmount = res.data
+          }
+        })
+      },
+      // 搜索按钮操作
+      handleQuery() {
+        this.queryParams.page = 1;
+        this.getList();
+      },
+      // 重置按钮操作
+      resetQuery() {
+        this.dateRange = [];
+        this.queryParams.page = 1;
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
     }
   }
 </script>
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
index 5630a3b3e..4a3fb4c93 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
@@ -19,27 +19,27 @@
           <el-input v-model="queryParams.orderNo" clearable placeholder="订单号检索"></el-input>
         </el-form-item>
         <el-form-item label="交易时间">
+          <el-date-picker
+            v-model="dateRange"
+            style="width: 400px"
+            size="medium"
+            value-format="yyyy-MM-dd"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
 <!--          <el-date-picker-->
-<!--            v-model="dateRange"-->
-<!--            style="width: 240px"-->
-<!--            size="medium"-->
-<!--            value-format="yyyy-MM-dd"-->
-<!--            type="daterange"-->
-<!--            range-separator="-"-->
-<!--            start-placeholder="开始日期"-->
-<!--            end-placeholder="结束日期"-->
-<!--          ></el-date-picker>-->
-          <el-date-picker
-            v-model="beginTime"
-            type="datetime"
-            placeholder="开始日期">
-          </el-date-picker>
-            至
-          <el-date-picker
-            v-model="endTime"
-            type="datetime"
-            placeholder="结束日期">
-          </el-date-picker>
+<!--            v-model="beginTime"-->
+<!--            type="datetime"-->
+<!--            placeholder="开始日期">-->
+<!--          </el-date-picker>-->
+<!--            至-->
+<!--          <el-date-picker-->
+<!--            v-model="endTime"-->
+<!--            type="datetime"-->
+<!--            placeholder="结束日期">-->
+<!--          </el-date-picker>-->
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -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)"
@@ -417,6 +418,8 @@ import {formatDate} from "@/utils";
         queryParams: {
           page: 1,
           pageSize: 10,
+          beginTime:"",
+          endTime:"",
         },
         orderStatistics:{
           numberOfStrokes:'0',
@@ -439,8 +442,8 @@ import {formatDate} from "@/utils";
     methods:{
 
       exportExcelCashier() {
-        this.dateRange.push(this.beginTime)
-        this.dateRange.push(this.endTime)
+        // this.dateRange.push(this.beginTime)
+        // this.dateRange.push(this.endTime)
         exportExcelCashierApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
           const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
           this.$download.saveAs(blob,'收银台订单统计.xLsx')
@@ -449,8 +452,8 @@ import {formatDate} from "@/utils";
       // 获取订单统计信息
 
       getOrderStatistics() {
-        this.dateRange.push(this.beginTime)
-        this.dateRange.push(this.endTime)
+        // this.dateRange.push(this.beginTime)
+        // this.dateRange.push(this.endTime)
         orderStatisticsApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
           this.orderStatistics = res.data
         })
@@ -681,6 +684,16 @@ import {formatDate} from "@/utils";
           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);
+      },
       // 获取列表信息
       getList(val){
         if (val!=undefined){
@@ -690,17 +703,17 @@ import {formatDate} from "@/utils";
         let time1 = ""
         let time2 = ""
         if (this.beginTime && this.endTime){
-          let beginTime = this.beginTime.getTime()
-          let endTime = this.endTime.getTime()
-          // time1 = formatDate(beginTime, 'yyyy-MM-dd')
-          // time2 = formatDate(endTime, 'yyyy-MM-dd')
-          time1 = new Date(beginTime)
-          time2 = new Date(endTime)
-          this.$modal.msgError(time1)
+          // let beginTime = this.beginTime.getTime()
+          // let endTime = this.endTime.getTime()
+          time1 = this.parseTime1(this.beginTime)
+          time2 = this.parseTime1(this.endTime)
         }
+        let dateRange = []
         // this.$modal.msgError()
-        this.dateRange.push(time1)
-        this.dateRange.push(time2)
+        // dateRange.push(time1.toString())
+        // dateRange.push(time2.toString())
+        // this.$modal.msgError(this.dateRange.toString())
+        // this.dateRange = dateRange.toString()
         listCashierOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
           this.orderList = response.data.records;
           this.total = response.data.total;
@@ -711,8 +724,8 @@ import {formatDate} from "@/utils";
         if (val!=undefined){
           this.queryParams.page = val
         }
-        this.dateRange.push(this.beginTime)
-        this.dateRange.push(this.endTime)
+        // this.dateRange.push(this.beginTime)
+        // this.dateRange.push(this.endTime)
         cashierOrderSeekZeroAmount(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
           if (response.data) {
             this.seekZeroAmount = response.data
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
index 3f508b3ba..d96908255 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
@@ -53,7 +53,7 @@
             size="medium"
             value-format="yyyy-MM-dd"
             type="daterange"
-            range-separator="-"
+            range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
           ></el-date-picker>
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
index a49998111..46aed4334 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
@@ -73,7 +73,7 @@
                 size="medium"
                 value-format="yyyy-MM-dd"
                 type="daterange"
-                range-separator="-"
+                range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
               ></el-date-picker>
@@ -142,54 +142,51 @@
           v-loading="loading"
           :data="oilOrderList"
           style="width: 100%">
-          <el-table-column type="expand">
-            <template slot-scope="props">
-              <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">
-                <el-form-item label="用户信息">
-                  <span>{{ props.row.userId ? queryUser(userList,props.row.userId):"--" }}</span>
-                </el-form-item>
-                <el-form-item label="收银员">
-                  <span>{{ queryStaf(staffList,props.row.staffId) }}</span>
-                </el-form-item>
-                <el-form-item label="来源终端">
-                  <span>{{ getVal(terminalList,props.row.terminal) }}</span>
-                </el-form-item>
-                <el-form-item label="用户评价">
-                  <span>{{ props.row.remark ? props.row.remark:"--" }}</span>
-                </el-form-item>
-<!--                <el-form-item label="订单备注">-->
-<!--                  <span>{{ props.row.remark ? props.row.remark:"&#45;&#45;" }}</span>-->
-<!--                  <div style="color: grey;font-size: 12px">订单备注为系统后台操作备注信息,非用户提交信息</div>-->
+<!--          <el-table-column type="expand">-->
+<!--            <template slot-scope="props">-->
+<!--              <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">-->
+<!--                <el-form-item label="用户信息">-->
+<!--                  <span>{{ props.row.userId ? queryUser(userList,props.row.userId):"&#45;&#45;" }}</span>-->
 <!--                </el-form-item>-->
-              </el-form>
-            </template>
-          </el-table-column>
+<!--                <el-form-item label="收银员">-->
+<!--                  <span>{{ queryStaf(staffList,props.row.staffId) }}</span>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="来源终端">-->
+<!--                  <span>{{ getVal(terminalList,props.row.terminal) }}</span>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="用户评价">-->
+<!--                  <span>{{ props.row.remark ? props.row.remark:"&#45;&#45;" }}</span>-->
+<!--                </el-form-item>-->
+<!--&lt;!&ndash;                <el-form-item label="订单备注">&ndash;&gt;-->
+<!--&lt;!&ndash;                  <span>{{ props.row.remark ? props.row.remark:"&#45;&#45;" }}</span>&ndash;&gt;-->
+<!--&lt;!&ndash;                  <div style="color: grey;font-size: 12px">订单备注为系统后台操作备注信息,非用户提交信息</div>&ndash;&gt;-->
+<!--&lt;!&ndash;                </el-form-item>&ndash;&gt;-->
+<!--              </el-form>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column type="index" width="80" align="center" label="序号"/>
           <el-table-column prop="terminal" label="终端" align="center" width="80">
             <template slot-scope="props">
               <span>{{ getVal(terminalList,props.row.terminal) }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="orderNo" label="订单号" width="220"> </el-table-column>
+          <el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
           <el-table-column label="订单信息" align="center">
-            <el-table-column prop="oilGunNum" label="油品/油枪" align="center" width="120">
+            <el-table-column prop="oilGunNum" label="油品/油枪" align="center" width="90">
               <template slot-scope="props">
                 <span>{{ getName(oilNameList,props.row.oils) }}/{{ getName1(oilGunList,props.row.oilGunNum) }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="orderAmount" label="订单金额" align="center" width="120">  </el-table-column>
-            <el-table-column prop="discountAmount" label="优惠金额" align="center" width="120">  </el-table-column>
+            <el-table-column prop="orderAmount" label="订单金额" align="center">  </el-table-column>
+            <el-table-column prop="discountAmount" label="优惠金额" align="center">  </el-table-column>
 
           </el-table-column>
           <el-table-column label="付款信息" align="center">
-            <el-table-column prop="payAmount" label="实付金额" align="center" width="120"> </el-table-column>
-            <el-table-column prop="payAmount" label="储值卡或囤油卡付款金额" align="center" width="120">
-              <template slot-scope="props">
-                <span v-if="props.row.orderAmount - props.row.discountAmount - props.row.payAmount>0 && props.row.userId && props.row.orderStatus=='paid'">{{ (props.row.orderAmount - props.row.discountAmount - props.row.payAmount).toFixed(2) || 0 }}</span>
-                <span v-else>0</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="payUser" label="付款用户" align="center"  width="120"> </el-table-column>
-            <el-table-column prop="payType" label="付款方式" align="center" width="120">
+            <el-table-column prop="payAmount" label="实付金额" align="center"> </el-table-column>
+            <el-table-column prop="balanceAmount" label="储值卡付款金额" align="center" width="115"/>
+            <el-table-column prop="oilCardAmount" label="囤油卡付款升数" align="center" width="115"/>
+            <el-table-column prop="payUser" label="付款用户" align="center"  width="110"> </el-table-column>
+            <el-table-column prop="payType" label="付款方式" align="center">
               <template slot-scope="scope">
                 <span>{{getType(payList,scope.row.payType)}}</span>
               </template>
@@ -204,6 +201,11 @@
             </el-table-column>
           </el-table-column>
           <el-table-column prop="orderType" label="订单类型" align="center" > </el-table-column>
+          <el-table-column prop="orderType" label="用户评价" align="center" >
+            <template slot-scope="scope">
+              <span>{{scope.row.remark || "--"}}</span>
+            </template>
+          </el-table-column>
 
             <el-table-column label="交易时间" align="center" width="160" prop="payTime">
               <template slot-scope="scope">
diff --git a/gasStation-uni/pagesRefuel/orderDetail/index.vue b/gasStation-uni/pagesRefuel/orderDetail/index.vue
index 08f56135a..30b545ea7 100644
--- a/gasStation-uni/pagesRefuel/orderDetail/index.vue
+++ b/gasStation-uni/pagesRefuel/orderDetail/index.vue
@@ -311,7 +311,7 @@
 					activeId:this.preferentialData.activeId,
 					cardFavorableId:this.preferentialData.cardFavorableId,
 					type:this.preferentialData.type,
-					balanceAmount:this.balanceRedece,
+					balanceAmountSale:this.balanceRedece,
 					oilCardAmountSale:this.oilCardRedece,
 				};
 				let _this = this;