wupengfei
3 天以前 538f0972c19b96af2ee361c6af4fc86c41127171
feat: 接口对接
3个文件已添加
6个文件已修改
120 ■■■■■ 已修改文件
apps/bMiniApp/src/app.config.ts 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/constants/router.ts 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/pages/mine/index.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/mine/mineFinanceManage/InnerPage.vue 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/mine/mineFinanceManage/mineFinanceManage.config.ts 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/mine/mineFinanceManage/mineFinanceManage.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/Input/ChooseInputWithDatePicker.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/app.config.ts
@@ -72,6 +72,7 @@
        'setting/setting',
        'mineFavorites/mineFavorites',
        'mineContactRecord/mineContactRecord',
        'mineFinanceManage/mineFinanceManage',
      ],
    },
    {
apps/bMiniApp/src/constants/router.ts
@@ -33,6 +33,7 @@
  setting = '/subpackages/mine/setting/setting',
  mineFavorites = '/subpackages/mine/mineFavorites/mineFavorites',
  mineContactRecord = '/subpackages/mine/mineContactRecord/mineContactRecord',
  mineFinanceManage = '/subpackages/mine/mineFinanceManage/mineFinanceManage',
  businessCard = '/subpackages/businessCard/businessCard/businessCard',
  businessCardEdit = '/subpackages/businessCard/businessCardEdit/businessCardEdit',
apps/bMiniApp/src/pages/mine/index.vue
@@ -69,7 +69,11 @@
        </div>
        <Cell :title="'更多服务'" class="mine-content-service">
          <div class="mine-content-service-list">
            <TaskDetailWelfareItem :icon="IconFinance" text="财务管理"></TaskDetailWelfareItem>
            <TaskDetailWelfareItem
              :icon="IconFinance"
              text="财务管理"
              @click="goFinance"
            ></TaskDetailWelfareItem>
            <TaskDetailWelfareItem
              :icon="IconRealName"
              text="企业实名"
@@ -160,6 +164,10 @@
  goPage(RouterPath.businessCard);
}
function goFinance() {
  goPage(RouterPath.mineFinanceManage);
}
async function handleLoginout() {
  try {
    await Message.confirm({
apps/bMiniApp/src/subpackages/mine/mineFinanceManage/InnerPage.vue
New file
@@ -0,0 +1,61 @@
<template>
  <List>
    <IncomeDetailListItem :item="'收入:¥600.00'">
      <template #title>
        <div class="mineFinanceManage-detail-time-picker">
          <ChooseInputWithDatePicker
            v-model="form.month"
            type="year-month"
            :max-date="nowDate"
          ></ChooseInputWithDatePicker>
        </div>
      </template>
    </IncomeDetailListItem>
    <IncomeDetailListItem
      :title="'收入-宁波人力无忧'"
      :item="'2024.12.20 13:30:30'"
      :value="'+300.00'"
    >
    </IncomeDetailListItem>
  </List>
</template>
<script setup lang="ts">
import { List, IncomeDetailListItem, ChooseInputWithDatePicker } from '@12333/components';
import { useUserStore } from '@/stores/modules/user';
import Taro from '@tarojs/taro';
import dayjs from 'dayjs';
defineOptions({
  name: 'InnerPage',
});
const userStore = useUserStore();
const nowDate = dayjs().toDate();
const form = reactive({
  month: '2024-12',
});
</script>
<style lang="scss">
@import '@/styles/common.scss';
.mineFinanceManage-page-wrapper {
  .mineFinanceManage-detail-time-picker {
    .nut-input {
      border-bottom: none;
      padding: 0;
      .input-text {
        font-size: 20px;
        font-weight: 500;
        height: 28px;
      }
      .nut-input-right-box {
        display: none;
      }
    }
  }
}
</style>
apps/bMiniApp/src/subpackages/mine/mineFinanceManage/mineFinanceManage.config.ts
New file
@@ -0,0 +1,3 @@
export default definePageConfig({
  disableScroll: true,
});
apps/bMiniApp/src/subpackages/mine/mineFinanceManage/mineFinanceManage.vue
New file
@@ -0,0 +1,18 @@
<template>
  <PageLayout class="mineFinanceManage-page-wrapper" :title="'财务管理'" developing>
    <InnerPage></InnerPage>
  </PageLayout>
</template>
<script setup lang="ts">
import { PageLayout } from '@/components';
import InnerPage from './InnerPage.vue';
defineOptions({
  name: 'mineFinanceManage',
});
</script>
<style lang="scss">
@import '@/styles/common.scss';
</style>
apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue
@@ -44,13 +44,13 @@
const searchValue = ref('');
const router = Taro.useRouter();
const id = router.params?.id ?? '';
const status = router.params?.status ?? '';
const status = Number(router.params?.status);
const queryState = reactive({
  keywords: '',
});
const showQueryState = computed(() => {
  return status === 'arrange';
  return status === EnumTaskUserArrangeStatus.Wait;
});
const handleSearch = _.debounce(function () {
@@ -61,7 +61,7 @@
  ({ pageParam }) => {
    let params: API.GetArrangeTaskUsersQuery = {
      keywords: queryState.keywords,
      arrangeStatus: EnumTaskUserArrangeStatus.Wait,
      arrangeStatus: status,
      id: id,
      pageModel: {
        rows: 20,
apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
@@ -31,7 +31,9 @@
        mode="taskManage"
      >
        <template #footer-actions>
          <nut-button type="primary" @click.stop="goBatchTaskList(item, 'arrange')"
          <nut-button
            type="primary"
            @click.stop="goBatchTaskList(item, EnumTaskUserArrangeStatus.Wait)"
            >人员安排</nut-button
          >
          <nut-button
@@ -39,7 +41,7 @@
            type="primary"
            :color="Colors.Info"
            class="dark-btn"
            @click.stop="goBatchTaskList(item, 'detail')"
            @click.stop="goBatchTaskList(item, EnumTaskUserArrangeStatus.Complete)"
            >详情</nut-button
          >
        </template>
@@ -51,7 +53,12 @@
<script setup lang="ts">
import { JobApplicationCard, ProTabs, ProTabPane } from '@12333/components';
import Taro from '@tarojs/taro';
import { EnumTaskStatus, BillingMethodEnumUnit, Colors } from '@12333/constants';
import {
  EnumTaskStatus,
  BillingMethodEnumUnit,
  Colors,
  EnumTaskUserArrangeStatus,
} from '@12333/constants';
import { useTaskList } from '@12333/hooks';
defineOptions({
@@ -77,8 +84,7 @@
  });
}
function goBatchTaskList(item: API.GetTaskInfosQueryResultItem, status: string) {
  console.log('status: ', status);
function goBatchTaskList(item: API.GetTaskInfosQueryResultItem, status: EnumTaskUserArrangeStatus) {
  Taro.navigateTo({
    url: `${RouterPath.batchTaskList}?id=${item.id}&status=${status}`,
  });
packages/components/src/Input/ChooseInputWithDatePicker.vue
@@ -16,6 +16,8 @@
type Props = {
  modelValue: string | number;
  minDate?: Date;
  maxDate?: Date;
  type?: string;
};
const props = withDefaults(defineProps<Props>(), {});
@@ -44,6 +46,8 @@
                h(DatePicker, {
                  modelValue: _modelValue,
                  onCancel: onClose,
                  type: props.type,
                  maxDate: props.maxDate,
                  onConfirm: ({ selectedValue }) => {
                    emit('update:modelValue', dayjs(selectedValue.join('-')).format('YYYY-MM-DD'));
                    onClose();