wupengfei
2025-09-16 36bbbf27de681da9bcf4cfc759f2cb948df5b302
feat: 接口对接
5个文件已修改
25002 ■■■■■ 已修改文件
pnpm-lock.yaml 24954 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/EmploymentManage/TaskManageList.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/ServiceChargeManage/ServiceChargeDetail.vue 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pnpm-lock.yaml
Diff too large
src/views/EmploymentManage/TaskManageList.vue
@@ -96,6 +96,10 @@
    emits: {
      onClick: (role) => goAddOrEdit(role),
    },
    extraProps:{
      hide: (row: API.GetTaskInfosQueryResultItem) =>
        row.status === EnumTaskStatus.Complete
    }
  },
  {
    data: {
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
@@ -70,6 +70,7 @@
          <ProFormCol>
            <ProFormColItem :span="12" class="settlement-cycle-date-form-item">
              <ProFormItemV2
                v-if="form.settlementCycle !== EnumSettlementCycle.Day"
                label="结算日期:"
                prop="settlementCycle"
                :check-rules="[{ message: '请选择结算日期' }]"
@@ -261,6 +262,7 @@
  EnumSettlementCycleDateText,
  EnumSettlementCycleDateMonthArray,
  EnumSettlementCycleDateWeekArray,
  EnumSettlementCycle,
} from '@/constants';
import { format, FormValidator } from '@/utils';
import dayjs from 'dayjs';
@@ -391,7 +393,7 @@
      billingMethod: form.billingMethod,
      serviceFee: form.serviceFee,
      settlementCycle: form.settlementCycle,
      settlementDate: form.settlementDate,
      settlementDate: form.settlementDate ? form.settlementDate : 0,
      benefits: form.benefits,
      ageMinLimit: form.ageMinLimit,
      ageMaxLimit: form.ageMaxLimit,
src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -134,7 +134,14 @@
import EditAccountInfoDialog from './components/EditAccountInfoDialog.vue';
import SettleDetailDialog from './components/SettleDetailDialog.vue';
import { Message } from '@bole-core/core';
import { downloadFile, paginateList, setOssFileName, toThousand } from '@/utils';
import {
  downloadFile,
  downloadFileByUrl,
  paginateList,
  setOssFileName,
  setOSSLink,
  toThousand,
} from '@/utils';
import _ from 'lodash';
defineOptions({
@@ -152,12 +159,14 @@
    emits: {
      onClick: (role) => openDialog(role),
    },
    extraProps: {
      hide: () => !isSettlement.value,
    },
  },
]);
const route = useRoute();
const id = (route.params.id as string) ?? '';
const settlement = (route.query.settlement as string) ?? '';
const isSettlement = computed(() => !!settlement);
const form = reactive({
@@ -178,7 +187,7 @@
const state = reactive({ ...BaseState });
const { isLoading } = useQuery({
const { isLoading, refetch } = useQuery({
  queryKey: ['taskUserServices/getSettlementTaskUsers', id],
  queryFn: async () => {
    return await taskUserServices.getSettlementTaskUsers(
@@ -196,8 +205,8 @@
      form.settlementAmount = res?.detail?.settlementAmount ?? 0;
      form.actualSettlementAmount = res?.detail?.actualSettlementAmount ?? 0;
      form.code = res?.detail?.code;
      form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
      form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
      // form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
      // form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
    }
    // if (res?.errors?.length > 0) {
    //   Message.tipMessage('存在导入错误的数据,是否导出?').then(() => {
@@ -307,6 +316,7 @@
    let res = await taskServices.editTaskSettlementOrderRoster(params);
    if (res) {
      Message.successMessage('操作成功');
      refetch();
      getList(paginationState.pageIndex);
    }
  } catch (error) {}
@@ -327,6 +337,7 @@
    let res = await taskServices.importTaskSettlementOrderRosters(params);
    if (res) {
      Message.successMessage('操作成功');
      refetch();
      getList(paginationState.pageIndex);
      if (res?.errors?.length > 0) {
        Message.tipMessage('存在导入错误的数据,是否导出?').then(() => {
@@ -399,22 +410,17 @@
const handleExport = _.debounce(
  async () => {
    // if (paginationState.total === 0) {
    //   Message.warnMessage('没有数据可以导出哦~');
    //   return;
    // }
    if (paginationState.total === 0) {
      Message.warnMessage('没有数据可以导出哦~');
      return;
    }
    try {
      let params: API.ExportTaskSettlementOrderRostersCommand = {
        id: id,
      };
      let res = await taskServices.exportTaskSettlementOrderRosters(params, {
        responseType: 'blob',
        getResponse: true,
      });
      let res = await taskServices.exportTaskSettlementOrderRosters(params);
      if (res) {
        console.log('res: ', res);
        //@ts-ignore
        downloadFile(res?.data, `${form.name}-${form.code}`, 'xlsx');
        downloadFileByUrl(setOSSLink(res), `${form.name}-${form.code}`);
      }
    } catch (error) {}
  },
src/views/ServiceChargeManage/components/EditAccountInfoDialog.vue
@@ -14,7 +14,7 @@
      <ProFormItemV2
        label="开户支行:"
        prop="bankBranch"
        :check-rules="[{ message: '请输入所属银行' }]"
        :check-rules="[{ message: '请输入开户支行' }]"
      >
        <ProFormText placeholder="请输入开户支行" v-model.trim="form.bankBranch"></ProFormText>
      </ProFormItemV2>