fix: 甲方小程序

zhengyiming

13 小时以前 1f2956581a18283f1d4b753af5a0193971b1db2e

fix: 甲方小程序

 apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue

@@ -58,6 +58,21 @@
          ></ChooseInputWithDatePicker>
        </nut-form-item>
        <nut-form-item
          label="服务机构:"
          class="bole-form-item"
          prop="supplierEnterpriseId"
          label-width="90px"
        >
          <ChooseInputWithDatePicker
            v-model="form.endTime"
            :minDate="endMinTime"
            :maxDate="endMaxTime"
            placeholder="请选择"
            type="datetime"
            format="YYYY-MM-DD HH:mm:ss"
          ></ChooseInputWithDatePicker>
        </nut-form-item>
        <nut-form-item
          label="备注:"
          class="bole-form-item alignTop"
          prop="remark"
@@ -120,7 +135,7 @@
  beginTime: '',
  endTime: '',
  supplierEnterpriseId: '',
  enterpriseEmployeeIds: [] as string[],
  enterpriseEmployeeId: '',
  remark: '',
});

@@ -271,6 +286,11 @@
  .addStandardOrder-form {
    .nut-cell-group__wrap {
      box-shadow: none;

      .input-text,
      .h5-textarea {
        text-align: right !important;
      }
    }
  }
}

 packages/services/apiV2/index.ts

@@ -14,11 +14,11 @@
import * as logRecords from './logRecords';
import * as dictionary from './dictionary';
import * as taskCheckReceive from './taskCheckReceive';
import * as taskUser from './taskUser';
import * as standardOrder from './standardOrder';
import * as standardService from './standardService';
import * as userResume from './userResume';
import * as auth from './auth';
import * as taskUser from './taskUser';
import * as enterpriseInsuranceProduct from './enterpriseInsuranceProduct';
import * as eventUtils from './eventUtils';
import * as enterpriseCooperationWallet from './enterpriseCooperationWallet';
@@ -45,11 +45,11 @@
  logRecords,
  dictionary,
  taskCheckReceive,
  taskUser,
  standardOrder,
  standardService,
  userResume,
  auth,
  taskUser,
  enterpriseInsuranceProduct,
  eventUtils,
  enterpriseCooperationWallet,

 packages/services/apiV2/standardOrder.ts

@@ -98,6 +98,24 @@
  });
}

/** 查询标准订单详情 GET /api/flexjob/standardOrder/getSureStandardOrder */
export async function getSureStandardOrder(
  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
  params: API.APIgetSureStandardOrderParams,
  options?: API.RequestConfig
) {
  return request<API.GetSureStandardOrderQueryResult>(
    '/api/flexjob/standardOrder/getSureStandardOrder',
    {
      method: 'GET',
      params: {
        ...params,
      },
      ...(options || {}),
    }
  );
}

/** 标准订单支付 POST /api/flexjob/standardOrder/payStandardOrder */
export async function payStandardOrder(
  body: API.PayStandardOrderCommand,

 packages/services/apiV2/taskUser.ts

@@ -41,6 +41,42 @@
  });
}

/** 查询任务安排灵工详情 GET /api/flexjob/taskUser/getArrangeTaskEnterpriseEmployee */
export async function getArrangeTaskEnterpriseEmployee(
  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
  params: API.APIgetArrangeTaskEnterpriseEmployeeParams,
  options?: API.RequestConfig
) {
  return request<API.GetArrangeTaskEnterpriseEmployeeQueryResult>(
    '/api/flexjob/taskUser/getArrangeTaskEnterpriseEmployee',
    {
      method: 'GET',
      params: {
        ...params,
      },
      ...(options || {}),
    }
  );
}

/** 查询任务安排灵工列表 POST /api/flexjob/taskUser/getArrangeTaskEnterpriseEmployees */
export async function getArrangeTaskEnterpriseEmployees(
  body: API.GetArrangeTaskEnterpriseEmployeesQuery,
  options?: API.RequestConfig
) {
  return request<API.GetArrangeTaskEnterpriseEmployeesQueryResult>(
    '/api/flexjob/taskUser/getArrangeTaskEnterpriseEmployees',
    {
      method: 'POST',
      headers: {
        'Content-Type': 'application/json-patch+json',
      },
      data: body,
      ...(options || {}),
    }
  );
}

/** B端查询人员安排分页列表信息 POST /api/flexjob/taskUser/getArrangeTaskUsers */
export async function getArrangeTaskUsers(
  body: API.GetArrangeTaskUsersQuery,
@@ -104,6 +140,21 @@
  });
}

/** 查询待安排任务分页列表 POST /api/flexjob/taskUser/getWaitArrangeTasks */
export async function getWaitArrangeTasks(
  body: API.GetWaitArrangeTasksQuery,
  options?: API.RequestConfig
) {
  return request<API.GetWaitArrangeTasksQueryResult>('/api/flexjob/taskUser/getWaitArrangeTasks', {
    method: 'POST',
    headers: {
      'Content-Type': 'application/json-patch+json',
    },
    data: body,
    ...(options || {}),
  });
}

/** 任务安排 PUT /api/flexjob/taskUser/setTaskUserArrange */
export async function setTaskUserArrange(
  body: API.SetTaskUserArrangeCommand,

 packages/services/apiV2/typings.d.ts

@@ -104,6 +104,11 @@
    maxDeep?: number;
  }

  interface APIgetArrangeTaskEnterpriseEmployeeParams {
    /** 灵工Id */
    id?: string;
  }

  interface APIgetCheckReceiveTaskUserSubmitParams {
    /** 提交Id（用于B端客户端） */
    submitId?: string;
@@ -411,6 +416,11 @@
    request?: GetSupplierEnterpriseSelectQuery;
  }

  interface APIgetSureStandardOrderParams {
    /** 订单Id */
    id?: string;
  }

  interface APIgetTaskEnterpriseParams {
    /** 企业Id */
    id?: string;
@@ -2189,6 +2199,42 @@
    timestamp?: number;
  }

  interface FriendlyResultGetArrangeTaskEnterpriseEmployeeQueryResult {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    data?: GetArrangeTaskEnterpriseEmployeeQueryResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }

  interface FriendlyResultGetArrangeTaskEnterpriseEmployeesQueryResult {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    data?: GetArrangeTaskEnterpriseEmployeesQueryResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }

  interface FriendlyResultGetArrangeTaskUsersQueryResult {
    /** 跟踪Id */
    traceId?: string;
@@ -3485,6 +3531,24 @@
    timestamp?: number;
  }

  interface FriendlyResultGetSureStandardOrderQueryResult {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    data?: GetSureStandardOrderQueryResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }

  interface FriendlyResultGetTaskEnterpriseQueryResult {
    /** 跟踪Id */
    traceId?: string;
@@ -3773,6 +3837,24 @@
    timestamp?: number;
  }

  interface FriendlyResultGetWaitArrangeTasksQueryResult {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    data?: GetWaitArrangeTasksQueryResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }

  interface FriendlyResultGetWxmpSettingsQueryResult {
    /** 跟踪Id */
    traceId?: string;
@@ -4682,6 +4764,66 @@
    quickQuery?: string;
  }

  interface GetArrangeTaskEnterpriseEmployeeQueryResult {
    /** 灵工Id */
    id?: string;
    /** 头像 */
    avatar?: string;
    /** 姓名 */
    name?: string;
    /** 身份证号 */
    identity?: string;
    /** 手机号 */
    contactPhoneNumber?: string;
    gender?: EnumUserGender;
    /** 年龄 */
    age?: number;
    /** 是否实名 */
    isReal?: boolean;
    realMethod?: EnumUserRealMethod;
    /** 电子合同 */
    contractUrl?: string;
    /** 协议起始时间 */
    contractBegin?: string;
    /** 协议终止时间 */
    contractEnd?: string;
    /** 已安排任务 */
    taskInfos?: GetWaitArrangeTasksQueryResultItem[];
  }

  interface GetArrangeTaskEnterpriseEmployeesQuery {
    /** 关键字（姓名、身份证号、手机号） */
    keywords?: string;
    pageModel?: PagedListQueryPageModel;
  }

  interface GetArrangeTaskEnterpriseEmployeesQueryResult {
    pageModel?: PagedListQueryResultPageModel;
    /** 数据 */
    data?: GetArrangeTaskEnterpriseEmployeesQueryResultItem[];
  }

  interface GetArrangeTaskEnterpriseEmployeesQueryResultItem {
    /** Id */
    id?: string;
    /** 头像 */
    avatar?: string;
    /** 姓名 */
    name?: string;
    /** 身份证号 */
    identity?: string;
    /** 手机号 */
    contactPhoneNumber?: string;
    gender?: EnumUserGender;
    /** 年龄 */
    age?: number;
    /** 是否实名 */
    isReal?: boolean;
    realMethod?: EnumUserRealMethod;
    /** 已安排 */
    arrangeTaskCount?: number;
  }

  interface GetArrangeTaskUsersQuery {
    /** 任务Id */
    id?: string;
@@ -7957,6 +8099,18 @@
    serviceId?: string;
    /** 服务名 */
    serviceName?: string;
    /** 服务单号 */
    serviceCode?: string;
    /** 服务图片 */
    serviceFile?: string;
    /** 下单用户Id */
    createdUserId?: string;
    /** 下单用户 */
    createdUserName?: string;
    /** 联系电话 */
    createdUserContactPhoneNumber?: string;
    /** 下单时间 */
    createdTime?: string;
    /** 甲方企业Id */
    partyAEnterpriseId?: string;
    /** 甲方企业 */
@@ -8003,12 +8157,8 @@
    supplierEnterpriseId?: string;
    /** 供应商 */
    supplierEnterpriseName?: string;
    /** 服务人员Id */
    serverId?: string;
    /** 服务人员姓名 */
    serverName?: string;
    /** 服务人员联系电话 */
    serverContactPhoneNumber?: string;
    /** 服务人员 */
    servers?: GetStandardOrderQueryResultServer[];
    /** 备注 */
    remark?: string;
    payAccess?: EnumUserBankCardAccess;
@@ -8022,6 +8172,8 @@
    payAmount?: number;
    /** 支付时间 */
    payTime?: string;
    /** 支付完成时间 */
    payCompletedTime?: string;
    settlementStatus?: EnumStandardOrderSettlementStatus;
    serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
    /** 服务费 */
@@ -8032,6 +8184,15 @@
    settlementAmount?: number;
  }

  interface GetStandardOrderQueryResultServer {
    /** Id */
    id?: string;
    /** 姓名 */
    name?: string;
    /** 联系电话 */
    contactPhoneNumber?: string;
  }

  interface GetStandardOrdersQuery {
    scene?: EnumGetStandardOrdersQueryScene;
    /** 关键字（订单号/服务名） */
@@ -8065,6 +8226,14 @@
    serviceName?: string;
    /** 服务单号 */
    serviceCode?: string;
    /** 服务图片 */
    serviceFile?: string;
    /** 省市区+详细地址+门牌号 */
    addressDetail?: string;
    /** 服务起始时间 */
    beginTime?: string;
    /** 服务截止时间 */
    endTime?: string;
    /** 下单用户Id */
    createdUserId?: string;
    /** 下单用户 */
@@ -8082,8 +8251,10 @@
    supplierEnterpriseId?: string;
    /** 供应商 */
    supplierEnterpriseName?: string;
    /** 供应商联系电话 */
    supplierContactPhoneNumber?: string;
    /** 服务人员 */
    serverNames?: string;
    /** 服务人员联系电话 */
    serverContactPhoneNumbers?: string;
    payStatus?: EnumStandardOrderPayStatus;
    /** 支付完成时间 */
    payCompletedTime?: string;
@@ -8091,6 +8262,7 @@
    payAmount?: number;
    /** 实收金额 */
    receiveAmount?: number;
    serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
    /** 服务费 */
    serviceFee?: number;
    settlementStatus?: EnumStandardOrderSettlementStatus;
@@ -8357,6 +8529,17 @@
    signStatus?: EnumEnterpriseCooperationSignStatus;
  }

  interface GetSureStandardOrderQueryResult {
    /** 订单Id */
    id?: string;
    /** 验收完成时间 */
    checkReceiveTime?: string;
    /** 附件 */
    files?: string[];
    /** 备注 */
    remark?: string;
  }

  interface GetTaskEnterpriseQueryResult {
    /** 企业全称 */
    enterpriseName?: string;
@@ -9119,6 +9302,37 @@
    pageModel?: PagedListQueryPageModel;
  }

  interface GetWaitArrangeTasksQuery {
    /** 灵工Id */
    enterpriseEmployeeId?: string;
    /** 关键字（任务名、任务单号） */
    keywords?: string;
    pageModel?: PagedListQueryPageModel;
  }

  interface GetWaitArrangeTasksQueryResult {
    pageModel?: PagedListQueryResultPageModel;
    /** 数据 */
    data?: GetWaitArrangeTasksQueryResultItem[];
  }

  interface GetWaitArrangeTasksQueryResultItem {
    /** Id */
    id?: string;
    /** 任务名称 */
    name?: string;
    /** 任务单号 */
    code?: string;
    /** 发单客户Id */
    enterpriseId?: string;
    /** 发单客户 */
    enterpriseName?: string;
    /** 任务开始时间 */
    beginTime?: string;
    /** 任务结束时间 */
    endTime?: string;
  }

  type GetWxmpSettingsQuery = Record<string, any>;

  interface GetWxmpSettingsQueryResult {
@@ -10610,10 +10824,8 @@
  interface SureStandardOrderCommand {
    /** 订单Id */
    id?: string;
    /** 评分 */
    commentStar?: number;
    /** 评价 */
    commentContent?: string;
    /** 预约订单完成备注 */
    appointmentCompletedRemark?: string;
  }

  interface SureTaskSettlementCommand {