Merge branch 'dev-v1.1' of http://120.26.58.240:8888/r/flexJobAdminBClient ...

zhengyiming

2025-09-19 f393d0372b5ef06099a3591a4c77e61b48935a3b

 src/views/ServiceChargeManage/ServiceChargeManage.vue

@@ -3,10 +3,10 @@
    <AppContainer>
      <ProTableQueryFilterBar @on-reset="reset">
        <template #query>
          <QueryFilterItem tip-content="结算单状态">
          <QueryFilterItem tip-content="验收状态">
            <FieldRadio
              v-model="extraParamState.settlementOrderStatus"
              :value-enum="EnumTaskSettlementOrderStatusText"
              v-model="extraParamState.checkReceiveStatus"
              :value-enum="EnumTaskCheckReceiveStatusTextForFilter"
              buttonStyle
              showAllBtn
              @change="getList()"
@@ -21,7 +21,7 @@
              @change="getList()"
            />
          </QueryFilterItem>
          <!-- <QueryFilterItem>
          <QueryFilterItem>
            <FieldDatePicker
              v-model="extraParamState.time"
              type="daterange"
@@ -30,23 +30,23 @@
              end-placeholder="截止日期"
              clearable
              @change="getList()"
              tooltipContent="创建时间"
              tooltipContent="结算时间"
            ></FieldDatePicker>
          </QueryFilterItem> -->
          </QueryFilterItem>
          <QueryFilterItem>
            <SearchInput
              v-model="extraParamState.keywords"
              style="width: 250px"
              placeholder="任务名称"
              @on-click-search="getList"
              @on-click-search="getList()"
              @keyup.enter="getList()"
            >
            </SearchInput>
          </QueryFilterItem>
        </template>
        <template #btn>
          <el-button type="primary" link @click="handleDownloadTemplate()">结算单模板</el-button>
          <el-button type="primary" @click="handleAdd()">上传结算单</el-button>
          <!-- <el-button type="primary" link @click="handleDownloadTemplate()">结算单模板</el-button> -->
          <!-- <el-button type="primary" @click="handleAdd()">上传结算单</el-button> -->
          <!-- <el-button type="primary" @click="handleDownloadTemplate()">导出</el-button> -->
        </template>
      </ProTableQueryFilterBar>
@@ -55,7 +55,7 @@
        :columns="ServiceChargeManageColumns"
        :operationBtns="operationBtns"
      >
        <template #operationBtn-uploadBtn="{ row }">
        <!-- <template #operationBtn-uploadBtn="{ row }">
          <BlFileUpload
            v-model:file-url="editForm.settlementUrl"
            ref="uploadRef"
@@ -84,7 +84,7 @@
          >
            <el-button text type="primary" class="pro-table-operation-btn">重新上传</el-button>
          </BlFileUpload>
        </template>
        </template> -->
      </ProTableV2>
    </AppContainer>
    <UploadStatementDialog v-bind="dialogProps" />
@@ -115,8 +115,11 @@
  EnumTaskSettlementOrderStatusText,
  EnumTaskSettlementOrderStatus,
  EnumTaskSettlementStatus,
  EnumTaskCheckReceiveStatusText,
  EnumTaskCheckReceiveStatusTextForFilter,
  EnumTaskCheckReceiveStatus,
} from '@/constants';
import { downloadFileByUrl, setOssFileName } from '@/utils';
import { downloadFileByUrl, format, setOssFileName } from '@/utils';
import * as taskServices from '@/services/api/task';
import { ModelValueType } from 'element-plus';
import UploadStatementDialog from './components/UploadStatementDialog.vue';
@@ -129,42 +132,42 @@
});

const operationBtns = defineOperationBtns([
  {
    data: {
      enCode: 'uploadBtn',
      name: '上传',
    },
    extraProps: {
      hide: (row: API.GetSettlementTasksQueryResultItem) =>
        row.settlementOrderStatus !== EnumTaskSettlementOrderStatus.Wait,
    },
  },
  {
    data: {
      enCode: 'reUploadBtn',
      name: '重新上传',
    },
    extraProps: {
      hide: (row: API.GetSettlementTasksQueryResultItem) =>
        !(
          row.settlementOrderStatus === EnumTaskSettlementOrderStatus.Completed &&
          row.settlementStatus === EnumTaskSettlementStatus.Wait
        ),
    },
  },
  // {
  //   data: {
  //     enCode: 'uploadBtn',
  //     name: '上传',
  //   },
  //   extraProps: {
  //     hide: (row: API.GetSettlementTasksQueryResultItem) =>
  //       row.settlementOrderStatus !== EnumTaskSettlementOrderStatus.Wait,
  //   },
  // },
  // {
  //   data: {
  //     enCode: 'reUploadBtn',
  //     name: '重新上传',
  //   },
  //   extraProps: {
  //     hide: (row: API.GetSettlementTasksQueryResultItem) =>
  //       !(
  //         row.settlementOrderStatus === EnumTaskSettlementOrderStatus.Completed &&
  //         row.settlementStatus === EnumTaskSettlementStatus.Wait
  //       ),
  //   },
  // },
  {
    data: {
      enCode: 'settleBtn',
      name: '结算',
    },
    emits: {
      onClick: (role: API.GetSettlementTasksQueryResultItem) => openSettleDialog(role),
      onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role, 'settlement'),
    },
    extraProps: {
      hide: (role: API.GetSettlementTasksQueryResultItem) =>
        !(
          role.settlementOrderStatus === EnumTaskSettlementOrderStatus.Completed &&
          role.settlementStatus === EnumTaskSettlementStatus.Wait
          role.settlementStatus === EnumTaskSettlementStatus.Wait &&
          role.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed
        ),
    },
  },
@@ -178,7 +181,10 @@
    },
    extraProps: {
      hide: (role: API.GetSettlementTasksQueryResultItem) =>
        role.settlementStatus !== EnumTaskSettlementStatus.InProcess,
        !(
          role.settlementStatus === EnumTaskSettlementStatus.InProcess &&
          role.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed
        ),
    },
  },
  {
@@ -187,12 +193,12 @@
      name: '详情',
    },
    emits: {
      onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role.id),
      onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role),
    },
    extraProps: {
      hide: (role: API.GetSettlementTasksQueryResultItem) =>
        role.settlementOrderStatus === EnumTaskSettlementOrderStatus.Wait,
    },
    // extraProps: {
    //   hide: (role: API.GetSettlementTasksQueryResultItem) =>
    //     role.settlementOrderStatus === EnumTaskSettlementOrderStatus.Wait,
    // },
  },
  {
    data: {
@@ -245,8 +251,10 @@
          orderInput: extraParamState.orderInput,
        },
        keywords: extraParamState.keywords,
        settlementOrderStatus: extraParamState.settlementOrderStatus,
        checkReceiveStatus: extraParamState.checkReceiveStatus,
        settlementStatus: extraParamState.settlementStatus,
        settlementTimeBegin: format(extraParamState.time?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
        settlementTimeEnd: format(extraParamState.time?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
      };

      let res = await taskServices.getSettlementTasks(params, {
@@ -261,6 +269,7 @@
    defaultExtraParams: {
      keywords: '',
      settlementOrderStatus: '' as any as EnumTaskSettlementOrderStatus,
      checkReceiveStatus: '' as any as EnumTaskCheckReceiveStatus,
      settlementStatus: '' as any as EnumTaskSettlementStatus,
      time: [] as unknown as ModelValueType,
      orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
@@ -269,9 +278,11 @@
    columnsRenderProps: {
      settlementOrderStatus: { type: 'enum', valueEnum: EnumTaskSettlementOrderStatusText },
      settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
      checkReceiveStatus: { type: 'enum', valueEnum: EnumTaskCheckReceiveStatusText },
      actualSettlementAmount: { type: 'money' },
      settlementAmount: { type: 'money' },
      settlementTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
      createdTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
      settlementOrderTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
      settlementOrderName: {
        formatter: (row: API.GetSettlementTasksQueryResultItem) =>
@@ -292,7 +303,16 @@
});

async function handleAddOrEdit() {
  goDetail(editForm.id, editForm.settlementUrl[0]?.path);
  try {
    let params: API.ImportTaskSettlementOrderRostersCommand = {
      id: editForm.id,
      url: editForm.settlementUrl[0]?.path,
    };
    let res = await taskServices.importTaskSettlementOrderRosters(params);
    if (res) {
      goSettlementDetail(editForm.id, editForm.settlementUrl[0]?.path);
    }
  } catch (error) {}
}

const {
@@ -335,6 +355,7 @@
  editForm: rechargeEditForm,
} = useFormDialog({
  defaultFormParams: {
    access: EnumEnterpriseWalletAccess.Alipay,
    amount: null as number,
    remark: '',
  },
@@ -369,23 +390,32 @@
  row: API.GetSettlementTasksQueryResultItem
) {
  if (response.path) {
    goDetail(row.id, response.path);
    goSettlementDetail(row.id, response.path);
  }
}

async function goDetail(id: string, url?: string) {
async function goSettlementDetail(id: string, url?: string) {
  await router.push({
    name: 'ServiceChargeDetail',
    params: {
      id: id,
    },
    query: {
      url: url ? url : '',
    },
  });
  editForm.settlementUrl = [] as UploadUserFile[];
}

function goDetail(row: API.GetSettlementTasksQueryResultItem, settlement?: string) {
  router.push({
    name: 'ServiceChargeDetail',
    params: {
      id: row?.id ?? '',
    },
    query: {
      settlement: settlement ? settlement : '',
    },
  });
}

function handleExport(val) {
  console.log('val: ', val);
}