Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

zhengyiming

昨天 0853d5b4dbffed8cd75a487e39f12dae58a30a9e

Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

 apps/bStandardMiniApp/src/subpackages/task/taskCheck/InnerPage.vue

@@ -28,8 +28,8 @@
          :beginTime="item.beginTime"
          :endTime="item.endTime"
          :addressName="item.addressName"
          :contacts="item.serverName"
          :contactPhoneNumber="item.serverContactPhoneNumber"
          :contacts="item.receiveName"
          :contactPhoneNumber="item.receiveContactPhoneNumber"
          :showContact="true"
          @click="goSubmitTaskDetail(item)"
        />

 apps/bStandardMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue

@@ -6,9 +6,9 @@
        :addressName="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.addressName"
        :begin-time="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.beginTime"
        :end-time="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.endTime"
        :contacts="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.serverName"
        :contacts="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.receiveName"
        :contactPhoneNumber="
          infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.serverContactPhoneNumber
          infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.receiveContactPhoneNumber
        "
        :showMyTaskArrow="false"
        :showContact="true"

 apps/cStandardMiniApp/src/pages/task/InnerPage.vue

@@ -28,8 +28,8 @@
          :addressName="item.addressName"
          :begin-time="item.beginTime"
          :end-time="item.endTime"
          :contacts="item.serverName"
          :contactPhoneNumber="item.serverContactPhoneNumber"
          :contacts="item.receiveName"
          :contactPhoneNumber="item.receiveContactPhoneNumber"
          :showContact="true"
          :showActions="
            OrderUtils.isContainCheckIn(item.checkReceiveMethods) &&

 apps/cStandardMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue

@@ -8,9 +8,9 @@
      :beginTime="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.beginTime"
      :endTime="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.endTime"
      :contactPhoneNumber="
        infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.contactPhoneNumber
        infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.receiveContactPhoneNumber
      "
      :contacts="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.contacts"
      :contacts="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.receiveName"
      :showMyTaskArrow="false"
      showContact
    ></MyTaskCard>

 apps/cStandardMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue

@@ -6,8 +6,8 @@
        :addressName="taskInfoDetail?.addressName ?? ''"
        :beginTime="taskInfoDetail?.beginTime"
        :endTime="taskInfoDetail.endTime"
        :contactPhoneNumber="taskInfoDetail.serverContactPhoneNumber"
        :contacts="taskInfoDetail.serverName"
        :contactPhoneNumber="taskInfoDetail.receiveContactPhoneNumber"
        :contacts="taskInfoDetail.receiveName"
        :showMyTaskArrow="false"
        showContact
      ></MyTaskCard>

 apps/housekeepingMiniApp/.eslintrc-auto-import.json

@@ -113,6 +113,7 @@
    "NODE_ENV": true,
    "TabBarPageRouterList": true,
    "useaa": true,
    "useEnterpriseAddresses": true
    "useEnterpriseAddresses": true,
    "useGetOpenStandardServices": true
  }
}

 apps/housekeepingMiniApp/auto-imports.d.ts

@@ -84,6 +84,7 @@
  const useCssModule: typeof import('vue')['useCssModule']
  const useCssVars: typeof import('vue')['useCssVars']
  const useEnterpriseAddresses: typeof import('./src/hooks/enterprise')['useEnterpriseAddresses']
  const useGetOpenStandardServices: typeof import('./src/hooks/openStandardServices')['useGetOpenStandardServices']
  const useGoLogin: typeof import('./src/hooks/user')['useGoLogin']
  const useId: typeof import('vue')['useId']
  const useIsLogin: typeof import('./src/hooks/user')['useIsLogin']
@@ -202,6 +203,7 @@
    readonly useCssModule: UnwrapRef<typeof import('vue')['useCssModule']>
    readonly useCssVars: UnwrapRef<typeof import('vue')['useCssVars']>
    readonly useEnterpriseAddresses: UnwrapRef<typeof import('./src/hooks/enterprise')['useEnterpriseAddresses']>
    readonly useGetOpenStandardServices: UnwrapRef<typeof import('./src/hooks/openStandardServices')['useGetOpenStandardServices']>
    readonly useGoLogin: UnwrapRef<typeof import('./src/hooks/user')['useGoLogin']>
    readonly useId: UnwrapRef<typeof import('vue')['useId']>
    readonly useIsLogin: UnwrapRef<typeof import('./src/hooks/user')['useIsLogin']>

 apps/housekeepingMiniApp/src/hooks/index.ts

@@ -5,3 +5,4 @@
export * from './authentication';
export * from './app';
export * from './enterprise';
export * from './openStandardServices';

 apps/housekeepingMiniApp/src/hooks/openStandardServices.ts

对比新文件
@@ -0,0 +1,38 @@
import { EnumPagedListOrder } from '@12333/constants';
import { useInfiniteLoading } from '@12333/hooks';
import * as standardServiceServices from '@12333/services/apiV2/standardService';

export function useGetOpenStandardServices() {
  const queryState = reactive({
    ignoreId: '',
    jobCode: '',
  });

  const { infiniteLoadingProps, invalidateQueries } = useInfiniteLoading(
    ({ pageParam }) => {
      let params: API.GetStandardServicesQuery = {
        pageModel: {
          rows: 20,
          page: pageParam,
          orderInput: [{ property: 'createdTime', order: EnumPagedListOrder.Desc }],
        },
        ignoreId: queryState.ignoreId,
        jobCode: queryState.jobCode,
      };

      return standardServiceServices.getOpenStandardServices(params, {
        showLoading: false,
      });
    },
    {
      queryKey: ['standardServiceServices/getOpenStandardServices', queryState],
      enabled: computed(() => !!queryState.jobCode),
    }
  );

  return {
    queryState,
    infiniteLoadingProps,
    invalidateQueries,
  };
}

 apps/housekeepingMiniApp/src/subpackages/sercice/serciceDetail/serciceDetail.vue

@@ -123,6 +123,7 @@
import IconAttention from '@/assets/flexJob/icon-attention-lg.png';
import IconAttentionActive from '@/assets/flexJob/icon-attention-lg-active.png';
import { EnumPagedListOrder } from '@12333/constants';
import { useGetOpenStandardServices } from '@/hooks';

defineOptions({
  name: 'serciceDetail',
@@ -156,6 +157,7 @@
      name: res.name,
    };
    queryState.jobCode = res.jobCode;
    queryState.ignoreId = id;
  },
});

@@ -194,32 +196,7 @@
  } catch (error) {}
});

const queryState = reactive({
  ignoreId: id,
  jobCode: '',
});

const { infiniteLoadingProps, invalidateQueries } = useInfiniteLoading(
  ({ pageParam }) => {
    let params: API.GetStandardServicesQuery = {
      pageModel: {
        rows: 20,
        page: pageParam,
        orderInput: [{ property: 'createdTime', order: EnumPagedListOrder.Desc }],
      },
      ignoreId: queryState.ignoreId,
      jobCode: queryState.jobCode,
    };

    return standardServiceServices.getOpenStandardServices(params, {
      showLoading: false,
    });
  },
  {
    queryKey: ['standardServiceServices/getOpenStandardServices', queryState],
    enabled: computed(() => !!queryState.jobCode),
  }
);
const { queryState, infiniteLoadingProps } = useGetOpenStandardServices();

function goSerciceDetail(item: API.GetStandardServicesQueryResultItem) {
  Taro.navigateTo({

 packages/services/apiV2/typings.d.ts

@@ -5080,6 +5080,10 @@
    description?: string;
    /** 浠诲姟鍦扮偣鍚嶇О */
    addressName?: string;
    /** 楠屾敹濮撳悕 */
    receiveName?: string;
    /** 楠屾敹鑱旂郴鐢佃瘽 */
    receiveContactPhoneNumber?: string;
    server?: GetCheckReceiveTasksQueryResultServer;
    /** 鏈嶅姟浜哄憳濮撳悕 */
    serverName?: string;
@@ -5153,6 +5157,10 @@
    checkedStatus?: EnumGetCheckReceiveTasksQueryResultItemCheckStatus;
    /** 浜哄憳鏁伴噺 */
    arrangeUserCount?: number;
    /** 楠屾敹濮撳悕 */
    receiveName?: string;
    /** 楠屾敹鑱旂郴鐢佃瘽 */
    receiveContactPhoneNumber?: string;
    server?: GetCheckReceiveTasksQueryResultServer;
    /** 鏈嶅姟浜哄憳濮撳悕 */
    serverName?: string;
@@ -5352,6 +5360,10 @@
    contacts?: string;
    /** 鑱旂郴鐢佃瘽 */
    contactPhoneNumber?: string;
    /** 楠屾敹濮撳悕 */
    receiveName?: string;
    /** 楠屾敹鑱旂郴鐢佃瘽 */
    receiveContactPhoneNumber?: string;
    server?: GetCheckReceiveTasksQueryResultServer;
    /** 鏈嶅姟浜哄憳濮撳悕 */
    serverName?: string;
@@ -8803,6 +8815,10 @@
    enterpriseEmployeeId?: string;
    applyButton?: GetTaskInfoQueryResultApplyButton;
    hireButton?: GetTaskInfoQueryResultHireButton;
    /** 楠屾敹濮撳悕 */
    receiveName?: string;
    /** 楠屾敹鑱旂郴鐢佃瘽 */
    receiveContactPhoneNumber?: string;
    server?: GetCheckReceiveTasksQueryResultServer;
    /** 鏈嶅姟浜哄憳濮撳悕 */
    serverName?: string;