fix: s

zhengyiming

2025-11-06 f0c3698c57b6e9a5678f088d1d6e4762b961b1d3

fix: s

 apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue

@@ -11,7 +11,7 @@
          <div class="payroll-manage-detail-top-content-item">
            <div class="payroll-manage-detail-top-content-item-label">服务费金额：</div>
            <div class="payroll-manage-detail-top-content-item-text">
              {{ `${form.serviceFee ?? 0}${BillingMethodEnumUnit[form.billingMethod]}` }}
              {{ OrderUtils.getServiceFeeText(form.serviceFee, form.billingMethod) }}
            </div>
          </div>
          <div class="payroll-manage-detail-top-content-item">
@@ -99,7 +99,7 @@
  BillingMethodEnumUnit,
} from '@12333/constants';
import PayrollManageDetailCard from '../components/PayrollManageDetailCard.vue';
import { Message, paginateList, setOSSLink, toThousand } from '@12333/utils';
import { Message, paginateList, setOSSLink, toThousand, OrderUtils } from '@12333/utils';
import { useQuery } from '@tanstack/vue-query';
import dayjs from 'dayjs';
import { goBack } from '@/utils';

 apps/underTakeMiniApp/project.private.config.json

@@ -24,11 +24,18 @@
        "miniprogram": {
            "list": [
                {
                    "name": "发薪详情",
                    "pathName": "subpackages/payrollManage/payrollManageDetail/payrollManageDetail",
                    "query": "id=225c2ed0-aefc-43aa-ff08-08de11385920&operatorToken=97671547-8f84-49c7-8cb0-7bf5bc216cc9",
                    "scene": null,
                    "launchMode": "default"
                },
                {
                    "name": "用户协议",
                    "pathName": "subpackages/login/userPolicy/userPolicy",
                    "query": "",
                    "scene": null,
                    "launchMode": "default"
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "验收管理",

 apps/underTakeMiniApp/src/pages/workbenches/InnerPage.vue

@@ -64,6 +64,7 @@
});

const goPage = useAccessLogin((routeName: string) => {
  console.log('routeName: ', routeName);
  Taro.navigateTo({
    url: routeName,
  });

 apps/underTakeMiniApp/src/subpackages/payrollManage/payrollManage/InnerPage.vue

@@ -9,15 +9,15 @@
    title-scroll
  >
    <ProTabPane
      :title="`待结算(${waitAuditCount})`"
      :title="`待结算`"
      :pane-key="GetSettlementTasksQuerySupplierPaymentStatus.WaitSettlement"
    ></ProTabPane>
    <ProTabPane
      :title="`已结算(${completedAuditCount})`"
      :title="`已结算`"
      :pane-key="GetSettlementTasksQuerySupplierPaymentStatus.CompletedSettlement"
    ></ProTabPane>
    <ProTabPane
      :title="`已发放(${completedReleaseCount})`"
      :title="`已发放`"
      :pane-key="GetSettlementTasksQuerySupplierPaymentStatus.CompletedRelease"
    ></ProTabPane>
  </ProTabs>

 apps/underTakeMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue

@@ -11,7 +11,7 @@
          <div class="payroll-manage-detail-top-content-item">
            <div class="payroll-manage-detail-top-content-item-label">服务费金额：</div>
            <div class="payroll-manage-detail-top-content-item-text">
              {{ `${form.serviceFee ?? 0}${BillingMethodEnumUnit[form.billingMethod]}` }}
              {{ OrderUtils.getServiceFeeText(form.serviceFee, form.billingMethod) }}
            </div>
          </div>
          <div class="payroll-manage-detail-top-content-item">
@@ -58,14 +58,14 @@
          :name="item.name"
          :gender="item.gender"
          :isReal="item.isReal"
          :totalWorkHours="item.timeoutHours"
          :totalWorkHours="item.timeoutHours ?? 0"
          :settlementAmount="item.settlementAmount"
        >
          <template #actions v-if="form.auditStatus === EnumTaskSettlementAuditStatus.Wait">
          <!-- <template #actions v-if="form.auditStatus === EnumTaskSettlementAuditStatus.Wait">
            <div class="payroll-manage-detail-card-actions">
              <nut-button type="primary" plain @click="goPayrollChange(item)">修改</nut-button>
            </div>
          </template>
          </template> -->
        </PayrollManageDetailCard>
      </template>
    </InfiniteLoading>
@@ -99,7 +99,7 @@
  BillingMethodEnumUnit,
} from '@12333/constants';
import PayrollManageDetailCard from '../components/PayrollManageDetailCard.vue';
import { Message, paginateList, setOSSLink, toThousand } from '@12333/utils';
import { Message, paginateList, setOSSLink, toThousand, OrderUtils } from '@12333/utils';
import { useQuery } from '@tanstack/vue-query';
import dayjs from 'dayjs';
import { goBack } from '@/utils';

 packages/constants/apiEnum.ts

@@ -649,9 +649,9 @@
  WaitSubmit = 10,
  /**待验收 */
  WaitCheckReceive = 20,
  /**验收通过/已签到 */
  /**验收通过 */
  Success = 30,
  /**验收未通过/未到岗 */
  /**验收未通过 */
  Fail = 40,
}


 packages/constants/task.ts

@@ -48,6 +48,7 @@
  [EnumBillingMethod.Day]: '元/日',
  [EnumBillingMethod.Hour]: '元/小时',
  [EnumBillingMethod.Piece]: '元/件',
  [EnumBillingMethod.Face]: '面议',
};

export const EnumSettlementCycleDateWeekArray = [

 packages/services/apiV2/typings.d.ts

@@ -557,10 +557,6 @@
    taskInfoUserId?: string;
    /** æ—¥æœŸ */
    date?: string;
    /** ç­¾åˆ°æ—¶é—´ */
    checkInTime?: string;
    /** ç­¾å‡ºæ—¶é—´ */
    checkOutTime?: string;
    /** æœåŠ¡è´¹ï¼ˆå…ƒï¼‰ */
    serviceFee?: number;
    /** è¶…时（小时） */
@@ -573,6 +569,11 @@
    remark?: string;
    /** ç»“算金额 */
    settlementAmount?: number;
    /** ç­¾åˆ°æ—¶é—´ */
    checkInTime?: string;
    /** ç­¾å‡ºæ—¶é—´ */
    checkOutTime?: string;
    checkHistoryType?: EnumTaskUserSubmitCheckHistoryType;
    checkReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
  }

@@ -1325,9 +1326,9 @@
    WaitSubmit = 10,
    /**待验收 */
    WaitCheckReceive = 20,
    /**验收通过/已签到 */
    /**验收通过 */
    Success = 30,
    /**验收未通过/未到岗 */
    /**验收未通过 */
    Fail = 40,
  }

@@ -3918,10 +3919,16 @@
    /** æ˜¯å¦å®žå */
    isReal?: boolean;
    realMethod?: EnumUserRealMethod;
    /** ç­¾åˆ°æ—¶é—´ */
    /** ç”¨æˆ·ç­¾åˆ°æ—¶é—´ */
    userCheckInTime?: string;
    /** ç”¨æˆ·ç­¾å‡ºæ—¶é—´ */
    userCheckOutTime?: string;
    userCheckHistoryType?: EnumTaskUserSubmitCheckHistoryType;
    /** äººå·¥ç­¾åˆ°æ—¶é—´ */
    checkInTime?: string;
    /** ç­¾å‡ºæ—¶é—´ */
    /** äººå·¥ç­¾å‡ºæ—¶é—´ */
    checkOutTime?: string;
    checkHistoryType?: EnumTaskUserSubmitCheckHistoryType;
    /** æ“ä½œäºº */
    operator?: string;
    /** æœ€è¿‘提交时间 */
@@ -3946,6 +3953,8 @@
    verifyWorkHours?: number;
    /** è¶…时服务费 */
    timeoutServiceFee?: number;
    /** æ€»ä»¶æ•° */
    totalPieceQuantity?: number;
    settlementCycle?: EnumSettlementCycle;
    /** ä»»åŠ¡å¼€å§‹æ—¶é—´ */
    beginTime?: string;
@@ -3955,7 +3964,8 @@
    applyBeginTime?: string;
    /** æŠ¥åç»“束时间 */
    applyEndTime?: string;
    checkReceiveMethod?: EnumTaskCheckReceiveMethod;
    /** éªŒæ”¶æ–¹å¼ */
    checkReceiveMethods?: EnumTaskCheckReceiveMethod[];
    paymentMethod?: EnumTaskPaymentMethod;
    settlementAccess?: EnumEnterpriseWalletAccess;
    /** ä»»åŠ¡æè¿° */
@@ -4001,6 +4011,8 @@
    verifyWorkHours?: number;
    /** è¶…时服务费 */
    timeoutServiceFee?: number;
    /** æ€»ä»¶æ•° */
    totalPieceQuantity?: number;
    settlementCycle?: EnumSettlementCycle;
    /** å‘布时间 */
    createdTime?: string;
@@ -4012,7 +4024,8 @@
    applyBeginTime?: string;
    /** æŠ¥åç»“束时间 */
    applyEndTime?: string;
    checkReceiveMethod?: EnumTaskCheckReceiveMethod;
    /** éªŒæ”¶æ–¹å¼ */
    checkReceiveMethods?: EnumTaskCheckReceiveMethod[];
    paymentMethod?: EnumTaskPaymentMethod;
    settlementAccess?: EnumEnterpriseWalletAccess;
    /** ä»»åŠ¡æè¿° */
@@ -4063,6 +4076,7 @@
    checkTime?: string;
    /** æ“ä½œäºº */
    operator?: string;
    operatorType?: EnumUserType;
    type?: EnumTaskUserSubmitCheckHistoryType;
  }

@@ -4075,6 +4089,16 @@
    /** æäº¤æ—¶é—´ */
    createdTime?: string;
    checkReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
    /** ç”¨æˆ·ç­¾åˆ°æ—¶é—´ */
    userCheckInTime?: string;
    /** ç”¨æˆ·ç­¾å‡ºæ—¶é—´ */
    userCheckOutTime?: string;
    userCheckHistoryType?: EnumTaskUserSubmitCheckHistoryType;
    /** äººå·¥ç­¾åˆ°æ—¶é—´ */
    checkInTime?: string;
    /** äººå·¥ç­¾å‡ºæ—¶é—´ */
    checkOutTime?: string;
    checkHistoryType?: EnumTaskUserSubmitCheckHistoryType;
    /** éªŒæ”¶ç…§ç‰‡ */
    files?: string[];
  }
@@ -4099,10 +4123,16 @@
    id?: string;
    /** éªŒæ”¶æ—¶é—´ */
    date?: string;
    /** ç­¾åˆ°æ—¶é—´ */
    /** ç”¨æˆ·ç­¾åˆ°æ—¶é—´ */
    userCheckInTime?: string;
    /** ç”¨æˆ·ç­¾å‡ºæ—¶é—´ */
    userCheckOutTime?: string;
    userCheckHistoryType?: EnumTaskUserSubmitCheckHistoryType;
    /** äººå·¥ç­¾åˆ°æ—¶é—´ */
    checkInTime?: string;
    /** ç­¾å‡ºæ—¶é—´ */
    /** äººå·¥ç­¾å‡ºæ—¶é—´ */
    checkOutTime?: string;
    checkHistoryType?: EnumTaskUserSubmitCheckHistoryType;
    /** æ“ä½œäºº */
    operator?: string;
    /** æäº¤æ—¶é—´ */
@@ -4328,6 +4358,8 @@
    amount?: number;
    /** å……值时间 */
    createdTime?: string;
    /** å¤‡æ³¨ */
    remark?: string;
    transactionStatus?: EnumEnterpriseCooperationWalletTransactionStatus;
    /** å‡­è¯ */
    files?: string[];
@@ -5613,7 +5645,8 @@
    applyBeginTime?: string;
    /** æŠ¥åç»“束时间 */
    applyEndTime?: string;
    checkReceiveMethod?: EnumTaskCheckReceiveMethod;
    /** éªŒæ”¶æ–¹å¼ */
    checkReceiveMethods?: EnumTaskCheckReceiveMethod[];
    paymentMethod?: EnumTaskPaymentMethod;
    settlementAccess?: EnumEnterpriseWalletAccess;
    /** ä»»åŠ¡æè¿° */
@@ -5625,6 +5658,8 @@
    verifyWorkHours?: number;
    /** è¶…时服务费 */
    timeoutServiceFee?: number;
    /** æ€»ä»¶æ•° */
    totalPieceQuantity?: number;
    settlementCycle?: EnumSettlementCycle;
    /** ç¦åˆ© */
    benefits?: GetTaskInfoQueryResultBenefit[];
@@ -5669,7 +5704,8 @@
    applyBeginTime?: string;
    /** æŠ¥åç»“束时间 */
    applyEndTime?: string;
    checkReceiveMethod?: EnumTaskCheckReceiveMethod;
    /** éªŒæ”¶æ–¹å¼ */
    checkReceiveMethods?: EnumTaskCheckReceiveMethod[];
    paymentMethod?: EnumTaskPaymentMethod;
    settlementAccess?: EnumEnterpriseWalletAccess;
    /** ä»»åŠ¡æè¿° */
@@ -5681,6 +5717,8 @@
    verifyWorkHours?: number;
    /** è¶…时服务费 */
    timeoutServiceFee?: number;
    /** æ€»ä»¶æ•° */
    totalPieceQuantity?: number;
    settlementCycle?: EnumSettlementCycle;
    /** ç¦åˆ© */
    benefits?: GetTaskInfoQueryResultBenefit[];
@@ -5718,7 +5756,8 @@
    applyBeginTime?: string;
    /** æŠ¥åç»“束时间 */
    applyEndTime?: string;
    checkReceiveMethod?: EnumTaskCheckReceiveMethod;
    /** éªŒæ”¶æ–¹å¼ */
    checkReceiveMethods?: EnumTaskCheckReceiveMethod[];
    paymentMethod?: EnumTaskPaymentMethod;
    settlementAccess?: EnumEnterpriseWalletAccess;
    /** ä»»åŠ¡æè¿° */
@@ -5730,6 +5769,8 @@
    verifyWorkHours?: number;
    /** è¶…时服务费 */
    timeoutServiceFee?: number;
    /** æ€»ä»¶æ•° */
    totalPieceQuantity?: number;
    settlementCycle?: EnumSettlementCycle;
    /** ç¦åˆ© */
    benefits?: GetTaskInfoQueryResultBenefit[];
@@ -6458,6 +6499,8 @@
    verifyWorkHours?: number;
    /** è¶…时服务费 */
    timeoutServiceFee?: number;
    /** æ€»ä»¶æ•° */
    totalPieceQuantity?: number;
    settlementAccess?: EnumEnterpriseWalletAccess;
    settlementOrderStatus?: EnumTaskSettlementOrderStatus;
    /** ç»“算单名称 */
@@ -6721,6 +6764,8 @@
    verifyWorkHours?: number;
    /** è¶…时服务费 */
    timeoutServiceFee?: number;
    /** æ€»ä»¶æ•° */
    totalPieceQuantity?: number;
    settlementCycle?: EnumSettlementCycle;
    /** ç»“算日期 */
    settlementDate?: number;
@@ -6757,7 +6802,8 @@
    applyBeginTime?: string;
    /** æŠ¥åç»“束时间 */
    applyEndTime?: string;
    checkReceiveMethod?: EnumTaskCheckReceiveMethod;
    /** éªŒæ”¶æ–¹å¼ */
    checkReceiveMethods?: EnumTaskCheckReceiveMethod[];
    paymentMethod?: EnumTaskPaymentMethod;
    settlementAccess?: EnumEnterpriseWalletAccess;
    /** ä»»åŠ¡æè¿° */
@@ -6869,6 +6915,8 @@
    verifyWorkHours?: number;
    /** è¶…时服务费 */
    timeoutServiceFee?: number;
    /** æ€»ä»¶æ•° */
    totalPieceQuantity?: number;
    settlementCycle?: EnumSettlementCycle;
    /** ç¦åˆ© */
    benefits?: GetTaskInfoQueryResultBenefit[];
@@ -6903,7 +6951,8 @@
    /** æŠ¥åç»“束时间 */
    applyEndTime?: string;
    applyStatus?: EnumTaskApplyStatus;
    checkReceiveMethod?: EnumTaskCheckReceiveMethod;
    /** éªŒæ”¶æ–¹å¼ */
    checkReceiveMethods?: EnumTaskCheckReceiveMethod[];
    paymentMethod?: EnumTaskPaymentMethod;
    settlementAccess?: EnumEnterpriseWalletAccess;
    /** ä»»åŠ¡æè¿° */
@@ -8206,6 +8255,8 @@
    verifyWorkHours?: number;
    /** è¶…时服务费 */
    timeoutServiceFee?: number;
    /** æ€»ä»¶æ•° */
    totalPieceQuantity?: number;
    settlementCycle: EnumSettlementCycle;
    /** ç»“算日期 */
    settlementDate: number;
@@ -8238,7 +8289,8 @@
    applyBeginTime?: string;
    /** æŠ¥åç»“束时间 */
    applyEndTime?: string;
    checkReceiveMethod?: EnumTaskCheckReceiveMethod;
    /** éªŒæ”¶æ–¹å¼ */
    checkReceiveMethods?: EnumTaskCheckReceiveMethod[];
    paymentMethod?: EnumTaskPaymentMethod;
    settlementAccess?: EnumEnterpriseWalletAccess;
    /** ä»»åŠ¡æè¿° */
@@ -8592,6 +8644,11 @@
    taskInfoId?: string;
    /** æ—¥æœŸ */
    date?: string;
    /** ç”¨æˆ·ç­¾åˆ°æ—¶é—´ */
    userCheckInTime?: string;
    /** ç”¨æˆ·ç­¾å‡ºæ—¶é—´ */
    userCheckOutTime?: string;
    userCheckHistoryType?: EnumTaskUserSubmitCheckHistoryType;
    /** é™„件 */
    files?: string[];
  }

 packages/utils/index.ts

@@ -18,3 +18,4 @@
export * from './developing';
export * from './LoggerRecord';
export * from './storage';
export * from './orderUtils';

 packages/utils/orderUtils.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
import { EnumBillingMethod, BillingMethodEnumUnit } from '@12333/constants';

export class OrderUtils {
  static getServiceFeeText(serviceFee: number, billingMethod: EnumBillingMethod) {
    if (billingMethod === EnumBillingMethod.Face) {
      return BillingMethodEnumUnit[billingMethod];
    }
    return `${serviceFee ?? 0}${BillingMethodEnumUnit[billingMethod]}`;
  }
}