Merge remote-tracking branch 'origin/master' into dev-auto-sign

zhengyiming

1 天以前 1b3d015ebf23534ed2911be8e7ae552793ebfb66

Merge remote-tracking branch 'origin/master' into dev-auto-sign

 src/services/api/taskCheckReceive.ts

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

/** 计算任务验收金额 POST /api/flexjob/taskCheckReceive/calcTaskCheckReceive */
export async function calcTaskCheckReceive(
  body: API.CalcTaskCheckReceiveCommand,
  options?: API.RequestConfig
) {
  return request<API.CalcTaskCheckReceiveCommandResult>(
    '/api/flexjob/taskCheckReceive/calcTaskCheckReceive',
    {
      method: 'POST',
      headers: {
        'Content-Type': 'application/json-patch+json',
      },
      data: body,
      ...(options || {}),
    }
  );
}

/** 任务验收 POST /api/flexjob/taskCheckReceive/checkReceiveTask */
export async function checkReceiveTask(
  body: API.CheckReceiveTaskCommand,

 src/services/api/typings.d.ts

@@ -461,6 +461,24 @@
    operatorToken?: string;
  }

  interface CalcTaskCheckReceiveCommand {
    /** 任务Id */
    taskInfoId?: string;
    /** 签到时间 */
    checkInTime?: string;
    /** 签出时间 */
    checkOutTime?: string;
  }

  interface CalcTaskCheckReceiveCommandResult {
    /** 服务费（元） */
    serviceFee?: number;
    /** 超时（小时） */
    timeoutHours?: number;
    /** 超时费用（元） */
    timeoutFee?: number;
  }

  interface ChangePhoneNumberCommand {
    /** 手机号码 */
    phoneNumber: string;
@@ -503,6 +521,18 @@
    checkInTime?: string;
    /** 签出时间 */
    checkOutTime?: string;
    /** 服务费（元） */
    serviceFee?: number;
    /** 超时（小时） */
    timeoutHours?: number;
    /** 超时费用（元） */
    timeoutFee?: number;
    /** 其他费用（元） */
    otherFee?: number;
    /** 备注 */
    remark?: string;
    /** 结算金额 */
    settlementAmount?: number;
    checkReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
  }

@@ -1488,6 +1518,24 @@
    /** 错误码 */
    errorCode?: string;
    data?: BuildOperatorTokenCommandResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }

  interface FriendlyResultCalcTaskCheckReceiveCommandResult {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    data?: CalcTaskCheckReceiveCommandResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
@@ -6532,6 +6580,8 @@
    height?: number;
    /** 体重 */
    weight?: number;
    /** 鞋码 */
    shoeSize?: number;
    /** 生活照 */
    photos?: string[];
    /** 生活照 */
@@ -6633,6 +6683,8 @@
    height?: number;
    /** 体重 */
    weight?: number;
    /** 鞋码 */
    shoeSize?: number;
    /** 生活照 */
    photos?: string[];
    /** 生活照 */
@@ -7596,6 +7648,8 @@
    height?: number;
    /** 体重 */
    weight?: number;
    /** 鞋码 */
    shoeSize?: number;
    /** 生活照 */
    photos?: string[];
    /** 个人视频 */

 src/views/CPersonManage/components/SignDetailView.vue

@@ -15,6 +15,7 @@
        :url="setOSSLink(row.contractUrl)"
      >
      </PreviewBtn>
      <div v-else></div>
    </template>
  </ProTableV2>
</template>

 src/views/CPersonManage/components/StaffResumeView.vue

@@ -44,14 +44,21 @@
    <ProFormCol>
      <ProFormColItem :span="12">
        <ProFormItemV2 label="身高：" prop="height">
          <ProFormInputNumber v-model="detail.height"></ProFormInputNumber>
          <ProFormInputNumber v-model="detail.height" unit="cm"></ProFormInputNumber>
        </ProFormItemV2>
      </ProFormColItem>
    </ProFormCol>
    <ProFormCol>
      <ProFormColItem :span="12">
        <ProFormItemV2 label="体重：" prop="weight">
          <ProFormInputNumber v-model="detail.weight"></ProFormInputNumber>
          <ProFormInputNumber v-model="detail.weight" unit="kg"></ProFormInputNumber>
        </ProFormItemV2>
      </ProFormColItem>
    </ProFormCol>
    <ProFormCol>
      <ProFormColItem :span="12">
        <ProFormItemV2 label="鞋码：" prop="shoeSize">
          <ProFormInputNumber v-model="detail.shoeSize" unit="码"></ProFormInputNumber>
        </ProFormItemV2>
      </ProFormColItem>
    </ProFormCol>
@@ -127,6 +134,7 @@
  workExperience: '',
  height: 0,
  weight: 0,
  shoeSize: 0,
  photos: [] as UploadUserFile[],
  videos: [] as UploadUserFile[],
});
@@ -147,6 +155,7 @@
    detail.workExperience = data.workExperience;
    detail.height = data.height ?? 0;
    detail.weight = data.weight ?? 0;
    detail.shoeSize = data.shoeSize ?? 0;
    detail.photos = data.photos
      ? data.photos.map((x) => convertApi2FormUrl(x))
      : ([] as UploadUserFile[]);