zhengyiming
昨天 2a4b768f52d9556a18a3190c5e6390b86abb37d8
Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
6个文件已修改
87 ■■■■■ 已修改文件
apps/bMiniApp/src/subpackages/jobApplicationManage/components/SignList.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue 69 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/jobApplicationManage/components/SignList.vue
@@ -5,7 +5,7 @@
        :name="item.name"
        :age="item.age"
        :gender="item.gender"
        :avatar="item.avatar"
        :avatar="setOSSLink(item.avatar)"
        :isReal="item.isReal"
        :personalIdentityContent="item.personalIdentityContent"
        :educationalBackgroundContent="item.educationalBackgroundContent"
@@ -35,6 +35,7 @@
import { useTaskUserList } from '@12333/hooks';
import { FlexJobCard } from '@12333/components';
import Taro from '@tarojs/taro';
import { setOSSLink } from '@12333/utils';
defineOptions({
  name: 'SignList',
apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
@@ -28,10 +28,12 @@
        :createdTime="item.createdTime"
        :serviceFee="item.serviceFee"
        :unit="BillingMethodEnumUnit[item.billingMethod]"
        @click="goSubmitTaskDetail(item)"
        mode="taskManage"
      >
        <template #footer-actions>
          <nut-button type="primary" @click.stop="goBatchTaskList(item, 'arrange')"
            >人员安排</nut-button
          >
          <nut-button
            v-if="item.status === EnumTaskStatus.Complete"
            type="primary"
@@ -39,9 +41,6 @@
            class="dark-btn"
            @click.stop="goBatchTaskList(item, 'detail')"
            >详情</nut-button
          >
          <nut-button type="primary" v-else @click.stop="goBatchTaskList(item, 'arrange')"
            >人员安排</nut-button
          >
        </template>
      </JobApplicationCard>
apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue
@@ -117,8 +117,8 @@
  onSuccess(data) {
    form.typeCode = data.typeCode;
    form.code = data.code;
    form.startDate = dayjs(data.startDate).format('YYYY-MM-DD');
    form.endDate = dayjs(data.endDate).format('YYYY-MM-DD');
    form.startDate = data.startDate ? dayjs(data.startDate).format('YYYY-MM-DD') : '';
    form.endDate = data.startDate ? dayjs(data.endDate).format('YYYY-MM-DD') : '';
    form.issueUnit = data.issueUnit;
    form.isForever = data.isForever;
    form.img = convertApi2FormUrlOnlyOne(setOSSLink(data.img));
apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
@@ -91,7 +91,7 @@
function goTaskDetail(item: API.GetPersonalHireTaskInfosQueryResultItem) {
  Taro.navigateTo({
    url: `${RouterPath.taskDetail}?id=${item.id}`,
    url: `${RouterPath.taskDetail}?id=${item.id}&from=mine`,
  });
}
</script>
apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
@@ -94,7 +94,7 @@
function goTaskDetail(item: API.GetPersonalApplyTaskInfosQueryResultItem) {
  Taro.navigateTo({
    url: `${RouterPath.taskDetail}?id=${item.id}`,
    url: `${RouterPath.taskDetail}?id=${item.id}&from=mine`,
  });
}
</script>
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
@@ -107,19 +107,47 @@
        :isFlex="false"
        @click="handleCall"
      ></PageFooterAction>
      <PageFooterBtn
        v-if="detail.releaseStatus === EnumTaskReleaseStatus.InProcess"
        type="primary"
        @click="handleApply"
        :disabled="detail?.hireStatus === EnumTaskUserHireStatus.Wait"
        >{{ `报名(${detail?.applyCount ?? 0}人已报名)` }}</PageFooterBtn
      >
      <PageFooterBtn v-if="detail.hireStatus === EnumTaskUserHireStatus.Wait" color="#999999"
        >已停止</PageFooterBtn
      >
      <PageFooterBtn v-if="detail.releaseStatus === EnumTaskReleaseStatus.Stopped" color="#999999"
        >已停止</PageFooterBtn
      >
      <template v-if="from === 'mine'">
        <PageFooterBtn
          v-if="detail.applyButton === GetTaskInfoQueryResultApplyButton.WaitHire"
          color="#999999"
          disabled
          >待确认</PageFooterBtn
        >
        <!-- <PageFooterBtn
        v-if="detail.applyButton === GetTaskInfoQueryResultApplyButton.WaitSignContract"
        >去签约</PageFooterBtn
      > -->
        <PageFooterBtn
          v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.InProcess"
          color="#999999"
          disabled
          >进行中</PageFooterBtn
        >
        <!-- <PageFooterBtn
        v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.ApplyCheckReceive"
        >申请验收</PageFooterBtn
      > -->
        <PageFooterBtn
          v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.Completed"
          color="#999999"
          disabled
          >已完成</PageFooterBtn
        >
      </template>
      <template v-else>
        <PageFooterBtn
          v-if="detail?.releaseStatus === EnumTaskReleaseStatus.InProcess"
          type="primary"
          @click="handleApply"
          :disabled="detail?.hireStatus"
          >{{ `报名(${detail?.applyCount ?? 0}人已报名)` }}</PageFooterBtn
        >
        <PageFooterBtn v-if="detail.releaseStatus === EnumTaskReleaseStatus.Stopped" color="#999999"
          >已停止</PageFooterBtn
        >
      </template>
    </PageFooter>
  </LoadingLayout>
</template>
@@ -147,6 +175,8 @@
  BillingMethodEnumUnit,
  EnumTaskReleaseStatus,
  EnumTaskUserHireStatus,
  GetTaskInfoQueryResultApplyButton,
  GetTaskInfoQueryResultHireButton,
} from '@12333/constants';
import { useAccessLogin } from '@/hooks';
@@ -159,7 +189,8 @@
 */
const router = Taro.useRouter();
const taskId = router.params?.id ?? '';
const id = router.params?.id ?? '';
const from = router.params?.from ?? '';
const {
  isLoading,
@@ -167,10 +198,10 @@
  data: detail,
  refetch,
} = useQuery({
  queryKey: ['taskServices/getTaskInfo', taskId],
  queryKey: ['taskServices/getTaskInfo', id],
  queryFn: async () => {
    return await taskServices.getTaskInfo(
      { id: taskId },
      { id: id },
      {
        showLoading: false,
      }
@@ -186,7 +217,7 @@
const goComplaint = useAccessLogin(() => {
  Taro.navigateTo({
    url: `${RouterPath.complaint}?id=${taskId}`,
    url: `${RouterPath.complaint}?id=${id}`,
  });
});
@@ -201,7 +232,7 @@
const handleApply = useAccessLogin(async () => {
  try {
    let params: API.ApplyTaskCommand = {
      ids: [taskId],
      ids: [id],
    };
    let res = await taskUserServices.applyTask(params);
    if (res) {
@@ -220,7 +251,7 @@
      message: `确定${detail.value?.isCollected ? '取消收藏' : '收藏'}吗?`,
    });
    let params: API.CollectTaskCommand = {
      ids: [taskId],
      ids: [id],
      isCollect: !detail.value?.isCollected,
    };
    let res = await taskUserServices.collectTask(params);