diff --git a/src/api/hr/people/index.ts b/src/api/hr/people/index.ts index f12d23593..aa7f56252 100644 --- a/src/api/hr/people/index.ts +++ b/src/api/hr/people/index.ts @@ -379,7 +379,7 @@ import { data: data }); } -<<<<<<< HEAD + /** * 根据行政组织ID获取当前行政组织人员及子行政组织 @@ -404,21 +404,19 @@ export function searchOrgUser(data: any) { /** * 获取角色列表 */ - export function gainAllRole(data: any) { - return request({ - url: '/systemapi/public/gainAllRole', -======= +// export function gainAllRole(data: any) { +// return request({ +// url: '/systemapi/public/gainAllRole', + //获取性格色彩 export function getCharacterColor(data?: contNumber):any { return request({ url: '/hrapi/staff/getPeopleColor', ->>>>>>> yjf_v3 method: 'post', data: data }); } -<<<<<<< HEAD /** * 设置可见范围 */ @@ -460,7 +458,7 @@ export function getCharacterColor(data?: contNumber):any { data: data }); } -======= + // 获取奖惩记录 export function getRewardsAndPunishmentsCont(data?: contId) { return request({ @@ -654,4 +652,4 @@ export function editCertificatesContState(data?: delJjlxr) { data: data }) } ->>>>>>> yjf_v3 + diff --git a/src/types/components.d.ts b/src/types/components.d.ts index d1ca25c71..5545035b0 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -23,88 +23,8 @@ declare module '@vue/runtime-core' { DesignLayoutPage: typeof import('./../components/DesignForm/designLayout/designLayoutPage.vue')['default'] DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default'] DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default'] -<<<<<<< HEAD DragControlApp: typeof import('./../components/DesignForm/dragControlApp.vue')['default'] DragControlNew: typeof import('./../components/DesignForm/dragControlNew.vue')['default'] - ElAffix: typeof import('element-plus/es')['ElAffix'] - ElAlert: typeof import('element-plus/es')['ElAlert'] -======= - ElAffix: typeof import('element-plus/es')['ElAffix'] ->>>>>>> yjf_v3 - ElAside: typeof import('element-plus/es')['ElAside'] - ElAvatar: typeof import('element-plus/es')['ElAvatar'] - ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] - ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] - ElButton: typeof import('element-plus/es')['ElButton'] - ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup'] - ElCard: typeof import('element-plus/es')['ElCard'] - ElCarousel: typeof import('element-plus/es')['ElCarousel'] - ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] - ElCascader: typeof import('element-plus/es')['ElCascader'] - ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] - ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] - ElCol: typeof import('element-plus/es')['ElCol'] - ElCollapse: typeof import('element-plus/es')['ElCollapse'] - ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] - ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] - ElContainer: typeof import('element-plus/es')['ElContainer'] - ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] - ElDescriptions: typeof import('element-plus/es')['ElDescriptions'] - ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem'] - ElDialog: typeof import('element-plus/es')['ElDialog'] - ElDivider: typeof import('element-plus/es')['ElDivider'] - ElDrawer: typeof import('element-plus/es')['ElDrawer'] - ElDropdown: typeof import('element-plus/es')['ElDropdown'] - ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] - ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] - ElEmpty: typeof import('element-plus/es')['ElEmpty'] - ElForm: typeof import('element-plus/es')['ElForm'] - ElFormItem: typeof import('element-plus/es')['ElFormItem'] - ElHeader: typeof import('element-plus/es')['ElHeader'] - ElIcon: typeof import('element-plus/es')['ElIcon'] - ElImage: typeof import('element-plus/es')['ElImage'] - ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] - ElInput: typeof import('element-plus/es')['ElInput'] - ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] - ElLink: typeof import('element-plus/es')['ElLink'] - ElMain: typeof import('element-plus/es')['ElMain'] - ElMenu: typeof import('element-plus/es')['ElMenu'] - ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] - ElOption: typeof import('element-plus/es')['ElOption'] - ElPagination: typeof import('element-plus/es')['ElPagination'] - ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] - ElPopover: typeof import('element-plus/es')['ElPopover'] - ElProgress: typeof import('element-plus/es')['ElProgress'] - ElRadio: typeof import('element-plus/es')['ElRadio'] - ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] - ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] - ElResult: typeof import('element-plus/es')['ElResult'] - ElRow: typeof import('element-plus/es')['ElRow'] - ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] - ElSelect: typeof import('element-plus/es')['ElSelect'] - ElSlider: typeof import('element-plus/es')['ElSlider'] -<<<<<<< HEAD - ElSpace: typeof import('element-plus/es')['ElSpace'] -======= ->>>>>>> yjf_v3 - ElStep: typeof import('element-plus/es')['ElStep'] - ElSteps: typeof import('element-plus/es')['ElSteps'] - ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] - ElSwitch: typeof import('element-plus/es')['ElSwitch'] - ElTable: typeof import('element-plus/es')['ElTable'] - ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] - ElTabPane: typeof import('element-plus/es')['ElTabPane'] - ElTabs: typeof import('element-plus/es')['ElTabs'] - ElTag: typeof import('element-plus/es')['ElTag'] - ElText: typeof import('element-plus/es')['ElText'] - ElTimeline: typeof import('element-plus/es')['ElTimeline'] - ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] - ElTimePicker: typeof import('element-plus/es')['ElTimePicker'] - ElTooltip: typeof import('element-plus/es')['ElTooltip'] - ElTransfer: typeof import('element-plus/es')['ElTransfer'] - ElTree: typeof import('element-plus/es')['ElTree'] - ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] - ElUpload: typeof import('element-plus/es')['ElUpload'] EmployeesDialog: typeof import('./../components/workflow/dialog/employeesDialog.vue')['default'] EmployeesRoleDialog: typeof import('./../components/workflow/dialog/employeesRoleDialog.vue')['default'] ErrorDialog: typeof import('./../components/workflow/dialog/errorDialog.vue')['default'] @@ -130,31 +50,6 @@ declare module '@vue/runtime-core' { HeadToolsApp: typeof import('./../components/DesignForm/public/headToolsApp.vue')['default'] HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default'] IconSelect: typeof import('./../components/IconSelect/index.vue')['default'] - IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default'] - IEpClose: typeof import('~icons/ep/close')['default'] - IEpDelete: typeof import('~icons/ep/delete')['default'] - IEpDownload: typeof import('~icons/ep/download')['default'] - IEpEdit: typeof import('~icons/ep/edit')['default'] - IEpMessageBox: typeof import('~icons/ep/message-box')['default'] -<<<<<<< HEAD - IEpMinus: typeof import('~icons/ep/minus')['default'] -======= ->>>>>>> yjf_v3 - IEpOperation: typeof import('~icons/ep/operation')['default'] - IEpPicture: typeof import('~icons/ep/picture')['default'] - IEpPlus: typeof import('~icons/ep/plus')['default'] - IEpPosition: typeof import('~icons/ep/position')['default'] - IEpRefresh: typeof import('~icons/ep/refresh')['default'] - IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default'] - IEpSearch: typeof import('~icons/ep/search')['default'] - IEpSetting: typeof import('~icons/ep/setting')['default'] -<<<<<<< HEAD - IEpTop: typeof import('~icons/ep/top')['default'] - IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default'] - IEpUser: typeof import('~icons/ep/user')['default'] -======= ->>>>>>> yjf_v3 - IEpView: typeof import('~icons/ep/view')['default'] LangSelect: typeof import('./../components/LangSelect/index.vue')['default'] LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default'] List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default'] @@ -193,7 +88,4 @@ declare module '@vue/runtime-core' { WangEditor: typeof import('./../components/WangEditor/index.vue')['default'] Yuanjao: typeof import('./../components/DesignForm/designLayout/yuanjao.vue')['default'] } - export interface ComponentCustomProperties { - vLoading: typeof import('element-plus/es')['ElLoadingDirective'] - } } diff --git a/src/views/hr/archives/basicinformation/appraisalrecord.vue b/src/views/hr/archives/basicinformation/appraisalrecord.vue index 8d445156c..829f554a3 100644 --- a/src/views/hr/archives/basicinformation/appraisalrecord.vue +++ b/src/views/hr/archives/basicinformation/appraisalrecord.vue @@ -1,19 +1,4 @@ - - - -======= @ 作者: 袁纪菲 @ 时间: 2024-4-22 @ 备注: 考评记录 @@ -151,4 +136,4 @@ const delkpjlBox = (cont: kaopingjilu) => { ->>>>>>> yjf_v3 +