From 6a747ef5b9843b79e91ad2f620887e9851d4002e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Sat, 11 Jan 2025 18:13:10 +0800
Subject: [PATCH 01/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=8F=91=E8=B5=B7=E7=94=B3=E8=AF=B7=E5=92=8C=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E4=B8=AD=E5=BF=83=E7=9A=84UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |  22 ++-
 src/pages/approval/approval.vue               |  78 ++++++++-
 .../approval/components/ApplicationList.vue   |  58 +++++++
 .../approval/components/ApprovalRecords.vue   | 149 ++++++++++++++++++
 src/pages/attendance/attendance.vue           |   6 +-
 src/static/images/icon_default_avatar.png     | Bin 0 -> 3963 bytes
 src/types/uni-pages.d.ts                      |   6 +-
 7 files changed, 313 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/approval/components/ApplicationList.vue
 create mode 100644 src/pages/approval/components/ApprovalRecords.vue
 create mode 100644 src/static/images/icon_default_avatar.png

diff --git a/src/pages.json b/src/pages.json
index 64a6baa..7b81eb9 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -163,7 +163,19 @@
     },
     {
       "path": "pages/info-publish/basic-info",
-      "type": "page"
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/info-publish/drafts-list",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
     },
     {
       "path": "pages/info-publish/info-publish",
@@ -223,6 +235,14 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/attendance/attendance-add-group/attendance-device",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/attendance/attendance-add-group/attendance-staff",
       "type": "page",
diff --git a/src/pages/approval/approval.vue b/src/pages/approval/approval.vue
index 5c80404..e0069bb 100644
--- a/src/pages/approval/approval.vue
+++ b/src/pages/approval/approval.vue
@@ -7,14 +7,18 @@
 }
 </route>
 <template>
-  <view>
+  <view class="h-100vh flex flex-col">
     <TopNavigation :title="index === 0 ? '发起申请' : '审批'"></TopNavigation>
+    <ApplicationList v-if="index === 0" :list="applicationListData"></ApplicationList>
+    <ApprovalRecords v-else></ApprovalRecords>
     <CustomTabBar :list="list" :default-index="index" @change="change"></CustomTabBar>
   </view>
 </template>
 
 <script setup lang="ts">
   import { TabBarItem } from '@/typings'
+  import ApplicationList from '@/pages/approval/components/ApplicationList.vue'
+  import ApprovalRecords from '@/pages/approval/components/ApprovalRecords.vue'
 
   const index = ref<number>(0)
 
@@ -29,6 +33,78 @@
     }
   ]
 
+  const applicationListData = ref<Array<object>>([
+    {
+      groupId: 138603,
+      groupName: '出勤休假',
+      sort: 1,
+      processDefs: [
+        {
+          processDefId: 249155,
+          processDefName: '请假',
+          icon: 'https://file.hikvisionmall.com/test1/image/f39c654cd30a48d28ddf37e4b64de57a.png',
+          version: '1735128632'
+        },
+        {
+          processDefId: 249156,
+          processDefName: '补卡',
+          icon: 'https://file.hikvisionmall.com/test1/image/26209b6732f2439fae3c6dd34a39145e.png',
+          version: '1704439843'
+        },
+        {
+          processDefId: 249158,
+          processDefName: '外出',
+          icon: 'https://file.hikvisionmall.com/test1/image/5c76288745dd47a38c9e1093d9737976.png',
+          version: '1704439843'
+        },
+        {
+          processDefId: 249157,
+          processDefName: '出差',
+          icon: 'https://file.hikvisionmall.com/test1/image/df75579e70c2435e9f78d04fc401b451.png',
+          version: '1704439843'
+        },
+        {
+          processDefId: 347336,
+          processDefName: '加班',
+          icon: 'https://file.hikvisionmall.com/test1/image/e4f21377ea2443b3856b07674ba41c2a.png',
+          version: '1711368134'
+        },
+        {
+          processDefId: 891737,
+          processDefName: '调休',
+          icon: 'https://file.hikvisionmall.com/prod/image/3d134cc9657e4816ad6aa8ef206fbc89.png',
+          version: '1735128832'
+        }
+      ]
+    },
+    {
+      groupId: 341473,
+      groupName: 'test',
+      sort: 2,
+      processDefs: [
+        {
+          processDefId: 924255,
+          processDefName: 'test1',
+          icon: 'https://file.hikvisionmall.com/prod/image/3d134cc9657e4816ad6aa8ef206fbc89.png',
+          version: '1736480449'
+        }
+      ]
+    },
+    {
+      groupId: 138604,
+      groupName: '其他',
+      sort: 999,
+      processDefs: [
+        {
+          processDefId: 466818,
+          processDefName: '访客预约',
+          icon: 'https://file.hikmall.com/prod/image/5300a838119d462b9e1c17489603b6d8.png',
+          version: '1715675086'
+        }
+      ]
+    }
+  ])
+
   onLoad(options => {
     if (options.index) {
       index.value = Number(options.index)
diff --git a/src/pages/approval/components/ApplicationList.vue b/src/pages/approval/components/ApplicationList.vue
new file mode 100644
index 0000000..26d60ba
--- /dev/null
+++ b/src/pages/approval/components/ApplicationList.vue
@@ -0,0 +1,58 @@
+<template>
+  <scroll-view class="flex-1 box-border" :scroll-y="true">
+    <view class="mx-4 pt-4 flex flex-items-center text-3.5 font-bold">
+      <view class="bg-#dfecff flex-1 px-3 py-6 rounded-2">
+        <view>使用指南</view>
+      </view>
+      <view class="w-4"></view>
+      <view class="bg-#feebda flex-1 px-3 py-6 rounded-2">
+        <view>常见问题</view>
+      </view>
+    </view>
+    <view class="py-4">
+      <wd-collapse v-model="collapseRoot" custom-class="!bg-transparent !border-0">
+        <wd-collapse-item
+          v-for="group in list"
+          :key="group.groupId"
+          :name="group.groupName"
+          :title="group.groupName"
+        >
+          <view
+            v-for="(item, index) in group.processDefs"
+            :key="item.processDefId"
+            :class="[index === group.processDefs.length - 1 ? '' : 'mb-2']"
+            class="flex flex-items-center bg-white px-3 py-3 mx-1 rounded-2"
+          >
+            <image :src="item.icon" class="w-7 h-7 rounded-2"></image>
+            <view class="text-3.5 ml-2">{{ item.processDefName }}</view>
+          </view>
+        </wd-collapse-item>
+      </wd-collapse>
+    </view>
+  </scroll-view>
+</template>
+
+<script setup lang="ts">
+  const collapseRoot = ref<string[]>([])
+
+  onMounted(() => {
+    collapseRoot.value = props.list.map(item => item.groupName)
+  })
+
+  const props = defineProps({
+    list: {
+      type: Array,
+      required: true
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+  .wd-collapse-item::after {
+    height: 0 !important;
+  }
+
+  :deep(.wd-collapse-item__header::after) {
+    height: 0 !important;
+  }
+</style>
diff --git a/src/pages/approval/components/ApprovalRecords.vue b/src/pages/approval/components/ApprovalRecords.vue
new file mode 100644
index 0000000..b470eac
--- /dev/null
+++ b/src/pages/approval/components/ApprovalRecords.vue
@@ -0,0 +1,149 @@
+<template>
+  <view class="mx-4 mt-2">
+    <wd-input
+      class="px-2 py-0.6 rounded-1"
+      placeholder="申请名称、发起人"
+      v-model="search"
+      clearable
+      custom-class="border-0"
+      :maxlength="50"
+      prefix-icon="search"
+      @change="handleChange"
+    />
+  </view>
+  <wd-tabs v-model="currentIndex" class="pt-3" auto-line-width @click="handleChange">
+    <wd-tab :title="item" v-for="(item, index) in tabs" :key="item" :name="index" />
+  </wd-tabs>
+  <swiper :current="currentIndex" @change="changeIndex">
+    <swiper-item v-for="(item, index) in tabs" :key="item" class="flex flex-col">
+      <view @click="closeOutside">
+        <wd-drop-menu>
+          <wd-drop-menu-item
+            v-model="typeList[index]"
+            :options="typeOptionList[index]"
+            @change="typeChange"
+          />
+          <wd-drop-menu-item
+            v-model="dateList[index]"
+            :options="dateOptions"
+            @change="dateChange"
+          />
+        </wd-drop-menu>
+      </view>
+      <scroll-view :scroll-y="true" class="flex-1 box-border">
+        <view class="pt-2">
+          <view
+            v-for="item in 10"
+            :key="item"
+            class="mx-4 my-2 p-4 bg-white shadow-sm rounded-2 text-3.5"
+          >
+            <view class="flex flex-items-center mb-2">
+              <view class="text-4.5 font-bold">请假</view>
+              <view class="ml-a px-3 py-1 border-solid border-[#2bbbc3] color-#2bbbc3 rounded">
+                通过
+              </view>
+            </view>
+            <view class="mb-2">请假类型：年假</view>
+            <view class="mb-2">开始时间：2025-12-31</view>
+            <view class="mb-2">结束时间：2025-12-31</view>
+            <view class="flex flex-items-center">
+              <image class="w-8 h-8" src="/static/images/icon_default_avatar.png"></image>
+              <view class="ml-4">xxx</view>
+              <view class="ml-a">2025-12-25</view>
+            </view>
+          </view>
+        </view>
+        <view class="py-6 mx-30%">
+          <wd-divider color="#515357">已经到底了</wd-divider>
+        </view>
+      </scroll-view>
+    </swiper-item>
+  </swiper>
+</template>
+
+<script setup lang="ts">
+  import { useQueue } from 'wot-design-uni'
+
+  const search = ref<string>('')
+
+  const currentIndex = ref<number>(0)
+
+  const tabs = ref<string[]>(['待办', '已办', '抄送我', '已发起'])
+
+  const { closeOutside } = useQueue()
+
+  const typeList = ref<Array<number>>([0, 0, 0, 0])
+  const dateList = ref<Array<number>>([0, 0, 0, 0])
+
+  const typeOptionList = ref<Array<Array<Record<string, number>>>>([
+    [
+      { label: '全部', value: 0 },
+      { label: '补卡', value: 1 },
+      { label: '请假', value: 2 }
+    ],
+    [
+      { label: '全部', value: 0 },
+      { label: '调休', value: 1 }
+    ],
+    [
+      { label: '全部', value: 0 },
+      { label: '补卡', value: 1 },
+      { label: '请假', value: 2 }
+    ],
+    [
+      { label: '全部', value: 0 },
+      { label: '补卡', value: 1 },
+      { label: '请假', value: 2 }
+    ]
+  ])
+
+  const dateOptions = ref<Array<Record<string, number>>>([
+    { label: '全部日期', value: 0 },
+    { label: '近7日', value: 1 },
+    { label: '近14日', value: 2 },
+    { label: '近30日', value: 3 }
+  ])
+
+  function typeChange({ value }) {
+    console.log(value)
+  }
+
+  function dateChange({ value }) {
+    console.log(value)
+  }
+
+  const handleChange = value => {
+    currentIndex.value = value.index
+  }
+
+  const changeIndex = e => {
+    currentIndex.value = e.detail.current
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-input::after {
+    height: 0;
+  }
+
+  .wd-drop-item {
+    top: calc(var(--window-top) + 48px) !important;
+  }
+
+  :deep(.wd-drop-menu__item.is-active .wd-drop-menu__item-title::after) {
+    opacity: 0 !important;
+  }
+
+  :deep(.wd-drop-menu__list) {
+    background-color: transparent !important;
+  }
+
+  :deep(.wd-tabs__nav-item) {
+    margin-bottom: 5px;
+  }
+
+  :deep(.wd-tabs__nav-item.is-active) {
+    font-weight: bold;
+    color: #255cf7;
+  }
+</style>
diff --git a/src/pages/attendance/attendance.vue b/src/pages/attendance/attendance.vue
index 92cfe85..bb290ec 100644
--- a/src/pages/attendance/attendance.vue
+++ b/src/pages/attendance/attendance.vue
@@ -11,9 +11,9 @@
   <view class="h-[calc(100vh-50px)] flex flex-col">
     <TopNavigation :title="titleTab[curIndex]"></TopNavigation>
     <scroll-view class="flex-1 box-border" scroll-y>
-      <view v-for="(item, index) in pages" :key="index" v-show="curIndex == index">
-        <component :is="item"></component>
-      </view>
+      <AttendanceClockIn v-show="curIndex === 0"></AttendanceClockIn>
+      <AttendanceStatistics v-show="curIndex === 1"></AttendanceStatistics>
+      <AttendanceSet v-show="curIndex === 2"></AttendanceSet>
     </scroll-view>
   </view>
   <CustomTabBar :list="list" :default-index="0" @change="change"></CustomTabBar>
diff --git a/src/static/images/icon_default_avatar.png b/src/static/images/icon_default_avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..b93dfad6a207648a45b5f45684ac9d1b2d892d45
GIT binary patch
literal 3963
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
PHw`q@bX1FPn+N|dwed#Y

literal 0
HcmV?d00001

diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 11e6519..b85ce17 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -17,15 +17,19 @@ interface NavigateToOptions {
        "/pages/attendance/issue-record" |
        "/pages/code/code" |
        "/pages/get-code/get-code" |
+       "/pages/info-publish/announce-notice" |
+       "/pages/info-publish/basic-info" |
+       "/pages/info-publish/drafts-list" |
        "/pages/info-publish/info-publish" |
        "/pages/info-publish/notice-details" |
-       "/pages/info-publish/notice" |
+       "/pages/info-publish/notice-manage" |
        "/pages/login/login" |
        "/pages/mine/mine" |
        "/pages/notification/notification" |
        "/pages/reset-password/reset-password" |
        "/pages/workbench/workbench" |
        "/pages/attendance/attendance-add-group/attendance-add-group" |
+       "/pages/attendance/attendance-add-group/attendance-device" |
        "/pages/attendance/attendance-add-group/attendance-staff" |
        "/pages/attendance/attendance-add-group/attendance-time" |
        "/pages/attendance/attendance-add-group/outside-rules" |

From 46f19f1808daac6e3076579361191c73541e3718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 13 Jan 2025 17:52:14 +0800
Subject: [PATCH 02/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E8=AF=A6=E6=83=85=E9=A1=B5UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/approval-detail.vue        | 66 +++++++++++++++
 src/pages/approval/approval.vue               |  6 +-
 .../approval/components/ApplicationList.vue   |  7 ++
 .../approval/components/ApprovalContent.vue   | 61 ++++++++++++++
 .../approval/components/ApprovalProcess.vue   | 81 +++++++++++++++++++
 .../approval/components/ApprovalRecords.vue   | 15 +++-
 6 files changed, 231 insertions(+), 5 deletions(-)
 create mode 100644 src/pages/approval/approval-detail.vue
 create mode 100644 src/pages/approval/components/ApprovalContent.vue
 create mode 100644 src/pages/approval/components/ApprovalProcess.vue

diff --git a/src/pages/approval/approval-detail.vue b/src/pages/approval/approval-detail.vue
new file mode 100644
index 0000000..9b74160
--- /dev/null
+++ b/src/pages/approval/approval-detail.vue
@@ -0,0 +1,66 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    disableScroll: true
+  }
+}
+</route>
+<template>
+  <view class="h-100vh flex flex-col">
+    <TopNavigation title="详情"></TopNavigation>
+    <scroll-view class="flex-1 box-border" :scroll-y="true">
+      <view class="pb-5">
+        <ApprovalContent class="mt-2" />
+        <ApprovalProcess class="mt-2" />
+      </view>
+    </scroll-view>
+    <view class="pb-safe border-#eef0f5 border-t-solid">
+      <view class="flex flex-items-center flex-justify-around py-3">
+        <view class="py-2 px-13 bg-#ef2e2f color-white rounded-2">拒绝</view>
+        <view class="py-2 px-13 custom-bg-blue color-white rounded-2">同意</view>
+        <view class="custom-color-blue text-4" @click="showActions">更多</view>
+      </view>
+    </view>
+    <wd-action-sheet
+      v-model="show"
+      :actions="actions"
+      close-on-click-action
+      @close="close"
+      @select="select"
+    />
+  </view>
+</template>
+
+<script setup lang="ts">
+  import { useToast } from 'wot-design-uni'
+  import ApprovalContent from '@/pages/approval/components/ApprovalContent.vue'
+  import ApprovalProcess from '@/pages/approval/components/ApprovalProcess.vue'
+
+  const toast = useToast()
+
+  const show = ref<boolean>(false)
+  const actions = ref([
+    {
+      name: '专审'
+    },
+    {
+      name: '退回'
+    },
+    {
+      name: '取消'
+    }
+  ])
+
+  const showActions = () => {
+    show.value = true
+  }
+
+  const close = () => {
+    show.value = false
+  }
+
+  const select = ({ item, index }) => {
+    toast.show(`当前选中项: ${item.title}, 下标: ${index}`)
+  }
+</script>
diff --git a/src/pages/approval/approval.vue b/src/pages/approval/approval.vue
index e0069bb..09b0ea5 100644
--- a/src/pages/approval/approval.vue
+++ b/src/pages/approval/approval.vue
@@ -9,8 +9,10 @@
 <template>
   <view class="h-100vh flex flex-col">
     <TopNavigation :title="index === 0 ? '发起申请' : '审批'"></TopNavigation>
-    <ApplicationList v-if="index === 0" :list="applicationListData"></ApplicationList>
-    <ApprovalRecords v-else></ApprovalRecords>
+    <ApplicationList v-show="index === 0" :list="applicationListData"></ApplicationList>
+    <view v-show="index === 1" class="flex-1 box-border">
+      <ApprovalRecords></ApprovalRecords>
+    </view>
     <CustomTabBar :list="list" :default-index="index" @change="change"></CustomTabBar>
   </view>
 </template>
diff --git a/src/pages/approval/components/ApplicationList.vue b/src/pages/approval/components/ApplicationList.vue
index 26d60ba..a8c67fc 100644
--- a/src/pages/approval/components/ApplicationList.vue
+++ b/src/pages/approval/components/ApplicationList.vue
@@ -22,6 +22,7 @@
             :key="item.processDefId"
             :class="[index === group.processDefs.length - 1 ? '' : 'mb-2']"
             class="flex flex-items-center bg-white px-3 py-3 mx-1 rounded-2"
+            @click="toDetail(item)"
           >
             <image :src="item.icon" class="w-7 h-7 rounded-2"></image>
             <view class="text-3.5 ml-2">{{ item.processDefName }}</view>
@@ -45,6 +46,12 @@
       required: true
     }
   })
+
+  const toDetail = (item: Record<string, any>) => {
+    uni.navigateTo({
+      url: `/pages/approval/create-application?id=${item.processDefId}&title=${item.processDefName}`
+    })
+  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/approval/components/ApprovalContent.vue b/src/pages/approval/components/ApprovalContent.vue
new file mode 100644
index 0000000..031fa1d
--- /dev/null
+++ b/src/pages/approval/components/ApprovalContent.vue
@@ -0,0 +1,61 @@
+<template>
+  <view class="bg-white rounded-2 py-2 px-4 mx-4">
+    <view class="flex flex-items-center">
+      <image
+        src="/static/images/icon_default_avatar.png"
+        class="w-10 h-10"
+        mode="aspectFill"
+      ></image>
+      <view class="ml-4">
+        <view class="font-bold text-4.5">请假</view>
+        <view class="text-3.5 mt-1">xxx</view>
+      </view>
+      <view
+        class="ml-a rounded py-0.5 px-1.5 text-3.5 border-solid border-1 border-#ef811c color-#ef811c"
+      >
+        审批中
+      </view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>所属组织：</view>
+      <view class="mt-2 break-all">123132123的互联</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>审批编号：</view>
+      <view class="mt-2 break-all">845465465465465465456</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>请假类型：</view>
+      <view class="mt-2 break-all">年假</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>开始时间：</view>
+      <view class="mt-2 break-all">2025-01-10</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>结束时间：</view>
+      <view class="mt-2 break-all">2025-01-10</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>请假时长(天)：</view>
+      <view class="mt-2 break-all">1.0</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>请假原因：</view>
+      <view class="mt-2 break-all">
+        请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假1111111111111111111111
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss"></style>
diff --git a/src/pages/approval/components/ApprovalProcess.vue b/src/pages/approval/components/ApprovalProcess.vue
new file mode 100644
index 0000000..c999f2d
--- /dev/null
+++ b/src/pages/approval/components/ApprovalProcess.vue
@@ -0,0 +1,81 @@
+<template>
+  <view class="bg-white rounded-2 py-2 px-4 mx-4">
+    <view class="py-2 text-4">审批流程</view>
+    <wd-steps :active="1" vertical>
+      <wd-step icon="link">
+        <template v-slot:title>
+          <view class="custom-color-black text-3.5">
+            <view class="flex-items-center flex">
+              <view>发起申请</view>
+              <view class="ml-a color-#7e807f text-3">2504-12-25 20:11</view>
+            </view>
+            <view class="my-2">
+              <view class="py-1 flex flex-items-center w-fit rounded-4 bg-#f3f5fa">
+                <image
+                  src="/static/images/icon_default_avatar.png"
+                  class="h-6 w-6 rounded-50%"
+                  mode="aspectFill"
+                ></image>
+                <view class="mx-2">xxx</view>
+              </view>
+            </view>
+          </view>
+        </template>
+      </wd-step>
+      <wd-step icon="link">
+        <template v-slot:title>
+          <view class="custom-color-black text-3.5">
+            <view class="flex-items-center flex">
+              <view>审批节点</view>
+              <view
+                class="ml-3 rounded-4 py-0.5 text-3 px-2 border-solid border-#ef811c border-1 color-#ef811c"
+              >
+                审批中
+              </view>
+            </view>
+            <view class="pt-2 color-#7e807f text-3">1人通过即可</view>
+            <view class="my-2">
+              <view
+                v-for="item in 4"
+                :key="item"
+                class="mb-2 py-1 flex flex-items-center w-fit rounded-4 bg-#f3f5fa"
+              >
+                <image
+                  src="/static/images/icon_default_avatar.png"
+                  class="h-6 w-6 rounded-50%"
+                  mode="aspectFill"
+                ></image>
+                <view class="mx-2">xxx</view>
+              </view>
+            </view>
+          </view>
+        </template>
+      </wd-step>
+      <wd-step icon="link">
+        <template v-slot:title>
+          <view class="custom-color-black text-3.5">
+            <view class="flex-items-center flex">
+              <view>抄送节点</view>
+            </view>
+            <view class="my-2">
+              <view
+                v-for="item in 4"
+                :key="item"
+                class="mb-2 py-1 flex flex-items-center w-fit rounded-4 bg-#f3f5fa"
+              >
+                <image
+                  src="/static/images/icon_default_avatar.png"
+                  class="h-6 w-6 rounded-50%"
+                  mode="aspectFill"
+                ></image>
+                <view class="mx-2">xxx</view>
+              </view>
+            </view>
+          </view>
+        </template>
+      </wd-step>
+    </wd-steps>
+  </view>
+</template>
+
+<script setup lang="ts"></script>
diff --git a/src/pages/approval/components/ApprovalRecords.vue b/src/pages/approval/components/ApprovalRecords.vue
index b470eac..9d24188 100644
--- a/src/pages/approval/components/ApprovalRecords.vue
+++ b/src/pages/approval/components/ApprovalRecords.vue
@@ -36,10 +36,13 @@
             v-for="item in 10"
             :key="item"
             class="mx-4 my-2 p-4 bg-white shadow-sm rounded-2 text-3.5"
+            @click="toDetail(item)"
           >
             <view class="flex flex-items-center mb-2">
               <view class="text-4.5 font-bold">请假</view>
-              <view class="ml-a px-3 py-1 border-solid border-[#2bbbc3] color-#2bbbc3 rounded">
+              <view
+                class="ml-a px-3 py-1 border-solid border-[#2bbbc3] border-1 color-#2bbbc3 rounded"
+              >
                 通过
               </view>
             </view>
@@ -104,14 +107,20 @@
     { label: '近30日', value: 3 }
   ])
 
-  function typeChange({ value }) {
+  const typeChange = ({ value }) => {
     console.log(value)
   }
 
-  function dateChange({ value }) {
+  const dateChange = ({ value }) => {
     console.log(value)
   }
 
+  const toDetail = item => {
+    uni.navigateTo({
+      url: '/pages/approval/approval-detail'
+    })
+  }
+
   const handleChange = value => {
     currentIndex.value = value.index
   }

From 735ff0c7223a5b141f838c9c4104b8486f8cc6d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 13 Jan 2025 17:52:54 +0800
Subject: [PATCH 03/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E8=BE=93=E5=85=A5=E6=A1=86=E4=B8=8E?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A1=86=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                               | 16 +++++
 src/pages/approval/components/Components.vue | 42 ++++++++++++
 src/pages/approval/components/Input.vue      | 64 ++++++++++++++++++
 src/pages/approval/components/Textarea.vue   | 71 ++++++++++++++++++++
 src/pages/approval/create-application.vue    | 40 +++++++++++
 src/types/uni-pages.d.ts                     |  2 +
 6 files changed, 235 insertions(+)
 create mode 100644 src/pages/approval/components/Components.vue
 create mode 100644 src/pages/approval/components/Input.vue
 create mode 100644 src/pages/approval/components/Textarea.vue
 create mode 100644 src/pages/approval/create-application.vue

diff --git a/src/pages.json b/src/pages.json
index 7b81eb9..5e5745b 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -63,6 +63,14 @@
       "path": "pages/application-list/application-list",
       "type": "page"
     },
+    {
+      "path": "pages/approval/approval-detail",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      }
+    },
     {
       "path": "pages/approval/approval",
       "type": "page",
@@ -71,6 +79,14 @@
         "disableScroll": true
       }
     },
+    {
+      "path": "pages/approval/create-application",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      }
+    },
     {
       "path": "pages/attendance/allowed-time",
       "type": "page",
diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
new file mode 100644
index 0000000..0162720
--- /dev/null
+++ b/src/pages/approval/components/Components.vue
@@ -0,0 +1,42 @@
+<template>
+  <view>
+    <view class="mx-4 p-2 rounded-2">
+      <Input
+        :id="0"
+        value="单行"
+        title="单行文本"
+        :required="true"
+        placeholder="单行文本"
+        @change="inputChange"
+      ></Input>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Textarea
+        :id="1"
+        title="多行文本"
+        :required="false"
+        placeholder="多行文本"
+        @change="textareaChange"
+      ></Textarea>
+      <wd-divider color="#bcbfbe"></wd-divider>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import Input from '@/pages/approval/components/Input.vue'
+  import Textarea from '@/pages/approval/components/Textarea.vue'
+
+  const inputChange = e => {
+    console.log('inputChange', e)
+  }
+
+  const textareaChange = e => {
+    console.log('textareaChange', e)
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-divider {
+    padding: 0 0.5rem;
+  }
+</style>
diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue
new file mode 100644
index 0000000..ff1e7d5
--- /dev/null
+++ b/src/pages/approval/components/Input.vue
@@ -0,0 +1,64 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="pt-2">
+      <wd-input
+        custom-class="!bg-transparent"
+        :placeholder="placeholder"
+        :maxlength="30"
+        v-model="text"
+        @input="change(id, $event)"
+      ></wd-input>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const emits = defineEmits(['change'])
+
+  const text = ref<string>('')
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: String,
+      default: ''
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    }
+  })
+
+  onMounted(() => {
+    text.value = props.value
+  })
+
+  const change = (id, data) => {
+    emits('change', { id, value: data.value })
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-input::after {
+    height: 0 !important;
+  }
+
+  :deep(.wd-input__inner) {
+    font-size: 0.875rem;
+  }
+</style>
diff --git a/src/pages/approval/components/Textarea.vue b/src/pages/approval/components/Textarea.vue
new file mode 100644
index 0000000..d870304
--- /dev/null
+++ b/src/pages/approval/components/Textarea.vue
@@ -0,0 +1,71 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="pt-2">
+      <wd-textarea
+        custom-class="!bg-transparent"
+        custom-textarea-class="h-16"
+        :placeholder="placeholder"
+        :maxlength="250"
+        v-model="text"
+        show-word-limit
+        @input="change(id, $event)"
+      ></wd-textarea>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const emits = defineEmits(['change'])
+
+  const text = ref<string>('')
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: String,
+      default: ''
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    }
+  })
+
+  onMounted(() => {
+    text.value = props.value
+  })
+
+  const change = (id, data) => {
+    emits('change', { id, value: data.value })
+  }
+</script>
+
+<style lang="scss" scoped>
+  :deep(.wd-textarea__value),
+  :deep(.wd-textarea__count) {
+    background: transparent !important;
+  }
+
+  :deep(.wd-textarea__inner) {
+    font-size: 0.875rem;
+  }
+
+  .wd-textarea {
+    padding: 0;
+  }
+</style>
diff --git a/src/pages/approval/create-application.vue b/src/pages/approval/create-application.vue
new file mode 100644
index 0000000..c7fd5a4
--- /dev/null
+++ b/src/pages/approval/create-application.vue
@@ -0,0 +1,40 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    disableScroll: true
+  }
+}
+</route>
+<template>
+  <view class="h-100vh flex flex-col">
+    <TopNavigation :title="title"></TopNavigation>
+    <scroll-view class="flex-1 box-border" :scroll-y="true">
+      <Components></Components>
+    </scroll-view>
+    <view class="pb-safe border-#eef0f5 border-t-solid">
+      <view class="flex flex-items-center flex-justify-around py-3 px-3">
+        <view class="py-2 w-45% text-center bg-#e2e5ea custom-color-blue rounded-2">保存草稿</view>
+        <view class="opacity-60% py-2 w-45% text-center custom-bg-blue color-white rounded-2">
+          提交
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import Components from '@/pages/approval/components/Components.vue'
+
+  const title = ref<string>('')
+  const id = ref<number>(null)
+
+  onLoad(options => {
+    if (options.title) {
+      title.value = options.title
+    }
+    if (options.id) {
+      id.value = Number(options.id)
+    }
+  })
+</script>
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index b85ce17..64d411e 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -6,7 +6,9 @@
 interface NavigateToOptions {
   url: "/pages/home/home" |
        "/pages/application-list/application-list" |
+       "/pages/approval/approval-detail" |
        "/pages/approval/approval" |
+       "/pages/approval/create-application" |
        "/pages/attendance/allowed-time" |
        "/pages/attendance/attendance-rules" |
        "/pages/attendance/attendance" |

From 207a55e525e600c0b72cfe0ed127715502f25632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 13 Jan 2025 18:42:04 +0800
Subject: [PATCH 04/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E9=80=89=E6=8B=A9=E5=99=A8=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue  | 34 +++++++++-
 .../approval/components/SelectPicker.vue      | 66 +++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/approval/components/SelectPicker.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 0162720..2cfa5e9 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <view class="mx-4 p-2 rounded-2">
+    <view class="bg-white mx-4 p-2 rounded-2">
       <Input
         :id="0"
         value="单行"
@@ -18,6 +18,22 @@
         @change="textareaChange"
       ></Textarea>
       <wd-divider color="#bcbfbe"></wd-divider>
+      <SelectPicker
+        :value="1"
+        :id="2"
+        title="单选框"
+        placeholder="单选"
+        :columns="columns"
+      ></SelectPicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <SelectPicker
+        :value="[0]"
+        :id="3"
+        title="多选框"
+        placeholder="多选"
+        type="checkbox"
+        :columns="columns"
+      ></SelectPicker>
     </view>
   </view>
 </template>
@@ -25,6 +41,22 @@
 <script setup lang="ts">
   import Input from '@/pages/approval/components/Input.vue'
   import Textarea from '@/pages/approval/components/Textarea.vue'
+  import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
+
+  const columns = ref<Record<number, any>>([
+    {
+      value: 0,
+      label: '男装'
+    },
+    {
+      value: 1,
+      label: '奢侈品'
+    },
+    {
+      value: 2,
+      label: '女装'
+    }
+  ])
 
   const inputChange = e => {
     console.log('inputChange', e)
diff --git a/src/pages/approval/components/SelectPicker.vue b/src/pages/approval/components/SelectPicker.vue
new file mode 100644
index 0000000..4ce41f7
--- /dev/null
+++ b/src/pages/approval/components/SelectPicker.vue
@@ -0,0 +1,66 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="pt-2">
+      <wd-select-picker
+        :type="type"
+        :title="placeholder"
+        :show-confirm="type === 'checkbox'"
+        v-model="picker"
+        :columns="columns"
+        size="large"
+      />
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const picker = ref(-1)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      default: 'radio'
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    },
+    value: {
+      type: [Number, Array, null],
+      default: null
+    },
+    columns: {
+      type: Array,
+      required: true
+    }
+  })
+
+  onMounted(() => {
+    if (props.value) {
+      picker.value = props.value
+    }
+  })
+</script>
+
+<style scoped lang="scss">
+  :deep(.wd-select-picker__cell) {
+    padding: var(--wot-cell-wrapper-padding, 10px) 0;
+    background-color: transparent;
+  }
+</style>

From a8a9f0863a75b2eac47390ba3b44392c0148b43d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 13 Jan 2025 18:56:05 +0800
Subject: [PATCH 05/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E6=95=B0=E5=AD=97=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue | 9 +++++++++
 src/pages/approval/components/Input.vue      | 7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 2cfa5e9..212d071 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -34,6 +34,15 @@
         type="checkbox"
         :columns="columns"
       ></SelectPicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Input
+        :id="4"
+        type="number"
+        title="数字"
+        :required="true"
+        placeholder="数字"
+        @change="inputChange"
+      ></Input>
     </view>
   </view>
 </template>
diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue
index ff1e7d5..96df501 100644
--- a/src/pages/approval/components/Input.vue
+++ b/src/pages/approval/components/Input.vue
@@ -6,9 +6,10 @@
     </view>
     <view class="pt-2">
       <wd-input
+        :type="type"
         custom-class="!bg-transparent"
         :placeholder="placeholder"
-        :maxlength="30"
+        :maxlength="type === 'text' ? 30 : 15"
         v-model="text"
         @input="change(id, $event)"
       ></wd-input>
@@ -26,6 +27,10 @@
       type: Number,
       required: true
     },
+    type: {
+      type: String,
+      default: 'text'
+    },
     required: {
       type: Boolean,
       default: false

From 813ec1dfd6f0449791d7500c62b68776d135053c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 14 Jan 2025 18:17:24 +0800
Subject: [PATCH 06/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue  |  22 ++
 .../approval/components/DatetimePicker.vue    | 196 ++++++++++++++++++
 2 files changed, 218 insertions(+)
 create mode 100644 src/pages/approval/components/DatetimePicker.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 212d071..0cfb397 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -43,6 +43,23 @@
         placeholder="数字"
         @change="inputChange"
       ></Input>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePicker :id="5" title="日期1" @change="changeDate"></DatetimePicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePicker
+        :id="6"
+        title="日期2"
+        type="dateHalfDay"
+        @change="changeDate"
+      ></DatetimePicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePicker
+        :id="7"
+        type="datetime"
+        :value="1737043380000"
+        title="日期3"
+        @change="changeDate"
+      ></DatetimePicker>
     </view>
   </view>
 </template>
@@ -51,6 +68,7 @@
   import Input from '@/pages/approval/components/Input.vue'
   import Textarea from '@/pages/approval/components/Textarea.vue'
   import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
+  import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
 
   const columns = ref<Record<number, any>>([
     {
@@ -74,6 +92,10 @@
   const textareaChange = e => {
     console.log('textareaChange', e)
   }
+
+  const changeDate = e => {
+    console.log('changeDate', e)
+  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/approval/components/DatetimePicker.vue b/src/pages/approval/components/DatetimePicker.vue
new file mode 100644
index 0000000..95fc9c5
--- /dev/null
+++ b/src/pages/approval/components/DatetimePicker.vue
@@ -0,0 +1,196 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="py-2" @click="openDialog">
+      <view class="flex flex-items-center flex-justify-between">
+        <view>{{ text || placeholder }}</view>
+        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+      </view>
+    </view>
+  </view>
+  <wd-popup
+    v-model="show"
+    position="bottom"
+    custom-style="border-radius:12rpx;"
+    @after-leave="afterLeave"
+  >
+    <view>
+      <view class="p-4 text-3.5 border-b-1 border-[#dcdcdc] border-solid flex flex-items-center">
+        <view class="font-bold">日期：</view>
+        <view class="font-bold ml-a" v-if="type !== 'dateHalfDay'">{{ date }}</view>
+      </view>
+      <view v-if="(type === 'date' || type === 'datetime') && showPicker">
+        <wd-datetime-picker-view
+          :formatter="formatter"
+          :type="type"
+          v-model="timestamp"
+          label="日期选择"
+          @change="change"
+        />
+      </view>
+      <view v-if="type === 'dateHalfDay' && showPicker">
+        <wd-tabs v-model="tab">
+          <wd-tab :title="index === 0 ? date : halfDay" v-for="(item, index) in 2" :key="index">
+            <view v-show="index === 0">
+              <wd-datetime-picker-view
+                :formatter="formatter"
+                type="date"
+                v-model="timestamp"
+                @change="change"
+              />
+            </view>
+            <view v-show="index === 1">
+              <wd-picker-view :columns="['上午', '下午']" v-model="halfDay" @change="change" />
+            </view>
+          </wd-tab>
+        </wd-tabs>
+      </view>
+      <view class="pb-safe">
+        <view class="flex py-3 flex-items-center flex-justify-around text-3.5 px-2 font-bold">
+          <view
+            class="w-45% bg-#eeeff4 custom-color-blue py-2.5 rounded-2 text-center"
+            @click="show = false"
+          >
+            取消
+          </view>
+          <view
+            class="w-45% custom-bg-blue color-white py-2.5 rounded-2 text-center"
+            @click="confirm"
+          >
+            确定
+          </view>
+        </view>
+      </view>
+    </view>
+  </wd-popup>
+</template>
+
+<script setup lang="ts">
+  import dayjs from 'dayjs'
+
+  const show = ref<boolean>(false)
+  const timestamp = ref<number>(0)
+  const text = ref<string>('')
+  const date = ref<string>('')
+  const halfDay = ref<string>('')
+  const showPicker = ref<boolean>(false)
+  const returnTimestamp = ref<number>(0)
+
+  const tab = ref<number>(0)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      default: 'date'
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [Number, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    }
+  })
+
+  const formatter = (type, value) => {
+    switch (type) {
+      case 'year':
+        return value + '年'
+      case 'month':
+        return value + '月'
+      case 'date':
+        return value + '日'
+      case 'hour':
+        return value + '时'
+      case 'minute':
+        return value + '分'
+      default:
+        return value
+    }
+  }
+
+  const emits = defineEmits(['change'])
+
+  onMounted(() => {
+    if (props.value) {
+      timestamp.value = props.value
+      if (props.type === 'date') {
+        date.value = dayjs(props.value).format('YYYY-M-D')
+        text.value = date.value
+      } else if (props.type === 'datetime') {
+        date.value = dayjs(props.value).format('YYYY-M-D HH:mm')
+        text.value = date.value
+      } else if (props.type === 'dateHalfDay') {
+        date.value = dayjs(props.value).format('YYYY年M月D日')
+        halfDay.value = dayjs(props.value).hour() < 12 ? '上午' : '下午'
+        text.value = `${date.value} ${halfDay.value}`
+      }
+    }
+  })
+
+  const change = ({ value }) => {
+    if (props.type === 'date') {
+      date.value = dayjs(value).format('YYYY-M-D')
+    } else if (props.type === 'datetime') {
+      date.value = dayjs(value).format('YYYY-M-D HH:mm')
+    } else if (props.type === 'dateHalfDay') {
+      if (tab.value === 0) {
+        date.value = dayjs(value).format('YYYY年M月D日')
+      } else {
+        halfDay.value = value
+      }
+    }
+  }
+
+  const openDialog = () => {
+    if (!props.value) {
+      if (text.value === '') {
+        timestamp.value = new Date().getTime()
+      } else {
+        timestamp.value = returnTimestamp.value
+      }
+
+      if (props.type === 'date') {
+        date.value = dayjs(timestamp.value).format('YYYY-M-D')
+      } else if (props.type === 'datetime') {
+        date.value = dayjs(timestamp.value).format('YYYY-M-D HH:mm')
+      } else if (props.type === 'dateHalfDay') {
+        date.value = dayjs(timestamp.value).format('YYYY年M月D日')
+        halfDay.value = dayjs(timestamp.value).hour() < 12 ? '上午' : '下午'
+      }
+    }
+    showPicker.value = true
+    show.value = true
+  }
+
+  const confirm = () => {
+    show.value = false
+    returnTimestamp.value = timestamp.value
+    if (props.type === 'dateHalfDay') {
+      text.value = `${date.value} ${halfDay.value}`
+    } else {
+      text.value = date.value
+    }
+    emits('change', { id: props.id, value: returnTimestamp.value, text: text.value })
+  }
+
+  const afterLeave = () => {
+    showPicker.value = false
+  }
+</script>

From f2b1753601b633891ec5fe5324b85b6d4fc3bb60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 14 Jan 2025 19:39:14 +0800
Subject: [PATCH 07/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue |  3 +
 src/pages/approval/components/Images.vue     | 61 ++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 src/pages/approval/components/Images.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 0cfb397..2b9bc94 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -60,6 +60,8 @@
         title="日期3"
         @change="changeDate"
       ></DatetimePicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Images id="8" title="图片"></Images>
     </view>
   </view>
 </template>
@@ -69,6 +71,7 @@
   import Textarea from '@/pages/approval/components/Textarea.vue'
   import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
+  import Images from '@/pages/approval/components/Images.vue'
 
   const columns = ref<Record<number, any>>([
     {
diff --git a/src/pages/approval/components/Images.vue b/src/pages/approval/components/Images.vue
new file mode 100644
index 0000000..c1b3798
--- /dev/null
+++ b/src/pages/approval/components/Images.vue
@@ -0,0 +1,61 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="pt-3">
+      <wd-upload
+        :file-list="fileList"
+        multiple
+        :limit="9"
+        image-mode="aspectFill"
+        :size-type="['original']"
+        action="https://mockapi.eolink.com/zhTuw2P8c29bc981a741931bdd86eb04dc1e8fd64865cb5/upload"
+        @change="handleChange"
+      ></wd-upload>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const fileList = ref<any[]>([])
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: Array,
+      default: () => []
+    }
+  })
+
+  onMounted(() => {
+    if (props.value.length > 0) {
+      fileList.value = props.value
+    }
+  })
+
+  const handleChange = ({ fileList: files }) => {
+    console.log('handleChange', files)
+    fileList.value = files
+  }
+</script>
+
+<style scoped lang="scss">
+  :deep(.wd-upload__evoke),
+  :deep(.wd-upload__status-content),
+  :deep(.wd-upload__picture) {
+    border-radius: 12rpx;
+  }
+</style>

From 1bdc3bdc875abe16f6295e6916ca0f43a901d083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 14 Jan 2025 19:44:58 +0800
Subject: [PATCH 08/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E8=AF=B4=E6=98=8E=E9=A1=B9=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue  |  6 ++++++
 src/pages/approval/components/Description.vue | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 src/pages/approval/components/Description.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 2b9bc94..4f2a1c8 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -62,6 +62,11 @@
       ></DatetimePicker>
       <wd-divider color="#bcbfbe"></wd-divider>
       <Images id="8" title="图片"></Images>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Description
+        id="9"
+        title="图片21378912378923718982371217389712397837889713247893428793142897134728900978"
+      ></Description>
     </view>
   </view>
 </template>
@@ -72,6 +77,7 @@
   import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
   import Images from '@/pages/approval/components/Images.vue'
+  import Description from '@/pages/approval/components/Description.vue'
 
   const columns = ref<Record<number, any>>([
     {
diff --git a/src/pages/approval/components/Description.vue b/src/pages/approval/components/Description.vue
new file mode 100644
index 0000000..5bed04c
--- /dev/null
+++ b/src/pages/approval/components/Description.vue
@@ -0,0 +1,18 @@
+<template>
+  <view class="px-2 text-3.5 pb-2">
+    <view class="break-all">{{ title }}</view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    title: {
+      type: String,
+      required: true
+    }
+  })
+</script>

From 0c35f8742c1bfb061834570bc9d5d28454d2017d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Wed, 15 Jan 2025 20:03:50 +0800
Subject: [PATCH 09/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E6=88=90=E5=91=98=E5=8F=8A=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TopNavigation/TopNavigation.vue           |  17 +-
 src/pages.json                                |   8 +
 src/pages/approval/components/Components.vue  |  14 +-
 .../components/MemberOrDepartment.vue         |  65 +++++
 .../components/MemberOrDepartmentItem.vue     |  56 ++++
 .../components/SearchItem.vue                 |  35 +++
 .../select-member-or-department.vue           | 275 ++++++++++++++++++
 src/static/images/icon_delete.png             | Bin 0 -> 1493 bytes
 src/static/images/icon_file.png               | Bin 0 -> 1205 bytes
 src/types/uni-pages.d.ts                      |   1 +
 10 files changed, 468 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/approval/components/MemberOrDepartment.vue
 create mode 100644 src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
 create mode 100644 src/pages/select-member-or-department/components/SearchItem.vue
 create mode 100644 src/pages/select-member-or-department/select-member-or-department.vue
 create mode 100644 src/static/images/icon_delete.png
 create mode 100644 src/static/images/icon_file.png

diff --git a/src/components/TopNavigation/TopNavigation.vue b/src/components/TopNavigation/TopNavigation.vue
index af1bfdd..aa9af26 100644
--- a/src/components/TopNavigation/TopNavigation.vue
+++ b/src/components/TopNavigation/TopNavigation.vue
@@ -31,6 +31,13 @@
             {{ title }}
           </view>
         </view>
+        <view
+          v-if="rightButtonText"
+          class="text-3.5 font-normal pos-absolute right-5"
+          @click="rightButton"
+        >
+          {{ rightButtonText }}
+        </view>
       </view>
     </view>
   </view>
@@ -59,16 +66,24 @@
     backUrl: {
       type: String,
       default: '/static/images/icon_back.png'
+    },
+    rightButtonText: {
+      type: [String, null],
+      default: null
     }
   })
 
-  const emits = defineEmits(['back'])
+  const emits = defineEmits(['back', 'rightButton'])
 
   const back = () => {
     uni.navigateBack()
     emits('back')
   }
 
+  const rightButton = () => {
+    emits('rightButton')
+  }
+
   onMounted(async () => {
     systemInfo.value = await $basic.getSystemInfo()
   })
diff --git a/src/pages.json b/src/pages.json
index 5e5745b..9c1261e 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -239,6 +239,14 @@
       },
       "needLogin": false
     },
+    {
+      "path": "pages/select-member-or-department/select-member-or-department",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      }
+    },
     {
       "path": "pages/workbench/workbench",
       "type": "page"
diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 4f2a1c8..d331ce8 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -61,12 +61,21 @@
         @change="changeDate"
       ></DatetimePicker>
       <wd-divider color="#bcbfbe"></wd-divider>
-      <Images id="8" title="图片"></Images>
+      <Images :id="8" title="图片"></Images>
       <wd-divider color="#bcbfbe"></wd-divider>
       <Description
-        id="9"
+        :id="9"
         title="图片21378912378923718982371217389712397837889713247893428793142897134728900978"
       ></Description>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <MemberOrDepartment :id="10" title="成员" type="member" :multiple="true"></MemberOrDepartment>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <MemberOrDepartment
+        :id="11"
+        title="部门"
+        type="department"
+        :multiple="true"
+      ></MemberOrDepartment>
     </view>
   </view>
 </template>
@@ -78,6 +87,7 @@
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
   import Images from '@/pages/approval/components/Images.vue'
   import Description from '@/pages/approval/components/Description.vue'
+  import MemberOrDepartment from '@/pages/approval/components/MemberOrDepartment.vue'
 
   const columns = ref<Record<number, any>>([
     {
diff --git a/src/pages/approval/components/MemberOrDepartment.vue b/src/pages/approval/components/MemberOrDepartment.vue
new file mode 100644
index 0000000..5339c4c
--- /dev/null
+++ b/src/pages/approval/components/MemberOrDepartment.vue
@@ -0,0 +1,65 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="py-2" @click="toSelect">
+      <view class="flex flex-items-center flex-justify-between">
+        <view>{{ text || placeholder }}</view>
+        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const text = ref<string | null>(null)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [Number, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    }
+  })
+
+  const toSelect = () => {
+    const params = {
+      type: props.type,
+      multiple: props.multiple,
+      title: props.type === 'member' ? '选择审批用户' : '选择部门'
+    }
+    uni.navigateTo({
+      url: `/pages/select-member-or-department/select-member-or-department?params=${JSON.stringify(params)}`,
+      events: {
+        change: res => {
+          console.log(1111, res)
+        }
+      }
+    })
+  }
+</script>
diff --git a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
new file mode 100644
index 0000000..2b3c360
--- /dev/null
+++ b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
@@ -0,0 +1,56 @@
+<template>
+  <view class="flex flex-items-center py-2 text-4" @click="toClick">
+    <view
+      v-if="item.type === 'member'"
+      class="w-10 h-10 flex flex-justify-center flex-items-center"
+    >
+      <image
+        src="/static/images/icon_default_avatar.png"
+        class="w-8 h-8 rounded-2"
+        mode="aspectFill"
+      ></image>
+    </view>
+    <view v-else class="w-10 h-10 flex flex-justify-center flex-items-center bg-#e4f1ff rounded-2">
+      <image src="/static/images/icon_file.png" class="w-6 h-6" mode="aspectFill"></image>
+    </view>
+    <view class="ml-2 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
+      {{ item.name }}
+    </view>
+    <view class="ml-a" v-if="item.type === 'department'">
+      <wd-divider vertical></wd-divider>
+    </view>
+    <view
+      v-if="item.type === 'department'"
+      :class="[disabled ? 'color-#87a9fb' : 'custom-color-blue']"
+      class="ml-1"
+    >
+      下级
+    </view>
+    <wd-icon
+      name="arrow-right"
+      size="14px"
+      class="ml-2"
+      :color="disabled ? '#87a9fb' : '#255cf7'"
+      v-if="item.type === 'department'"
+    ></wd-icon>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const emits = defineEmits(['click'])
+
+  const props = defineProps({
+    item: {
+      type: Object,
+      required: true
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const toClick = () => {
+    emits('click')
+  }
+</script>
diff --git a/src/pages/select-member-or-department/components/SearchItem.vue b/src/pages/select-member-or-department/components/SearchItem.vue
new file mode 100644
index 0000000..9a13733
--- /dev/null
+++ b/src/pages/select-member-or-department/components/SearchItem.vue
@@ -0,0 +1,35 @@
+<template>
+  <view class="flex flex-items-center py-2 text-4" @click="toClick">
+    <view
+      v-if="item.type === 'member'"
+      class="w-10 h-10 flex flex-justify-center flex-items-center"
+    >
+      <image
+        src="/static/images/icon_default_avatar.png"
+        class="w-8 h-8 rounded-2"
+        mode="aspectFill"
+      ></image>
+    </view>
+    <view v-else class="w-10 h-10 flex flex-justify-center flex-items-center bg-#e4f1ff rounded-2">
+      <image src="/static/images/icon_file.png" class="w-6 h-6" mode="aspectFill"></image>
+    </view>
+    <view class="ml-2 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
+      {{ item.name }}
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const emits = defineEmits(['click'])
+
+  const props = defineProps({
+    item: {
+      type: Object,
+      required: true
+    }
+  })
+
+  const toClick = () => {
+    emits('click')
+  }
+</script>
diff --git a/src/pages/select-member-or-department/select-member-or-department.vue b/src/pages/select-member-or-department/select-member-or-department.vue
new file mode 100644
index 0000000..f3a80e6
--- /dev/null
+++ b/src/pages/select-member-or-department/select-member-or-department.vue
@@ -0,0 +1,275 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    disableScroll: true
+  }
+}
+</route>
+<template>
+  <view>
+    <view v-if="showSearch" class="h-[calc(100vh-60px)] flex flex-col">
+      <view v-if="systemInfo" :style="{ marginTop: systemInfo.safeAreaInsets?.top + 'px' }">
+        <view class="h-12 pt-1 pb-2">
+          <wd-search
+            :placeholder-left="true"
+            :focus="false"
+            @change="changeSearch"
+            @cancel="showSearch = false"
+          />
+        </view>
+      </view>
+      <scroll-view class="flex-1 box-border" :scroll-y="true">
+        <view class="bg-white">
+          <view
+            v-for="item in list"
+            :key="item.id"
+            class="border-[#ebebeb] border-b-1 border-b-solid px-4 flex flex-items-center"
+          >
+            <view
+              v-if="!(type === 'member' && item.type === 'department')"
+              class="mr-3"
+              @click="toClick(item)"
+            >
+              <wd-icon
+                v-if="value.includes(item)"
+                name="check-circle-filled"
+                color="#255cf9"
+                size="26px"
+              ></wd-icon>
+              <wd-icon v-else name="circle1" color="#838589" size="26px"></wd-icon>
+            </view>
+            <SearchItem class="flex-1" :item="item" @click="toClick(item)"></SearchItem>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+    <view v-if="!showSearch" class="h-[calc(100vh-60px-env(safe-area-inset-bottom))] flex flex-col">
+      <TopNavigation :title="title"></TopNavigation>
+      <view
+        @click="showSearch = true"
+        class="bg-white flex flex-justify-center flex-items-center rounded color-#a6a6a6 mx-4 mt-3 py-1.5"
+      >
+        <wd-icon name="search" size="16px" class="mr-2"></wd-icon>
+        <view>搜索</view>
+      </view>
+      <view class="flex flex-items-center m-4 text-3.5 break-all overflow-hidden whitespace-nowrap">
+        <view
+          v-for="(department, index) in organizationList"
+          :key="department.id"
+          class="flex flex-items-center"
+          @click="toOrganization(index)"
+        >
+          <span
+            :class="[index === organizationList.length - 1 ? 'color-#838589' : 'custom-color-blue']"
+          >
+            {{ department.name }}
+          </span>
+          <span v-if="index !== organizationList.length - 1" class="mx-0.5">/</span>
+        </view>
+      </view>
+      <scroll-view class="flex-1 box-border" :scroll-y="true">
+        <view class="bg-white">
+          <view
+            v-for="item in list"
+            :key="item.id"
+            class="border-[#ebebeb] border-b-1 border-b-solid px-4 flex flex-items-center"
+          >
+            <view
+              v-if="!(type === 'member' && item.type === 'department')"
+              class="mr-3"
+              @click="toClick(item)"
+            >
+              <wd-icon
+                v-if="value.includes(item)"
+                name="check-circle-filled"
+                color="#255cf9"
+                size="26px"
+              ></wd-icon>
+              <wd-icon v-else name="circle1" color="#838589" size="26px"></wd-icon>
+            </view>
+            <MemberOrDepartmentItem
+              class="flex-1"
+              :item="item"
+              :disabled="item.type === 'department' && value.includes(item)"
+              @click="toClick(item)"
+            ></MemberOrDepartmentItem>
+          </view>
+        </view>
+        <view class="py-5 px-15">
+          <wd-divider color="#838589">仅显示已开通账号的人员</wd-divider>
+        </view>
+      </scroll-view>
+    </view>
+    <view
+      class="pb-safe h-60px px-4 border-[#ebebeb] border-t-1 border-t-solid text-3.5 flex flex-items-center"
+    >
+      <view class="flex flex-items-center flex-justify-between w-full">
+        <view class="flex flex-items-center" v-if="value.length" @click="showSelected = true">
+          <view class="custom-color-blue">已选中：{{ value.length }}个人</view>
+          <wd-icon name="arrow-right" size="16px" class="ml-2" color="#255cf7"></wd-icon>
+        </view>
+        <view v-else></view>
+        <view class="custom-bg-blue color-white py-1 px-5 rounded" @click="confirm">确定</view>
+      </view>
+    </view>
+  </view>
+  <wd-popup v-model="showSelected" position="bottom">
+    <view class="h-100vh flex flex-col bg-#f3f5fa">
+      <TopNavigation
+        title="已选中"
+        :have-back="false"
+        right-button-text="确定"
+        @right-button="showSelected = false"
+      ></TopNavigation>
+      <scroll-view class="flex-1 box-border" :scroll-y="true">
+        <view class="bg-white">
+          <view
+            v-for="item in value"
+            :key="item.id"
+            class="flex flex-items-center px-4 py-3 border-[#ebebeb] border-b-1 border-b-solid"
+          >
+            <image :src="item.avatar" class="w-10 h-10 rounded-2"></image>
+            <view class="ml-4 text-3.5">
+              <view>{{ item.name }}</view>
+              <view class="mt-1 color-#a6a6a6 text-3">{{ item.name }}</view>
+            </view>
+            <view class="p-1 ml-a bg-#f3f5f8 rounded-50%" @click="deleteItem(item)">
+              <image src="/static/images/icon_delete.png" class="w-5 h-5"></image>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </wd-popup>
+</template>
+
+<script setup lang="ts">
+  import { useBasicStore } from '@/store'
+  import MemberOrDepartmentItem from '@/pages/select-member-or-department/components/MemberOrDepartmentItem.vue'
+  import SearchItem from '@/pages/select-member-or-department/components/SearchItem.vue'
+
+  const instance = getCurrentInstance().proxy
+  const eventChannel = instance.getOpenerEventChannel()
+
+  const type = ref<string>('')
+  const multiple = ref<boolean>(false)
+  const title = ref<string>('')
+  const showSearch = ref<boolean>(false)
+
+  const organizationList = ref<Array<object>>([
+    {
+      id: 1,
+      type: 'department',
+      name: '技术部'
+    }
+  ])
+
+  const $basic = useBasicStore()
+
+  const systemInfo = ref(null)
+
+  const value = ref<Array>([])
+  const showSelected = ref<boolean>(false)
+
+  const list = ref<Array<object>>([
+    {
+      id: 0,
+      type: 'department',
+      name: 'xxx的互联',
+      avatar: '/static/images/icon_file.png'
+    },
+    {
+      id: 1,
+      type: 'member',
+      name: '张三',
+      avatar: '/static/images/icon_default_avatar.png'
+    },
+    {
+      id: 2,
+      type: 'member',
+      name: '李四',
+      avatar: '/static/images/icon_default_avatar.png'
+    },
+    {
+      id: 3,
+      type: 'member',
+      name: '王五',
+      avatar: '/static/images/icon_default_avatar.png'
+    }
+  ])
+
+  const toClick = item => {
+    if (value.value.includes(item)) {
+      value.value = value.value.filter(v => v !== item)
+    } else {
+      if (multiple.value || value.value.length === 0) {
+        value.value.push(item)
+      } else {
+        uni.showToast({
+          title: '最多选择一个',
+          icon: 'none'
+        })
+      }
+    }
+  }
+
+  const deleteItem = item => {
+    value.value = value.value.filter(v => v !== item)
+  }
+
+  onMounted(async () => {
+    systemInfo.value = await $basic.getSystemInfo()
+  })
+
+  function changeSearch({ value }) {
+    console.log('输入', value)
+  }
+
+  onLoad(options => {
+    const params = JSON.parse(options.params)
+    type.value = params.type
+    multiple.value = params.multiple
+    title.value = params.title
+  })
+
+  const toOrganization = index => {
+    if (index === organizationList.value.length - 1) {
+      return
+    }
+    uni.navigateBack({
+      delta: organizationList.value.length - index - 1
+    })
+  }
+
+  const change = e => {
+    console.log('change', e)
+  }
+
+  const confirm = () => {
+    eventChannel.emit('change', { value: value.value })
+    uni.navigateBack({
+      delta: organizationList.value.length
+    })
+  }
+</script>
+
+<style scoped lang="scss">
+  :deep(.wd-checkbox) {
+    margin-bottom: 0;
+  }
+
+  .wd-search {
+    background: transparent;
+  }
+
+  :deep(.wd-search__block) {
+    padding: 3px 0;
+    background-color: #e2e5ea;
+    border-radius: 0.5rem;
+  }
+
+  :deep(.wd-search__cancel) {
+    color: #a6a6a6;
+  }
+</style>
diff --git a/src/static/images/icon_delete.png b/src/static/images/icon_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..10c193fd39f760e9eda2fbbad302136b9b4c82ba
GIT binary patch
literal 1493
zcmZ`(do<Ju6u!TCYRrrg%E+^_G>FY=JSK*;C?u6MdA43ro}C(x_>EL-IcO(qJ%>`F
zu&rn7F^;k%&y`oosJs$pY0D$*w14mZaqm6%-tT<(p6{M>lbjrFC?q8k08s2~t(_$i
z{c2JKiElRdZkGfk!r8_ON;{RO0q`ky)|SV(9<w>#!7mNSSH@>KdM;&ywVAm=Q@sWC
z{S%hrM>USyIehEhzV=b;n|86=pZaUjF&^&GUQ@$SifX`~q)9ltYl)^zH9ElgIbLUn
zjbvI*v>;+J4UzO!r$%CY{tME;5-%>Ti;c*Kdy01@T;udpH0m6^qoS4PWhy5s3{pzS
z;_w)Ygt(@V$&u+HIb0_!WenrjS&MlF$rdfECz2{TWn%<1W2G@+Y;f2+Y~7XGkaF?%
z6VAhdP%LV{lGls?=ZCfoH89BD+x+1z9=KsRAUEdYd`!;`W%*M(R=6Dvc^qRa_NA+<
zv3=X#xF%ir?F_*f@3F_g?cPh30hfybBw^XxKV+NqZAuE~y2;SiP&e|l-#_4Id?unE
z$*5Ls=$#3QoWen2kF25$;Ihv~ZUQe8Q_KM2f0L?1P~cghxKot3J3ZiUoU@^d;Chj<
z!DcX)I-RuXG}I~kst)RgU48iL?8lA591yznZFoAgo1qL4^@pmSNqL*oIw5~@XC@U)
ziBNs58r%J7-qZ7n>sQ&as8&K1mKJYMq?Os~Vgc<$5-0Xc50ZGzWPmDy1#TCGU4auQ
zj8IWNp*$KKM?1%2KMPv8bHlroM=(w$3O9JGDt9Nx^?K`S^@Gl~Ee(&N7_hFY8yB3*
zX_>|L@2y<;w4`*+%}&;~4tG|Xc3kIAEgweW{Z|Lv)fAKiS-wMG8r+EGhoDF<oCFN?
z{Joo0Dh#6BGnse5_C+{^($&A!6jyu)w)2}wVoJ2`%#JtUWR&?h>X~J97w|9f<HARY
zpp#N)cx=@W^^w+&m3oj*a5nRqrwjK%WPH1?)goD#zCSSd$9v}b9+-otG`qky2pF0G
zcRt;DAccd{Csv<ng9ua%yYy?#FVk#qF^h8}UT?L)@-JZcKLJ~n0K!zN`YTLvHj;`2
z&vyrdb`Pd59VisG9+qDb59(ztNAp}vBpL>Jr-dMCi2XFEAWj8%t{$Sar<@~^dzo2V
z#Ob``IZk%!B}H|BlAa)tATp=ppeA~4#ki6ze1TzM1cgYEA3*5qG<VF`f*(AjvW+CX
zz7G98a10Su#kYbZl?NhaThjZ-8XK%E&Q=Lf+kf^i9!-zJuE&K|05~z#Bs7jXQUJn?
zmBobmTj20-k7F4}XP4n|@J%jpN>PGHB#Wjb*Y=5%Ur;hFb_W}2aXO+M{eJFq`w$49
zY4wg$`s8_iGQ3vMI4{F4RkSXAzHb_amCz(|Y6+f;VK17XN5_v^NOoM^KXch5Fct(+
zQhf?Mdp_!>hcb{pm6r5I1-Dh!jx>6oAv;(r)ztW$j@Et8)mV!J16HAO9ws$DWS>6X
z5Nf7*?dlV2eij=Wn9{WqP1#Qaxcw6W)u`V=_FSilS$I@#vSP#ddV~%6o&4Qu<Gr0}
zX6Ct~!$FHJGeO`7q7SM`9|yxJ(n=^Ds$R^ckEP~q1KpU{J79~ox(_TTH@Y72#2R4P
zrCS6_)q&Ts=;2b`HLbM3Fxkx3c!C!LD?VkJpLpD(C0=qe2GPjh6v`J|Jaf?Gl@JE@
zIk73m#K?c(<kEv%>l^Q+<(QY#dB136jJr!CC6Sbw4YN`c=EdC+5K3t>&LskLg#>?(
z05ks`9Ru9h2tyLoY|`wafp9S^>j(%Pv?H$q<c^Nqz(BB7n;{OwUnczIAyn>Qt_Gl!
yOy+Gsvz!*l2(TJ!>3A4PxaltiqUDZ`qQ>7@h0p6x`KC*LD%c%xv@W&sivI^x=VxXB

literal 0
HcmV?d00001

diff --git a/src/static/images/icon_file.png b/src/static/images/icon_file.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a8886b842e0730c225abb5596c8a0e2df2ca159
GIT binary patch
literal 1205
zcmeAS@N?(olHy`uVBq!ia0vp^y+GW+!3HGF4!o)cQjEnx?oJHr&dI!FU|`Ajba4!+
zh<iKdV9;#?i5Asg0R`EgyizQj&-?uHdNRW%<Z)lR6kC+k>;CIfk-rOFqcY3wQ`mco
zA9b@daXxua(KgwENlJl3ox$Yci5Uzg1_FK$(lX?}9X_49RdM<IOpn<gUYV*tDLJwK
zQvc&%yDKr<j&D75p=Se+rtNw&o(D5yV>xDBW&W(VZVpghZ~y#hn<twHX|yd<Ptg0z
zbS`&^xZ~#!Ryl3Ezm(k;$~|xOwkVJ-clV0jyB8gJ_x*4{dGyz?$6GqnZ8?3<FXx%Q
z(!$_zk7vfadcOR#^>g-}{k=RgX4xs{Ic>`xdtW|2V~0=Yg2EjpwM@_FZ2R*mUuxcJ
z^<HTc&E<z*8s;xg{w&96QvdaQYSu4yri^_jI%Yq5{ea=D_|Jk{3}?Soa$79yvB+F^
z^y_o|M+;rT4JzKLyDW%wJlUO7cuZNzVY7$wYr(xw|M6yAyZk=My0?khq&sw@-a`%x
zht2Eq#Bb|f&=JeMe`x9cD^HfZoZUQOcgzp==mnfdZ+(Ao$y?;Ym$Qy1WG}QlO8PK^
z;lcq&3&sVU?#EabG&UA6ISBXla5^wEKV)f8laUl|U}HPP$>3{Yq{hI@(<00;t02WE
zgKt)$^UFCE_wO?0@ZG<(`H?E`TZhB@cj+~p+&`(ye5xt4?@ME;&`ED=ChlC{n#nBX
zH*?jDbGEs&8kUs^hfaQ5v2kbqPmQ<P7uz>@nO`jI4_#Zzcy>m_%fqKaFTX9>X!kCY
z$-lYuR<dbyvH#4%#Y@B6T=o6mcb@&R|6$h3^%V<unja8<o$I*yk<*-Qd?tRm-FujN
zH9XWM7ZheiKM~DvakM(g&>MVPX}yCo*CkK3j5)W&Dp{ohC-@mTJifB+g!YAwrjkjF
zQp>lw#x=T$ESb!6!D6fKCoYpk3UgB$j;+j{7`{M|^`#2)NHKaf%dA5E@4piT-g3@7
z28`lk+*yUy4wsX(d*6GqojqJvAsJMacSrxWu*!t<nbkF?+BH|&m@;H66MFUh_wv|z
zPZCR_O*&>jtUK^y{p2}(%a8BTEsSE}UGD2S<+WUJRi>6*=CQ_x&3PK@-tPOt_G3|C
z$)y-JX219cJsW!Z`gZ>jDimvaCOhwX;^cRi)HVquOM5?<!>2lb%D!7)eJ_}#&3_x>
z$B?1Le(!LR!)530skRKhPY+Z_@MTnGY}~}YV5Lk2|7k{Fe%-Kd3?@^V-zQowc)9TC
jDY=GaMGtIszDsZ3b$`C!kBA?@a)`mx)z4*}Q$iB}w`U?2

literal 0
HcmV?d00001

diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 64d411e..63e6d56 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -29,6 +29,7 @@ interface NavigateToOptions {
        "/pages/mine/mine" |
        "/pages/notification/notification" |
        "/pages/reset-password/reset-password" |
+       "/pages/select-member-or-department/select-member-or-department" |
        "/pages/workbench/workbench" |
        "/pages/attendance/attendance-add-group/attendance-add-group" |
        "/pages/attendance/attendance-add-group/attendance-device" |

From 51123d48c8893e4fc223cf31ff35d4d403864155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 16 Jan 2025 09:38:56 +0800
Subject: [PATCH 10/31] =?UTF-8?q?fix:=20=E6=95=B4=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TeamPopup/TeamPopup.vue        |  3 +-
 .../TopNavigation/TopNavigation.vue           |  3 +-
 src/pages.json                                | 58 +++++++++----------
 .../application-list.vue                      |  0
 .../home/{ => compoents}/HomeAddDevice.vue    |  0
 .../{ => compoents}/HomeAddTeamManager.vue    |  0
 .../home/{ => compoents}/HomeAttendance.vue   |  0
 .../home/{ => compoents}/HomeBulletin.vue     |  0
 .../home/{ => compoents}/HomeOpenDoor.vue     |  0
 .../home/{ => compoents}/HomeSetting.vue      |  0
 src/pages/home/{ => compoents}/HomeSwiper.vue |  0
 src/pages/home/{ => compoents}/HomeTab.vue    |  2 +-
 .../home/{ => compoents}/HomeTeamManager.vue  |  0
 src/pages/home/{ => compoents}/HomeTodo.vue   |  0
 src/pages/home/home.vue                       | 32 +++++-----
 src/pages/{code => login}/code.vue            |  6 +-
 src/pages/{get-code => login}/get-code.vue    |  8 ++-
 src/pages/login/login.vue                     | 12 +++-
 .../reset-password.vue                        |  6 +-
 .../components/MemberOrDepartmentItem.vue     |  6 +-
 .../select-member-or-department.vue           |  3 +-
 src/service/user.ts                           |  4 +-
 src/types/uni-pages.d.ts                      |  8 +--
 23 files changed, 84 insertions(+), 67 deletions(-)
 rename src/pages/{application-list => home}/application-list.vue (100%)
 rename src/pages/home/{ => compoents}/HomeAddDevice.vue (100%)
 rename src/pages/home/{ => compoents}/HomeAddTeamManager.vue (100%)
 rename src/pages/home/{ => compoents}/HomeAttendance.vue (100%)
 rename src/pages/home/{ => compoents}/HomeBulletin.vue (100%)
 rename src/pages/home/{ => compoents}/HomeOpenDoor.vue (100%)
 rename src/pages/home/{ => compoents}/HomeSetting.vue (100%)
 rename src/pages/home/{ => compoents}/HomeSwiper.vue (100%)
 rename src/pages/home/{ => compoents}/HomeTab.vue (96%)
 rename src/pages/home/{ => compoents}/HomeTeamManager.vue (100%)
 rename src/pages/home/{ => compoents}/HomeTodo.vue (100%)
 rename src/pages/{code => login}/code.vue (97%)
 rename src/pages/{get-code => login}/get-code.vue (93%)
 rename src/pages/{reset-password => login}/reset-password.vue (98%)

diff --git a/src/components/TeamPopup/TeamPopup.vue b/src/components/TeamPopup/TeamPopup.vue
index b9e73f1..d120885 100644
--- a/src/components/TeamPopup/TeamPopup.vue
+++ b/src/components/TeamPopup/TeamPopup.vue
@@ -56,10 +56,11 @@
 
 <script setup lang="ts">
   import { useBasicStore } from '@/store'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
   const show = ref<boolean>(false)
 
   onMounted(async () => {
diff --git a/src/components/TopNavigation/TopNavigation.vue b/src/components/TopNavigation/TopNavigation.vue
index aa9af26..56440b9 100644
--- a/src/components/TopNavigation/TopNavigation.vue
+++ b/src/components/TopNavigation/TopNavigation.vue
@@ -45,10 +45,11 @@
 
 <script lang="ts" setup>
   import { useBasicStore } from '@/store'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
 
   defineProps({
     mini: {
diff --git a/src/pages.json b/src/pages.json
index 9c1261e..35d9713 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -59,10 +59,6 @@
         "disableScroll": true
       }
     },
-    {
-      "path": "pages/application-list/application-list",
-      "type": "page"
-    },
     {
       "path": "pages/approval/approval-detail",
       "type": "page",
@@ -152,22 +148,8 @@
       }
     },
     {
-      "path": "pages/code/code",
-      "type": "page",
-      "style": {
-        "navigationStyle": "custom",
-        "disableScroll": true
-      },
-      "needLogin": false
-    },
-    {
-      "path": "pages/get-code/get-code",
-      "type": "page",
-      "style": {
-        "navigationStyle": "custom",
-        "disableScroll": true
-      },
-      "needLogin": false
+      "path": "pages/home/application-list",
+      "type": "page"
     },
     {
       "path": "pages/info-publish/announce-notice",
@@ -213,6 +195,24 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/login/code",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      },
+      "needLogin": false
+    },
+    {
+      "path": "pages/login/get-code",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      },
+      "needLogin": false
+    },
     {
       "path": "pages/login/login",
       "type": "page",
@@ -222,6 +222,15 @@
       },
       "needLogin": false
     },
+    {
+      "path": "pages/login/reset-password",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      },
+      "needLogin": false
+    },
     {
       "path": "pages/mine/mine",
       "type": "page"
@@ -230,15 +239,6 @@
       "path": "pages/notification/notification",
       "type": "page"
     },
-    {
-      "path": "pages/reset-password/reset-password",
-      "type": "page",
-      "style": {
-        "navigationStyle": "custom",
-        "disableScroll": true
-      },
-      "needLogin": false
-    },
     {
       "path": "pages/select-member-or-department/select-member-or-department",
       "type": "page",
diff --git a/src/pages/application-list/application-list.vue b/src/pages/home/application-list.vue
similarity index 100%
rename from src/pages/application-list/application-list.vue
rename to src/pages/home/application-list.vue
diff --git a/src/pages/home/HomeAddDevice.vue b/src/pages/home/compoents/HomeAddDevice.vue
similarity index 100%
rename from src/pages/home/HomeAddDevice.vue
rename to src/pages/home/compoents/HomeAddDevice.vue
diff --git a/src/pages/home/HomeAddTeamManager.vue b/src/pages/home/compoents/HomeAddTeamManager.vue
similarity index 100%
rename from src/pages/home/HomeAddTeamManager.vue
rename to src/pages/home/compoents/HomeAddTeamManager.vue
diff --git a/src/pages/home/HomeAttendance.vue b/src/pages/home/compoents/HomeAttendance.vue
similarity index 100%
rename from src/pages/home/HomeAttendance.vue
rename to src/pages/home/compoents/HomeAttendance.vue
diff --git a/src/pages/home/HomeBulletin.vue b/src/pages/home/compoents/HomeBulletin.vue
similarity index 100%
rename from src/pages/home/HomeBulletin.vue
rename to src/pages/home/compoents/HomeBulletin.vue
diff --git a/src/pages/home/HomeOpenDoor.vue b/src/pages/home/compoents/HomeOpenDoor.vue
similarity index 100%
rename from src/pages/home/HomeOpenDoor.vue
rename to src/pages/home/compoents/HomeOpenDoor.vue
diff --git a/src/pages/home/HomeSetting.vue b/src/pages/home/compoents/HomeSetting.vue
similarity index 100%
rename from src/pages/home/HomeSetting.vue
rename to src/pages/home/compoents/HomeSetting.vue
diff --git a/src/pages/home/HomeSwiper.vue b/src/pages/home/compoents/HomeSwiper.vue
similarity index 100%
rename from src/pages/home/HomeSwiper.vue
rename to src/pages/home/compoents/HomeSwiper.vue
diff --git a/src/pages/home/HomeTab.vue b/src/pages/home/compoents/HomeTab.vue
similarity index 96%
rename from src/pages/home/HomeTab.vue
rename to src/pages/home/compoents/HomeTab.vue
index f124fe2..00caea8 100644
--- a/src/pages/home/HomeTab.vue
+++ b/src/pages/home/compoents/HomeTab.vue
@@ -50,7 +50,7 @@
 
   const clickMenu = () => {
     uni.navigateTo({
-      url: '/pages/application-list/application-list'
+      url: '/pages/home/application-list'
     })
   }
 
diff --git a/src/pages/home/HomeTeamManager.vue b/src/pages/home/compoents/HomeTeamManager.vue
similarity index 100%
rename from src/pages/home/HomeTeamManager.vue
rename to src/pages/home/compoents/HomeTeamManager.vue
diff --git a/src/pages/home/HomeTodo.vue b/src/pages/home/compoents/HomeTodo.vue
similarity index 100%
rename from src/pages/home/HomeTodo.vue
rename to src/pages/home/compoents/HomeTodo.vue
diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue
index 201d182..bf6f66e 100644
--- a/src/pages/home/home.vue
+++ b/src/pages/home/home.vue
@@ -40,7 +40,7 @@
           <HomeSwiper @colorChange="colorChange"></HomeSwiper>
           <HomeBulletin class="my-2"></HomeBulletin>
           <HomeTodo class="my-2"></HomeTodo>
-          <CustomTab :list="featuresList" @clickItem="clickItem"></CustomTab>
+          <CustomTab :list="featuresList"></CustomTab>
           <HomeOpenDoor class="my-2"></HomeOpenDoor>
           <HomeAttendance class="my-2"></HomeAttendance>
           <HomeTeamManager class="my-2"></HomeTeamManager>
@@ -56,25 +56,26 @@
 </template>
 
 <script lang="ts" setup>
-  import CustomTab from '@/pages/home/HomeTab.vue'
+  import CustomTab from '@/pages/home/compoents/HomeTab.vue'
   import { useBasicStore, useUserStore } from '@/store'
   import { Result } from '@/constants/result'
   import { HomeTab } from '@/typings'
-  import HomeSwiper from '@/pages/home/HomeSwiper.vue'
-  import HomeBulletin from '@/pages/home/HomeBulletin.vue'
-  import HomeTodo from '@/pages/home/HomeTodo.vue'
-  import HomeOpenDoor from '@/pages/home/HomeOpenDoor.vue'
-  import HomeAttendance from '@/pages/home/HomeAttendance.vue'
-  import HomeTeamManager from '@/pages/home/HomeTeamManager.vue'
-  import HomeSetting from '@/pages/home/HomeSetting.vue'
-  import HomeAddDevice from '@/pages/home/HomeAddDevice.vue'
-  import HomeAddTeamManager from '@/pages/home/HomeAddTeamManager.vue'
+  import HomeSwiper from '@/pages/home/compoents/HomeSwiper.vue'
+  import HomeBulletin from '@/pages/home/compoents/HomeBulletin.vue'
+  import HomeTodo from '@/pages/home/compoents/HomeTodo.vue'
+  import HomeOpenDoor from '@/pages/home/compoents/HomeOpenDoor.vue'
+  import HomeAttendance from '@/pages/home/compoents/HomeAttendance.vue'
+  import HomeTeamManager from '@/pages/home/compoents/HomeTeamManager.vue'
+  import HomeSetting from '@/pages/home/compoents/HomeSetting.vue'
+  import HomeAddDevice from '@/pages/home/compoents/HomeAddDevice.vue'
+  import HomeAddTeamManager from '@/pages/home/compoents/HomeAddTeamManager.vue'
   import TeamPopup from '@/components/TeamPopup/TeamPopup.vue'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const $user = useUserStore()
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
 
   const color = ref<string>('#bfcbef')
 
@@ -314,11 +315,4 @@
   const colorChange = data => {
     color.value = data
   }
-
-  const clickItem = item => {
-    console.log(item)
-    uni.navigateTo({
-      url: item.url
-    })
-  }
 </script>
diff --git a/src/pages/code/code.vue b/src/pages/login/code.vue
similarity index 97%
rename from src/pages/code/code.vue
rename to src/pages/login/code.vue
index 04ac263..3f72908 100644
--- a/src/pages/code/code.vue
+++ b/src/pages/login/code.vue
@@ -124,7 +124,7 @@
         }
       } else if (type.value === 'reset-password') {
         await uni.redirectTo({
-          url: `/pages/reset-password/reset-password?phone=${phone.value}&code=${code.value}`
+          url: `/pages/login/reset-password?phone=${phone.value}&code=${code.value}`
         })
       }
     }
@@ -159,4 +159,8 @@
     border: #b8b8b8 solid 2rpx;
     border-radius: 12rpx;
   }
+
+  page {
+    background-color: #ffffff;
+  }
 </style>
diff --git a/src/pages/get-code/get-code.vue b/src/pages/login/get-code.vue
similarity index 93%
rename from src/pages/get-code/get-code.vue
rename to src/pages/login/get-code.vue
index 22720bd..574fe38 100644
--- a/src/pages/get-code/get-code.vue
+++ b/src/pages/login/get-code.vue
@@ -63,7 +63,7 @@
       uni.hideLoading()
       if (result.errorCode === Result.Success.code) {
         await uni.navigateTo({
-          url: `/pages/reset-password/reset-password?phone=${phone.value}`
+          url: `/pages/login/reset-password?phone=${phone.value}`
         })
       } else {
         await uni.showToast({
@@ -85,3 +85,9 @@
     phone.value = value
   }
 </script>
+
+<style lang="scss">
+  page {
+    background-color: #ffffff;
+  }
+</style>
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index c9cc32b..48f0e18 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -61,7 +61,7 @@
               :disabled="!phonePass"
               :round="false"
               size="large"
-              @click="codeLogin"
+              @click="codeLogin(false, $event)"
             >
               获取验证码
             </wd-button>
@@ -264,7 +264,7 @@
       })
       uni.hideLoading()
       if (result.errorCode === Result.Success.code) {
-        let url = `/pages/code/code?phone=${phone.value}&type=login`
+        let url = `/pages/login/code?phone=${phone.value}&type=login`
         if (tip) {
           url = url + `&tip=true`
         }
@@ -298,7 +298,7 @@
       params = `?phone=${phone.value}`
     }
     uni.navigateTo({
-      url: `/pages/get-code/get-code${params}`
+      url: `/pages/login/get-code${params}`
     })
   }
 
@@ -325,3 +325,9 @@
     consentAgreement.value = !consentAgreement.value
   }
 </script>
+
+<style lang="scss">
+  page {
+    background-color: #ffffff;
+  }
+</style>
diff --git a/src/pages/reset-password/reset-password.vue b/src/pages/login/reset-password.vue
similarity index 98%
rename from src/pages/reset-password/reset-password.vue
rename to src/pages/login/reset-password.vue
index c70afde..d89595f 100644
--- a/src/pages/reset-password/reset-password.vue
+++ b/src/pages/login/reset-password.vue
@@ -226,4 +226,8 @@
   }
 </script>
 
-<style scoped lang="scss"></style>
+<style lang="scss">
+  page {
+    background-color: #ffffff;
+  }
+</style>
diff --git a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
index 2b3c360..a845b28 100644
--- a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
+++ b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
@@ -16,11 +16,11 @@
     <view class="ml-2 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
       {{ item.name }}
     </view>
-    <view class="ml-a" v-if="item.type === 'department'">
+    <view class="ml-a" v-if="item.type !== 'member'">
       <wd-divider vertical></wd-divider>
     </view>
     <view
-      v-if="item.type === 'department'"
+      v-if="item.type !== 'member'"
       :class="[disabled ? 'color-#87a9fb' : 'custom-color-blue']"
       class="ml-1"
     >
@@ -31,7 +31,7 @@
       size="14px"
       class="ml-2"
       :color="disabled ? '#87a9fb' : '#255cf7'"
-      v-if="item.type === 'department'"
+      v-if="item.type !== 'member'"
     ></wd-icon>
   </view>
 </template>
diff --git a/src/pages/select-member-or-department/select-member-or-department.vue b/src/pages/select-member-or-department/select-member-or-department.vue
index f3a80e6..c27d26b 100644
--- a/src/pages/select-member-or-department/select-member-or-department.vue
+++ b/src/pages/select-member-or-department/select-member-or-department.vue
@@ -148,6 +148,7 @@
   import { useBasicStore } from '@/store'
   import MemberOrDepartmentItem from '@/pages/select-member-or-department/components/MemberOrDepartmentItem.vue'
   import SearchItem from '@/pages/select-member-or-department/components/SearchItem.vue'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const instance = getCurrentInstance().proxy
   const eventChannel = instance.getOpenerEventChannel()
@@ -167,7 +168,7 @@
 
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
 
   const value = ref<Array>([])
   const showSelected = ref<boolean>(false)
diff --git a/src/service/user.ts b/src/service/user.ts
index eee4867..4bbbe59 100644
--- a/src/service/user.ts
+++ b/src/service/user.ts
@@ -62,8 +62,8 @@ interface TeamInfo {
 }
 
 // 获取用户信息
-export const getUserInfoApi = (params: UserInfo) => {
-  return http.post('/v1/user/detail', params)
+export const getUserInfoApi = () => {
+  return http.post('/v1/user/detail')
 }
 
 export interface resetPasswordRequest {
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 63e6d56..058f3eb 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -5,7 +5,6 @@
 
 interface NavigateToOptions {
   url: "/pages/home/home" |
-       "/pages/application-list/application-list" |
        "/pages/approval/approval-detail" |
        "/pages/approval/approval" |
        "/pages/approval/create-application" |
@@ -17,18 +16,19 @@ interface NavigateToOptions {
        "/pages/attendance/flexible-punching" |
        "/pages/attendance/issue-record-detail" |
        "/pages/attendance/issue-record" |
-       "/pages/code/code" |
-       "/pages/get-code/get-code" |
+       "/pages/home/application-list" |
        "/pages/info-publish/announce-notice" |
        "/pages/info-publish/basic-info" |
        "/pages/info-publish/drafts-list" |
        "/pages/info-publish/info-publish" |
        "/pages/info-publish/notice-details" |
        "/pages/info-publish/notice-manage" |
+       "/pages/login/code" |
+       "/pages/login/get-code" |
        "/pages/login/login" |
+       "/pages/login/reset-password" |
        "/pages/mine/mine" |
        "/pages/notification/notification" |
-       "/pages/reset-password/reset-password" |
        "/pages/select-member-or-department/select-member-or-department" |
        "/pages/workbench/workbench" |
        "/pages/attendance/attendance-add-group/attendance-add-group" |

From d6ff287a65d1437bf77ab366cba2042d1c99e2b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 16 Jan 2025 15:19:30 +0800
Subject: [PATCH 11/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=A8=A1=E5=9D=97=E8=AF=B7=E5=81=87=E3=80=81=E5=87=BA?=
 =?UTF-8?q?=E5=B7=AE=E3=80=81=E5=A4=96=E5=87=BA=E3=80=81=E8=A1=A5=E5=8D=A1?=
 =?UTF-8?q?=E3=80=81=E5=8A=A0=E7=8F=AD=E5=A5=97=E4=BB=B6=E7=9A=84=E5=B0=81?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue  |  23 +++-
 .../approval/components/DatetimePicker.vue    |  63 +++++++++-
 .../components/DatetimePickerGroup.vue        | 110 ++++++++++++++++++
 src/pages/approval/components/Input.vue       |  13 +++
 src/pages/approval/components/Leave.vue       |  97 +++++++++++++++
 .../components/MemberOrDepartment.vue         |   4 +-
 src/pages/approval/components/Overtime.vue    |  43 +++++++
 .../approval/components/SelectPicker.vue      |  40 ++++++-
 8 files changed, 387 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/approval/components/DatetimePickerGroup.vue
 create mode 100644 src/pages/approval/components/Leave.vue
 create mode 100644 src/pages/approval/components/Overtime.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index d331ce8..001aede 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -1,5 +1,5 @@
 <template>
-  <view>
+  <view class="pb-3">
     <view class="bg-white mx-4 p-2 rounded-2">
       <Input
         :id="0"
@@ -76,6 +76,22 @@
         type="department"
         :multiple="true"
       ></MemberOrDepartment>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Leave :id="12"></Leave>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePickerGroup :id="13" type="businessTrip" unit="date"></DatetimePickerGroup>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePickerGroup :id="14" type="goOut" unit="dateHalfDay"></DatetimePickerGroup>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Overtime :id="15"></Overtime>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePicker
+        :id="16"
+        type="datetime"
+        required
+        title="补卡时间"
+        @change="changeDate"
+      ></DatetimePicker>
     </view>
   </view>
 </template>
@@ -88,8 +104,11 @@
   import Images from '@/pages/approval/components/Images.vue'
   import Description from '@/pages/approval/components/Description.vue'
   import MemberOrDepartment from '@/pages/approval/components/MemberOrDepartment.vue'
+  import Leave from '@/pages/approval/components/Leave.vue'
+  import DatetimePickerGroup from '@/pages/approval/components/DatetimePickerGroup.vue'
+  import Overtime from '@/pages/approval/components/Overtime.vue'
 
-  const columns = ref<Record<number, any>>([
+  const columns = ref<Record<number, string>>([
     {
       value: 0,
       label: '男装'
diff --git a/src/pages/approval/components/DatetimePicker.vue b/src/pages/approval/components/DatetimePicker.vue
index 95fc9c5..e27f5d8 100644
--- a/src/pages/approval/components/DatetimePicker.vue
+++ b/src/pages/approval/components/DatetimePicker.vue
@@ -6,7 +6,9 @@
     </view>
     <view class="py-2" @click="openDialog">
       <view class="flex flex-items-center flex-justify-between">
-        <view>{{ text || placeholder }}</view>
+        <view :class="text ? 'custom-color-black' : 'color-#838589'">
+          {{ text || placeholder }}
+        </view>
         <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
       </view>
     </view>
@@ -104,7 +106,31 @@
     },
     placeholder: {
       type: String,
-      default: '请输入'
+      default: '请选择'
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    disabledText: {
+      type: String,
+      default: ''
+    },
+    minDate: {
+      type: [Number, null],
+      default: null
+    },
+    maxDate: {
+      type: [Number, null],
+      default: null
+    },
+    minDateText: {
+      type: String,
+      default: ''
+    },
+    maxDateText: {
+      type: String,
+      default: ''
     }
   })
 
@@ -159,6 +185,13 @@
   }
 
   const openDialog = () => {
+    if (props.disabled) {
+      uni.showToast({
+        title: props.disabledText,
+        icon: 'none'
+      })
+      return
+    }
     if (!props.value) {
       if (text.value === '') {
         timestamp.value = new Date().getTime()
@@ -180,6 +213,20 @@
   }
 
   const confirm = () => {
+    if (props.minDate && timestamp.value < props.minDate) {
+      uni.showToast({
+        title: props.minDateText,
+        icon: 'none'
+      })
+      return
+    }
+    if (props.maxDate && timestamp.value > props.maxDate) {
+      uni.showToast({
+        title: props.maxDateText,
+        icon: 'none'
+      })
+      return
+    }
     show.value = false
     returnTimestamp.value = timestamp.value
     if (props.type === 'dateHalfDay') {
@@ -193,4 +240,16 @@
   const afterLeave = () => {
     showPicker.value = false
   }
+
+  const clear = () => {
+    text.value = ''
+    date.value = ''
+    halfDay.value = ''
+    returnTimestamp.value = 0
+    emits('change', { id: props.id, value: returnTimestamp.value, text: text.value })
+  }
+
+  defineExpose({
+    clear
+  })
 </script>
diff --git a/src/pages/approval/components/DatetimePickerGroup.vue b/src/pages/approval/components/DatetimePickerGroup.vue
new file mode 100644
index 0000000..3d3142d
--- /dev/null
+++ b/src/pages/approval/components/DatetimePickerGroup.vue
@@ -0,0 +1,110 @@
+<template>
+  <view>
+    <DatetimePicker
+      :id="1"
+      ref="startDatetimePicker"
+      title="开始时间"
+      @change="changeDate"
+      :max-date="endTimestamp"
+      max-date-text="开始时间不能晚于结束时间"
+      required
+      :disabled="disabled"
+      :disabled-text="disabledText"
+      :type="unit"
+    ></DatetimePicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <DatetimePicker
+      :id="2"
+      title="结束时间"
+      ref="endDatetimePicker"
+      :min-date="startTimestamp"
+      min-date-text="结束时间不能早于开始时间"
+      @change="changeDate"
+      required
+      :type="unit"
+      :disabled="disabled"
+      :disabled-text="disabledText"
+    ></DatetimePicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input
+      :id="3"
+      ref="inputComponent"
+      type="number"
+      :title="`${textMap[type]}时长${unit === 'datetime' ? '（小时）' : '（天）'}`"
+      required
+      :readonly="updateTime"
+      placeholder="自动计算"
+      @change="inputChange"
+    ></Input>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
+  import Input from '@/pages/approval/components/Input.vue'
+
+  const textMap = {
+    leave: '请假',
+    businessTrip: '出差',
+    goOut: '外出',
+    overtime: '加班'
+  }
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    unit: {
+      type: String,
+      default: 'date'
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    disabledText: {
+      type: String,
+      default: ''
+    },
+    updateTime: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const startTimestamp = ref(0)
+  const endTimestamp = ref(0)
+
+  const startDatetimePicker = ref(null)
+  const endDatetimePicker = ref(null)
+  const inputComponent = ref(null)
+
+  const changeDate = e => {
+    if (e.id === 1) {
+      startTimestamp.value = e.value
+    } else {
+      endTimestamp.value = e.value
+    }
+  }
+
+  const inputChange = e => {
+    console.log('inputChange', e)
+  }
+
+  const clear = () => {
+    startDatetimePicker.value.clear()
+    endDatetimePicker.value.clear()
+    inputComponent.value.clear()
+  }
+
+  defineExpose({
+    clear
+  })
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue
index 96df501..9334107 100644
--- a/src/pages/approval/components/Input.vue
+++ b/src/pages/approval/components/Input.vue
@@ -11,6 +11,7 @@
         :placeholder="placeholder"
         :maxlength="type === 'text' ? 30 : 15"
         v-model="text"
+        :readonly="readonly"
         @input="change(id, $event)"
       ></wd-input>
     </view>
@@ -46,6 +47,10 @@
     placeholder: {
       type: String,
       default: '请输入'
+    },
+    readonly: {
+      type: Boolean,
+      default: false
     }
   })
 
@@ -56,6 +61,14 @@
   const change = (id, data) => {
     emits('change', { id, value: data.value })
   }
+
+  const clear = () => {
+    text.value = ''
+  }
+
+  defineExpose({
+    clear
+  })
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/approval/components/Leave.vue b/src/pages/approval/components/Leave.vue
new file mode 100644
index 0000000..b7bade7
--- /dev/null
+++ b/src/pages/approval/components/Leave.vue
@@ -0,0 +1,97 @@
+<template>
+  <view>
+    <SelectPicker
+      :id="0"
+      title="请假类型"
+      placeholder="请选择"
+      :columns="columns"
+      required
+      @change="changeSelect"
+    ></SelectPicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <DatetimePickerGroup
+      ref="timeGroup"
+      type="leave"
+      :disabled="!leaveType"
+      :updateTime="updateTime"
+      :unit="leaveType?.unit ?? 'date'"
+      disabled-text="请选择请假类型"
+      :id="1"
+    ></DatetimePickerGroup>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
+  import DatetimePickerGroup from '@/pages/approval/components/DatetimePickerGroup.vue'
+
+  const leaveType = ref(null)
+  const timeGroup = ref(null)
+
+  const columns = ref<Record<number, string>>([
+    {
+      value: 0,
+      label: '年假',
+      unit: 'date'
+    },
+    {
+      value: 1,
+      label: '事假',
+      unit: 'dateHalfDay'
+    },
+    {
+      value: 2,
+      label: '病假',
+      unit: 'datetime'
+    },
+    {
+      value: 3,
+      label: '婚假',
+      unit: 'date',
+      limit: 5
+    },
+    {
+      value: 4,
+      label: '产假',
+      unit: 'datetime',
+      limit: 24.5
+    },
+    {
+      value: 5,
+      label: '陪产假',
+      unit: 'datetime'
+    },
+    {
+      value: 6,
+      label: '丧假',
+      unit: 'date'
+    },
+    {
+      value: 7,
+      label: '哺乳假',
+      unit: 'date'
+    }
+  ])
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    updateTime: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const changeSelect = e => {
+    leaveType.value = e.value
+    timeGroup.value.clear()
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-divider {
+    padding: 0 0.5rem;
+  }
+</style>
diff --git a/src/pages/approval/components/MemberOrDepartment.vue b/src/pages/approval/components/MemberOrDepartment.vue
index 5339c4c..e582118 100644
--- a/src/pages/approval/components/MemberOrDepartment.vue
+++ b/src/pages/approval/components/MemberOrDepartment.vue
@@ -6,7 +6,9 @@
     </view>
     <view class="py-2" @click="toSelect">
       <view class="flex flex-items-center flex-justify-between">
-        <view>{{ text || placeholder }}</view>
+        <view :class="text ? 'custom-color-black' : 'color-#838589'">
+          {{ text || placeholder }}
+        </view>
         <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
       </view>
     </view>
diff --git a/src/pages/approval/components/Overtime.vue b/src/pages/approval/components/Overtime.vue
new file mode 100644
index 0000000..683a52c
--- /dev/null
+++ b/src/pages/approval/components/Overtime.vue
@@ -0,0 +1,43 @@
+<template>
+  <view>
+    <DatetimePicker
+      :id="0"
+      ref="startDatetimePicker"
+      title="加班日期"
+      @change="changeDate"
+      required
+    ></DatetimePicker>
+    <wd-divider v-if="timestamp" color="#bcbfbe"></wd-divider>
+    <DatetimePickerGroup
+      v-if="timestamp"
+      type="overtime"
+      unit="datetime"
+      :id="1"
+    ></DatetimePickerGroup>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import DatetimePickerGroup from '@/pages/approval/components/DatetimePickerGroup.vue'
+  import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
+
+  const timestamp = ref<number>(0)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    }
+  })
+
+  const changeDate = e => {
+    timestamp.value = e.value
+    console.log('changeDate', e)
+  }
+</script>
+
+<style scoped lang="scss">
+  .wd-divider {
+    padding: 0 0.5rem;
+  }
+</style>
diff --git a/src/pages/approval/components/SelectPicker.vue b/src/pages/approval/components/SelectPicker.vue
index 4ce41f7..99708b3 100644
--- a/src/pages/approval/components/SelectPicker.vue
+++ b/src/pages/approval/components/SelectPicker.vue
@@ -12,7 +12,9 @@
         v-model="picker"
         :columns="columns"
         size="large"
-      />
+        @change="change"
+        select-size="large"
+      ></wd-select-picker>
     </view>
   </view>
 </template>
@@ -51,11 +53,17 @@
     }
   })
 
+  const emits = defineEmits(['change'])
+
   onMounted(() => {
     if (props.value) {
       picker.value = props.value
     }
   })
+
+  const change = ({ value }) => {
+    emits('change', { id: props.id, value: props.columns.find(item => item.value === value) })
+  }
 </script>
 
 <style scoped lang="scss">
@@ -63,4 +71,34 @@
     padding: var(--wot-cell-wrapper-padding, 10px) 0;
     background-color: transparent;
   }
+
+  :deep(.wd-radio-group),
+  :deep(.wd-checkbox-group) {
+    background-color: #ffffff;
+    border-radius: 0.5rem;
+  }
+
+  :deep(.wd-action-sheet) {
+    background-color: #f3f5fa;
+  }
+
+  :deep(.uni-scroll-view-content) {
+    padding-bottom: 0.5rem;
+  }
+
+  :deep(.wd-radio),
+  :deep(.wd-checkbox) {
+    position: relative;
+    padding: 1rem !important;
+  }
+
+  :deep(.wd-radio)::after,
+  :deep(.wd-checkbox)::after {
+    position: absolute;
+    bottom: 0;
+    left: 4%;
+    width: 92%;
+    content: '';
+    border-bottom: 1px solid #efefef;
+  }
 </style>

From f8be94b7a96bc47292841c87d6d2797cf634ee62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 16 Jan 2025 18:38:45 +0800
Subject: [PATCH 12/31] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=E8=A1=8C=E5=86=85?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F+=E6=B7=BB=E5=8A=A0=E8=99=9A=E6=8B=9F?=
 =?UTF-8?q?=E9=94=AE=E7=9B=98=E7=BB=84=E4=BB=B6+=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=82=80=E7=BA=A6=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |  6 +-
 src/pages/approval/components/Components.vue  | 10 +-
 .../approval/components/DatetimePicker.vue    | 36 +++++--
 src/pages/approval/components/Input.vue       | 53 ++++++++---
 src/pages/approval/components/Keyboard.vue    | 94 +++++++++++++++++++
 .../components/MemberOrDepartment.vue         | 67 -------------
 .../approval/components/NavigatorSelector.vue | 89 ++++++++++++++++++
 .../approval/components/SelectPicker.vue      | 52 +++++++---
 src/pages/approval/components/Visitor.vue     | 86 +++++++++++++++++
 .../components/OrganizationItem.vue}          |  0
 .../components/SearchItem.vue                 |  0
 src/pages/select/select-access-control.vue    |  7 ++
 .../select-organization.vue}                  | 10 +-
 src/types/uni-pages.d.ts                      |  3 +-
 14 files changed, 399 insertions(+), 114 deletions(-)
 create mode 100644 src/pages/approval/components/Keyboard.vue
 delete mode 100644 src/pages/approval/components/MemberOrDepartment.vue
 create mode 100644 src/pages/approval/components/NavigatorSelector.vue
 create mode 100644 src/pages/approval/components/Visitor.vue
 rename src/pages/{select-member-or-department/components/MemberOrDepartmentItem.vue => select/components/OrganizationItem.vue} (100%)
 rename src/pages/{select-member-or-department => select}/components/SearchItem.vue (100%)
 create mode 100644 src/pages/select/select-access-control.vue
 rename src/pages/{select-member-or-department/select-member-or-department.vue => select/select-organization.vue} (96%)

diff --git a/src/pages.json b/src/pages.json
index 35d9713..0c06a21 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -240,7 +240,11 @@
       "type": "page"
     },
     {
-      "path": "pages/select-member-or-department/select-member-or-department",
+      "path": "pages/select/select-access-control",
+      "type": "page"
+    },
+    {
+      "path": "pages/select/select-organization",
       "type": "page",
       "style": {
         "navigationStyle": "custom",
diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 001aede..167026c 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -1,5 +1,6 @@
 <template>
   <view class="pb-3">
+    <Visitor></Visitor>
     <view class="bg-white mx-4 p-2 rounded-2">
       <Input
         :id="0"
@@ -68,14 +69,14 @@
         title="图片21378912378923718982371217389712397837889713247893428793142897134728900978"
       ></Description>
       <wd-divider color="#bcbfbe"></wd-divider>
-      <MemberOrDepartment :id="10" title="成员" type="member" :multiple="true"></MemberOrDepartment>
+      <NavigatorSelector :id="10" title="成员" type="member" :multiple="true"></NavigatorSelector>
       <wd-divider color="#bcbfbe"></wd-divider>
-      <MemberOrDepartment
+      <NavigatorSelector
         :id="11"
         title="部门"
         type="department"
         :multiple="true"
-      ></MemberOrDepartment>
+      ></NavigatorSelector>
       <wd-divider color="#bcbfbe"></wd-divider>
       <Leave :id="12"></Leave>
       <wd-divider color="#bcbfbe"></wd-divider>
@@ -103,10 +104,11 @@
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
   import Images from '@/pages/approval/components/Images.vue'
   import Description from '@/pages/approval/components/Description.vue'
-  import MemberOrDepartment from '@/pages/approval/components/MemberOrDepartment.vue'
+  import NavigatorSelector from '@/pages/approval/components/NavigatorSelector.vue'
   import Leave from '@/pages/approval/components/Leave.vue'
   import DatetimePickerGroup from '@/pages/approval/components/DatetimePickerGroup.vue'
   import Overtime from '@/pages/approval/components/Overtime.vue'
+  import Visitor from '@/pages/approval/components/Visitor.vue'
 
   const columns = ref<Record<number, string>>([
     {
diff --git a/src/pages/approval/components/DatetimePicker.vue b/src/pages/approval/components/DatetimePicker.vue
index e27f5d8..338eed4 100644
--- a/src/pages/approval/components/DatetimePicker.vue
+++ b/src/pages/approval/components/DatetimePicker.vue
@@ -1,15 +1,29 @@
 <template>
   <view class="px-2 text-3.5">
-    <view class="flex flex-items-center pos-relative">
-      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
-      <view>{{ title }}</view>
-    </view>
-    <view class="py-2" @click="openDialog">
-      <view class="flex flex-items-center flex-justify-between">
-        <view :class="text ? 'custom-color-black' : 'color-#838589'">
-          {{ text || placeholder }}
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative pt-2 pb-1">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <view @click="openDialog" class="flex-1 flex flex-items-center">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']" class="ml-a mr-2">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+        </view>
+      </view>
+    </view>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="py-2" @click="openDialog">
+        <view class="flex flex-items-center flex-justify-between">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
         </view>
-        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
       </view>
     </view>
   </view>
@@ -131,6 +145,10 @@
     maxDateText: {
       type: String,
       default: ''
+    },
+    inline: {
+      type: Boolean,
+      default: false
     }
   })
 
diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue
index 9334107..d24115a 100644
--- a/src/pages/approval/components/Input.vue
+++ b/src/pages/approval/components/Input.vue
@@ -1,19 +1,38 @@
 <template>
   <view class="px-2 text-3.5">
-    <view class="flex flex-items-center pos-relative">
-      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
-      <view>{{ title }}</view>
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <wd-input
+          class="flex-1 ml-2"
+          :type="type"
+          custom-class="!bg-transparent"
+          :custom-input-class="inline ? 'text-right' : 'text-left'"
+          :placeholder="placeholder"
+          :maxlength="maxlength ?? (type === 'text' ? 30 : 15)"
+          v-model="text"
+          :readonly="readonly"
+          @input="change(id, $event)"
+        ></wd-input>
+      </view>
     </view>
-    <view class="pt-2">
-      <wd-input
-        :type="type"
-        custom-class="!bg-transparent"
-        :placeholder="placeholder"
-        :maxlength="type === 'text' ? 30 : 15"
-        v-model="text"
-        :readonly="readonly"
-        @input="change(id, $event)"
-      ></wd-input>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="pt-2">
+        <wd-input
+          :type="type"
+          custom-class="!bg-transparent"
+          :placeholder="placeholder"
+          :maxlength="maxlength ?? (type === 'text' ? 30 : 15)"
+          v-model="text"
+          :readonly="readonly"
+          @input="change(id, $event)"
+        ></wd-input>
+      </view>
     </view>
   </view>
 </template>
@@ -51,6 +70,14 @@
     readonly: {
       type: Boolean,
       default: false
+    },
+    inline: {
+      type: Boolean,
+      default: false
+    },
+    maxlength: {
+      type: [Number, null],
+      default: null
     }
   })
 
diff --git a/src/pages/approval/components/Keyboard.vue b/src/pages/approval/components/Keyboard.vue
new file mode 100644
index 0000000..7713ec5
--- /dev/null
+++ b/src/pages/approval/components/Keyboard.vue
@@ -0,0 +1,94 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative py-1.5">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <view
+          class="flex-1 ml-a text-right"
+          @click="toSelect"
+          :class="[text ? 'custom-color-black' : 'color-#bfbfbf']"
+        >
+          {{ text || placeholder }}
+        </view>
+      </view>
+    </view>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="py-2" @click="toSelect">
+        <view class="flex flex-items-center flex-justify-between">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+        </view>
+      </view>
+    </view>
+    <wd-keyboard
+      :mode="type"
+      title="键盘"
+      :hide-on-click-outside="true"
+      v-model:visible="visible"
+      @input="onInput"
+      closeText="确认"
+      @delete="onDelete"
+    />
+  </view>
+</template>
+
+<script setup lang="ts">
+  const text = ref<string>('')
+  const visible = ref<boolean>(false)
+
+  const onInput = value => {
+    if (props.maxlength && text.value.length >= props.maxlength) return
+    text.value += value
+  }
+  const onDelete = () => {
+    text.value = text.value.slice(0, -1)
+  }
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [Number, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    },
+    maxlength: {
+      type: [Number, null],
+      default: null
+    },
+    inline: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const toSelect = () => {
+    visible.value = true
+  }
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/pages/approval/components/MemberOrDepartment.vue b/src/pages/approval/components/MemberOrDepartment.vue
deleted file mode 100644
index e582118..0000000
--- a/src/pages/approval/components/MemberOrDepartment.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-  <view class="px-2 text-3.5">
-    <view class="flex flex-items-center pos-relative">
-      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
-      <view>{{ title }}</view>
-    </view>
-    <view class="py-2" @click="toSelect">
-      <view class="flex flex-items-center flex-justify-between">
-        <view :class="text ? 'custom-color-black' : 'color-#838589'">
-          {{ text || placeholder }}
-        </view>
-        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script setup lang="ts">
-  const text = ref<string | null>(null)
-
-  const props = defineProps({
-    id: {
-      type: Number,
-      required: true
-    },
-    type: {
-      type: String,
-      required: true
-    },
-    multiple: {
-      type: Boolean,
-      default: false
-    },
-    required: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String,
-      required: true
-    },
-    value: {
-      type: [Number, null],
-      default: null
-    },
-    placeholder: {
-      type: String,
-      default: '请输入'
-    }
-  })
-
-  const toSelect = () => {
-    const params = {
-      type: props.type,
-      multiple: props.multiple,
-      title: props.type === 'member' ? '选择审批用户' : '选择部门'
-    }
-    uni.navigateTo({
-      url: `/pages/select-member-or-department/select-member-or-department?params=${JSON.stringify(params)}`,
-      events: {
-        change: res => {
-          console.log(1111, res)
-        }
-      }
-    })
-  }
-</script>
diff --git a/src/pages/approval/components/NavigatorSelector.vue b/src/pages/approval/components/NavigatorSelector.vue
new file mode 100644
index 0000000..018918c
--- /dev/null
+++ b/src/pages/approval/components/NavigatorSelector.vue
@@ -0,0 +1,89 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative pb-1.5">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <view class="ml-a mr-2" :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+          {{ text || placeholder }}
+        </view>
+        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+      </view>
+    </view>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="py-2" @click="toSelect">
+        <view class="flex flex-items-center flex-justify-between">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const text = ref<string | null>(null)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [Number, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请选择'
+    },
+    inline: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const toSelect = () => {
+    if (props.type === 'accessControl') {
+      uni.navigateTo({
+        url: `/pages/select/select-access-control`
+      })
+    } else {
+      const params = {
+        type: props.type,
+        multiple: props.multiple,
+        title: props.type === 'member' ? '选择审批用户' : '选择部门'
+      }
+      uni.navigateTo({
+        url: `/pages/select/select-organization?params=${JSON.stringify(params)}`,
+        events: {
+          change: res => {
+            console.log(1111, res)
+          }
+        }
+      })
+    }
+  }
+</script>
diff --git a/src/pages/approval/components/SelectPicker.vue b/src/pages/approval/components/SelectPicker.vue
index 99708b3..65aad0e 100644
--- a/src/pages/approval/components/SelectPicker.vue
+++ b/src/pages/approval/components/SelectPicker.vue
@@ -1,20 +1,40 @@
 <template>
   <view class="px-2 text-3.5">
-    <view class="flex flex-items-center pos-relative">
-      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
-      <view>{{ title }}</view>
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <wd-select-picker
+          class="flex-1"
+          align-right
+          :type="type"
+          :title="placeholder"
+          :show-confirm="type === 'checkbox'"
+          v-model="picker"
+          :columns="columns"
+          size="large"
+          @change="change"
+          select-size="large"
+        ></wd-select-picker>
+      </view>
     </view>
-    <view class="pt-2">
-      <wd-select-picker
-        :type="type"
-        :title="placeholder"
-        :show-confirm="type === 'checkbox'"
-        v-model="picker"
-        :columns="columns"
-        size="large"
-        @change="change"
-        select-size="large"
-      ></wd-select-picker>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="pt-2">
+        <wd-select-picker
+          :type="type"
+          :title="placeholder"
+          :show-confirm="type === 'checkbox'"
+          v-model="picker"
+          :columns="columns"
+          size="large"
+          @change="change"
+          select-size="large"
+        ></wd-select-picker>
+      </view>
     </view>
   </view>
 </template>
@@ -50,6 +70,10 @@
     columns: {
       type: Array,
       required: true
+    },
+    inline: {
+      type: Boolean,
+      default: false
     }
   })
 
diff --git a/src/pages/approval/components/Visitor.vue b/src/pages/approval/components/Visitor.vue
new file mode 100644
index 0000000..e3d6dd3
--- /dev/null
+++ b/src/pages/approval/components/Visitor.vue
@@ -0,0 +1,86 @@
+<template>
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+    <Input :id="0" title="访客姓名" :required="true" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input
+      :id="1"
+      title="访客手机"
+      :required="true"
+      :maxlength="11"
+      @change="inputChange"
+      inline
+      type="number"
+    ></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <SelectPicker required :id="2" title="访客类型" :columns="columns" inline></SelectPicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <NavigatorSelector :id="3" title="通行门禁点" type="accessControl" inline></NavigatorSelector>
+  </view>
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+    <Keyboard :id="4" title="车牌号码" type="car" :maxlength="8" inline></Keyboard>
+  </view>
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+    <DatetimePicker
+      :id="5"
+      ref="startDatetimePicker"
+      title="预约到访时间"
+      @change="changeDate"
+      type="datetime"
+      inline
+      required
+    ></DatetimePicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input :id="7" title="同行人数" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input :id="8" title="访问单位" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input :id="9" title="到访事由说明" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input :id="10" title="访问地址" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Description :id="11" title="表单通过后，访客将收到断音邀请通知"></Description>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import Input from '@/pages/approval/components/Input.vue'
+  import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
+  import Description from '@/pages/approval/components/Description.vue'
+  import Keyboard from '@/pages/approval/components/Keyboard.vue'
+  import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
+  import NavigatorSelector from '@/pages/approval/components/NavigatorSelector.vue'
+
+  const columns = ref<Record<number, string>>([
+    {
+      value: 0,
+      label: '外卖快递'
+    },
+    {
+      value: 1,
+      label: '会议洽谈'
+    },
+    {
+      value: 2,
+      label: '探亲访友'
+    },
+    {
+      value: 3,
+      label: '业务沟通'
+    }
+  ])
+
+  const inputChange = e => {
+    console.log('inputChange', e)
+  }
+
+  const changeDate = e => {
+    // timestamp.value = e.value
+    console.log('changeDate', e)
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-divider {
+    padding: 0 0.5rem;
+  }
+</style>
diff --git a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue b/src/pages/select/components/OrganizationItem.vue
similarity index 100%
rename from src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
rename to src/pages/select/components/OrganizationItem.vue
diff --git a/src/pages/select-member-or-department/components/SearchItem.vue b/src/pages/select/components/SearchItem.vue
similarity index 100%
rename from src/pages/select-member-or-department/components/SearchItem.vue
rename to src/pages/select/components/SearchItem.vue
diff --git a/src/pages/select/select-access-control.vue b/src/pages/select/select-access-control.vue
new file mode 100644
index 0000000..126a836
--- /dev/null
+++ b/src/pages/select/select-access-control.vue
@@ -0,0 +1,7 @@
+<template>
+  <view></view>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss"></style>
diff --git a/src/pages/select-member-or-department/select-member-or-department.vue b/src/pages/select/select-organization.vue
similarity index 96%
rename from src/pages/select-member-or-department/select-member-or-department.vue
rename to src/pages/select/select-organization.vue
index c27d26b..779490c 100644
--- a/src/pages/select-member-or-department/select-member-or-department.vue
+++ b/src/pages/select/select-organization.vue
@@ -61,7 +61,7 @@
           @click="toOrganization(index)"
         >
           <span
-            :class="[index === organizationList.length - 1 ? 'color-#838589' : 'custom-color-blue']"
+            :class="[index === organizationList.length - 1 ? 'color-#bfbfbf' : 'custom-color-blue']"
           >
             {{ department.name }}
           </span>
@@ -88,12 +88,12 @@
               ></wd-icon>
               <wd-icon v-else name="circle1" color="#838589" size="26px"></wd-icon>
             </view>
-            <MemberOrDepartmentItem
+            <OrganizationItem
               class="flex-1"
               :item="item"
               :disabled="item.type === 'department' && value.includes(item)"
               @click="toClick(item)"
-            ></MemberOrDepartmentItem>
+            ></OrganizationItem>
           </view>
         </view>
         <view class="py-5 px-15">
@@ -146,8 +146,8 @@
 
 <script setup lang="ts">
   import { useBasicStore } from '@/store'
-  import MemberOrDepartmentItem from '@/pages/select-member-or-department/components/MemberOrDepartmentItem.vue'
-  import SearchItem from '@/pages/select-member-or-department/components/SearchItem.vue'
+  import OrganizationItem from '@/pages/select/components/OrganizationItem.vue'
+  import SearchItem from '@/pages/select/components/SearchItem.vue'
   import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const instance = getCurrentInstance().proxy
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 058f3eb..cc65bba 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -29,7 +29,8 @@ interface NavigateToOptions {
        "/pages/login/reset-password" |
        "/pages/mine/mine" |
        "/pages/notification/notification" |
-       "/pages/select-member-or-department/select-member-or-department" |
+       "/pages/select/select-access-control" |
+       "/pages/select/select-organization" |
        "/pages/workbench/workbench" |
        "/pages/attendance/attendance-add-group/attendance-add-group" |
        "/pages/attendance/attendance-add-group/attendance-device" |

From 10ce85a53d29f7c37f9cb5a08c1b8083510488c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 11:59:26 +0800
Subject: [PATCH 13/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E8=AE=BF=E5=AE=A2=E9=A2=84=E7=BA=A6=E5=A5=97=E4=BB=B6?=
 =?UTF-8?q?=E5=B0=81=E8=A3=85+=E9=80=89=E6=8B=A9=E9=97=A8=E7=A6=81?=
 =?UTF-8?q?=E7=82=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |   6 +-
 .../approval/components/NavigatorSelector.vue |   9 +-
 .../approval/components/VisitDuration.vue     | 194 ++++++++++++++++++
 src/pages/approval/components/Visitor.vue     |   3 +
 src/pages/select/select-access-control.vue    |  99 ++++++++-
 5 files changed, 305 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/approval/components/VisitDuration.vue

diff --git a/src/pages.json b/src/pages.json
index 0c06a21..74ed35d 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -241,7 +241,11 @@
     },
     {
       "path": "pages/select/select-access-control",
-      "type": "page"
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      }
     },
     {
       "path": "pages/select/select-organization",
diff --git a/src/pages/approval/components/NavigatorSelector.vue b/src/pages/approval/components/NavigatorSelector.vue
index 018918c..fe88998 100644
--- a/src/pages/approval/components/NavigatorSelector.vue
+++ b/src/pages/approval/components/NavigatorSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="px-2 text-3.5">
     <view v-if="inline">
-      <view class="flex flex-items-center pos-relative pb-1.5">
+      <view class="flex flex-items-center pos-relative pb-1.5" @click="toSelect">
         <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
         <view>{{ title }}</view>
         <view class="ml-a mr-2" :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
@@ -68,7 +68,12 @@
   const toSelect = () => {
     if (props.type === 'accessControl') {
       uni.navigateTo({
-        url: `/pages/select/select-access-control`
+        url: `/pages/select/select-access-control`,
+        events: {
+          change: res => {
+            console.log(1111, res)
+          }
+        }
       })
     } else {
       const params = {
diff --git a/src/pages/approval/components/VisitDuration.vue b/src/pages/approval/components/VisitDuration.vue
new file mode 100644
index 0000000..87d89b8
--- /dev/null
+++ b/src/pages/approval/components/VisitDuration.vue
@@ -0,0 +1,194 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative pb-1.5" @click="toSelect">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <view class="ml-a mr-2" :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+          {{ text || placeholder }}
+        </view>
+        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+      </view>
+    </view>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="py-2" @click="toSelect">
+        <view class="flex flex-items-center flex-justify-between">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+        </view>
+      </view>
+    </view>
+    <wd-popup v-model="show" position="bottom" custom-style="border-radius:12rpx;">
+      <view v-if="showDuration">
+        <view
+          class="px-4 py-2 text-3.5 border-b-1 border-[#dcdcdc] border-solid flex flex-items-center"
+        >
+          <view @click="show = false">取消</view>
+          <view class="font-bold text-4 flex-1 text-center">访问时长</view>
+          <view class="flex flex-items-center" @click="changeSelect">
+            <view class="custom-color-blue">自定义时间</view>
+            <wd-icon name="arrow-right" size="14px" class="ml-1" color="#255cf7"></wd-icon>
+          </view>
+        </view>
+        <scroll-view class="h-60 text-3.5" :scroll-y="true">
+          <view
+            v-for="item in durationList"
+            :key="item.value"
+            @click="changeDuration(item)"
+            class="py-4 px-4 flex flex-items-center"
+          >
+            <view>{{ item.label }}</view>
+            <view
+              class="bg-#f3f5fa ml-a w-12 h-6 rounded-5 flex flex-items-center flex-justify-center"
+            >
+              <wd-icon
+                v-if="duration === item.label"
+                name="check"
+                size="15px"
+                class="ml-1"
+                color="#255cf7"
+              ></wd-icon>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+      <view v-else>
+        <view
+          class="px-4 py-2 text-3.5 border-b-1 border-[#dcdcdc] border-solid flex flex-items-center"
+        >
+          <view class="flex flex-items-center" @click="showDuration = true">
+            <wd-icon name="arrow-left" size="14px" class="ml-1" color="#0d0f10"></wd-icon>
+            <view class="custom-color-black">返回</view>
+          </view>
+          <view class="font-bold text-4 flex-1 text-center">时间选择器</view>
+          <wd-icon
+            name="close"
+            size="14px"
+            class="ml-1"
+            color="#0d0f10"
+            @click="show = false"
+          ></wd-icon>
+        </view>
+        <wd-datetime-picker-view
+          :formatter="formatter"
+          type="datetime"
+          v-model="timestamp"
+          @change="change"
+        />
+      </view>
+      <view
+        @click="confirm"
+        class="py-2.5 rounded custom-bg-blue w-90% mx-5% font-bold text-center color-white text-3.5 my-2"
+      >
+        完成
+      </view>
+    </wd-popup>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import dayjs from 'dayjs'
+
+  const text = ref<string | null>(null)
+  const show = ref<boolean>(false)
+  const timestamp = ref<number>(0)
+  const duration = ref<string>('')
+
+  const showDuration = ref<boolean>(true)
+
+  const formatter = (type, value) => {
+    switch (type) {
+      case 'year':
+        return value + '年'
+      case 'month':
+        return value + '月'
+      case 'date':
+        return value + '日'
+      case 'hour':
+        return value + '时'
+      case 'minute':
+        return value + '分'
+      default:
+        return value
+    }
+  }
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [String, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请选择'
+    },
+    inline: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const durationList = [
+    { label: '30分钟', value: 1800000 },
+    { label: '1小时', value: 3600000 },
+    { label: '2小时', value: 7200000 },
+    { label: '3小时', value: 10800000 },
+    { label: '5小时', value: 18000000 },
+    { label: '8小时', value: 28800000 },
+    { label: '12小时', value: 43200000 },
+    { label: '24小时', value: 86400000 }
+  ]
+
+  onMounted(() => {
+    if (props.value) {
+      text.value = props.value
+      duration.value = props.value
+    }
+  })
+
+  const changeSelect = () => {
+    timestamp.value = new Date().getTime()
+    showDuration.value = false
+  }
+
+  const toSelect = () => {
+    show.value = true
+  }
+
+  const change = value => {
+    timestamp.value = value.value
+    duration.value = ''
+  }
+
+  const changeDuration = item => {
+    duration.value = item.label
+    timestamp.value = 0
+  }
+
+  const confirm = () => {
+    if (timestamp.value === 0) {
+      text.value = duration.value
+    } else {
+      text.value = dayjs(timestamp.value).format('YYYY-M-D HH:mm')
+    }
+    show.value = false
+  }
+</script>
diff --git a/src/pages/approval/components/Visitor.vue b/src/pages/approval/components/Visitor.vue
index e3d6dd3..e9fa668 100644
--- a/src/pages/approval/components/Visitor.vue
+++ b/src/pages/approval/components/Visitor.vue
@@ -30,6 +30,8 @@
       required
     ></DatetimePicker>
     <wd-divider color="#bcbfbe"></wd-divider>
+    <VisitDuration :id="6" title="访问时长" required value="2小时" inline></VisitDuration>
+    <wd-divider color="#bcbfbe"></wd-divider>
     <Input :id="7" title="同行人数" @change="inputChange" inline></Input>
     <wd-divider color="#bcbfbe"></wd-divider>
     <Input :id="8" title="访问单位" @change="inputChange" inline></Input>
@@ -49,6 +51,7 @@
   import Keyboard from '@/pages/approval/components/Keyboard.vue'
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
   import NavigatorSelector from '@/pages/approval/components/NavigatorSelector.vue'
+  import VisitDuration from '@/pages/approval/components/VisitDuration.vue'
 
   const columns = ref<Record<number, string>>([
     {
diff --git a/src/pages/select/select-access-control.vue b/src/pages/select/select-access-control.vue
index 126a836..57dfd24 100644
--- a/src/pages/select/select-access-control.vue
+++ b/src/pages/select/select-access-control.vue
@@ -1,7 +1,100 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    disableScroll: true
+  }
+}
+</route>
 <template>
-  <view></view>
+  <view class="h-100vh flex flex-col">
+    <TopNavigation class="bg-white" title="选择门禁点"></TopNavigation>
+    <scroll-view class="flex-1 box-border text-3.5 custom-color-black border-1" :scroll-y="true">
+      <wd-checkbox-group v-model="value" size="large" @change="change">
+        <view class="px-4 py-1.5 bg-white mb-2">
+          <wd-checkbox :modelValue="item.id" v-for="item in permissionList" :key="item.id">
+            <view class="flex flex-items-center">
+              <view
+                class="w-10 h-10 flex flex-justify-center flex-items-center bg-#e4f1ff rounded-2"
+              >
+                <image src="/static/images/icon_file.png" class="w-6 h-6" mode="aspectFill"></image>
+              </view>
+              <view class="ml-2">{{ item.name }}</view>
+            </view>
+          </wd-checkbox>
+        </view>
+        <view
+          v-for="(item, index) in list"
+          :key="item.id"
+          class="bg-white border-#eef0f5 border-b-solid"
+          :class="[index === list.length - 1 ? 'border-b-0' : 'border-b-1']"
+        >
+          <wd-checkbox :modelValue="item.id" class="py-1.5 px-4">
+            <view class="flex flex-items-center">
+              <image
+                src="https://file.hikmall.com/prod/image/69c3851d052e493ebb6e7c2e7a189b61.png"
+                class="w-10 h-10"
+              ></image>
+              <view class="ml-2">{{ item.name }}</view>
+            </view>
+          </wd-checkbox>
+        </view>
+      </wd-checkbox-group>
+    </scroll-view>
+    <view class="pb-safe border-#eef0f5 border-t-solid border-1 flex flex-items-center">
+      <view
+        @click="confirm"
+        class="opacity-60% w-90% py-2 mx-5% text-center custom-bg-blue color-white rounded-2 my-3"
+      >
+        确定
+      </view>
+    </view>
+  </view>
 </template>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+  const instance = getCurrentInstance().proxy
+  const eventChannel = instance.getOpenerEventChannel()
 
-<style scoped lang="scss"></style>
+  const value = ref<number[]>([])
+  const selected = ref<Array>([])
+
+  const permissionList = [
+    {
+      name: '[访客类型]权限组',
+      id: 0
+    }
+  ]
+
+  const list = [
+    {
+      name: 'DS-K(FU6004429)',
+      id: 1
+    },
+    {
+      name: 'DS-K(L40959329)',
+      id: 2
+    }
+  ]
+
+  const change = value => {
+    selected.value = []
+    selected.value.push(...permissionList.filter(item => value.value.includes(item.id)))
+    selected.value.push(...list.filter(item => value.value.includes(item.id)))
+  }
+
+  const confirm = () => {
+    eventChannel.emit('change', { value: selected.value })
+    uni.navigateBack()
+  }
+</script>
+
+<style scoped lang="scss">
+  .wd-checkbox-group {
+    background-color: transparent;
+  }
+
+  .wd-checkbox {
+    margin-bottom: 0;
+  }
+</style>

From 0e64d092a422a6800f688b4a037ea86f0160b697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 13:46:39 +0800
Subject: [PATCH 14/31] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=92=8C=E6=88=90=E5=91=98=E9=80=89=E6=8B=A9=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/select/components/SearchItem.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/pages/select/components/SearchItem.vue b/src/pages/select/components/SearchItem.vue
index 9a13733..eb3ce14 100644
--- a/src/pages/select/components/SearchItem.vue
+++ b/src/pages/select/components/SearchItem.vue
@@ -13,8 +13,15 @@
     <view v-else class="w-10 h-10 flex flex-justify-center flex-items-center bg-#e4f1ff rounded-2">
       <image src="/static/images/icon_file.png" class="w-6 h-6" mode="aspectFill"></image>
     </view>
-    <view class="ml-2 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
-      {{ item.name }}
+    <view class="ml-2">
+      <view class="break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
+        {{ item.name }}
+      </view>
+      <view
+        class="color-#838589 text-3 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1"
+      >
+        xxx的互联/test
+      </view>
     </view>
   </view>
 </template>

From a0b4e1f0b5505bbfba823d9a6e02459708542588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 14:52:30 +0800
Subject: [PATCH 15/31] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=B5=81=E7=A8=8B=E5=88=9B=E5=BB=BAUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../approval/components/ApprovalCreate.vue    | 101 ++++++++++++++++++
 .../components/{Components.vue => Form.vue}   |   4 +-
 src/pages/approval/components/Visitor.vue     |   6 +-
 src/pages/approval/create-application.vue     |   6 +-
 src/static/images/icon_airplane.png           | Bin 0 -> 1949 bytes
 src/static/images/icon_approval.png           | Bin 0 -> 1627 bytes
 6 files changed, 110 insertions(+), 7 deletions(-)
 create mode 100644 src/pages/approval/components/ApprovalCreate.vue
 rename src/pages/approval/components/{Components.vue => Form.vue} (98%)
 create mode 100644 src/static/images/icon_airplane.png
 create mode 100644 src/static/images/icon_approval.png

diff --git a/src/pages/approval/components/ApprovalCreate.vue b/src/pages/approval/components/ApprovalCreate.vue
new file mode 100644
index 0000000..ab6071f
--- /dev/null
+++ b/src/pages/approval/components/ApprovalCreate.vue
@@ -0,0 +1,101 @@
+<template>
+  <view class="bg-white rounded-2 py-3 px-4 mx-4 my-2 shadow-sm">
+    <view class="text-4">审批流程</view>
+    <view v-if="false" class="text-3 color-#838589 mt-2">必填信息填写完整后，将显示审批流程</view>
+    <view v-else class="mt-4 color-#838589">
+      <wd-steps :active="3" vertical>
+        <wd-step>
+          <template v-slot:icon>
+            <view
+              class="custom-bg-blue w-5 h-5 rounded-50% flex flex-items-center flex-justify-center"
+            >
+              <view class="w-2.5 h-2.5 bg-white rounded-50%"></view>
+            </view>
+          </template>
+          <template v-slot:title>
+            <view class="custom-color-black text-3.5">
+              <view class="flex-items-center flex">
+                <view>发起人</view>
+              </view>
+              <view class="my-2">
+                <view>
+                  <image
+                    src="https://file.hikmall.com/prod/image/4921b7596d2344088f8611f503b011dc.png"
+                    class="h-10 w-10 rounded-2"
+                    mode="aspectFill"
+                  ></image>
+                  <view class="mx-2">xxx</view>
+                </view>
+              </view>
+            </view>
+          </template>
+        </wd-step>
+        <wd-step>
+          <template v-slot:icon>
+            <view class="bg-#f0801e w-5 h-5 rounded-50% flex flex-items-center flex-justify-center">
+              <image src="/static/images/icon_approval.png" class="w-3 h-3"></image>
+            </view>
+          </template>
+          <template v-slot:title>
+            <view class="custom-color-black text-3.5">
+              <view class="flex-items-center flex">
+                <view>审批节点</view>
+              </view>
+              <view class="pt-2 color-#7e807f text-3">1人通过即可</view>
+              <view class="my-2 flex flex-wrap">
+                <view v-for="item in 8" :key="item" class="mb-2 w-fit mr-2">
+                  <view>
+                    <image
+                      src="https://file.hikmall.com/prod/image/4921b7596d2344088f8611f503b011dc.png"
+                      class="h-10 w-10 rounded-2"
+                      mode="aspectFill"
+                    ></image>
+                    <view class="mx-2">xxx</view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </template>
+        </wd-step>
+        <wd-step>
+          <template v-slot:icon>
+            <view class="bg-#2ab6c7 w-5 h-5 rounded-50% flex flex-items-center flex-justify-center">
+              <image src="/static/images/icon_airplane.png" class="w-3 h-3"></image>
+            </view>
+          </template>
+          <template v-slot:title>
+            <view class="custom-color-black text-3.5">
+              <view class="flex-items-center flex">
+                <view>抄送节点</view>
+              </view>
+              <view class="my-2 flex flex-wrap">
+                <view v-for="item in 3" :key="item" class="mb-2 w-fit mr-2">
+                  <view>
+                    <image
+                      src="https://file.hikmall.com/prod/image/4921b7596d2344088f8611f503b011dc.png"
+                      class="h-10 w-10 rounded-2"
+                      mode="aspectFill"
+                    ></image>
+                    <view class="mx-2">xxx</view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </template>
+        </wd-step>
+      </wd-steps>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss">
+  :deep(.wd-step__header) {
+    width: 1.25rem;
+  }
+
+  :deep(.wd-step__line) {
+    background: #255cf7;
+  }
+</style>
diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Form.vue
similarity index 98%
rename from src/pages/approval/components/Components.vue
rename to src/pages/approval/components/Form.vue
index 167026c..3538184 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Form.vue
@@ -1,7 +1,7 @@
 <template>
-  <view class="pb-3">
+  <view class="pb-3 mb-2">
     <Visitor></Visitor>
-    <view class="bg-white mx-4 p-2 rounded-2">
+    <view class="bg-white mx-4 p-2 rounded-2 shadow-sm">
       <Input
         :id="0"
         value="单行"
diff --git a/src/pages/approval/components/Visitor.vue b/src/pages/approval/components/Visitor.vue
index e9fa668..1f8ac23 100644
--- a/src/pages/approval/components/Visitor.vue
+++ b/src/pages/approval/components/Visitor.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2 shadow-sm">
     <Input :id="0" title="访客姓名" :required="true" @change="inputChange" inline></Input>
     <wd-divider color="#bcbfbe"></wd-divider>
     <Input
@@ -16,10 +16,10 @@
     <wd-divider color="#bcbfbe"></wd-divider>
     <NavigatorSelector :id="3" title="通行门禁点" type="accessControl" inline></NavigatorSelector>
   </view>
-  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2 shadow-sm">
     <Keyboard :id="4" title="车牌号码" type="car" :maxlength="8" inline></Keyboard>
   </view>
-  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2 shadow-sm">
     <DatetimePicker
       :id="5"
       ref="startDatetimePicker"
diff --git a/src/pages/approval/create-application.vue b/src/pages/approval/create-application.vue
index c7fd5a4..fcb0d49 100644
--- a/src/pages/approval/create-application.vue
+++ b/src/pages/approval/create-application.vue
@@ -10,7 +10,8 @@
   <view class="h-100vh flex flex-col">
     <TopNavigation :title="title"></TopNavigation>
     <scroll-view class="flex-1 box-border" :scroll-y="true">
-      <Components></Components>
+      <ApprovalCreate></ApprovalCreate>
+      <Form></Form>
     </scroll-view>
     <view class="pb-safe border-#eef0f5 border-t-solid">
       <view class="flex flex-items-center flex-justify-around py-3 px-3">
@@ -24,7 +25,8 @@
 </template>
 
 <script setup lang="ts">
-  import Components from '@/pages/approval/components/Components.vue'
+  import Form from '@/pages/approval/components/Form.vue'
+  import ApprovalCreate from '@/pages/approval/components/ApprovalCreate.vue'
 
   const title = ref<string>('')
   const id = ref<number>(null)
diff --git a/src/static/images/icon_airplane.png b/src/static/images/icon_airplane.png
new file mode 100644
index 0000000000000000000000000000000000000000..090beac47d176e327d249d6fb5fdde268554264b
GIT binary patch
literal 1949
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

literal 0
HcmV?d00001

diff --git a/src/static/images/icon_approval.png b/src/static/images/icon_approval.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c4943fea2f24125079a7d6037e9aeef4ace25ac
GIT binary patch
literal 1627
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
Z{SQxU)}JuPX{rDK002ovPDHLkV1g!t&07Ef

literal 0
HcmV?d00001


From 215eee5f017570ec59df76da2ecf664e4e435d52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Sat, 11 Jan 2025 18:13:10 +0800
Subject: [PATCH 16/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=8F=91=E8=B5=B7=E7=94=B3=E8=AF=B7=E5=92=8C=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E4=B8=AD=E5=BF=83=E7=9A=84UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/approval.vue               |  78 ++++++++-
 .../approval/components/ApplicationList.vue   |  58 +++++++
 .../approval/components/ApprovalRecords.vue   | 149 ++++++++++++++++++
 src/pages/attendance/attendance.vue           |   6 +-
 src/static/images/icon_default_avatar.png     | Bin 0 -> 3963 bytes
 5 files changed, 287 insertions(+), 4 deletions(-)
 create mode 100644 src/pages/approval/components/ApplicationList.vue
 create mode 100644 src/pages/approval/components/ApprovalRecords.vue
 create mode 100644 src/static/images/icon_default_avatar.png

diff --git a/src/pages/approval/approval.vue b/src/pages/approval/approval.vue
index 5c80404..e0069bb 100644
--- a/src/pages/approval/approval.vue
+++ b/src/pages/approval/approval.vue
@@ -7,14 +7,18 @@
 }
 </route>
 <template>
-  <view>
+  <view class="h-100vh flex flex-col">
     <TopNavigation :title="index === 0 ? '发起申请' : '审批'"></TopNavigation>
+    <ApplicationList v-if="index === 0" :list="applicationListData"></ApplicationList>
+    <ApprovalRecords v-else></ApprovalRecords>
     <CustomTabBar :list="list" :default-index="index" @change="change"></CustomTabBar>
   </view>
 </template>
 
 <script setup lang="ts">
   import { TabBarItem } from '@/typings'
+  import ApplicationList from '@/pages/approval/components/ApplicationList.vue'
+  import ApprovalRecords from '@/pages/approval/components/ApprovalRecords.vue'
 
   const index = ref<number>(0)
 
@@ -29,6 +33,78 @@
     }
   ]
 
+  const applicationListData = ref<Array<object>>([
+    {
+      groupId: 138603,
+      groupName: '出勤休假',
+      sort: 1,
+      processDefs: [
+        {
+          processDefId: 249155,
+          processDefName: '请假',
+          icon: 'https://file.hikvisionmall.com/test1/image/f39c654cd30a48d28ddf37e4b64de57a.png',
+          version: '1735128632'
+        },
+        {
+          processDefId: 249156,
+          processDefName: '补卡',
+          icon: 'https://file.hikvisionmall.com/test1/image/26209b6732f2439fae3c6dd34a39145e.png',
+          version: '1704439843'
+        },
+        {
+          processDefId: 249158,
+          processDefName: '外出',
+          icon: 'https://file.hikvisionmall.com/test1/image/5c76288745dd47a38c9e1093d9737976.png',
+          version: '1704439843'
+        },
+        {
+          processDefId: 249157,
+          processDefName: '出差',
+          icon: 'https://file.hikvisionmall.com/test1/image/df75579e70c2435e9f78d04fc401b451.png',
+          version: '1704439843'
+        },
+        {
+          processDefId: 347336,
+          processDefName: '加班',
+          icon: 'https://file.hikvisionmall.com/test1/image/e4f21377ea2443b3856b07674ba41c2a.png',
+          version: '1711368134'
+        },
+        {
+          processDefId: 891737,
+          processDefName: '调休',
+          icon: 'https://file.hikvisionmall.com/prod/image/3d134cc9657e4816ad6aa8ef206fbc89.png',
+          version: '1735128832'
+        }
+      ]
+    },
+    {
+      groupId: 341473,
+      groupName: 'test',
+      sort: 2,
+      processDefs: [
+        {
+          processDefId: 924255,
+          processDefName: 'test1',
+          icon: 'https://file.hikvisionmall.com/prod/image/3d134cc9657e4816ad6aa8ef206fbc89.png',
+          version: '1736480449'
+        }
+      ]
+    },
+    {
+      groupId: 138604,
+      groupName: '其他',
+      sort: 999,
+      processDefs: [
+        {
+          processDefId: 466818,
+          processDefName: '访客预约',
+          icon: 'https://file.hikmall.com/prod/image/5300a838119d462b9e1c17489603b6d8.png',
+          version: '1715675086'
+        }
+      ]
+    }
+  ])
+
   onLoad(options => {
     if (options.index) {
       index.value = Number(options.index)
diff --git a/src/pages/approval/components/ApplicationList.vue b/src/pages/approval/components/ApplicationList.vue
new file mode 100644
index 0000000..26d60ba
--- /dev/null
+++ b/src/pages/approval/components/ApplicationList.vue
@@ -0,0 +1,58 @@
+<template>
+  <scroll-view class="flex-1 box-border" :scroll-y="true">
+    <view class="mx-4 pt-4 flex flex-items-center text-3.5 font-bold">
+      <view class="bg-#dfecff flex-1 px-3 py-6 rounded-2">
+        <view>使用指南</view>
+      </view>
+      <view class="w-4"></view>
+      <view class="bg-#feebda flex-1 px-3 py-6 rounded-2">
+        <view>常见问题</view>
+      </view>
+    </view>
+    <view class="py-4">
+      <wd-collapse v-model="collapseRoot" custom-class="!bg-transparent !border-0">
+        <wd-collapse-item
+          v-for="group in list"
+          :key="group.groupId"
+          :name="group.groupName"
+          :title="group.groupName"
+        >
+          <view
+            v-for="(item, index) in group.processDefs"
+            :key="item.processDefId"
+            :class="[index === group.processDefs.length - 1 ? '' : 'mb-2']"
+            class="flex flex-items-center bg-white px-3 py-3 mx-1 rounded-2"
+          >
+            <image :src="item.icon" class="w-7 h-7 rounded-2"></image>
+            <view class="text-3.5 ml-2">{{ item.processDefName }}</view>
+          </view>
+        </wd-collapse-item>
+      </wd-collapse>
+    </view>
+  </scroll-view>
+</template>
+
+<script setup lang="ts">
+  const collapseRoot = ref<string[]>([])
+
+  onMounted(() => {
+    collapseRoot.value = props.list.map(item => item.groupName)
+  })
+
+  const props = defineProps({
+    list: {
+      type: Array,
+      required: true
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+  .wd-collapse-item::after {
+    height: 0 !important;
+  }
+
+  :deep(.wd-collapse-item__header::after) {
+    height: 0 !important;
+  }
+</style>
diff --git a/src/pages/approval/components/ApprovalRecords.vue b/src/pages/approval/components/ApprovalRecords.vue
new file mode 100644
index 0000000..b470eac
--- /dev/null
+++ b/src/pages/approval/components/ApprovalRecords.vue
@@ -0,0 +1,149 @@
+<template>
+  <view class="mx-4 mt-2">
+    <wd-input
+      class="px-2 py-0.6 rounded-1"
+      placeholder="申请名称、发起人"
+      v-model="search"
+      clearable
+      custom-class="border-0"
+      :maxlength="50"
+      prefix-icon="search"
+      @change="handleChange"
+    />
+  </view>
+  <wd-tabs v-model="currentIndex" class="pt-3" auto-line-width @click="handleChange">
+    <wd-tab :title="item" v-for="(item, index) in tabs" :key="item" :name="index" />
+  </wd-tabs>
+  <swiper :current="currentIndex" @change="changeIndex">
+    <swiper-item v-for="(item, index) in tabs" :key="item" class="flex flex-col">
+      <view @click="closeOutside">
+        <wd-drop-menu>
+          <wd-drop-menu-item
+            v-model="typeList[index]"
+            :options="typeOptionList[index]"
+            @change="typeChange"
+          />
+          <wd-drop-menu-item
+            v-model="dateList[index]"
+            :options="dateOptions"
+            @change="dateChange"
+          />
+        </wd-drop-menu>
+      </view>
+      <scroll-view :scroll-y="true" class="flex-1 box-border">
+        <view class="pt-2">
+          <view
+            v-for="item in 10"
+            :key="item"
+            class="mx-4 my-2 p-4 bg-white shadow-sm rounded-2 text-3.5"
+          >
+            <view class="flex flex-items-center mb-2">
+              <view class="text-4.5 font-bold">请假</view>
+              <view class="ml-a px-3 py-1 border-solid border-[#2bbbc3] color-#2bbbc3 rounded">
+                通过
+              </view>
+            </view>
+            <view class="mb-2">请假类型：年假</view>
+            <view class="mb-2">开始时间：2025-12-31</view>
+            <view class="mb-2">结束时间：2025-12-31</view>
+            <view class="flex flex-items-center">
+              <image class="w-8 h-8" src="/static/images/icon_default_avatar.png"></image>
+              <view class="ml-4">xxx</view>
+              <view class="ml-a">2025-12-25</view>
+            </view>
+          </view>
+        </view>
+        <view class="py-6 mx-30%">
+          <wd-divider color="#515357">已经到底了</wd-divider>
+        </view>
+      </scroll-view>
+    </swiper-item>
+  </swiper>
+</template>
+
+<script setup lang="ts">
+  import { useQueue } from 'wot-design-uni'
+
+  const search = ref<string>('')
+
+  const currentIndex = ref<number>(0)
+
+  const tabs = ref<string[]>(['待办', '已办', '抄送我', '已发起'])
+
+  const { closeOutside } = useQueue()
+
+  const typeList = ref<Array<number>>([0, 0, 0, 0])
+  const dateList = ref<Array<number>>([0, 0, 0, 0])
+
+  const typeOptionList = ref<Array<Array<Record<string, number>>>>([
+    [
+      { label: '全部', value: 0 },
+      { label: '补卡', value: 1 },
+      { label: '请假', value: 2 }
+    ],
+    [
+      { label: '全部', value: 0 },
+      { label: '调休', value: 1 }
+    ],
+    [
+      { label: '全部', value: 0 },
+      { label: '补卡', value: 1 },
+      { label: '请假', value: 2 }
+    ],
+    [
+      { label: '全部', value: 0 },
+      { label: '补卡', value: 1 },
+      { label: '请假', value: 2 }
+    ]
+  ])
+
+  const dateOptions = ref<Array<Record<string, number>>>([
+    { label: '全部日期', value: 0 },
+    { label: '近7日', value: 1 },
+    { label: '近14日', value: 2 },
+    { label: '近30日', value: 3 }
+  ])
+
+  function typeChange({ value }) {
+    console.log(value)
+  }
+
+  function dateChange({ value }) {
+    console.log(value)
+  }
+
+  const handleChange = value => {
+    currentIndex.value = value.index
+  }
+
+  const changeIndex = e => {
+    currentIndex.value = e.detail.current
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-input::after {
+    height: 0;
+  }
+
+  .wd-drop-item {
+    top: calc(var(--window-top) + 48px) !important;
+  }
+
+  :deep(.wd-drop-menu__item.is-active .wd-drop-menu__item-title::after) {
+    opacity: 0 !important;
+  }
+
+  :deep(.wd-drop-menu__list) {
+    background-color: transparent !important;
+  }
+
+  :deep(.wd-tabs__nav-item) {
+    margin-bottom: 5px;
+  }
+
+  :deep(.wd-tabs__nav-item.is-active) {
+    font-weight: bold;
+    color: #255cf7;
+  }
+</style>
diff --git a/src/pages/attendance/attendance.vue b/src/pages/attendance/attendance.vue
index 92cfe85..bb290ec 100644
--- a/src/pages/attendance/attendance.vue
+++ b/src/pages/attendance/attendance.vue
@@ -11,9 +11,9 @@
   <view class="h-[calc(100vh-50px)] flex flex-col">
     <TopNavigation :title="titleTab[curIndex]"></TopNavigation>
     <scroll-view class="flex-1 box-border" scroll-y>
-      <view v-for="(item, index) in pages" :key="index" v-show="curIndex == index">
-        <component :is="item"></component>
-      </view>
+      <AttendanceClockIn v-show="curIndex === 0"></AttendanceClockIn>
+      <AttendanceStatistics v-show="curIndex === 1"></AttendanceStatistics>
+      <AttendanceSet v-show="curIndex === 2"></AttendanceSet>
     </scroll-view>
   </view>
   <CustomTabBar :list="list" :default-index="0" @change="change"></CustomTabBar>
diff --git a/src/static/images/icon_default_avatar.png b/src/static/images/icon_default_avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..b93dfad6a207648a45b5f45684ac9d1b2d892d45
GIT binary patch
literal 3963
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
PHw`q@bX1FPn+N|dwed#Y

literal 0
HcmV?d00001


From b5be5bc0ae5318c45c01ebfd08e0c937d1f1c843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 13 Jan 2025 17:52:14 +0800
Subject: [PATCH 17/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E8=AF=A6=E6=83=85=E9=A1=B5UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/approval-detail.vue        | 66 +++++++++++++++
 src/pages/approval/approval.vue               |  6 +-
 .../approval/components/ApplicationList.vue   |  7 ++
 .../approval/components/ApprovalContent.vue   | 61 ++++++++++++++
 .../approval/components/ApprovalProcess.vue   | 81 +++++++++++++++++++
 .../approval/components/ApprovalRecords.vue   | 15 +++-
 6 files changed, 231 insertions(+), 5 deletions(-)
 create mode 100644 src/pages/approval/approval-detail.vue
 create mode 100644 src/pages/approval/components/ApprovalContent.vue
 create mode 100644 src/pages/approval/components/ApprovalProcess.vue

diff --git a/src/pages/approval/approval-detail.vue b/src/pages/approval/approval-detail.vue
new file mode 100644
index 0000000..9b74160
--- /dev/null
+++ b/src/pages/approval/approval-detail.vue
@@ -0,0 +1,66 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    disableScroll: true
+  }
+}
+</route>
+<template>
+  <view class="h-100vh flex flex-col">
+    <TopNavigation title="详情"></TopNavigation>
+    <scroll-view class="flex-1 box-border" :scroll-y="true">
+      <view class="pb-5">
+        <ApprovalContent class="mt-2" />
+        <ApprovalProcess class="mt-2" />
+      </view>
+    </scroll-view>
+    <view class="pb-safe border-#eef0f5 border-t-solid">
+      <view class="flex flex-items-center flex-justify-around py-3">
+        <view class="py-2 px-13 bg-#ef2e2f color-white rounded-2">拒绝</view>
+        <view class="py-2 px-13 custom-bg-blue color-white rounded-2">同意</view>
+        <view class="custom-color-blue text-4" @click="showActions">更多</view>
+      </view>
+    </view>
+    <wd-action-sheet
+      v-model="show"
+      :actions="actions"
+      close-on-click-action
+      @close="close"
+      @select="select"
+    />
+  </view>
+</template>
+
+<script setup lang="ts">
+  import { useToast } from 'wot-design-uni'
+  import ApprovalContent from '@/pages/approval/components/ApprovalContent.vue'
+  import ApprovalProcess from '@/pages/approval/components/ApprovalProcess.vue'
+
+  const toast = useToast()
+
+  const show = ref<boolean>(false)
+  const actions = ref([
+    {
+      name: '专审'
+    },
+    {
+      name: '退回'
+    },
+    {
+      name: '取消'
+    }
+  ])
+
+  const showActions = () => {
+    show.value = true
+  }
+
+  const close = () => {
+    show.value = false
+  }
+
+  const select = ({ item, index }) => {
+    toast.show(`当前选中项: ${item.title}, 下标: ${index}`)
+  }
+</script>
diff --git a/src/pages/approval/approval.vue b/src/pages/approval/approval.vue
index e0069bb..09b0ea5 100644
--- a/src/pages/approval/approval.vue
+++ b/src/pages/approval/approval.vue
@@ -9,8 +9,10 @@
 <template>
   <view class="h-100vh flex flex-col">
     <TopNavigation :title="index === 0 ? '发起申请' : '审批'"></TopNavigation>
-    <ApplicationList v-if="index === 0" :list="applicationListData"></ApplicationList>
-    <ApprovalRecords v-else></ApprovalRecords>
+    <ApplicationList v-show="index === 0" :list="applicationListData"></ApplicationList>
+    <view v-show="index === 1" class="flex-1 box-border">
+      <ApprovalRecords></ApprovalRecords>
+    </view>
     <CustomTabBar :list="list" :default-index="index" @change="change"></CustomTabBar>
   </view>
 </template>
diff --git a/src/pages/approval/components/ApplicationList.vue b/src/pages/approval/components/ApplicationList.vue
index 26d60ba..a8c67fc 100644
--- a/src/pages/approval/components/ApplicationList.vue
+++ b/src/pages/approval/components/ApplicationList.vue
@@ -22,6 +22,7 @@
             :key="item.processDefId"
             :class="[index === group.processDefs.length - 1 ? '' : 'mb-2']"
             class="flex flex-items-center bg-white px-3 py-3 mx-1 rounded-2"
+            @click="toDetail(item)"
           >
             <image :src="item.icon" class="w-7 h-7 rounded-2"></image>
             <view class="text-3.5 ml-2">{{ item.processDefName }}</view>
@@ -45,6 +46,12 @@
       required: true
     }
   })
+
+  const toDetail = (item: Record<string, any>) => {
+    uni.navigateTo({
+      url: `/pages/approval/create-application?id=${item.processDefId}&title=${item.processDefName}`
+    })
+  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/approval/components/ApprovalContent.vue b/src/pages/approval/components/ApprovalContent.vue
new file mode 100644
index 0000000..031fa1d
--- /dev/null
+++ b/src/pages/approval/components/ApprovalContent.vue
@@ -0,0 +1,61 @@
+<template>
+  <view class="bg-white rounded-2 py-2 px-4 mx-4">
+    <view class="flex flex-items-center">
+      <image
+        src="/static/images/icon_default_avatar.png"
+        class="w-10 h-10"
+        mode="aspectFill"
+      ></image>
+      <view class="ml-4">
+        <view class="font-bold text-4.5">请假</view>
+        <view class="text-3.5 mt-1">xxx</view>
+      </view>
+      <view
+        class="ml-a rounded py-0.5 px-1.5 text-3.5 border-solid border-1 border-#ef811c color-#ef811c"
+      >
+        审批中
+      </view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>所属组织：</view>
+      <view class="mt-2 break-all">123132123的互联</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>审批编号：</view>
+      <view class="mt-2 break-all">845465465465465465456</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>请假类型：</view>
+      <view class="mt-2 break-all">年假</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>开始时间：</view>
+      <view class="mt-2 break-all">2025-01-10</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>结束时间：</view>
+      <view class="mt-2 break-all">2025-01-10</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>请假时长(天)：</view>
+      <view class="mt-2 break-all">1.0</view>
+    </view>
+    <view class="my-2 h-1px w-full bg-#eef0f5"></view>
+    <view class="custom-color-black">
+      <view>请假原因：</view>
+      <view class="mt-2 break-all">
+        请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假请假1111111111111111111111
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss"></style>
diff --git a/src/pages/approval/components/ApprovalProcess.vue b/src/pages/approval/components/ApprovalProcess.vue
new file mode 100644
index 0000000..c999f2d
--- /dev/null
+++ b/src/pages/approval/components/ApprovalProcess.vue
@@ -0,0 +1,81 @@
+<template>
+  <view class="bg-white rounded-2 py-2 px-4 mx-4">
+    <view class="py-2 text-4">审批流程</view>
+    <wd-steps :active="1" vertical>
+      <wd-step icon="link">
+        <template v-slot:title>
+          <view class="custom-color-black text-3.5">
+            <view class="flex-items-center flex">
+              <view>发起申请</view>
+              <view class="ml-a color-#7e807f text-3">2504-12-25 20:11</view>
+            </view>
+            <view class="my-2">
+              <view class="py-1 flex flex-items-center w-fit rounded-4 bg-#f3f5fa">
+                <image
+                  src="/static/images/icon_default_avatar.png"
+                  class="h-6 w-6 rounded-50%"
+                  mode="aspectFill"
+                ></image>
+                <view class="mx-2">xxx</view>
+              </view>
+            </view>
+          </view>
+        </template>
+      </wd-step>
+      <wd-step icon="link">
+        <template v-slot:title>
+          <view class="custom-color-black text-3.5">
+            <view class="flex-items-center flex">
+              <view>审批节点</view>
+              <view
+                class="ml-3 rounded-4 py-0.5 text-3 px-2 border-solid border-#ef811c border-1 color-#ef811c"
+              >
+                审批中
+              </view>
+            </view>
+            <view class="pt-2 color-#7e807f text-3">1人通过即可</view>
+            <view class="my-2">
+              <view
+                v-for="item in 4"
+                :key="item"
+                class="mb-2 py-1 flex flex-items-center w-fit rounded-4 bg-#f3f5fa"
+              >
+                <image
+                  src="/static/images/icon_default_avatar.png"
+                  class="h-6 w-6 rounded-50%"
+                  mode="aspectFill"
+                ></image>
+                <view class="mx-2">xxx</view>
+              </view>
+            </view>
+          </view>
+        </template>
+      </wd-step>
+      <wd-step icon="link">
+        <template v-slot:title>
+          <view class="custom-color-black text-3.5">
+            <view class="flex-items-center flex">
+              <view>抄送节点</view>
+            </view>
+            <view class="my-2">
+              <view
+                v-for="item in 4"
+                :key="item"
+                class="mb-2 py-1 flex flex-items-center w-fit rounded-4 bg-#f3f5fa"
+              >
+                <image
+                  src="/static/images/icon_default_avatar.png"
+                  class="h-6 w-6 rounded-50%"
+                  mode="aspectFill"
+                ></image>
+                <view class="mx-2">xxx</view>
+              </view>
+            </view>
+          </view>
+        </template>
+      </wd-step>
+    </wd-steps>
+  </view>
+</template>
+
+<script setup lang="ts"></script>
diff --git a/src/pages/approval/components/ApprovalRecords.vue b/src/pages/approval/components/ApprovalRecords.vue
index b470eac..9d24188 100644
--- a/src/pages/approval/components/ApprovalRecords.vue
+++ b/src/pages/approval/components/ApprovalRecords.vue
@@ -36,10 +36,13 @@
             v-for="item in 10"
             :key="item"
             class="mx-4 my-2 p-4 bg-white shadow-sm rounded-2 text-3.5"
+            @click="toDetail(item)"
           >
             <view class="flex flex-items-center mb-2">
               <view class="text-4.5 font-bold">请假</view>
-              <view class="ml-a px-3 py-1 border-solid border-[#2bbbc3] color-#2bbbc3 rounded">
+              <view
+                class="ml-a px-3 py-1 border-solid border-[#2bbbc3] border-1 color-#2bbbc3 rounded"
+              >
                 通过
               </view>
             </view>
@@ -104,14 +107,20 @@
     { label: '近30日', value: 3 }
   ])
 
-  function typeChange({ value }) {
+  const typeChange = ({ value }) => {
     console.log(value)
   }
 
-  function dateChange({ value }) {
+  const dateChange = ({ value }) => {
     console.log(value)
   }
 
+  const toDetail = item => {
+    uni.navigateTo({
+      url: '/pages/approval/approval-detail'
+    })
+  }
+
   const handleChange = value => {
     currentIndex.value = value.index
   }

From 871a935ecb0b7bbc4dbe4d0b1518dbf102b5e73d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 13 Jan 2025 17:52:54 +0800
Subject: [PATCH 18/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E8=BE=93=E5=85=A5=E6=A1=86=E4=B8=8E?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A1=86=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                               | 16 +++++
 src/pages/approval/components/Components.vue | 42 ++++++++++++
 src/pages/approval/components/Input.vue      | 64 ++++++++++++++++++
 src/pages/approval/components/Textarea.vue   | 71 ++++++++++++++++++++
 src/pages/approval/create-application.vue    | 40 +++++++++++
 src/types/uni-pages.d.ts                     |  2 +
 6 files changed, 235 insertions(+)
 create mode 100644 src/pages/approval/components/Components.vue
 create mode 100644 src/pages/approval/components/Input.vue
 create mode 100644 src/pages/approval/components/Textarea.vue
 create mode 100644 src/pages/approval/create-application.vue

diff --git a/src/pages.json b/src/pages.json
index 81ad8c4..1fb3c68 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -63,6 +63,14 @@
       "path": "pages/application-list/application-list",
       "type": "page"
     },
+    {
+      "path": "pages/approval/approval-detail",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      }
+    },
     {
       "path": "pages/approval/approval",
       "type": "page",
@@ -71,6 +79,14 @@
         "disableScroll": true
       }
     },
+    {
+      "path": "pages/approval/create-application",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      }
+    },
     {
       "path": "pages/attendance/allowed-time",
       "type": "page",
diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
new file mode 100644
index 0000000..0162720
--- /dev/null
+++ b/src/pages/approval/components/Components.vue
@@ -0,0 +1,42 @@
+<template>
+  <view>
+    <view class="mx-4 p-2 rounded-2">
+      <Input
+        :id="0"
+        value="单行"
+        title="单行文本"
+        :required="true"
+        placeholder="单行文本"
+        @change="inputChange"
+      ></Input>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Textarea
+        :id="1"
+        title="多行文本"
+        :required="false"
+        placeholder="多行文本"
+        @change="textareaChange"
+      ></Textarea>
+      <wd-divider color="#bcbfbe"></wd-divider>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import Input from '@/pages/approval/components/Input.vue'
+  import Textarea from '@/pages/approval/components/Textarea.vue'
+
+  const inputChange = e => {
+    console.log('inputChange', e)
+  }
+
+  const textareaChange = e => {
+    console.log('textareaChange', e)
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-divider {
+    padding: 0 0.5rem;
+  }
+</style>
diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue
new file mode 100644
index 0000000..ff1e7d5
--- /dev/null
+++ b/src/pages/approval/components/Input.vue
@@ -0,0 +1,64 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="pt-2">
+      <wd-input
+        custom-class="!bg-transparent"
+        :placeholder="placeholder"
+        :maxlength="30"
+        v-model="text"
+        @input="change(id, $event)"
+      ></wd-input>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const emits = defineEmits(['change'])
+
+  const text = ref<string>('')
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: String,
+      default: ''
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    }
+  })
+
+  onMounted(() => {
+    text.value = props.value
+  })
+
+  const change = (id, data) => {
+    emits('change', { id, value: data.value })
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-input::after {
+    height: 0 !important;
+  }
+
+  :deep(.wd-input__inner) {
+    font-size: 0.875rem;
+  }
+</style>
diff --git a/src/pages/approval/components/Textarea.vue b/src/pages/approval/components/Textarea.vue
new file mode 100644
index 0000000..d870304
--- /dev/null
+++ b/src/pages/approval/components/Textarea.vue
@@ -0,0 +1,71 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="pt-2">
+      <wd-textarea
+        custom-class="!bg-transparent"
+        custom-textarea-class="h-16"
+        :placeholder="placeholder"
+        :maxlength="250"
+        v-model="text"
+        show-word-limit
+        @input="change(id, $event)"
+      ></wd-textarea>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const emits = defineEmits(['change'])
+
+  const text = ref<string>('')
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: String,
+      default: ''
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    }
+  })
+
+  onMounted(() => {
+    text.value = props.value
+  })
+
+  const change = (id, data) => {
+    emits('change', { id, value: data.value })
+  }
+</script>
+
+<style lang="scss" scoped>
+  :deep(.wd-textarea__value),
+  :deep(.wd-textarea__count) {
+    background: transparent !important;
+  }
+
+  :deep(.wd-textarea__inner) {
+    font-size: 0.875rem;
+  }
+
+  .wd-textarea {
+    padding: 0;
+  }
+</style>
diff --git a/src/pages/approval/create-application.vue b/src/pages/approval/create-application.vue
new file mode 100644
index 0000000..c7fd5a4
--- /dev/null
+++ b/src/pages/approval/create-application.vue
@@ -0,0 +1,40 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    disableScroll: true
+  }
+}
+</route>
+<template>
+  <view class="h-100vh flex flex-col">
+    <TopNavigation :title="title"></TopNavigation>
+    <scroll-view class="flex-1 box-border" :scroll-y="true">
+      <Components></Components>
+    </scroll-view>
+    <view class="pb-safe border-#eef0f5 border-t-solid">
+      <view class="flex flex-items-center flex-justify-around py-3 px-3">
+        <view class="py-2 w-45% text-center bg-#e2e5ea custom-color-blue rounded-2">保存草稿</view>
+        <view class="opacity-60% py-2 w-45% text-center custom-bg-blue color-white rounded-2">
+          提交
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import Components from '@/pages/approval/components/Components.vue'
+
+  const title = ref<string>('')
+  const id = ref<number>(null)
+
+  onLoad(options => {
+    if (options.title) {
+      title.value = options.title
+    }
+    if (options.id) {
+      id.value = Number(options.id)
+    }
+  })
+</script>
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 51ebdf9..b4660c3 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -7,7 +7,9 @@ interface NavigateToOptions {
   url: "/pages/mine/mine" |
        "/pages/home/home" |
        "/pages/application-list/application-list" |
+       "/pages/approval/approval-detail" |
        "/pages/approval/approval" |
+       "/pages/approval/create-application" |
        "/pages/attendance/allowed-time" |
        "/pages/attendance/attendance-rules" |
        "/pages/attendance/attendance" |

From b9230bc39423ecc2f30c677b06aa273b1a4da55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 13 Jan 2025 18:42:04 +0800
Subject: [PATCH 19/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E9=80=89=E6=8B=A9=E5=99=A8=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue  | 34 +++++++++-
 .../approval/components/SelectPicker.vue      | 66 +++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/approval/components/SelectPicker.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 0162720..2cfa5e9 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <view class="mx-4 p-2 rounded-2">
+    <view class="bg-white mx-4 p-2 rounded-2">
       <Input
         :id="0"
         value="单行"
@@ -18,6 +18,22 @@
         @change="textareaChange"
       ></Textarea>
       <wd-divider color="#bcbfbe"></wd-divider>
+      <SelectPicker
+        :value="1"
+        :id="2"
+        title="单选框"
+        placeholder="单选"
+        :columns="columns"
+      ></SelectPicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <SelectPicker
+        :value="[0]"
+        :id="3"
+        title="多选框"
+        placeholder="多选"
+        type="checkbox"
+        :columns="columns"
+      ></SelectPicker>
     </view>
   </view>
 </template>
@@ -25,6 +41,22 @@
 <script setup lang="ts">
   import Input from '@/pages/approval/components/Input.vue'
   import Textarea from '@/pages/approval/components/Textarea.vue'
+  import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
+
+  const columns = ref<Record<number, any>>([
+    {
+      value: 0,
+      label: '男装'
+    },
+    {
+      value: 1,
+      label: '奢侈品'
+    },
+    {
+      value: 2,
+      label: '女装'
+    }
+  ])
 
   const inputChange = e => {
     console.log('inputChange', e)
diff --git a/src/pages/approval/components/SelectPicker.vue b/src/pages/approval/components/SelectPicker.vue
new file mode 100644
index 0000000..4ce41f7
--- /dev/null
+++ b/src/pages/approval/components/SelectPicker.vue
@@ -0,0 +1,66 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="pt-2">
+      <wd-select-picker
+        :type="type"
+        :title="placeholder"
+        :show-confirm="type === 'checkbox'"
+        v-model="picker"
+        :columns="columns"
+        size="large"
+      />
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const picker = ref(-1)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      default: 'radio'
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    },
+    value: {
+      type: [Number, Array, null],
+      default: null
+    },
+    columns: {
+      type: Array,
+      required: true
+    }
+  })
+
+  onMounted(() => {
+    if (props.value) {
+      picker.value = props.value
+    }
+  })
+</script>
+
+<style scoped lang="scss">
+  :deep(.wd-select-picker__cell) {
+    padding: var(--wot-cell-wrapper-padding, 10px) 0;
+    background-color: transparent;
+  }
+</style>

From 84084b0758186fe01ef6a838e1990dca0ef36a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 13 Jan 2025 18:56:05 +0800
Subject: [PATCH 20/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E6=95=B0=E5=AD=97=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue | 9 +++++++++
 src/pages/approval/components/Input.vue      | 7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 2cfa5e9..212d071 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -34,6 +34,15 @@
         type="checkbox"
         :columns="columns"
       ></SelectPicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Input
+        :id="4"
+        type="number"
+        title="数字"
+        :required="true"
+        placeholder="数字"
+        @change="inputChange"
+      ></Input>
     </view>
   </view>
 </template>
diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue
index ff1e7d5..96df501 100644
--- a/src/pages/approval/components/Input.vue
+++ b/src/pages/approval/components/Input.vue
@@ -6,9 +6,10 @@
     </view>
     <view class="pt-2">
       <wd-input
+        :type="type"
         custom-class="!bg-transparent"
         :placeholder="placeholder"
-        :maxlength="30"
+        :maxlength="type === 'text' ? 30 : 15"
         v-model="text"
         @input="change(id, $event)"
       ></wd-input>
@@ -26,6 +27,10 @@
       type: Number,
       required: true
     },
+    type: {
+      type: String,
+      default: 'text'
+    },
     required: {
       type: Boolean,
       default: false

From 53d212ba33a7676a781ad049aa1b50a75f5ba2f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 14 Jan 2025 18:17:24 +0800
Subject: [PATCH 21/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue  |  22 ++
 .../approval/components/DatetimePicker.vue    | 196 ++++++++++++++++++
 2 files changed, 218 insertions(+)
 create mode 100644 src/pages/approval/components/DatetimePicker.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 212d071..0cfb397 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -43,6 +43,23 @@
         placeholder="数字"
         @change="inputChange"
       ></Input>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePicker :id="5" title="日期1" @change="changeDate"></DatetimePicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePicker
+        :id="6"
+        title="日期2"
+        type="dateHalfDay"
+        @change="changeDate"
+      ></DatetimePicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePicker
+        :id="7"
+        type="datetime"
+        :value="1737043380000"
+        title="日期3"
+        @change="changeDate"
+      ></DatetimePicker>
     </view>
   </view>
 </template>
@@ -51,6 +68,7 @@
   import Input from '@/pages/approval/components/Input.vue'
   import Textarea from '@/pages/approval/components/Textarea.vue'
   import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
+  import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
 
   const columns = ref<Record<number, any>>([
     {
@@ -74,6 +92,10 @@
   const textareaChange = e => {
     console.log('textareaChange', e)
   }
+
+  const changeDate = e => {
+    console.log('changeDate', e)
+  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/approval/components/DatetimePicker.vue b/src/pages/approval/components/DatetimePicker.vue
new file mode 100644
index 0000000..95fc9c5
--- /dev/null
+++ b/src/pages/approval/components/DatetimePicker.vue
@@ -0,0 +1,196 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="py-2" @click="openDialog">
+      <view class="flex flex-items-center flex-justify-between">
+        <view>{{ text || placeholder }}</view>
+        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+      </view>
+    </view>
+  </view>
+  <wd-popup
+    v-model="show"
+    position="bottom"
+    custom-style="border-radius:12rpx;"
+    @after-leave="afterLeave"
+  >
+    <view>
+      <view class="p-4 text-3.5 border-b-1 border-[#dcdcdc] border-solid flex flex-items-center">
+        <view class="font-bold">日期：</view>
+        <view class="font-bold ml-a" v-if="type !== 'dateHalfDay'">{{ date }}</view>
+      </view>
+      <view v-if="(type === 'date' || type === 'datetime') && showPicker">
+        <wd-datetime-picker-view
+          :formatter="formatter"
+          :type="type"
+          v-model="timestamp"
+          label="日期选择"
+          @change="change"
+        />
+      </view>
+      <view v-if="type === 'dateHalfDay' && showPicker">
+        <wd-tabs v-model="tab">
+          <wd-tab :title="index === 0 ? date : halfDay" v-for="(item, index) in 2" :key="index">
+            <view v-show="index === 0">
+              <wd-datetime-picker-view
+                :formatter="formatter"
+                type="date"
+                v-model="timestamp"
+                @change="change"
+              />
+            </view>
+            <view v-show="index === 1">
+              <wd-picker-view :columns="['上午', '下午']" v-model="halfDay" @change="change" />
+            </view>
+          </wd-tab>
+        </wd-tabs>
+      </view>
+      <view class="pb-safe">
+        <view class="flex py-3 flex-items-center flex-justify-around text-3.5 px-2 font-bold">
+          <view
+            class="w-45% bg-#eeeff4 custom-color-blue py-2.5 rounded-2 text-center"
+            @click="show = false"
+          >
+            取消
+          </view>
+          <view
+            class="w-45% custom-bg-blue color-white py-2.5 rounded-2 text-center"
+            @click="confirm"
+          >
+            确定
+          </view>
+        </view>
+      </view>
+    </view>
+  </wd-popup>
+</template>
+
+<script setup lang="ts">
+  import dayjs from 'dayjs'
+
+  const show = ref<boolean>(false)
+  const timestamp = ref<number>(0)
+  const text = ref<string>('')
+  const date = ref<string>('')
+  const halfDay = ref<string>('')
+  const showPicker = ref<boolean>(false)
+  const returnTimestamp = ref<number>(0)
+
+  const tab = ref<number>(0)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      default: 'date'
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [Number, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    }
+  })
+
+  const formatter = (type, value) => {
+    switch (type) {
+      case 'year':
+        return value + '年'
+      case 'month':
+        return value + '月'
+      case 'date':
+        return value + '日'
+      case 'hour':
+        return value + '时'
+      case 'minute':
+        return value + '分'
+      default:
+        return value
+    }
+  }
+
+  const emits = defineEmits(['change'])
+
+  onMounted(() => {
+    if (props.value) {
+      timestamp.value = props.value
+      if (props.type === 'date') {
+        date.value = dayjs(props.value).format('YYYY-M-D')
+        text.value = date.value
+      } else if (props.type === 'datetime') {
+        date.value = dayjs(props.value).format('YYYY-M-D HH:mm')
+        text.value = date.value
+      } else if (props.type === 'dateHalfDay') {
+        date.value = dayjs(props.value).format('YYYY年M月D日')
+        halfDay.value = dayjs(props.value).hour() < 12 ? '上午' : '下午'
+        text.value = `${date.value} ${halfDay.value}`
+      }
+    }
+  })
+
+  const change = ({ value }) => {
+    if (props.type === 'date') {
+      date.value = dayjs(value).format('YYYY-M-D')
+    } else if (props.type === 'datetime') {
+      date.value = dayjs(value).format('YYYY-M-D HH:mm')
+    } else if (props.type === 'dateHalfDay') {
+      if (tab.value === 0) {
+        date.value = dayjs(value).format('YYYY年M月D日')
+      } else {
+        halfDay.value = value
+      }
+    }
+  }
+
+  const openDialog = () => {
+    if (!props.value) {
+      if (text.value === '') {
+        timestamp.value = new Date().getTime()
+      } else {
+        timestamp.value = returnTimestamp.value
+      }
+
+      if (props.type === 'date') {
+        date.value = dayjs(timestamp.value).format('YYYY-M-D')
+      } else if (props.type === 'datetime') {
+        date.value = dayjs(timestamp.value).format('YYYY-M-D HH:mm')
+      } else if (props.type === 'dateHalfDay') {
+        date.value = dayjs(timestamp.value).format('YYYY年M月D日')
+        halfDay.value = dayjs(timestamp.value).hour() < 12 ? '上午' : '下午'
+      }
+    }
+    showPicker.value = true
+    show.value = true
+  }
+
+  const confirm = () => {
+    show.value = false
+    returnTimestamp.value = timestamp.value
+    if (props.type === 'dateHalfDay') {
+      text.value = `${date.value} ${halfDay.value}`
+    } else {
+      text.value = date.value
+    }
+    emits('change', { id: props.id, value: returnTimestamp.value, text: text.value })
+  }
+
+  const afterLeave = () => {
+    showPicker.value = false
+  }
+</script>

From 561c84f1a909ce5d27370c740c48af7a3f8c5ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 14 Jan 2025 19:39:14 +0800
Subject: [PATCH 22/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue |  3 +
 src/pages/approval/components/Images.vue     | 61 ++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 src/pages/approval/components/Images.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 0cfb397..2b9bc94 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -60,6 +60,8 @@
         title="日期3"
         @change="changeDate"
       ></DatetimePicker>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Images id="8" title="图片"></Images>
     </view>
   </view>
 </template>
@@ -69,6 +71,7 @@
   import Textarea from '@/pages/approval/components/Textarea.vue'
   import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
+  import Images from '@/pages/approval/components/Images.vue'
 
   const columns = ref<Record<number, any>>([
     {
diff --git a/src/pages/approval/components/Images.vue b/src/pages/approval/components/Images.vue
new file mode 100644
index 0000000..c1b3798
--- /dev/null
+++ b/src/pages/approval/components/Images.vue
@@ -0,0 +1,61 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="pt-3">
+      <wd-upload
+        :file-list="fileList"
+        multiple
+        :limit="9"
+        image-mode="aspectFill"
+        :size-type="['original']"
+        action="https://mockapi.eolink.com/zhTuw2P8c29bc981a741931bdd86eb04dc1e8fd64865cb5/upload"
+        @change="handleChange"
+      ></wd-upload>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const fileList = ref<any[]>([])
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: Array,
+      default: () => []
+    }
+  })
+
+  onMounted(() => {
+    if (props.value.length > 0) {
+      fileList.value = props.value
+    }
+  })
+
+  const handleChange = ({ fileList: files }) => {
+    console.log('handleChange', files)
+    fileList.value = files
+  }
+</script>
+
+<style scoped lang="scss">
+  :deep(.wd-upload__evoke),
+  :deep(.wd-upload__status-content),
+  :deep(.wd-upload__picture) {
+    border-radius: 12rpx;
+  }
+</style>

From 3cb49a5132bfbe444175d820ed430a59f6abbe39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 14 Jan 2025 19:44:58 +0800
Subject: [PATCH 23/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E8=AF=B4=E6=98=8E=E9=A1=B9=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue  |  6 ++++++
 src/pages/approval/components/Description.vue | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 src/pages/approval/components/Description.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 2b9bc94..4f2a1c8 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -62,6 +62,11 @@
       ></DatetimePicker>
       <wd-divider color="#bcbfbe"></wd-divider>
       <Images id="8" title="图片"></Images>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Description
+        id="9"
+        title="图片21378912378923718982371217389712397837889713247893428793142897134728900978"
+      ></Description>
     </view>
   </view>
 </template>
@@ -72,6 +77,7 @@
   import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
   import Images from '@/pages/approval/components/Images.vue'
+  import Description from '@/pages/approval/components/Description.vue'
 
   const columns = ref<Record<number, any>>([
     {
diff --git a/src/pages/approval/components/Description.vue b/src/pages/approval/components/Description.vue
new file mode 100644
index 0000000..5bed04c
--- /dev/null
+++ b/src/pages/approval/components/Description.vue
@@ -0,0 +1,18 @@
+<template>
+  <view class="px-2 text-3.5 pb-2">
+    <view class="break-all">{{ title }}</view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    title: {
+      type: String,
+      required: true
+    }
+  })
+</script>

From 03d338974ef60e3a49a7d48a3747be1e174fc1e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 14:54:10 +0800
Subject: [PATCH 24/31] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TopNavigation/TopNavigation.vue           |  21 +-
 src/pages.json                                |  64 +++-
 src/pages/approval/components/Components.vue  |  14 +-
 .../components/MemberOrDepartment.vue         |  65 +++++
 .../components/MemberOrDepartmentItem.vue     |  56 ++++
 .../components/SearchItem.vue                 |  35 +++
 .../select-member-or-department.vue           | 275 ++++++++++++++++++
 src/static/images/icon_delete.png             | Bin 0 -> 1493 bytes
 src/static/images/icon_file.png               | Bin 0 -> 1205 bytes
 src/types/uni-pages.d.ts                      |   6 +
 10 files changed, 529 insertions(+), 7 deletions(-)
 create mode 100644 src/pages/approval/components/MemberOrDepartment.vue
 create mode 100644 src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
 create mode 100644 src/pages/select-member-or-department/components/SearchItem.vue
 create mode 100644 src/pages/select-member-or-department/select-member-or-department.vue
 create mode 100644 src/static/images/icon_delete.png
 create mode 100644 src/static/images/icon_file.png

diff --git a/src/components/TopNavigation/TopNavigation.vue b/src/components/TopNavigation/TopNavigation.vue
index e1755e0..7e6a7f9 100644
--- a/src/components/TopNavigation/TopNavigation.vue
+++ b/src/components/TopNavigation/TopNavigation.vue
@@ -26,14 +26,21 @@
           class="pos-absolute left-3 h-5 w-5"
           @click="back"
         ></image>
-        <view class="flex-1 text-center">
-          <view class="line-clamp-1 max-w-60 break-all mx-auto">
+        <view class="flex flex-items-center">
+          <view class="line-clamp-1 max-w-60 break-all">
             {{ title }}
           </view>
         </view>
         <view class="pos-absolute right--3">
           <slot></slot>
         </view>
+        <view
+          v-if="rightButtonText"
+          class="text-3.5 font-normal pos-absolute right-5"
+          @click="rightButton"
+        >
+          {{ rightButtonText }}
+        </view>
       </view>
     </view>
   </view>
@@ -62,16 +69,24 @@
     backUrl: {
       type: String,
       default: '/static/images/icon_back.png'
+    },
+    rightButtonText: {
+      type: [String, null],
+      default: null
     }
   })
 
-  const emits = defineEmits(['back'])
+  const emits = defineEmits(['back', 'rightButton'])
 
   const back = () => {
     uni.navigateBack()
     emits('back')
   }
 
+  const rightButton = () => {
+    emits('rightButton')
+  }
+
   onMounted(async () => {
     systemInfo.value = await $basic.getSystemInfo()
   })
diff --git a/src/pages.json b/src/pages.json
index 1fb3c68..39642f0 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -50,6 +50,14 @@
     ]
   },
   "pages": [
+    {
+      "path": "pages/mine/mine",
+      "type": "home",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "首页"
+      }
+    },
     {
       "path": "pages/home/home",
       "type": "home",
@@ -169,6 +177,14 @@
       },
       "needLogin": false
     },
+    {
+      "path": "pages/info-publish/add-release-plan",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/info-publish/announce-notice",
       "type": "page",
@@ -193,9 +209,29 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/info-publish/edit-pic-video",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/info-publish/info-publish",
-      "type": "page"
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/info-publish/material-library",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
     },
     {
       "path": "pages/info-publish/notice-details",
@@ -213,6 +249,22 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/info-publish/play-content-library",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/info-publish/release-plan",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/login/login",
       "type": "page",
@@ -243,6 +295,14 @@
       },
       "needLogin": false
     },
+    {
+      "path": "pages/select-member-or-department/select-member-or-department",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      }
+    },
     {
       "path": "pages/workbench/workbench",
       "type": "page"
@@ -297,4 +357,4 @@
     }
   ],
   "subPackages": []
-}
+}
\ No newline at end of file
diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 4f2a1c8..d331ce8 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -61,12 +61,21 @@
         @change="changeDate"
       ></DatetimePicker>
       <wd-divider color="#bcbfbe"></wd-divider>
-      <Images id="8" title="图片"></Images>
+      <Images :id="8" title="图片"></Images>
       <wd-divider color="#bcbfbe"></wd-divider>
       <Description
-        id="9"
+        :id="9"
         title="图片21378912378923718982371217389712397837889713247893428793142897134728900978"
       ></Description>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <MemberOrDepartment :id="10" title="成员" type="member" :multiple="true"></MemberOrDepartment>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <MemberOrDepartment
+        :id="11"
+        title="部门"
+        type="department"
+        :multiple="true"
+      ></MemberOrDepartment>
     </view>
   </view>
 </template>
@@ -78,6 +87,7 @@
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
   import Images from '@/pages/approval/components/Images.vue'
   import Description from '@/pages/approval/components/Description.vue'
+  import MemberOrDepartment from '@/pages/approval/components/MemberOrDepartment.vue'
 
   const columns = ref<Record<number, any>>([
     {
diff --git a/src/pages/approval/components/MemberOrDepartment.vue b/src/pages/approval/components/MemberOrDepartment.vue
new file mode 100644
index 0000000..5339c4c
--- /dev/null
+++ b/src/pages/approval/components/MemberOrDepartment.vue
@@ -0,0 +1,65 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view class="flex flex-items-center pos-relative">
+      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+      <view>{{ title }}</view>
+    </view>
+    <view class="py-2" @click="toSelect">
+      <view class="flex flex-items-center flex-justify-between">
+        <view>{{ text || placeholder }}</view>
+        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const text = ref<string | null>(null)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [Number, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    }
+  })
+
+  const toSelect = () => {
+    const params = {
+      type: props.type,
+      multiple: props.multiple,
+      title: props.type === 'member' ? '选择审批用户' : '选择部门'
+    }
+    uni.navigateTo({
+      url: `/pages/select-member-or-department/select-member-or-department?params=${JSON.stringify(params)}`,
+      events: {
+        change: res => {
+          console.log(1111, res)
+        }
+      }
+    })
+  }
+</script>
diff --git a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
new file mode 100644
index 0000000..2b3c360
--- /dev/null
+++ b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
@@ -0,0 +1,56 @@
+<template>
+  <view class="flex flex-items-center py-2 text-4" @click="toClick">
+    <view
+      v-if="item.type === 'member'"
+      class="w-10 h-10 flex flex-justify-center flex-items-center"
+    >
+      <image
+        src="/static/images/icon_default_avatar.png"
+        class="w-8 h-8 rounded-2"
+        mode="aspectFill"
+      ></image>
+    </view>
+    <view v-else class="w-10 h-10 flex flex-justify-center flex-items-center bg-#e4f1ff rounded-2">
+      <image src="/static/images/icon_file.png" class="w-6 h-6" mode="aspectFill"></image>
+    </view>
+    <view class="ml-2 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
+      {{ item.name }}
+    </view>
+    <view class="ml-a" v-if="item.type === 'department'">
+      <wd-divider vertical></wd-divider>
+    </view>
+    <view
+      v-if="item.type === 'department'"
+      :class="[disabled ? 'color-#87a9fb' : 'custom-color-blue']"
+      class="ml-1"
+    >
+      下级
+    </view>
+    <wd-icon
+      name="arrow-right"
+      size="14px"
+      class="ml-2"
+      :color="disabled ? '#87a9fb' : '#255cf7'"
+      v-if="item.type === 'department'"
+    ></wd-icon>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const emits = defineEmits(['click'])
+
+  const props = defineProps({
+    item: {
+      type: Object,
+      required: true
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const toClick = () => {
+    emits('click')
+  }
+</script>
diff --git a/src/pages/select-member-or-department/components/SearchItem.vue b/src/pages/select-member-or-department/components/SearchItem.vue
new file mode 100644
index 0000000..9a13733
--- /dev/null
+++ b/src/pages/select-member-or-department/components/SearchItem.vue
@@ -0,0 +1,35 @@
+<template>
+  <view class="flex flex-items-center py-2 text-4" @click="toClick">
+    <view
+      v-if="item.type === 'member'"
+      class="w-10 h-10 flex flex-justify-center flex-items-center"
+    >
+      <image
+        src="/static/images/icon_default_avatar.png"
+        class="w-8 h-8 rounded-2"
+        mode="aspectFill"
+      ></image>
+    </view>
+    <view v-else class="w-10 h-10 flex flex-justify-center flex-items-center bg-#e4f1ff rounded-2">
+      <image src="/static/images/icon_file.png" class="w-6 h-6" mode="aspectFill"></image>
+    </view>
+    <view class="ml-2 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
+      {{ item.name }}
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const emits = defineEmits(['click'])
+
+  const props = defineProps({
+    item: {
+      type: Object,
+      required: true
+    }
+  })
+
+  const toClick = () => {
+    emits('click')
+  }
+</script>
diff --git a/src/pages/select-member-or-department/select-member-or-department.vue b/src/pages/select-member-or-department/select-member-or-department.vue
new file mode 100644
index 0000000..f3a80e6
--- /dev/null
+++ b/src/pages/select-member-or-department/select-member-or-department.vue
@@ -0,0 +1,275 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    disableScroll: true
+  }
+}
+</route>
+<template>
+  <view>
+    <view v-if="showSearch" class="h-[calc(100vh-60px)] flex flex-col">
+      <view v-if="systemInfo" :style="{ marginTop: systemInfo.safeAreaInsets?.top + 'px' }">
+        <view class="h-12 pt-1 pb-2">
+          <wd-search
+            :placeholder-left="true"
+            :focus="false"
+            @change="changeSearch"
+            @cancel="showSearch = false"
+          />
+        </view>
+      </view>
+      <scroll-view class="flex-1 box-border" :scroll-y="true">
+        <view class="bg-white">
+          <view
+            v-for="item in list"
+            :key="item.id"
+            class="border-[#ebebeb] border-b-1 border-b-solid px-4 flex flex-items-center"
+          >
+            <view
+              v-if="!(type === 'member' && item.type === 'department')"
+              class="mr-3"
+              @click="toClick(item)"
+            >
+              <wd-icon
+                v-if="value.includes(item)"
+                name="check-circle-filled"
+                color="#255cf9"
+                size="26px"
+              ></wd-icon>
+              <wd-icon v-else name="circle1" color="#838589" size="26px"></wd-icon>
+            </view>
+            <SearchItem class="flex-1" :item="item" @click="toClick(item)"></SearchItem>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+    <view v-if="!showSearch" class="h-[calc(100vh-60px-env(safe-area-inset-bottom))] flex flex-col">
+      <TopNavigation :title="title"></TopNavigation>
+      <view
+        @click="showSearch = true"
+        class="bg-white flex flex-justify-center flex-items-center rounded color-#a6a6a6 mx-4 mt-3 py-1.5"
+      >
+        <wd-icon name="search" size="16px" class="mr-2"></wd-icon>
+        <view>搜索</view>
+      </view>
+      <view class="flex flex-items-center m-4 text-3.5 break-all overflow-hidden whitespace-nowrap">
+        <view
+          v-for="(department, index) in organizationList"
+          :key="department.id"
+          class="flex flex-items-center"
+          @click="toOrganization(index)"
+        >
+          <span
+            :class="[index === organizationList.length - 1 ? 'color-#838589' : 'custom-color-blue']"
+          >
+            {{ department.name }}
+          </span>
+          <span v-if="index !== organizationList.length - 1" class="mx-0.5">/</span>
+        </view>
+      </view>
+      <scroll-view class="flex-1 box-border" :scroll-y="true">
+        <view class="bg-white">
+          <view
+            v-for="item in list"
+            :key="item.id"
+            class="border-[#ebebeb] border-b-1 border-b-solid px-4 flex flex-items-center"
+          >
+            <view
+              v-if="!(type === 'member' && item.type === 'department')"
+              class="mr-3"
+              @click="toClick(item)"
+            >
+              <wd-icon
+                v-if="value.includes(item)"
+                name="check-circle-filled"
+                color="#255cf9"
+                size="26px"
+              ></wd-icon>
+              <wd-icon v-else name="circle1" color="#838589" size="26px"></wd-icon>
+            </view>
+            <MemberOrDepartmentItem
+              class="flex-1"
+              :item="item"
+              :disabled="item.type === 'department' && value.includes(item)"
+              @click="toClick(item)"
+            ></MemberOrDepartmentItem>
+          </view>
+        </view>
+        <view class="py-5 px-15">
+          <wd-divider color="#838589">仅显示已开通账号的人员</wd-divider>
+        </view>
+      </scroll-view>
+    </view>
+    <view
+      class="pb-safe h-60px px-4 border-[#ebebeb] border-t-1 border-t-solid text-3.5 flex flex-items-center"
+    >
+      <view class="flex flex-items-center flex-justify-between w-full">
+        <view class="flex flex-items-center" v-if="value.length" @click="showSelected = true">
+          <view class="custom-color-blue">已选中：{{ value.length }}个人</view>
+          <wd-icon name="arrow-right" size="16px" class="ml-2" color="#255cf7"></wd-icon>
+        </view>
+        <view v-else></view>
+        <view class="custom-bg-blue color-white py-1 px-5 rounded" @click="confirm">确定</view>
+      </view>
+    </view>
+  </view>
+  <wd-popup v-model="showSelected" position="bottom">
+    <view class="h-100vh flex flex-col bg-#f3f5fa">
+      <TopNavigation
+        title="已选中"
+        :have-back="false"
+        right-button-text="确定"
+        @right-button="showSelected = false"
+      ></TopNavigation>
+      <scroll-view class="flex-1 box-border" :scroll-y="true">
+        <view class="bg-white">
+          <view
+            v-for="item in value"
+            :key="item.id"
+            class="flex flex-items-center px-4 py-3 border-[#ebebeb] border-b-1 border-b-solid"
+          >
+            <image :src="item.avatar" class="w-10 h-10 rounded-2"></image>
+            <view class="ml-4 text-3.5">
+              <view>{{ item.name }}</view>
+              <view class="mt-1 color-#a6a6a6 text-3">{{ item.name }}</view>
+            </view>
+            <view class="p-1 ml-a bg-#f3f5f8 rounded-50%" @click="deleteItem(item)">
+              <image src="/static/images/icon_delete.png" class="w-5 h-5"></image>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </wd-popup>
+</template>
+
+<script setup lang="ts">
+  import { useBasicStore } from '@/store'
+  import MemberOrDepartmentItem from '@/pages/select-member-or-department/components/MemberOrDepartmentItem.vue'
+  import SearchItem from '@/pages/select-member-or-department/components/SearchItem.vue'
+
+  const instance = getCurrentInstance().proxy
+  const eventChannel = instance.getOpenerEventChannel()
+
+  const type = ref<string>('')
+  const multiple = ref<boolean>(false)
+  const title = ref<string>('')
+  const showSearch = ref<boolean>(false)
+
+  const organizationList = ref<Array<object>>([
+    {
+      id: 1,
+      type: 'department',
+      name: '技术部'
+    }
+  ])
+
+  const $basic = useBasicStore()
+
+  const systemInfo = ref(null)
+
+  const value = ref<Array>([])
+  const showSelected = ref<boolean>(false)
+
+  const list = ref<Array<object>>([
+    {
+      id: 0,
+      type: 'department',
+      name: 'xxx的互联',
+      avatar: '/static/images/icon_file.png'
+    },
+    {
+      id: 1,
+      type: 'member',
+      name: '张三',
+      avatar: '/static/images/icon_default_avatar.png'
+    },
+    {
+      id: 2,
+      type: 'member',
+      name: '李四',
+      avatar: '/static/images/icon_default_avatar.png'
+    },
+    {
+      id: 3,
+      type: 'member',
+      name: '王五',
+      avatar: '/static/images/icon_default_avatar.png'
+    }
+  ])
+
+  const toClick = item => {
+    if (value.value.includes(item)) {
+      value.value = value.value.filter(v => v !== item)
+    } else {
+      if (multiple.value || value.value.length === 0) {
+        value.value.push(item)
+      } else {
+        uni.showToast({
+          title: '最多选择一个',
+          icon: 'none'
+        })
+      }
+    }
+  }
+
+  const deleteItem = item => {
+    value.value = value.value.filter(v => v !== item)
+  }
+
+  onMounted(async () => {
+    systemInfo.value = await $basic.getSystemInfo()
+  })
+
+  function changeSearch({ value }) {
+    console.log('输入', value)
+  }
+
+  onLoad(options => {
+    const params = JSON.parse(options.params)
+    type.value = params.type
+    multiple.value = params.multiple
+    title.value = params.title
+  })
+
+  const toOrganization = index => {
+    if (index === organizationList.value.length - 1) {
+      return
+    }
+    uni.navigateBack({
+      delta: organizationList.value.length - index - 1
+    })
+  }
+
+  const change = e => {
+    console.log('change', e)
+  }
+
+  const confirm = () => {
+    eventChannel.emit('change', { value: value.value })
+    uni.navigateBack({
+      delta: organizationList.value.length
+    })
+  }
+</script>
+
+<style scoped lang="scss">
+  :deep(.wd-checkbox) {
+    margin-bottom: 0;
+  }
+
+  .wd-search {
+    background: transparent;
+  }
+
+  :deep(.wd-search__block) {
+    padding: 3px 0;
+    background-color: #e2e5ea;
+    border-radius: 0.5rem;
+  }
+
+  :deep(.wd-search__cancel) {
+    color: #a6a6a6;
+  }
+</style>
diff --git a/src/static/images/icon_delete.png b/src/static/images/icon_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..10c193fd39f760e9eda2fbbad302136b9b4c82ba
GIT binary patch
literal 1493
zcmZ`(do<Ju6u!TCYRrrg%E+^_G>FY=JSK*;C?u6MdA43ro}C(x_>EL-IcO(qJ%>`F
zu&rn7F^;k%&y`oosJs$pY0D$*w14mZaqm6%-tT<(p6{M>lbjrFC?q8k08s2~t(_$i
z{c2JKiElRdZkGfk!r8_ON;{RO0q`ky)|SV(9<w>#!7mNSSH@>KdM;&ywVAm=Q@sWC
z{S%hrM>USyIehEhzV=b;n|86=pZaUjF&^&GUQ@$SifX`~q)9ltYl)^zH9ElgIbLUn
zjbvI*v>;+J4UzO!r$%CY{tME;5-%>Ti;c*Kdy01@T;udpH0m6^qoS4PWhy5s3{pzS
z;_w)Ygt(@V$&u+HIb0_!WenrjS&MlF$rdfECz2{TWn%<1W2G@+Y;f2+Y~7XGkaF?%
z6VAhdP%LV{lGls?=ZCfoH89BD+x+1z9=KsRAUEdYd`!;`W%*M(R=6Dvc^qRa_NA+<
zv3=X#xF%ir?F_*f@3F_g?cPh30hfybBw^XxKV+NqZAuE~y2;SiP&e|l-#_4Id?unE
z$*5Ls=$#3QoWen2kF25$;Ihv~ZUQe8Q_KM2f0L?1P~cghxKot3J3ZiUoU@^d;Chj<
z!DcX)I-RuXG}I~kst)RgU48iL?8lA591yznZFoAgo1qL4^@pmSNqL*oIw5~@XC@U)
ziBNs58r%J7-qZ7n>sQ&as8&K1mKJYMq?Os~Vgc<$5-0Xc50ZGzWPmDy1#TCGU4auQ
zj8IWNp*$KKM?1%2KMPv8bHlroM=(w$3O9JGDt9Nx^?K`S^@Gl~Ee(&N7_hFY8yB3*
zX_>|L@2y<;w4`*+%}&;~4tG|Xc3kIAEgweW{Z|Lv)fAKiS-wMG8r+EGhoDF<oCFN?
z{Joo0Dh#6BGnse5_C+{^($&A!6jyu)w)2}wVoJ2`%#JtUWR&?h>X~J97w|9f<HARY
zpp#N)cx=@W^^w+&m3oj*a5nRqrwjK%WPH1?)goD#zCSSd$9v}b9+-otG`qky2pF0G
zcRt;DAccd{Csv<ng9ua%yYy?#FVk#qF^h8}UT?L)@-JZcKLJ~n0K!zN`YTLvHj;`2
z&vyrdb`Pd59VisG9+qDb59(ztNAp}vBpL>Jr-dMCi2XFEAWj8%t{$Sar<@~^dzo2V
z#Ob``IZk%!B}H|BlAa)tATp=ppeA~4#ki6ze1TzM1cgYEA3*5qG<VF`f*(AjvW+CX
zz7G98a10Su#kYbZl?NhaThjZ-8XK%E&Q=Lf+kf^i9!-zJuE&K|05~z#Bs7jXQUJn?
zmBobmTj20-k7F4}XP4n|@J%jpN>PGHB#Wjb*Y=5%Ur;hFb_W}2aXO+M{eJFq`w$49
zY4wg$`s8_iGQ3vMI4{F4RkSXAzHb_amCz(|Y6+f;VK17XN5_v^NOoM^KXch5Fct(+
zQhf?Mdp_!>hcb{pm6r5I1-Dh!jx>6oAv;(r)ztW$j@Et8)mV!J16HAO9ws$DWS>6X
z5Nf7*?dlV2eij=Wn9{WqP1#Qaxcw6W)u`V=_FSilS$I@#vSP#ddV~%6o&4Qu<Gr0}
zX6Ct~!$FHJGeO`7q7SM`9|yxJ(n=^Ds$R^ckEP~q1KpU{J79~ox(_TTH@Y72#2R4P
zrCS6_)q&Ts=;2b`HLbM3Fxkx3c!C!LD?VkJpLpD(C0=qe2GPjh6v`J|Jaf?Gl@JE@
zIk73m#K?c(<kEv%>l^Q+<(QY#dB136jJr!CC6Sbw4YN`c=EdC+5K3t>&LskLg#>?(
z05ks`9Ru9h2tyLoY|`wafp9S^>j(%Pv?H$q<c^Nqz(BB7n;{OwUnczIAyn>Qt_Gl!
yOy+Gsvz!*l2(TJ!>3A4PxaltiqUDZ`qQ>7@h0p6x`KC*LD%c%xv@W&sivI^x=VxXB

literal 0
HcmV?d00001

diff --git a/src/static/images/icon_file.png b/src/static/images/icon_file.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a8886b842e0730c225abb5596c8a0e2df2ca159
GIT binary patch
literal 1205
zcmeAS@N?(olHy`uVBq!ia0vp^y+GW+!3HGF4!o)cQjEnx?oJHr&dI!FU|`Ajba4!+
zh<iKdV9;#?i5Asg0R`EgyizQj&-?uHdNRW%<Z)lR6kC+k>;CIfk-rOFqcY3wQ`mco
zA9b@daXxua(KgwENlJl3ox$Yci5Uzg1_FK$(lX?}9X_49RdM<IOpn<gUYV*tDLJwK
zQvc&%yDKr<j&D75p=Se+rtNw&o(D5yV>xDBW&W(VZVpghZ~y#hn<twHX|yd<Ptg0z
zbS`&^xZ~#!Ryl3Ezm(k;$~|xOwkVJ-clV0jyB8gJ_x*4{dGyz?$6GqnZ8?3<FXx%Q
z(!$_zk7vfadcOR#^>g-}{k=RgX4xs{Ic>`xdtW|2V~0=Yg2EjpwM@_FZ2R*mUuxcJ
z^<HTc&E<z*8s;xg{w&96QvdaQYSu4yri^_jI%Yq5{ea=D_|Jk{3}?Soa$79yvB+F^
z^y_o|M+;rT4JzKLyDW%wJlUO7cuZNzVY7$wYr(xw|M6yAyZk=My0?khq&sw@-a`%x
zht2Eq#Bb|f&=JeMe`x9cD^HfZoZUQOcgzp==mnfdZ+(Ao$y?;Ym$Qy1WG}QlO8PK^
z;lcq&3&sVU?#EabG&UA6ISBXla5^wEKV)f8laUl|U}HPP$>3{Yq{hI@(<00;t02WE
zgKt)$^UFCE_wO?0@ZG<(`H?E`TZhB@cj+~p+&`(ye5xt4?@ME;&`ED=ChlC{n#nBX
zH*?jDbGEs&8kUs^hfaQ5v2kbqPmQ<P7uz>@nO`jI4_#Zzcy>m_%fqKaFTX9>X!kCY
z$-lYuR<dbyvH#4%#Y@B6T=o6mcb@&R|6$h3^%V<unja8<o$I*yk<*-Qd?tRm-FujN
zH9XWM7ZheiKM~DvakM(g&>MVPX}yCo*CkK3j5)W&Dp{ohC-@mTJifB+g!YAwrjkjF
zQp>lw#x=T$ESb!6!D6fKCoYpk3UgB$j;+j{7`{M|^`#2)NHKaf%dA5E@4piT-g3@7
z28`lk+*yUy4wsX(d*6GqojqJvAsJMacSrxWu*!t<nbkF?+BH|&m@;H66MFUh_wv|z
zPZCR_O*&>jtUK^y{p2}(%a8BTEsSE}UGD2S<+WUJRi>6*=CQ_x&3PK@-tPOt_G3|C
z$)y-JX219cJsW!Z`gZ>jDimvaCOhwX;^cRi)HVquOM5?<!>2lb%D!7)eJ_}#&3_x>
z$B?1Le(!LR!)530skRKhPY+Z_@MTnGY}~}YV5Lk2|7k{Fe%-Kd3?@^V-zQowc)9TC
jDY=GaMGtIszDsZ3b$`C!kBA?@a)`mx)z4*}Q$iB}w`U?2

literal 0
HcmV?d00001

diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index b4660c3..8e6bfdb 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -20,16 +20,22 @@ interface NavigateToOptions {
        "/pages/attendance/issue-record" |
        "/pages/code/code" |
        "/pages/get-code/get-code" |
+       "/pages/info-publish/add-release-plan" |
        "/pages/info-publish/announce-notice" |
        "/pages/info-publish/basic-info" |
        "/pages/info-publish/drafts-list" |
+       "/pages/info-publish/edit-pic-video" |
        "/pages/info-publish/info-publish" |
+       "/pages/info-publish/material-library" |
        "/pages/info-publish/notice-details" |
        "/pages/info-publish/notice-manage" |
+       "/pages/info-publish/play-content-library" |
+       "/pages/info-publish/release-plan" |
        "/pages/login/login" |
        "/pages/notification/notification" |
        "/pages/personnel-passage/traffic-correlation" |
        "/pages/reset-password/reset-password" |
+       "/pages/select-member-or-department/select-member-or-department" |
        "/pages/workbench/workbench" |
        "/pages/attendance/attendance-add-group/attendance-add-group" |
        "/pages/attendance/attendance-add-group/attendance-device" |

From 67996568f4e40a7646dbcc4f75e161a4bfde8aba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 16 Jan 2025 09:38:56 +0800
Subject: [PATCH 25/31] =?UTF-8?q?fix:=20=E6=95=B4=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TeamPopup/TeamPopup.vue        |   3 +-
 .../TopNavigation/TopNavigation.vue           |   3 +-
 src/pages.json                                | 102 ++++--------------
 .../application-list.vue                      |   0
 .../home/{ => compoents}/HomeAddDevice.vue    |   0
 .../{ => compoents}/HomeAddTeamManager.vue    |   0
 .../home/{ => compoents}/HomeAttendance.vue   |   0
 .../home/{ => compoents}/HomeBulletin.vue     |   0
 .../home/{ => compoents}/HomeOpenDoor.vue     |   0
 .../home/{ => compoents}/HomeSetting.vue      |   0
 src/pages/home/{ => compoents}/HomeSwiper.vue |   0
 src/pages/home/{ => compoents}/HomeTab.vue    |   2 +-
 .../home/{ => compoents}/HomeTeamManager.vue  |   0
 src/pages/home/{ => compoents}/HomeTodo.vue   |   0
 src/pages/home/home.vue                       |  32 +++---
 src/pages/{code => login}/code.vue            |   6 +-
 src/pages/{get-code => login}/get-code.vue    |   8 +-
 src/pages/login/login.vue                     |  12 ++-
 .../reset-password.vue                        |   6 +-
 .../components/MemberOrDepartmentItem.vue     |   6 +-
 .../select-member-or-department.vue           |   3 +-
 src/types/uni-pages.d.ts                      |  18 ++--
 22 files changed, 78 insertions(+), 123 deletions(-)
 rename src/pages/{application-list => home}/application-list.vue (100%)
 rename src/pages/home/{ => compoents}/HomeAddDevice.vue (100%)
 rename src/pages/home/{ => compoents}/HomeAddTeamManager.vue (100%)
 rename src/pages/home/{ => compoents}/HomeAttendance.vue (100%)
 rename src/pages/home/{ => compoents}/HomeBulletin.vue (100%)
 rename src/pages/home/{ => compoents}/HomeOpenDoor.vue (100%)
 rename src/pages/home/{ => compoents}/HomeSetting.vue (100%)
 rename src/pages/home/{ => compoents}/HomeSwiper.vue (100%)
 rename src/pages/home/{ => compoents}/HomeTab.vue (96%)
 rename src/pages/home/{ => compoents}/HomeTeamManager.vue (100%)
 rename src/pages/home/{ => compoents}/HomeTodo.vue (100%)
 rename src/pages/{code => login}/code.vue (97%)
 rename src/pages/{get-code => login}/get-code.vue (93%)
 rename src/pages/{reset-password => login}/reset-password.vue (98%)

diff --git a/src/components/TeamPopup/TeamPopup.vue b/src/components/TeamPopup/TeamPopup.vue
index b9e73f1..d120885 100644
--- a/src/components/TeamPopup/TeamPopup.vue
+++ b/src/components/TeamPopup/TeamPopup.vue
@@ -56,10 +56,11 @@
 
 <script setup lang="ts">
   import { useBasicStore } from '@/store'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
   const show = ref<boolean>(false)
 
   onMounted(async () => {
diff --git a/src/components/TopNavigation/TopNavigation.vue b/src/components/TopNavigation/TopNavigation.vue
index 7e6a7f9..190fe75 100644
--- a/src/components/TopNavigation/TopNavigation.vue
+++ b/src/components/TopNavigation/TopNavigation.vue
@@ -48,10 +48,11 @@
 
 <script lang="ts" setup>
   import { useBasicStore } from '@/store'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
 
   defineProps({
     mini: {
diff --git a/src/pages.json b/src/pages.json
index 39642f0..de9a36a 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -50,14 +50,6 @@
     ]
   },
   "pages": [
-    {
-      "path": "pages/mine/mine",
-      "type": "home",
-      "style": {
-        "navigationStyle": "custom",
-        "navigationBarTitleText": "首页"
-      }
-    },
     {
       "path": "pages/home/home",
       "type": "home",
@@ -67,10 +59,6 @@
         "disableScroll": true
       }
     },
-    {
-      "path": "pages/application-list/application-list",
-      "type": "page"
-    },
     {
       "path": "pages/approval/approval-detail",
       "type": "page",
@@ -160,30 +148,8 @@
       }
     },
     {
-      "path": "pages/code/code",
-      "type": "page",
-      "style": {
-        "navigationStyle": "custom",
-        "disableScroll": true
-      },
-      "needLogin": false
-    },
-    {
-      "path": "pages/get-code/get-code",
-      "type": "page",
-      "style": {
-        "navigationStyle": "custom",
-        "disableScroll": true
-      },
-      "needLogin": false
-    },
-    {
-      "path": "pages/info-publish/add-release-plan",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationStyle": "custom"
-      }
+      "path": "pages/home/application-list",
+      "type": "page"
     },
     {
       "path": "pages/info-publish/announce-notice",
@@ -209,29 +175,9 @@
         "navigationStyle": "custom"
       }
     },
-    {
-      "path": "pages/info-publish/edit-pic-video",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationStyle": "custom"
-      }
-    },
     {
       "path": "pages/info-publish/info-publish",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/info-publish/material-library",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationStyle": "custom"
-      }
+      "type": "page"
     },
     {
       "path": "pages/info-publish/notice-details",
@@ -250,20 +196,22 @@
       }
     },
     {
-      "path": "pages/info-publish/play-content-library",
+      "path": "pages/login/code",
       "type": "page",
-      "layout": "default",
       "style": {
-        "navigationStyle": "custom"
-      }
+        "navigationStyle": "custom",
+        "disableScroll": true
+      },
+      "needLogin": false
     },
     {
-      "path": "pages/info-publish/release-plan",
+      "path": "pages/login/get-code",
       "type": "page",
-      "layout": "default",
       "style": {
-        "navigationStyle": "custom"
-      }
+        "navigationStyle": "custom",
+        "disableScroll": true
+      },
+      "needLogin": false
     },
     {
       "path": "pages/login/login",
@@ -275,19 +223,7 @@
       "needLogin": false
     },
     {
-      "path": "pages/notification/notification",
-      "type": "page"
-    },
-    {
-      "path": "pages/personnel-passage/traffic-correlation",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/reset-password/reset-password",
+      "path": "pages/login/reset-password",
       "type": "page",
       "style": {
         "navigationStyle": "custom",
@@ -295,6 +231,14 @@
       },
       "needLogin": false
     },
+    {
+      "path": "pages/mine/mine",
+      "type": "page"
+    },
+    {
+      "path": "pages/notification/notification",
+      "type": "page"
+    },
     {
       "path": "pages/select-member-or-department/select-member-or-department",
       "type": "page",
@@ -357,4 +301,4 @@
     }
   ],
   "subPackages": []
-}
\ No newline at end of file
+}
diff --git a/src/pages/application-list/application-list.vue b/src/pages/home/application-list.vue
similarity index 100%
rename from src/pages/application-list/application-list.vue
rename to src/pages/home/application-list.vue
diff --git a/src/pages/home/HomeAddDevice.vue b/src/pages/home/compoents/HomeAddDevice.vue
similarity index 100%
rename from src/pages/home/HomeAddDevice.vue
rename to src/pages/home/compoents/HomeAddDevice.vue
diff --git a/src/pages/home/HomeAddTeamManager.vue b/src/pages/home/compoents/HomeAddTeamManager.vue
similarity index 100%
rename from src/pages/home/HomeAddTeamManager.vue
rename to src/pages/home/compoents/HomeAddTeamManager.vue
diff --git a/src/pages/home/HomeAttendance.vue b/src/pages/home/compoents/HomeAttendance.vue
similarity index 100%
rename from src/pages/home/HomeAttendance.vue
rename to src/pages/home/compoents/HomeAttendance.vue
diff --git a/src/pages/home/HomeBulletin.vue b/src/pages/home/compoents/HomeBulletin.vue
similarity index 100%
rename from src/pages/home/HomeBulletin.vue
rename to src/pages/home/compoents/HomeBulletin.vue
diff --git a/src/pages/home/HomeOpenDoor.vue b/src/pages/home/compoents/HomeOpenDoor.vue
similarity index 100%
rename from src/pages/home/HomeOpenDoor.vue
rename to src/pages/home/compoents/HomeOpenDoor.vue
diff --git a/src/pages/home/HomeSetting.vue b/src/pages/home/compoents/HomeSetting.vue
similarity index 100%
rename from src/pages/home/HomeSetting.vue
rename to src/pages/home/compoents/HomeSetting.vue
diff --git a/src/pages/home/HomeSwiper.vue b/src/pages/home/compoents/HomeSwiper.vue
similarity index 100%
rename from src/pages/home/HomeSwiper.vue
rename to src/pages/home/compoents/HomeSwiper.vue
diff --git a/src/pages/home/HomeTab.vue b/src/pages/home/compoents/HomeTab.vue
similarity index 96%
rename from src/pages/home/HomeTab.vue
rename to src/pages/home/compoents/HomeTab.vue
index f124fe2..00caea8 100644
--- a/src/pages/home/HomeTab.vue
+++ b/src/pages/home/compoents/HomeTab.vue
@@ -50,7 +50,7 @@
 
   const clickMenu = () => {
     uni.navigateTo({
-      url: '/pages/application-list/application-list'
+      url: '/pages/home/application-list'
     })
   }
 
diff --git a/src/pages/home/HomeTeamManager.vue b/src/pages/home/compoents/HomeTeamManager.vue
similarity index 100%
rename from src/pages/home/HomeTeamManager.vue
rename to src/pages/home/compoents/HomeTeamManager.vue
diff --git a/src/pages/home/HomeTodo.vue b/src/pages/home/compoents/HomeTodo.vue
similarity index 100%
rename from src/pages/home/HomeTodo.vue
rename to src/pages/home/compoents/HomeTodo.vue
diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue
index 1ed0009..233a012 100644
--- a/src/pages/home/home.vue
+++ b/src/pages/home/home.vue
@@ -40,7 +40,7 @@
           <HomeSwiper @colorChange="colorChange"></HomeSwiper>
           <HomeBulletin class="my-2"></HomeBulletin>
           <HomeTodo class="my-2"></HomeTodo>
-          <CustomTab :list="featuresList" @clickItem="clickItem"></CustomTab>
+          <CustomTab :list="featuresList"></CustomTab>
           <HomeOpenDoor class="my-2"></HomeOpenDoor>
           <HomeAttendance class="my-2"></HomeAttendance>
           <HomeTeamManager class="my-2"></HomeTeamManager>
@@ -56,25 +56,26 @@
 </template>
 
 <script lang="ts" setup>
-  import CustomTab from '@/pages/home/HomeTab.vue'
+  import CustomTab from '@/pages/home/compoents/HomeTab.vue'
   import { useBasicStore, useUserStore } from '@/store'
   import { Result } from '@/constants/result'
   import { HomeTab } from '@/typings'
-  import HomeSwiper from '@/pages/home/HomeSwiper.vue'
-  import HomeBulletin from '@/pages/home/HomeBulletin.vue'
-  import HomeTodo from '@/pages/home/HomeTodo.vue'
-  import HomeOpenDoor from '@/pages/home/HomeOpenDoor.vue'
-  import HomeAttendance from '@/pages/home/HomeAttendance.vue'
-  import HomeTeamManager from '@/pages/home/HomeTeamManager.vue'
-  import HomeSetting from '@/pages/home/HomeSetting.vue'
-  import HomeAddDevice from '@/pages/home/HomeAddDevice.vue'
-  import HomeAddTeamManager from '@/pages/home/HomeAddTeamManager.vue'
+  import HomeSwiper from '@/pages/home/compoents/HomeSwiper.vue'
+  import HomeBulletin from '@/pages/home/compoents/HomeBulletin.vue'
+  import HomeTodo from '@/pages/home/compoents/HomeTodo.vue'
+  import HomeOpenDoor from '@/pages/home/compoents/HomeOpenDoor.vue'
+  import HomeAttendance from '@/pages/home/compoents/HomeAttendance.vue'
+  import HomeTeamManager from '@/pages/home/compoents/HomeTeamManager.vue'
+  import HomeSetting from '@/pages/home/compoents/HomeSetting.vue'
+  import HomeAddDevice from '@/pages/home/compoents/HomeAddDevice.vue'
+  import HomeAddTeamManager from '@/pages/home/compoents/HomeAddTeamManager.vue'
   import TeamPopup from '@/components/TeamPopup/TeamPopup.vue'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const $user = useUserStore()
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
 
   const color = ref<string>('#bfcbef')
 
@@ -318,11 +319,4 @@
   const colorChange = data => {
     color.value = data
   }
-
-  const clickItem = item => {
-    console.log(item)
-    uni.navigateTo({
-      url: item.url
-    })
-  }
 </script>
diff --git a/src/pages/code/code.vue b/src/pages/login/code.vue
similarity index 97%
rename from src/pages/code/code.vue
rename to src/pages/login/code.vue
index 04ac263..3f72908 100644
--- a/src/pages/code/code.vue
+++ b/src/pages/login/code.vue
@@ -124,7 +124,7 @@
         }
       } else if (type.value === 'reset-password') {
         await uni.redirectTo({
-          url: `/pages/reset-password/reset-password?phone=${phone.value}&code=${code.value}`
+          url: `/pages/login/reset-password?phone=${phone.value}&code=${code.value}`
         })
       }
     }
@@ -159,4 +159,8 @@
     border: #b8b8b8 solid 2rpx;
     border-radius: 12rpx;
   }
+
+  page {
+    background-color: #ffffff;
+  }
 </style>
diff --git a/src/pages/get-code/get-code.vue b/src/pages/login/get-code.vue
similarity index 93%
rename from src/pages/get-code/get-code.vue
rename to src/pages/login/get-code.vue
index 22720bd..574fe38 100644
--- a/src/pages/get-code/get-code.vue
+++ b/src/pages/login/get-code.vue
@@ -63,7 +63,7 @@
       uni.hideLoading()
       if (result.errorCode === Result.Success.code) {
         await uni.navigateTo({
-          url: `/pages/reset-password/reset-password?phone=${phone.value}`
+          url: `/pages/login/reset-password?phone=${phone.value}`
         })
       } else {
         await uni.showToast({
@@ -85,3 +85,9 @@
     phone.value = value
   }
 </script>
+
+<style lang="scss">
+  page {
+    background-color: #ffffff;
+  }
+</style>
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index c9cc32b..48f0e18 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -61,7 +61,7 @@
               :disabled="!phonePass"
               :round="false"
               size="large"
-              @click="codeLogin"
+              @click="codeLogin(false, $event)"
             >
               获取验证码
             </wd-button>
@@ -264,7 +264,7 @@
       })
       uni.hideLoading()
       if (result.errorCode === Result.Success.code) {
-        let url = `/pages/code/code?phone=${phone.value}&type=login`
+        let url = `/pages/login/code?phone=${phone.value}&type=login`
         if (tip) {
           url = url + `&tip=true`
         }
@@ -298,7 +298,7 @@
       params = `?phone=${phone.value}`
     }
     uni.navigateTo({
-      url: `/pages/get-code/get-code${params}`
+      url: `/pages/login/get-code${params}`
     })
   }
 
@@ -325,3 +325,9 @@
     consentAgreement.value = !consentAgreement.value
   }
 </script>
+
+<style lang="scss">
+  page {
+    background-color: #ffffff;
+  }
+</style>
diff --git a/src/pages/reset-password/reset-password.vue b/src/pages/login/reset-password.vue
similarity index 98%
rename from src/pages/reset-password/reset-password.vue
rename to src/pages/login/reset-password.vue
index c70afde..d89595f 100644
--- a/src/pages/reset-password/reset-password.vue
+++ b/src/pages/login/reset-password.vue
@@ -226,4 +226,8 @@
   }
 </script>
 
-<style scoped lang="scss"></style>
+<style lang="scss">
+  page {
+    background-color: #ffffff;
+  }
+</style>
diff --git a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
index 2b3c360..a845b28 100644
--- a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
+++ b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
@@ -16,11 +16,11 @@
     <view class="ml-2 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
       {{ item.name }}
     </view>
-    <view class="ml-a" v-if="item.type === 'department'">
+    <view class="ml-a" v-if="item.type !== 'member'">
       <wd-divider vertical></wd-divider>
     </view>
     <view
-      v-if="item.type === 'department'"
+      v-if="item.type !== 'member'"
       :class="[disabled ? 'color-#87a9fb' : 'custom-color-blue']"
       class="ml-1"
     >
@@ -31,7 +31,7 @@
       size="14px"
       class="ml-2"
       :color="disabled ? '#87a9fb' : '#255cf7'"
-      v-if="item.type === 'department'"
+      v-if="item.type !== 'member'"
     ></wd-icon>
   </view>
 </template>
diff --git a/src/pages/select-member-or-department/select-member-or-department.vue b/src/pages/select-member-or-department/select-member-or-department.vue
index f3a80e6..c27d26b 100644
--- a/src/pages/select-member-or-department/select-member-or-department.vue
+++ b/src/pages/select-member-or-department/select-member-or-department.vue
@@ -148,6 +148,7 @@
   import { useBasicStore } from '@/store'
   import MemberOrDepartmentItem from '@/pages/select-member-or-department/components/MemberOrDepartmentItem.vue'
   import SearchItem from '@/pages/select-member-or-department/components/SearchItem.vue'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const instance = getCurrentInstance().proxy
   const eventChannel = instance.getOpenerEventChannel()
@@ -167,7 +168,7 @@
 
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
 
   const value = ref<Array>([])
   const showSelected = ref<boolean>(false)
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 8e6bfdb..058f3eb 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -4,9 +4,7 @@
 // Generated by vite-plugin-uni-pages
 
 interface NavigateToOptions {
-  url: "/pages/mine/mine" |
-       "/pages/home/home" |
-       "/pages/application-list/application-list" |
+  url: "/pages/home/home" |
        "/pages/approval/approval-detail" |
        "/pages/approval/approval" |
        "/pages/approval/create-application" |
@@ -18,23 +16,19 @@ interface NavigateToOptions {
        "/pages/attendance/flexible-punching" |
        "/pages/attendance/issue-record-detail" |
        "/pages/attendance/issue-record" |
-       "/pages/code/code" |
-       "/pages/get-code/get-code" |
-       "/pages/info-publish/add-release-plan" |
+       "/pages/home/application-list" |
        "/pages/info-publish/announce-notice" |
        "/pages/info-publish/basic-info" |
        "/pages/info-publish/drafts-list" |
-       "/pages/info-publish/edit-pic-video" |
        "/pages/info-publish/info-publish" |
-       "/pages/info-publish/material-library" |
        "/pages/info-publish/notice-details" |
        "/pages/info-publish/notice-manage" |
-       "/pages/info-publish/play-content-library" |
-       "/pages/info-publish/release-plan" |
+       "/pages/login/code" |
+       "/pages/login/get-code" |
        "/pages/login/login" |
+       "/pages/login/reset-password" |
+       "/pages/mine/mine" |
        "/pages/notification/notification" |
-       "/pages/personnel-passage/traffic-correlation" |
-       "/pages/reset-password/reset-password" |
        "/pages/select-member-or-department/select-member-or-department" |
        "/pages/workbench/workbench" |
        "/pages/attendance/attendance-add-group/attendance-add-group" |

From 3bfcf05ad964e7e24bcd98e278f56caeae681c86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 16 Jan 2025 15:19:30 +0800
Subject: [PATCH 26/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=A8=A1=E5=9D=97=E8=AF=B7=E5=81=87=E3=80=81=E5=87=BA?=
 =?UTF-8?q?=E5=B7=AE=E3=80=81=E5=A4=96=E5=87=BA=E3=80=81=E8=A1=A5=E5=8D=A1?=
 =?UTF-8?q?=E3=80=81=E5=8A=A0=E7=8F=AD=E5=A5=97=E4=BB=B6=E7=9A=84=E5=B0=81?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/approval/components/Components.vue  |  23 +++-
 .../approval/components/DatetimePicker.vue    |  63 +++++++++-
 .../components/DatetimePickerGroup.vue        | 110 ++++++++++++++++++
 src/pages/approval/components/Input.vue       |  13 +++
 src/pages/approval/components/Leave.vue       |  97 +++++++++++++++
 .../components/MemberOrDepartment.vue         |   4 +-
 src/pages/approval/components/Overtime.vue    |  43 +++++++
 .../approval/components/SelectPicker.vue      |  40 ++++++-
 8 files changed, 387 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/approval/components/DatetimePickerGroup.vue
 create mode 100644 src/pages/approval/components/Leave.vue
 create mode 100644 src/pages/approval/components/Overtime.vue

diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index d331ce8..001aede 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -1,5 +1,5 @@
 <template>
-  <view>
+  <view class="pb-3">
     <view class="bg-white mx-4 p-2 rounded-2">
       <Input
         :id="0"
@@ -76,6 +76,22 @@
         type="department"
         :multiple="true"
       ></MemberOrDepartment>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Leave :id="12"></Leave>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePickerGroup :id="13" type="businessTrip" unit="date"></DatetimePickerGroup>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePickerGroup :id="14" type="goOut" unit="dateHalfDay"></DatetimePickerGroup>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <Overtime :id="15"></Overtime>
+      <wd-divider color="#bcbfbe"></wd-divider>
+      <DatetimePicker
+        :id="16"
+        type="datetime"
+        required
+        title="补卡时间"
+        @change="changeDate"
+      ></DatetimePicker>
     </view>
   </view>
 </template>
@@ -88,8 +104,11 @@
   import Images from '@/pages/approval/components/Images.vue'
   import Description from '@/pages/approval/components/Description.vue'
   import MemberOrDepartment from '@/pages/approval/components/MemberOrDepartment.vue'
+  import Leave from '@/pages/approval/components/Leave.vue'
+  import DatetimePickerGroup from '@/pages/approval/components/DatetimePickerGroup.vue'
+  import Overtime from '@/pages/approval/components/Overtime.vue'
 
-  const columns = ref<Record<number, any>>([
+  const columns = ref<Record<number, string>>([
     {
       value: 0,
       label: '男装'
diff --git a/src/pages/approval/components/DatetimePicker.vue b/src/pages/approval/components/DatetimePicker.vue
index 95fc9c5..e27f5d8 100644
--- a/src/pages/approval/components/DatetimePicker.vue
+++ b/src/pages/approval/components/DatetimePicker.vue
@@ -6,7 +6,9 @@
     </view>
     <view class="py-2" @click="openDialog">
       <view class="flex flex-items-center flex-justify-between">
-        <view>{{ text || placeholder }}</view>
+        <view :class="text ? 'custom-color-black' : 'color-#838589'">
+          {{ text || placeholder }}
+        </view>
         <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
       </view>
     </view>
@@ -104,7 +106,31 @@
     },
     placeholder: {
       type: String,
-      default: '请输入'
+      default: '请选择'
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    disabledText: {
+      type: String,
+      default: ''
+    },
+    minDate: {
+      type: [Number, null],
+      default: null
+    },
+    maxDate: {
+      type: [Number, null],
+      default: null
+    },
+    minDateText: {
+      type: String,
+      default: ''
+    },
+    maxDateText: {
+      type: String,
+      default: ''
     }
   })
 
@@ -159,6 +185,13 @@
   }
 
   const openDialog = () => {
+    if (props.disabled) {
+      uni.showToast({
+        title: props.disabledText,
+        icon: 'none'
+      })
+      return
+    }
     if (!props.value) {
       if (text.value === '') {
         timestamp.value = new Date().getTime()
@@ -180,6 +213,20 @@
   }
 
   const confirm = () => {
+    if (props.minDate && timestamp.value < props.minDate) {
+      uni.showToast({
+        title: props.minDateText,
+        icon: 'none'
+      })
+      return
+    }
+    if (props.maxDate && timestamp.value > props.maxDate) {
+      uni.showToast({
+        title: props.maxDateText,
+        icon: 'none'
+      })
+      return
+    }
     show.value = false
     returnTimestamp.value = timestamp.value
     if (props.type === 'dateHalfDay') {
@@ -193,4 +240,16 @@
   const afterLeave = () => {
     showPicker.value = false
   }
+
+  const clear = () => {
+    text.value = ''
+    date.value = ''
+    halfDay.value = ''
+    returnTimestamp.value = 0
+    emits('change', { id: props.id, value: returnTimestamp.value, text: text.value })
+  }
+
+  defineExpose({
+    clear
+  })
 </script>
diff --git a/src/pages/approval/components/DatetimePickerGroup.vue b/src/pages/approval/components/DatetimePickerGroup.vue
new file mode 100644
index 0000000..3d3142d
--- /dev/null
+++ b/src/pages/approval/components/DatetimePickerGroup.vue
@@ -0,0 +1,110 @@
+<template>
+  <view>
+    <DatetimePicker
+      :id="1"
+      ref="startDatetimePicker"
+      title="开始时间"
+      @change="changeDate"
+      :max-date="endTimestamp"
+      max-date-text="开始时间不能晚于结束时间"
+      required
+      :disabled="disabled"
+      :disabled-text="disabledText"
+      :type="unit"
+    ></DatetimePicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <DatetimePicker
+      :id="2"
+      title="结束时间"
+      ref="endDatetimePicker"
+      :min-date="startTimestamp"
+      min-date-text="结束时间不能早于开始时间"
+      @change="changeDate"
+      required
+      :type="unit"
+      :disabled="disabled"
+      :disabled-text="disabledText"
+    ></DatetimePicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input
+      :id="3"
+      ref="inputComponent"
+      type="number"
+      :title="`${textMap[type]}时长${unit === 'datetime' ? '（小时）' : '（天）'}`"
+      required
+      :readonly="updateTime"
+      placeholder="自动计算"
+      @change="inputChange"
+    ></Input>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
+  import Input from '@/pages/approval/components/Input.vue'
+
+  const textMap = {
+    leave: '请假',
+    businessTrip: '出差',
+    goOut: '外出',
+    overtime: '加班'
+  }
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    unit: {
+      type: String,
+      default: 'date'
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    disabledText: {
+      type: String,
+      default: ''
+    },
+    updateTime: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const startTimestamp = ref(0)
+  const endTimestamp = ref(0)
+
+  const startDatetimePicker = ref(null)
+  const endDatetimePicker = ref(null)
+  const inputComponent = ref(null)
+
+  const changeDate = e => {
+    if (e.id === 1) {
+      startTimestamp.value = e.value
+    } else {
+      endTimestamp.value = e.value
+    }
+  }
+
+  const inputChange = e => {
+    console.log('inputChange', e)
+  }
+
+  const clear = () => {
+    startDatetimePicker.value.clear()
+    endDatetimePicker.value.clear()
+    inputComponent.value.clear()
+  }
+
+  defineExpose({
+    clear
+  })
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue
index 96df501..9334107 100644
--- a/src/pages/approval/components/Input.vue
+++ b/src/pages/approval/components/Input.vue
@@ -11,6 +11,7 @@
         :placeholder="placeholder"
         :maxlength="type === 'text' ? 30 : 15"
         v-model="text"
+        :readonly="readonly"
         @input="change(id, $event)"
       ></wd-input>
     </view>
@@ -46,6 +47,10 @@
     placeholder: {
       type: String,
       default: '请输入'
+    },
+    readonly: {
+      type: Boolean,
+      default: false
     }
   })
 
@@ -56,6 +61,14 @@
   const change = (id, data) => {
     emits('change', { id, value: data.value })
   }
+
+  const clear = () => {
+    text.value = ''
+  }
+
+  defineExpose({
+    clear
+  })
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/approval/components/Leave.vue b/src/pages/approval/components/Leave.vue
new file mode 100644
index 0000000..b7bade7
--- /dev/null
+++ b/src/pages/approval/components/Leave.vue
@@ -0,0 +1,97 @@
+<template>
+  <view>
+    <SelectPicker
+      :id="0"
+      title="请假类型"
+      placeholder="请选择"
+      :columns="columns"
+      required
+      @change="changeSelect"
+    ></SelectPicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <DatetimePickerGroup
+      ref="timeGroup"
+      type="leave"
+      :disabled="!leaveType"
+      :updateTime="updateTime"
+      :unit="leaveType?.unit ?? 'date'"
+      disabled-text="请选择请假类型"
+      :id="1"
+    ></DatetimePickerGroup>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
+  import DatetimePickerGroup from '@/pages/approval/components/DatetimePickerGroup.vue'
+
+  const leaveType = ref(null)
+  const timeGroup = ref(null)
+
+  const columns = ref<Record<number, string>>([
+    {
+      value: 0,
+      label: '年假',
+      unit: 'date'
+    },
+    {
+      value: 1,
+      label: '事假',
+      unit: 'dateHalfDay'
+    },
+    {
+      value: 2,
+      label: '病假',
+      unit: 'datetime'
+    },
+    {
+      value: 3,
+      label: '婚假',
+      unit: 'date',
+      limit: 5
+    },
+    {
+      value: 4,
+      label: '产假',
+      unit: 'datetime',
+      limit: 24.5
+    },
+    {
+      value: 5,
+      label: '陪产假',
+      unit: 'datetime'
+    },
+    {
+      value: 6,
+      label: '丧假',
+      unit: 'date'
+    },
+    {
+      value: 7,
+      label: '哺乳假',
+      unit: 'date'
+    }
+  ])
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    updateTime: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const changeSelect = e => {
+    leaveType.value = e.value
+    timeGroup.value.clear()
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-divider {
+    padding: 0 0.5rem;
+  }
+</style>
diff --git a/src/pages/approval/components/MemberOrDepartment.vue b/src/pages/approval/components/MemberOrDepartment.vue
index 5339c4c..e582118 100644
--- a/src/pages/approval/components/MemberOrDepartment.vue
+++ b/src/pages/approval/components/MemberOrDepartment.vue
@@ -6,7 +6,9 @@
     </view>
     <view class="py-2" @click="toSelect">
       <view class="flex flex-items-center flex-justify-between">
-        <view>{{ text || placeholder }}</view>
+        <view :class="text ? 'custom-color-black' : 'color-#838589'">
+          {{ text || placeholder }}
+        </view>
         <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
       </view>
     </view>
diff --git a/src/pages/approval/components/Overtime.vue b/src/pages/approval/components/Overtime.vue
new file mode 100644
index 0000000..683a52c
--- /dev/null
+++ b/src/pages/approval/components/Overtime.vue
@@ -0,0 +1,43 @@
+<template>
+  <view>
+    <DatetimePicker
+      :id="0"
+      ref="startDatetimePicker"
+      title="加班日期"
+      @change="changeDate"
+      required
+    ></DatetimePicker>
+    <wd-divider v-if="timestamp" color="#bcbfbe"></wd-divider>
+    <DatetimePickerGroup
+      v-if="timestamp"
+      type="overtime"
+      unit="datetime"
+      :id="1"
+    ></DatetimePickerGroup>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import DatetimePickerGroup from '@/pages/approval/components/DatetimePickerGroup.vue'
+  import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
+
+  const timestamp = ref<number>(0)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    }
+  })
+
+  const changeDate = e => {
+    timestamp.value = e.value
+    console.log('changeDate', e)
+  }
+</script>
+
+<style scoped lang="scss">
+  .wd-divider {
+    padding: 0 0.5rem;
+  }
+</style>
diff --git a/src/pages/approval/components/SelectPicker.vue b/src/pages/approval/components/SelectPicker.vue
index 4ce41f7..99708b3 100644
--- a/src/pages/approval/components/SelectPicker.vue
+++ b/src/pages/approval/components/SelectPicker.vue
@@ -12,7 +12,9 @@
         v-model="picker"
         :columns="columns"
         size="large"
-      />
+        @change="change"
+        select-size="large"
+      ></wd-select-picker>
     </view>
   </view>
 </template>
@@ -51,11 +53,17 @@
     }
   })
 
+  const emits = defineEmits(['change'])
+
   onMounted(() => {
     if (props.value) {
       picker.value = props.value
     }
   })
+
+  const change = ({ value }) => {
+    emits('change', { id: props.id, value: props.columns.find(item => item.value === value) })
+  }
 </script>
 
 <style scoped lang="scss">
@@ -63,4 +71,34 @@
     padding: var(--wot-cell-wrapper-padding, 10px) 0;
     background-color: transparent;
   }
+
+  :deep(.wd-radio-group),
+  :deep(.wd-checkbox-group) {
+    background-color: #ffffff;
+    border-radius: 0.5rem;
+  }
+
+  :deep(.wd-action-sheet) {
+    background-color: #f3f5fa;
+  }
+
+  :deep(.uni-scroll-view-content) {
+    padding-bottom: 0.5rem;
+  }
+
+  :deep(.wd-radio),
+  :deep(.wd-checkbox) {
+    position: relative;
+    padding: 1rem !important;
+  }
+
+  :deep(.wd-radio)::after,
+  :deep(.wd-checkbox)::after {
+    position: absolute;
+    bottom: 0;
+    left: 4%;
+    width: 92%;
+    content: '';
+    border-bottom: 1px solid #efefef;
+  }
 </style>

From dc3d862e62f8c7862fd412f80199f65a11db5671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 16 Jan 2025 18:38:45 +0800
Subject: [PATCH 27/31] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=E8=A1=8C=E5=86=85?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F+=E6=B7=BB=E5=8A=A0=E8=99=9A=E6=8B=9F?=
 =?UTF-8?q?=E9=94=AE=E7=9B=98=E7=BB=84=E4=BB=B6+=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=82=80=E7=BA=A6=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |  6 +-
 src/pages/approval/components/Components.vue  | 10 +-
 .../approval/components/DatetimePicker.vue    | 36 +++++--
 src/pages/approval/components/Input.vue       | 53 ++++++++---
 src/pages/approval/components/Keyboard.vue    | 94 +++++++++++++++++++
 .../components/MemberOrDepartment.vue         | 67 -------------
 .../approval/components/NavigatorSelector.vue | 89 ++++++++++++++++++
 .../approval/components/SelectPicker.vue      | 52 +++++++---
 src/pages/approval/components/Visitor.vue     | 86 +++++++++++++++++
 .../components/OrganizationItem.vue}          |  0
 .../components/SearchItem.vue                 |  0
 src/pages/select/select-access-control.vue    |  7 ++
 .../select-organization.vue}                  | 10 +-
 src/types/uni-pages.d.ts                      |  3 +-
 14 files changed, 399 insertions(+), 114 deletions(-)
 create mode 100644 src/pages/approval/components/Keyboard.vue
 delete mode 100644 src/pages/approval/components/MemberOrDepartment.vue
 create mode 100644 src/pages/approval/components/NavigatorSelector.vue
 create mode 100644 src/pages/approval/components/Visitor.vue
 rename src/pages/{select-member-or-department/components/MemberOrDepartmentItem.vue => select/components/OrganizationItem.vue} (100%)
 rename src/pages/{select-member-or-department => select}/components/SearchItem.vue (100%)
 create mode 100644 src/pages/select/select-access-control.vue
 rename src/pages/{select-member-or-department/select-member-or-department.vue => select/select-organization.vue} (96%)

diff --git a/src/pages.json b/src/pages.json
index de9a36a..b675786 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -240,7 +240,11 @@
       "type": "page"
     },
     {
-      "path": "pages/select-member-or-department/select-member-or-department",
+      "path": "pages/select/select-access-control",
+      "type": "page"
+    },
+    {
+      "path": "pages/select/select-organization",
       "type": "page",
       "style": {
         "navigationStyle": "custom",
diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 001aede..167026c 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -1,5 +1,6 @@
 <template>
   <view class="pb-3">
+    <Visitor></Visitor>
     <view class="bg-white mx-4 p-2 rounded-2">
       <Input
         :id="0"
@@ -68,14 +69,14 @@
         title="图片21378912378923718982371217389712397837889713247893428793142897134728900978"
       ></Description>
       <wd-divider color="#bcbfbe"></wd-divider>
-      <MemberOrDepartment :id="10" title="成员" type="member" :multiple="true"></MemberOrDepartment>
+      <NavigatorSelector :id="10" title="成员" type="member" :multiple="true"></NavigatorSelector>
       <wd-divider color="#bcbfbe"></wd-divider>
-      <MemberOrDepartment
+      <NavigatorSelector
         :id="11"
         title="部门"
         type="department"
         :multiple="true"
-      ></MemberOrDepartment>
+      ></NavigatorSelector>
       <wd-divider color="#bcbfbe"></wd-divider>
       <Leave :id="12"></Leave>
       <wd-divider color="#bcbfbe"></wd-divider>
@@ -103,10 +104,11 @@
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
   import Images from '@/pages/approval/components/Images.vue'
   import Description from '@/pages/approval/components/Description.vue'
-  import MemberOrDepartment from '@/pages/approval/components/MemberOrDepartment.vue'
+  import NavigatorSelector from '@/pages/approval/components/NavigatorSelector.vue'
   import Leave from '@/pages/approval/components/Leave.vue'
   import DatetimePickerGroup from '@/pages/approval/components/DatetimePickerGroup.vue'
   import Overtime from '@/pages/approval/components/Overtime.vue'
+  import Visitor from '@/pages/approval/components/Visitor.vue'
 
   const columns = ref<Record<number, string>>([
     {
diff --git a/src/pages/approval/components/DatetimePicker.vue b/src/pages/approval/components/DatetimePicker.vue
index e27f5d8..338eed4 100644
--- a/src/pages/approval/components/DatetimePicker.vue
+++ b/src/pages/approval/components/DatetimePicker.vue
@@ -1,15 +1,29 @@
 <template>
   <view class="px-2 text-3.5">
-    <view class="flex flex-items-center pos-relative">
-      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
-      <view>{{ title }}</view>
-    </view>
-    <view class="py-2" @click="openDialog">
-      <view class="flex flex-items-center flex-justify-between">
-        <view :class="text ? 'custom-color-black' : 'color-#838589'">
-          {{ text || placeholder }}
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative pt-2 pb-1">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <view @click="openDialog" class="flex-1 flex flex-items-center">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']" class="ml-a mr-2">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+        </view>
+      </view>
+    </view>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="py-2" @click="openDialog">
+        <view class="flex flex-items-center flex-justify-between">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
         </view>
-        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
       </view>
     </view>
   </view>
@@ -131,6 +145,10 @@
     maxDateText: {
       type: String,
       default: ''
+    },
+    inline: {
+      type: Boolean,
+      default: false
     }
   })
 
diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue
index 9334107..d24115a 100644
--- a/src/pages/approval/components/Input.vue
+++ b/src/pages/approval/components/Input.vue
@@ -1,19 +1,38 @@
 <template>
   <view class="px-2 text-3.5">
-    <view class="flex flex-items-center pos-relative">
-      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
-      <view>{{ title }}</view>
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <wd-input
+          class="flex-1 ml-2"
+          :type="type"
+          custom-class="!bg-transparent"
+          :custom-input-class="inline ? 'text-right' : 'text-left'"
+          :placeholder="placeholder"
+          :maxlength="maxlength ?? (type === 'text' ? 30 : 15)"
+          v-model="text"
+          :readonly="readonly"
+          @input="change(id, $event)"
+        ></wd-input>
+      </view>
     </view>
-    <view class="pt-2">
-      <wd-input
-        :type="type"
-        custom-class="!bg-transparent"
-        :placeholder="placeholder"
-        :maxlength="type === 'text' ? 30 : 15"
-        v-model="text"
-        :readonly="readonly"
-        @input="change(id, $event)"
-      ></wd-input>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="pt-2">
+        <wd-input
+          :type="type"
+          custom-class="!bg-transparent"
+          :placeholder="placeholder"
+          :maxlength="maxlength ?? (type === 'text' ? 30 : 15)"
+          v-model="text"
+          :readonly="readonly"
+          @input="change(id, $event)"
+        ></wd-input>
+      </view>
     </view>
   </view>
 </template>
@@ -51,6 +70,14 @@
     readonly: {
       type: Boolean,
       default: false
+    },
+    inline: {
+      type: Boolean,
+      default: false
+    },
+    maxlength: {
+      type: [Number, null],
+      default: null
     }
   })
 
diff --git a/src/pages/approval/components/Keyboard.vue b/src/pages/approval/components/Keyboard.vue
new file mode 100644
index 0000000..7713ec5
--- /dev/null
+++ b/src/pages/approval/components/Keyboard.vue
@@ -0,0 +1,94 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative py-1.5">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <view
+          class="flex-1 ml-a text-right"
+          @click="toSelect"
+          :class="[text ? 'custom-color-black' : 'color-#bfbfbf']"
+        >
+          {{ text || placeholder }}
+        </view>
+      </view>
+    </view>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="py-2" @click="toSelect">
+        <view class="flex flex-items-center flex-justify-between">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+        </view>
+      </view>
+    </view>
+    <wd-keyboard
+      :mode="type"
+      title="键盘"
+      :hide-on-click-outside="true"
+      v-model:visible="visible"
+      @input="onInput"
+      closeText="确认"
+      @delete="onDelete"
+    />
+  </view>
+</template>
+
+<script setup lang="ts">
+  const text = ref<string>('')
+  const visible = ref<boolean>(false)
+
+  const onInput = value => {
+    if (props.maxlength && text.value.length >= props.maxlength) return
+    text.value += value
+  }
+  const onDelete = () => {
+    text.value = text.value.slice(0, -1)
+  }
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [Number, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请输入'
+    },
+    maxlength: {
+      type: [Number, null],
+      default: null
+    },
+    inline: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const toSelect = () => {
+    visible.value = true
+  }
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/pages/approval/components/MemberOrDepartment.vue b/src/pages/approval/components/MemberOrDepartment.vue
deleted file mode 100644
index e582118..0000000
--- a/src/pages/approval/components/MemberOrDepartment.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-  <view class="px-2 text-3.5">
-    <view class="flex flex-items-center pos-relative">
-      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
-      <view>{{ title }}</view>
-    </view>
-    <view class="py-2" @click="toSelect">
-      <view class="flex flex-items-center flex-justify-between">
-        <view :class="text ? 'custom-color-black' : 'color-#838589'">
-          {{ text || placeholder }}
-        </view>
-        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script setup lang="ts">
-  const text = ref<string | null>(null)
-
-  const props = defineProps({
-    id: {
-      type: Number,
-      required: true
-    },
-    type: {
-      type: String,
-      required: true
-    },
-    multiple: {
-      type: Boolean,
-      default: false
-    },
-    required: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String,
-      required: true
-    },
-    value: {
-      type: [Number, null],
-      default: null
-    },
-    placeholder: {
-      type: String,
-      default: '请输入'
-    }
-  })
-
-  const toSelect = () => {
-    const params = {
-      type: props.type,
-      multiple: props.multiple,
-      title: props.type === 'member' ? '选择审批用户' : '选择部门'
-    }
-    uni.navigateTo({
-      url: `/pages/select-member-or-department/select-member-or-department?params=${JSON.stringify(params)}`,
-      events: {
-        change: res => {
-          console.log(1111, res)
-        }
-      }
-    })
-  }
-</script>
diff --git a/src/pages/approval/components/NavigatorSelector.vue b/src/pages/approval/components/NavigatorSelector.vue
new file mode 100644
index 0000000..018918c
--- /dev/null
+++ b/src/pages/approval/components/NavigatorSelector.vue
@@ -0,0 +1,89 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative pb-1.5">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <view class="ml-a mr-2" :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+          {{ text || placeholder }}
+        </view>
+        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+      </view>
+    </view>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="py-2" @click="toSelect">
+        <view class="flex flex-items-center flex-justify-between">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  const text = ref<string | null>(null)
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [Number, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请选择'
+    },
+    inline: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const toSelect = () => {
+    if (props.type === 'accessControl') {
+      uni.navigateTo({
+        url: `/pages/select/select-access-control`
+      })
+    } else {
+      const params = {
+        type: props.type,
+        multiple: props.multiple,
+        title: props.type === 'member' ? '选择审批用户' : '选择部门'
+      }
+      uni.navigateTo({
+        url: `/pages/select/select-organization?params=${JSON.stringify(params)}`,
+        events: {
+          change: res => {
+            console.log(1111, res)
+          }
+        }
+      })
+    }
+  }
+</script>
diff --git a/src/pages/approval/components/SelectPicker.vue b/src/pages/approval/components/SelectPicker.vue
index 99708b3..65aad0e 100644
--- a/src/pages/approval/components/SelectPicker.vue
+++ b/src/pages/approval/components/SelectPicker.vue
@@ -1,20 +1,40 @@
 <template>
   <view class="px-2 text-3.5">
-    <view class="flex flex-items-center pos-relative">
-      <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
-      <view>{{ title }}</view>
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <wd-select-picker
+          class="flex-1"
+          align-right
+          :type="type"
+          :title="placeholder"
+          :show-confirm="type === 'checkbox'"
+          v-model="picker"
+          :columns="columns"
+          size="large"
+          @change="change"
+          select-size="large"
+        ></wd-select-picker>
+      </view>
     </view>
-    <view class="pt-2">
-      <wd-select-picker
-        :type="type"
-        :title="placeholder"
-        :show-confirm="type === 'checkbox'"
-        v-model="picker"
-        :columns="columns"
-        size="large"
-        @change="change"
-        select-size="large"
-      ></wd-select-picker>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="pt-2">
+        <wd-select-picker
+          :type="type"
+          :title="placeholder"
+          :show-confirm="type === 'checkbox'"
+          v-model="picker"
+          :columns="columns"
+          size="large"
+          @change="change"
+          select-size="large"
+        ></wd-select-picker>
+      </view>
     </view>
   </view>
 </template>
@@ -50,6 +70,10 @@
     columns: {
       type: Array,
       required: true
+    },
+    inline: {
+      type: Boolean,
+      default: false
     }
   })
 
diff --git a/src/pages/approval/components/Visitor.vue b/src/pages/approval/components/Visitor.vue
new file mode 100644
index 0000000..e3d6dd3
--- /dev/null
+++ b/src/pages/approval/components/Visitor.vue
@@ -0,0 +1,86 @@
+<template>
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+    <Input :id="0" title="访客姓名" :required="true" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input
+      :id="1"
+      title="访客手机"
+      :required="true"
+      :maxlength="11"
+      @change="inputChange"
+      inline
+      type="number"
+    ></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <SelectPicker required :id="2" title="访客类型" :columns="columns" inline></SelectPicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <NavigatorSelector :id="3" title="通行门禁点" type="accessControl" inline></NavigatorSelector>
+  </view>
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+    <Keyboard :id="4" title="车牌号码" type="car" :maxlength="8" inline></Keyboard>
+  </view>
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+    <DatetimePicker
+      :id="5"
+      ref="startDatetimePicker"
+      title="预约到访时间"
+      @change="changeDate"
+      type="datetime"
+      inline
+      required
+    ></DatetimePicker>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input :id="7" title="同行人数" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input :id="8" title="访问单位" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input :id="9" title="到访事由说明" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Input :id="10" title="访问地址" @change="inputChange" inline></Input>
+    <wd-divider color="#bcbfbe"></wd-divider>
+    <Description :id="11" title="表单通过后，访客将收到断音邀请通知"></Description>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import Input from '@/pages/approval/components/Input.vue'
+  import SelectPicker from '@/pages/approval/components/SelectPicker.vue'
+  import Description from '@/pages/approval/components/Description.vue'
+  import Keyboard from '@/pages/approval/components/Keyboard.vue'
+  import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
+  import NavigatorSelector from '@/pages/approval/components/NavigatorSelector.vue'
+
+  const columns = ref<Record<number, string>>([
+    {
+      value: 0,
+      label: '外卖快递'
+    },
+    {
+      value: 1,
+      label: '会议洽谈'
+    },
+    {
+      value: 2,
+      label: '探亲访友'
+    },
+    {
+      value: 3,
+      label: '业务沟通'
+    }
+  ])
+
+  const inputChange = e => {
+    console.log('inputChange', e)
+  }
+
+  const changeDate = e => {
+    // timestamp.value = e.value
+    console.log('changeDate', e)
+  }
+</script>
+
+<style lang="scss" scoped>
+  .wd-divider {
+    padding: 0 0.5rem;
+  }
+</style>
diff --git a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue b/src/pages/select/components/OrganizationItem.vue
similarity index 100%
rename from src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
rename to src/pages/select/components/OrganizationItem.vue
diff --git a/src/pages/select-member-or-department/components/SearchItem.vue b/src/pages/select/components/SearchItem.vue
similarity index 100%
rename from src/pages/select-member-or-department/components/SearchItem.vue
rename to src/pages/select/components/SearchItem.vue
diff --git a/src/pages/select/select-access-control.vue b/src/pages/select/select-access-control.vue
new file mode 100644
index 0000000..126a836
--- /dev/null
+++ b/src/pages/select/select-access-control.vue
@@ -0,0 +1,7 @@
+<template>
+  <view></view>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss"></style>
diff --git a/src/pages/select-member-or-department/select-member-or-department.vue b/src/pages/select/select-organization.vue
similarity index 96%
rename from src/pages/select-member-or-department/select-member-or-department.vue
rename to src/pages/select/select-organization.vue
index c27d26b..779490c 100644
--- a/src/pages/select-member-or-department/select-member-or-department.vue
+++ b/src/pages/select/select-organization.vue
@@ -61,7 +61,7 @@
           @click="toOrganization(index)"
         >
           <span
-            :class="[index === organizationList.length - 1 ? 'color-#838589' : 'custom-color-blue']"
+            :class="[index === organizationList.length - 1 ? 'color-#bfbfbf' : 'custom-color-blue']"
           >
             {{ department.name }}
           </span>
@@ -88,12 +88,12 @@
               ></wd-icon>
               <wd-icon v-else name="circle1" color="#838589" size="26px"></wd-icon>
             </view>
-            <MemberOrDepartmentItem
+            <OrganizationItem
               class="flex-1"
               :item="item"
               :disabled="item.type === 'department' && value.includes(item)"
               @click="toClick(item)"
-            ></MemberOrDepartmentItem>
+            ></OrganizationItem>
           </view>
         </view>
         <view class="py-5 px-15">
@@ -146,8 +146,8 @@
 
 <script setup lang="ts">
   import { useBasicStore } from '@/store'
-  import MemberOrDepartmentItem from '@/pages/select-member-or-department/components/MemberOrDepartmentItem.vue'
-  import SearchItem from '@/pages/select-member-or-department/components/SearchItem.vue'
+  import OrganizationItem from '@/pages/select/components/OrganizationItem.vue'
+  import SearchItem from '@/pages/select/components/SearchItem.vue'
   import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const instance = getCurrentInstance().proxy
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 058f3eb..cc65bba 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -29,7 +29,8 @@ interface NavigateToOptions {
        "/pages/login/reset-password" |
        "/pages/mine/mine" |
        "/pages/notification/notification" |
-       "/pages/select-member-or-department/select-member-or-department" |
+       "/pages/select/select-access-control" |
+       "/pages/select/select-organization" |
        "/pages/workbench/workbench" |
        "/pages/attendance/attendance-add-group/attendance-add-group" |
        "/pages/attendance/attendance-add-group/attendance-device" |

From 14474c3d6785a4650cd7a4f4270a0dc52981dc34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 11:59:26 +0800
Subject: [PATCH 28/31] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E8=AE=BF=E5=AE=A2=E9=A2=84=E7=BA=A6=E5=A5=97=E4=BB=B6?=
 =?UTF-8?q?=E5=B0=81=E8=A3=85+=E9=80=89=E6=8B=A9=E9=97=A8=E7=A6=81?=
 =?UTF-8?q?=E7=82=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |   6 +-
 .../approval/components/NavigatorSelector.vue |   9 +-
 .../approval/components/VisitDuration.vue     | 194 ++++++++++++++++++
 src/pages/approval/components/Visitor.vue     |   3 +
 src/pages/select/select-access-control.vue    |  99 ++++++++-
 5 files changed, 305 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/approval/components/VisitDuration.vue

diff --git a/src/pages.json b/src/pages.json
index b675786..e648387 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -241,7 +241,11 @@
     },
     {
       "path": "pages/select/select-access-control",
-      "type": "page"
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "disableScroll": true
+      }
     },
     {
       "path": "pages/select/select-organization",
diff --git a/src/pages/approval/components/NavigatorSelector.vue b/src/pages/approval/components/NavigatorSelector.vue
index 018918c..fe88998 100644
--- a/src/pages/approval/components/NavigatorSelector.vue
+++ b/src/pages/approval/components/NavigatorSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="px-2 text-3.5">
     <view v-if="inline">
-      <view class="flex flex-items-center pos-relative pb-1.5">
+      <view class="flex flex-items-center pos-relative pb-1.5" @click="toSelect">
         <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
         <view>{{ title }}</view>
         <view class="ml-a mr-2" :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
@@ -68,7 +68,12 @@
   const toSelect = () => {
     if (props.type === 'accessControl') {
       uni.navigateTo({
-        url: `/pages/select/select-access-control`
+        url: `/pages/select/select-access-control`,
+        events: {
+          change: res => {
+            console.log(1111, res)
+          }
+        }
       })
     } else {
       const params = {
diff --git a/src/pages/approval/components/VisitDuration.vue b/src/pages/approval/components/VisitDuration.vue
new file mode 100644
index 0000000..87d89b8
--- /dev/null
+++ b/src/pages/approval/components/VisitDuration.vue
@@ -0,0 +1,194 @@
+<template>
+  <view class="px-2 text-3.5">
+    <view v-if="inline">
+      <view class="flex flex-items-center pos-relative pb-1.5" @click="toSelect">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+        <view class="ml-a mr-2" :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+          {{ text || placeholder }}
+        </view>
+        <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+      </view>
+    </view>
+    <view v-else>
+      <view class="flex flex-items-center pos-relative">
+        <view v-if="required" class="color-#f62933 pos-absolute left--2 mt-1">*</view>
+        <view>{{ title }}</view>
+      </view>
+      <view class="py-2" @click="toSelect">
+        <view class="flex flex-items-center flex-justify-between">
+          <view :class="[text ? 'custom-color-black' : 'color-#bfbfbf']">
+            {{ text || placeholder }}
+          </view>
+          <wd-icon name="arrow-right" color="rgba(0,0,0,0.25)" size="18px"></wd-icon>
+        </view>
+      </view>
+    </view>
+    <wd-popup v-model="show" position="bottom" custom-style="border-radius:12rpx;">
+      <view v-if="showDuration">
+        <view
+          class="px-4 py-2 text-3.5 border-b-1 border-[#dcdcdc] border-solid flex flex-items-center"
+        >
+          <view @click="show = false">取消</view>
+          <view class="font-bold text-4 flex-1 text-center">访问时长</view>
+          <view class="flex flex-items-center" @click="changeSelect">
+            <view class="custom-color-blue">自定义时间</view>
+            <wd-icon name="arrow-right" size="14px" class="ml-1" color="#255cf7"></wd-icon>
+          </view>
+        </view>
+        <scroll-view class="h-60 text-3.5" :scroll-y="true">
+          <view
+            v-for="item in durationList"
+            :key="item.value"
+            @click="changeDuration(item)"
+            class="py-4 px-4 flex flex-items-center"
+          >
+            <view>{{ item.label }}</view>
+            <view
+              class="bg-#f3f5fa ml-a w-12 h-6 rounded-5 flex flex-items-center flex-justify-center"
+            >
+              <wd-icon
+                v-if="duration === item.label"
+                name="check"
+                size="15px"
+                class="ml-1"
+                color="#255cf7"
+              ></wd-icon>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+      <view v-else>
+        <view
+          class="px-4 py-2 text-3.5 border-b-1 border-[#dcdcdc] border-solid flex flex-items-center"
+        >
+          <view class="flex flex-items-center" @click="showDuration = true">
+            <wd-icon name="arrow-left" size="14px" class="ml-1" color="#0d0f10"></wd-icon>
+            <view class="custom-color-black">返回</view>
+          </view>
+          <view class="font-bold text-4 flex-1 text-center">时间选择器</view>
+          <wd-icon
+            name="close"
+            size="14px"
+            class="ml-1"
+            color="#0d0f10"
+            @click="show = false"
+          ></wd-icon>
+        </view>
+        <wd-datetime-picker-view
+          :formatter="formatter"
+          type="datetime"
+          v-model="timestamp"
+          @change="change"
+        />
+      </view>
+      <view
+        @click="confirm"
+        class="py-2.5 rounded custom-bg-blue w-90% mx-5% font-bold text-center color-white text-3.5 my-2"
+      >
+        完成
+      </view>
+    </wd-popup>
+  </view>
+</template>
+
+<script setup lang="ts">
+  import dayjs from 'dayjs'
+
+  const text = ref<string | null>(null)
+  const show = ref<boolean>(false)
+  const timestamp = ref<number>(0)
+  const duration = ref<string>('')
+
+  const showDuration = ref<boolean>(true)
+
+  const formatter = (type, value) => {
+    switch (type) {
+      case 'year':
+        return value + '年'
+      case 'month':
+        return value + '月'
+      case 'date':
+        return value + '日'
+      case 'hour':
+        return value + '时'
+      case 'minute':
+        return value + '分'
+      default:
+        return value
+    }
+  }
+
+  const props = defineProps({
+    id: {
+      type: Number,
+      required: true
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: [String, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请选择'
+    },
+    inline: {
+      type: Boolean,
+      default: false
+    }
+  })
+
+  const durationList = [
+    { label: '30分钟', value: 1800000 },
+    { label: '1小时', value: 3600000 },
+    { label: '2小时', value: 7200000 },
+    { label: '3小时', value: 10800000 },
+    { label: '5小时', value: 18000000 },
+    { label: '8小时', value: 28800000 },
+    { label: '12小时', value: 43200000 },
+    { label: '24小时', value: 86400000 }
+  ]
+
+  onMounted(() => {
+    if (props.value) {
+      text.value = props.value
+      duration.value = props.value
+    }
+  })
+
+  const changeSelect = () => {
+    timestamp.value = new Date().getTime()
+    showDuration.value = false
+  }
+
+  const toSelect = () => {
+    show.value = true
+  }
+
+  const change = value => {
+    timestamp.value = value.value
+    duration.value = ''
+  }
+
+  const changeDuration = item => {
+    duration.value = item.label
+    timestamp.value = 0
+  }
+
+  const confirm = () => {
+    if (timestamp.value === 0) {
+      text.value = duration.value
+    } else {
+      text.value = dayjs(timestamp.value).format('YYYY-M-D HH:mm')
+    }
+    show.value = false
+  }
+</script>
diff --git a/src/pages/approval/components/Visitor.vue b/src/pages/approval/components/Visitor.vue
index e3d6dd3..e9fa668 100644
--- a/src/pages/approval/components/Visitor.vue
+++ b/src/pages/approval/components/Visitor.vue
@@ -30,6 +30,8 @@
       required
     ></DatetimePicker>
     <wd-divider color="#bcbfbe"></wd-divider>
+    <VisitDuration :id="6" title="访问时长" required value="2小时" inline></VisitDuration>
+    <wd-divider color="#bcbfbe"></wd-divider>
     <Input :id="7" title="同行人数" @change="inputChange" inline></Input>
     <wd-divider color="#bcbfbe"></wd-divider>
     <Input :id="8" title="访问单位" @change="inputChange" inline></Input>
@@ -49,6 +51,7 @@
   import Keyboard from '@/pages/approval/components/Keyboard.vue'
   import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
   import NavigatorSelector from '@/pages/approval/components/NavigatorSelector.vue'
+  import VisitDuration from '@/pages/approval/components/VisitDuration.vue'
 
   const columns = ref<Record<number, string>>([
     {
diff --git a/src/pages/select/select-access-control.vue b/src/pages/select/select-access-control.vue
index 126a836..57dfd24 100644
--- a/src/pages/select/select-access-control.vue
+++ b/src/pages/select/select-access-control.vue
@@ -1,7 +1,100 @@
+<route lang="json5">
+{
+  style: {
+    navigationStyle: 'custom',
+    disableScroll: true
+  }
+}
+</route>
 <template>
-  <view></view>
+  <view class="h-100vh flex flex-col">
+    <TopNavigation class="bg-white" title="选择门禁点"></TopNavigation>
+    <scroll-view class="flex-1 box-border text-3.5 custom-color-black border-1" :scroll-y="true">
+      <wd-checkbox-group v-model="value" size="large" @change="change">
+        <view class="px-4 py-1.5 bg-white mb-2">
+          <wd-checkbox :modelValue="item.id" v-for="item in permissionList" :key="item.id">
+            <view class="flex flex-items-center">
+              <view
+                class="w-10 h-10 flex flex-justify-center flex-items-center bg-#e4f1ff rounded-2"
+              >
+                <image src="/static/images/icon_file.png" class="w-6 h-6" mode="aspectFill"></image>
+              </view>
+              <view class="ml-2">{{ item.name }}</view>
+            </view>
+          </wd-checkbox>
+        </view>
+        <view
+          v-for="(item, index) in list"
+          :key="item.id"
+          class="bg-white border-#eef0f5 border-b-solid"
+          :class="[index === list.length - 1 ? 'border-b-0' : 'border-b-1']"
+        >
+          <wd-checkbox :modelValue="item.id" class="py-1.5 px-4">
+            <view class="flex flex-items-center">
+              <image
+                src="https://file.hikmall.com/prod/image/69c3851d052e493ebb6e7c2e7a189b61.png"
+                class="w-10 h-10"
+              ></image>
+              <view class="ml-2">{{ item.name }}</view>
+            </view>
+          </wd-checkbox>
+        </view>
+      </wd-checkbox-group>
+    </scroll-view>
+    <view class="pb-safe border-#eef0f5 border-t-solid border-1 flex flex-items-center">
+      <view
+        @click="confirm"
+        class="opacity-60% w-90% py-2 mx-5% text-center custom-bg-blue color-white rounded-2 my-3"
+      >
+        确定
+      </view>
+    </view>
+  </view>
 </template>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+  const instance = getCurrentInstance().proxy
+  const eventChannel = instance.getOpenerEventChannel()
 
-<style scoped lang="scss"></style>
+  const value = ref<number[]>([])
+  const selected = ref<Array>([])
+
+  const permissionList = [
+    {
+      name: '[访客类型]权限组',
+      id: 0
+    }
+  ]
+
+  const list = [
+    {
+      name: 'DS-K(FU6004429)',
+      id: 1
+    },
+    {
+      name: 'DS-K(L40959329)',
+      id: 2
+    }
+  ]
+
+  const change = value => {
+    selected.value = []
+    selected.value.push(...permissionList.filter(item => value.value.includes(item.id)))
+    selected.value.push(...list.filter(item => value.value.includes(item.id)))
+  }
+
+  const confirm = () => {
+    eventChannel.emit('change', { value: selected.value })
+    uni.navigateBack()
+  }
+</script>
+
+<style scoped lang="scss">
+  .wd-checkbox-group {
+    background-color: transparent;
+  }
+
+  .wd-checkbox {
+    margin-bottom: 0;
+  }
+</style>

From 5a602a6f4d5e4b7bf24de22fc05f306bfa109768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 13:46:39 +0800
Subject: [PATCH 29/31] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=92=8C=E6=88=90=E5=91=98=E9=80=89=E6=8B=A9=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/select/components/SearchItem.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/pages/select/components/SearchItem.vue b/src/pages/select/components/SearchItem.vue
index 9a13733..eb3ce14 100644
--- a/src/pages/select/components/SearchItem.vue
+++ b/src/pages/select/components/SearchItem.vue
@@ -13,8 +13,15 @@
     <view v-else class="w-10 h-10 flex flex-justify-center flex-items-center bg-#e4f1ff rounded-2">
       <image src="/static/images/icon_file.png" class="w-6 h-6" mode="aspectFill"></image>
     </view>
-    <view class="ml-2 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
-      {{ item.name }}
+    <view class="ml-2">
+      <view class="break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
+        {{ item.name }}
+      </view>
+      <view
+        class="color-#838589 text-3 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1"
+      >
+        xxx的互联/test
+      </view>
     </view>
   </view>
 </template>

From fa7c4de6956db4b6e1b9ec80f7b1c3832d26de92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 14:52:30 +0800
Subject: [PATCH 30/31] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=B5=81=E7=A8=8B=E5=88=9B=E5=BB=BAUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../approval/components/ApprovalCreate.vue    | 101 ++++++++++++++++++
 .../components/{Components.vue => Form.vue}   |   4 +-
 src/pages/approval/components/Visitor.vue     |   6 +-
 src/pages/approval/create-application.vue     |   6 +-
 src/static/images/icon_airplane.png           | Bin 0 -> 1949 bytes
 src/static/images/icon_approval.png           | Bin 0 -> 1627 bytes
 6 files changed, 110 insertions(+), 7 deletions(-)
 create mode 100644 src/pages/approval/components/ApprovalCreate.vue
 rename src/pages/approval/components/{Components.vue => Form.vue} (98%)
 create mode 100644 src/static/images/icon_airplane.png
 create mode 100644 src/static/images/icon_approval.png

diff --git a/src/pages/approval/components/ApprovalCreate.vue b/src/pages/approval/components/ApprovalCreate.vue
new file mode 100644
index 0000000..ab6071f
--- /dev/null
+++ b/src/pages/approval/components/ApprovalCreate.vue
@@ -0,0 +1,101 @@
+<template>
+  <view class="bg-white rounded-2 py-3 px-4 mx-4 my-2 shadow-sm">
+    <view class="text-4">审批流程</view>
+    <view v-if="false" class="text-3 color-#838589 mt-2">必填信息填写完整后，将显示审批流程</view>
+    <view v-else class="mt-4 color-#838589">
+      <wd-steps :active="3" vertical>
+        <wd-step>
+          <template v-slot:icon>
+            <view
+              class="custom-bg-blue w-5 h-5 rounded-50% flex flex-items-center flex-justify-center"
+            >
+              <view class="w-2.5 h-2.5 bg-white rounded-50%"></view>
+            </view>
+          </template>
+          <template v-slot:title>
+            <view class="custom-color-black text-3.5">
+              <view class="flex-items-center flex">
+                <view>发起人</view>
+              </view>
+              <view class="my-2">
+                <view>
+                  <image
+                    src="https://file.hikmall.com/prod/image/4921b7596d2344088f8611f503b011dc.png"
+                    class="h-10 w-10 rounded-2"
+                    mode="aspectFill"
+                  ></image>
+                  <view class="mx-2">xxx</view>
+                </view>
+              </view>
+            </view>
+          </template>
+        </wd-step>
+        <wd-step>
+          <template v-slot:icon>
+            <view class="bg-#f0801e w-5 h-5 rounded-50% flex flex-items-center flex-justify-center">
+              <image src="/static/images/icon_approval.png" class="w-3 h-3"></image>
+            </view>
+          </template>
+          <template v-slot:title>
+            <view class="custom-color-black text-3.5">
+              <view class="flex-items-center flex">
+                <view>审批节点</view>
+              </view>
+              <view class="pt-2 color-#7e807f text-3">1人通过即可</view>
+              <view class="my-2 flex flex-wrap">
+                <view v-for="item in 8" :key="item" class="mb-2 w-fit mr-2">
+                  <view>
+                    <image
+                      src="https://file.hikmall.com/prod/image/4921b7596d2344088f8611f503b011dc.png"
+                      class="h-10 w-10 rounded-2"
+                      mode="aspectFill"
+                    ></image>
+                    <view class="mx-2">xxx</view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </template>
+        </wd-step>
+        <wd-step>
+          <template v-slot:icon>
+            <view class="bg-#2ab6c7 w-5 h-5 rounded-50% flex flex-items-center flex-justify-center">
+              <image src="/static/images/icon_airplane.png" class="w-3 h-3"></image>
+            </view>
+          </template>
+          <template v-slot:title>
+            <view class="custom-color-black text-3.5">
+              <view class="flex-items-center flex">
+                <view>抄送节点</view>
+              </view>
+              <view class="my-2 flex flex-wrap">
+                <view v-for="item in 3" :key="item" class="mb-2 w-fit mr-2">
+                  <view>
+                    <image
+                      src="https://file.hikmall.com/prod/image/4921b7596d2344088f8611f503b011dc.png"
+                      class="h-10 w-10 rounded-2"
+                      mode="aspectFill"
+                    ></image>
+                    <view class="mx-2">xxx</view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </template>
+        </wd-step>
+      </wd-steps>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss">
+  :deep(.wd-step__header) {
+    width: 1.25rem;
+  }
+
+  :deep(.wd-step__line) {
+    background: #255cf7;
+  }
+</style>
diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Form.vue
similarity index 98%
rename from src/pages/approval/components/Components.vue
rename to src/pages/approval/components/Form.vue
index 167026c..3538184 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Form.vue
@@ -1,7 +1,7 @@
 <template>
-  <view class="pb-3">
+  <view class="pb-3 mb-2">
     <Visitor></Visitor>
-    <view class="bg-white mx-4 p-2 rounded-2">
+    <view class="bg-white mx-4 p-2 rounded-2 shadow-sm">
       <Input
         :id="0"
         value="单行"
diff --git a/src/pages/approval/components/Visitor.vue b/src/pages/approval/components/Visitor.vue
index e9fa668..1f8ac23 100644
--- a/src/pages/approval/components/Visitor.vue
+++ b/src/pages/approval/components/Visitor.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2 shadow-sm">
     <Input :id="0" title="访客姓名" :required="true" @change="inputChange" inline></Input>
     <wd-divider color="#bcbfbe"></wd-divider>
     <Input
@@ -16,10 +16,10 @@
     <wd-divider color="#bcbfbe"></wd-divider>
     <NavigatorSelector :id="3" title="通行门禁点" type="accessControl" inline></NavigatorSelector>
   </view>
-  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2 shadow-sm">
     <Keyboard :id="4" title="车牌号码" type="car" :maxlength="8" inline></Keyboard>
   </view>
-  <view class="bg-white mx-4 p-2 rounded-2 mb-2">
+  <view class="bg-white mx-4 p-2 rounded-2 mb-2 shadow-sm">
     <DatetimePicker
       :id="5"
       ref="startDatetimePicker"
diff --git a/src/pages/approval/create-application.vue b/src/pages/approval/create-application.vue
index c7fd5a4..fcb0d49 100644
--- a/src/pages/approval/create-application.vue
+++ b/src/pages/approval/create-application.vue
@@ -10,7 +10,8 @@
   <view class="h-100vh flex flex-col">
     <TopNavigation :title="title"></TopNavigation>
     <scroll-view class="flex-1 box-border" :scroll-y="true">
-      <Components></Components>
+      <ApprovalCreate></ApprovalCreate>
+      <Form></Form>
     </scroll-view>
     <view class="pb-safe border-#eef0f5 border-t-solid">
       <view class="flex flex-items-center flex-justify-around py-3 px-3">
@@ -24,7 +25,8 @@
 </template>
 
 <script setup lang="ts">
-  import Components from '@/pages/approval/components/Components.vue'
+  import Form from '@/pages/approval/components/Form.vue'
+  import ApprovalCreate from '@/pages/approval/components/ApprovalCreate.vue'
 
   const title = ref<string>('')
   const id = ref<number>(null)
diff --git a/src/static/images/icon_airplane.png b/src/static/images/icon_airplane.png
new file mode 100644
index 0000000000000000000000000000000000000000..090beac47d176e327d249d6fb5fdde268554264b
GIT binary patch
literal 1949
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

literal 0
HcmV?d00001

diff --git a/src/static/images/icon_approval.png b/src/static/images/icon_approval.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c4943fea2f24125079a7d6037e9aeef4ace25ac
GIT binary patch
literal 1627
zcmV-h2Bi6kP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00001b5ch_0Itp)
z=>Px*6-h)vRCr$PodI&(APhylCrfj(HYaOxGB@ntsb}L|B#_~M{CB3)OoFladPsmV
zds{B>S=aT~vMlM}_Ib-cY`^>5{p~CN{CT_G_P?J}soRvTT9##9*FU*!zZ=__Ao!RS
zhUoyvj&F7PGiIiPVHyBVcKjm{(||w^KxfB4f{;?fmTDR^&6vw+0muWpzhh+kao2a&
zF#;t3gM0lm<|v~99RQ%t-=Ls_fC>O`=Wh_C^@Dei)KoNs27q;4Q@-CX<`f$@umDXY
zpa6iR=TpuQ-~niKewwe3j2iHf02+YGsosx8nns9PGYRw*5gh<;-hVm(8wtVfd$p*Q
zqO-1tHLTKMFMHeiUFlgu7V3pf1;_w+omCWh<V*rJ3P1u-(fdtv?~wrHN6K)|4d4K%
z9QYLnT9x&NW(>qAfCxa?z;Exp!Mz`LshA!BORuU(DWN@oSD7hQoptl0dZ7TQ2-B8<
zUs?!4d2GB`fE55n1uSBMg#LYtiqIOHA5si00(kO&QOJsj5+Z7$5~wtQ27r0)PulzM
zY*=jXLE_z(UN<V;$Jtwpy$ERFchvOaw6&yH)ZbYFC<-`m+1KKmqWzXiBFZ2EkXFeo
z`}r-sA8O=(;HcvGCBnIuI%WmHGnlmK6kSFDJSys#u9cqnq4)mObOBHcKxqW+04cgx
zd+IBuF;8VJWsy>VC2SXk697IOkN~g@0$&2)oJ#tXiY;9PIretXYhwf8W$q*bKx2S|
zF@Plk2!P<wFk1w$Kol%tRdrejI+D$>dRK}7mVsoI$AT{s0F?lw%MQgO%Kv&8^sF}-
zAK)Cl_>mTW(lYYMw}7lc0%it~42Bs4Bx8&KY(ggx(urQ_#4iTNZ+63ke>ea#1m-;f
z)-H!suC$Wb+g7LuP!R=s>(zQcsPK;(0a&JTH84Phe@Fl(P6Keg9~podqX1m*hXr85
zu>fT67XUR`yzUyv-VY7HL{R|d$=?yXaMQp?BS|)RJc|pkp?@<N9suT90otMuWdtBj
z1+aO44+2F5$Ph5>_T99F&ij-A5J5oE^Qp!Fdt$+#`%^g|ej4~{$_+L<pb7bpn$nB`
zj$m-^AE;ZxDPKkFeCi0W`6Z`>5xaq?9Zx$3c-A31g79(gIpp6JG#voDh;ZtTB8J7C
za@P7^f_e<_WLzKs90UjehgdoEPo>#Zjp^~+Kq<i4V|o`iyj|2}k^pFu@BE7efKOwk
z0H0n^uXQ<1KP)Z)oGK~>I0frnTq(e(xFUd0FQovdUfqi;0{A3X1n}vl2;kJKdvQeo
zpX7=FKD`tHta|0gvm*{}upBsTZN^c#`{Uq_pL7sL0`LBR^d~d|<Q+Q6#<QIetpiJa
zKaR&~H9Q0WkgZv*S}<K720}9ca{f?mnzyAj0RXl$cc>=@-n{Ak!)gHJ{DCh2dFyHj
zssK>fhjRXAOjSB?0|5SJ4y0!~8s&zd1^|}xcsuHjb1U!TY8L?N{Wy+(VTmgWcmYuF
z$7kSF08ZU=kFPC<g`PBEjsOb(9L~>HnqN~F091Z88*5Gj9sp)Mz0<5HSwR6n=CEjU
z1wgc-Wc3LEGKWQ*D*&PuC96*WkU1>cTmcZRC|P|1fXrdh<_dslMak+D0Avn}Hdg>d
zD@s<M03dT%w7CKxT2Zq41OS=CqRkZm(TbAQCjiJC7H#e+0E~FkH(HoW)aQAV*t{X+
z63Sh$kpkd?PTx0K00@AKD{%4VD*_0Biz{&P<~K!v{F?aN#Wh4}ewzEc50Z)iKnFr$
zAYfkn37ZAzpa=}lXDb8%lsozxBLMnq4s}NX0OgMU#t4A^nnT@D06@8;zcB)!zvfVP
z6aY}}=x@vr0MaIrba0eD;}z%+Kx*^Z-_S8$R~ie<=K_VT1ZDtqbQ}O9o|C}@0D!}S
zO{fb0$%dwfK{*0w91!fyit4Jue+U2>0-YdM;kBSks(XJJ02&Jfxzb-v_4fp9w`xuS
zdz<xm*zduHE1G)#DF7%PG`Q1#Y1kJ=g{FW<`yakHP`ifg4n8WGoc^^eOA7h!ZC|f$
Z{SQxU)}JuPX{rDK002ovPDHLkV1g!t&07Ef

literal 0
HcmV?d00001


From 76d427f84cd0da429423f60f47402d342348b9ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 17 Jan 2025 14:59:34 +0800
Subject: [PATCH 31/31] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                            | 62 +++++++++++++++++++++--
 src/pages/approval/create-application.vue |  2 +-
 src/pages/mine/mine.vue                   |  2 +-
 src/types/uni-pages.d.ts                  |  6 +++
 4 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index e648387..0b8e599 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -151,6 +151,14 @@
       "path": "pages/home/application-list",
       "type": "page"
     },
+    {
+      "path": "pages/info-publish/add-release-plan",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/info-publish/announce-notice",
       "type": "page",
@@ -175,9 +183,29 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/info-publish/edit-pic-video",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/info-publish/info-publish",
-      "type": "page"
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/info-publish/material-library",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
     },
     {
       "path": "pages/info-publish/notice-details",
@@ -195,6 +223,22 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/info-publish/play-content-library",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/info-publish/release-plan",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/login/code",
       "type": "page",
@@ -233,12 +277,24 @@
     },
     {
       "path": "pages/mine/mine",
-      "type": "page"
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "首页"
+      }
     },
     {
       "path": "pages/notification/notification",
       "type": "page"
     },
+    {
+      "path": "pages/personnel-passage/traffic-correlation",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/select/select-access-control",
       "type": "page",
@@ -309,4 +365,4 @@
     }
   ],
   "subPackages": []
-}
+}
\ No newline at end of file
diff --git a/src/pages/approval/create-application.vue b/src/pages/approval/create-application.vue
index fcb0d49..1b2cf46 100644
--- a/src/pages/approval/create-application.vue
+++ b/src/pages/approval/create-application.vue
@@ -10,8 +10,8 @@
   <view class="h-100vh flex flex-col">
     <TopNavigation :title="title"></TopNavigation>
     <scroll-view class="flex-1 box-border" :scroll-y="true">
-      <ApprovalCreate></ApprovalCreate>
       <Form></Form>
+      <ApprovalCreate></ApprovalCreate>
     </scroll-view>
     <view class="pb-safe border-#eef0f5 border-t-solid">
       <view class="flex flex-items-center flex-justify-around py-3 px-3">
diff --git a/src/pages/mine/mine.vue b/src/pages/mine/mine.vue
index 2e79a40..4d7711c 100644
--- a/src/pages/mine/mine.vue
+++ b/src/pages/mine/mine.vue
@@ -1,4 +1,4 @@
-<route lang="json5" type="home">
+<route lang="json5">
 {
   style: {
     navigationStyle: 'custom',
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index cc65bba..eb8731c 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -17,18 +17,24 @@ interface NavigateToOptions {
        "/pages/attendance/issue-record-detail" |
        "/pages/attendance/issue-record" |
        "/pages/home/application-list" |
+       "/pages/info-publish/add-release-plan" |
        "/pages/info-publish/announce-notice" |
        "/pages/info-publish/basic-info" |
        "/pages/info-publish/drafts-list" |
+       "/pages/info-publish/edit-pic-video" |
        "/pages/info-publish/info-publish" |
+       "/pages/info-publish/material-library" |
        "/pages/info-publish/notice-details" |
        "/pages/info-publish/notice-manage" |
+       "/pages/info-publish/play-content-library" |
+       "/pages/info-publish/release-plan" |
        "/pages/login/code" |
        "/pages/login/get-code" |
        "/pages/login/login" |
        "/pages/login/reset-password" |
        "/pages/mine/mine" |
        "/pages/notification/notification" |
+       "/pages/personnel-passage/traffic-correlation" |
        "/pages/select/select-access-control" |
        "/pages/select/select-organization" |
        "/pages/workbench/workbench" |