feat：【bpm】用户分组：100%

src/api/bpm/user-group/index.ts

@@ -0,0 +1,45 @@
+import type { PageParam, PageResult } from '@/http/types'
+import { http } from '@/http/http'
+
+const baseUrl = '/bpm/user-group'
+
+/** 用户组 */
+export interface UserGroup {
+  id?: number
+  name: string // 组名
+  description: string // 描述
+  userIds: number[] // 成员用户编号数组
+  status: number // 状态
+  remark: string // 备注
+  createTime?: Date
+}
+
+/** 获取用户组分页列表 */
+export function getUserGroupPage(params: PageParam) {
+  return http.get<PageResult<UserGroup>>(`${baseUrl}/page`, params)
+}
+
+/** 获取用户组详情 */
+export function getUserGroup(id: number) {
+  return http.get<UserGroup>(`${baseUrl}/get?id=${id}`)
+}
+
+/** 创建用户组 */
+export function createUserGroup(data: UserGroup) {
+  return http.post<number>(`${baseUrl}/create`, data)
+}
+
+/** 更新用户组 */
+export function updateUserGroup(data: UserGroup) {
+  return http.put<boolean>(`${baseUrl}/update`, data)
+}
+
+/** 删除用户组 */
+export function deleteUserGroup(id: number) {
+  return http.delete<boolean>(`${baseUrl}/delete?id=${id}`)
+}
+
+/** 获取用户组简单列表 */
+export function getUserGroupSimpleList() {
+  return http.get<UserGroup[]>(`${baseUrl}/simple-list`)
+}

src/components/system-select/index.ts

@@ -0,0 +1 @@
+export { default as UserPicker } from './user-picker.vue'

src/pages-system/user/form/components/user-picker.vue

@@ -3,7 +3,9 @@
     v-model="selectedId"
     :label="label"
     :label-width="label ? '180rpx' : '0'"
-    :columns="columns"
+    :columns="userList"
+    value-key="id"
+    label-key="nickname"
     :type="type"
     filterable
     :placeholder="placeholder"
@@ -13,7 +15,7 @@
 
 <script lang="ts" setup>
 import type { User } from '@/api/system/user'
-import { computed, onMounted, ref, watch } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { getSimpleUserList } from '@/api/system/user'
 
 const props = withDefaults(defineProps<{
@@ -31,10 +33,14 @@ const emit = defineEmits<{
   (e: 'update:modelValue', value: number | number[] | undefined): void
 }>()
 
+const userList = ref<User[]>([])
+const selectedId = ref<number | string | number[]>([])
+
 /** 根据用户 ID 获取昵称 */
 function getUserNickname(userId: number | undefined): string {
-  if (!userId)
+  if (!userId) {
     return ''
+  }
   const user = userList.value.find(u => u.id === userId)
   return user?.nickname || ''
 }
@@ -43,17 +49,6 @@ defineExpose({
   getUserNickname,
 })
 
-const userList = ref<User[]>([])
-const selectedId = ref<number | string | number[]>([])
-
-// 构建 columns 数据
-const columns = computed(() => {
-  return userList.value.map(user => ({
-    label: user.nickname,
-    value: user.id,
-  }))
-})
-
 watch(
   () => props.modelValue,
   (val) => {
@@ -68,14 +63,17 @@ watch(
   { immediate: true },
 )
 
+/** 加载用户列表 */
 async function loadUserList() {
   userList.value = await getSimpleUserList()
 }
 
+/** 选择确认 */
 function handleConfirm({ value }: { value: any }) {
   emit('update:modelValue', value)
 }
 
+/** 初始化 */
 onMounted(() => {
   loadUserList()
 })

src/pages-bpm/user-group/components/search-form.vue

@@ -0,0 +1,153 @@
+<template>
+  <!-- 搜索框入口 -->
+  <view @click="visible = true">
+    <wd-search :placeholder="placeholder" hide-cancel disabled />
+  </view>
+
+  <!-- 搜索弹窗 -->
+  <wd-popup v-model="visible" position="top" @close="visible = false">
+    <view class="yd-search-form-container" :style="{ paddingTop: `${getNavbarHeight()}px` }">
+      <view class="yd-search-form-item">
+        <view class="yd-search-form-label">
+          组名
+        </view>
+        <wd-input
+          v-model="formData.name"
+          placeholder="请输入组名"
+          clearable
+        />
+      </view>
+      <view class="yd-search-form-item">
+        <view class="yd-search-form-label">
+          状态
+        </view>
+        <wd-radio-group v-model="formData.status" shape="button">
+          <wd-radio :value="-1">
+            全部
+          </wd-radio>
+          <wd-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :value="dict.value"
+          >
+            {{ dict.label }}
+          </wd-radio>
+        </wd-radio-group>
+      </view>
+      <view class="yd-search-form-item">
+        <view class="yd-search-form-label">
+          创建时间
+        </view>
+        <view class="yd-search-form-date-range-container">
+          <view class="flex-1" @click="visibleCreateTime[0] = true">
+            <view class="yd-search-form-date-range-picker">
+              {{ formatDate(formData.createTime?.[0]) || '开始日期' }}
+            </view>
+          </view>
+          -
+          <view class="flex-1" @click="visibleCreateTime[1] = true">
+            <view class="yd-search-form-date-range-picker">
+              {{ formatDate(formData.createTime?.[1]) || '结束日期' }}
+            </view>
+          </view>
+        </view>
+        <wd-datetime-picker-view v-if="visibleCreateTime[0]" v-model="tempCreateTime[0]" type="date" />
+        <view v-if="visibleCreateTime[0]" class="yd-search-form-date-range-actions">
+          <wd-button size="small" plain @click="visibleCreateTime[0] = false">
+            取消
+          </wd-button>
+          <wd-button size="small" type="primary" @click="handleCreateTime0Confirm">
+            确定
+          </wd-button>
+        </view>
+        <wd-datetime-picker-view v-if="visibleCreateTime[1]" v-model="tempCreateTime[1]" type="date" />
+        <view v-if="visibleCreateTime[1]" class="yd-search-form-date-range-actions">
+          <wd-button size="small" plain @click="visibleCreateTime[1] = false">
+            取消
+          </wd-button>
+          <wd-button size="small" type="primary" @click="handleCreateTime1Confirm">
+            确定
+          </wd-button>
+        </view>
+      </view>
+      <view class="yd-search-form-actions">
+        <wd-button class="flex-1" plain @click="handleReset">
+          重置
+        </wd-button>
+        <wd-button class="flex-1" type="primary" @click="handleSearch">
+          搜索
+        </wd-button>
+      </view>
+    </view>
+  </wd-popup>
+</template>
+
+<script lang="ts" setup>
+import { computed, reactive, ref } from 'vue'
+import { getDictLabel, getIntDictOptions } from '@/hooks/useDict'
+import { getNavbarHeight } from '@/utils'
+import { DICT_TYPE } from '@/utils/constants'
+import { formatDate, formatDateRange } from '@/utils/date'
+
+const emit = defineEmits<{
+  search: [data: Record<string, any>]
+  reset: []
+}>()
+
+const visible = ref(false)
+const formData = reactive({
+  name: undefined as string | undefined,
+  status: -1, // -1 表示全部
+  createTime: [undefined, undefined] as [number | undefined, number | undefined],
+})
+
+// 时间范围选择器状态
+const visibleCreateTime = ref<[boolean, boolean]>([false, false])
+const tempCreateTime = ref<[number, number]>([Date.now(), Date.now()])
+
+/** 创建时间[0]确认 */
+function handleCreateTime0Confirm() {
+  formData.createTime = [tempCreateTime.value[0], formData.createTime?.[1]]
+  visibleCreateTime.value[0] = false
+}
+
+/** 创建时间[1]确认 */
+function handleCreateTime1Confirm() {
+  formData.createTime = [formData.createTime?.[0], tempCreateTime.value[1]]
+  visibleCreateTime.value[1] = false
+}
+
+/** 搜索条件 placeholder 拼接 */
+const placeholder = computed(() => {
+  const conditions: string[] = []
+  if (formData.name) {
+    conditions.push(`组名:${formData.name}`)
+  }
+  if (formData.status !== -1) {
+    conditions.push(`状态:${getDictLabel(DICT_TYPE.COMMON_STATUS, formData.status)}`)
+  }
+  if (formData.createTime?.[0] && formData.createTime?.[1]) {
+    conditions.push(`创建时间:${formatDate(formData.createTime[0])}~${formatDate(formData.createTime[1])}`)
+  }
+  return conditions.length > 0 ? conditions.join(' | ') : '搜索用户分组'
+})
+
+/** 搜索 */
+function handleSearch() {
+  visible.value = false
+  emit('search', {
+    ...formData,
+    status: formData.status === -1 ? undefined : formData.status,
+    createTime: formatDateRange(formData.createTime),
+  })
+}
+
+/** 重置 */
+function handleReset() {
+  formData.name = undefined
+  formData.status = -1
+  formData.createTime = [undefined, undefined]
+  visible.value = false
+  emit('reset')
+}
+</script>

src/pages-bpm/user-group/detail/index.vue

@@ -0,0 +1,155 @@
+<template>
+  <view class="yd-page-container">
+    <!-- 顶部导航栏 -->
+    <wd-navbar
+      title="用户分组详情"
+      left-arrow placeholder safe-area-inset-top fixed
+      @click-left="handleBack"
+    />
+
+    <!-- 详情内容 -->
+    <view>
+      <wd-cell-group border>
+        <wd-cell title="编号" :value="formData?.id" />
+        <wd-cell title="组名" :value="formData?.name" />
+        <wd-cell title="描述" :value="formData?.description || '-'" />
+        <wd-cell title="成员">
+          <view class="flex flex-wrap gap-8rpx justify-end">
+            <wd-tag
+              v-for="userId in (formData?.userIds || [])"
+              :key="userId"
+              type="primary"
+              plain
+            >
+              {{ getUserNickname(userId) }}
+            </wd-tag>
+            <text v-if="!formData?.userIds?.length">-</text>
+          </view>
+        </wd-cell>
+        <wd-cell title="状态">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="formData?.status" />
+        </wd-cell>
+        <wd-cell title="创建时间" :value="formatDateTime(formData?.createTime)" />
+      </wd-cell-group>
+    </view>
+
+    <!-- 底部操作按钮 -->
+    <view class="yd-detail-footer">
+      <view class="yd-detail-footer-actions">
+        <wd-button
+          v-if="hasAccessByCodes(['bpm:user-group:update'])"
+          class="flex-1" type="warning" @click="handleEdit"
+        >
+          编辑
+        </wd-button>
+        <wd-button
+          v-if="hasAccessByCodes(['bpm:user-group:delete'])"
+          class="flex-1" type="error" :loading="deleting" @click="handleDelete"
+        >
+          删除
+        </wd-button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import type { UserGroup } from '@/api/bpm/user-group'
+import type { SimpleUser } from '@/api/system/user'
+import { onMounted, ref } from 'vue'
+import { useToast } from 'wot-design-uni'
+import { deleteUserGroup, getUserGroup } from '@/api/bpm/user-group'
+import { getSimpleUserList } from '@/api/system/user'
+import { useAccess } from '@/hooks/useAccess'
+import { navigateBackPlus } from '@/utils'
+import { DICT_TYPE } from '@/utils/constants'
+import { formatDateTime } from '@/utils/date'
+
+const props = defineProps<{
+  id?: number | any
+}>()
+
+definePage({
+  style: {
+    navigationBarTitleText: '',
+    navigationStyle: 'custom',
+  },
+})
+
+const { hasAccessByCodes } = useAccess()
+const toast = useToast()
+const formData = ref<UserGroup>()
+const deleting = ref(false)
+const userList = ref<SimpleUser[]>([])
+
+/** 返回上一页 */
+function handleBack() {
+  navigateBackPlus('/pages-bpm/user-group/index')
+}
+
+/** 获取用户昵称 */
+function getUserNickname(userId: number) {
+  const user = userList.value.find(u => u.id === userId)
+  return user?.nickname || userId
+}
+
+/** 加载用户列表 */
+async function loadUserList() {
+  userList.value = await getSimpleUserList()
+}
+
+/** 加载用户分组详情 */
+async function getDetail() {
+  if (!props.id) {
+    return
+  }
+  try {
+    toast.loading('加载中...')
+    formData.value = await getUserGroup(props.id)
+  } finally {
+    toast.close()
+  }
+}
+
+/** 编辑用户分组 */
+function handleEdit() {
+  uni.navigateTo({
+    url: `/pages-bpm/user-group/form/index?id=${props.id}`,
+  })
+}
+
+/** 删除用户分组 */
+function handleDelete() {
+  if (!props.id) {
+    return
+  }
+  uni.showModal({
+    title: '提示',
+    content: '确定要删除该用户分组吗？',
+    success: async (res) => {
+      if (!res.confirm) {
+        return
+      }
+      deleting.value = true
+      try {
+        await deleteUserGroup(props.id)
+        toast.success('删除成功')
+        setTimeout(() => {
+          handleBack()
+        }, 500)
+      } finally {
+        deleting.value = false
+      }
+    },
+  })
+}
+
+/** 初始化 */
+onMounted(() => {
+  loadUserList()
+  getDetail()
+})
+</script>
+
+<style lang="scss" scoped>
+</style>

src/pages-bpm/user-group/form/index.vue

@@ -0,0 +1,150 @@
+<template>
+  <view class="yd-page-container">
+    <!-- 顶部导航栏 -->
+    <wd-navbar
+      :title="getTitle"
+      left-arrow placeholder safe-area-inset-top fixed
+      @click-left="handleBack"
+    />
+
+    <!-- 表单区域 -->
+    <view>
+      <wd-form ref="formRef" :model="formData" :rules="formRules">
+        <wd-cell-group border>
+          <wd-input
+            v-model="formData.name"
+            label="组名"
+            label-width="180rpx"
+            prop="name"
+            clearable
+            placeholder="请输入组名"
+          />
+          <wd-textarea
+            v-model="formData.description"
+            label="描述"
+            label-width="180rpx"
+            prop="description"
+            clearable
+            placeholder="请输入描述"
+          />
+          <UserPicker
+            ref="userPickerRef"
+            v-model="formData.userIds"
+            label="成员"
+            type="checkbox"
+            placeholder="请选择成员"
+          />
+          <wd-cell title="状态" title-width="180rpx" prop="status" center>
+            <wd-radio-group v-model="formData.status" shape="button">
+              <wd-radio
+                v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+                :key="dict.value"
+                :value="dict.value"
+              >
+                {{ dict.label }}
+              </wd-radio>
+            </wd-radio-group>
+          </wd-cell>
+        </wd-cell-group>
+      </wd-form>
+    </view>
+
+    <!-- 底部保存按钮 -->
+    <view class="yd-detail-footer">
+      <wd-button
+        type="primary"
+        block
+        :loading="formLoading"
+        @click="handleSubmit"
+      >
+        保存
+      </wd-button>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import type { UserGroup } from '@/api/bpm/user-group'
+import { computed, onMounted, ref } from 'vue'
+import { useToast } from 'wot-design-uni'
+import { createUserGroup, getUserGroup, updateUserGroup } from '@/api/bpm/user-group'
+import { UserPicker } from '@/components/system-select'
+import { getIntDictOptions } from '@/hooks/useDict'
+import { navigateBackPlus } from '@/utils'
+import { CommonStatusEnum, DICT_TYPE } from '@/utils/constants'
+
+const props = defineProps<{
+  id?: number | any
+}>()
+
+definePage({
+  style: {
+    navigationBarTitleText: '',
+    navigationStyle: 'custom',
+  },
+})
+
+const toast = useToast()
+const getTitle = computed(() => props.id ? '编辑用户分组' : '新增用户分组')
+const formLoading = ref(false)
+const formData = ref<UserGroup>({
+  id: undefined,
+  name: '',
+  description: '',
+  userIds: [],
+  status: CommonStatusEnum.ENABLE,
+  remark: '',
+})
+const formRules = {
+  name: [{ required: true, message: '组名不能为空' }],
+  userIds: [{ required: true, message: '成员不能为空' }],
+  status: [{ required: true, message: '状态不能为空' }],
+}
+const formRef = ref()
+const userPickerRef = ref()
+
+/** 返回上一页 */
+function handleBack() {
+  navigateBackPlus('/pages-bpm/user-group/index')
+}
+
+/** 加载用户分组详情 */
+async function getDetail() {
+  if (!props.id) {
+    return
+  }
+  formData.value = await getUserGroup(props.id)
+}
+
+/** 提交表单 */
+async function handleSubmit() {
+  const { valid } = await formRef.value.validate()
+  if (!valid) {
+    return
+  }
+
+  formLoading.value = true
+  try {
+    if (props.id) {
+      await updateUserGroup(formData.value)
+      toast.success('修改成功')
+    } else {
+      await createUserGroup(formData.value)
+      toast.success('新增成功')
+    }
+    setTimeout(() => {
+      handleBack()
+    }, 500)
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 初始化 */
+onMounted(() => {
+  getDetail()
+})
+</script>
+
+<style lang="scss" scoped>
+</style>

src/pages-bpm/user-group/index.vue

@@ -0,0 +1,190 @@
+<template>
+  <view class="yd-page-container">
+    <!-- 顶部导航栏 -->
+    <wd-navbar
+      title="用户分组管理"
+      left-arrow placeholder safe-area-inset-top fixed
+      @click-left="handleBack"
+    />
+
+    <!-- 搜索组件 -->
+    <SearchForm @search="handleQuery" @reset="handleReset" />
+
+    <!-- 用户分组列表 -->
+    <view class="p-24rpx">
+      <view
+        v-for="item in list"
+        :key="item.id"
+        class="mb-24rpx overflow-hidden rounded-12rpx bg-white shadow-sm"
+        @click="handleDetail(item)"
+      >
+        <view class="p-24rpx">
+          <view class="mb-16rpx flex items-center justify-between">
+            <view class="text-32rpx text-[#333] font-semibold">
+              {{ item.name }}
+            </view>
+            <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="item.status" />
+          </view>
+          <view class="mb-12rpx flex items-center text-28rpx text-[#666]">
+            <text class="mr-8rpx shrink-0 text-[#999]">描述：</text>
+            <text class="min-w-0 flex-1 truncate">{{ item.description || '-' }}</text>
+          </view>
+          <view class="mb-12rpx flex items-center text-28rpx text-[#666]">
+            <text class="mr-8rpx shrink-0 text-[#999]">成员：</text>
+            <view class="min-w-0 flex flex-1 flex-wrap gap-8rpx">
+              <wd-tag
+                v-for="userId in (item.userIds || []).slice(0, 3)"
+                :key="userId"
+                type="primary"
+                plain
+              >
+                {{ getUserNickname(userId) }}
+              </wd-tag>
+              <wd-tag v-if="(item.userIds || []).length > 3" type="info" plain>
+                +{{ (item.userIds || []).length - 3 }}
+              </wd-tag>
+            </view>
+          </view>
+          <view class="mb-12rpx flex items-center text-28rpx text-[#666]">
+            <text class="mr-8rpx text-[#999]">创建时间：</text>
+            <text class="line-clamp-1">{{ formatDateTime(item.createTime) }}</text>
+          </view>
+        </view>
+      </view>
+
+      <!-- 加载更多 -->
+      <view v-if="loadMoreState !== 'loading' && list.length === 0" class="py-100rpx text-center">
+        <wd-status-tip image="content" tip="暂无用户分组数据" />
+      </view>
+      <wd-loadmore
+        v-if="list.length > 0"
+        :state="loadMoreState"
+        @reload="loadMore"
+      />
+    </view>
+
+    <!-- 新增按钮 -->
+    <wd-fab
+      v-if="hasAccessByCodes(['bpm:user-group:create'])"
+      position="right-bottom"
+      type="primary"
+      :expandable="false"
+      @click="handleAdd"
+    />
+  </view>
+</template>
+
+<script lang="ts" setup>
+import type { UserGroup } from '@/api/bpm/user-group'
+import type { SimpleUser } from '@/api/system/user'
+import type { LoadMoreState } from '@/http/types'
+import { onReachBottom } from '@dcloudio/uni-app'
+import { onMounted, ref } from 'vue'
+import { getUserGroupPage } from '@/api/bpm/user-group'
+import { getSimpleUserList } from '@/api/system/user'
+import { useAccess } from '@/hooks/useAccess'
+import { navigateBackPlus } from '@/utils'
+import { DICT_TYPE } from '@/utils/constants'
+import { formatDateTime } from '@/utils/date'
+import SearchForm from './components/search-form.vue'
+
+definePage({
+  style: {
+    navigationBarTitleText: '',
+    navigationStyle: 'custom',
+  },
+})
+
+const { hasAccessByCodes } = useAccess()
+const total = ref(0)
+const list = ref<UserGroup[]>([])
+const loadMoreState = ref<LoadMoreState>('loading')
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+})
+const userList = ref<SimpleUser[]>([])
+
+/** 返回上一页 */
+function handleBack() {
+  navigateBackPlus()
+}
+
+/** 获取用户昵称 */
+function getUserNickname(userId: number) {
+  const user = userList.value.find(u => u.id === userId)
+  return user?.nickname || userId
+}
+
+/** 加载用户列表 */
+async function loadUserList() {
+  userList.value = await getSimpleUserList()
+}
+
+/** 查询用户分组列表 */
+async function getList() {
+  loadMoreState.value = 'loading'
+  try {
+    const data = await getUserGroupPage(queryParams.value)
+    list.value = [...list.value, ...data.list]
+    total.value = data.total
+    loadMoreState.value = list.value.length >= total.value ? 'finished' : 'loading'
+  } catch {
+    queryParams.value.pageNo = queryParams.value.pageNo > 1 ? queryParams.value.pageNo - 1 : 1
+    loadMoreState.value = 'error'
+  }
+}
+
+/** 搜索按钮操作 */
+function handleQuery(data?: Record<string, any>) {
+  queryParams.value = {
+    ...data,
+    pageNo: 1,
+    pageSize: queryParams.value.pageSize,
+  }
+  list.value = []
+  getList()
+}
+
+/** 重置按钮操作 */
+function handleReset() {
+  handleQuery()
+}
+
+/** 加载更多 */
+function loadMore() {
+  if (loadMoreState.value === 'finished') {
+    return
+  }
+  queryParams.value.pageNo++
+  getList()
+}
+
+/** 新增用户分组 */
+function handleAdd() {
+  uni.navigateTo({
+    url: '/pages-bpm/user-group/form/index',
+  })
+}
+
+/** 查看详情 */
+function handleDetail(item: UserGroup) {
+  uni.navigateTo({
+    url: `/pages-bpm/user-group/detail/index?id=${item.id}`,
+  })
+}
+
+/** 触底加载更多 */
+onReachBottom(() => {
+  loadMore()
+})
+
+/** 初始化 */
+onMounted(() => {
+  loadUserList()
+  getList()
+})
+</script>
+
+<style lang="scss" scoped>
+</style>

src/pages-system/dept/form/index.vue

@@ -80,7 +80,7 @@ import type { Dept } from '@/api/system/dept'
 import { computed, onMounted, ref } from 'vue'
 import { useToast } from 'wot-design-uni'
 import { createDept, getDept, updateDept } from '@/api/system/dept'
-import UserPicker from '@/pages-system/user/form/components/user-picker.vue'
+import UserPicker from '@/components/system-select/user-picker.vue'
 import { navigateBackPlus } from '@/utils'
 import { CommonStatusEnum } from '@/utils/constants'
 import DeptPicker from './components/dept-picker.vue'

src/pages-system/operate-log/modules/search-form.vue

@@ -108,7 +108,7 @@
 
 <script lang="ts" setup>
 import { computed, reactive, ref } from 'vue'
-import UserPicker from '@/pages-system/user/form/components/user-picker.vue'
+import UserPicker from '@/components/system-select/user-picker.vue'
 import { getNavbarHeight } from '@/utils'
 import { formatDate, formatDateRange } from '@/utils/date'