合并代码

gaoluyang

6 小时以前 07f9f8657d057a38792c3822acc9b08d83478967

 src/views/financialManagement/revenueManagement/index.vue

@@ -3,22 +3,22 @@
    <el-form :model="filters" :inline="true">
      <el-form-item label="收入日期:">
        <el-date-picker v-model="filters.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
                        placeholder="请选择" clearable @change="changeDaterange" />
                        placeholder="请选择" clearable @change="changeDaterange"/>
      </el-form-item>
      <el-form-item label="收款方式:">
        <el-select
                v-model="filters.incomeMethod"
                placeholder="请选择"
                clearable
                style="width: 200px;"
              >
                <el-option
                  v-for="item in payment_methods"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            v-model="filters.incomeMethodLabel"
            placeholder="请选择"
            clearable
            style="width: 200px;"
        >
          <el-option
              v-for="item in incomeMethodOptions"
              :key="item.value"
              :label="item.label"
              :value="item.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" @click="getTableData">搜索</el-button>
@@ -29,46 +29,51 @@
      <div class="actions">
        <div></div>
        <div>
          <el-button type="primary" @click="add" icon="Plus"> 新增 </el-button>
          <el-button type="primary" @click="add" icon="Plus"> 新增</el-button>
          <el-button @click="handleOut" icon="download">导出</el-button>
          <el-button
            type="danger"
            icon="Delete"
            :disabled="multipleList.length <= 0 || hasBusinessIdInSelection"
            @click="handleBatchDelete"
              type="danger"
              icon="Delete"
              :disabled="multipleList.length <= 0 || hasBusinessIdInSelection"
              @click="handleBatchDelete"
          >
            批量删除
          </el-button>
        </div>
      </div>
      <PIMTable
        rowKey="id"
        isSelection
        :column="columns"
        :tableData="dataList"
        :page="{
          rowKey="id"
          isSelection
          :column="columns"
          :tableData="dataList"
          :page="{
          current: pagination.currentPage,
          size: pagination.pageSize,
          total: pagination.total,
        }"
        :isShowSummary="true"
        :summaryMethod="summarizeMainTable"
        @selection-change="handleSelectionChange"
        @pagination="changePage"
          :isShowSummary="true"
          :summaryMethod="summarizeMainTable"
          @selection-change="handleSelectionChange"
          @pagination="changePage"
      >
        <template #incomeMethodSlot="{ row }">
          <el-tag>
            {{ getIncomeMethodLabel(row) }}
          </el-tag>
        </template>
        <template #operation="{ row }">
          <el-button 
            type="primary" 
            link 
            :disabled="!!row.businessId"
            @click="edit(row.id)"
          <el-button
              type="primary"
              link
              :disabled="!!row.businessId"
              @click="edit(row.id)"
          >
            编辑
          </el-button>
          <el-button
            type="primary"
                  link
            @click="openFilesFormDia(row)"
              type="primary"
              link
              @click="openFilesFormDia(row)"
          >
            附件
          </el-button>
@@ -76,27 +81,16 @@
      </PIMTable>
    </div>
    <Modal ref="modalRef" @success="getTableData"></Modal>
    <FileListDialog 
      ref="fileListRef" 
      v-model="fileListDialogVisible"
      :show-upload-button="true"
      :show-delete-button="true"
      :upload-method="handleUpload"
      :delete-method="handleFileDelete"
    />
    <FileListDialog v-if="fileListDialogVisible" :record-id="currentRecordId" record-type="account_income" v-model:visible="fileListDialogVisible"/>
  </div>
</template>

<script setup>
import { usePaginationApi } from "@/hooks/usePaginationApi";
import { listPage, delAccountIncome, fileListPage, fileAdd, fileDel } from "@/api/financialManagement/revenueManagement";
import { onMounted, getCurrentInstance, ref, computed } from "vue";
import Modal from "./Modal.vue";
import { ElMessageBox, ElMessage } from "element-plus";
import {usePaginationApi} from "@/hooks/usePaginationApi";
import {listPage, delAccountIncome} from "@/api/financialManagement/revenueManagement";
import {onMounted, getCurrentInstance, ref, computed} from "vue";
import {ElMessageBox, ElMessage} from "element-plus";
import dayjs from "dayjs";
import FileListDialog from "@/components/Dialog/FileListDialog.vue";
import request from "@/utils/request";
import { getToken } from "@/utils/auth";

defineOptions({
  name: "收入管理",
@@ -104,14 +98,27 @@

// 表格多选框选中项
const multipleList = ref([]);
const { proxy } = getCurrentInstance();
const {proxy} = getCurrentInstance();
const modalRef = ref();
const { payment_methods } = proxy.useDict("payment_methods");
const { income_types } = proxy.useDict("income_types");
const {payment_methods} = proxy.useDict("payment_methods");
const {receipt_payment_type} = proxy.useDict("receipt_payment_type");
const {income_types} = proxy.useDict("income_types");
const fileListRef = ref(null);
const fileListDialogVisible = ref(false);
const currentFileRow = ref(null);
const accountType = ref('收入');
const currentRecordId = ref(0);

const incomeMethodOptions = computed(() => {
  const merged = [...(payment_methods.value || []), ...(receipt_payment_type.value || [])];
  const uniqueMap = new Map();
  merged.forEach((item) => {
    const label = item?.label;
    if (!label) return;
    if (!uniqueMap.has(label)) {
      uniqueMap.set(label, {label, value: label});
    }
  });
  return Array.from(uniqueMap.values());
});

const {
  filters,
@@ -122,91 +129,99 @@
  resetFilters,
  onCurrentChange,
} = usePaginationApi(
  listPage,
  {
    incomeMethod: undefined,
    entryDate: undefined,
  },
  [
    listPage,
    {
      label: "收入日期",
      prop: "incomeDate",
      incomeMethodLabel: undefined,
      entryDate: undefined,
    },
    {
      label: "收入类型",
      prop: "incomeType",
      dataType: "tag",
      formatData: (params) => {
        if (income_types.value.find((m) => m.value == params)) {
          return income_types.value.find((m) => m.value == params).label;
        } else {
          return null
        }
    [
      {
        label: "收入日期",
        prop: "incomeDate",
      },
    },
    {
      label: "客户名称",
      prop: "customerName",
         width: '200'

    },
    {
      label: "收入金额",
      prop: "incomeMoney",

    },
    {
      label: "收入描述",
      prop: "incomeDescribed",

    },
    {
      label: "收款方式",
      prop: "incomeMethod",
         align: 'center',
         width: '100',
      dataType: "tag",
      formatData: (params) => {
        if (payment_methods.value.find((m) => m.value == params)) {
          return payment_methods.value.find((m) => m.value == params).label;
        } else {
          return null
        }
      {
        label: "收入类型",
        prop: "incomeType",
        dataType: "tag",
        formatData: (params) => {
          if (income_types.value.find((m) => m.value == params)) {
            return income_types.value.find((m) => m.value == params).label;
          } else {
            return null
          }
        },
      },
    },
    {
      label: "发票号码",
      prop: "invoiceNumber",
      {
        label: "客户名称",
        prop: "customerName",
        width: '200'

    },
    {
      label: "备注",
      prop: "note",
      },
      {
        label: "收入金额",
        prop: "incomeMoney",

    },
    {
      label: "录入人",
      prop: "inputUser",
    },
    {
      label: "录入日期",
      prop: "inputTime",
      },
      {
        label: "收入描述",
        prop: "incomeDescribed",

    },
      },
      {
        label: "收款方式",
        prop: "incomeMethodLabel",
        align: 'center',
        width: '100',
        dataType: "slot",
        slot: "incomeMethodSlot",
      },
      {
        label: "发票号码",
        prop: "invoiceNumber",

      },
      {
        label: "备注",
        prop: "note",

      },
      {
        label: "录入人",
        prop: "inputUser",
      },
      {
        label: "录入日期",
        prop: "inputTime",

      },
      {
        fixed: "right",
        label: "操作",
        dataType: "slot",
        slot: "operation",
        align: "center",
        width: "160px",
      },
    ],
    undefined,
    {
      fixed: "right",
      label: "操作",
      dataType: "slot",
      slot: "operation",
      align: "center",
      width: "160px",
    },
  ]
      incomeMethodLabel: (value) => ({
        incomeMethodLabel: value || undefined,
      }),
    }
);

// 表格合计：收入金额
const summarizeMainTable = (param) => {
  return proxy.summarizeTable(param, ["incomeMoney"]);
};

const getIncomeMethodLabel = (row) => {
  const methodValue = row?.incomeMethod;
  const dictList = String(row?.businessType) === "1"
      ? receipt_payment_type.value
      : payment_methods.value;
  return dictList.find((item) => item.value == methodValue)?.label || "--";
};

// 多选后做什么
@@ -231,9 +246,9 @@
  }
  modalRef.value.loadForm(id);
};
const changePage = ({ page, limit }) => {
const changePage = ({page, limit}) => {
  pagination.currentPage = page;
   pagination.pageSize = limit;
  pagination.pageSize = limit;
  onCurrentChange(page);
};
const deleteRow = (id) => {
@@ -255,13 +270,13 @@
      return;
    }
  }
  

  ElMessageBox.confirm("此操作将永久删除该数据, 是否继续?", "提示", {
    confirmButtonText: "确定",
    cancelButtonText: "取消",
    type: "warning",
  }).then(async () => {
    const { code } = await delAccountIncome(id);
    const {code} = await delAccountIncome(id);
    if (code == 200) {
      ElMessage({
        type: "success",
@@ -278,13 +293,13 @@
    proxy.$modal.msgWarning("请选择要删除的数据");
    return;
  }
  

  // 检查是否有 businessId
  if (hasBusinessIdInSelection.value) {
    proxy.$modal.msgWarning("选中的记录中包含已关联业务的记录，不能删除");
    return;
  }
  

  const ids = multipleList.value.map((item) => item.id);
  deleteRow(ids);
};
@@ -308,162 +323,17 @@
    cancelButtonText: "取消",
    type: "warning",
  })
    .then(() => {
      proxy.download(`/account/accountIncome/export`, {}, "收入台账.xlsx");
    })
    .catch(() => {
      proxy.$modal.msg("已取消");
    });
      .then(() => {
        proxy.download(`/account/accountIncome/export`, {}, "收入台账.xlsx");
      })
      .catch(() => {
        proxy.$modal.msg("已取消");
      });
};
// 打开附件弹框
const openFilesFormDia = async (row) => {
  currentFileRow.value = row;
  accountType.value = '收入';
  try {
    const res = await fileListPage({
      accountId: row.id,
      accountType: accountType.value,
      current: 1,
      size: 100
    });
    if (res.code === 200 && fileListRef.value) {
      // 将数据转换为 FileListDialog 需要的格式
      const fileList = (res.data?.records || []).map(item => ({
        name: item.name,
        url: item.url,
        id: item.id,
        ...item
      }));
      fileListRef.value.open(fileList);
      fileListDialogVisible.value = true;
    }
  } catch (error) {
    proxy.$modal.msgError("获取附件列表失败");
  }
};

// 上传附件
const handleUpload = async () => {
  if (!currentFileRow.value) {
    proxy.$modal.msgWarning("请先选择数据");
    return null;
  }
  
  return new Promise((resolve) => {
    // 创建一个隐藏的文件输入元素
    const input = document.createElement('input');
    input.type = 'file';
    input.style.display = 'none';
    input.onchange = async (e) => {
      const file = e.target.files[0];
      if (!file) {
        resolve(null);
        return;
      }
      
      try {
        // 使用 FormData 上传文件
        const formData = new FormData();
        formData.append('file', file);
        
        const uploadRes = await request({
          url: '/file/upload',
          method: 'post',
          data: formData,
          headers: {
            'Content-Type': 'multipart/form-data',
            Authorization: `Bearer ${getToken()}`
          }
        });
        
        if (uploadRes.code === 200) {
          // 保存附件信息
          const fileData = {
            accountId: currentFileRow.value.id,
            accountType: accountType.value,
            name: uploadRes.data.originalName || file.name,
            url: uploadRes.data.tempPath || uploadRes.data.url
          };
          
          const saveRes = await fileAdd(fileData);
          if (saveRes.code === 200) {
            proxy.$modal.msgSuccess("文件上传成功");
            // 重新加载文件列表
            const listRes = await fileListPage({
              accountId: currentFileRow.value.id,
              accountType: accountType.value,
              current: 1,
              size: 100
            });
            if (listRes.code === 200 && fileListRef.value) {
              const fileList = (listRes.data?.records || []).map(item => ({
                name: item.name,
                url: item.url,
                id: item.id,
                ...item
              }));
              fileListRef.value.setList(fileList);
            }
            // 返回新文件信息
            resolve({
              name: fileData.name,
              url: fileData.url,
              id: saveRes.data?.id
            });
          } else {
            proxy.$modal.msgError(saveRes.msg || "文件保存失败");
            resolve(null);
          }
        } else {
          proxy.$modal.msgError(uploadRes.msg || "文件上传失败");
          resolve(null);
        }
      } catch (error) {
        proxy.$modal.msgError("文件上传失败");
        resolve(null);
      } finally {
        document.body.removeChild(input);
      }
    };
    
    document.body.appendChild(input);
    input.click();
  });
};

// 删除附件
const handleFileDelete = async (row) => {
  try {
    const res = await fileDel([row.id]);
    if (res.code === 200) {
      proxy.$modal.msgSuccess("删除成功");
      // 重新加载文件列表
      if (currentFileRow.value && fileListRef.value) {
        const listRes = await fileListPage({
          accountId: currentFileRow.value.id,
          accountType: accountType.value,
          current: 1,
          size: 100
        });
        if (listRes.code === 200) {
          const fileList = (listRes.data?.records || []).map(item => ({
            name: item.name,
            url: item.url,
            id: item.id,
            ...item
          }));
          fileListRef.value.setList(fileList);
        }
      }
      return true; // 返回 true 表示删除成功，组件会更新列表
    } else {
      proxy.$modal.msgError(res.msg || "删除失败");
      return false;
    }
  } catch (error) {
    proxy.$modal.msgError("删除失败");
    return false;
  }
  currentRecordId.value = row.id;
  fileListDialogVisible.value = true;
};

onMounted(() => {
@@ -475,6 +345,7 @@
.table_list {
  margin-top: unset;
}

.actions {
  display: flex;
  justify-content: space-between;