修改

fuintAdmin/src/views/convenienceStore/damage/index.vue

@@ -16,7 +16,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="状态" v-model="queryParams.approvalStatus" prop="status">
-          <el-select v-model="queryParams.approvalStatus" placeholder="请选择状态" style="150px">
+          <el-select v-model="queryParams.approvalStatus" placeholder="请选择状态" style="150px" clearable>
             <el-option
               v-for="dict in dict.type.oilPurchasedStatus"
               :key="dict.value"

fuintAdmin/src/views/convenienceStore/purchase/index.vue

@@ -16,7 +16,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="状态" v-model="queryParams.approvalStatus" prop="status">
-          <el-select v-model="queryParams.approvalStatus" placeholder="请选择状态" style="150px">
+          <el-select v-model="queryParams.approvalStatus" placeholder="请选择状态" style="150px" clearable>
             <el-option
               v-for="dict in dict.type.oilPurchasedStatus"
               :key="dict.value"

fuintAdmin/src/views/member/userInfo.vue

@@ -1083,18 +1083,26 @@ export default {
     },
     handleDataFromChild(data) {
       this.openStaff = false
-      this.cardFuelDieselForm= {
-        mtStaffId: data.mtStaffId,
-        realName: data.realName,
-        staffMobile: data.staffMobile,
-      },
+      // 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.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
 
     },
     // 查询参加存油卡油品

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java

@@ -171,7 +171,9 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
 
         // 支付
         if (flag) {
-//            Integer allAmount = (int) (theAmountToBePaid*100);
+            Integer allAmount1 = (int) (theAmountToBePaid*100);
+            System.out.println("allAmount1:"+allAmount1);
+
             Integer allAmount = (int) (0.01 * 100);
 
             MerchantConfig merchantConfig = merchantConfigService.selectMeChByIsUse("1");
@@ -238,6 +240,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
             Map<String, String> refuelMoney = new HashMap<>();
             // todo 目前没有用id
 //            refuelMoney.put("oilNumberId",cardFuelRecord.getOilNumberId().toString());
+//            refuelMoney.put("oilNameId",cardFuelRecord.getType());
             refuelMoney.put("type",cardFuelRecord.getType());
             refuelMoney.put("oilType",cardFuelRecord.getOilType());
             refuelMoney.put("refuelMoney",cardFuelRecord.getIncomeLitres().toString());
@@ -257,7 +260,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
 //                    Double.valueOf(refuelMoney);
 
                     BigDecimal ref = new BigDecimal(refuelMoney);
-                    BigDecimal inconLitres = new BigDecimal(cardFuelRecord.getIncomeLitres());
+                    BigDecimal inconLitres = new BigDecimal(cardFuelRecord.getIncomeLitres().toString());
                     BigDecimal add = ref.add(inconLitres);
                     stringObjectMap.put("refuelMoney",add.toString());
                     flag = false;

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java

@@ -116,7 +116,8 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
         }
         // todo
         if (flag) {
-//            Integer allAmount = (int) (theAmountToBePaid*100);
+            Integer allAmount1 = (int) (theAmountToBePaid*100);
+            System.out.println("allAmount1:"+allAmount1);
             Integer allAmount = (int) (0.01*100);
 
             MerchantConfig merchantConfig = merchantConfigService.selectMeChByIsUse("1");

fuintCashierWeb/src/api/staff/client.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询省市区详细
+export function getClient() {
+  return request({
+    url: '/province/region/tree',
+    method: 'get'
+  })
+}
+

fuintCashierWeb/src/api/staff/duty.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 查询角色列表
+export function listDuty(query) {
+  return request({
+    url: '/business/member/duty/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询角色详细
+export function getDuty(id) {
+  return request({
+    url: '/business/member/duty/' + id,
+    method: 'get'
+  })
+}

fuintCashierWeb/src/api/staff/qrcode.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询二维码列表
+export function listQRCode(query) {
+  return request({
+    url: '/business/storeInformation/qrCode/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询二维码详细
+export function qrCodeInfo() {
+  return request({
+    url: '/business/storeInformation/qrCode',
+    method: 'get'
+  })
+}
+
+// 查询二维码详细
+export function getQRCode(id) {
+  return request({
+    url: '/business/storeInformation/qrCode/' + id,
+    method: 'get'
+  })
+}
+
+// 新增二维码
+export function addQRCode(data) {
+  return request({
+    url: '/business/storeInformation/qrCode',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改二维码
+export function updateQRCode(data) {
+  return request({
+    url: '/business/storeInformation/qrCode',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除二维码
+export function delQRCode(id) {
+  return request({
+    url: '/business/storeInformation/qrCode/' + id,
+    method: 'delete'
+  })
+}

fuintCashierWeb/src/api/staff/staff.js

@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 查询员工列表
+export function listStaff(query) {
+  return request({
+    url: '/business/member/staff/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询所有员工
+export function queryStaffs() {
+  return request({
+    url: '/business/member/staff/query',
+    method: 'get'
+  })
+}
+
+// 查询员工详细
+export function getStaff(id) {
+  return request({
+    url: '/business/member/staff/' + id,
+    method: 'get'
+  })
+}
+
+// 根据手机号查询员工详情
+export function queryStaff(data) {
+  return request({
+    url: '/business/member/staff/mobile',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增员工
+export function addStaff(data) {
+  return request({
+    url: '/business/member/staff',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改员工
+export function updateStaff(data) {
+  return request({
+    url: '/business/member/staff',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除员工
+export function delStaff(id) {
+  return request({
+    url: '/business/member/staff/' + id,
+    method: 'delete'
+  })
+}

fuintCashierWeb/src/api/staff/store.js

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 查询店铺详细
+export function ljStoreInfo() {
+  return request({
+    url: '/business/storeInformation/store',
+    method: 'get'
+  })
+}
+
+// 查询店铺详细
+export function ljStoreList() {
+  return request({
+    url: '/business/storeInformation/store/list',
+    method: 'get'
+  })
+}
+
+// 修改店铺信息
+export function updateStore(data) {
+  return request({
+    url: '/business/storeInformation/store',
+    method: 'put',
+    data: data
+  })
+}

fuintCashierWeb/src/api/staff/user/certifiedmember.js

@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 查询固定等级列表
+export function listCertifiedMember(query) {
+  return request({
+    url: '/business/userManager/certifiedMember/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询固定等级详细
+export function getCertifiedMember(id) {
+  return request({
+    url: '/business/userManager/certifiedMember/' + id,
+    method: 'get'
+  })
+}
+
+// 根据会员id查询固定等级详细
+export function getCertifiedMemberByUserId(userId) {
+  return request({
+    url: '/business/userManager/certifiedMember/userId/' + userId,
+    method: 'get'
+  })
+}
+
+// 新增固定等级
+export function addCertifiedMember(data) {
+  return request({
+    url: '/business/userManager/certifiedMember',
+    method: 'post',
+    data: data
+  })
+}
+
+// 批量新增固定等级
+export function addCertifiedMembers(data) {
+  return request({
+    url: '/business/userManager/certifiedMember/members',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改固定等级
+export function updateCertifiedMember(data) {
+  return request({
+    url: '/business/userManager/certifiedMember',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除固定等级
+export function delCertifiedMember(id) {
+  return request({
+    url: '/business/userManager/certifiedMember/' + id,
+    method: 'delete'
+  })
+}

fuintCashierWeb/src/api/staff/user/chainstoreconfig.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 查询会员详细
+export function getChainStoreConfig() {
+  return request({
+    url: '/business/userManager/chainStoreConfig',
+    method: 'get'
+  })
+}
+
+// 修改会员
+export function updateChainStoreConfig(data) {
+  return request({
+    url: '/business/userManager/chainStoreConfig',
+    method: 'put',
+    data: data
+  })
+}
+

fuintCashierWeb/src/api/staff/user/fixinglevel.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询固定等级列表
+export function listFixingLevel(query) {
+  return request({
+    url: '/business/userManager/fixingLevel/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询固定等级详细
+export function getFixingLevel(id) {
+  return request({
+    url: '/business/userManager/fixingLevel/' + id,
+    method: 'get'
+  })
+}
+
+// 根据固定等级名称查询固定等级信息
+export function queryFixingLevel(data) {
+  return request({
+    url: '/business/userManager/fixingLevel/getName',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增固定等级
+export function addFixingLevel(data) {
+  return request({
+    url: '/business/userManager/fixingLevel',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改固定等级
+export function updateFixingLevel(data) {
+  return request({
+    url: '/business/userManager/fixingLevel',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除固定等级
+export function delFixingLevel(id) {
+  return request({
+    url: '/business/userManager/fixingLevel/' + id,
+    method: 'delete'
+  })
+}

fuintCashierWeb/src/api/staff/user/sysconfig.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 查询会员详细
+export function getSysConfig(key) {
+  return request({
+    url: '/sysConfig/getByKey/' + key,
+    method: 'get'
+  })
+}

fuintCashierWeb/src/api/staff/user/user.js

@@ -0,0 +1,78 @@
+import request from '@/utils/request'
+
+// 查询会员列表
+export function listUser(query) {
+  return request({
+    url: '/business/userManager/user/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询会员统计列表
+export function listUserStatistic(query) {
+  return request({
+    url: '/business/userManager/userStatistic/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询会员列表
+export function listStatistic(query) {
+  return request({
+    url: '/business/userManager/user/statistic',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询会员详细
+export function getUser(id) {
+  return request({
+    url: '/business/userManager/user/' + id,
+    method: 'get'
+  })
+}
+// 根据手机号查询会员详细
+export function getUserMobile(data) {
+  return request({
+    url: '/business/userManager/user/mobile' ,
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增会员
+export function addUser(data) {
+  return request({
+    url: '/business/userManager/user',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改会员
+export function updateUser(data) {
+  return request({
+    url: '/business/userManager/user',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除会员
+export function delUser(id) {
+  return request({
+    url: '/business/userManager/user/' + id,
+    method: 'delete'
+  })
+}
+
+//下载示例文件
+export function exportUsers() {
+  return request({
+    url: '/excel/export',
+    method: 'get'
+  })
+}

fuintCashierWeb/src/api/staff/user/usergrade.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询会员等级列表
+export function listUserGrade(query) {
+  return request({
+    url: '/business/userManager/userGrade/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询会员等级详细
+export function getUserGrade(id) {
+  return request({
+    url: '/business/userManager/userGrade/' + id,
+    method: 'get'
+  })
+}
+
+// 根据会员等级名称查询会员等级信息
+export function queryUserGrade(data) {
+  return request({
+    url: '/business/userManager/userGrade/getName',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增会员等级
+export function addUserGrade(data) {
+  return request({
+    url: '/business/userManager/userGrade',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改会员等级
+export function updateUserGrade(data) {
+  return request({
+    url: '/business/userManager/userGrade',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除会员等级
+export function delUserGrade(id) {
+  return request({
+    url: '/business/userManager/userGrade/' + id,
+    method: 'delete'
+  })
+}

fuintCashierWeb/src/components/local/selectStaff.vue

@@ -0,0 +1,273 @@
+<template>
+  <div class="app-container">
+    <el-card >
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="姓名" prop="name">
+          <el-input
+            v-model="queryParams.realName"
+            placeholder="请输入姓名"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="手机号" prop="mobile">
+          <el-input
+            v-model="queryParams.mobile"
+            placeholder="请输入手机号"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+<!--        <el-form-item label="状态" prop="auditedStatus">-->
+<!--          <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" >
+
+      <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange"
+                   @row-click="handleRowClick"
+ :default-sort="defaultSort" @sort-change="handleSortChange">
+        <el-table-column label="ID" align="center" prop="id" width="80" />
+        <el-table-column label="姓名" align="center" prop="realName" />
+        <el-table-column label="手机号" align="center" prop="mobile"  width="110"/>
+
+
+        <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>
+          </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>
+  </div>
+</template>
+
+<script>
+import {getName} from "../../utils/fuint";
+import {addStaff, delStaff, getStaff, listStaff, queryStaff, updateStaff} from "@/api/staff/staff";
+import {getDuty, listDuty} from "@/api/staff/duty";
+
+export default {
+  name: "selectStaff",
+  dicts: ['zhzt','transaction','time_frame','handover','handover_quit',
+    'jbjl','official','notice','special_prem','role','shqx'],
+  data() {
+    return {
+      // 角色列表
+      roleList:[],
+      drawer: false,
+      // 标题
+      title: "",
+      // 遮罩层
+      loading: false,
+      // 选中数组
+      ids: [],
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      storeOptions: [],
+      // role:[],
+      posPrem:'',
+
+      props: { multiple: true },
+      appletPrem:'',
+
+      writeOff:[],
+      write:[],
+      specialPrem:[],
+      auditPrem:[],
+      special:[],
+      // 总条数
+      total: 0,
+      // 表格数据
+      list: [],
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 默认排序
+      defaultSort: {prop: 'createTime', order: 'descending'},
+      // 表单参数
+      form: {
+        id:'', userId:'', mobile:'', realName:'', wechat:'', merchantId:'', storeId:'', auditedStatus:'',
+        auditedTime:'', description:'', isRefuel:'yc', handoverMode:'dqmdtyjb', handoverPrem:'yqx', handoverOut:'jbtc', record:'qbjl',
+        merchantStatus:'qy',screen:'qy', posPrem:'', appletPrem:'', notice:'advice_jy', oilGunId:'', timeFrame:'bx', refund:'yqx',
+        transaction:'qbjy', writeOff:'',auditPrem:'',specialPrem:'', official:'', status:'qy',pos:'jy',roleId:''
+      },
+      // 查询参数
+      queryParams: {
+        page: 1,
+        pageSize: 10,
+        realName: '',
+        mobile: '',
+        status: ''
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getDuty();
+    // this.getStoreList();
+  },
+  methods: {
+    showDesc(){
+      this.drawer = true;
+    },
+    handleNodeClick1(data) {
+      this.form.posPrem = JSON.stringify(data);
+    },
+    handleNodeClick2(data) {
+      this.form.appletPrem = JSON.stringify(data);
+    },
+    getCheckbox(){
+      this.form.writeOff = this.writeOff.toString();
+      this.form.specialPrem = this.specialPrem.toString();
+      this.form.auditPrem = this.auditPrem.toString();
+    },
+    // 页面跳转
+    toTarget(url) {
+      this.$router.push( { path: url } );
+    },
+    getName,
+    // 查询列表
+    getList() {
+      this.loading = true;
+      listStaff(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.list = response.data.records;
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 查询角色列表
+    getDuty(){
+      listDuty().then(response => {
+        this.roleList = response.data
+      })
+    },
+    // 店铺列表
+    getStoreList() {
+      listStaff().then(response => {
+          this.storeOptions = response.data.records;
+        }
+      );
+    },
+    // 搜索按钮操作
+    handleQuery() {
+      this.queryParams.page = 1;
+      this.getList();
+    },
+    // 重置按钮操作
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.handleQuery();
+    },
+    // 状态修改
+    handleStatusChange(row) {
+      let text = row.auditedStatus == "A" ? "启用" : "禁用";
+      this.$modal.confirm('确认要' + text + '"' + row.realName + '"吗？').then(function() {
+        // return updateStaffStatus(row.id, row.auditedStatus);
+        return updateStaff({id:row.id, auditedStatus:row.auditedStatus})
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.auditedStatus = row.auditedStatus === "A" ? "A" : "N";
+      });
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.operId)
+      this.multiple = !selection.length
+    },
+    // 排序触发事件
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    // 表单重置
+    reset() {
+      this.posPrem = '';
+      this.appletPrem = '';
+      this.writeOff = [];
+      this.auditPrem = [];
+      this.form = {
+        id:'', userId:'', mobile:'', realName:'', wechat:'', merchantId:'', storeId:'', auditedStatus:'A',
+        auditedTime:'', description:'', isRefuel:'yc', handoverMode:'dqmdtyjb', handoverPrem:'yqx', handoverOut:'jbtc', record:'qbjl',
+        merchantStatus:'qy',screen:'qy', posPrem:'', appletPrem:'', notice:'advice_jy', oilGunId:'', timeFrame:'bx', refund:'yqx',
+        transaction:'qbjy', writeOff:'',auditPrem:'',specialPrem:'', official:'', status:'qy',pos:'jy',roleId:''
+      };
+      this.resetForm("form");
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    handleRowClick(row) {
+      this.$refs.tables.clearSelection(); // 清除当前选中的行
+      this.$refs.tables.toggleRowSelection(row); // 选中当前点击的行
+      // 处理选中的行数据
+      let file = {
+        mtStaffId: row.id,
+        realName: row.realName,
+        staffMobile: row.mobile,
+      }
+      this.$emit('send-data', file);
+    },
+
+  }
+};
+</script>
+
+<style scoped>
+.app-container{
+  width: 100%;
+  height: 100%;
+  background: #f6f8f9;
+}
+.pagin-box{
+  background: white;
+  box-sizing: border-box;
+  padding: 20px;
+}
+.baoguo{
+  background: white;
+  box-sizing: border-box;
+  padding: 20px;
+  margin-bottom: 20px;
+}
+</style>

fuintCashierWeb/src/views/details/index.vue

@@ -884,8 +884,10 @@ import {ljStoreInfo} from "@/api/cashier/user/store";
 import {getDicts} from "@/api/dict/data";
 import {getList,getCountOilTypeApi,getCardValueListApi,getPrepaidCardTopUpApi,getCheckTheStatusOfYourPaymentApi,getPrepaidFuelTopUpApi,getCheckTheStatusOfYourPaymentByFuelApi} from "@/api/cashier/cardSet";
 import BigNumber from 'bignumber.js';
+import SelectStaff from "@/components/local/selectStaff";
 
 export default {
+  components: {SelectStaff},
   computed: {
     item() {
       return item
@@ -1195,18 +1197,24 @@ export default {
     },
     handleDataFromChild(data) {
       this.openStaff = false
-      this.cardFuelDieselForm= {
-        mtStaffId: data.mtStaffId,
-        realName: data.realName,
-        staffMobile: data.staffMobile,
-      },
+      // this.cardFuelDieselForm= {
+      //   mtStaffId: data.mtStaffId,
+      //   realName: data.realName,
+      //   staffMobile: data.staffMobile,
+      // },
+      // this.cardValueForm = {
+      //   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
 
     },
     // 查询参加存油卡油品
@@ -1216,7 +1224,6 @@ export default {
         if (this.oilTypeList.length > 0) {
           // 默认选中第一个
           this.tabOilType = this.oilTypeList[0].oilType
-          console.log("this.oilTypeList[0].status",this.oilTypeList[0].status)
           this.selectOilType(this.oilTypeList[0].status,this.oilTypeList[0].oilType);
         }
       })
@@ -1312,6 +1319,7 @@ export default {
       this.realyPayBills = file.rechargeBalance
       console.log("this.cardFuelDieselList[index]",this.cardFuelDieselList[index])
       console.log("this.cardFuelDieselForm[index]",this.cardFuelDieselForm)
+      console.log("file",file)
     },
 
     async collection(){