Skip to content

I
iBiz商业中心
提交 052221cf 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

xignzi006 发布系统代码 [Spring Boot，员工]

上级 9aa306d8
隐藏空白字符变更
内嵌 并排
正在显示 包含 229 行增加 和 127 行删除
app_HR/public/assets/json/view-config.json
浏览文件 @ 052221cf
......@@ -720,7 +720,7 @@
"memo": "系统自动添加"
},
"hr_contractgridview": {
"title": "Contract表格视图",
"title": "合同表格视图",
"caption": "合同",
"viewtype": "DEGRIDVIEW",
"viewmodule": "odoo_hr",
......
app_HR/src/locale/lanres/entities/hr-contract/hr-contract_en_US.ts
浏览文件 @ 052221cf
......@@ -66,7 +66,7 @@ export default {
},
gridview: {
caption: "合同",
title: "Contract表格视图",
title: "合同表格视图",
},
basiceditview: {
caption: "合同",
......
app_HR/src/locale/lanres/entities/hr-contract/hr-contract_zh_CN.ts
浏览文件 @ 052221cf
......@@ -66,7 +66,7 @@ export default {
},
gridview: {
caption: "合同",
title: "Contract表格视图",
title: "合同表格视图",
},
basiceditview: {
caption: "合同",
......
app_HR/src/locale/lanres/entities/hr-employee/hr-employee_en_US.ts
浏览文件 @ 052221cf
......@@ -161,58 +161,13 @@ export default {
title: "快速新建",
},
},
ef_master_form: {
details: {
group1: "基本信息",
formpage1: "基本信息",
srfupdatedate: "最后更新时间",
srforikey: "",
srfkey: "ID",
srfmajortext: "名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
id: "ID",
},
uiactions: {
},
},
ef_masterquick_form: {
details: {
group1: "基本信息",
formpage1: "基本信息",
srfupdatedate: "最后更新时间",
srforikey: "",
srfkey: "ID",
srfmajortext: "名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
name: "名称",
job_id: "工作岗位",
job_id_text: "工作岗位",
mobile_phone: "办公手机",
work_phone: "办公电话",
work_email: "工作EMail",
work_location: "工作地点",
company_id: "公司",
company_id_text: "公司",
department_id: "部门",
department_id_text: "部门",
parent_id: "经理",
parent_id_text: "经理",
id: "ID",
resource_id: "资源",
},
uiactions: {
},
},
personalinfo_form: {
if_master_form: {
details: {
grouppanel10: "分组面板",
group1: "基本信息",
druipart1: "",
grouppanel12: "简历",
grouppanel16: "技能",
grouppanel8: "分组面板",
grouppanel1: "位置",
grouppanel2: "负责人",
grouppanel13: "工作信息",
......@@ -244,9 +199,9 @@ export default {
department_id_text: "部门",
job_id_text: "工作岗位",
parent_id_text: "经理",
job_id: "工作岗位",
company_id: "公司",
department_id: "部门",
job_id: "工作岗位",
parent_id: "经理",
address_id: "工作地址",
address_id_text: "工作地址",
......@@ -284,13 +239,58 @@ export default {
uiactions: {
},
},
if_master_form: {
ef_master_form: {
details: {
group1: "基本信息",
formpage1: "基本信息",
srfupdatedate: "最后更新时间",
srforikey: "",
srfkey: "ID",
srfmajortext: "名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
id: "ID",
},
uiactions: {
},
},
ef_masterquick_form: {
details: {
group1: "基本信息",
formpage1: "基本信息",
srfupdatedate: "最后更新时间",
srforikey: "",
srfkey: "ID",
srfmajortext: "名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
name: "名称",
job_id: "工作岗位",
job_id_text: "工作岗位",
mobile_phone: "办公手机",
work_phone: "办公电话",
work_email: "工作EMail",
work_location: "工作地点",
company_id: "公司",
company_id_text: "公司",
department_id: "部门",
department_id_text: "部门",
parent_id: "经理",
parent_id_text: "经理",
id: "ID",
resource_id: "资源",
},
uiactions: {
},
},
personalinfo_form: {
details: {
grouppanel10: "分组面板",
druipart1: "",
grouppanel12: "简历",
grouppanel16: "技能",
grouppanel8: "分组面板",
group1: "基本信息",
grouppanel1: "位置",
grouppanel2: "负责人",
grouppanel13: "工作信息",
......@@ -322,9 +322,9 @@ export default {
department_id_text: "部门",
job_id_text: "工作岗位",
parent_id_text: "经理",
job_id: "工作岗位",
company_id: "公司",
department_id: "部门",
job_id: "工作岗位",
parent_id: "经理",
address_id: "工作地址",
address_id_text: "工作地址",
......
app_HR/src/locale/lanres/entities/hr-employee/hr-employee_zh_CN.ts
浏览文件 @ 052221cf
......@@ -161,58 +161,13 @@ export default {
title: "快速新建",
},
},
ef_master_form: {
details: {
group1: "基本信息",
formpage1: "基本信息",
srfupdatedate: "最后更新时间",
srforikey: "",
srfkey: "ID",
srfmajortext: "名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
id: "ID",
},
uiactions: {
},
},
ef_masterquick_form: {
details: {
group1: "基本信息",
formpage1: "基本信息",
srfupdatedate: "最后更新时间",
srforikey: "",
srfkey: "ID",
srfmajortext: "名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
name: "名称",
job_id: "工作岗位",
job_id_text: "工作岗位",
mobile_phone: "办公手机",
work_phone: "办公电话",
work_email: "工作EMail",
work_location: "工作地点",
company_id: "公司",
company_id_text: "公司",
department_id: "部门",
department_id_text: "部门",
parent_id: "经理",
parent_id_text: "经理",
id: "ID",
resource_id: "资源",
},
uiactions: {
},
},
personalinfo_form: {
if_master_form: {
details: {
grouppanel10: "分组面板",
group1: "基本信息",
druipart1: "",
grouppanel12: "简历",
grouppanel16: "技能",
grouppanel8: "分组面板",
grouppanel1: "位置",
grouppanel2: "负责人",
grouppanel13: "工作信息",
......@@ -244,9 +199,9 @@ export default {
department_id_text: "部门",
job_id_text: "工作岗位",
parent_id_text: "经理",
job_id: "工作岗位",
company_id: "公司",
department_id: "部门",
job_id: "工作岗位",
parent_id: "经理",
address_id: "工作地址",
address_id_text: "工作地址",
......@@ -284,13 +239,58 @@ export default {
uiactions: {
},
},
if_master_form: {
ef_master_form: {
details: {
group1: "基本信息",
formpage1: "基本信息",
srfupdatedate: "最后更新时间",
srforikey: "",
srfkey: "ID",
srfmajortext: "名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
id: "ID",
},
uiactions: {
},
},
ef_masterquick_form: {
details: {
group1: "基本信息",
formpage1: "基本信息",
srfupdatedate: "最后更新时间",
srforikey: "",
srfkey: "ID",
srfmajortext: "名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
name: "名称",
job_id: "工作岗位",
job_id_text: "工作岗位",
mobile_phone: "办公手机",
work_phone: "办公电话",
work_email: "工作EMail",
work_location: "工作地点",
company_id: "公司",
company_id_text: "公司",
department_id: "部门",
department_id_text: "部门",
parent_id: "经理",
parent_id_text: "经理",
id: "ID",
resource_id: "资源",
},
uiactions: {
},
},
personalinfo_form: {
details: {
grouppanel10: "分组面板",
druipart1: "",
grouppanel12: "简历",
grouppanel16: "技能",
grouppanel8: "分组面板",
group1: "基本信息",
grouppanel1: "位置",
grouppanel2: "负责人",
grouppanel13: "工作信息",
......@@ -322,9 +322,9 @@ export default {
department_id_text: "部门",
job_id_text: "工作岗位",
parent_id_text: "经理",
job_id: "工作岗位",
company_id: "公司",
department_id: "部门",
job_id: "工作岗位",
parent_id: "经理",
address_id: "工作地址",
address_id_text: "工作地址",
......
app_HR/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 052221cf
......@@ -584,7 +584,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag": "c81bf4a79286794aba838b3e058622de"
},
"hr_contractgridview": {
"title": "Contract表格视图",
"title": "合同表格视图",
"caption": "合同",
"viewtype": "DEGRIDVIEW",
"viewmodule": "odoo_hr",
......
app_HR/src/pages/odoo-hr/hr-contract-grid-view/hr-contract-grid-view-base.tsx
浏览文件 @ 052221cf
......@@ -10,7 +10,7 @@ import CodeListService from "@service/app/codelist-service";
/**
* Contract表格视图视图基类
* 合同表格视图视图基类
*
* @export
* @class Hr_contractGridViewBase
......
app_HR/src/pages/odoo-hr/hr-contract-grid-view/hr-contract-grid-view.html
浏览文件 @ 052221cf
<studio-view-style2 viewName="hr_contractgridview" viewTitle="Contract表格视图" class='degridview hr-contract-grid-view'>
<template slot='title'>
<span class='caption-info'>{{viewCaption}}</span>
</template>
<studio-view-style2 viewName="hr_contractgridview" viewTitle="合同表格视图" class='degridview hr-contract-grid-view'>
<i-input slot='quickSearch' clearable v-show="!isExpandSearchForm" v-model="query" placeholder="合同参考" search @on-search="onSearch($event)"/>
<template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>
......
app_HR/src/pages/odoo-hr/hr-contract-grid-view/hr-contract-grid-view.vue
浏览文件 @ 052221cf
......@@ -7,7 +7,7 @@ import view_grid from '@widgets/hr-contract/main-grid/main-grid.vue';
import view_searchform from '@widgets/hr-contract/default-searchform/default-searchform.vue';
/**
* Contract表格视图视图
* 合同表格视图视图
*
* @export
* @class Hr_contractGridView
......
app_HR/src/pages/odoo-hr/hrindex-view/page-register.ts
浏览文件 @ 052221cf
export const PageComponents = {
install(Vue: any, opt: any) {
Vue.component('hr-department-pickup-view', () => import('@pages/odoo-hr/hr-department-pickup-view/hr-department-pickup-view.vue'));
Vue.component('hr-resume-line-line', () => import('@pages/odoo-hr/hr-resume-line-line/hr-resume-line-line.vue'));
Vue.component('hr-department-pickup-view', () => import('@pages/odoo-hr/hr-department-pickup-view/hr-department-pickup-view.vue'));
Vue.component('maintenance-equipment-edit-view', () => import('@pages/odoo-maintenance/maintenance-equipment-edit-view/maintenance-equipment-edit-view.vue'));
Vue.component('hr-contract-basic-edit-view', () => import('@pages/odoo-hr/hr-contract-basic-edit-view/hr-contract-basic-edit-view.vue'));
Vue.component('mail-message-main-view', () => import('@pages/odoo-mail/mail-message-main-view/mail-message-main-view.vue'));
......@@ -15,6 +16,7 @@ export const PageComponents = {
Vue.component('hr-contract-basic-quick-view', () => import('@pages/odoo-hr/hr-contract-basic-quick-view/hr-contract-basic-quick-view.vue'));
Vue.component('hr-resume-line-type-edit-view', () => import('@pages/odoo-hr/hr-resume-line-type-edit-view/hr-resume-line-type-edit-view.vue'));
Vue.component('mail-activity-by-res-list-view', () => import('@pages/odoo-mail/mail-activity-by-res-list-view/mail-activity-by-res-list-view.vue'));
Vue.component('hr-employee-master-info-view', () => import('@pages/odoo-hr/hr-employee-master-info-view/hr-employee-master-info-view.vue'));
Vue.component('hr-job-master-info-view', () => import('@pages/odoo-hr/hr-job-master-info-view/hr-job-master-info-view.vue'));
Vue.component('hr-employee-pickup-view', () => import('@pages/odoo-hr/hr-employee-pickup-view/hr-employee-pickup-view.vue'));
Vue.component('res-partner-pickup-grid-view', () => import('@pages/odoo-base/res-partner-pickup-grid-view/res-partner-pickup-grid-view.vue'));
......@@ -45,6 +47,7 @@ export const PageComponents = {
Vue.component('hr-contract-grid-view', () => import('@pages/odoo-hr/hr-contract-grid-view/hr-contract-grid-view.vue'));
Vue.component('resource-resource-pickup-view', () => import('@pages/odoo-resource/resource-resource-pickup-view/resource-resource-pickup-view.vue'));
Vue.component('ir-attachment-by-res-data-view', () => import('@pages/odoo-ir/ir-attachment-by-res-data-view/ir-attachment-by-res-data-view.vue'));
Vue.component('hr-resume-line-edit-view', () => import('@pages/odoo-hr/hr-resume-line-edit-view/hr-resume-line-edit-view.vue'));
Vue.component('resource-resource-pickup-grid-view', () => import('@pages/odoo-resource/resource-resource-pickup-grid-view/resource-resource-pickup-grid-view.vue'));
Vue.component('survey-survey-pickup-view', () => import('@pages/odoo-survey/survey-survey-pickup-view/survey-survey-pickup-view.vue'));
Vue.component('hr-department-master-quick-view', () => import('@pages/odoo-hr/hr-department-master-quick-view/hr-department-master-quick-view.vue'));
......
app_HR/src/pages/odoo-hr/hrindex-view/router.ts
浏览文件 @ 052221cf
......@@ -45,6 +45,35 @@ const router = new Router({
},
component: () => import('@pages/odoo-hr/hrindex-view/hrindex-view.vue'),
children: [
{
path: 'hr_employees/:hr_employee?/hr_resume_lines/:hr_resume_line?/line/:line?',
meta: {
caption: 'entities.hr_resume_line.views.line.caption',
info:'',
parameters: [
{ pathName: 'hrindexview', parameterName: 'hrindexview' },
{ pathName: 'hr_employees', parameterName: 'hr_employee' },
{ pathName: 'hr_resume_lines', parameterName: 'hr_resume_line' },
{ pathName: 'line', parameterName: 'line' },
],
requireAuth: true,
},
component: () => import('@pages/odoo-hr/hr-resume-line-line/hr-resume-line-line.vue'),
},
{
path: 'hr_resume_lines/:hr_resume_line?/line/:line?',
meta: {
caption: 'entities.hr_resume_line.views.line.caption',
info:'',
parameters: [
{ pathName: 'hrindexview', parameterName: 'hrindexview' },
{ pathName: 'hr_resume_lines', parameterName: 'hr_resume_line' },
{ pathName: 'line', parameterName: 'line' },
],
requireAuth: true,
},
component: () => import('@pages/odoo-hr/hr-resume-line-line/hr-resume-line-line.vue'),
},
{
path: 'hr_departments/:hr_department?/pickupview/:pickupview?',
meta: {
......@@ -345,6 +374,20 @@ const router = new Router({
},
component: () => import('@pages/odoo-mail/mail-activity-by-res-list-view/mail-activity-by-res-list-view.vue'),
},
{
path: 'hr_employees/:hr_employee?/masterinfoview/:masterinfoview?',
meta: {
caption: 'entities.hr_employee.views.masterinfoview.caption',
info:'',
parameters: [
{ pathName: 'hrindexview', parameterName: 'hrindexview' },
{ pathName: 'hr_employees', parameterName: 'hr_employee' },
{ pathName: 'masterinfoview', parameterName: 'masterinfoview' },
],
requireAuth: true,
},
component: () => import('@pages/odoo-hr/hr-employee-master-info-view/hr-employee-master-info-view.vue'),
},
{
path: 'hr_jobs/:hr_job?/masterinfoview/:masterinfoview?',
meta: {
......@@ -840,6 +883,35 @@ const router = new Router({
},
component: () => import('@pages/odoo-ir/ir-attachment-by-res-data-view/ir-attachment-by-res-data-view.vue'),
},
{
path: 'hr_employees/:hr_employee?/hr_resume_lines/:hr_resume_line?/editview/:editview?',
meta: {
caption: 'entities.hr_resume_line.views.editview.caption',
info:'',
parameters: [
{ pathName: 'hrindexview', parameterName: 'hrindexview' },
{ pathName: 'hr_employees', parameterName: 'hr_employee' },
{ pathName: 'hr_resume_lines', parameterName: 'hr_resume_line' },
{ pathName: 'editview', parameterName: 'editview' },
],
requireAuth: true,
},
component: () => import('@pages/odoo-hr/hr-resume-line-edit-view/hr-resume-line-edit-view.vue'),
},
{
path: 'hr_resume_lines/:hr_resume_line?/editview/:editview?',
meta: {
caption: 'entities.hr_resume_line.views.editview.caption',
info:'',
parameters: [
{ pathName: 'hrindexview', parameterName: 'hrindexview' },
{ pathName: 'hr_resume_lines', parameterName: 'hr_resume_line' },
{ pathName: 'editview', parameterName: 'editview' },
],
requireAuth: true,
},
component: () => import('@pages/odoo-hr/hr-resume-line-edit-view/hr-resume-line-edit-view.vue'),
},
{
path: 'resource_resources/:resource_resource?/pickupgridview/:pickupgridview?',
meta: {
......
app_HR/src/store/modules/view-action/state.ts
浏览文件 @ 052221cf
......@@ -189,6 +189,7 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'f3651c83b6944418c948f91616a23eb9',
'b0816566792fd556e775203e4dfa964b',
],
},
......@@ -321,6 +322,16 @@ export const viewstate: any = {
'e62157d555e4d41070c10edf4b8843d4',
],
},
{
viewtag: '6f8e0737003d72cf20baef50ee849c73',
viewmodule: 'odoo_hr',
viewname: 'hr_resume_lineLine',
viewaction: '',
viewdatachange: false,
refviews: [
'a09d5ebab0b5cec0ed2117814b6e34dc',
],
},
{
viewtag: '765a695b889be2aa0520261276422fb9',
viewmodule: 'odoo_hr',
......@@ -429,6 +440,15 @@ export const viewstate: any = {
'40d3ef7b5f091b9a38d760e4f7e6fd88',
],
},
{
viewtag: 'a09d5ebab0b5cec0ed2117814b6e34dc',
viewmodule: 'odoo_hr',
viewname: 'hr_resume_lineEditView',
viewaction: '',
viewdatachange: false,
refviews: [
],
},
{
viewtag: 'a149ddfe684227db8e5a34d8516ac6c2',
viewmodule: 'odoo_hr',
......@@ -631,6 +651,16 @@ export const viewstate: any = {
refviews: [
],
},
{
viewtag: 'f3651c83b6944418c948f91616a23eb9',
viewmodule: 'odoo_hr',
viewname: 'hr_employeeMasterInfoView',
viewaction: '',
viewdatachange: false,
refviews: [
'6f8e0737003d72cf20baef50ee849c73',
],
},
{
viewtag: 'f4d97651e0ab8e42ede8190daba9658a',
viewmodule: 'odoo_hr',
......
app_HR/src/widgets/hr-employee/master-summary-portlet/master-summary-portlet-base.tsx
浏览文件 @ 052221cf
......@@ -225,7 +225,7 @@ export class MasterSummaryPortletBase extends MainControlBase {
* @memberof MasterSummaryBase
*/
public refresh(args?: any) {
this.viewState.next({ tag: 'hr_employeeMasterSummaryView', action: 'refresh', data: args });
this.viewState.next({ tag: 'hr_employeeMasterInfoView', action: 'refresh', data: args });
}
}
app_HR/src/widgets/hr-employee/master-summary-portlet/master-summary-portlet.html
浏览文件 @ 052221cf
<div class='portlet master-summary ' :style="{}">
<div class="portlet-without-title">
<hr-employee-master-summary-view :portletState="viewState" :viewUsage="4" :viewdata="JSON.stringify(context)" :viewDefaultUsage="false" ></hr-employee-master-summary-view>
<hr-employee-master-info-view :portletState="viewState" :viewUsage="4" :viewdata="JSON.stringify(context)" :viewDefaultUsage="false" ></hr-employee-master-info-view>
</div>
</div>
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或