Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient

wupengfei

5 天以前 c41e0d0abff2a4b7b22ea1e276aa18493359c9c8

 src/views/ServiceChargeManage/ServiceChargeDetail.vue

@@ -1,6 +1,6 @@
<template>
  <LoadingLayout :loading="isLoading">
    <AppContainer>
    <AppScrollContainer>
      <ChunkCell title="结算单详情">
        <ProForm :model="form" ref="formRef" label-width="120px" :is-read="true">
          <ProFormCol>
@@ -84,22 +84,32 @@
          :auto-height="false"
          ref="proTable"
          :tableProps="{
            maxHeight: '250px',
            maxHeight: '400px',
          }"
        >
        </ProTableV2>
        <div class="chuck-add-or-edit-actions">
          <el-button class="chuck-add-or-edit-actions" @click="handleBack">取消</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>
    </AppContainer>
    </AppScrollContainer>
    <EditAccountInfoDialog v-bind="dialogProps"></EditAccountInfoDialog>
    <SettleDetailDialog v-bind="dialogSettleProps" />
  </LoadingLayout>
@@ -108,6 +118,7 @@
import {
  LoadingLayout,
  AppContainer,
  AppScrollContainer,
  ChunkCell,
  ProForm,
  ProFormItemV2,
@@ -134,7 +145,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 +179,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({
@@ -182,7 +193,10 @@

  settlementUrl: [] as UploadUserFile[],

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

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

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

const { isLoading, refetch } = useQuery({
  queryKey: ['taskUserServices/getSettlementTaskUsers', id, toRef(form, 'settlementAccess')],
  queryKey: ['taskUserServices/getSettlementTaskUsers', id, toRef(form, 'isSettlement')],
  queryFn: async () => {
    let params: API.APIgetSettlementTaskUsersParams = {
      id: id,
    };
    if (form.settlementAccess) {
      params.settlementAccess = Number(form.settlementAccess);
    // if (form.settlementAccess) {
    //   params.settlementAccess = Number(form.settlementAccess);
    // }
    if (form.isSettlement) {
      params.isImport = true;
    }
    return await taskUserServices.getSettlementTaskUsers(params, {
      showLoading: false,
@@ -212,6 +229,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 ?? '';
    }
@@ -295,7 +314,7 @@
    receiveAccount: '',
    bank: '',
    totalWorkHours: null as number,
    settlementAccess: '' as any as EnumEnterpriseWalletAccess,
    settlementAccess: form.settlementAccess,
    // bankBranch: '',
  },
});
@@ -308,8 +327,8 @@
      actualSettlementAmount: row?.actualSettlementAmount ?? null,
      receiveAccount: row?.receiveAccount ?? '',
      bank: row?.bank ?? '',
      totalWorkHours: null as number,
      settlementAccess: Number(form.settlementAccess),
      totalWorkHours: row?.totalWorkHours ?? null,
      settlementAccess: form.settlementAccess,
      // bankBranch: row?.bankBranch ?? '',
    });
  }
@@ -329,7 +348,7 @@
    let res = await taskServices.editTaskSettlementOrderRoster(params);
    if (res) {
      Message.successMessage('操作成功');
      form.settlementAccess = '';
      form.isSettlement = false;
      refetch();
      getList(paginationState.pageIndex);
    }
@@ -351,7 +370,7 @@
    let res = await taskServices.importTaskSettlementOrderRosters(params);
    if (res) {
      Message.successMessage('操作成功');
      form.settlementAccess = '';
      form.isSettlement = false;
      refetch();
      getList(paginationState.pageIndex);
      if (res?.errors?.length > 0) {
@@ -387,6 +406,7 @@
    code: form.code,
    settlementUserCount: form.settlementTaskUsers.length,
    actualSettlementAmount: form.actualSettlementAmount,
    settlementAccess: form.settlementAccess,
  });
}

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

@@ -465,6 +486,10 @@
    }
  }
}

.chuck-add-or-edit-actions {
  margin-bottom: 20px;
}
</style>
<style lang="scss">
.text-over-tooltip-content {