zhengyiming
3 天以前 8b40022d423cb9734813326e60957ec513b8a942
fix: bug
3个文件已修改
88 ■■■■ 已修改文件
apps/bMiniApp/src/subpackages/payrollManage/payrollChange/InnerPage.vue 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/services/apiV2/typings.d.ts 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/payrollManage/payrollChange/InnerPage.vue
@@ -182,7 +182,6 @@
const eventChannel = useEventChannel();
async function confirm() {
  try {
    let params: API.EditTaskSettlementOrderRosterCommand = {
      id: orderRosterId,
      settlementAmount: settlementAmount.value,
@@ -197,16 +196,33 @@
      otherFee: form.otherFee,
      remark: form.remark,
    };
    let res = await taskServices.editTaskSettlementOrderRoster(params);
    if (res) {
      Message.success('修改成功', {
        onClosed() {
  // try {
  //   let params: API.EditTaskSettlementOrderRosterCommand = {
  //     id: orderRosterId,
  //     settlementAmount: settlementAmount.value,
  //     actualSettlementAmount: form.actualSettlementAmount,
  //     receiveAccount: form.receiveAccount,
  //     bank: form.bank,
  //     // totalWorkHours: editForm.totalWorkHours,
  //     // bankBranch: editForm.bankBranch,
  //     serviceFee: form.serviceFee,
  //     timeoutHours: form.timeoutHours,
  //     timeoutFee: form.timeoutFee,
  //     otherFee: form.otherFee,
  //     remark: form.remark,
  //   };
  //   let res = await taskServices.editTaskSettlementOrderRoster(params);
  //   if (res) {
  //     Message.success('修改成功', {
  //       onClosed() {
  //         goBack();
  //       },
  //     });
  //     eventChannel.emit('update');
  //   }
  // } catch (error) {}
          goBack();
        },
      });
      eventChannel.emit('update');
    }
  } catch (error) {}
  eventChannel.emit('update', params);
}
</script>
apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
@@ -117,6 +117,8 @@
  auditStatus: 0,
  billingMethod: 0,
  settlementStatus: 0,
  settlementTaskUsers: [] as API.GetSettlementTaskUsersQueryResultItem[],
});
const {
@@ -147,6 +149,9 @@
    return res;
  },
  placeholderData: () => ({} as API.GetSettlementTaskUsersQueryResult),
  onSuccess(res) {
    form.settlementTaskUsers = res?.data ?? [];
  },
});
const { infiniteLoadingProps, invalidateQueries } = useInfiniteLoading(
@@ -162,13 +167,13 @@
      pageModel: {
        rows: 20,
        page: pageParam,
        totalCount: detail.value?.data.length,
        totalCount: form.settlementTaskUsers.length,
      },
      data: paginateList(detail.value?.data, pageParam, 20),
      data: paginateList(form.settlementTaskUsers, pageParam, 20),
    });
  },
  {
    enabled: computed(() => !!detail.value?.data),
    enabled: computed(() => !isLoading.value),
  }
);
@@ -178,6 +183,15 @@
      id: id,
      operatorToken: operatorToken,
      auditStatus: auditStatus,
      rosters: form.settlementTaskUsers.map((item) => ({
        id: item.id,
        serviceFee: item.serviceFee,
        timeoutHours: item.timeoutHours,
        timeoutFee: item.timeoutFee,
        otherFee: item.otherFee,
        remark: item.remark,
        settlementAmount: item.settlementAmount,
      })),
    };
    let res = await taskServices.auditTaskSettlement(params);
    if (res) {
@@ -194,8 +208,17 @@
  Taro.navigateTo({
    url: `${RouterPath.payrollChange}?orderRosterId=${item.id}&settleId=${id}&operatorToken=${operatorToken}`,
    events: {
      update: function () {
        refetch();
      update: function (params: API.EditTaskSettlementOrderRosterCommand) {
        // refetch();
        form.settlementTaskUsers = form.settlementTaskUsers.map((item) => {
          if (item.id == params.id) {
            return {
              ...item,
              ...params,
            };
          }
          return item;
        });
      },
    },
  });
packages/services/apiV2/typings.d.ts
@@ -354,6 +354,25 @@
    auditRemark?: string;
    /** 操作令牌 */
    operatorToken?: string;
    /** 名单 */
    rosters?: AuditTaskSettlementCommandRoster[];
  }
  interface AuditTaskSettlementCommandRoster {
    /** 名单Id */
    id?: string;
    /** 服务费(元) */
    serviceFee?: number;
    /** 超时(小时) */
    timeoutHours?: number;
    /** 超时费用(元) */
    timeoutFee?: number;
    /** 其他费用(元) */
    otherFee?: number;
    /** 备注 */
    remark?: string;
    /** 结算金额 */
    settlementAmount: number;
  }
  interface BaiduOcrBusinessLicenseResultModel {