Merge branch 'master' into dev-v1.1

wupengfei

54 分钟以前 b331f884097a2dc5086c8cf043c8c8f52e7640fe

 src/views/ServiceChargeManage/ServiceChargeManage.vue

@@ -5,11 +5,8 @@
        <template #query>
          <QueryFilterItem tip-content="结算单状态">
            <FieldRadio
              v-model="extraParamState.status"
              :value-enum="[
                { label: '已安排', value: 1 },
                { label: '待安排', value: 0 },
              ]"
              v-model="extraParamState.settlementOrderStatus"
              :value-enum="EnumTaskSettlementOrderStatusText"
              buttonStyle
              showAllBtn
              @change="getList()"
@@ -17,17 +14,14 @@
          </QueryFilterItem>
          <QueryFilterItem tip-content="结算状态">
            <FieldRadio
              v-model="extraParamState.status"
              :value-enum="[
                { label: '已安排', value: 1 },
                { label: '待安排', value: 0 },
              ]"
              v-model="extraParamState.settlementStatus"
              :value-enum="EnumTaskSettlementStatusText"
              buttonStyle
              showAllBtn
              @change="getList()"
            />
          </QueryFilterItem>
          <QueryFilterItem>
          <!-- <QueryFilterItem>
            <FieldDatePicker
              v-model="extraParamState.time"
              type="daterange"
@@ -38,10 +32,10 @@
              @change="getList()"
              tooltipContent="创建时间"
            ></FieldDatePicker>
          </QueryFilterItem>
          </QueryFilterItem> -->
          <QueryFilterItem>
            <SearchInput
              v-model="extraParamState.searchWord"
              v-model="extraParamState.keywords"
              style="width: 250px"
              placeholder="任务名称"
              @on-click-search="getList"
@@ -52,9 +46,8 @@
        </template>
        <template #btn>
          <el-button type="primary" link @click="handleDownloadTemplate()">结算单模板</el-button>

          <el-button type="primary" @click="openDialog()">上传结算单</el-button>
          <el-button type="primary" @click="handleDownloadTemplate()">导出</el-button>
          <el-button type="primary" @click="handleAdd()">上传结算单</el-button>
          <!-- <el-button type="primary" @click="handleDownloadTemplate()">导出</el-button> -->
        </template>
      </ProTableQueryFilterBar>
      <ProTableV2
@@ -62,10 +55,41 @@
        :columns="ServiceChargeManageColumns"
        :operationBtns="operationBtns"
      >
        <!-- <template #operationBtn-uploadBtn="{ row }">
          <BlFileUpload
            v-model:file-url="editForm.settlementUrl"
            ref="uploadRef"
            :showTip="false"
            :show-file-list="false"
            class="pro-table-operation-btn upload-style-btn"
            :on-success="(event) => handleUploadSuccess(event, row)"
            :limitFileSize="null"
            :limit="1"
            accept="xlsx,xls"
          >
            <el-button text type="primary" class="pro-table-operation-btn">上传</el-button>
          </BlFileUpload>
        </template>
        <template #operationBtn-reUploadBtn="{ data, row }">
          <BlFileUpload
            v-model:file-url="editForm.settlementUrl"
            ref="uploadRef"
            :showTip="false"
            :show-file-list="false"
            class="pro-table-operation-btn upload-style-btn"
            :on-success="(event) => handleUploadSuccess(event, row)"
            :limitFileSize="null"
            :limit="1"
            accept="xlsx,xls"
          >
            <el-button text type="primary" class="pro-table-operation-btn">重新上传</el-button>
          </BlFileUpload>
        </template> -->
      </ProTableV2>
    </AppContainer>
    <UploadStatementDialog v-bind="dialogProps" />
    <SettleDetailDialog v-bind="dialogSettleProps" />
    <RechargeEnterpriseWalletDialog v-bind="dialogRechargeProps" />
  </LoadingLayout>
</template>

@@ -83,53 +107,65 @@
  defineOperationBtns,
  useFormDialog,
  UploadUserFile,
  BlFileUpload,
} from '@bole-core/components';
import { ServiceChargeManageColumns } from './constants';
import { downloadFileByUrl } from '@/utils';
import {
  EnumTaskSettlementStatusText,
  EnumTaskSettlementOrderStatusText,
  EnumTaskSettlementOrderStatus,
  EnumTaskSettlementStatus,
} from '@/constants';
import { downloadFileByUrl, setOssFileName } from '@/utils';
import * as taskServices from '@/services/api/task';
import { ModelValueType } from 'element-plus';
import UploadStatementDialog from './components/UploadStatementDialog.vue';
import SettleDetailDialog from './components/SettleDetailDialog.vue';
import RechargeEnterpriseWalletDialog from './components/RechargeEnterpriseWalletDialog.vue';
import { Message } from '@bole-core/core';

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

const operationBtns = defineOperationBtns([
  {
    data: {
      enCode: 'uploadBtn',
      name: '上传',
    },
    emits: {
      onClick: (role) => openDialog(role),
    },
    extraProps: {
      hide: () => false,
    },
  },
  {
    data: {
      enCode: 'reUploadBtn',
      name: '重新上传',
    },
    emits: {
      onClick: (role) => openDialog(role),
    },
    extraProps: {
      hide: () => false,
    },
  },
  // {
  //   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) => openSettleDialog(role),
      onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role, 'settlement'),
    },
    extraProps: {
      hide: () => false,
      hide: (role: API.GetSettlementTasksQueryResultItem) =>
        !(
          role.settlementOrderStatus === EnumTaskSettlementOrderStatus.Completed &&
          role.settlementStatus === EnumTaskSettlementStatus.Wait
        ),
    },
  },
  {
@@ -141,7 +177,8 @@
      onClick: (role) => handleRecall(role),
    },
    extraProps: {
      hide: () => false,
      hide: (role: API.GetSettlementTasksQueryResultItem) =>
        role.settlementStatus !== EnumTaskSettlementStatus.InProcess,
    },
  },
  {
@@ -150,7 +187,11 @@
      name: '详情',
    },
    emits: {
      onClick: (role) => goDetail(role),
      onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role),
    },
    extraProps: {
      hide: (role: API.GetSettlementTasksQueryResultItem) =>
        role.settlementOrderStatus === EnumTaskSettlementOrderStatus.Wait,
    },
  },
  {
@@ -162,12 +203,20 @@
      onClick: (role) => handleExport(role),
    },
    extraProps: {
      hide: () => false,
      hide: () => true,
    },
  },
]);

const router = useRouter();

const { userDetail } = useUser();

const eventContext = useGlobalEventContext();

eventContext.addEvent('sureTaskSettlementOrder', () => {
  getList(paginationState.pageIndex);
});

const BaseState = {
  loading: true,
@@ -189,15 +238,18 @@
} = useTable(
  async ({ pageIndex, pageSize }, extraParamState) => {
    try {
      let params: API.GetTaskInfosQuery = {
      let params: API.GetSettlementTasksQuery = {
        pageModel: {
          rows: pageSize,
          page: pageIndex,
          orderInput: extraParamState.orderInput,
        },
        keywords: extraParamState.keywords,
        settlementOrderStatus: extraParamState.settlementOrderStatus,
        settlementStatus: extraParamState.settlementStatus,
      };

      let res = await taskServices.getTaskInfos(params, {
      let res = await taskServices.getSettlementTasks(params, {
        showLoading: !state.loading,
      });
      return res;
@@ -207,38 +259,41 @@
  },
  {
    defaultExtraParams: {
      searchWord: '',
      status: 0,
      keywords: '',
      settlementOrderStatus: '' as any as EnumTaskSettlementOrderStatus,
      settlementStatus: '' as any as EnumTaskSettlementStatus,
      time: [] as unknown as ModelValueType,
      orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
    },
    queryKey: ['taskServices/getTaskInfos'],
    columnsRenderProps: {},
    queryKey: ['taskServices/getSettlementTasks'],
    columnsRenderProps: {
      settlementOrderStatus: { type: 'enum', valueEnum: EnumTaskSettlementOrderStatusText },
      settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
      actualSettlementAmount: { type: 'money' },
      settlementAmount: { type: 'money' },
      settlementTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
      settlementOrderTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
      settlementOrderName: {
        formatter: (row: API.GetSettlementTasksQueryResultItem) =>
          row.settlementOrderName && setOssFileName(row.settlementOrderName),
      },
    },
  }
);

const { dialogProps, handleAdd, handleEdit, editForm } = useFormDialog({
const { dialogProps, handleAdd, editForm } = useFormDialog({
  onConfirm: handleAddOrEdit,
  defaultFormParams: {
    code: '',
    id: '',
    name: '',
    settlementUrl: [] as UploadUserFile[],
  },
});

function openDialog(row?) {
  if (row) {
    handleEdit({
      id: row?.id,
      name: row?.name,
      settlementUrl: [] as UploadUserFile[],
    });
  } else {
    handleAdd();
  }
async function handleAddOrEdit() {
  goSettlementDetail(editForm.id, editForm.settlementUrl[0]?.path);
}

async function handleAddOrEdit() {}

const {
  dialogProps: dialogSettleProps,
@@ -249,27 +304,97 @@
  defaultFormParams: {
    id: '',
    name: '',
    count: 0,
    code: '',
    settlementUserCount: 0,
    actualSettlementAmount: 0,
  },
});

async function handleSettle() {}
async function handleSettle() {
  try {
    let params: API.SureTaskSettlementCommand = {
      taskInfoId: settleEditForm.id,
    };
    let res = await taskServices.sureTaskSettlement(params, {
      skipErrorHandler: true,
    });
    if (res) {
      Message.successMessage('操作成功');
      getList(paginationState.pageIndex);
    }
  } catch (error) {
    if (error?.info?.errorCode == 's510') {
      handleRechargeAdd();
    }
  }
}

function openSettleDialog(row?) {
const {
  dialogProps: dialogRechargeProps,
  handleAdd: handleRechargeAdd,
  editForm: rechargeEditForm,
} = useFormDialog({
  defaultFormParams: {
    access: EnumEnterpriseWalletAccess.Alipay,
    amount: null as number,
    remark: '',
  },
});

function openSettleDialog(row: API.GetSettlementTasksQueryResultItem) {
  handleSettleEdit({
    id: row.id,
    name: row.name,
    count: row.count,
    code: row.code,
    settlementUserCount: row.settlementUserCount ?? 0,
    actualSettlementAmount: row.actualSettlementAmount ?? 0,
  });
}

function handleRecall(row) {}
async function handleRecall(row: API.GetSettlementTasksQueryResultItem) {
  try {
    await Message.tipMessage('确认要撤回吗？');
    let params: API.RevokeTaskSettlementOrderCommand = {
      taskInfoId: row.id,
    };
    let res = await taskServices.revokeTaskSettlementOrder(params);
    if (res) {
      Message.successMessage('操作成功');
      getList(paginationState.pageIndex);
    }
  } catch (error) {}
}

function goDetail(row) {
function handleUploadSuccess(
  response: UploadUserFile & { file: File & { uid: number } },
  row: API.GetSettlementTasksQueryResultItem
) {
  if (response.path) {
    goSettlementDetail(row.id, response.path);
  }
}

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,
      id: row?.id ?? '',
    },
    query: {
      settlement: settlement ? settlement : '',
    },
  });
}
@@ -279,6 +404,9 @@
}

function handleDownloadTemplate() {
  downloadFileByUrl('', '结算单模板');
  downloadFileByUrl(
    'https://parkmanagement.oss-cn-hangzhou.aliyuncs.com/FlexJob/temp/%E7%BB%93%E7%AE%97%E5%8D%95%E6%A8%A1%E6%9D%BF.xlsx',
    '结算单模板'
  );
}
</script>