From e87263d7ce50aa542b183aaaed21d0961a9e6d87 Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Thu, 17 Jul 2025 13:40:01 +0800 Subject: [PATCH] 工作办理 待办功能测试完成 --- src/api/oa/visitUndoApi.js | 21 +++++++++++++++++++++ src/api/resource/itemReleaseUndoApi.js | 40 ++++++++++++++++++++++++++++++++++++++++ src/i18n/oaI18n.js | 3 +++ src/i18n/resourceI18n.js | 3 +++ src/router/oaRouter.js | 5 +++++ src/router/resourceRouter.js | 11 ++++++++--- src/views/oa/visitUndoLang.js | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/views/oa/visitUndoList.vue | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/itemReleaseUndoLang.js | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/itemReleaseUndoList.vue | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 524 insertions(+), 3 deletions(-) create mode 100644 src/api/oa/visitUndoApi.js create mode 100644 src/api/resource/itemReleaseUndoApi.js create mode 100644 src/views/oa/visitUndoLang.js create mode 100644 src/views/oa/visitUndoList.vue create mode 100644 src/views/resource/itemReleaseUndoLang.js create mode 100644 src/views/resource/itemReleaseUndoList.vue diff --git a/src/api/oa/visitUndoApi.js b/src/api/oa/visitUndoApi.js new file mode 100644 index 0000000..d101375 --- /dev/null +++ b/src/api/oa/visitUndoApi.js @@ -0,0 +1,21 @@ +import request from '@/utils/request' + +/** + * 查询待办访客列表 + * @param {Object} params 查询参数 + * @returns {Promise} 返回Promise对象 + */ +export function queryUndoVisit(params) { + return new Promise((resolve, reject) => { + request({ + url: '/visit.queryUndoVisit', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} \ No newline at end of file diff --git a/src/api/resource/itemReleaseUndoApi.js b/src/api/resource/itemReleaseUndoApi.js new file mode 100644 index 0000000..6a08055 --- /dev/null +++ b/src/api/resource/itemReleaseUndoApi.js @@ -0,0 +1,40 @@ +import request from '@/utils/request' +import { getCommunityId } from '@/api/community/communityApi' + +// 查询待办放行单列表 +export function queryUndoItemRelease(params) { + return new Promise((resolve, reject) => { + request({ + url: '/itemRelease.queryUndoItemRelease', + method: 'get', + params: { + ...params, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 查询放行物品列表 +export function listItemReleaseRes(params) { + return new Promise((resolve, reject) => { + request({ + url: '/itemRelease.listItemReleaseRes', + method: 'get', + params: { + ...params, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} \ No newline at end of file diff --git a/src/i18n/oaI18n.js b/src/i18n/oaI18n.js index a75dfb9..a23f288 100644 --- a/src/i18n/oaI18n.js +++ b/src/i18n/oaI18n.js @@ -52,6 +52,7 @@ import { messages as newOaWorkflowFormEditMessages } from '../views/oa/newOaWork import { messages as simplifyNotepadManageMessages } from '../views/oa/simplifyNotepadManageLang' import { messages as uodoComplaintsMessages } from '../views/oa/uodoComplaintsLang' import { messages as complaintDetailMessages } from '../views/oa/complaintDetailLang' +import { messages as visitUndoMessages } from '../views/oa/visitUndoLang' export const messages ={ @@ -109,6 +110,7 @@ export const messages ={ ...simplifyNotepadManageMessages.en, ...uodoComplaintsMessages.en, ...complaintDetailMessages.en, + ...visitUndoMessages.en, }, zh:{ ...activitiesTypeManageMessages.zh, @@ -164,5 +166,6 @@ export const messages ={ ...simplifyNotepadManageMessages.zh, ...uodoComplaintsMessages.zh, ...complaintDetailMessages.zh, + ...visitUndoMessages.zh, } } \ No newline at end of file diff --git a/src/i18n/resourceI18n.js b/src/i18n/resourceI18n.js index 8f77ceb..fd06056 100644 --- a/src/i18n/resourceI18n.js +++ b/src/i18n/resourceI18n.js @@ -39,6 +39,7 @@ import { messages as resourceOutManageMessages } from '../views/resource/resourc import { messages as allocationStorehouseAuditOrdersMessages } from '../views/resource/allocationStorehouseAuditOrdersLang' import { messages as editAllocationStorehouseApplyMessages } from '../views/resource/editAllocationStorehouseApplyLang' import { messages as allocationStorehouseEnterMessages } from '../views/resource/allocationStorehouseEnterLang' +import { messages as itemReleaseUndoMessages } from '../views/resource/itemReleaseUndoLang' export const messages = { en: { @@ -81,6 +82,7 @@ export const messages = { ...allocationStorehouseAuditOrdersMessages.en, ...editAllocationStorehouseApplyMessages.en, ...allocationStorehouseEnterMessages.en, + ...itemReleaseUndoMessages.en, }, zh: { ...resourceAuditFlowMessages.zh, @@ -122,5 +124,6 @@ export const messages = { ...allocationStorehouseAuditOrdersMessages.zh, ...editAllocationStorehouseApplyMessages.zh, ...allocationStorehouseEnterMessages.zh, + ...itemReleaseUndoMessages.zh, } } \ No newline at end of file diff --git a/src/router/oaRouter.js b/src/router/oaRouter.js index b9837c2..b68ea6c 100644 --- a/src/router/oaRouter.js +++ b/src/router/oaRouter.js @@ -249,4 +249,9 @@ export default [ name: '/pages/complaint/complaintDetail', component: () => import('@/views/oa/complaintDetailList.vue') }, + { + path: '/pages/property/visitUndo', + name: '/pages/property/visitUndo', + component: () => import('@/views/oa/visitUndoList.vue') + }, ] \ No newline at end of file diff --git a/src/router/resourceRouter.js b/src/router/resourceRouter.js index 1a18e71..e6854ff 100644 --- a/src/router/resourceRouter.js +++ b/src/router/resourceRouter.js @@ -181,9 +181,14 @@ export default [ component: () => import('@/views/resource/editAllocationStorehouseApplyList.vue') }, { - path:'/pages/resource/allocationStorehouseEnter', - name:'/pages/resource/allocationStorehouseEnter', + path: '/pages/resource/allocationStorehouseEnter', + name: '/pages/resource/allocationStorehouseEnter', component: () => import('@/views/resource/allocationStorehouseEnterList.vue') - }, + }, + { + path: '/pages/property/itemReleaseUndo', + name: '/pages/property/itemReleaseUndo', + component: () => import('@/views/resource/itemReleaseUndoList.vue') + }, ] \ No newline at end of file diff --git a/src/views/oa/visitUndoLang.js b/src/views/oa/visitUndoLang.js new file mode 100644 index 0000000..6d48608 --- /dev/null +++ b/src/views/oa/visitUndoLang.js @@ -0,0 +1,44 @@ +export const messages = { + en: { + visitUndo: { + title: 'Visitor To-do List', + back: 'Back', + refresh: 'Refresh', + visitorId: 'Visitor ID', + visitor: 'Visitor', + male: 'Male', + female: 'Female', + ownerName: 'Owner Name', + visitReason: 'Visit Reason/Type', + carNumber: 'Car Number', + entourageCount: 'Entourage Count', + createTime: 'Create Time', + visitTime: 'Visit/Departure Time', + status: 'Status', + operation: 'Operation', + process: 'Process', + detail: 'Detail' + } + }, + zh: { + visitUndo: { + title: '访客待办单', + back: '返回', + refresh: '刷新', + visitorId: '访客ID', + visitor: '访客', + male: '男', + female: '女', + ownerName: '业主姓名', + visitReason: '来访事由/类型', + carNumber: '车牌号', + entourageCount: '随行人数', + createTime: '创建时间', + visitTime: '来访/离开时间', + status: '状态', + operation: '操作', + process: '办理', + detail: '详情' + } + } +} \ No newline at end of file diff --git a/src/views/oa/visitUndoList.vue b/src/views/oa/visitUndoList.vue new file mode 100644 index 0000000..f4a6001 --- /dev/null +++ b/src/views/oa/visitUndoList.vue @@ -0,0 +1,171 @@ + + + + + \ No newline at end of file diff --git a/src/views/resource/itemReleaseUndoLang.js b/src/views/resource/itemReleaseUndoLang.js new file mode 100644 index 0000000..4ee2a59 --- /dev/null +++ b/src/views/resource/itemReleaseUndoLang.js @@ -0,0 +1,48 @@ +export const messages = { + en: { + itemReleaseUndo: { + title: 'Release Pending Orders', + back: 'Back', + refresh: 'Refresh', + orderNo: 'Order No', + releaseType: 'Release Type', + applyUnit: 'Applicant Unit', + applicant: 'Applicant', + idCard: 'ID Card', + phone: 'Phone', + passTime: 'Pass Time', + items: 'Items', + viewItems: 'View Items', + status: 'Status', + plateNo: 'Plate No', + none: 'None', + operations: 'Operations', + process: 'Process', + detail: 'Detail' + }, + + }, + zh: { + itemReleaseUndo: { + title: '放行待办单', + back: '返回', + refresh: '刷新', + orderNo: '单号', + releaseType: '放行类型', + applyUnit: '申请单位', + applicant: '申请人', + idCard: '身份证', + phone: '手机号', + passTime: '通行时间', + items: '物品', + viewItems: '查看物品', + status: '状态', + plateNo: '车牌号', + none: '无', + operations: '操作', + process: '办理', + detail: '详情' + }, + + } +} \ No newline at end of file diff --git a/src/views/resource/itemReleaseUndoList.vue b/src/views/resource/itemReleaseUndoList.vue new file mode 100644 index 0000000..0cb01c4 --- /dev/null +++ b/src/views/resource/itemReleaseUndoList.vue @@ -0,0 +1,181 @@ + + + + + \ No newline at end of file -- libgit2 0.21.4