Merge branch 'dev-1.3.0.2' into dev-1.3.0.3

zhengyiming

2025-11-28 5b90c8ecbcb40195ef8fe14ed4b032a580370cda

Merge branch 'dev-1.3.0.2' into dev-1.3.0.3

 apps/bMiniApp/project.private.config.json

@@ -23,6 +23,20 @@
        "miniprogram": {
            "list": [
                {
                    "name": "待验收-验收详情",
                    "pathName": "subpackages/task/taskHandleCheckDetail/taskHandleCheckDetail",
                    "query": "id=546401cc-c148-47d0-c647-08de1e75af01&date=2025-11-28&taskInfoId=5a22c18b-0b49-4540-6658-08de1da80d7c",
                    "scene": null,
                    "launchMode": "default"
                },
                {
                    "name": "报名列表",
                    "pathName": "subpackages/jobApplicationManage/jobApplicationDetail/jobApplicationDetail",
                    "query": "id=d74bca5e-a26e-4bb9-6b53-08de257fa022",
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "发布任务",
                    "pathName": "subpackages/task/publishTask/publishTask",
                    "query": "",

 apps/bMiniApp/src/subpackages/jobApplicationManage/components/SignList.vue

@@ -22,6 +22,7 @@
          </div>
        </template>
        <template #footerRight>
          <nut-button type="primary" plain @click.stop="handleMakeCall(item)">联系TA</nut-button>
          <nut-button type="primary" @click.stop="goToJobDetail(item)">查看详情</nut-button>
        </template>
      </FlexJobCard>
@@ -35,7 +36,7 @@
import { useTaskUserList } from '@12333/hooks';
import { FlexJobCard } from '@12333/components';
import Taro from '@tarojs/taro';
import { setOSSLink } from '@12333/utils';
import { Message, setOSSLink } from '@12333/utils';

defineOptions({
  name: 'SignList',
@@ -57,6 +58,12 @@
    url: `${RouterPath.flexJobDetailFromTask}?enterpriseEmployeeId=${item.enterpriseEmployeeId}&id=${item.id}&taskInfoId=${id}`,
  });
}

function handleMakeCall(item: API.GetTaskUsersQueryResultItem) {
  Message.confirm({
    message: item.contactPhoneNumber,
  });
}
</script>

<style lang="scss">

 apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue

@@ -131,7 +131,7 @@
        </nut-form>
        <div class="payroll-form-footer">
          <nut-button @click="handleCancel">取消</nut-button>
          <nut-button type="primary" @click="handleConfirm">确认</nut-button>
          <nut-button type="primary" @click="dialogVisible = false">确认</nut-button>
        </div>
      </div>
    </nut-popup>
@@ -192,12 +192,12 @@
    let params: API.CheckReceiveTaskCommand = {
      id: detail.value?.id,
      checkReceiveStatus: EnumTaskUserSubmitCheckReceiveStatus.Success,
      // serviceFee: form.serviceFee,
      // timeoutHours: form.timeoutHours,
      // timeoutFee: form.timeoutFee,
      // otherFee: form.otherFee,
      // remark: form.remark,
      // settlementAmount: settlementAmount.value,
      serviceFee: form.serviceFee,
      timeoutHours: form.timeoutHours,
      timeoutFee: form.timeoutFee,
      otherFee: form.otherFee,
      remark: form.remark,
      settlementAmount: settlementAmount.value,
    };
    let res = await taskCheckReceiveServices.checkReceiveTask(params);
    if (res) {

 apps/cMiniApp/project.config.json

@@ -3,8 +3,8 @@
    "description": "",
    "setting": {
        "urlCheck": false,
        "es6": true,
        "enhance": true,
        "es6": false,
        "enhance": false,
        "postcss": false,
        "preloadBackgroundData": false,
        "minified": false,

 apps/cMiniApp/project.private.config.json

@@ -23,6 +23,13 @@
        "miniprogram": {
            "list": [
                {
                    "name": "收入详情",
                    "pathName": "subpackages/wallet/incomeDetailInfo/incomeDetailInfo",
                    "query": "id=7899c603-f237-4505-949d-08de234155c4",
                    "scene": null,
                    "launchMode": "default"
                },
                {
                    "name": "验收详情",
                    "pathName": "subpackages/task/taskCheckDetail/taskCheckDetail",
                    "query": "id=b0e79981-56d5-4730-83e7-08de1d1fb9dd",

 apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue

@@ -21,6 +21,20 @@
        </div>
      </template>
    </ListItem>
    <ListItem title="任务名称" :show-arrow="false">
      <template #extra>
        <div class="income-detail-info-value">
          {{ detail?.taskName }}
        </div>
      </template>
    </ListItem>
    <ListItem title="任务单号" :show-arrow="false">
      <template #extra>
        <div class="income-detail-info-value">
          {{ detail?.code }}
        </div>
      </template>
    </ListItem>
    <ListItem title="结算金额" :show-arrow="false">
      <template #extra>
        <div class="income-detail-info-value">

 apps/underTakeMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue

@@ -131,7 +131,7 @@
        </nut-form>
        <div class="payroll-form-footer">
          <nut-button @click="handleCancel">取消</nut-button>
          <nut-button type="primary" @click="handleConfirm">确认</nut-button>
          <nut-button type="primary" @click="dialogVisible = false">确认</nut-button>
        </div>
      </div>
    </nut-popup>
@@ -192,6 +192,12 @@
    let params: API.CheckReceiveTaskCommand = {
      id: detail.value?.id,
      checkReceiveStatus: EnumTaskUserSubmitCheckReceiveStatus.Success,
      serviceFee: form.serviceFee,
      timeoutHours: form.timeoutHours,
      timeoutFee: form.timeoutFee,
      otherFee: form.otherFee,
      remark: form.remark,
      settlementAmount: settlementAmount.value,
    };
    let res = await taskCheckReceiveServices.checkReceiveTask(params);
    if (res) {

 packages/components/src/Card/FlexJobCard.vue

@@ -143,6 +143,14 @@

      .nut-button {
        min-width: 144rpx;

        &.nut-button--plain {
          border-width: 1px;
        }

        &.nut-button {
          margin-left: 10px;
        }
      }
    }
  }

 packages/constants/apiEnum.ts

@@ -101,6 +101,14 @@
  Face = 20,
}

/** 服务费收取方式 */
export enum EnumEnterpriseCooperationServiceFeeCollectType {
  /**按比例 */
  Rate = 10,
  /**单人单次 */
  SingleTime = 20,
}

/** 签约状态 */
export enum EnumEnterpriseCooperationSignStatus {
  /**未签约 */
@@ -447,8 +455,10 @@
  UserServerEnterpriseEmployee = 23,
  /**电子签 */
  ElectronSignServerElectronSign = 24,
  /**电子签 */
  /**短信 */
  ToolServerSms = 25,
  /**小程序 */
  ToolServerWxmp = 26,
}

/** 资源请求方式 */
@@ -887,6 +897,22 @@
  VERIFYING = 2,
}

/** 微信小程序订阅消息模板 */
export enum EnumWxmpSubscribMessageTemplate {
  /**支付成功提醒  结算完成后向承揽端管理员推送 */
  SettlementCompletedToSupplier = 0,
  /**报酬结算审核结果通知  甲方结算确认后向承揽端管理员推送 */
  SettlementAuditCompletedToSupplier = 1,
  /**工资发放通知  结算完成后向C端人员通知 */
  SettlementReceiveCompletedToUser = 2,
  /**报名录用结果通知  被录用后向C端人员通知 */
  HireCompletedToUser = 3,
  /**排班成功通知  排班后向C端人员通知 */
  ArrangeCompletedToUser = 4,
  /**测试 */
  Test = 5,
}

/** 我的报名分页列表-状态 */
export enum GetPersonalApplyTaskInfosQueryStatus {
  /**待确认 */

 packages/services/apiV2/enterpriseWallet.ts

@@ -508,6 +508,21 @@
  );
}

/** 1.3.0.2版本修复企业钱包交易数据 POST /api/user/enterpriseWallet/repairEnterpriseWalletTransaction_1_3_0_2 */
export async function repairEnterpriseWalletTransaction1302(
  body: API.RepairEnterpriseWalletTransaction1302Command,
  options?: API.RequestConfig
) {
  return request<boolean>('/api/user/enterpriseWallet/repairEnterpriseWalletTransaction_1_3_0_2', {
    method: 'POST',
    headers: {
      'Content-Type': 'application/json-patch+json',
    },
    data: body,
    ...(options || {}),
  });
}

/** 修改企业微信支付钱包结算账户 POST /api/user/enterpriseWallet/updateEnterpriseWeChatPayWalletBankAccountInfo */
export async function updateEnterpriseWeChatPayWalletBankAccountInfo(
  body: API.UpdateEnterpriseWeChatPayWalletBankAccountInfoCommand,

 packages/services/apiV2/syncDatabase.ts

@@ -2,6 +2,21 @@
// @ts-ignore
import { request } from '@/utils/request';

/** 同步数据库 POST /api/common/syncDatabase/sendWxmpSubscribMessage */
export async function sendWxmpSubscribMessage(
  body: API.SendWxmpSubscribMessageCommand,
  options?: API.RequestConfig
) {
  return request<boolean>('/api/common/syncDatabase/sendWxmpSubscribMessage', {
    method: 'POST',
    headers: {
      'Content-Type': 'application/json-patch+json',
    },
    data: body,
    ...(options || {}),
  });
}

/** 同步数据库 POST /api/common/syncDatabase/syncDatabase */
export async function syncDatabase(body: API.SyncDatabaseCommand, options?: API.RequestConfig) {
  return request<number>('/api/common/syncDatabase/syncDatabase', {

 packages/services/apiV2/typings.d.ts

@@ -875,6 +875,13 @@
    Face = 20,
  }

  enum EnumEnterpriseCooperationServiceFeeCollectType {
    /**按比例 */
    Rate = 10,
    /**单人单次 */
    SingleTime = 20,
  }

  enum EnumEnterpriseCooperationSignStatus {
    /**未签约 */
    None = 10,
@@ -1191,8 +1198,10 @@
    UserServerEnterpriseEmployee = 23,
    /**电子签 */
    ElectronSignServerElectronSign = 24,
    /**电子签 */
    /**短信 */
    ToolServerSms = 25,
    /**小程序 */
    ToolServerWxmp = 26,
  }

  enum EnumResourceMethod {
@@ -1590,6 +1599,21 @@
    VERIFY_FAIL = 1,
    /**验证中，商户可发起提现尝试 */
    VERIFYING = 2,
  }

  enum EnumWxmpSubscribMessageTemplate {
    /**支付成功提醒  结算完成后向承揽端管理员推送 */
    SettlementCompletedToSupplier = 0,
    /**报酬结算审核结果通知  甲方结算确认后向承揽端管理员推送 */
    SettlementAuditCompletedToSupplier = 1,
    /**工资发放通知  结算完成后向C端人员通知 */
    SettlementReceiveCompletedToUser = 2,
    /**报名录用结果通知  被录用后向C端人员通知 */
    HireCompletedToUser = 3,
    /**排班成功通知  排班后向C端人员通知 */
    ArrangeCompletedToUser = 4,
    /**测试 */
    Test = 5,
  }

  interface ExportEnterpriseBalanceDetailsCommand {
@@ -4119,6 +4143,8 @@
    id?: string;
    /** 供应商Id */
    supplierEnterpriseId?: string;
    /** 是否内部任务 */
    isInternal?: boolean;
    /** 需求人数 */
    needPeopleNumber?: number;
    /** 任务名称 */
@@ -4206,6 +4232,8 @@
    id?: string;
    /** 任务人员Id */
    taskInfoUserId?: string;
    /** 是否内部任务 */
    isInternal?: boolean;
    enterpriseEmployeeUser?: GetCheckReceiveTaskUserSubmitsQueryResultObjectDataEnterpriseEmployeeUser;
    /** 验收时间 */
    date?: string;
@@ -4879,6 +4907,10 @@
    enterpriseSignContractTime?: string;
    /** 电子合同 */
    contractUrl?: string;
    /** 协议起始时间 */
    contractBegin?: string;
    /** 协议终止时间 */
    contractEnd?: string;
    userSignContractStatus?: EnumTaskUserSignContractStatus;
  }

@@ -4889,6 +4921,10 @@
    createdTimeStart?: string;
    /** 登记时间-最晚时间 */
    createdTimeEnd?: string;
    /** 灵工签约时间-最早时间 */
    userSignContractTimeStart?: string;
    /** 灵工签约时间-最晚时间 */
    userSignContractTimeEnd?: string;
    /** 签约时间-最早时间 */
    signContractTimeStart?: string;
    /** 签约时间-最晚时间 */
@@ -5749,6 +5785,11 @@
    signStatus?: EnumEnterpriseCooperationSignStatus;
    /** 合作协议 */
    cooperationAgreementUrl?: string;
    serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
    /** 服务费 */
    serviceFeeRate?: number;
    /** 发票税点 */
    invoiceTaxPointRate?: number;
    /** 用户Id */
    userId?: string;
    /** 账号 */
@@ -5784,6 +5825,11 @@
    cityContent?: string;
    cooperationStatus?: EnumEnterpriseCooperationStatus;
    signStatus?: EnumEnterpriseCooperationSignStatus;
    serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
    /** 服务费 */
    serviceFeeRate?: number;
    /** 发票税点 */
    invoiceTaxPointRate?: number;
  }

  interface GetPersonalApplyTaskInfosQuery {
@@ -6086,8 +6132,15 @@
    enterpriseSignContractStatus?: EnumTaskUserSignContractStatus;
    /** 企业签约时间 */
    enterpriseSignContractTime?: string;
    source?: EnumEnterpriseEmployeeSource;
    /** 来源名称 */
    sourceName?: string;
    /** 电子合同 */
    contractUrl?: string;
    /** 协议起始时间 */
    contractBegin?: string;
    /** 协议终止时间 */
    contractEnd?: string;
  }

  interface GetPersonalUserInfosQuery {
@@ -6189,6 +6242,8 @@
    type?: EnumUserWalletTransactionType;
    /** 订单号 */
    code?: string;
    /** 任务名称 */
    taskName?: string;
    /** 企业名称 */
    enterpriseName?: string;
    /** 结算日期 */
@@ -6524,6 +6579,8 @@
    isDisabled?: boolean;
    /** 用户数量 */
    userCount?: number;
    /** 是否公开 */
    isPublic?: boolean;
  }

  interface GetRoleUserInfosQueryResultItem {
@@ -6596,6 +6653,8 @@
  interface GetSettlementTasksQueryResultItem {
    /** 任务Id */
    id?: string;
    /** 是否内部任务 */
    isInternal?: boolean;
    /** 所属任务 */
    name?: string;
    /** 任务单号 */
@@ -6627,6 +6686,8 @@
    auditStatus?: EnumTaskSettlementAuditStatus;
    /** 操作人 */
    operator?: string;
    /** 创建人 */
    createdUser?: string;
  }

  interface GetSettlementTasksQueryResultObjectData {
@@ -6666,6 +6727,8 @@
    checkReceiveEndDate?: string;
    /** 任务名称 */
    name?: string;
    /** 是否内部任务 */
    isInternal?: boolean;
    /** 任务单号 */
    code?: string;
    billingMethod?: EnumBillingMethod;
@@ -6913,6 +6976,8 @@
    id?: string;
    /** 供应商Id */
    supplierEnterpriseId?: string;
    /** 是否内部任务 */
    isInternal?: boolean;
    /** 供应商 */
    supplierEnterpriseName?: string;
    /** 需求人数 */
@@ -7634,6 +7699,10 @@
  }

  interface ImportEnterpriseEmployeesCommandResultError {
    /** 协议起始 */
    contractBegin?: string;
    /** 协议终止 */
    contractEnd?: string;
    /** 错误信息 */
    errorMessage?: string;
    /** 姓名 */
@@ -7642,10 +7711,6 @@
    contactPhoneNumber?: string;
    /** 身份证号 */
    identity?: string;
    /** 协议起始时间 */
    contractBegin?: string;
    /** 协议终止时间 */
    contractEnd?: string;
  }

  interface ImportTaskSettlementOrderRostersCommand {
@@ -7998,6 +8063,10 @@
  type RepairContractTemplateValuePointBy1202Command = Record<string, any>;

  type RepairEnterpriseEmployee1302Command = Record<string, any>;

  type RepairEnterpriseUser1302Command = Record<string, any>;

  type RepairEnterpriseWalletTransaction1302Command = Record<string, any>;

  type RepairTaskEstimatedServiceFee1301Command = Record<string, any>;

@@ -8366,6 +8435,11 @@
    signStatus?: EnumEnterpriseCooperationSignStatus;
    /** 合作协议 */
    cooperationAgreementUrl?: string;
    serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
    /** 服务费 */
    serviceFeeRate?: number;
    /** 发票税点 */
    invoiceTaxPointRate?: number;
    /** 账号 */
    userName?: string;
    /** 密码（选填 填了就改不填就不改） */
@@ -8671,6 +8745,18 @@
    phoneNumber: string;
  }

  interface SendWxmpSubscribMessageCommand {
    /** 小程序编号 */
    wxmpCode: string;
    template: EnumWxmpSubscribMessageTemplate;
    /** 点击模板卡片后的跳转页面，仅限本小程序内的页面。支持带参数,（示例index?foo=bar）。该字段不填则模板无跳转 */
    page?: string;
    /** 接收者（用户）的 openid */
    touser: string;
    /** 模板内容，格式形如{ "phrase3": { "value": "审核通过" }, "name1": { "value": "订阅" }, "date2": { "value": "2019-12-25 09:42" } } */
    data: any;
  }

  interface SetDictionaryDataIsDisabledCommand {
    ids?: string[];
    /** 是否已禁用 */

 packages/services/apiV2/user.ts

@@ -206,6 +206,21 @@
  });
}

/** 1.3.0.2版本修复企业用户数据 POST /api/user/user/repairEnterpriseUser_1_3_0_2 */
export async function repairEnterpriseUser1302(
  body: API.RepairEnterpriseUser1302Command,
  options?: API.RequestConfig
) {
  return request<boolean>('/api/user/user/repairEnterpriseUser_1_3_0_2', {
    method: 'POST',
    headers: {
      'Content-Type': 'application/json-patch+json',
    },
    data: body,
    ...(options || {}),
  });
}

/** 重置用户操作密码 POST /api/user/user/resetUserOperatorPasswords */
export async function resetUserOperatorPasswords(
  body: API.ResetUserOperatorPasswordsCommand,