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

wupengfei

2025-02-14 9486476bd79bb3bc6eeef2b1b69e6222fcd18b00

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

 apps/bMiniApp/project.private.config.json

@@ -9,6 +9,13 @@
        "miniprogram": {
            "list": [
                {
                    "name": "安排任务",
                    "pathName": "subpackages/task/batchTaskList/batchTaskList",
                    "query": "id=57a8f533-2a46-7a88-e008-3a1775810dd2",
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "任务管理",
                    "pathName": "subpackages/task/taskManage/taskManage",
                    "query": "",

 apps/bMiniApp/src/app.config.ts

@@ -82,6 +82,7 @@
        'taskCheckDetail/taskCheckDetail',
        'taskHandleCheckDetail/taskHandleCheckDetail',
        'taskManage/taskManage',
        'batchTaskList/batchTaskList',
      ],
    },
    {

 apps/bMiniApp/src/assets/jx-qrcode.png

 apps/bMiniApp/src/components/Searchbar/BlSearchbar.vue

New file
@@ -0,0 +1,34 @@
<template>
  <nut-searchbar shape="round" class="bole-search-bar" v-model.trim="model" v-bind="$attrs">
    <template #leftin>
      <Search2 />
    </template>
  </nut-searchbar>
</template>

<script setup lang="ts">
import { Search2 } from '@nutui/icons-vue-taro';

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

// type Props = {};

// const props = withDefaults(defineProps<Props>(), {});
const model = defineModel<string>();
</script>

<style lang="scss">
@import '@/styles/common.scss';

.bole-search-bar {
  padding: 0;
  background-color: transparent;

  .nut-searchbar__search-input {
    box-shadow: none;
    border: 1px solid boleGetCssVar('color', 'primary');
  }
}
</style>

 apps/bMiniApp/src/constants/router.ts

@@ -37,6 +37,7 @@
  taskCheckDetail = '/subpackages/task/taskCheckDetail/taskCheckDetail',
  taskHandleCheckDetail = '/subpackages/task/taskHandleCheckDetail/taskHandleCheckDetail',
  taskManage = '/subpackages/task/taskManage/taskManage',
  batchTaskList = '/subpackages/task/batchTaskList/batchTaskList',

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

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

New file
@@ -0,0 +1,80 @@
<template>
  <div class="searchbar-container">
    <BlSearchbar
      v-model.trim="searchValue"
      placeholder="搜索姓名/身份证号"
      @search="handleSearch"
      @change="handleSearch"
    ></BlSearchbar>
  </div>
  <InfiniteLoading scrollViewClassName="common-infinite-scroll-list" v-bind="infiniteLoadingProps">
    <template #renderItem="{ item }">
      <FlexJobCard :showFooterLeft="false">
        <template #footerRight>
          <nut-button type="primary">安排</nut-button>
          <!-- <div class="batch-task-card-status">已安排</div> -->
        </template>
      </FlexJobCard>
    </template>
  </InfiniteLoading>
</template>

<script setup lang="ts">
import Taro from '@tarojs/taro';
import { useInfiniteLoading } from '@12333/hooks';
import { OrderInputType } from '@12333/constants';
import * as orderServices from '@12333/services/api/Order';
import _ from 'lodash';
import { trim } from '@12333/utils';
import { FlexJobCard } from '@12333/components';

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

const searchValue = ref('');

const queryState = reactive({
  searchValueTrim: '',
});

const handleSearch = _.debounce(function () {
  queryState.searchValueTrim = trim(searchValue.value);
}, 300);

const { infiniteLoadingProps } = useInfiniteLoading(
  ({ pageParam }) => {
    let params: API.FrontOrderListInput = {
      pageModel: {
        rows: 20,
        page: pageParam,
        orderInput: [{ property: 'lastShelfTime', order: OrderInputType.Desc }],
      },
    };

    return orderServices.getFrontOrderList(params, {
      showLoading: false,
    });
  },
  {
    queryKey: ['orderServices/getFrontOrderList', queryState],
  }
);
</script>

<style lang="scss">
@import '@/styles/common.scss';

.searchbar-container {
  padding: boleGetCssVar('size', 'body-padding-h');
  padding-top: 0;
}

.batchTaskList-page-wrapper {
  .batch-task-card-status {
    line-height: 52px;
    color: boleGetCssVar('text-color', 'primary');
    font-size: 24px;
  }
}
</style>

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

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

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

New file
@@ -0,0 +1,36 @@
<template>
  <PageLayoutWithBg class="batchTaskList-page-wrapper" title="安排任务">
    <!-- <Image :src="IconQrcode" class="qrcode" @tap="handeClick" /> -->
    <InnerPage />
  </PageLayoutWithBg>
</template>

<script setup lang="ts">
import IconQrcode from '@/assets/jx-qrcode.png';
import Taro from '@tarojs/taro';
import { Image } from '@tarojs/components';
import InnerPage from './InnerPage.vue';

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

function handeClick() {
  Taro.previewImage({
    current: IconQrcode,
    urls: [IconQrcode],
  });
}
</script>

<style lang="scss">
@import '@/styles/common.scss';

.batchTaskList-page-wrapper {
  .qrcode {
    width: 200px;
    height: 200px;
    margin: 400px auto 0;
  }
}
</style>

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

@@ -17,13 +17,13 @@
    :key="queryState.status"
  >
    <template #renderItem="{ item }">
      <TaskCard @click="goSubmitTaskDetail(item)" />
      <JobApplicationCard @click="goSubmitTaskDetail(item)" />
    </template>
  </InfiniteLoading>
</template>

<script setup lang="ts">
import { TaskCard, ProTabs, ProTabPane } from '@12333/components';
import { JobApplicationCard, ProTabs, ProTabPane } from '@12333/components';
import Taro from '@tarojs/taro';
import { useInfiniteLoading } from '@12333/hooks';
import { OrderInputType } from '@12333/constants';
@@ -58,7 +58,7 @@

function goSubmitTaskDetail(item: API.FrontOrderList) {
  Taro.navigateTo({
    url: `${RouterPath.taskCheckDetail}?id=${item.id}`,
    url: `${RouterPath.batchTaskList}?id=${item.id}`,
  });
}
</script>

 packages/components/src/Card/FlexJobCard.vue

@@ -119,6 +119,10 @@
      --nut-button-default-font-size: 24px;
      --nut-button-default-height: 52px;
      --nut-button-default-line-height: 49px;

      .nut-button {
        min-width: 144rpx;
      }
    }
  }
}