bugfix:卡务操作-错扣补款；

src/api/consumption/XfConsumeDetail/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { XfConsumeDetailVO, XfConsumeDetailForm, XfConsumeDetailQuery } from '@/api/consumption/XfConsumeDetail/types';
+import { XfConsumeDetailVO, XfConsumeDetailForm, XfConsumeDetailQuery, XfConsumeDetailCKBKVO } from '@/api/consumption/XfConsumeDetail/types';
 
 /**
  * 查询消费明细列表
@@ -15,6 +15,19 @@ export const listXfConsumeDetail = (query?: XfConsumeDetailQuery): AxiosPromise<
   });
 };
 
+/**
+ * 查询消费明细列表 for 错扣补款
+ * @param query
+ * @returns {*}
+ */
+export const listXfConsumeDetailCKBK = (query?: XfConsumeDetailQuery): AxiosPromise<XfConsumeDetailCKBKVO[]> => {
+  return request({
+    url: '/backstage/consumption/xfConsumeDetail/listCKBK',
+    method: 'get',
+    params: query
+  });
+};
+
 /**
  * 查询消费明细详细
  * @param consumeId

src/api/consumption/XfConsumeDetail/types.ts

@@ -165,6 +165,8 @@ export interface XfConsumeDetailVO {
    * 备注
    */
   remark: string;
+
+  detailId: string;
 }
 
 export interface XfConsumeDetailForm extends BaseEntity {
@@ -451,3 +453,174 @@ export interface XfConsumeDetailQuery extends PageQuery {
    */
   params?: any;
 }
+
+export interface XfConsumeDetailCKBKVO {
+  /**
+   * 消费记录Id,主键
+   */
+  consumeId: string;
+
+  /**
+   * 原始记录Id,主键
+   */
+  originalId: string;
+
+  /**
+   * 记录Id
+   */
+  recordId: string | number;
+
+  /**
+   * 人员Id
+   */
+  userId: string | number;
+
+  /**
+   * 学/工号
+   */
+  userNumb: string;
+
+  /**
+   * 用户姓名
+   */
+  realName: string;
+
+  /**
+   * 部门Id
+   */
+  deptId: string | number;
+
+  /**
+   * 部门名称
+   */
+  deptName: string;
+
+  /**
+   * 消费日期
+   */
+  consumeDate: string;
+
+  /**
+   * 消费金额
+   */
+  consumeMoney: Decimal;
+
+  /**
+   * 卡流水号
+   */
+  cardNo: number;
+
+  /**
+   * 物理卡号
+   */
+  factoryId: string | number;
+
+  /**
+   * 卡上余额
+   */
+  cardValue: number;
+
+  /**
+   * 卡使用次数
+   */
+  cardCount: number;
+
+  /**
+   * 消费账户金额
+   */
+  consumeBalance: number;
+
+  /**
+   * 设备机号
+   */
+  termNo: number;
+
+  /**
+   * 设备名称
+   */
+  termName: string;
+
+  /**
+   * 机器流水号
+   */
+  termRecordId: string | number;
+
+  /**
+   * 是否已处理(和灰记录处理有关)
+   */
+  analysisFlag: number;
+
+  /**
+   * 状态标识（记录消费类型？）
+   */
+  statusFlag: number;
+
+  /**
+   * 营业员Id
+   */
+  operatorId: string | number;
+
+  /**
+   * 营业员名称
+   */
+  operatorName: string;
+
+  /**
+   * 结算账户Id
+   */
+  accountId: string | number;
+
+  /**
+   * 结算账户名称
+   */
+  accountName: string;
+
+  /**
+   * 房间Id
+   */
+  roomId: string | number;
+
+  /**
+   * 房间名称
+   */
+  roomName: string;
+
+  /**
+   * 钱包类型
+   */
+  bagType: string;
+
+  /**
+   * 餐类Id
+   */
+  mealType: number;
+
+  /**
+   * 餐类名称
+   */
+  mealName: string;
+
+  /**
+   * 是否发送短信,见 sys_yes_no字典类别
+   */
+  smsSend: string;
+
+  /**
+   * 消费记录标志位?
+   */
+  recordStatus: number;
+
+  /**
+   * 同步标志，0-未同步,1-已同步
+   */
+  syncStatus: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  detailId: string;
+
+  details: XfConsumeDetailVO[];
+}

src/views/cardCenter/cardOperation/ptCard/ErrorFillForm.vue

@@ -62,6 +62,23 @@
           highlight-current-row
           @current-change="handleCurrentChange"
         >
+          <el-table-column type="expand">
+            <template #default="props">
+              <div m="4">
+                <h3>错扣补款列表</h3>
+                <el-table :data="props.row.details" :border="true">
+                  <el-table-column label="补款时间" prop="consumeDate" />
+                  <!-- <el-table-column label="补款时间" prop="consumeDate">
+                    <template #default="scope">
+                      <span>{{ parseTime(scope.row.consumeDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                    </template>
+                  </el-table-column> -->
+                  <el-table-column label="补款金额" prop="consumeMoney" />
+                  <el-table-column label="操作人" prop="operatorName" />
+                </el-table>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column label="序列号" type="index" width="100" />
           <el-table-column label="消费时间" align="center" prop="consumeDate" width="250">
             <template #default="scope">
@@ -142,7 +159,7 @@
 <script setup name="RecompenseForm" lang="ts">
 import * as api from '@/api/consumption/XfConsumeDetail';
 import { dayjs, ElTable } from 'element-plus';
-import { XfConsumeDetailForm, XfConsumeDetailVO } from '@/api/consumption/XfConsumeDetail/types';
+import { XfConsumeDetailCKBKVO, XfConsumeDetailForm, XfConsumeDetailVO } from '@/api/consumption/XfConsumeDetail/types';
 import Decimal from 'decimal.js';
 import useUserStore from '@/store/modules/user';
 import { QuestionFilled } from '@element-plus/icons-vue';
@@ -207,7 +224,7 @@ const loading = ref(false);
 // 是否显示查询项
 const showSearch = ref(true);
 // 消费明细列表
-const xfConsumeDetailList = ref<XfConsumeDetailVO[]>([]);
+const xfConsumeDetailList = ref<XfConsumeDetailCKBKVO[]>([]);
 // 总记录数
 const total = ref(0);
 const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
@@ -270,7 +287,7 @@ const cleaConsumeRange = () => {
 const getList = async () => {
   resetForm();
   loading.value = true;
-  const res = await api.listXfConsumeDetail(proxy?.addDateRange(queryParams, dateRange.value));
+  const res = await api.listXfConsumeDetailCKBK(proxy?.addDateRange(queryParams, dateRange.value));
   xfConsumeDetailList.value = res.rows;
   total.value = res.total;
   loading.value = false;
@@ -287,7 +304,7 @@ const resetQuery = () => {
   handleQuery();
 };
 // 单选选中
-const handleCurrentChange = (val: XfConsumeDetailVO | undefined) => {
+const handleCurrentChange = (val: XfConsumeDetailCKBKVO | undefined) => {
   if (val) {
     Object.assign(formData.value, val);
     const bag: DictDataOption = CARDBAGTYPE.value.find((p: DictDataOption) => p.value == formData.value.bagType);
@@ -347,6 +364,17 @@ const submitForm = async () => {
       proxy?.$modal.alertWarning('补款金额不能大于消费金额！');
       return;
     }
+    // 所有的补款金额之和不能大于消费金额
+    let totalValue = new Decimal(0);
+    for (const item of currentRow.value.details) {
+      totalValue = totalValue.sub(new Decimal(item.consumeMoney));
+    }
+    totalValue = totalValue.add(operatorValue);
+    console.log(totalValue, operatorValue, 'totalValue');
+    if (totalValue.comparedTo(consumeValue) === 1) {
+      proxy?.$modal.alertWarning('所有的补款金额之和不能大于消费金额！');
+      return;
+    }
     data.operatorId = useUserStore().userId;
     data.operatorName = useUserStore().realName;
     await api.recompenseConsumeDetail(data).then((res) => {

src/views/cardCenter/cardOperation/ptCard/index.vue

@@ -155,7 +155,7 @@
                 <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="90">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
               <template #default="scope">
                 <el-tooltip content="卡片信息" placement="top">
                   <el-button