Skip to content

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

JunZai 发布系统代码

上级 ab819677
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 2261 行增加 和 182 行删除
app_PIM/public/assets/json/view-config.json
浏览文件 @ f54864c8
......@@ -109,6 +109,16 @@
"viewtag": "0b5f255d6581dcb130acf242a14cab06",
"memo": ""
},
"hrarchivesv_001": {
"title": "档案",
"caption": "档案信息",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HRArchivesV_001",
"viewfilename": "hrarchives-v-001",
"viewtag": "0b80553da51b3d2dbf107cf369e503a4",
"memo": "系统自动添加"
},
"hrrewardgridview": {
"title": "奖励惩罚表格视图",
"caption": "奖励惩罚",
......@@ -1110,7 +1120,7 @@
"memo": "系统自动添加"
},
"hrarchivesgridview": {
"title": "档案信息表格视图",
"title": "档案",
"caption": "档案信息",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
......
app_PIM/src/locale/lanres/entities/hrarchives/hrarchives_en_US.ts
浏览文件 @ f54864c8
......@@ -29,21 +29,23 @@ export default {
hrorganizationname: "档案管理单位",
},
views: {
v_001: {
caption: "档案信息",
title: "档案",
},
editview: {
caption: "档案信息",
title: "档案信息编辑视图",
},
gridview: {
caption: "档案信息",
title: "档案信息表格视图",
title: "档案",
},
},
main_form: {
details: {
group1: "档案信息基本信息",
group1: "档案信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "档案信息标识",
......@@ -53,18 +55,35 @@ export default {
srfdeid: "",
srfsourcekey: "",
hrarchivesname: "档案信息名称",
createman: "建立人",
createdate: "建立时间",
updateman: "更新人",
updatedate: "更新时间",
hrarchivesid: "档案信息标识",
},
uiactions: {
},
},
grid_001_grid: {
columns: {
archivescode: "档案编号",
hrorganizationname: "档案管理单位",
archivesplace: "档案保管地",
archivesroom: "档案室",
activeflag: "是否有效",
borrowstate: "档案借阅状态",
},
uiactions: {
},
},
main_grid: {
columns: {
archivescode: "档案编号",
hrorganizationname: "档案管理单位",
archivesplace: "档案保管地",
archivesroom: "档案室",
activeflag: "是否有效",
employeecode: "员工编号",
hremployeename: "员工姓名",
empstate: "员工状态",
organizationname: "单位",
borrowstate: "档案借阅状态",
},
uiactions: {
},
......@@ -76,7 +95,7 @@ export default {
uiactions: {
},
},
gridviewtoolbar_toolbar: {
v_001toolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
......@@ -156,4 +175,38 @@ export default {
tip: "Help",
},
},
gridviewtoolbar_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",
},
},
};
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrarchives/hrarchives_zh_CN.ts
浏览文件 @ f54864c8
......@@ -28,21 +28,23 @@ export default {
hrorganizationname: "档案管理单位",
},
views: {
v_001: {
caption: "档案信息",
title: "档案",
},
editview: {
caption: "档案信息",
title: "档案信息编辑视图",
},
gridview: {
caption: "档案信息",
title: "档案信息表格视图",
title: "档案",
},
},
main_form: {
details: {
group1: "档案信息基本信息",
group1: "档案信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "档案信息标识",
......@@ -52,18 +54,35 @@ export default {
srfdeid: "",
srfsourcekey: "",
hrarchivesname: "档案信息名称",
createman: "建立人",
createdate: "建立时间",
updateman: "更新人",
updatedate: "更新时间",
hrarchivesid: "档案信息标识",
},
uiactions: {
},
},
grid_001_grid: {
columns: {
archivescode: "档案编号",
hrorganizationname: "档案管理单位",
archivesplace: "档案保管地",
archivesroom: "档案室",
activeflag: "是否有效",
borrowstate: "档案借阅状态",
},
uiactions: {
},
},
main_grid: {
columns: {
archivescode: "档案编号",
hrorganizationname: "档案管理单位",
archivesplace: "档案保管地",
archivesroom: "档案室",
activeflag: "是否有效",
employeecode: "员工编号",
hremployeename: "员工姓名",
empstate: "员工状态",
organizationname: "单位",
borrowstate: "档案借阅状态",
},
uiactions: {
},
......@@ -75,7 +94,7 @@ export default {
uiactions: {
},
},
gridviewtoolbar_toolbar: {
v_001toolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
......@@ -155,4 +174,38 @@ export default {
tip: "帮助",
},
},
gridviewtoolbar_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: "过滤",
},
},
};
\ No newline at end of file
app_PIM/src/mock/viewconfig/viewconfig.ts
浏览文件 @ f54864c8
......@@ -95,6 +95,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "HRTransferApplyV_002",
"viewtag": "0b5f255d6581dcb130acf242a14cab06"
},
"hrarchivesv_001": {
"title": "档案",
"caption": "档案信息",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HRArchivesV_001",
"viewtag": "0b80553da51b3d2dbf107cf369e503a4"
},
"hrrewardgridview": {
"title": "奖励惩罚表格视图",
"caption": "奖励惩罚",
......@@ -896,7 +904,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag": "bffe15abbb6a8e5cc8b72099573611cb"
},
"hrarchivesgridview": {
"title": "档案信息表格视图",
"title": "档案",
"caption": "档案信息",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
......
app_PIM/src/pages/human-resource/hrarchives-grid-view/hrarchives-grid-view-base.tsx
浏览文件 @ f54864c8
......@@ -9,7 +9,7 @@ import CodeListService from "@service/app/codelist-service";
/**
* 档案信息表格视图视图基类
* 档案视图基类
*
* @export
* @class HRArchivesGridViewBase
......
app_PIM/src/pages/human-resource/hrarchives-grid-view/hrarchives-grid-view.html
浏览文件 @ f54864c8
<studio-view-style2 viewName="hrarchivesgridview" viewTitle="档案信息表格视图" class='degridview hrarchives-grid-view'>
<studio-view-style2 viewName="hrarchivesgridview" viewTitle="档案" class='degridview hrarchives-grid-view'>
<i-input slot="quickSearch" 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)"/> </template>
......
app_PIM/src/pages/human-resource/hrarchives-grid-view/hrarchives-grid-view.vue
浏览文件 @ f54864c8
......@@ -7,7 +7,7 @@ import view_grid from '@widgets/hrarchives/main-grid/main-grid.vue';
import view_searchform from '@widgets/hrarchives/default-searchform/default-searchform.vue';
/**
* 档案信息表格视图视图
* 档案视图
*
* @export
* @class HRArchivesGridView
......
app_PIM/src/pages/human-resource/hrarchives-v-001/hrarchives-v-001.html 0 → 100644
浏览文件 @ f54864c8
<studio-view-style2 viewName="hrarchivesv_001" viewTitle="档案" class='degridview hrarchives-v-001'>
<i-input slot="quickSearch" 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)"/> </template>
<template slot="searchForm">
<view_searchform
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:showBusyIndicator="true"
v-show="isExpandSearchForm"
loaddraftAction="FilterGetDraft"
loadAction="FilterGet"
name="searchform"
ref='searchform'
@save="searchform_save($event)"
@search="searchform_search($event)"
@load="searchform_load($event)"
@closeview="closeView($event)">
</view_searchform>
</template>
<view_grid
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
@save="onSave.apply(_self, arguments)"
updateAction=""
removeAction="Remove"
loaddraftAction=""
loadAction=""
createAction=""
fetchAction="FetchDefault"
:newdata="newdata.bind(_self)"
:opendata="opendata.bind(_self)"
name="grid"
ref='grid'
@selectionchange="grid_selectionchange($event)"
@beforeload="grid_beforeload($event)"
@rowdblclick="grid_rowdblclick($event)"
@remove="grid_remove($event)"
@load="grid_load($event)"
@closeview="closeView($event)">
</view_grid>
</studio-view-style2>
\ No newline at end of file
app_PIM/src/pages/human-resource/hrarchives-v-001/hrarchives-v-001.vue 0 → 100644
浏览文件 @ f54864c8
<template src="./hrarchives-v-001.html"/>
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { HRArchivesV_001Base } from './hrarchives-v-001-base';
import view_grid from '@widgets/hrarchives/grid-001-grid/grid-001-grid.vue';
import view_searchform from '@widgets/hrarchives/default-searchform/default-searchform.vue';
/**
* 档案视图
*
* @export
* @class HRArchivesV_001
* @extends {HRArchivesV_001Base}
*/
@Component({
components: {
view_grid,
view_searchform,
}
})
@VueLifeCycleProcessing()
export default class HRArchivesV_001 extends HRArchivesV_001Base { }
</script>
app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view-base.tsx
浏览文件 @ f54864c8
......@@ -1076,7 +1076,7 @@ export class HRTransferApplyWFDynaExpGridViewBase extends ViewBase {
* @type {any}
* @memberof HRTransferApplyWFDynaExpGridViewBase
*/
public isSingleSelect:boolean = true;
public isGridSingleSelect:boolean = true;
/**
* 左侧树的默认配置
......
app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view.html
浏览文件 @ f54864c8
<div class="view-container dewfdynaexpgridview hrtransfer-apply-wfdyna-exp-grid-view">
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="hrtransferapplywfdynaexpgridview"></app-studioaction>
<card class='view-card ' :disHover="true" :padding="0" :bordered="false">
<template slot='title'>
<span class='caption-info'>{{viewCaption}}</span>
</template>
......@@ -53,4 +50,79 @@
</div>
</split>
</card>
</div>
\ No newline at end of file
</div> -->
<studio-view-style2 viewName="hrtransferapplywfdynaexpgridview" viewTitle="调动申请工作流导航表格视图" class='dewfdynaexpgridview hrtransfer-apply-wfdyna-exp-grid-view'>
<template slot='title'>
<span class='caption-info'>{{viewCaption}}</span>
</template>
<i-input slot="quickSearch" 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)"/> </template>
<template slot="searchForm">
<view_searchform
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:showBusyIndicator="true"
v-show="isExpandSearchForm"
loaddraftAction="FilterGetDraft"
loadAction="FilterGet"
name="searchform"
ref='searchform'
@save="searchform_save($event)"
@search="searchform_search($event)"
@load="searchform_load($event)"
@closeview="closeView($event)">
</view_searchform>
</template>
<split id="hrtransferapplywfdynaexpgridview" v-model="split" mode="horizontal">
<div slot='left'>
<el-tree ref="tree" :data="wfStepModel" node-key="userTaskId" :highlight-current="true" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
</div>
<div slot="right">
<div class="content-container">
<view_searchform
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:showBusyIndicator="true"
v-show="isExpandSearchForm"
loaddraftAction="FilterGetDraft"
loadAction="FilterGet"
name="searchform"
ref='searchform'
@save="searchform_save($event)"
@search="searchform_search($event)"
@load="searchform_load($event)"
@closeview="closeView($event)">
</view_searchform>
<view_grid
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
updateAction=""
removeAction="Remove"
loaddraftAction=""
loadAction=""
createAction=""
fetchAction="FetchDefault"
:newdata="newdata.bind(_self)"
:opendata="opendata.bind(_self)"
name="grid"
ref='grid'
@selectionchange="grid_selectionchange($event)"
@beforeload="grid_beforeload($event)"
@rowdblclick="grid_rowdblclick($event)"
@remove="grid_remove($event)"
@load="grid_load($event)"
@closeview="closeView($event)">
</view_grid>
</div>
</div>
</split>
</card>
</studio-view-style2>
\ No newline at end of file
app_PIM/src/pages/ungroup/pim/page-register.ts
浏览文件 @ f54864c8
......@@ -130,6 +130,7 @@ export const PageComponents = {
Vue.component('hromhierarchy-cat-v-002', () => import('@pages/base/hromhierarchy-cat-v-002/hromhierarchy-cat-v-002.vue'));
Vue.component('hrdistribution-grid-view', () => import('@pages/human-resource/hrdistribution-grid-view/hrdistribution-grid-view.vue'));
Vue.component('hrarchives-edit-view', () => import('@pages/human-resource/hrarchives-edit-view/hrarchives-edit-view.vue'));
Vue.component('hrarchives-v-001', () => import('@pages/human-resource/hrarchives-v-001/hrarchives-v-001.vue'));
Vue.component('hromhierarchy-pickup-grid-view', () => import('@pages/base/hromhierarchy-pickup-grid-view/hromhierarchy-pickup-grid-view.vue'));
Vue.component('hrcertificate-tab-exp-view', () => import('@pages/human-resource/hrcertificate-tab-exp-view/hrcertificate-tab-exp-view.vue'));
Vue.component('hrdistribution-v-001', () => import('@pages/human-resource/hrdistribution-v-001/hrdistribution-v-001.vue'));
......
app_PIM/src/pages/ungroup/pim/router.ts
浏览文件 @ f54864c8
......@@ -3453,6 +3453,35 @@ const router = new Router({
},
component: () => import('@pages/human-resource/hrarchives-edit-view/hrarchives-edit-view.vue'),
},
{
path: 'hremployees/:hremployee?/hrarchives/:hrarchives?/v_001/:v_001?',
meta: {
caption: 'entities.hrarchives.views.v_001.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hremployees', parameterName: 'hremployee' },
{ pathName: 'hrarchives', parameterName: 'hrarchives' },
{ pathName: 'v_001', parameterName: 'v_001' },
],
requireAuth: true,
},
component: () => import('@pages/human-resource/hrarchives-v-001/hrarchives-v-001.vue'),
},
{
path: 'hrarchives/:hrarchives?/v_001/:v_001?',
meta: {
caption: 'entities.hrarchives.views.v_001.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrarchives', parameterName: 'hrarchives' },
{ pathName: 'v_001', parameterName: 'v_001' },
],
requireAuth: true,
},
component: () => import('@pages/human-resource/hrarchives-v-001/hrarchives-v-001.vue'),
},
{
path: 'hromhierarchycats/:hromhierarchycat?/hromhierarchies/:hromhierarchy?/pickupgridview/:pickupgridview?',
meta: {
......
app_PIM/src/store/modules/view-action/state.ts
浏览文件 @ f54864c8
......@@ -111,6 +111,16 @@ export const viewstate: any = {
'0dbdd98c4946bd6e79feb18e32dd387b',
],
},
{
viewtag: '0b80553da51b3d2dbf107cf369e503a4',
viewmodule: 'HumanResource',
viewname: 'HRArchivesV_001',
viewaction: '',
viewdatachange: false,
refviews: [
'4726bc4ee402aed771ecabe7a6ecdaae',
],
},
{
viewtag: '0ca6b2b05e01dfdc50fcc397b55de86a',
viewmodule: 'HumanResource',
......@@ -1045,12 +1055,12 @@ export const viewstate: any = {
'ef663fe283b58da63cd423f8506fa726',
'135e644817a41fccc4733e670e69be87',
'7bef45fc4e0ec53b6a6925262c3ea133',
'c01c4604589a2c171c4f41f2ac11f4e2',
'6fed66b17754f0251f020b82b375c009',
'84cfd4498b43e03549cdaba7c5d643ae',
'621c665c0d1c18948c754c33f0bd86e8',
'6395cba44e6d6151f19e543b55d88845',
'b932c0eb66409c638c29ee27ba4fda37',
'0b80553da51b3d2dbf107cf369e503a4',
'd0d5ecbe6b182e35765428d8f2f2e28f',
'cc825f424baa276e6a286963d999e03a',
'f7c3f3a7c389106700f90b5973be3d02',
......
app_PIM/src/uiservice/hrarchives/hrarchives-ui-service-base.ts
浏览文件 @ f54864c8
......@@ -89,6 +89,7 @@ export default class HRArchivesUIServiceBase extends UIService {
* @memberof HRArchivesUIServiceBase
*/
public initViewMap(){
this.allViewMap.set(':',{viewname:'v_001',srfappde:'hrarchives'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'hrarchives'});
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'hrarchives'});
}
......
app_PIM/src/widgets/hrarchives/grid-001-grid/grid-001-grid-base.tsx 0 → 100644
浏览文件 @ f54864c8
import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
import { Subject, Subscription } from 'rxjs';
import { Watch, GridControlBase } from '@/studio-core';
import HRArchivesService from '@/service/hrarchives/hrarchives-service';
import GRID_001Service from './grid-001-grid-service';
import HRArchivesUIService from '@/uiservice/hrarchives/hrarchives-ui-service';
import { FormItemModel } from '@/model/form-detail';
/**
* grid部件基类
*
* @export
* @class GridControlBase
* @extends {GRID_001GridBase}
*/
export class GRID_001GridBase extends GridControlBase {
/**
* 获取部件类型
*
* @protected
* @type {string}
* @memberof GRID_001GridBase
*/
protected controlType: string = 'GRID';
/**
* 建构部件服务对象
*
* @type {GRID_001Service}
* @memberof GRID_001GridBase
*/
public service: GRID_001Service = new GRID_001Service({ $store: this.$store });
/**
* 实体服务对象
*
* @type {HRArchivesService}
* @memberof GRID_001GridBase
*/
public appEntityService: HRArchivesService = new HRArchivesService({ $store: this.$store });
/**
* 应用实体名称
*
* @protected
* @type {string}
* @memberof GRID_001GridBase
*/
protected appDeName: string = 'hrarchives';
/**
* 应用实体中文名称
*
* @protected
* @type {string}
* @memberof GRID_001GridBase
*/
protected appDeLogicName: string = '档案信息';
/**
* 界面UI服务对象
*
* @type {HRArchivesUIService}
* @memberof GRID_001Base
*/
public appUIService:HRArchivesUIService = new HRArchivesUIService(this.$store);
/**
* 界面行为模型
*
* @type {*}
* @memberof GRID_001Base
*/
public ActionModel: any = {
};
/**
* 本地缓存标识
*
* @protected
* @type {string}
* @memberof GRID_001Base
*/
protected localStorageTag: string = 'hrarchives_grid_001_grid';
/**
* 所有列成员
*
* @type {any[]}
* @memberof GRID_001GridBase
*/
public allColumns: any[] = [
{
name: 'archivescode',
label: '档案编号',
langtag: 'entities.hrarchives.grid_001_grid.columns.archivescode',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'hrorganizationname',
label: '档案管理单位',
langtag: 'entities.hrarchives.grid_001_grid.columns.hrorganizationname',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'archivesplace',
label: '档案保管地',
langtag: 'entities.hrarchives.grid_001_grid.columns.archivesplace',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'archivesroom',
label: '档案室',
langtag: 'entities.hrarchives.grid_001_grid.columns.archivesroom',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'activeflag',
label: '是否有效',
langtag: 'entities.hrarchives.grid_001_grid.columns.activeflag',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'borrowstate',
label: '档案借阅状态',
langtag: 'entities.hrarchives.grid_001_grid.columns.borrowstate',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
]
/**
* 获取表格行模型
*
* @type {*}
* @memberof GRID_001GridBase
*/
public getGridRowModel(){
return {
srfkey: new FormItemModel(),
}
}
/**
* 属性值规则
*
* @type {*}
* @memberof GRID_001GridBase
*/
public rules: any = {
srfkey: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '档案信息标识 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '档案信息标识 值不能为空', trigger: 'blur' },
],
}
/**
* 获取对应列class
*
* @type {*}
* @memberof GRID_001Base
*/
public hasRowEdit: any = {
'archivescode':false,
'hrorganizationname':false,
'archivesplace':false,
'archivesroom':false,
'activeflag':false,
'borrowstate':false,
};
/**
* 获取对应列class
*
* @param {*} $args row 行数据，column 列数据，rowIndex 行索引，列索引
* @returns {void}
* @memberof GRID_001Base
*/
public getCellClassName(args: {row: any, column: any, rowIndex: number, columnIndex: number}): any {
return ( this.hasRowEdit[args.column.property] && this.actualIsOpenEdit ) ? "edit-cell" : "info-cell";
}
/**
* 导出数据格式化
*
* @param {*} filterVal
* @param {*} jsonData
* @param {any[]} [codelistColumns=[]]
* @returns {Promise<any>}
* @memberof GRID_001GridBase
*/
public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
return super.formatExcelData(filterVal, jsonData, [
{
name: 'activeflag',
srfkey: 'YesNo',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]);
}
}
\ No newline at end of file
app_PIM/src/widgets/hrarchives/grid-001-grid/grid-001-grid-model.ts 0 → 100644
浏览文件 @ f54864c8
/**
* GRID_001 部件模型
*
* @export
* @class GRID_001Model
*/
export default class GRID_001Model {
/**
* 是否是实体数据导出
*
* @returns {any[]}
* @memberof GRID_001GridMode
*/
public isDEExport: boolean = false;
/**
* 获取数据项集合
*
* @returns {any[]}
* @memberof GRID_001GridMode
*/
public getDataItems(): any[] {
if(this.isDEExport){
return [
]
}else{
return [
{
name: 'hremployeeid',
prop: 'hremployeeid',
dataType: 'PICKUP',
},
{
name: 'borrowstate',
prop: 'borrowstate',
dataType: 'SSCODELIST',
},
{
name: 'hrorganizationname',
prop: 'hrorganizationname',
dataType: 'PICKUPTEXT',
},
{
name: 'archivesplace',
prop: 'archivesplace',
dataType: 'TEXT',
},
{
name: 'hrorganizationid',
prop: 'hrorganizationid',
dataType: 'PICKUP',
},
{
name: 'activeflag',
prop: 'activeflag',
dataType: 'YESNO',
},
{
name: 'archivesroom',
prop: 'archivesroom',
dataType: 'TEXT',
},
{
name: 'archivescode',
prop: 'archivescode',
dataType: 'TEXT',
},
{
name: 'srfmajortext',
prop: 'hrarchivesname',
dataType: 'TEXT',
},
{
name: 'srfdataaccaction',
prop: 'hrarchivesid',
dataType: 'GUID',
},
{
name: 'srfkey',
prop: 'hrarchivesid',
dataType: 'GUID',
isEditable:true
},
{
name: 'hrarchives',
prop: 'hrarchivesid',
},
{
name:'size',
prop:'size'
},
{
name:'query',
prop:'query'
},
{
name:'filter',
prop:'filter'
},
{
name:'page',
prop:'page'
},
{
name:'sort',
prop:'sort'
},
{
name:'srfparentdata',
prop:'srfparentdata'
},
// 前端新增修改标识，新增为"0",修改为"1"或未设值
{
name: 'srffrontuf',
prop: 'srffrontuf',
dataType: 'TEXT',
},
]
}
}
}
\ No newline at end of file
app_PIM/src/widgets/hrarchives/grid-001-grid/grid-001-grid.html 0 → 100644
浏览文件 @ f54864c8
<div :class="{ 'grid': true, 'show-paging-bar': isEnablePagingBar, 'hidden-paging-bar': !isEnablePagingBar }">
<i-form>
<el-table v-if="isDisplay === true"
:default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"
@sort-change="onSortChange($event)"
:border="isDragendCol"
:highlight-current-row ="isSingleSelect"
:row-class-name="getRowClassName.bind(_self)"
:cell-class-name="getCellClassName.bind(_self)"
size="mini"
stripe
@row-click="rowClick($event)"
@select-all="selectAll($event)"
@select="select($event)"
@row-class-name="onRowClassName($event)"
@row-dblclick="rowDBLClick($event)"
ref='multipleTable' :data="items" :show-header="!isHideHeader">
<template slot="empty">
无数据
<span class="quick-toolbar">
</span>
</template>
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('archivescode')">
<el-table-column show-overflow-tooltip :prop="'archivescode'" :label="$t('entities.hrarchives.grid_001_grid.columns.archivescode')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.grid_001_grid.columns.archivescode')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.archivescode}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('hrorganizationname')">
<el-table-column show-overflow-tooltip :prop="'hrorganizationname'" :label="$t('entities.hrarchives.grid_001_grid.columns.hrorganizationname')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.grid_001_grid.columns.hrorganizationname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.hrorganizationname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('archivesplace')">
<el-table-column show-overflow-tooltip :prop="'archivesplace'" :label="$t('entities.hrarchives.grid_001_grid.columns.archivesplace')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.grid_001_grid.columns.archivesplace')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.archivesplace}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('archivesroom')">
<el-table-column show-overflow-tooltip :prop="'archivesroom'" :label="$t('entities.hrarchives.grid_001_grid.columns.archivesroom')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.grid_001_grid.columns.archivesroom')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.archivesroom}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('activeflag')">
<el-table-column show-overflow-tooltip :prop="'activeflag'" :label="$t('entities.hrarchives.grid_001_grid.columns.activeflag')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.grid_001_grid.columns.activeflag')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.activeflag" tag='YesNo' codelistType='STATIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('borrowstate')">
<el-table-column show-overflow-tooltip :prop="'borrowstate'" :label="$t('entities.hrarchives.grid_001_grid.columns.borrowstate')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.grid_001_grid.columns.borrowstate')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.borrowstate}}</span>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState">
<el-table-column></el-table-column>
</template>
</el-table>
<row class='grid-pagination' v-show="items.length > 0">
<page class='pull-right' @on-change="pageOnChange($event)"
@on-page-size-change="onPageSizeChange($event)"
:transfer="true" :total="totalRecord"
show-sizer :current="curPage" :page-size="limit"
:page-size-opts="[10, 20, 30, 40, 50, 60, 70, 80, 90, 100]" show-elevator show-total>
<span>
<span class="page-column">
<poptip transfer placement="top-start">
<i-button icon="md-menu">{{$t('app.gridpage.choicecolumns')}}</i-button>
<div slot="content">
<template v-for="col in allColumns">
<div :key="col.name"><el-checkbox v-model="col.show" @change="onColChange()">{{$t(col.langtag)}}</el-checkbox></div>
</template>
</div>
</poptip>
</span>
<span v-if="selections.length > 0" class="batch-toolbar">
</span>
<span class="page-button"><i-button icon="md-refresh" :title="$t('app.gridpage.refresh')" @click="pageRefresh()"></i-button></span>&nbsp;
<span>
{{$t('app.gridpage.show')}}&nbsp;
<span>
<template v-if="items.length === 1">
1
</template>
<template v-else>
<span>{{(curPage - 1) * limit + 1}}&nbsp;-&nbsp;{{totalRecord > curPage * limit ? curPage * limit : totalRecord}}</span>
</template>
</span>&nbsp;
{{$t('app.gridpage.records')}}，{{$t('app.gridpage.totle')}}&nbsp;{{totalRecord}}&nbsp;{{$t('app.gridpage.records')}}
</span>
</span>
</page>
</row>
</i-form>
</div>
\ No newline at end of file
app_PIM/src/widgets/hrarchives/grid-001-grid/grid-001-grid.vue 0 → 100644
浏览文件 @ f54864c8
<template src="./grid-001-grid.html"/>
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { GRID_001GridBase } from './grid-001-grid-base';
/**
* grid部件
*
* @export
* @class GRID_001Grid
* @extends {GRID_001GridBase}
*/
@Component({
components: {
}
})
@VueLifeCycleProcessing()
export default class GRID_001Grid extends GRID_001GridBase { }
</script>
app_PIM/src/widgets/hrarchives/main-form/main-form-base.tsx
浏览文件 @ f54864c8
......@@ -83,10 +83,6 @@ export class MainEditFormBase extends EditFormControlBase {
srfdeid: null,
srfsourcekey: null,
hrarchivesname: null,
createman: null,
createdate: null,
updateman: null,
updatedate: null,
hrarchivesid: null,
hrarchives:null,
};
......@@ -116,14 +112,10 @@ export class MainEditFormBase extends EditFormControlBase {
* @memberof MainEditFormBase
*/
public detailsModel: any = {
group1: new FormGroupPanelModel({ caption: '档案信息基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrarchives.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.hrarchives.main_form', extractMode: 'ITEM', details: [] } }),
formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
group2: new FormGroupPanelModel({ caption: '操作信息', detailType: 'GROUPPANEL', name: 'group2', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrarchives.main_form', extractMode: 'ITEM', details: [] } }),
formpage2: new FormPageModel({ caption: '其它', detailType: 'FORMPAGE', name: 'formpage2', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......@@ -142,16 +134,7 @@ export class MainEditFormBase extends EditFormControlBase {
hrarchivesname: new FormItemModel({ caption: '档案信息名称', detailType: 'FORMITEM', name: 'hrarchivesname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
createman: new FormItemModel({ caption: '建立人', detailType: 'FORMITEM', name: 'createman', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
createdate: new FormItemModel({ caption: '建立时间', detailType: 'FORMITEM', name: 'createdate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
updateman: new FormItemModel({ caption: '更新人', detailType: 'FORMITEM', name: 'updateman', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
updatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'updatedate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
hrarchivesid: new FormItemModel({ caption: '档案信息标识', detailType: 'FORMITEM', name: 'hrarchivesid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
form: new FormTabPanelModel({ caption: 'form', detailType: 'TABPANEL', name: 'form', visible: true, isShowCaption: true, form: this, tabPages: [{ name: 'formpage1', index: 0, visible: true }, { name: 'formpage2', index: 1, visible: true }] }),
};
}
\ No newline at end of file
app_PIM/src/widgets/hrarchives/main-form/main-form-model.ts
浏览文件 @ f54864c8
......@@ -60,26 +60,6 @@ export default class MainModel {
prop: 'hrarchivesname',
dataType: 'TEXT',
},
{
name: 'createman',
prop: 'createman',
dataType: 'TEXT',
},
{
name: 'createdate',
prop: 'createdate',
dataType: 'DATETIME',
},
{
name: 'updateman',
prop: 'updateman',
dataType: 'TEXT',
},
{
name: 'updatedate',
prop: 'updatedate',
dataType: 'DATETIME',
},
{
name: 'hrarchivesid',
prop: 'hrarchivesid',
......
app_PIM/src/widgets/hrarchives/main-form/main-form.html
浏览文件 @ f54864c8
<i-form :model="this.data" class='app-form' ref='form' id='hrarchives_main' style="">
<input style="display:none;" />
<row >
<tabs :animated="false" size="small" name='main' :value="detailsModel.form.activiedPage"
@on-click="detailsModel.form.clickPage($event)">
<tab-pane v-show="detailsModel.formpage1.visible" name='formpage1' :index="0" tab='main' class=''
:label="(h) =>{
return h('span',{
class:'caption'
},[
$t('entities.hrarchives.main_form.details.formpage1')
])
}">
<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.hrarchives.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
......@@ -37,68 +27,5 @@
</i-col>
</tab-pane>
<tab-pane v-show="detailsModel.formpage2.visible" name='formpage2' :index="1" tab='main' class=''
:label="(h) =>{
return h('span',{
class:'caption'
},[
$t('entities.hrarchives.main_form.details.formpage2')
])
}">
<i-col class="form-layout-container" v-show="detailsModel.group2.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group :model="detailsModel.group2" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hrarchives.main_form.details.group2')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group2" :data="data" :context="context" :viewparams="viewparams"/>
<row>
<i-col class="form-layout-container" v-show="detailsModel.createman.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='createman' :itemRules="this.rules.createman" class='' :caption="$t('entities.hrarchives.main_form.details.createman')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createman.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='createman' :value="data.createman" dataType="TEXT" :precision="0"
tag='SysOperator' codelistType='DYNAMIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.createdate.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='createdate' :itemRules="this.rules.createdate" class='' :caption="$t('entities.hrarchives.main_form.details.createdate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createdate.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='createdate' :value="data.createdate" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.updateman.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='updateman' :itemRules="this.rules.updateman" class='' :caption="$t('entities.hrarchives.main_form.details.updateman')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.updateman.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='updateman' :value="data.updateman" dataType="TEXT" :precision="0"
tag='SysOperator' codelistType='DYNAMIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.updatedate.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='updatedate' :itemRules="this.rules.updatedate" class='' :caption="$t('entities.hrarchives.main_form.details.updatedate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.updatedate.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='updatedate' :value="data.updatedate" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
</row>
</app-form-group>
</i-col>
</tab-pane>
</tabs>
</row>
</i-form>
\ No newline at end of file
app_PIM/src/widgets/hrarchives/main-grid/main-grid-base.tsx
浏览文件 @ f54864c8
......@@ -100,6 +100,78 @@ export class MainGridBase extends GridControlBase {
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'hrorganizationname',
label: '档案管理单位',
langtag: 'entities.hrarchives.main_grid.columns.hrorganizationname',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'archivesplace',
label: '档案保管地',
langtag: 'entities.hrarchives.main_grid.columns.archivesplace',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'archivesroom',
label: '档案室',
langtag: 'entities.hrarchives.main_grid.columns.archivesroom',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'activeflag',
label: '是否有效',
langtag: 'entities.hrarchives.main_grid.columns.activeflag',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'employeecode',
label: '员工编号',
langtag: 'entities.hrarchives.main_grid.columns.employeecode',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'hremployeename',
label: '员工姓名',
langtag: 'entities.hrarchives.main_grid.columns.hremployeename',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'empstate',
label: '员工状态',
langtag: 'entities.hrarchives.main_grid.columns.empstate',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'organizationname',
label: '单位',
langtag: 'entities.hrarchives.main_grid.columns.organizationname',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'borrowstate',
label: '档案借阅状态',
langtag: 'entities.hrarchives.main_grid.columns.borrowstate',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
]
/**
......@@ -135,6 +207,15 @@ export class MainGridBase extends GridControlBase {
*/
public hasRowEdit: any = {
'archivescode':false,
'hrorganizationname':false,
'archivesplace':false,
'archivesroom':false,
'activeflag':false,
'employeecode':false,
'hremployeename':false,
'empstate':false,
'organizationname':false,
'borrowstate':false,
};
/**
......@@ -160,6 +241,22 @@ export class MainGridBase extends GridControlBase {
*/
public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
return super.formatExcelData(filterVal, jsonData, [
{
name: 'activeflag',
srfkey: 'YesNo',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
{
name: 'empstate',
srfkey: 'CL_HR_0016',
codelistType : 'DYNAMIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]);
}
......
app_PIM/src/widgets/hrarchives/main-grid/main-grid-model.ts
浏览文件 @ f54864c8
......@@ -27,35 +27,80 @@ export default class MainModel {
}else{
return [
{
name: 'hremployeeid',
prop: 'hremployeeid',
dataType: 'PICKUP',
name: 'organizationname',
prop: 'organizationname',
dataType: 'PICKUPDATA',
},
{
name: 'hrorganizationid',
prop: 'hrorganizationid',
dataType: 'PICKUP',
name: 'empstate',
prop: 'empstate',
dataType: 'PICKUPDATA',
},
{
name: 'archivesroom',
prop: 'archivesroom',
dataType: 'TEXT',
},
{
name: 'archivescode',
prop: 'archivescode',
dataType: 'TEXT',
},
{
name: 'employeecode',
prop: 'employeecode',
dataType: 'PICKUPDATA',
},
{
name: 'srfmajortext',
prop: 'hrarchivesname',
dataType: 'TEXT',
},
{
name: 'srfdataaccaction',
name: 'srfkey',
prop: 'hrarchivesid',
dataType: 'GUID',
isEditable:true
},
{
name: 'srfkey',
name: 'srfdataaccaction',
prop: 'hrarchivesid',
dataType: 'GUID',
isEditable:true
},
{
name: 'hremployeeid',
prop: 'hremployeeid',
dataType: 'PICKUP',
},
{
name: 'borrowstate',
prop: 'borrowstate',
dataType: 'SSCODELIST',
},
{
name: 'hrorganizationname',
prop: 'hrorganizationname',
dataType: 'PICKUPTEXT',
},
{
name: 'hremployeename',
prop: 'hremployeename',
dataType: 'PICKUPTEXT',
},
{
name: 'archivesplace',
prop: 'archivesplace',
dataType: 'TEXT',
},
{
name: 'hrorganizationid',
prop: 'hrorganizationid',
dataType: 'PICKUP',
},
{
name: 'activeflag',
prop: 'activeflag',
dataType: 'YESNO',
},
{
name: 'hrarchives',
......
app_PIM/src/widgets/hrarchives/main-grid/main-grid.html
浏览文件 @ f54864c8
......@@ -24,7 +24,7 @@
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('archivescode')">
<el-table-column show-overflow-tooltip :prop="'archivescode'" :label="$t('entities.hrarchives.main_grid.columns.archivescode')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'archivescode'" :label="$t('entities.hrarchives.main_grid.columns.archivescode')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.main_grid.columns.archivescode')}}
......@@ -35,6 +35,118 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('hrorganizationname')">
<el-table-column show-overflow-tooltip :prop="'hrorganizationname'" :label="$t('entities.hrarchives.main_grid.columns.hrorganizationname')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.main_grid.columns.hrorganizationname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.hrorganizationname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('archivesplace')">
<el-table-column show-overflow-tooltip :prop="'archivesplace'" :label="$t('entities.hrarchives.main_grid.columns.archivesplace')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.main_grid.columns.archivesplace')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.archivesplace}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('archivesroom')">
<el-table-column show-overflow-tooltip :prop="'archivesroom'" :label="$t('entities.hrarchives.main_grid.columns.archivesroom')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.main_grid.columns.archivesroom')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.archivesroom}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('activeflag')">
<el-table-column show-overflow-tooltip :prop="'activeflag'" :label="$t('entities.hrarchives.main_grid.columns.activeflag')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.main_grid.columns.activeflag')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.activeflag" tag='YesNo' codelistType='STATIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('employeecode')">
<el-table-column show-overflow-tooltip :prop="'employeecode'" :label="$t('entities.hrarchives.main_grid.columns.employeecode')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.main_grid.columns.employeecode')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.employeecode}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('hremployeename')">
<el-table-column show-overflow-tooltip :prop="'hremployeename'" :label="$t('entities.hrarchives.main_grid.columns.hremployeename')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.main_grid.columns.hremployeename')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.hremployeename}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('empstate')">
<el-table-column show-overflow-tooltip :prop="'empstate'" :label="$t('entities.hrarchives.main_grid.columns.empstate')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.main_grid.columns.empstate')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.empstate" tag='CL_HR_0016' codelistType='DYNAMIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('organizationname')">
<el-table-column show-overflow-tooltip :prop="'organizationname'" :label="$t('entities.hrarchives.main_grid.columns.organizationname')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.main_grid.columns.organizationname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.organizationname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('borrowstate')">
<el-table-column show-overflow-tooltip :prop="'borrowstate'" :label="$t('entities.hrarchives.main_grid.columns.borrowstate')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrarchives.main_grid.columns.borrowstate')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.borrowstate}}</span>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState">
<el-table-column></el-table-column>
</template>
......
app_PIM/src/widgets/hremployee/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.tsx
浏览文件 @ f54864c8
......@@ -226,7 +226,7 @@ export class TreeExpViewtreeexpbarTreeExpBarBase extends MainControlBase {
}
if (Object.is(expmode, 'TR07')) {
return {
viewname: 'hrarchives-grid-view',
viewname: 'hrarchives-v-001',
parentdata: {"srfparentdefname":"HREMPLOYEEID","srfparentdename":"HREMPLOYEE","srfparentmode":"DER1N_HRARCHIVES_HREMPLOYEE_HREMPLOYEEID_327A4D"},
deKeyField:'hrarchives'
};
......
config.xml
浏览文件 @ f54864c8
......@@ -37,11 +37,6 @@
git clone -b master $para2 ibizhumanresources/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizhumanresources/
mvn clean package -Ppim
cd humanresource-app/humanresource-app-pim
mvn -Ppim docker:build
mvn -Ppim docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile
浏览文件 @ f54864c8
......@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar
EXPOSE 10327
EXPOSE 8080
ADD humanresource-app-pim.jar /humanresource-app-pim.jar
humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml
浏览文件 @ f54864c8
......@@ -3,25 +3,9 @@ services:
humanresource-app-pim:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
ports:
- "10327:10327"
- "8080:8080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=10327
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
- SPRING_DATASOURCE_PASSWORD=b1@@@772
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
- SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
- SEATA_ENABLED=true
deploy:
resources:
limits:
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ f54864c8
......@@ -4,7 +4,7 @@
<!--输出实体[HRARCHIVES]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrarchives-31-1">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrarchives-39-1">
<createTable tableName="T_HRARCHIVES">
<column name="HRARCHIVESID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRARCHIVES_HRARCHIVESID"/>
......@@ -370,7 +370,7 @@
<!--输出实体[HREMPLOYEE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-290-12">
<changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-291-12">
<createTable tableName="EMPLOYEE">
<column name="EMPLOYEENAME" remarks="" type="VARCHAR(200)">
</column>
......@@ -1107,10 +1107,10 @@
</changeSet>
<!--输出实体[HRARCHIVES]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrarchives-31-35">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrarchives-39-35">
<addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRARCHIVES" constraintName="DER1N_HRARCHIVES_HREMPLOYEE_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hrarchives-31-36">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrarchives-39-36">
<addForeignKeyConstraint baseColumnNames="HRORGANIZATIONID" baseTableName="T_HRARCHIVES" constraintName="DER1N_HRARCHIVES_HRORGANIZATIO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
</changeSet>
<!--输出实体[HRATTENDANCE]外键关系 -->
......@@ -1154,13 +1154,13 @@
</changeSet>
<!--输出实体[HREMPSTATE]外键关系 -->
<!--输出实体[HREMPLOYEE]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-290-48">
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-291-48">
<addForeignKeyConstraint baseColumnNames="ORGANIZATIONID" baseTableName="EMPLOYEE" constraintName="DER1N_EMPLOYEE_ORGANIZATION_OR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-290-49">
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-291-49">
<addForeignKeyConstraint baseColumnNames="EMPSTATE" baseTableName="EMPLOYEE" constraintName="DER1N_HREMPLOYEE_HREMPSTATE_EM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HREMPSTATEID" referencedTableName="T_HREMPSTATE" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-290-50">
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-291-50">
<addForeignKeyConstraint baseColumnNames="HRPOSTID" baseTableName="EMPLOYEE" constraintName="DER1N_HREMPLOYEE_HRPOST_HRPOST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
</changeSet>
<!--输出实体[HRFAMILY]外键关系 -->
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或