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

zhengyiming

3 天以前 1d839bd0fca331b565deb640bbec0c85e3711791

 src/views/ServiceChargeManage/ServiceChargeDetail.vue

@@ -1,6 +1,6 @@
<template>
  <LoadingLayout :loading="isLoading">
    <AppScrollContainer>
    <AppContainer>
      <ChunkCell title="结算单详情">
        <ProForm :model="form" ref="formRef" label-width="120px" :is-read="true">
          <ProFormCol>
@@ -10,22 +10,21 @@
              </ProFormItemV2>
            </ProFormColItem>
            <ProFormColItem :span="8">
              <ProFormItemV2 label="任务编号:" prop="name">
                <ProFormText v-model="form.name"> </ProFormText>
              <ProFormItemV2 label="任务编号:" prop="code">
                <ProFormText v-model="form.code"> </ProFormText>
              </ProFormItemV2>
            </ProFormColItem>
            <ProFormColItem :span="8"></ProFormColItem>
          </ProFormCol>
          <ProFormCol>
            <ProFormColItem :span="8">
              <ProFormItemV2 label="结算单名称:" prop="name">
                <ProFormText v-model="form.name"> </ProFormText>
              <ProFormItemV2 label="结算单名称:" prop="settlementOrderName">
                <ProFormText v-model="form.settlementOrderName"> </ProFormText>
              </ProFormItemV2>
            </ProFormColItem>
            <ProFormColItem :span="8">
              <ProFormItemV2 label="上传时间:" prop="name">
              <ProFormItemV2 label="上传时间:" prop="settlementOrderTime">
                <ProFormDatePicker
                  v-model="form.name"
                  v-model="form.settlementOrderTime"
                  type="date"
                  format="YYYY-MM-DD HH:mm"
                ></ProFormDatePicker>
@@ -34,13 +33,15 @@
          </ProFormCol>
          <ProFormCol>
            <ProFormColItem :span="8">
              <ProFormItemV2 label="结算金额:" prop="money">
                <ProFormInputNumber v-model="form.money"> </ProFormInputNumber>
              <ProFormItemV2 label="结算金额:" prop="settlementAmount">
                <ProFormInputNumber v-model="form.settlementAmount" format-value="money">
                </ProFormInputNumber>
              </ProFormItemV2>
            </ProFormColItem>
            <ProFormColItem :span="8">
              <ProFormItemV2 label="实发金额:" prop="money">
                <ProFormInputNumber v-model="form.money"> </ProFormInputNumber>
              <ProFormItemV2 label="实发金额:" prop="actualSettlementAmount">
                <ProFormInputNumber v-model="form.actualSettlementAmount" format-value="money">
                </ProFormInputNumber>
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
@@ -68,7 +69,7 @@
          </el-steps>
        </div>
      </ChunkCell> -->
      <ChunkCell title="结算名单">
      <ChunkCell title="结算名单" style="flex: 1">
        <ProTableQueryFilterBar @on-reset="reset">
          <template #query>
            <QueryFilterItem>
@@ -85,7 +86,7 @@
        <ProTableV2
          v-bind="proTableProps"
          :columns="SettlementListColumns"
          :operationBtns="operationBtns"
          :show-operation-column="false"
          :auto-height="false"
          ref="proTable"
          :tableProps="{
@@ -93,14 +94,25 @@
          }"
        >
        </ProTableV2>
        <div class="chuck-add-or-edit-actions">
          <el-button class="chuck-add-or-edit-actions" @click="handleBack">取消</el-button>
          <el-button
            v-if="!isDetail"
            class="chuck-add-or-edit-actions"
            type="primary"
            @click="handleSubmit"
            >确认</el-button
          >
        </div>
      </ChunkCell>
    </AppScrollContainer>
    </AppContainer>
    <EditAccountInfoDialog v-bind="dialogProps"></EditAccountInfoDialog>
  </LoadingLayout>
</template>
<script setup lang="ts">
import {
  LoadingLayout,
  AppContainer,
  AppScrollContainer,
  ChunkCell,
  ProForm,
@@ -110,27 +122,28 @@
  ProFormColItem,
  ProFormDatePicker,
  ProFormInputNumber,
  ProFormRadio,
  useTable,
  ProTableV2,
  defineOperationBtns,
  SearchInput,
  QueryFilterItem,
  ProTableQueryFilterBar,
  TextOverTooltip,
  useFormDialog,
} from '@bole-core/components';
import { Edit, Upload } from '@element-plus/icons-vue';
import { SettlementListColumns } from './constants';
import { useQuery } from '@tanstack/vue-query';
import { downloadFileByUrl } from '@bole-core/core';
import * as taskServices from '@/services/api/task';
import * as taskUserServices from '@/services/api/taskUser';
import EditAccountInfoDialog from './components/EditAccountInfoDialog.vue';
import { Message } from '@bole-core/core';
import { paginateList, setOssFileName, toThousand } from '@/utils';

defineOptions({
  name: 'ServiceChargeDetail',
});

const { closeViewPush } = useRouteView();
const eventContext = useGlobalEventContext();
const operationBtns = defineOperationBtns([
  {
    data: {
@@ -145,26 +158,37 @@

const route = useRoute();
const id = (route.params.id as string) ?? '';
const url = (route.query.url as string) ?? '';

const isDetail = computed(() => !url);

const form = reactive({
  name: '',
  money: 0,
  status: 1,
  settlementAmount: 0,
  actualSettlementAmount: 0,
  code: '',
  settlementOrderName: '',
  settlementOrderTime: '',
});

const { isLoading } = useQuery({
  queryKey: ['taskServices/getTaskInfo', id],
  queryKey: ['taskServices/getSettlementTask', id],
  queryFn: async () => {
    return await taskServices.getTaskInfo(
    return await taskServices.getSettlementTask(
      { id: id },
      {
        showLoading: false,
      }
    );
  },
  placeholderData: () => ({} as API.GetTaskInfoQueryResult),
  placeholderData: () => ({} as API.GetSettlementTaskQueryResult),
  onSuccess(data) {
    form.name = data.name;
    form.settlementAmount = data.settlementAmount ?? 0;
    form.actualSettlementAmount = data.actualSettlementAmount ?? 0;
    form.code = data.code;
    form.settlementOrderName = setOssFileName(data.settlementOrderName);
    form.settlementOrderTime = data.settlementOrderTime ?? '';
  },
  enabled: !!id,
});
@@ -178,17 +202,28 @@
} = useTable(
  async ({ pageIndex, pageSize }, extraParamState) => {
    try {
      let params: API.GetOpenTaskInfosQuery = {
      let params: API.APIgetSettlementTaskUsersParams = {
        taskInfoId: id,
        settlementOrderUrl: url,
      };
      let res = await taskUserServices.getSettlementTaskUsers(params);
      if (extraParamState.keywords) {
        res.data = res.data?.filter((item) => {
          return (
            item.name.includes(extraParamState.keywords) ||
            item.contactPhoneNumber.includes(extraParamState.keywords) ||
            item.identity.includes(extraParamState.keywords)
          );
        });
      }
      return Promise.resolve({
        pageModel: {
          rows: pageSize,
          page: pageIndex,
          orderInput: extraParamState.orderInput,
          totalCount: res.data.length,
        },
        keywords: extraParamState.keywords,
      };

      let res = await taskServices.getOpenTaskInfos(params);
      return res;
        data: paginateList(res.data, pageIndex, pageSize),
      });
    } catch (error) {
      console.log('error: ', error);
    }
@@ -198,8 +233,12 @@
      keywords: '',
      orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
    },
    queryKey: ['taskServices/getOpenTaskInfos'],
    columnsRenderProps: {},
    queryKey: ['taskUserServices/getSettlementTaskUsers'],
    columnsRenderProps: {
      settlementTime: { type: 'date' },
      settlementAmount: { type: 'money' },
      actualSettlementAmount: { type: 'money' },
    },
  }
);

@@ -222,6 +261,33 @@

async function handleAddOrEdit() {}

async function handleSubmit() {
  try {
    let params: API.SureTaskSettlementOrderCommand = {
      taskInfoId: id,
      settlementOrderUrl: url,
      taskInfoUsers:
        proTableProps.value.tableData?.length > 0
          ? proTableProps.value.tableData.map(
              (x) => ({ ...x } as API.SureTaskSettlementOrderCommandUser)
            )
          : [],
    };
    let res = await taskServices.sureTaskSettlementOrder(params);
    if (res) {
      Message.successMessage('操作成功');
      eventContext.emit('sureTaskSettlementOrder');
      handleBack();
    }
  } catch (error) {}
}

function handleBack() {
  closeViewPush(route, {
    name: 'ServiceChargeManageList',
  });
}

onMounted(() => {
  getList();
});