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

zhengyiming

3 天以前 1d839bd0fca331b565deb640bbec0c85e3711791

 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,11 +184,11 @@
  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;
    form.settlementOrderTime = data.settlementOrderTime ?? '';
  },
  enabled: !!id,
});
@@ -264,9 +266,12 @@
    let params: API.SureTaskSettlementOrderCommand = {
      taskInfoId: id,
      settlementOrderUrl: url,
      taskInfoUsers: proTableProps.value.tableData.map(
        (x) => ({ ...x } as API.SureTaskSettlementOrderCommandUser)
      ),
      taskInfoUsers:
        proTableProps.value.tableData?.length > 0
          ? proTableProps.value.tableData.map(
              (x) => ({ ...x } as API.SureTaskSettlementOrderCommandUser)
            )
          : [],
    };
    let res = await taskServices.sureTaskSettlementOrder(params);
    if (res) {