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>
@@ -34,12 +34,14 @@
          <ProFormCol>
            <ProFormColItem :span="8">
              <ProFormItemV2 label="结算金额:" prop="settlementAmount">
                <ProFormInputNumber v-model="form.settlementAmount"> </ProFormInputNumber>
                <ProFormInputNumber v-model="form.settlementAmount" format-value="money">
                </ProFormInputNumber>
              </ProFormItemV2>
            </ProFormColItem>
            <ProFormColItem :span="8">
              <ProFormItemV2 label="实发金额:" prop="actualSettlementAmount">
                <ProFormInputNumber v-model="form.actualSettlementAmount"> </ProFormInputNumber>
                <ProFormInputNumber v-model="form.actualSettlementAmount" format-value="money">
                </ProFormInputNumber>
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
@@ -67,7 +69,7 @@
          </el-steps>
        </div>
      </ChunkCell> -->
      <ChunkCell title="结算名单">
      <ChunkCell title="结算名单" style="flex: 1">
        <ProTableQueryFilterBar @on-reset="reset">
          <template #query>
            <QueryFilterItem>
@@ -84,7 +86,7 @@
        <ProTableV2
          v-bind="proTableProps"
          :columns="SettlementListColumns"
          :operationBtns="operationBtns"
          :show-operation-column="false"
          :auto-height="false"
          ref="proTable"
          :tableProps="{
@@ -93,19 +95,24 @@
        >
        </ProTableV2>
        <div class="chuck-add-or-edit-actions">
          <el-button @click="handleBack">取消</el-button>
          <el-button class="chuck-add-or-edit-actions" type="primary" @click="handleSubmit"
          <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,
@@ -129,7 +136,7 @@
import * as taskUserServices from '@/services/api/taskUser';
import EditAccountInfoDialog from './components/EditAccountInfoDialog.vue';
import { Message } from '@bole-core/core';
import { paginateList } from '@/utils';
import { paginateList, setOssFileName, toThousand } from '@/utils';

defineOptions({
  name: 'ServiceChargeDetail',
@@ -150,8 +157,10 @@
]);

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

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

const form = reactive({
  name: '',
@@ -175,11 +184,11 @@
  placeholderData: () => ({} as API.GetSettlementTaskQueryResult),
  onSuccess(data) {
    form.name = data.name;
    form.settlementAmount = data.settlementAmount;
    form.actualSettlementAmount = data.actualSettlementAmount;
    form.settlementAmount = data.settlementAmount ?? 0;
    form.actualSettlementAmount = data.actualSettlementAmount ?? 0;
    form.code = data.code;
    form.settlementOrderName = data.settlementOrderName;
    form.settlementOrderTime = data.settlementOrderTime;
    form.settlementOrderName = setOssFileName(data.settlementOrderName);
    form.settlementOrderTime = data.settlementOrderTime ?? '';
  },
  enabled: !!id,
});
@@ -199,7 +208,7 @@
      };
      let res = await taskUserServices.getSettlementTaskUsers(params);
      if (extraParamState.keywords) {
        res.data = res.data.filter((item) => {
        res.data = res.data?.filter((item) => {
          return (
            item.name.includes(extraParamState.keywords) ||
            item.contactPhoneNumber.includes(extraParamState.keywords) ||
@@ -225,7 +234,11 @@
      orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
    },
    queryKey: ['taskUserServices/getSettlementTaskUsers'],
    columnsRenderProps: {},
    columnsRenderProps: {
      settlementTime: { type: 'date' },
      settlementAmount: { type: 'money' },
      actualSettlementAmount: { type: 'money' },
    },
  }
);

@@ -253,7 +266,12 @@
    let params: API.SureTaskSettlementOrderCommand = {
      taskInfoId: id,
      settlementOrderUrl: url,
      taskInfoUsers: [],
      taskInfoUsers:
        proTableProps.value.tableData?.length > 0
          ? proTableProps.value.tableData.map(
              (x) => ({ ...x } as API.SureTaskSettlementOrderCommandUser)
            )
          : [],
    };
    let res = await taskServices.sureTaskSettlementOrder(params);
    if (res) {