Procházet zdrojové kódy

feat:优化时间范围的处理逻辑

YunaiV před 4 měsíci
rodič
revize
428f80f43c

+ 4 - 6
src/pages/bpm/components/copy-list.vue

@@ -76,17 +76,15 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   processInstanceName: undefined as string | undefined,
-  createTime: undefined as number[] | undefined,
+  createTime: [undefined, undefined] as [number | undefined, number | undefined],
 })
 
 /** 查询列表 */
 async function getList() {
   loadMoreState.value = 'loading'
   try {
-    const params = {
-      ...queryParams,
-      createTime: formatDateRange(queryParams.createTime as any),
-    }
+    const params: any = { ...queryParams }
+    params.createTime = formatDateRange(queryParams.createTime)
     const data = await getProcessInstanceCopyPage(params)
     list.value = [...list.value, ...data.list]
     total.value = data.total
@@ -109,7 +107,7 @@ function loadMore() {
 /** 搜索 */
 function handleSearch(data?: CopySearchFormData) {
   queryParams.processInstanceName = data?.processInstanceName
-  queryParams.createTime = data?.createTime
+  queryParams.createTime = data?.createTime ?? [undefined, undefined]
   queryParams.pageNo = 1
   list.value = []
   getList()

+ 4 - 6
src/pages/bpm/components/done-list.vue

@@ -75,17 +75,15 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   name: undefined as string | undefined,
-  createTime: undefined as number[] | undefined,
+  createTime: [undefined, undefined] as [number | undefined, number | undefined],
 })
 
 /** 查询列表 */
 async function getList() {
   loadMoreState.value = 'loading'
   try {
-    const params = {
-      ...queryParams,
-      createTime: formatDateRange(queryParams.createTime as any),
-    }
+    const params: any = { ...queryParams }
+    params.createTime = formatDateRange(queryParams.createTime)
     const data = await getTaskDonePage(params)
     list.value = [...list.value, ...data.list]
     total.value = data.total
@@ -108,7 +106,7 @@ function loadMore() {
 /** 搜索 */
 function handleSearch(data?: DoneSearchFormData) {
   queryParams.name = data?.name
-  queryParams.createTime = data?.createTime
+  queryParams.createTime = data?.createTime ?? [undefined, undefined]
   queryParams.pageNo = 1
   list.value = []
   getList()

+ 5 - 5
src/pages/bpm/components/my-list.vue

@@ -64,7 +64,7 @@
 
 <script lang="ts" setup>
 import type { MySearchFormData } from './my-search-form.vue'
-import type { ProcessInstance } from '@/api/bpm/processInstance'
+import {getProcessInstanceCopyPage, ProcessInstance} from '@/api/bpm/processInstance'
 import type { LoadMoreState } from '@/http/types'
 import { onReachBottom } from '@dcloudio/uni-app'
 import { computed, onMounted, reactive, ref, watch } from 'vue'
@@ -91,7 +91,7 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   name: undefined as string | undefined,
-  createTime: undefined as number[] | undefined,
+  createTime: [undefined, undefined] as [number | undefined, number | undefined],
   status: -1,
   categoryId: undefined as string | undefined,
 })
@@ -100,11 +100,11 @@ const queryParams = reactive({
 async function getList() {
   loadMoreState.value = 'loading'
   try {
-    const params = {
+    const params: any = {
       ...queryParams,
       status: queryParams.status === -1 ? undefined : queryParams.status,
-      createTime: formatDateRange(queryParams.createTime as any),
     }
+    params.createTime = formatDateRange(queryParams.createTime)
     const data = await getProcessInstanceMyPage(params)
     list.value = [...list.value, ...data.list]
     total.value = data.total
@@ -127,7 +127,7 @@ function loadMore() {
 /** 搜索 */
 function handleSearch(data?: MySearchFormData) {
   queryParams.name = data?.name
-  queryParams.createTime = data?.createTime as any
+  queryParams.createTime = data?.createTime ?? [undefined, undefined]
   queryParams.status = data?.status ?? -1
   queryParams.categoryId = data?.categoryId
   queryParams.pageNo = 1

+ 4 - 6
src/pages/bpm/components/todo-list.vue

@@ -85,17 +85,15 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   name: undefined as string | undefined,
-  createTime: undefined as number[] | undefined,
+  createTime: [undefined, undefined] as [number | undefined, number | undefined],
 })
 
 /** 查询列表 */
 async function getList() {
   loadMoreState.value = 'loading'
   try {
-    const params = {
-      ...queryParams,
-      createTime: formatDateRange(queryParams.createTime as any),
-    }
+    const params: any = { ...queryParams }
+    params.createTime = formatDateRange(queryParams.createTime)
     const data = await getTaskTodoPage(params)
     list.value = [...list.value, ...data.list]
     total.value = data.total
@@ -118,7 +116,7 @@ function loadMore() {
 /** 搜索 */
 function handleSearch(data?: TodoSearchFormData) {
   queryParams.name = data?.name
-  queryParams.createTime = data?.createTime
+  queryParams.createTime = data?.createTime ?? [undefined, undefined]
   queryParams.pageNo = 1
   list.value = []
   getList()

+ 1 - 4
src/pages/message/index.vue

@@ -121,16 +121,13 @@ const detailPopupRef = ref<InstanceType<typeof DetailPopup>>() // 详情弹窗
 async function getList() {
   loadMoreState.value = 'loading'
   try {
-    // 构建参数
-    const params = { ...queryParams } as any
+    const params: any = { ...queryParams }
     if (queryParams.readStatus !== -1) {
       params.readStatus = queryParams.readStatus === 1
     } else {
       delete params.readStatus
     }
     params.createTime = formatDateRange(queryParams.createTime)
-
-    // 执行查询
     const data = await getMyNotifyMessagePage(params)
     list.value = [...list.value, ...data.list]
     total.value = data.total