feat: 1.2.0.1

wupengfei

6 天以前 02aa28ba50c16658edfaff2e2e8ff19b355ab8f1

 src/views/ServiceChargeManage/ServiceChargeDetail.vue

@@ -89,13 +89,26 @@
        >
        </ProTableV2>
        <div class="chuck-add-or-edit-actions">
          <el-button class="chuck-add-or-edit-actions" @click="handleBack">取消</el-button>
          <el-button class="chuck-add-or-edit-actions" @click="handleBack"
            >取消{{ !form.auditStatus
            }}{{ form.auditStatus !== EnumTaskSettlementAuditStatus.Pass }}</el-button
          >
          <el-button
            v-if="isSettlement"
            v-if="
              isSettlement &&
              (!form.auditStatus || form.auditStatus !== EnumTaskSettlementAuditStatus.Pass)
            "
            class="chuck-add-or-edit-actions"
            type="primary"
            @click="handleSubmit()"
            >结算</el-button
            >结算申请</el-button
          >
          <el-button
            v-if="isSettlement && form.auditStatus === EnumTaskSettlementAuditStatus.Pass"
            class="chuck-add-or-edit-actions"
            type="primary"
            @click="handleSubmit()"
            >提交结算</el-button
          >
        </div>
      </ChunkCell>
@@ -134,7 +147,7 @@
import EditAccountInfoDialog from './components/EditAccountInfoDialog.vue';
import SettleDetailDialog from './components/SettleDetailDialog.vue';
import { Message } from '@bole-core/core';
import { SettlementReceiveStatusText } from '@/constants';
import { SettlementReceiveStatusText, EnumTaskSettlementAuditStatus } from '@/constants';
import {
  downloadFile,
  downloadFileByUrl,
@@ -168,7 +181,7 @@
const route = useRoute();
const id = (route.params.id as string) ?? '';
const settlement = (route.query.settlement as string) ?? '';
const settlementAccess = route.query.settlementAccess ?? '';
// const settlementAccess = route.query.settlementAccess ?? '';
const isSettlement = computed(() => !!settlement);

const form = reactive({
@@ -181,6 +194,11 @@
  settlementTaskUsers: [] as API.GetSettlementTaskUsersQueryResultItem[],

  settlementUrl: [] as UploadUserFile[],

  settlementAccess: '' as any as EnumEnterpriseWalletAccess,
  isSettlement: isSettlement.value,

  auditStatus: '' as any as EnumTaskSettlementAuditStatus,
});

const BaseState = {
@@ -190,13 +208,16 @@
const state = reactive({ ...BaseState });

const { isLoading, refetch } = useQuery({
  queryKey: ['taskUserServices/getSettlementTaskUsers', id, settlementAccess],
  queryKey: ['taskUserServices/getSettlementTaskUsers', id, toRef(form, 'isSettlement')],
  queryFn: async () => {
    let params: API.APIgetSettlementTaskUsersParams = {
      id: id,
    };
    if (settlementAccess) {
      params.settlementAccess = Number(settlementAccess);
    // if (form.settlementAccess) {
    //   params.settlementAccess = Number(form.settlementAccess);
    // }
    if (form.isSettlement) {
      params.isImport = true;
    }
    return await taskUserServices.getSettlementTaskUsers(params, {
      showLoading: false,
@@ -210,6 +231,8 @@
      form.settlementAmount = res?.detail?.settlementAmount ?? 0;
      form.actualSettlementAmount = res?.detail?.actualSettlementAmount ?? 0;
      form.code = res?.detail?.code;
      form.settlementAccess = res?.detail?.settlementAccess;
      form.auditStatus = res?.detail?.auditStatus;
      // form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
      // form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
    }
@@ -292,6 +315,8 @@
    actualSettlementAmount: null as number,
    receiveAccount: '',
    bank: '',
    totalWorkHours: null as number,
    settlementAccess: form.settlementAccess,
    // bankBranch: '',
  },
});
@@ -304,6 +329,8 @@
      actualSettlementAmount: row?.actualSettlementAmount ?? null,
      receiveAccount: row?.receiveAccount ?? '',
      bank: row?.bank ?? '',
      totalWorkHours: row?.totalWorkHours ?? null,
      settlementAccess: form.settlementAccess,
      // bankBranch: row?.bankBranch ?? '',
    });
  }
@@ -317,11 +344,13 @@
      actualSettlementAmount: editForm.actualSettlementAmount,
      receiveAccount: editForm.receiveAccount,
      bank: editForm.bank,
      totalWorkHours: editForm.totalWorkHours,
      // bankBranch: editForm.bankBranch,
    };
    let res = await taskServices.editTaskSettlementOrderRoster(params);
    if (res) {
      Message.successMessage('操作成功');
      form.isSettlement = false;
      refetch();
      getList(paginationState.pageIndex);
    }
@@ -343,6 +372,7 @@
    let res = await taskServices.importTaskSettlementOrderRosters(params);
    if (res) {
      Message.successMessage('操作成功');
      form.isSettlement = false;
      refetch();
      getList(paginationState.pageIndex);
      if (res?.errors?.length > 0) {
@@ -378,6 +408,7 @@
    code: form.code,
    settlementUserCount: form.settlementTaskUsers.length,
    actualSettlementAmount: form.actualSettlementAmount,
    settlementAccess: form.settlementAccess,
  });
}

@@ -393,6 +424,7 @@
    code: '',
    settlementUserCount: 0,
    actualSettlementAmount: 0,
    settlementAccess: '' as any as EnumEnterpriseWalletAccess,
  },
});