From 56c7fec9f35a3e9babf204ca6008371cb6fcdbe6 Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Tue, 15 Jul 2025 11:35:18 +0800 Subject: [PATCH] 巡检功能测试完成 --- src/api/inspection/inspectionPlanDetailApi.js | 211 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/inspection/InspectionPlanDetailStaff.vue | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/inspection/InspectionRoutePoint.vue | 4 ++++ src/components/inspection/InspectionTaskDetail.vue | 7 ++++--- src/components/inspection/RouteTask.vue | 10 +++++++--- src/components/inspection/editInspectionPlan.vue | 19 ++++++++++--------- src/components/inspection/inspectionPlanState.vue | 8 ++------ src/components/inspection/pointRoute.vue | 4 ++++ src/components/inspection/pointTaskDetail.vue | 6 ++++++ src/components/staff/selectStaffsDiv.vue | 7 ++++--- src/i18n/inspectionI18n.js | 3 +++ src/router/inspectionRouter.js | 5 +++++ src/views/contract/contractChangeDetailLang.js | 15 +-------------- src/views/inspection/InspectionTaskList.vue | 6 +++--- src/views/inspection/addInspectionPlanList.vue | 2 +- src/views/inspection/inspectionPlanDetailLang.js | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/inspection/inspectionPlanDetailList.vue | 241 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/inspection/inspectionPlanLang.js | 9 +++++++-- src/views/inspection/pointPlanLang.js | 28 ++-------------------------- src/views/oa/addAttendanceClassesStaffLang.js | 16 ---------------- src/views/oa/addComplaintTypeLang.js | 12 ------------ src/views/oa/addExamineStaffLang.js | 14 -------------- src/views/oa/addWorkLang.js | 14 -------------- src/views/oa/editComplaintTypeLang.js | 14 -------------- src/views/oa/editWorkLang.js | 14 -------------- src/views/oa/newOaWorkflowDetailLang.js | 14 -------------- src/views/resource/addItemOutLang.js | 24 ------------------------ src/views/resource/addPurchaseApplyLang.js | 14 -------------- src/views/resource/allocationStorehouseApplyLang.js | 14 -------------- src/views/resource/purchaseApplyDetailLang.js | 14 -------------- src/views/staff/staffLang.js | 20 ++++++++++++++++++-- src/views/system/workflowSettingManageLang.js | 16 ---------------- src/views/work/addItemReleaseViewLang.js | 14 -------------- src/views/work/repairTypeUserLang.js | 14 -------------- 34 files changed, 739 insertions(+), 280 deletions(-) create mode 100644 src/api/inspection/inspectionPlanDetailApi.js create mode 100644 src/components/inspection/InspectionPlanDetailStaff.vue create mode 100644 src/views/inspection/inspectionPlanDetailLang.js create mode 100644 src/views/inspection/inspectionPlanDetailList.vue diff --git a/src/api/inspection/inspectionPlanDetailApi.js b/src/api/inspection/inspectionPlanDetailApi.js new file mode 100644 index 0000000..c43fa51 --- /dev/null +++ b/src/api/inspection/inspectionPlanDetailApi.js @@ -0,0 +1,211 @@ +import request from '@/utils/request' +import { getCommunityId } from '@/api/community/communityApi' + +// 获取巡检计划详情 +export function getInspectionPlanDetail(params) { + return new Promise((resolve, reject) => { + request({ + url: '/inspectionPlan.listInspectionPlans', + method: 'get', + params: { + ...params, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取巡检计划人员列表 +export function listInspectionPlanStaffs(params) { + return new Promise((resolve, reject) => { + request({ + url: '/inspection.listInspectionPlanStaffs', + method: 'get', + params: { + ...params, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取巡检路线列表 +export function listInspectionRoutes(params) { + return new Promise((resolve, reject) => { + request({ + url: '/inspectionRoute.listInspectionRoutes', + method: 'get', + params: { + ...params, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取巡检路线点列表 +export function listInspectionRoutePoints(params) { + return new Promise((resolve, reject) => { + request({ + url: '/inspectionRoute.listInspectionRoutePoints', + method: 'get', + params: { + ...params, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取巡检点列表 +export function listInspectionPoints(params) { + return new Promise((resolve, reject) => { + request({ + url: '/inspectionPoint.listInspectionPoints', + method: 'get', + params: { + ...params, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 保存巡检路线点 +export function saveInspectionRoutePoint(data) { + return new Promise((resolve, reject) => { + request({ + url: '/inspectionRoute.saveInspectionRoutePoint', + method: 'post', + data: { + ...data, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 删除巡检路线点 +export function deleteInspectionRoutePoint(data) { + return new Promise((resolve, reject) => { + request({ + url: '/inspectionRoute.deleteInspectionRoutePoint', + method: 'post', + data: { + ...data, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 更新巡检路线点关系 +export function updateInspectionRoutePointRel(data) { + return new Promise((resolve, reject) => { + request({ + url: '/inspectionRoute.updateInspectionRoutePointRel', + method: 'post', + data: { + ...data, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 查询路线巡检任务 +export function queryRouteInspectionTask(params) { + return new Promise((resolve, reject) => { + request({ + url: '/inspection.queryRouteInspectionTask', + method: 'get', + params: { + ...params, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 查询巡检任务详情 +export function queryInspectionTaskDetail(params) { + return new Promise((resolve, reject) => { + request({ + url: '/inspection.queryInspectionTaskDetail', + method: 'get', + params: { + ...params, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取巡检任务详情列表 +export function listInspectionTaskDetails(params) { + return new Promise((resolve, reject) => { + request({ + url: '/inspectionTaskDetail.listInspectionTaskDetails', + 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/components/inspection/InspectionPlanDetailStaff.vue b/src/components/inspection/InspectionPlanDetailStaff.vue new file mode 100644 index 0000000..4706b0f --- /dev/null +++ b/src/components/inspection/InspectionPlanDetailStaff.vue @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/inspection/InspectionRoutePoint.vue b/src/components/inspection/InspectionRoutePoint.vue index 980c230..0cc8778 100644 --- a/src/components/inspection/InspectionRoutePoint.vue +++ b/src/components/inspection/InspectionRoutePoint.vue @@ -81,6 +81,10 @@ export default { beforeDestroy() { }, methods: { + open(params) { + this.inspectionRoutePointInfo.inspectionRouteId = params.inspectionRouteId + this._listInspectionRoutePoints() + }, loadData(params) { this.inspectionRoutePointInfo.inspectionRouteId = params.inspectionRouteId this._listInspectionRoutePoints() diff --git a/src/components/inspection/InspectionTaskDetail.vue b/src/components/inspection/InspectionTaskDetail.vue index 7e76691..d73c723 100644 --- a/src/components/inspection/InspectionTaskDetail.vue +++ b/src/components/inspection/InspectionTaskDetail.vue @@ -1,6 +1,7 @@ - - + + @@ -55,7 +56,7 @@ - + diff --git a/src/components/inspection/RouteTask.vue b/src/components/inspection/RouteTask.vue index 7f311a3..f806a93 100644 --- a/src/components/inspection/RouteTask.vue +++ b/src/components/inspection/RouteTask.vue @@ -45,6 +45,10 @@ export default { beforeDestroy() { }, methods: { + open(params) { + this.routeTaskInfo.inspectionRouteId = params.inspectionRouteId + this._loadRouteTaskData() + }, loadData(params) { this.routeTaskInfo.inspectionRouteId = params.inspectionRouteId this._loadRouteTaskData() @@ -75,11 +79,11 @@ export default { this.routeTaskInfo.inspectionRouteId = task.inspectionRouteId // 通知地图组件加载任务 - this.$nextTick(() => { + setTimeout(() => { if (this.$refs.inspectionTaskMap) { - this.$refs.inspectionTaskMap.loadTask(task) + this.$refs.inspectionTaskMap.loadData(task) } - }) + }, 500) } } } diff --git a/src/components/inspection/editInspectionPlan.vue b/src/components/inspection/editInspectionPlan.vue index 944c0a0..b1f31cb 100644 --- a/src/components/inspection/editInspectionPlan.vue +++ b/src/components/inspection/editInspectionPlan.vue @@ -1,6 +1,6 @@ - + @@ -100,15 +100,16 @@ - + - - + + @@ -116,7 +117,7 @@ - + @@ -131,7 +132,7 @@ - + \ No newline at end of file +} + \ No newline at end of file diff --git a/src/i18n/inspectionI18n.js b/src/i18n/inspectionI18n.js index 27cdb56..88e4c96 100644 --- a/src/i18n/inspectionI18n.js +++ b/src/i18n/inspectionI18n.js @@ -19,6 +19,7 @@ import { messages as inspectionPlanMessages } from '../views/inspection/inspecti import { messages as addInspectionPlanMessages } from '../views/inspection/addInspectionPlanLang' import { messages as inspectionTaskMessages } from '../views/inspection/inspectionTaskLang' import { messages as inspectionTaskDetailsMessages } from '../views/inspection/inspectionTaskDetailsLang' +import { messages as inspectionPlanDetailMessages } from '../views/inspection/inspectionPlanDetailLang' export const messages = { en: { @@ -43,6 +44,7 @@ export const messages = { ...addInspectionPlanMessages.en, ...inspectionTaskMessages.en, ...inspectionTaskDetailsMessages.en, + ...inspectionPlanDetailMessages.en, }, zh: { ...adminInspectionPlanMessages.zh, @@ -66,6 +68,7 @@ export const messages = { ...addInspectionPlanMessages.zh, ...inspectionTaskMessages.zh, ...inspectionTaskDetailsMessages.zh, + ...inspectionPlanDetailMessages.zh, } } \ No newline at end of file diff --git a/src/router/inspectionRouter.js b/src/router/inspectionRouter.js index 17aebda..aad317c 100644 --- a/src/router/inspectionRouter.js +++ b/src/router/inspectionRouter.js @@ -104,4 +104,9 @@ export default [ name: '/pages/property/maintainanceTaskManage', component: () => import('@/views/inspection/maintainanceTaskManageList.vue') }, + { + path:'/pages/inspection/inspectionPlanDetail', + name:'/pages/inspection/inspectionPlanDetail', + component: () => import('@/views/inspection/inspectionPlanDetailList.vue') + }, ] \ No newline at end of file diff --git a/src/views/contract/contractChangeDetailLang.js b/src/views/contract/contractChangeDetailLang.js index 3ebb09d..fc1f348 100644 --- a/src/views/contract/contractChangeDetailLang.js +++ b/src/views/contract/contractChangeDetailLang.js @@ -65,13 +65,6 @@ export const messages = { staffRequired: 'Staff is required', staffNameRequired: 'Staff name is required' }, - selectStaff: { - title: 'Select Staff', - orgInfo: 'Organization Information', - staffInfo: 'Staff Information', - submitter: 'Submitter', - dynamicAssign: 'Dynamic Assignment' - }, chooseContract: { title: 'Select Contract', searchPlaceholder: 'Input contract name', @@ -149,13 +142,7 @@ export const messages = { staffRequired: '员工不能为空', staffNameRequired: '员工名称不能为空' }, - selectStaff: { - title: '选择员工', - orgInfo: '组织信息', - staffInfo: '员工信息', - submitter: '提交者', - dynamicAssign: '动态指定' - }, + chooseContract: { title: '选择合同信息', searchPlaceholder: '输入合同信息名称', diff --git a/src/views/inspection/InspectionTaskList.vue b/src/views/inspection/InspectionTaskList.vue index f448892..a9f2565 100644 --- a/src/views/inspection/InspectionTaskList.vue +++ b/src/views/inspection/InspectionTaskList.vue @@ -109,8 +109,8 @@ - - {{ $t('inspectionTask.note') }} + + {{ $t('inspectionTask.note') }} {{ $t('addInspectionPlan.title') }} - + diff --git a/src/views/inspection/inspectionPlanDetailLang.js b/src/views/inspection/inspectionPlanDetailLang.js new file mode 100644 index 0000000..d38da3f --- /dev/null +++ b/src/views/inspection/inspectionPlanDetailLang.js @@ -0,0 +1,116 @@ +export const messages = { + en: { + inspectionPlanDetail: { + title: 'Inspection Plan Detail', + planName: 'Plan Name', + planRoute: 'Plan Route', + planPeriod: 'Plan Period', + signType: 'Sign Type', + dateRange: 'Date Range', + timeRange: 'Time Range', + beforeTime: 'Before Time (min)', + creator: 'Creator', + createTime: 'Create Time', + status: 'Status', + staff: 'Staff', + route: 'Route', + point: 'Point', + task: 'Task', + detail: 'Detail', + staffName: 'Staff Name', + startTime: 'Start Time', + endTime: 'End Time', + routeList: 'Route List', + pointId: 'Point ID', + pointName: 'Point Name', + pointType: 'Point Type', + pointLocation: 'Location', + pointTimeRange: 'Time Range', + sortNumber: 'Sort Number', + operation: 'Operation', + choosePoint: 'Choose Inspection Point', + pointNamePlaceholder: 'Enter point name', + deletePointConfirm: 'Are you sure to delete this inspection point?', + editPoint: 'Edit Inspection Point', + startTimePlaceholder: 'Select start time', + endTimePlaceholder: 'Select end time', + sortNumberPlaceholder: 'Enter sort number', + startTimeRequired: 'Start time is required', + endTimeRequired: 'End time is required', + sortNumberRequired: 'Sort number is required', + sortNumberMustBeNumber: 'Sort number must be a number', + choosePointWarning: 'Please select at least one inspection point', + taskList: 'Task List', + taskDetailId: 'Task Detail ID', + taskStatus: 'Task Status', + planUser: 'Plan User', + actualUser: 'Actual User', + signStatus: 'Sign Status', + pointStatus: 'Point Status', + inspectionDesc: 'Description', + inspectionPhoto: 'Photos', + planTimeRange: 'Plan Time', + actualTime: 'Actual Time', + searchPlanUser: 'Search by user', + searchStartTime: 'Start time', + searchEndTime: 'End time' + } + }, + zh: { + inspectionPlanDetail: { + title: '巡检计划详情', + planName: '计划名称', + planRoute: '计划路线', + planPeriod: '计划周期', + signType: '签到方式', + dateRange: '日期范围', + timeRange: '时间范围', + beforeTime: '任务提前(分钟)', + creator: '制定人', + createTime: '制定时间', + status: '状态', + staff: '巡检人员', + route: '巡检路线', + point: '巡检点', + task: '巡检任务', + detail: '巡检明细', + staffName: '巡检人员', + startTime: '开始时间', + endTime: '结束时间', + routeList: '路线列表', + pointId: '巡检点ID', + pointName: '巡检点名称', + pointType: '巡检点类型', + pointLocation: '巡检位置', + pointTimeRange: '时间范围', + sortNumber: '排序', + operation: '操作', + choosePoint: '选择巡检点', + pointNamePlaceholder: '输入巡检点名称', + deletePointConfirm: '确定删除该巡检点吗?', + editPoint: '修改巡检点', + startTimePlaceholder: '请填写开始时间', + endTimePlaceholder: '请填写结束时间', + sortNumberPlaceholder: '请填写排序值', + startTimeRequired: '开始时间不能为空', + endTimeRequired: '结束时间不能为空', + sortNumberRequired: '排序不能为空', + sortNumberMustBeNumber: '顺序必须是数字', + choosePointWarning: '请选择巡检点', + taskList: '任务列表', + taskDetailId: '任务详情ID', + taskStatus: '任务状态', + planUser: '计划巡检人', + actualUser: '实际巡检人', + signStatus: '实际签到状态', + pointStatus: '巡检点状态', + inspectionDesc: '巡检情况', + inspectionPhoto: '巡检照片', + planTimeRange: '计划时间', + actualTime: '实际巡检时间', + searchPlanUser: '请输入巡检人', + searchStartTime: '实际巡检开始时间', + searchEndTime: '实际巡检结束时间' + } + } +} \ No newline at end of file diff --git a/src/views/inspection/inspectionPlanDetailList.vue b/src/views/inspection/inspectionPlanDetailList.vue new file mode 100644 index 0000000..b764ca7 --- /dev/null +++ b/src/views/inspection/inspectionPlanDetailList.vue @@ -0,0 +1,241 @@ + + + + + {{ $t('inspectionPlanDetail.title') }} + + + + + + + {{ $t('inspectionPlanDetail.planName') }}: + + {{ inspectionPlanDetailInfo.inspectionPlanName }} + + + + + + {{ $t('inspectionPlanDetail.planRoute') }}: + + {{ inspectionPlanDetailInfo.inspectionRouteName }} + + + + + + {{ $t('inspectionPlanDetail.planPeriod') }}: + + {{ inspectionPlanDetailInfo.inspectionPlanPeriodName }} + + + + + + {{ $t('inspectionPlanDetail.signType') }}: + + {{ inspectionPlanDetailInfo.signTypeName }} + + + + + + {{ $t('inspectionPlanDetail.dateRange') }}: + + {{ inspectionPlanDetailInfo.startDate }}~{{ inspectionPlanDetailInfo.endDate }} + + + + + + {{ $t('inspectionPlanDetail.timeRange') }}: + + {{ inspectionPlanDetailInfo.startTime }}~{{ inspectionPlanDetailInfo.endTime }} + + + + + + {{ $t('inspectionPlanDetail.beforeTime') }}: + + {{ inspectionPlanDetailInfo.beforeTime }} + + + + + + {{ $t('inspectionPlanDetail.creator') }}: + + {{ inspectionPlanDetailInfo.createUserName }} + + + + + + {{ $t('inspectionPlanDetail.createTime') }}: + + {{ inspectionPlanDetailInfo.createTime }} + + + + + + {{ $t('inspectionPlanDetail.status') }}: + + {{ inspectionPlanDetailInfo.stateName }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/inspection/inspectionPlanLang.js b/src/views/inspection/inspectionPlanLang.js index ea6dea1..b473f32 100644 --- a/src/views/inspection/inspectionPlanLang.js +++ b/src/views/inspection/inspectionPlanLang.js @@ -32,7 +32,10 @@ export const messages = { confirmDeleteTitle: 'Confirm Deletion', confirmDeleteContent: 'Are you sure you want to delete this inspection plan?', cancel: 'Cancel', - confirm: 'Confirm' + confirm: 'Confirm', + confirmOperation: 'Confirm Operation', + confirmStateChange: 'Confirm State Change', + }, editInspectionPlan: { title: 'Edit Plan', @@ -100,7 +103,9 @@ export const messages = { confirmDeleteTitle: '确认删除', confirmDeleteContent: '确定删除巡检计划吗?', cancel: '取消', - confirm: '确定' + confirm: '确定', + confirmOperation: '确认操作', + confirmStateChange: '确认状态变更', }, editInspectionPlan: { title: '修改计划', diff --git a/src/views/inspection/pointPlanLang.js b/src/views/inspection/pointPlanLang.js index 6961386..baf9839 100644 --- a/src/views/inspection/pointPlanLang.js +++ b/src/views/inspection/pointPlanLang.js @@ -1,32 +1,8 @@ export default { en: { - inspectionPlan: { - planName: 'Plan Name', - planRoute: 'Plan Route', - planPeriod: 'Plan Cycle', - signType: 'Sign-in Method', - dateRange: 'Date Range', - timeRange: 'Time Range', - taskAhead: 'Task Ahead (minutes)', - creator: 'Creator', - createTime: 'Create Time', - inspector: 'Inspector', - status: 'Status' - } + }, zh: { - inspectionPlan: { - planName: '计划名称', - planRoute: '计划路线', - planPeriod: '计划周期', - signType: '签到方式', - dateRange: '日期范围', - timeRange: '时间范围', - taskAhead: '任务提前(分钟)', - creator: '制定人', - createTime: '制定时间', - inspector: '巡检人', - status: '状态' - } + } } \ No newline at end of file diff --git a/src/views/oa/addAttendanceClassesStaffLang.js b/src/views/oa/addAttendanceClassesStaffLang.js index 8614a40..8fd476d 100644 --- a/src/views/oa/addAttendanceClassesStaffLang.js +++ b/src/views/oa/addAttendanceClassesStaffLang.js @@ -13,14 +13,6 @@ export const messages = { imageSizeLimit: 'Image size cannot exceed 2MB', uploadFailed: 'Upload failed' }, - selectStaff: { - title: 'Select Staff', - orgInfo: 'Organization Information', - staffInfo: 'Staff Information', - submitter: 'Submitter', - dynamicAssign: 'Dynamic Assign', - loadStaffFailed: 'Failed to load staff list' - }, orgTree: { loadFailed: 'Failed to load organization tree' } @@ -39,14 +31,6 @@ export const messages = { imageSizeLimit: '图片大小不能超过2MB', uploadFailed: '上传失败' }, - selectStaff: { - title: '选择员工', - orgInfo: '组织信息', - staffInfo: '员工信息', - submitter: '提交者', - dynamicAssign: '动态指定', - loadStaffFailed: '加载员工列表失败' - }, orgTree: { loadFailed: '加载组织树失败' } diff --git a/src/views/oa/addComplaintTypeLang.js b/src/views/oa/addComplaintTypeLang.js index f553580..8dda837 100644 --- a/src/views/oa/addComplaintTypeLang.js +++ b/src/views/oa/addComplaintTypeLang.js @@ -17,12 +17,6 @@ export const messages = { autoReply: 'Auto Reply', manualReply: 'Manual Reply' }, - selectStaff: { - orgInfo: 'Organization Info', - staffInfo: 'Staff Info', - selectedStaff: 'Selected Staff', - noRepeatSelect: 'Do not select repeatedly' - } }, zh: { addComplaintType: { @@ -42,11 +36,5 @@ export const messages = { autoReply: '自动回复', manualReply: '人工回复' }, - selectStaff: { - orgInfo: '组织信息', - staffInfo: '员工信息', - selectedStaff: '已选员工', - noRepeatSelect: '请勿重复选择' - } } } \ No newline at end of file diff --git a/src/views/oa/addExamineStaffLang.js b/src/views/oa/addExamineStaffLang.js index a2024d6..4f86587 100644 --- a/src/views/oa/addExamineStaffLang.js +++ b/src/views/oa/addExamineStaffLang.js @@ -12,13 +12,6 @@ export const messages = { staffIntroduction: 'Staff Introduction', staffIntroductionPlaceholder: 'Required, please fill in staff introduction' }, - selectStaff: { - title: 'Select Staff', - orgInfo: 'Organization Information', - staffInfo: 'Staff Information', - submitter: 'Submitter', - dynamicAssign: 'Dynamic Assignment' - }, uploadImage: { imageSizeLimit: 'Image size cannot exceed 2MB', uploadFailed: 'Upload failed' @@ -37,13 +30,6 @@ export const messages = { staffIntroduction: '员工简介', staffIntroductionPlaceholder: '必填,请输入员工简介' }, - selectStaff: { - title: '选择员工', - orgInfo: '组织信息', - staffInfo: '员工信息', - submitter: '提交者', - dynamicAssign: '动态指定' - }, uploadImage: { imageSizeLimit: '图片大小不能超过2MB', uploadFailed: '上传失败' diff --git a/src/views/oa/addWorkLang.js b/src/views/oa/addWorkLang.js index 1ecfd5e..77822ab 100644 --- a/src/views/oa/addWorkLang.js +++ b/src/views/oa/addWorkLang.js @@ -47,13 +47,6 @@ export const messages = { success: 'File uploaded successfully', failed: 'File upload failed' }, - selectStaff: { - title: 'Select Staff', - orgInfo: 'Organization Information', - staffInfo: 'Staff Information', - submitter: 'Submitter', - dynamicAssign: 'Dynamic Assignment' - } }, zh: { addWork: { @@ -103,12 +96,5 @@ export const messages = { success: '文件上传成功', failed: '文件上传失败' }, - selectStaff: { - title: '选择员工', - orgInfo: '组织信息', - staffInfo: '员工信息', - submitter: '提交者', - dynamicAssign: '动态指定' - } } } \ No newline at end of file diff --git a/src/views/oa/editComplaintTypeLang.js b/src/views/oa/editComplaintTypeLang.js index 55fa180..ca2964d 100644 --- a/src/views/oa/editComplaintTypeLang.js +++ b/src/views/oa/editComplaintTypeLang.js @@ -20,13 +20,6 @@ export const messages = { saveError: 'Save failed', loadError: 'Failed to load complaint type details' }, - selectStaff: { - orgInfo: 'Organization Information', - staffInfo: 'Staff Information', - selectedStaff: 'Selected Staff', - staffAlreadySelected: 'Staff already selected', - loadStaffError: 'Failed to load staff information' - }, orgTree: { loadError: 'Failed to load organization tree' } @@ -52,13 +45,6 @@ export const messages = { saveError: '保存失败', loadError: '加载投诉类型详情失败' }, - selectStaff: { - orgInfo: '组织信息', - staffInfo: '员工信息', - selectedStaff: '已选员工', - staffAlreadySelected: '请勿重复选择', - loadStaffError: '加载员工信息失败' - }, orgTree: { loadError: '加载组织树失败' } diff --git a/src/views/oa/editWorkLang.js b/src/views/oa/editWorkLang.js index 4c32dce..952bfd1 100644 --- a/src/views/oa/editWorkLang.js +++ b/src/views/oa/editWorkLang.js @@ -51,13 +51,6 @@ export const messages = { placeholder: 'Required, please enter content', uploadFailed: 'Image upload failed' }, - selectStaff: { - title: 'Select Staff', - orgInfo: 'Organization Information', - staffInfo: 'Staff Information', - submitter: 'Submitter', - dynamicAssign: 'Dynamic Assign' - } }, zh: { editWork: { @@ -111,12 +104,5 @@ export const messages = { placeholder: '必填,请输入内容', uploadFailed: '图片上传失败' }, - selectStaff: { - title: '选择员工', - orgInfo: '组织信息', - staffInfo: '员工信息', - submitter: '提交者', - dynamicAssign: '动态指定' - } } } \ No newline at end of file diff --git a/src/views/oa/newOaWorkflowDetailLang.js b/src/views/oa/newOaWorkflowDetailLang.js index 6687cd6..6ae7d28 100644 --- a/src/views/oa/newOaWorkflowDetailLang.js +++ b/src/views/oa/newOaWorkflowDetailLang.js @@ -41,13 +41,6 @@ export const messages = { transferred: 'Transferred', completed: 'Completed' }, - selectStaff: { - title: 'Select Staff', - orgInfo: 'Organization Information', - staffInfo: 'Staff Information', - submitter: 'Submitter', - customAssign: 'Dynamic Assignment' - } }, zh: { newOaWorkflowDetail: { @@ -91,12 +84,5 @@ export const messages = { transferred: '转单', completed: '办结' }, - selectStaff: { - title: '选择员工', - orgInfo: '组织信息', - staffInfo: '员工信息', - submitter: '提交者', - customAssign: '动态指定' - } } } \ No newline at end of file diff --git a/src/views/resource/addItemOutLang.js b/src/views/resource/addItemOutLang.js index 8d0ca12..3c6fb8b 100644 --- a/src/views/resource/addItemOutLang.js +++ b/src/views/resource/addItemOutLang.js @@ -63,18 +63,6 @@ export const messages = { fixedItem: 'Fixed Item', stock: 'Stock' }, - selectStaff: { - title: 'Select Staff', - orgInfo: 'Organization Information', - staffInfo: 'Staff Information', - submitter: 'Submitter', - dynamicAssign: 'Dynamic Assignment', - confirm: 'Confirm', - cancel: 'Cancel', - selectStaffWarning: 'Please select a staff member', - fetchOrgError: 'Failed to fetch organization data', - fetchStaffError: 'Failed to fetch staff data' - } }, zh: { addItemOut: { @@ -140,17 +128,5 @@ export const messages = { fixedItem: '固定物品', stock: '物品库存' }, - selectStaff: { - title: '选择员工', - orgInfo: '组织信息', - staffInfo: '员工信息', - submitter: '提交者', - dynamicAssign: '动态指定', - confirm: '确定', - cancel: '取消', - selectStaffWarning: '请选择员工', - fetchOrgError: '获取组织数据失败', - fetchStaffError: '获取员工数据失败' - } } } \ No newline at end of file diff --git a/src/views/resource/addPurchaseApplyLang.js b/src/views/resource/addPurchaseApplyLang.js index 7f2665a..43675d5 100644 --- a/src/views/resource/addPurchaseApplyLang.js +++ b/src/views/resource/addPurchaseApplyLang.js @@ -53,13 +53,6 @@ export const messages = { itemStock: 'Item Stock', selectItemsRequired: 'Please select items to purchase' }, - selectStaff: { - title: 'Select Staff', - orgInfo: 'Organization Information', - staffInfo: 'Staff Information', - submitter: 'Submitter', - dynamicAssign: 'Dynamic Assignment' - } }, zh: { addPurchaseApply: { @@ -115,12 +108,5 @@ export const messages = { itemStock: '物品库存', selectItemsRequired: '请选择需要采购的物品' }, - selectStaff: { - title: '选择员工', - orgInfo: '组织信息', - staffInfo: '员工信息', - submitter: '提交者', - dynamicAssign: '动态指定' - } } } \ No newline at end of file diff --git a/src/views/resource/allocationStorehouseApplyLang.js b/src/views/resource/allocationStorehouseApplyLang.js index b4d0ba1..73a9ef9 100644 --- a/src/views/resource/allocationStorehouseApplyLang.js +++ b/src/views/resource/allocationStorehouseApplyLang.js @@ -53,13 +53,6 @@ export const messages = { itemStock: 'Item Stock', selectItemFirst: 'Please select items first' }, - selectStaff: { - title: 'Select Staff', - orgInfo: 'Organization Information', - staffInfo: 'Staff Information', - submitter: 'Submitter', - dynamicAssign: 'Dynamic Assignment' - } }, zh: { allocationStorehouseApply: { @@ -115,12 +108,5 @@ export const messages = { itemStock: '物品库存', selectItemFirst: '请先选择物品' }, - selectStaff: { - title: '选择员工', - orgInfo: '组织信息', - staffInfo: '员工信息', - submitter: '提交者', - dynamicAssign: '动态指定' - } } } \ No newline at end of file diff --git a/src/views/resource/purchaseApplyDetailLang.js b/src/views/resource/purchaseApplyDetailLang.js index 94b9d91..2016e30 100644 --- a/src/views/resource/purchaseApplyDetailLang.js +++ b/src/views/resource/purchaseApplyDetailLang.js @@ -66,13 +66,6 @@ export const messages = { submitSuccess: 'Submit successfully', submitFailed: 'Submit failed' }, - selectStaff: { - selectStaff: 'Select Staff', - orgInfo: 'Organization Information', - staffInfo: 'Staff Information', - submitter: 'Submitter', - dynamicAssign: 'Dynamic Assign' - } }, zh: { purchaseApplyDetail: { @@ -141,12 +134,5 @@ export const messages = { submitSuccess: '提交成功', submitFailed: '提交失败' }, - selectStaff: { - selectStaff: '选择员工', - orgInfo: '组织信息', - staffInfo: '员工信息', - submitter: '提交者', - dynamicAssign: '动态指定' - } } } \ No newline at end of file diff --git a/src/views/staff/staffLang.js b/src/views/staff/staffLang.js index 134ada0..ea1b96a 100644 --- a/src/views/staff/staffLang.js +++ b/src/views/staff/staffLang.js @@ -39,7 +39,15 @@ export const messages = { cancel: 'Cancel', confirmDelete: 'Are you sure to delete? Before deleting staff, please confirm that the staff has completed the relevant approval process. After deletion, the relevant process will not be able to continue. Please operate carefully!', confirmDeleteAction: 'Confirm Delete' - } + }, + selectStaff: { + title: 'Select Staff', + orgInfo: 'Organization Information', + staffInfo: 'Staff Information', + submitter: 'Submitter', + dynamicAssign: 'Dynamic Assignment', + selectedStaff: 'Selected Staff' + }, }, zh: { staff: { @@ -80,6 +88,14 @@ export const messages = { cancel: '取消', confirmDelete: '确认是否删除,删除员工前请确认员工已完成相关审批流程,删除后相关流程将无法继续进行,请慎重操作!', confirmDeleteAction: '确认删除' - } + }, + selectStaff: { + title: '选择员工', + orgInfo: '组织信息', + staffInfo: '员工信息', + submitter: '提交者', + dynamicAssign: '动态指定', + selectedStaff: '已选员工' + }, } } \ No newline at end of file diff --git a/src/views/system/workflowSettingManageLang.js b/src/views/system/workflowSettingManageLang.js index 04b6f15..e50430e 100644 --- a/src/views/system/workflowSettingManageLang.js +++ b/src/views/system/workflowSettingManageLang.js @@ -26,14 +26,6 @@ export const messages = { instruction4: 'Must configure the corresponding process', invalidOperation: 'Invalid operation' }, - selectStaff: { - title: 'Select Staff', - orgInfo: 'Organization Information', - staffInfo: 'Staff Information', - submitter: 'Submitter', - dynamicAssign: 'Dynamic Assign', - fetchStaffError: 'Failed to fetch staff information' - }, orgTree: { fetchError: 'Failed to fetch organization tree' } @@ -65,14 +57,6 @@ export const messages = { instruction4: '必须配置对应的流程', invalidOperation: '操作错误' }, - selectStaff: { - title: '选择员工', - orgInfo: '组织信息', - staffInfo: '员工信息', - submitter: '提交者', - dynamicAssign: '动态指定', - fetchStaffError: '获取员工信息失败' - }, orgTree: { fetchError: '获取组织树失败' } diff --git a/src/views/work/addItemReleaseViewLang.js b/src/views/work/addItemReleaseViewLang.js index 6057e80..7dbd5ff 100644 --- a/src/views/work/addItemReleaseViewLang.js +++ b/src/views/work/addItemReleaseViewLang.js @@ -39,13 +39,6 @@ export const messages = { approverRequired: 'Approver is required' } }, - selectStaff: { - title: 'Select Staff', - orgInfo: 'Organization Information', - staffInfo: 'Staff Information', - submitter: 'Submitter', - dynamicAssign: 'Dynamic Assignment' - } }, zh: { addItemReleaseView: { @@ -87,12 +80,5 @@ export const messages = { approverRequired: '审批人不能为空' } }, - selectStaff: { - title: '选择员工', - orgInfo: '组织信息', - staffInfo: '员工信息', - submitter: '提交者', - dynamicAssign: '动态指定' - } } } \ No newline at end of file diff --git a/src/views/work/repairTypeUserLang.js b/src/views/work/repairTypeUserLang.js index 6f39216..18032ce 100644 --- a/src/views/work/repairTypeUserLang.js +++ b/src/views/work/repairTypeUserLang.js @@ -11,13 +11,6 @@ export const messages = { operation: 'Operation', repairTypeRequired: 'Repair type is required' }, - selectStaff: { - title: 'Select Staff', - orgInfo: 'Organization Information', - staffInfo: 'Staff Information', - selectStaffFirst: 'Please select a staff first', - selectedStaff: 'Selected Staff' - }, deleteRepairTypeUser: { title: 'Confirm Operation', confirmDelete: 'Are you sure to delete this repair master?' @@ -44,13 +37,6 @@ export const messages = { operation: '操作', repairTypeRequired: '未包含报修类型' }, - selectStaff: { - title: '选择员工', - orgInfo: '组织信息', - staffInfo: '员工信息', - selectStaffFirst: '请先选择员工', - selectedStaff: '已选择员工' - }, deleteRepairTypeUser: { title: '请确认您的操作', confirmDelete: '确定删除报修师傅?' -- libgit2 0.21.4