fix: bug

wupengfei

2 天以前 5e06f2f05feab4d0e4bae091a7154a0ec3a8cf65

fix: bug

 apps/bMiniApp/project.private.config.json

@@ -17,8 +17,7 @@
        "showES6CompileOption": false,
        "checkInvalidKey": true,
        "ignoreDevUnusedFiles": true,
        "useIsolateContext": true,
        "skylineRenderEnable": false
        "useIsolateContext": true
    },
    "condition": {
        "miniprogram": {
@@ -27,8 +26,8 @@
                    "name": "发薪详情",
                    "pathName": "subpackages/payrollManage/payrollManageDetail/payrollManageDetail",
                    "query": "id=ed553142-801d-40b4-5582-08de0fa2a04b&operatorToken=627f56a2-d8a2-4606-b69f-36eadf770ecb",
                    "scene": null,
                    "launchMode": "default"
                    "launchMode": "default",
                    "scene": null
                }
            ]
        }

 apps/bMiniApp/src/app.config.ts

@@ -95,6 +95,7 @@
        'taskManage/taskManage',
        'batchTaskList/batchTaskList',
        'taskUserSubmitCheckHistories/taskUserSubmitCheckHistories',
        'taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail',
      ],
    },
    {

 apps/bMiniApp/src/constants/router.ts

@@ -52,6 +52,7 @@
  taskManage = '/subpackages/task/taskManage/taskManage',
  batchTaskList = '/subpackages/task/batchTaskList/batchTaskList',
  taskUserSubmitCheckHistories = '/subpackages/task/taskUserSubmitCheckHistories/taskUserSubmitCheckHistories',
  taskUserSubmitCheckHistoriesDetail = '/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail',

  jobApplicationManage = '/subpackages/jobApplicationManage/jobApplicationManage/jobApplicationManage',
  jobApplicationDetail = '/subpackages/jobApplicationManage/jobApplicationDetail/jobApplicationDetail',

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

@@ -14,24 +14,20 @@
    >
      <ProTabPane :title="`全部`" :pane-key="0"></ProTabPane>
      <ProTabPane
        :title="EnumTaskUserSubmitCheckHistoryTypeText[EnumTaskUserSubmitCheckHistoryType.CheckIn]"
        :pane-key="EnumTaskUserSubmitCheckHistoryType.CheckIn"
      ></ProTabPane>
      <ProTabPane
        :title="EnumTaskUserSubmitCheckHistoryTypeText[EnumTaskUserSubmitCheckHistoryType.CheckOut]"
        :pane-key="EnumTaskUserSubmitCheckHistoryType.CheckOut"
        :title="
          EnumGetCheckReceiveTaskCheckInUsersQueryStatusText[
            EnumGetCheckReceiveTaskCheckInUsersQueryStatus.CheckOut
          ]
        "
        :pane-key="EnumGetCheckReceiveTaskCheckInUsersQueryStatus.CheckOut"
      ></ProTabPane>
      <ProTabPane
        :title="
          EnumTaskUserSubmitCheckHistoryTypeText[EnumTaskUserSubmitCheckHistoryType.UnCheckIn]
          EnumGetCheckReceiveTaskCheckInUsersQueryStatusText[
            EnumGetCheckReceiveTaskCheckInUsersQueryStatus.UnCheck
          ]
        "
        :pane-key="EnumTaskUserSubmitCheckHistoryType.UnCheckIn"
      ></ProTabPane>
      <ProTabPane
        :title="
          EnumTaskUserSubmitCheckHistoryTypeText[EnumTaskUserSubmitCheckHistoryType.UnCheckOut]
        "
        :pane-key="EnumTaskUserSubmitCheckHistoryType.UnCheckOut"
        :pane-key="EnumGetCheckReceiveTaskCheckInUsersQueryStatus.UnCheck"
      ></ProTabPane>
    </ProTabs>
    <InfiniteLoading
@@ -45,8 +41,7 @@
          :gender="item.gender"
          :isReal="item.isReal"
          :contactPhoneNumber="item.contactPhoneNumber"
          :type="item.type"
          :checkTime="item.checkTime"
          @click="goDetail(item)"
        />
      </template>
    </InfiniteLoading>
@@ -63,6 +58,8 @@
  EnumTaskUserSubmitCheckHistoryTypeColor,
  EnumTaskUserSubmitCheckHistoryType,
  WeekCN,
  EnumGetCheckReceiveTaskCheckInUsersQueryStatus,
  EnumGetCheckReceiveTaskCheckInUsersQueryStatusText,
} from '@12333/constants';
import { Message, setOSSLink } from '@12333/utils';
import dayjs from 'dayjs';
@@ -78,12 +75,12 @@
const title = `${dayjs(date).format('YYYY年MM月DD日')} 星期${WeekCN[dayjs(date).day()]}`;

const queryState = reactive({
  type: 0 as any as EnumTaskUserSubmitCheckHistoryType,
  type: 0 as any as EnumGetCheckReceiveTaskCheckInUsersQueryStatus,
});

const { infiniteLoadingProps } = useInfiniteLoading(
  async ({ pageParam }) => {
    let params: API.GetCheckReceiveTaskUserSubmitCheckHistoriesQuery = {
    let params: API.GetCheckReceiveTaskCheckInUsersQuery = {
      pageModel: {
        rows: 20,
        page: pageParam,
@@ -93,16 +90,22 @@
    };

    if (Number(queryState.type) !== 0) {
      params.type = queryState.type;
      params.status = queryState.type;
    }

    let res = await taskCheckReceiveServices.getCheckReceiveTaskUserSubmitCheckHistories(params, {
    let res = await taskCheckReceiveServices.getCheckReceiveTaskCheckInUsers(params, {
      showLoading: false,
    });
    return res;
  },
  {
    queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskUserSubmitCheckHistories', queryState],
    queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskCheckInUsers', queryState],
  }
);

function goDetail(item: API.GetCheckReceiveTaskCheckInUsersQueryResultItem) {
  Taro.navigateTo({
    url: `${RouterPath.taskUserSubmitCheckHistoriesDetail}?id=${item.id}&date=${date}`,
  });
}
</script>

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

New file
@@ -0,0 +1,72 @@
<template>
  <LoadingLayout>
    <!-- <ContentView>
      <ChunkTitle :title="title" />
    </ContentView> -->
    <InfiniteLoading
      scrollViewClassName="common-infinite-scroll-list"
      v-bind="infiniteLoadingProps"
    >
      <template #renderItem="{ item }">
        <TaskCheckHistoryCard
          :avatar="setOSSLink(item.avatar)"
          :name="item.name"
          :gender="item.gender"
          :isReal="item.isReal"
          :contactPhoneNumber="item.contactPhoneNumber"
          :type="item.type"
          :checkTime="item.checkTime"
        />
      </template>
    </InfiniteLoading>
  </LoadingLayout>
</template>

<script setup lang="ts">
import Taro from '@tarojs/taro';
import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive';
import { useInfiniteLoading } from '@12333/hooks';
import { TaskCheckHistoryCard } from '@12333/components';
import { EnumTaskUserSubmitCheckHistoryType, WeekCN } from '@12333/constants';
import { Message, setOSSLink } from '@12333/utils';
import dayjs from 'dayjs';

defineOptions({
  name: 'InnerPage',
});

const router = Taro.useRouter();
const id = router.params?.id ?? '';
const date = router.params?.date ?? '';

const title = `${dayjs(date).format('YYYY年MM月DD日')} 星期${WeekCN[dayjs(date).day()]}`;

const queryState = reactive({
  type: 0 as any as EnumTaskUserSubmitCheckHistoryType,
});

const { infiniteLoadingProps } = useInfiniteLoading(
  async ({ pageParam }) => {
    let params: API.GetCheckReceiveTaskUserSubmitCheckHistoriesQuery = {
      pageModel: {
        rows: 20,
        page: pageParam,
      },
      taskInfoId: id,
      date: dayjs(date).format('YYYY-MM-DD'),
    };

    if (Number(queryState.type) !== 0) {
      params.type = queryState.type;
    }

    let res = await taskCheckReceiveServices.getCheckReceiveTaskUserSubmitCheckHistories(params, {
      showLoading: false,
    });
    return res;
  },
  {
    queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskUserSubmitCheckHistories', queryState],
  }
);
</script>

 apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.config.ts

New file
@@ -0,0 +1,3 @@
export default definePageConfig({
  disableScroll: true,
});

 apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.vue

New file
@@ -0,0 +1,13 @@
<template>
  <PageLayoutWithBg class="taskUserSubmitCheckHistoriesDetail-page-wrapper" title="验收详情">
    <InnerPage />
  </PageLayoutWithBg>
</template>

<script setup lang="ts">
import InnerPage from './InnerPage.vue';

defineOptions({
  name: 'taskUserSubmitCheckHistoriesDetail',
});
</script>

 apps/cMiniApp/src/app.config.ts

@@ -121,6 +121,7 @@
        'taskSubmitCheck/taskSubmitCheck',
        'taskCheckDetail/taskCheckDetail',
        'taskUserSubmitCheckHistories/taskUserSubmitCheckHistories',
        'taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail',
      ],
    },
    {

 apps/cMiniApp/src/constants/router.ts

@@ -15,6 +15,7 @@
  taskSubmitCheck = '/subpackages/task/taskSubmitCheck/taskSubmitCheck',
  taskCheckDetail = '/subpackages/task/taskCheckDetail/taskCheckDetail',
  taskUserSubmitCheckHistories = '/subpackages/task/taskUserSubmitCheckHistories/taskUserSubmitCheckHistories',
  taskUserSubmitCheckHistoriesDetail = '/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail',

  // userInfo = '/subpackages/setting/userInfo/userInfo',
  // setting = '/subpackages/setting/setting/setting',

 apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue

@@ -14,24 +14,20 @@
    >
      <ProTabPane :title="`全部`" :pane-key="0"></ProTabPane>
      <ProTabPane
        :title="EnumTaskUserSubmitCheckHistoryTypeText[EnumTaskUserSubmitCheckHistoryType.CheckIn]"
        :pane-key="EnumTaskUserSubmitCheckHistoryType.CheckIn"
      ></ProTabPane>
      <ProTabPane
        :title="EnumTaskUserSubmitCheckHistoryTypeText[EnumTaskUserSubmitCheckHistoryType.CheckOut]"
        :pane-key="EnumTaskUserSubmitCheckHistoryType.CheckOut"
        :title="
          EnumGetCheckReceiveTaskCheckInUsersQueryStatusText[
            EnumGetCheckReceiveTaskCheckInUsersQueryStatus.CheckOut
          ]
        "
        :pane-key="EnumGetCheckReceiveTaskCheckInUsersQueryStatus.CheckOut"
      ></ProTabPane>
      <ProTabPane
        :title="
          EnumTaskUserSubmitCheckHistoryTypeText[EnumTaskUserSubmitCheckHistoryType.UnCheckIn]
          EnumGetCheckReceiveTaskCheckInUsersQueryStatusText[
            EnumGetCheckReceiveTaskCheckInUsersQueryStatus.UnCheck
          ]
        "
        :pane-key="EnumTaskUserSubmitCheckHistoryType.UnCheckIn"
      ></ProTabPane>
      <ProTabPane
        :title="
          EnumTaskUserSubmitCheckHistoryTypeText[EnumTaskUserSubmitCheckHistoryType.UnCheckOut]
        "
        :pane-key="EnumTaskUserSubmitCheckHistoryType.UnCheckOut"
        :pane-key="EnumGetCheckReceiveTaskCheckInUsersQueryStatus.UnCheck"
      ></ProTabPane>
    </ProTabs>
    <InfiniteLoading
@@ -45,8 +41,7 @@
          :gender="item.gender"
          :isReal="item.isReal"
          :contactPhoneNumber="item.contactPhoneNumber"
          :type="item.type"
          :checkTime="item.checkTime"
          @click="goDetail(item)"
        />
      </template>
    </InfiniteLoading>
@@ -63,6 +58,8 @@
  EnumTaskUserSubmitCheckHistoryTypeColor,
  EnumTaskUserSubmitCheckHistoryType,
  WeekCN,
  EnumGetCheckReceiveTaskCheckInUsersQueryStatus,
  EnumGetCheckReceiveTaskCheckInUsersQueryStatusText,
} from '@12333/constants';
import { Message, setOSSLink } from '@12333/utils';
import dayjs from 'dayjs';
@@ -78,12 +75,12 @@
const title = `${dayjs(date).format('YYYY年MM月DD日')} 星期${WeekCN[dayjs(date).day()]}`;

const queryState = reactive({
  type: 0 as any as EnumTaskUserSubmitCheckHistoryType,
  type: 0 as any as EnumGetCheckReceiveTaskCheckInUsersQueryStatus,
});

const { infiniteLoadingProps } = useInfiniteLoading(
  async ({ pageParam }) => {
    let params: API.GetCheckReceiveTaskUserSubmitCheckHistoriesQuery = {
    let params: API.GetCheckReceiveTaskCheckInUsersQuery = {
      pageModel: {
        rows: 20,
        page: pageParam,
@@ -92,16 +89,21 @@
      date: dayjs(date).format('YYYY-MM-DD'),
    };
    if (Number(queryState.type) !== 0) {
      params.type = queryState.type;
      params.status = queryState.type;
    }

    let res = await taskCheckReceiveServices.getCheckReceiveTaskUserSubmitCheckHistories(params, {
    let res = await taskCheckReceiveServices.getCheckReceiveTaskCheckInUsers(params, {
      showLoading: false,
    });
    return res;
  },
  {
    queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskUserSubmitCheckHistories', queryState],
    queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskCheckInUsers', queryState],
  }
);
function goDetail(item: API.GetCheckReceiveTaskUserSubmitCheckHistoriesQueryResultItem) {
  Taro.navigateTo({
    url: `${RouterPath.taskUserSubmitCheckHistoriesDetail}?id=${item.id}&date=${date}`,
  });
}
</script>

 apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/InnerPage.vue

New file
@@ -0,0 +1,72 @@
<template>
  <LoadingLayout>
    <!-- <ContentView>
      <ChunkTitle :title="title" />
    </ContentView> -->
    <InfiniteLoading
      scrollViewClassName="common-infinite-scroll-list"
      v-bind="infiniteLoadingProps"
    >
      <template #renderItem="{ item }">
        <TaskCheckHistoryCard
          :avatar="setOSSLink(item.avatar)"
          :name="item.name"
          :gender="item.gender"
          :isReal="item.isReal"
          :contactPhoneNumber="item.contactPhoneNumber"
          :type="item.type"
          :checkTime="item.checkTime"
        />
      </template>
    </InfiniteLoading>
  </LoadingLayout>
</template>

<script setup lang="ts">
import Taro from '@tarojs/taro';
import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive';
import { useInfiniteLoading } from '@12333/hooks';
import { TaskCheckHistoryCard } from '@12333/components';
import { EnumTaskUserSubmitCheckHistoryType, WeekCN } from '@12333/constants';
import { Message, setOSSLink } from '@12333/utils';
import dayjs from 'dayjs';

defineOptions({
  name: 'InnerPage',
});

const router = Taro.useRouter();
const id = router.params?.id ?? '';
const date = router.params?.date ?? '';

const title = `${dayjs(date).format('YYYY年MM月DD日')} 星期${WeekCN[dayjs(date).day()]}`;

const queryState = reactive({
  type: 0 as any as EnumTaskUserSubmitCheckHistoryType,
});

const { infiniteLoadingProps } = useInfiniteLoading(
  async ({ pageParam }) => {
    let params: API.GetCheckReceiveTaskUserSubmitCheckHistoriesQuery = {
      pageModel: {
        rows: 20,
        page: pageParam,
      },
      taskInfoId: id,
      date: dayjs(date).format('YYYY-MM-DD'),
    };

    if (Number(queryState.type) !== 0) {
      params.type = queryState.type;
    }

    let res = await taskCheckReceiveServices.getCheckReceiveTaskUserSubmitCheckHistories(params, {
      showLoading: false,
    });
    return res;
  },
  {
    queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskUserSubmitCheckHistories', queryState],
  }
);
</script>

 apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.config.ts

New file
@@ -0,0 +1,3 @@
export default definePageConfig({
  disableScroll: true,
});

 apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.vue

New file
@@ -0,0 +1,13 @@
<template>
  <PageLayoutWithBg class="taskUserSubmitCheckHistoriesDetail-page-wrapper" title="验收详情">
    <InnerPage />
  </PageLayoutWithBg>
</template>

<script setup lang="ts">
import InnerPage from './InnerPage.vue';

defineOptions({
  name: 'taskUserSubmitCheckHistoriesDetail',
});
</script>

 packages/constants/apiEnum.ts

@@ -209,6 +209,14 @@
  Completed = 20,
}

/** 查询验收任务详情-签到签出记录 */
export enum EnumGetCheckReceiveTaskCheckInUsersQueryStatus {
  /**已签到 */
  CheckOut = 10,
  /**未到岗 */
  UnCheck = 20,
}

/** 没写注释 */
export enum EnumGetCheckReceiveTasksQueryResultItemCheckStatus {
  /**未到岗 */
@@ -587,7 +595,7 @@
  CheckOut = 20,
  /**未到岗 */
  UnCheckIn = 30,
  /**未签出 */
  /**未到岗 */
  UnCheckOut = 40,
}


 packages/constants/task.ts

@@ -15,6 +15,7 @@
  EnumTaskUserSubmitCheckReceiveStatus,
  EnumTaskUserSubmitCheckHistoryType,
  EnumTaskCheckReceiveMethod,
  EnumGetCheckReceiveTaskCheckInUsersQueryStatus,
} from './apiEnum';

export const EnumBillingMethodText = {
@@ -173,6 +174,16 @@
  [EnumTaskUserSubmitCheckHistoryType.UnCheckOut]: Colors.Info,
};

export const EnumGetCheckReceiveTaskCheckInUsersQueryStatusText = {
  [EnumGetCheckReceiveTaskCheckInUsersQueryStatus.CheckOut]: '已到岗',
  [EnumGetCheckReceiveTaskCheckInUsersQueryStatus.UnCheck]: '未到岗',
};

export const EnumGetCheckReceiveTaskCheckInUsersQueryStatusColor = {
  [EnumGetCheckReceiveTaskCheckInUsersQueryStatus.CheckOut]: Colors.Success,
  [EnumGetCheckReceiveTaskCheckInUsersQueryStatus.UnCheck]: Colors.Danger,
};

export const EnumTaskCheckReceiveMethodText = {
  [EnumTaskCheckReceiveMethod.CheckIn]: '人工签到',
  [EnumTaskCheckReceiveMethod.Submit]: '自主提交',

 packages/services/apiV2/taskCheckReceive.ts

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

/** 查询验收签到用户 POST /api/flexjob/taskCheckReceive/getCheckReceiveTaskCheckInUsers */
export async function getCheckReceiveTaskCheckInUsers(
  body: API.GetCheckReceiveTaskCheckInUsersQuery,
  options?: API.RequestConfig
) {
  return request<API.GetCheckReceiveTaskCheckInUsersQueryResult>(
    '/api/flexjob/taskCheckReceive/getCheckReceiveTaskCheckInUsers',
    {
      method: 'POST',
      headers: {
        'Content-Type': 'application/json-patch+json',
      },
      data: body,
      ...(options || {}),
    }
  );
}

/** 查询验收任务分页列表 POST /api/flexjob/taskCheckReceive/getCheckReceiveTasks */
export async function getCheckReceiveTasks(
  body: API.GetCheckReceiveTasksQuery,

 packages/services/apiV2/typings.d.ts

@@ -593,9 +593,9 @@
    /** 实发金额 */
    actualSettlementAmount: number;
    /** 收款账户 */
    receiveAccount: string;
    receiveAccount?: string;
    /** 所属银行 */
    bank: string;
    bank?: string;
    /** 开户支行名称 */
    bankBranch?: string;
  }
@@ -853,6 +853,13 @@
    None = 10,
    /**已报名 */
    Completed = 20,
  }

  enum EnumGetCheckReceiveTaskCheckInUsersQueryStatus {
    /**已签到 */
    CheckOut = 10,
    /**未到岗 */
    UnCheck = 20,
  }

  enum EnumGetCheckReceiveTasksQueryResultItemCheckStatus {
@@ -1200,7 +1207,7 @@
    CheckOut = 20,
    /**未到岗 */
    UnCheckIn = 30,
    /**未签出 */
    /**未到岗 */
    UnCheckOut = 40,
  }

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

  interface FriendlyResultGetCheckReceiveTaskCheckInUsersQueryResult {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    data?: GetCheckReceiveTaskCheckInUsersQueryResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
@@ -3535,6 +3560,40 @@
    number?: string;
  }

  interface GetCheckReceiveTaskCheckInUsersQuery {
    /** 任务Id */
    taskInfoId?: string;
    /** 日期 */
    date?: string;
    status?: EnumGetCheckReceiveTaskCheckInUsersQueryStatus;
    pageModel?: PagedListQueryPageModel;
  }

  interface GetCheckReceiveTaskCheckInUsersQueryResult {
    pageModel?: PagedListQueryResultPageModel;
    /** 数据 */
    data?: GetCheckReceiveTaskCheckInUsersQueryResultItem[];
  }

  interface GetCheckReceiveTaskCheckInUsersQueryResultItem {
    /** 任务人员Id */
    id?: string;
    /** 头像 */
    avatar?: string;
    /** 姓名 */
    name?: string;
    /** 身份证号 */
    identity?: string;
    gender?: EnumUserGender;
    /** 年龄 */
    age?: number;
    /** 手机号 */
    contactPhoneNumber?: string;
    /** 是否实名 */
    isReal?: boolean;
    realMethod?: EnumUserRealMethod;
  }

  interface GetCheckReceiveTaskQuery {
    /** 任务Id */
    taskInfoId?: string;