diff --git a/src/api/org/orgApi.js b/src/api/org/orgApi.js index 0ac9f2d..5fe96e9 100644 --- a/src/api/org/orgApi.js +++ b/src/api/org/orgApi.js @@ -120,11 +120,8 @@ export function listStaffs(params) { params }).then(response => { const res = response.data - if (res.code == 0) { resolve(res) - } else { - reject(new Error(res.msg || '获取员工列表失败')) - } + }).catch(error => { reject(error) }) diff --git a/src/api/org/scheduleClassesStaffManageApi.js b/src/api/org/scheduleClassesStaffManageApi.js new file mode 100644 index 0000000..3211f36 --- /dev/null +++ b/src/api/org/scheduleClassesStaffManageApi.js @@ -0,0 +1,99 @@ +import request from '@/utils/request' + +/** + * 获取班次员工列表 + * @param {Object} params 查询参数 + * @returns {Promise} + */ +export function listScheduleClassesStaff(params) { + return new Promise((resolve, reject) => { + request({ + url: '/scheduleClasses.listScheduleClassesStaff', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +/** + * 保存班次员工 + * @param {Object} data 保存数据 + * @returns {Promise} + */ +export function saveScheduleClassesStaff(data) { + return new Promise((resolve, reject) => { + request({ + url: '/scheduleClasses.saveScheduleClassesStaff', + method: 'post', + data + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +/** + * 删除班次员工 + * @param {Object} data 删除数据 + * @returns {Promise} + */ +export function deleteScheduleClassesStaff(data) { + return new Promise((resolve, reject) => { + request({ + url: '/scheduleClasses.deleteScheduleClassesStaff', + method: 'post', + data + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +/** + * 获取组织树 + * @returns {Promise} + */ +export function listOrgTree() { + return new Promise((resolve, reject) => { + request({ + url: '/org.listOrgTree', + method: 'get' + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +/** + * 根据组织ID获取员工列表 + * @param {Object} params 查询参数 + * @returns {Promise} + */ +export function listStaffByOrg(params) { + return new Promise((resolve, reject) => { + request({ + url: '/query.staff.infos', + 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/components/car/importOwnerCar.vue b/src/components/car/importOwnerCar.vue index efb4be0..a48827b 100644 --- a/src/components/car/importOwnerCar.vue +++ b/src/components/car/importOwnerCar.vue @@ -80,7 +80,7 @@ export default { this.$message.success(this.$t('listOwnerCar.importSuccess')) this.$emit('success') this.visible = false - this.$router.push(`/pages/property/assetImportLogDetail?logId=${response.logId}&logType=importOwnerCar`) + this.$router.push(`/views/system/assetImportLogDetail?logId=${response.logId}&logType=importOwnerCar`) } catch (error) { console.error('导入失败:', error) this.$message.error(error.message || this.$t('listOwnerCar.importError')) diff --git a/src/components/fee/doImportCreateFee.vue b/src/components/fee/doImportCreateFee.vue index 11d5bd2..5d94c94 100644 --- a/src/components/fee/doImportCreateFee.vue +++ b/src/components/fee/doImportCreateFee.vue @@ -78,7 +78,7 @@ export default { if (res.code === 0) { this.$message.success(this.$t('doImportCreateFee.successMessage')) this.handleClose() - this.$router.push(`/pages/property/assetImportLogDetail?logId=${res.data.logId}&logType=importCustomFee`) + this.$router.push(`/views/system/assetImportLogDetail?logId=${res.data.logId}&logType=importCustomFee`) } else { this.$message.error(res.msg) } diff --git a/src/components/org/addClasses.vue b/src/components/org/addClasses.vue index e972f80..f066d5d 100644 --- a/src/components/org/addClasses.vue +++ b/src/components/org/addClasses.vue @@ -1,6 +1,6 @@ + + + + \ No newline at end of file diff --git a/src/components/org/deleteScheduleClassesStaff.vue b/src/components/org/deleteScheduleClassesStaff.vue new file mode 100644 index 0000000..52aca7a --- /dev/null +++ b/src/components/org/deleteScheduleClassesStaff.vue @@ -0,0 +1,52 @@ + + + + + \ No newline at end of file diff --git a/src/components/org/editClasses.vue b/src/components/org/editClasses.vue index a46c115..f705721 100644 --- a/src/components/org/editClasses.vue +++ b/src/components/org/editClasses.vue @@ -1,6 +1,6 @@ \ No newline at end of file +} + \ No newline at end of file diff --git a/src/i18n/userI18n.js b/src/i18n/userI18n.js index 1a042ea..fc583ac 100644 --- a/src/i18n/userI18n.js +++ b/src/i18n/userI18n.js @@ -10,6 +10,7 @@ import { messages as workflowManageMessages } from '../views/system/workflowMana import { messages as workflowSettingManageMessages } from '../views/system/workflowSettingManageLang' import { messages as ownerDetailMessages } from '../views/owner/ownerDetailLang' import { messages as auditAuthOwnerUndoMessages } from '../views/owner/auditAuthOwnerUndoLang' +import { messages as scheduleClassesStaffManageMessages } from '../views/org/scheduleClassesStaffManageLang' export const messages = { en: { @@ -25,6 +26,7 @@ export const messages = { ...workflowSettingManageMessages.en, ...ownerDetailMessages.en, ...auditAuthOwnerUndoMessages.en, + ...scheduleClassesStaffManageMessages.en, }, zh: { ...staffCommunityMessages.zh, @@ -39,5 +41,6 @@ export const messages = { ...workflowSettingManageMessages.zh, ...ownerDetailMessages.zh, ...auditAuthOwnerUndoMessages.zh, + ...scheduleClassesStaffManageMessages.zh, } } \ No newline at end of file diff --git a/src/router/userRouter.js b/src/router/userRouter.js index 8f3a3a2..2b52373 100644 --- a/src/router/userRouter.js +++ b/src/router/userRouter.js @@ -45,8 +45,13 @@ export default [ component: () => import('@/views/owner/ownerDetail.vue') }, { - path:'/views/owner/auditAuthOwnerUndo', - name:'/views/owner/auditAuthOwnerUndo', + path: '/views/owner/auditAuthOwnerUndo', + name: '/views/owner/auditAuthOwnerUndo', component: () => import('@/views/owner/auditAuthOwnerUndoList.vue') - }, + }, + { + path: '/views/org/scheduleClassesStaffManage', + name: '/views/org/scheduleClassesStaffManage', + component: () => import('@/views/org/scheduleClassesStaffManageList.vue') + }, ] \ No newline at end of file diff --git a/src/views/org/classesManageList.vue b/src/views/org/classesManageList.vue index 932cbfc..b6fad8e 100644 --- a/src/views/org/classesManageList.vue +++ b/src/views/org/classesManageList.vue @@ -1,5 +1,5 @@