zhengyiming
3 天以前 1d839bd0fca331b565deb640bbec0c85e3711791
Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient
3个文件已修改
32 ■■■■■ 已修改文件
src/views/ServiceChargeManage/ServiceChargeDetail.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/ServiceChargeManage/ServiceChargeManage.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/ServiceChargeManage/components/SettleDetailDialog.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -34,12 +34,14 @@
          <ProFormCol>
            <ProFormColItem :span="8">
              <ProFormItemV2 label="结算金额:" prop="settlementAmount">
                <ProFormText v-model="form.settlementAmount"> </ProFormText>
                <ProFormInputNumber v-model="form.settlementAmount" format-value="money">
                </ProFormInputNumber>
              </ProFormItemV2>
            </ProFormColItem>
            <ProFormColItem :span="8">
              <ProFormItemV2 label="实发金额:" prop="actualSettlementAmount">
                <ProFormText v-model="form.actualSettlementAmount"> </ProFormText>
                <ProFormInputNumber v-model="form.actualSettlementAmount" format-value="money">
                </ProFormInputNumber>
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
@@ -162,8 +164,8 @@
const form = reactive({
  name: '',
  settlementAmount: '',
  actualSettlementAmount: '',
  settlementAmount: 0,
  actualSettlementAmount: 0,
  code: '',
  settlementOrderName: '',
  settlementOrderTime: '',
@@ -182,8 +184,8 @@
  placeholderData: () => ({} as API.GetSettlementTaskQueryResult),
  onSuccess(data) {
    form.name = data.name;
    form.settlementAmount = toThousand(data.settlementAmount);
    form.actualSettlementAmount = toThousand(data.actualSettlementAmount);
    form.settlementAmount = data.settlementAmount ?? 0;
    form.actualSettlementAmount = data.actualSettlementAmount ?? 0;
    form.code = data.code;
    form.settlementOrderName = setOssFileName(data.settlementOrderName);
    form.settlementOrderTime = data.settlementOrderTime ?? '';
src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -303,7 +303,7 @@
    name: '',
    code: '',
    settlementUserCount: 0,
    settlementAmount: 0,
    actualSettlementAmount: 0,
  },
});
@@ -326,13 +326,13 @@
    name: row.name,
    code: row.code,
    settlementUserCount: row.settlementUserCount ?? 0,
    settlementAmount: row.settlementAmount ?? 0,
    actualSettlementAmount: row.actualSettlementAmount ?? 0,
  });
}
async function handleRecall(row: API.GetSettlementTasksQueryResultItem) {
  try {
    Message.tipMessage('确认要撤回吗?');
    await Message.tipMessage('确认要撤回吗?');
    let params: API.RevokeTaskSettlementOrderCommand = {
      taskInfoId: row.id,
    };
@@ -353,8 +353,8 @@
  }
}
function goDetail(id: string, url?: string) {
  router.push({
async function goDetail(id: string, url?: string) {
  await router.push({
    name: 'ServiceChargeDetail',
    params: {
      id: id,
@@ -363,6 +363,7 @@
      url: url ? url : '',
    },
  });
  editForm.settlementUrl = [] as UploadUserFile[];
}
function handleExport(val) {
src/views/ServiceChargeManage/components/SettleDetailDialog.vue
@@ -17,8 +17,9 @@
      <ProFormItemV2 label="结算人数:" prop="settlementUserCount">
        <ProFormInputNumber v-model="form.settlementUserCount" unit="人"> </ProFormInputNumber>
      </ProFormItemV2>
      <ProFormItemV2 label="结算金额:" prop="settlementAmount">
        <ProFormInputNumber v-model="form.settlementAmount" unit="元"> </ProFormInputNumber>
      <ProFormItemV2 label="结算金额:" prop="actualSettlementAmount">
        <ProFormInputNumber v-model="form.actualSettlementAmount" unit="元" format-value="money">
        </ProFormInputNumber>
      </ProFormItemV2>
    </ProForm>
    <template #footer>
@@ -51,7 +52,7 @@
  name: string;
  code: string;
  settlementUserCount: number;
  settlementAmount: number;
  actualSettlementAmount: number;
};
const visible = defineModel({ type: Boolean });