Skip to content

I
iBiz人力资源
提交 f95e9f55 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

jackwang 部署微服务应用

上级 3c562804
隐藏空白字符变更
内嵌 并排
正在显示 包含 113 行增加 和 102 行删除
app_PIM/src/locale/lanres/entities/hrcontract/hrcontract_en_US.ts
浏览文件 @ f95e9f55
......@@ -176,6 +176,40 @@ export default {
uiactions: {
},
},
v_001toolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: "Save",
......@@ -222,40 +256,6 @@ export default {
tip: "Help",
},
},
v_001toolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "New",
......
app_PIM/src/locale/lanres/entities/hrcontract/hrcontract_zh_CN.ts
浏览文件 @ f95e9f55
......@@ -175,6 +175,40 @@ export default {
uiactions: {
},
},
v_001toolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: "保存",
......@@ -221,40 +255,6 @@ export default {
tip: "帮助",
},
},
v_001toolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "新建",
......
app_PIM/src/pages/ungroup/pim/page-register.ts
浏览文件 @ f95e9f55
......@@ -15,8 +15,8 @@ export const PageComponents = {
Vue.component('hremployee-pickup-grid-view', () => import('@pages/human-resource/hremployee-pickup-grid-view/hremployee-pickup-grid-view.vue'));
Vue.component('hrcontract-grid-view', () => import('@pages/human-resource/hrcontract-grid-view/hrcontract-grid-view.vue'));
Vue.component('hromhierarchy-tree-exp-view', () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view.vue'));
Vue.component('hrlegal-grid-view', () => import('@pages/base/hrlegal-grid-view/hrlegal-grid-view.vue'));
Vue.component('hrpost-v-006', () => import('@pages/human-resource/hrpost-v-006/hrpost-v-006.vue'));
Vue.component('hrlegal-grid-view', () => import('@pages/base/hrlegal-grid-view/hrlegal-grid-view.vue'));
Vue.component('hrlegal-v-002', () => import('@pages/base/hrlegal-v-002/hrlegal-v-002.vue'));
Vue.component('hrcontract-tab-exp-view', () => import('@pages/human-resource/hrcontract-tab-exp-view/hrcontract-tab-exp-view.vue'));
Vue.component('hremployee-v-003', () => import('@pages/human-resource/hremployee-v-003/hremployee-v-003.vue'));
......
app_PIM/src/pages/ungroup/pim/router.ts
浏览文件 @ f95e9f55
......@@ -374,32 +374,32 @@ const router = new Router({
component: () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view.vue'),
},
{
path: 'hrlegals/:hrlegal?/gridview/:gridview?',
path: 'hrposts/:hrpost?/v_006/:v_006?',
meta: {
caption: 'entities.hrlegal.views.gridview.title',
caption: 'entities.hrpost.views.v_006.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrlegals', parameterName: 'hrlegal' },
{ pathName: 'gridview', parameterName: 'gridview' },
{ pathName: 'hrposts', parameterName: 'hrpost' },
{ pathName: 'v_006', parameterName: 'v_006' },
],
requireAuth: true,
},
component: () => import('@pages/base/hrlegal-grid-view/hrlegal-grid-view.vue'),
component: () => import('@pages/human-resource/hrpost-v-006/hrpost-v-006.vue'),
},
{
path: 'hrposts/:hrpost?/v_006/:v_006?',
path: 'hrlegals/:hrlegal?/gridview/:gridview?',
meta: {
caption: 'entities.hrpost.views.v_006.title',
caption: 'entities.hrlegal.views.gridview.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrposts', parameterName: 'hrpost' },
{ pathName: 'v_006', parameterName: 'v_006' },
{ pathName: 'hrlegals', parameterName: 'hrlegal' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
requireAuth: true,
},
component: () => import('@pages/human-resource/hrpost-v-006/hrpost-v-006.vue'),
component: () => import('@pages/base/hrlegal-grid-view/hrlegal-grid-view.vue'),
},
{
path: 'hrlegals/:hrlegal?/v_002/:v_002?',
......
app_PIM/src/store/modules/view-action/state.ts
浏览文件 @ f95e9f55
......@@ -11,7 +11,7 @@ export const viewstate: any = {
viewdatachange: false,
refviews: [
'ba512ad6a392dc170b1959cebd038fb8',
'a03a955d89ac96b26f80ca2caf2cc023',
'b748e4bd87b9d77bfc24835a2e5e96c9',
'1fda62030d6149cb5ee6f088bc4f0aa7',
],
},
......
app_PIM/src/uiservice/hremployee/hremployee-ui-service-base.ts
浏览文件 @ f95e9f55
......@@ -165,14 +165,25 @@ export default class HREmployeeUIServiceBase extends UIService {
}
const parameters: any[] = [
{ pathName: 'hrcontracts', parameterName: 'hrcontract' },
{ pathName: 'editview', parameterName: 'editview' },
];
const openIndexViewTab = (data: any) => {
const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
actionContext.$router.push(routePath);
return null;
}
openIndexViewTab(data);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = actionContext.$appdrawer.openDrawer(view, context,data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
const _this: any = actionContext;
return result.datas;
});
}
const view: any = {
viewname: 'hrcontract-v-005',
height: 0,
width: 1024,
title: actionContext.$t('entities.hrcontract.views.v_005.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
/**
......
app_PIM/src/widgets/hrcontract/main-form/main-form-base.tsx
浏览文件 @ f95e9f55
......@@ -159,7 +159,7 @@ export class MainEditFormBase extends EditFormControlBase {
* @memberof MainEditFormBase
*/
public detailsModel: any = {
group1: new FormGroupPanelModel({ caption: '合同信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrcontract.main_form', extractMode: 'ITEM', details: [] } }),
group1: new FormGroupPanelModel({ caption: '合同信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrcontract.main_form', extractMode: 'ITEM', details: [] } }),
formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
......
app_PIM/src/widgets/hrcontract/main-form/main-form.html
浏览文件 @ f95e9f55
......@@ -3,10 +3,10 @@
<row >
<i-col class="form-layout-container" v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hrcontract.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hrcontract.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/>
<row>
<i-col class="form-layout-container" v-show="detailsModel.hremployeename.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<i-col class="form-layout-container" v-show="detailsModel.hremployeename.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='hremployeename' :itemRules="this.rules.hremployeename" class='' :caption="$t('entities.hrcontract.main_form.details.hremployeename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.hremployeename.error" :isEmptyCaption="false" labelPos="LEFT">
<app-picker
......@@ -32,7 +32,7 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.contractcode.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<i-col class="form-layout-container" v-show="detailsModel.contractcode.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='contractcode' :itemRules="this.rules.contractcode" class='' :caption="$t('entities.hrcontract.main_form.details.contractcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.contractcode.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.contractcode"
......@@ -46,7 +46,7 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.contractmode.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<i-col class="form-layout-container" v-show="detailsModel.contractmode.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='contractmode' :itemRules="this.rules.contractmode" class='' :caption="$t('entities.hrcontract.main_form.details.contractmode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.contractmode.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list
......@@ -66,7 +66,7 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.contracttype.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<i-col class="form-layout-container" v-show="detailsModel.contracttype.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='contracttype' :itemRules="this.rules.contracttype" class='' :caption="$t('entities.hrcontract.main_form.details.contracttype')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.contracttype.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list
......@@ -86,21 +86,21 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.begintime.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<i-col class="form-layout-container" v-show="detailsModel.begintime.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='begintime' :itemRules="this.rules.begintime" class='' :caption="$t('entities.hrcontract.main_form.details.begintime')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.begintime.error" :isEmptyCaption="false" labelPos="LEFT">
<date-picker type="date" :transfer="true" format="yyyy-MM-dd" placeholder="请选择时间..." :value="data.begintime" :disabled="detailsModel.begintime.disabled" style="min-width: 150px; width:100px;" @on-change="(val1, val2) => { this.data.begintime = val1 }"></date-picker>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.endtime.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<i-col class="form-layout-container" v-show="detailsModel.endtime.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='endtime' :itemRules="this.rules.endtime" class='' :caption="$t('entities.hrcontract.main_form.details.endtime')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.endtime.error" :isEmptyCaption="false" labelPos="LEFT">
<date-picker type="date" :transfer="true" format="yyyy-MM-dd" placeholder="请选择时间..." :value="data.endtime" :disabled="detailsModel.endtime.disabled" style="min-width: 150px; width:100px;" @on-change="(val1, val2) => { this.data.endtime = val1 }"></date-picker>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.mgrorganizationname.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<i-col class="form-layout-container" v-show="detailsModel.mgrorganizationname.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='mgrorganizationname' :itemRules="this.rules.mgrorganizationname" class='' :caption="$t('entities.hrcontract.main_form.details.mgrorganizationname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.mgrorganizationname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-picker
......@@ -126,7 +126,7 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.signorganizationname.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<i-col class="form-layout-container" v-show="detailsModel.signorganizationname.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='signorganizationname' :itemRules="this.rules.signorganizationname" class='' :caption="$t('entities.hrcontract.main_form.details.signorganizationname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.signorganizationname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-picker
......@@ -152,7 +152,7 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.contractsigntype.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<i-col class="form-layout-container" v-show="detailsModel.contractsigntype.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='contractsigntype' :itemRules="this.rules.contractsigntype" class='' :caption="$t('entities.hrcontract.main_form.details.contractsigntype')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.contractsigntype.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list
......@@ -172,7 +172,7 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.contractstate.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<i-col class="form-layout-container" v-show="detailsModel.contractstate.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='contractstate' :itemRules="this.rules.contractstate" class='' :caption="$t('entities.hrcontract.main_form.details.contractstate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.contractstate.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list
......@@ -192,14 +192,14 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.probationtime.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<i-col class="form-layout-container" v-show="detailsModel.probationtime.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='probationtime' :itemRules="this.rules.probationtime" class='' :caption="$t('entities.hrcontract.main_form.details.probationtime')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.probationtime.error" :isEmptyCaption="false" labelPos="LEFT">
<date-picker type="date" :transfer="true" format="yyyy-MM-dd" placeholder="请选择时间..." :value="data.probationtime" :disabled="detailsModel.probationtime.disabled" style="min-width: 150px; width:100px;" @on-change="(val1, val2) => { this.data.probationtime = val1 }"></date-picker>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.attachment.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<i-col class="form-layout-container" v-show="detailsModel.attachment.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='attachment' :itemRules="this.rules.attachment" class='' :caption="$t('entities.hrcontract.main_form.details.attachment')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.attachment.error" :isEmptyCaption="false" labelPos="LEFT">
<app-file-upload :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange($event)" :data="JSON.stringify(this.data)" name='attachment' :value="data.attachment" :disabled="detailsModel.attachment.disabled" :uploadparams='{}' :exportparams='{}' style="overflow: auto;"></app-file-upload>
</app-form-item>
......
app_PIM/src/widgets/hrcontract/wait-sign-grid/wait-sign-grid.html
浏览文件 @ f95e9f55
......@@ -126,7 +126,7 @@
</el-table-column>
</template>
<template v-if="getColumnState('uagridcolumn1')">
<el-table-column :column-key="'uagridcolumn1'" :label="$t('entities.hrcontract.waitsign_grid.columns.uagridcolumn1')" :width="100" :align="'center'">
<el-table-column :column-key="'uagridcolumn1'" :label="$t('entities.hrcontract.waitsign_grid.columns.uagridcolumn1')" :width="150" :align="'center'">
<template v-slot:header="{column}">
<span class="column-header ">
<i class='fa fa-pencil'></i>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或