wupengfei
2 天以前 7343ef57056cbd1197240a58fabb785c84b39691
fix: bug
11个文件已修改
169 ■■■■ 已修改文件
apps/cMiniApp/src/pages/task/InnerPage.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/Calendar/Calendar.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/constants/apiEnum.ts 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/hooks/enterprise.ts 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/services/apiV2/index.ts 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/services/apiV2/resource.ts 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/services/apiV2/task.ts 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/services/apiV2/typings.d.ts 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/services/apiV2/user.ts 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/pages/task/InnerPage.vue
@@ -46,6 +46,7 @@
const { queryState, infiniteLoadingProps } = useCheckReceiveTasks();
function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) {
  console.log('queryState.date: ', queryState.date);
  if (Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.WaitSubmit) {
    Taro.navigateTo({
      url: `${RouterPath.taskSubmitCheck}?id=${item.id}&date=${queryState.date}`,
apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue
@@ -3,33 +3,32 @@
    <div v-if="isCertified" class="companyInfo-info-wrapper">
      <div class="companyInfo-info-item">
        <div class="companyInfo-info-item-label">企业名称</div>
        <div class="companyInfo-info-item-content">{{ enterpriseDetail.enterpriseName }}</div>
        <div class="companyInfo-info-item-content">{{ enterpriseDetail?.enterpriseName }}</div>
      </div>
      <div class="companyInfo-info-item">
        <div class="companyInfo-info-item-label">统一社会信用代码</div>
        <div class="companyInfo-info-item-content">{{ enterpriseDetail.societyCreditCode }}</div>
        <div class="companyInfo-info-item-content">{{ enterpriseDetail?.societyCreditCode }}</div>
      </div>
      <div class="companyInfo-info-item">
        <div class="companyInfo-info-item-label">注册资本</div>
        <div class="companyInfo-info-item-content">捌佰万元整</div>
        <div class="companyInfo-info-item-content">{{ enterpriseDetail?.registeredCapital }}</div>
      </div>
      <div class="companyInfo-info-item">
        <div class="companyInfo-info-item-label">企业类型</div>
        <div class="companyInfo-info-item-content">有限责任公司(自然人投资或控股 的法人独资)</div>
        <div class="companyInfo-info-item-content">{{ enterpriseDetail?.enterpriseType }}</div>
      </div>
      <div class="companyInfo-info-item">
        <div class="companyInfo-info-item-label">成立日期</div>
        <div class="companyInfo-info-item-content">2024年11月11日</div>
        <div class="companyInfo-info-item-content">{{ enterpriseDetail?.establishmentDate }}</div>
      </div>
      <div class="companyInfo-info-item">
        <div class="companyInfo-info-item-label">企业地址</div>
        <div class="companyInfo-info-item-content">江西省九江市共青城市xx路xx号xx xxxx</div>
        <div class="companyInfo-info-item-content">{{ enterpriseDetail?.address }}</div>
      </div>
      <div class="companyInfo-info-item">
        <div class="companyInfo-info-item-label">经营范围</div>
        <div class="companyInfo-info-item-content">
          我是营业执照上的经营范围信息我 是营业执照上的经营范围信息我是
          营业执照上的经营范围信息我是营 业执照上的经营范围信息我是营业 执照上的经营范围信息
          {{ enterpriseDetail?.mainBusiness }}
        </div>
      </div>
    </div>
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
@@ -41,7 +41,7 @@
            :unit="BillingMethodEnumUnit[detail.billingMethod]"
          />
        </div>
        <div class="taskDetail-address-wrapper">
        <div class="taskDetail-address-wrapper" @click="goMap">
          <div class="taskDetail-address-title-wrapper">
            <img :src="IconLocaltion" class="taskDetail-address-title-icon" />
            <div class="taskDetail-address-title">{{ detail?.addressName ?? '' }}</div>
@@ -275,4 +275,12 @@
    url: `${RouterPath.taskSubmitCheck}?id=${id}`,
  });
}
function goMap() {
  Taro.openLocation({
    latitude: detail.value?.latitude,
    longitude: detail.value?.longitude,
    scale: 18,
  });
}
</script>
packages/components/src/Calendar/Calendar.vue
@@ -4,8 +4,6 @@
      <nut-calendar-card
        v-model="model"
        class="bole-calendar"
        ref="calendar"
        @change="handleChange"
      ></nut-calendar-card>
    </div>
    <div :class="['bole-calendar-arrow', { active: !isCollapse }]" @click="toggle">
@@ -29,12 +27,6 @@
const model = defineModel<Date | Date[]>();
const { isCollapse, toggle } = useToggle(true);
const calendar = ref();
function handleChange(value) {
  console.log('value: ', value);
  console.log('calendar: ', calendar.value);
}
</script>
<style lang="scss">
packages/constants/apiEnum.ts
@@ -157,6 +157,8 @@
/** 资源请求方式 */
export enum EnumResourceMethod {
  /**无 */
  None = 0,
  /**查询 */
  Get = 10,
  /**提交 */
packages/hooks/enterprise.ts
@@ -1,5 +1,5 @@
import { useQuery, useQueryClient } from '@tanstack/vue-query';
import * as enterpriseServices from '@12333/services/apiV2/enterprise';
import * as taskServices from '@12333/services/apiV2/task';
import { MaybeRef, unref } from 'vue';
type UseEnterpriseDetailOptions = {
@@ -8,16 +8,16 @@
export function useEnterpriseDetail({ id }: UseEnterpriseDetailOptions) {
  const { data, refetch, isLoading, isError } = useQuery({
    queryKey: ['enterpriseServices/getEnterprise', id],
    queryKey: ['taskServices/getTaskEnterprise', id],
    queryFn: async () => {
      return await enterpriseServices.getEnterprise(
      return await taskServices.getTaskEnterprise(
        { id: unref(id) },
        {
          showLoading: false,
        }
      );
    },
    placeholderData: () => ({} as API.GetEnterpriseQueryResult),
    placeholderData: () => ({} as API.GetTaskEnterpriseQueryResult),
  });
  return {
packages/services/apiV2/index.ts
@@ -6,13 +6,13 @@
import * as user from './user';
import * as role from './role';
import * as enterprise from './enterprise';
import * as resource from './resource';
import * as task from './task';
import * as ocrUtils from './ocrUtils';
import * as dictionary from './dictionary';
import * as userResume from './userResume';
import * as auth from './auth';
import * as taskCheckReceive from './taskCheckReceive';
import * as resource from './resource';
import * as taskUser from './taskUser';
import * as menu from './menu';
import * as fileUtils from './fileUtils';
@@ -21,13 +21,13 @@
  user,
  role,
  enterprise,
  resource,
  task,
  ocrUtils,
  dictionary,
  userResume,
  auth,
  taskCheckReceive,
  resource,
  taskUser,
  menu,
  fileUtils,
packages/services/apiV2/resource.ts
@@ -2,6 +2,23 @@
// @ts-ignore
import { request } from '@/utils/request';
/** 健康校验 GET /api/user/resource/checkHealth */
export async function checkHealth(
  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
  params: API.APIcheckHealthParams,
  options?: API.RequestConfig
) {
  return request<boolean>('/api/user/resource/checkHealth', {
    method: 'GET',
    params: {
      ...params,
      request: undefined,
      ...params['request'],
    },
    ...(options || {}),
  });
}
/** 获取资源字段 GET /api/user/resource/getResourceFields */
export async function getResourceFields(
  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
packages/services/apiV2/task.ts
@@ -83,6 +83,21 @@
  );
}
/** 查询任务企业信息 GET /api/flexjob/task/getTaskEnterprise */
export async function getTaskEnterprise(
  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
  params: API.APIgetTaskEnterpriseParams,
  options?: API.RequestConfig
) {
  return request<API.GetTaskEnterpriseQueryResult>('/api/flexjob/task/getTaskEnterprise', {
    method: 'GET',
    params: {
      ...params,
    },
    ...(options || {}),
  });
}
/** 查询任务详情 GET /api/flexjob/task/getTaskInfo */
export async function getTaskInfo(
  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
packages/services/apiV2/typings.d.ts
@@ -3,6 +3,11 @@
    [key: string]: any;
  }
  interface APIcheckHealthParams {
    /** 健康校验 */
    request?: CheckHealthQuery;
  }
  interface APIgetAliyunOSSAcsParams {
    /** 获取阿里云OSS授权信息 */
    request?: GetAliyunOSSAcsQuery;
@@ -144,6 +149,11 @@
    roleId?: string;
  }
  interface APIgetTaskEnterpriseParams {
    /** 企业Id */
    id?: string;
  }
  interface APIgetTaskInfoParams {
    /** Id */
    id?: string;
@@ -241,6 +251,8 @@
    /** 验证码 */
    verifyCode: string;
  }
  type CheckHealthQuery = Record<string, any>;
  interface CheckReceiveTaskCommand {
    /** 提交Id */
@@ -448,6 +460,8 @@
  }
  enum EnumResourceMethod {
    /**无 */
    None = 0,
    /**查询 */
    Get = 10,
    /**提交 */
@@ -984,6 +998,24 @@
    /** 错误码 */
    errorCode?: string;
    data?: GetRoleQueryResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }
  interface FriendlyResultGetTaskEnterpriseQueryResult {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    data?: GetTaskEnterpriseQueryResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
@@ -2639,6 +2671,27 @@
    isChecked?: boolean;
  }
  interface GetTaskEnterpriseQueryResult {
    /** 企业全称 */
    enterpriseName?: string;
    /** 统一社会信用代码 */
    societyCreditCode?: string;
    /** 是否实名 */
    isReal?: boolean;
    /** 企业类型 */
    enterpriseType?: string;
    /** 注册资本 */
    registeredCapital?: string;
    /** 成立日期 */
    establishmentDate?: string;
    /** 企业地址 */
    address?: string;
    /** 经营范围 */
    mainBusiness?: string;
    /** 在招岗位数量 */
    taskCount?: number;
  }
  interface GetTaskInfoQueryResult {
    /** Id */
    id?: string;
@@ -2648,6 +2701,8 @@
    enterpriseName?: string;
    /** 联系电话 */
    contactPhoneNumber?: string;
    /** 是否认证 */
    isReal?: boolean;
    /** 在招岗位数量 */
    taskCount?: number;
    /** 报名人数 */
@@ -3785,6 +3840,25 @@
  type SyncHumanResourcesAreaDictionaryDataCommand = Record<string, any>;
  interface SyncOperationUserCommand {
    dataSource?: EnumDataSource;
    /** 数据来源Id */
    dataSourceId?: string;
    /** 姓名 */
    name?: string;
    /** 用户名 */
    userName: string;
    /** 手机号 */
    phoneNumber?: string;
    /** 密码 */
    password?: string;
    /** 园区Id */
    industrialParkIds?: string[];
    status?: EnumUserStatus;
    /** 备注 */
    remark?: string;
  }
  interface UpdatePhoneNumberVerifyCodeCommand {
    /** 手机号码 */
    phoneNumber: string;
packages/services/apiV2/user.ts
@@ -112,3 +112,18 @@
    ...(options || {}),
  });
}
/** 同步运营用户 POST /api/user/user/syncOperationUser */
export async function syncOperationUser(
  body: API.SyncOperationUserCommand,
  options?: API.RequestConfig
) {
  return request<string>('/api/user/user/syncOperationUser', {
    method: 'POST',
    headers: {
      'Content-Type': 'application/json-patch+json',
    },
    data: body,
    ...(options || {}),
  });
}