Skip to content

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

jackwang 部署微服务应用

上级 3d984393
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 2964 行增加 和 82 行删除
app_PIM/public/assets/json/view-config.json
浏览文件 @ e0482b1b
......@@ -19,6 +19,16 @@
"viewtag": "28aca0d4ad43b8ef609172d9be9359c7",
"memo": "系统自动添加"
},
"hrlegalgridview": {
"title": "法人表格视图",
"caption": "法人",
"viewtype": "DEGRIDVIEW",
"viewmodule": "Base",
"viewname": "HRLegalGridView",
"viewfilename": "hrlegal-grid-view",
"viewtag": "41036146909ab3f28ff59b80370514b2",
"memo": ""
},
"pim": {
"title": "应用首页视图",
"caption": "基础管理",
......
app_PIM/src/interface/entity/hrlegal.ts
浏览文件 @ e0482b1b
......@@ -61,4 +61,76 @@ export interface HRLegal {
* @memberof HRLegal
*/
organizationtype?: any;
/**
* 组织层级
*
* @returns {*}
* @memberof HRLegal
*/
orglevel?: any;
/**
* 运营单位类型
*
* @returns {*}
* @memberof HRLegal
*/
operationunittype?: any;
/**
* 排序号
*
* @returns {*}
* @memberof HRLegal
*/
showorder?: any;
/**
* 组织编码
*
* @returns {*}
* @memberof HRLegal
*/
orgcode?: any;
/**
* 备注
*
* @returns {*}
* @memberof HRLegal
*/
memo?: any;
/**
* 组织简称
*
* @returns {*}
* @memberof HRLegal
*/
shortname?: any;
/**
* 统一社会信用代码
*
* @returns {*}
* @memberof HRLegal
*/
uscc?: any;
/**
* 开户行
*
* @returns {*}
* @memberof HRLegal
*/
bank?: any;
/**
* 银行账号
*
* @returns {*}
* @memberof HRLegal
*/
bankaccount?: any;
}
\ No newline at end of file
app_PIM/src/interface/entity/hrorganization.ts
浏览文件 @ e0482b1b
......@@ -101,4 +101,12 @@ export interface HROrganization {
* @memberof HROrganization
*/
operationunittype?: any;
/**
* 备注
*
* @returns {*}
* @memberof HROrganization
*/
memo?: any;
}
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrlegal/hrlegal_en_US.ts
浏览文件 @ e0482b1b
......@@ -8,8 +8,21 @@ export default {
createdate: "建立时间",
updatedate: "更新时间",
organizationtype: "组织类型",
orglevel: "组织层级",
operationunittype: "运营单位类型",
showorder: "排序号",
orgcode: "组织编码",
memo: "备注",
shortname: "组织简称",
uscc: "统一社会信用代码",
bank: "开户行",
bankaccount: "银行账号",
},
views: {
gridview: {
caption: "法人",
title: "法人表格视图",
},
editview: {
caption: "法人",
title: "法人编辑视图",
......@@ -17,10 +30,10 @@ export default {
},
main_form: {
details: {
group1: "法人基本信息",
group1: "法人信息",
grouppanel1: "银行账号信息",
grouppanel2: "备注",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "法人标识",
......@@ -29,11 +42,36 @@ export default {
srfuf: "",
srfdeid: "",
srfsourcekey: "",
legalname: "法人名称",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
bank: "开户行",
bankaccount: "银行账号",
uscc: "统一社会信用代码",
memo: "备注",
legalid: "法人标识",
},
uiactions: {
},
},
main_grid: {
columns: {
legalname: "法人名称",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
},
uiactions: {
},
},
default_searchform: {
details: {
formpage1: "常规条件",
},
uiactions: {
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: "Save",
......@@ -80,4 +118,62 @@ export default {
tip: "Help",
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem6: {
caption: "Copy",
tip: "Copy {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: "",
},
tbitem16: {
caption: "其它",
tip: "其它",
},
tbitem21: {
caption: "Export Data Model",
tip: "导出数据模型",
},
tbitem23: {
caption: "数据导入",
tip: "数据导入",
},
tbitem17: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
tbitem18: {
caption: "Help",
tip: "Help",
},
},
};
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrlegal/hrlegal_zh_CN.ts
浏览文件 @ e0482b1b
......@@ -7,8 +7,21 @@ export default {
createdate: "建立时间",
updatedate: "更新时间",
organizationtype: "组织类型",
orglevel: "组织层级",
operationunittype: "运营单位类型",
showorder: "排序号",
orgcode: "组织编码",
memo: "备注",
shortname: "组织简称",
uscc: "统一社会信用代码",
bank: "开户行",
bankaccount: "银行账号",
},
views: {
gridview: {
caption: "法人",
title: "法人表格视图",
},
editview: {
caption: "法人",
title: "法人编辑视图",
......@@ -16,10 +29,10 @@ export default {
},
main_form: {
details: {
group1: "法人基本信息",
group1: "法人信息",
grouppanel1: "银行账号信息",
grouppanel2: "备注",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "法人标识",
......@@ -28,11 +41,36 @@ export default {
srfuf: "",
srfdeid: "",
srfsourcekey: "",
legalname: "法人名称",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
bank: "开户行",
bankaccount: "银行账号",
uscc: "统一社会信用代码",
memo: "备注",
legalid: "法人标识",
},
uiactions: {
},
},
main_grid: {
columns: {
legalname: "法人名称",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
},
uiactions: {
},
},
default_searchform: {
details: {
formpage1: "常规条件",
},
uiactions: {
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: "保存",
......@@ -79,4 +117,62 @@ export default {
tip: "帮助",
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem6: {
caption: "拷贝",
tip: "拷贝",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem16: {
caption: "其它",
tip: "其它",
},
tbitem21: {
caption: "导出数据模型",
tip: "导出数据模型",
},
tbitem23: {
caption: "数据导入",
tip: "数据导入",
},
tbitem17: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
tbitem18: {
caption: "帮助",
tip: "帮助",
},
},
};
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrorganization/hrorganization_en_US.ts
浏览文件 @ e0482b1b
......@@ -13,6 +13,7 @@ export default {
orglevel: "组织层级",
showorder: "排序号",
operationunittype: "运营单位类型",
memo: "备注",
},
views: {
gridview: {
......
app_PIM/src/locale/lanres/entities/hrorganization/hrorganization_zh_CN.ts
浏览文件 @ e0482b1b
......@@ -12,6 +12,7 @@ export default {
orglevel: "组织层级",
showorder: "排序号",
operationunittype: "运营单位类型",
memo: "备注",
},
views: {
gridview: {
......
app_PIM/src/mock/app/pim-appmenu/pim-appmenu.ts
浏览文件 @ e0482b1b
......@@ -137,7 +137,7 @@ mock.onGet('v7/pimappmenu').reply((config: any) => {
iconcls: 'fa fa-user',
icon: '',
textcls: '',
appfunctag: '_2',
appfunctag: '_3',
resourcetag: '',
},
],
......@@ -175,7 +175,7 @@ mock.onGet('v7/pimappmenu').reply((config: any) => {
iconcls: '',
icon: '',
textcls: '',
appfunctag: '',
appfunctag: '_2',
resourcetag: '',
},
{
......@@ -247,7 +247,7 @@ mock.onGet('v7/pimappmenu').reply((config: any) => {
iconcls: 'fa fa-cubes',
icon: '',
textcls: '',
appfunctag: '_3',
appfunctag: '_4',
resourcetag: '',
},
{
......
app_PIM/src/mock/viewconfig/viewconfig.ts
浏览文件 @ e0482b1b
......@@ -23,6 +23,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "HROperationUnitEditView",
"viewtag": "28aca0d4ad43b8ef609172d9be9359c7"
},
"hrlegalgridview": {
"title": "法人表格视图",
"caption": "法人",
"viewtype": "DEGRIDVIEW",
"viewmodule": "Base",
"viewname": "HRLegalGridView",
"viewtag": "41036146909ab3f28ff59b80370514b2"
},
"pim": {
"title": "应用首页视图",
"caption": "基础管理",
......
app_PIM/src/pages/base/hrlegal-grid-view/hrlegal-grid-view.html 0 → 100644
浏览文件 @ e0482b1b
<studio-view-style2 viewName="hrlegalgridview" viewTitle="法人表格视图" class='degridview hrlegal-grid-view'>
<template slot='title'>
<span class='caption-info'>{{$t(model.srfTitle)}}</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($event)"/> </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/base/hrlegal-grid-view/hrlegal-grid-view.vue 0 → 100644
浏览文件 @ e0482b1b
<template src="./hrlegal-grid-view.html"/>
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { HRLegalGridViewBase } from './hrlegal-grid-view-base';
import view_grid from '@widgets/hrlegal/main-grid/main-grid.vue';
import view_searchform from '@widgets/hrlegal/default-searchform/default-searchform.vue';
/**
* 法人表格视图视图
*
* @export
* @class HRLegalGridView
* @extends {HRLegalGridViewBase}
*/
@Component({
components: {
view_grid,
view_searchform,
}
})
@VueLifeCycleProcessing()
export default class HRLegalGridView extends HRLegalGridViewBase { }
</script>
app_PIM/src/pages/ungroup/pim/page-register.ts
浏览文件 @ e0482b1b
......@@ -5,6 +5,7 @@ export const PageComponents = {
Vue.component('hroperation-unit-edit-view', () => import('@pages/base/hroperation-unit-edit-view/hroperation-unit-edit-view.vue'));
Vue.component('hremployee-grid-view', () => import('@pages/human-resource/hremployee-grid-view/hremployee-grid-view.vue'));
Vue.component('hrorganization-grid-view', () => import('@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'));
Vue.component('hrlegal-grid-view', () => import('@pages/base/hrlegal-grid-view/hrlegal-grid-view.vue'));
Vue.component('hrorganization-edit-view', () => import('@pages/base/hrorganization-edit-view/hrorganization-edit-view.vue'));
}
};
\ No newline at end of file
app_PIM/src/pages/ungroup/pim/router.ts
浏览文件 @ e0482b1b
......@@ -113,6 +113,20 @@ const router = new Router({
},
component: () => import('@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'),
},
{
path: 'hrlegals/:hrlegal?/gridview/:gridview?',
meta: {
caption: 'entities.hrlegal.views.gridview.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrlegals', parameterName: 'hrlegal' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
requireAuth: true,
},
component: () => import('@pages/base/hrlegal-grid-view/hrlegal-grid-view.vue'),
},
{
path: 'hrorganizations/:hrorganization?/editview/:editview?',
meta: {
......
app_PIM/src/store/modules/view-action/state.ts
浏览文件 @ e0482b1b
......@@ -24,6 +24,16 @@ export const viewstate: any = {
refviews: [
],
},
{
viewtag: '41036146909ab3f28ff59b80370514b2',
viewmodule: 'Base',
viewname: 'HRLegalGridView',
viewaction: '',
viewdatachange: false,
refviews: [
'e50ad3e1883bafa2d6f264d44ca8ff89',
],
},
{
viewtag: '49CD8BAE-D640-4816-8313-5D8609BB0041',
viewmodule: 'Ungroup',
......@@ -33,6 +43,7 @@ export const viewstate: any = {
refviews: [
'9559258a9c3ac118e15ead941b780682',
'0d8ac739134947cc5f6545d4041024de',
'41036146909ab3f28ff59b80370514b2',
],
},
{
......
app_PIM/src/uiservice/hrlegal/hrlegal-ui-service-base.ts
浏览文件 @ e0482b1b
......@@ -89,6 +89,7 @@ export default class HRLegalUIServiceBase extends UIService {
* @memberof HRLegalUIServiceBase
*/
public initViewMap(){
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'hrlegals'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'hrlegals'});
}
......
app_PIM/src/widgets/app/pim-appmenu/pim-appmenu-base.tsx
浏览文件 @ e0482b1b
......@@ -15,10 +15,12 @@ export class PIMBase extends Vue {
if (item) {
let judge = true;
switch (item.appfunctag) {
case '_3':
this.click_3(item); break;
case '_4':
this.click_4(item); break;
case '_2':
this.click_2(item); break;
case '_3':
this.click_3(item); break;
default:
judge = false;
console.warn('未指定应用功能');
......@@ -35,7 +37,7 @@ export class PIMBase extends Vue {
* @param {*} [item={}]
* @memberof PIM
*/
public click_3(item: any = {}) {
public click_4(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
......@@ -53,12 +55,35 @@ export class PIMBase extends Vue {
}
/**
* 员工信息
* 法人
*
* @param {*} [item={}]
* @memberof PIM
*/
public click_2(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'hrlegals', parameterName: 'hrlegal' },
{ pathName: 'gridview', parameterName: 'gridview' },
];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
}
/**
* 员工信息
*
* @param {*} [item={}]
* @memberof PIM
*/
public click_3(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
......
app_PIM/src/widgets/app/pim-appmenu/pim-appmenu-model.ts
浏览文件 @ e0482b1b
......@@ -147,7 +147,7 @@ export default class PIMModel {
iconcls: 'fa fa-user',
icon: '',
textcls: '',
appfunctag: '_2',
appfunctag: '_3',
appfuncyype: 'APPVIEW',
viewname: 'hremployee-grid-view',
resourcetag: '',
......@@ -189,7 +189,9 @@ export default class PIMModel {
iconcls: '',
icon: '',
textcls: '',
appfunctag: '',
appfunctag: '_2',
appfuncyype: 'APPVIEW',
viewname: 'hrlegal-grid-view',
resourcetag: '',
}
,
......@@ -265,7 +267,7 @@ export default class PIMModel {
iconcls: 'fa fa-cubes',
icon: '',
textcls: '',
appfunctag: '_3',
appfunctag: '_4',
appfuncyype: 'APPVIEW',
viewname: 'hrorganization-grid-view',
resourcetag: '',
......@@ -461,7 +463,7 @@ export default class PIMModel {
*/
private funcs: any[] = [
{
appfunctag: '_3',
appfunctag: '_4',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'hrorganizationgridview',
......@@ -476,6 +478,18 @@ export default class PIMModel {
appfunctag: '_2',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'hrlegalgridview',
deResParameters: [],
routepath: '/pim/:pim?/hrlegals/:hrlegal?/gridview/:gridview?',
parameters: [
{ pathName: 'hrlegals', parameterName: 'hrlegal' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
},
{
appfunctag: '_3',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'hremployeegridview',
deResParameters: [],
routepath: '/pim/:pim?/hremployees/:hremployee?/gridview/:gridview?',
......
app_PIM/src/widgets/hrlegal/default-searchform/default-searchform-base.tsx 0 → 100644
浏览文件 @ e0482b1b
import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
import { Subject, Subscription } from 'rxjs';
import { Watch, SearchFormControlBase } from '@/studio-core';
import HRLegalService from '@/service/hrlegal/hrlegal-service';
import DefaultService from './default-searchform-service';
import HRLegalUIService from '@/uiservice/hrlegal/hrlegal-ui-service';
import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
/**
* searchform部件基类
*
* @export
* @class SearchFormControlBase
* @extends {DefaultSearchFormBase}
*/
export class DefaultSearchFormBase extends SearchFormControlBase {
/**
* 获取部件类型
*
* @protected
* @type {string}
* @memberof DefaultSearchFormBase
*/
protected controlType: string = 'SEARCHFORM';
/**
* 建构部件服务对象
*
* @type {DefaultService}
* @memberof DefaultSearchFormBase
*/
public service: DefaultService = new DefaultService({ $store: this.$store });
/**
* 实体服务对象
*
* @type {HRLegalService}
* @memberof DefaultSearchFormBase
*/
public appEntityService: HRLegalService = new HRLegalService({ $store: this.$store });
/**
* 应用实体名称
*
* @protected
* @type {string}
* @memberof DefaultSearchFormBase
*/
protected appDeName: string = 'hrlegal';
/**
* 表单数据对象
*
* @type {*}
* @memberof DefaultSearchFormBase
*/
public data: any = {
};
/**
* 详情模型集合
*
* @type {*}
* @memberof DefaultSearchFormBase
*/
public detailsModel: any = {
formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
,
};
}
\ No newline at end of file
app_PIM/src/widgets/hrlegal/default-searchform/default-searchform-model.ts 0 → 100644
浏览文件 @ e0482b1b
/**
* Default 部件模型
*
* @export
* @class DefaultModel
*/
export default class DefaultModel {
/**
* 获取数据项集合
*
* @returns {any[]}
* @memberof DefaultModel
*/
public getDataItems(): any[] {
return [
{
name: 'srfwfmemo',
prop: 'srfwfmemo',
dataType: 'TEXT',
},
// 前端新增修改标识，新增为"0",修改为"1"或未设值
{
name: 'srffrontuf',
prop: 'srffrontuf',
dataType: 'TEXT',
},
]
}
}
\ No newline at end of file
app_PIM/src/widgets/hrlegal/default-searchform/default-searchform.html 0 → 100644
浏览文件 @ e0482b1b
<i-form :model="this.data" class='app-search-form' ref='searchform' style="">
<input style="display:none;"/>
<div class="search-button">
<i-button size="small" type="primary" ghost @click="onSearch.apply(_self, arguments)">{{$t('app.searchButton.search')}}</i-button>
<i-button size="small" type="default" ghost @click="onReset.apply(_self, arguments)">{{this.$t('app.searchButton.reset')}}</i-button>
</div>
<div class="form-content">
</div>
</i-form>
\ No newline at end of file
app_PIM/src/widgets/hrlegal/default-searchform/default-searchform.vue 0 → 100644
浏览文件 @ e0482b1b
<template src="./default-searchform.html"/>
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { DefaultSearchFormBase } from './default-searchform-base';
/**
* searchform部件
*
* @export
* @class DefaultSearchForm
* @extends {DefaultSearchFormBase}
*/
@Component({
components: {
}
})
@VueLifeCycleProcessing()
export default class DefaultSearchForm extends DefaultSearchFormBase { }
</script>
app_PIM/src/widgets/hrlegal/main-form/main-form-base.tsx
浏览文件 @ e0482b1b
......@@ -73,6 +73,14 @@ export class MainEditFormBase extends EditFormControlBase {
srfuf: null,
srfdeid: null,
srfsourcekey: null,
legalname: null,
orgcode: null,
shortname: null,
showorder: null,
bank: null,
bankaccount: null,
uscc: null,
memo: null,
legalid: null,
hrlegal:null,
};
......@@ -102,13 +110,13 @@ 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.hrlegal.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.hrlegal.main_form', extractMode: 'ITEM', details: [] } }),
formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
grouppanel1: new FormGroupPanelModel({ caption: '银行账号信息', detailType: 'GROUPPANEL', name: 'grouppanel1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrlegal.main_form', extractMode: 'ITEM', details: [] } }),
group2: new FormGroupPanelModel({ caption: '操作信息', detailType: 'GROUPPANEL', name: 'group2', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrlegal.main_form', extractMode: 'ITEM', details: [] } }),
grouppanel2: new FormGroupPanelModel({ caption: '备注', detailType: 'GROUPPANEL', name: 'grouppanel2', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrlegal.main_form', extractMode: 'ITEM', details: [] } }),
formpage2: new FormPageModel({ caption: '其它', detailType: 'FORMPAGE', name: 'formpage2', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', 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 }),
......@@ -126,8 +134,23 @@ export class MainEditFormBase extends EditFormControlBase {
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
legalname: new FormItemModel({ caption: '法人名称', detailType: 'FORMITEM', name: 'legalname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
orgcode: new FormItemModel({ caption: '组织编码', detailType: 'FORMITEM', name: 'orgcode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
shortname: new FormItemModel({ caption: '组织简称', detailType: 'FORMITEM', name: 'shortname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
showorder: new FormItemModel({ caption: '排序号', detailType: 'FORMITEM', name: 'showorder', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
bank: new FormItemModel({ caption: '开户行', detailType: 'FORMITEM', name: 'bank', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
bankaccount: new FormItemModel({ caption: '银行账号', detailType: 'FORMITEM', name: 'bankaccount', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
uscc: new FormItemModel({ caption: '统一社会信用代码', detailType: 'FORMITEM', name: 'uscc', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
memo: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'memo', visible: true, isShowCaption: false, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
legalid: new FormItemModel({ caption: '法人标识', detailType: 'FORMITEM', name: 'legalid', 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/hrlegal/main-form/main-form-model.ts
浏览文件 @ e0482b1b
......@@ -55,6 +55,46 @@ export default class MainModel {
{
name: 'srfsourcekey',
},
{
name: 'legalname',
prop: 'legalname',
dataType: 'TEXT',
},
{
name: 'orgcode',
prop: 'orgcode',
dataType: 'INHERIT',
},
{
name: 'shortname',
prop: 'shortname',
dataType: 'INHERIT',
},
{
name: 'showorder',
prop: 'showorder',
dataType: 'INHERIT',
},
{
name: 'bank',
prop: 'bank',
dataType: 'TEXT',
},
{
name: 'bankaccount',
prop: 'bankaccount',
dataType: 'TEXT',
},
{
name: 'uscc',
prop: 'uscc',
dataType: 'TEXT',
},
{
name: 'memo',
prop: 'memo',
dataType: 'INHERIT',
},
{
name: 'legalid',
prop: 'legalid',
......
app_PIM/src/widgets/hrlegal/main-form/main-form.html
浏览文件 @ e0482b1b
<i-form :model="this.data" class='app-form' ref='form' id='hrlegal_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.hrlegal.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.hrlegal.main_form.details.group1')" :isShowCaption="true" 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.hrlegal.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :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.legalname.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='legalname' :itemRules="this.rules.legalname" class='' :caption="$t('entities.hrlegal.main_form.details.legalname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.legalname.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.legalname"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.legalname.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.orgcode.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='orgcode' :itemRules="this.rules.orgcode" class='' :caption="$t('entities.hrlegal.main_form.details.orgcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgcode.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.orgcode"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.orgcode.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.shortname.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='shortname' :itemRules="this.rules.shortname" class='' :caption="$t('entities.hrlegal.main_form.details.shortname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.shortname.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.shortname"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.shortname.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.showorder.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='showorder' :itemRules="this.rules.showorder" class='' :caption="$t('entities.hrlegal.main_form.details.showorder')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.showorder.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.showorder"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.showorder.disabled"
type='number'
style="">
</input-box>
</app-form-item>
</i-col>
</row>
</app-form-group>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.grouppanel1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group :model="detailsModel.grouppanel1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hrlegal.main_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="false" >
<app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.grouppanel1" :data="data" :context="context" :viewparams="viewparams"/>
<row>
<i-col class="form-layout-container" v-show="detailsModel.bank.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='bank' :itemRules="this.rules.bank" class='' :caption="$t('entities.hrlegal.main_form.details.bank')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.bank.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.bank"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.bank.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.bankaccount.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='bankaccount' :itemRules="this.rules.bankaccount" class='' :caption="$t('entities.hrlegal.main_form.details.bankaccount')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.bankaccount.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.bankaccount"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.bankaccount.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.uscc.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='uscc' :itemRules="this.rules.uscc" class='' :caption="$t('entities.hrlegal.main_form.details.uscc')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.uscc.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.uscc"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.uscc.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</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.hrlegal.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.hrlegal.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"/>
</i-col>
</row>
</app-form-group>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.grouppanel2.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group :model="detailsModel.grouppanel2" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hrlegal.main_form.details.grouppanel2')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="false" >
<app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.grouppanel2" :data="data" :context="context" :viewparams="viewparams"/>
<row>
<i-col class="form-layout-container" v-show="detailsModel.memo.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='memo' :itemRules="this.rules.memo" class='' :caption="$t('entities.hrlegal.main_form.details.memo')" uiStyle="DEFAULT" :labelWidth="0" :isShowCaption="false" :error="detailsModel.memo.error" :isEmptyCaption="false" labelPos="NONE">
<input-box v-model="data.memo" :textareaId="this.$util.createUUID()" :disabled="detailsModel.memo.disabled" type='textarea' textareaStyle="height:200px;" ></input-box>
</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/hrlegal/main-grid/main-grid-base.tsx 0 → 100644
浏览文件 @ e0482b1b
import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
import { Subject, Subscription } from 'rxjs';
import { Watch, GridControlBase } from '@/studio-core';
import HRLegalService from '@/service/hrlegal/hrlegal-service';
import MainService from './main-grid-service';
import HRLegalUIService from '@/uiservice/hrlegal/hrlegal-ui-service';
import { FormItemModel } from '@/model/form-detail';
/**
* grid部件基类
*
* @export
* @class GridControlBase
* @extends {MainGridBase}
*/
export class MainGridBase extends GridControlBase {
/**
* 获取部件类型
*
* @protected
* @type {string}
* @memberof MainGridBase
*/
protected controlType: string = 'GRID';
/**
* 建构部件服务对象
*
* @type {MainService}
* @memberof MainGridBase
*/
public service: MainService = new MainService({ $store: this.$store });
/**
* 实体服务对象
*
* @type {HRLegalService}
* @memberof MainGridBase
*/
public appEntityService: HRLegalService = new HRLegalService({ $store: this.$store });
/**
* 应用实体名称
*
* @protected
* @type {string}
* @memberof MainGridBase
*/
protected appDeName: string = 'hrlegal';
/**
* 界面UI服务对象
*
* @type {HRLegalUIService}
* @memberof MainBase
*/
public appUIService:HRLegalUIService = new HRLegalUIService(this.$store);
/**
* 界面行为模型
*
* @type {*}
* @memberof MainBase
*/
public ActionModel: any = {
};
/**
* 本地缓存标识
*
* @protected
* @type {string}
* @memberof MainBase
*/
protected localStorageTag: string = 'legal_main_grid';
/**
* 所有列成员
*
* @type {any[]}
* @memberof MainGridBase
*/
public allColumns: any[] = [
{
name: 'legalname',
label: '法人名称',
langtag: 'entities.hrlegal.main_grid.columns.legalname',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'orgcode',
label: '组织编码',
langtag: 'entities.hrlegal.main_grid.columns.orgcode',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'shortname',
label: '组织简称',
langtag: 'entities.hrlegal.main_grid.columns.shortname',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'showorder',
label: '排序号',
langtag: 'entities.hrlegal.main_grid.columns.showorder',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
]
/**
* 获取表格行模型
*
* @type {*}
* @memberof MainGridBase
*/
public getGridRowModel(){
return {
srfkey: new FormItemModel(),
}
}
/**
* 属性值规则
*
* @type {*}
* @memberof MainGridBase
*/
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 MainBase
*/
public hasRowEdit: any = {
'legalname':false,
'orgcode':false,
'shortname':false,
'showorder':false,
};
/**
* 获取对应列class
*
* @param {*} $args row 行数据，column 列数据，rowIndex 行索引，列索引
* @returns {void}
* @memberof MainBase
*/
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 MainGridBase
*/
public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
return super.formatExcelData(filterVal, jsonData, [
]);
}
}
\ No newline at end of file
app_PIM/src/widgets/hrlegal/main-grid/main-grid-model.ts 0 → 100644
浏览文件 @ e0482b1b
/**
* Main 部件模型
*
* @export
* @class MainModel
*/
export default class MainModel {
/**
* 是否是实体数据导出
*
* @returns {any[]}
* @memberof MainGridMode
*/
public isDEExport: boolean = false;
/**
* 获取数据项集合
*
* @returns {any[]}
* @memberof MainGridMode
*/
public getDataItems(): any[] {
if(this.isDEExport){
return [
]
}else{
return [
{
name: 'orgcode',
prop: 'orgcode',
dataType: 'INHERIT',
},
{
name: 'legalname',
prop: 'legalname',
dataType: 'TEXT',
},
{
name: 'showorder',
prop: 'showorder',
dataType: 'INHERIT',
},
{
name: 'shortname',
prop: 'shortname',
dataType: 'INHERIT',
},
{
name: 'srfmajortext',
prop: 'legalname',
dataType: 'TEXT',
},
{
name: 'srfdataaccaction',
prop: 'legalid',
dataType: 'GUID',
},
{
name: 'srfkey',
prop: 'legalid',
dataType: 'GUID',
isEditable:true
},
{
name: 'hrlegal',
prop: 'legalid',
},
{
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/hrlegal/main-grid/main-grid.html 0 → 100644
浏览文件 @ e0482b1b
<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('legalname')">
<el-table-column show-overflow-tooltip :prop="'legalname'" :label="$t('entities.hrlegal.main_grid.columns.legalname')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrlegal.main_grid.columns.legalname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.legalname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('orgcode')">
<el-table-column show-overflow-tooltip :prop="'orgcode'" :label="$t('entities.hrlegal.main_grid.columns.orgcode')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrlegal.main_grid.columns.orgcode')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.orgcode}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('shortname')">
<el-table-column show-overflow-tooltip :prop="'shortname'" :label="$t('entities.hrlegal.main_grid.columns.shortname')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrlegal.main_grid.columns.shortname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.shortname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('showorder')">
<el-table-column show-overflow-tooltip :prop="'showorder'" :label="$t('entities.hrlegal.main_grid.columns.showorder')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrlegal.main_grid.columns.showorder')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.showorder}}</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/hrlegal/main-grid/main-grid.vue 0 → 100644
浏览文件 @ e0482b1b
<template src="./main-grid.html"/>
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { MainGridBase } from './main-grid-base';
/**
* grid部件
*
* @export
* @class MainGrid
* @extends {MainGridBase}
*/
@Component({
components: {
}
})
@VueLifeCycleProcessing()
export default class MainGrid extends MainGridBase { }
</script>
app_PIM/src/widgets/hrorganization/main-grid/main-grid.html
浏览文件 @ e0482b1b
......@@ -24,7 +24,7 @@
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('orgcode')">
<el-table-column show-overflow-tooltip :prop="'orgcode'" :label="$t('entities.hrorganization.main_grid.columns.orgcode')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'orgcode'" :label="$t('entities.hrorganization.main_grid.columns.orgcode')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrorganization.main_grid.columns.orgcode')}}
......@@ -36,7 +36,7 @@
</el-table-column>
</template>
<template v-if="getColumnState('organizationname')">
<el-table-column show-overflow-tooltip :prop="'organizationname'" :label="$t('entities.hrorganization.main_grid.columns.organizationname')" :width="150" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'organizationname'" :label="$t('entities.hrorganization.main_grid.columns.organizationname')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrorganization.main_grid.columns.organizationname')}}
......@@ -48,7 +48,7 @@
</el-table-column>
</template>
<template v-if="getColumnState('organizationtype')">
<el-table-column show-overflow-tooltip :prop="'organizationtype'" :label="$t('entities.hrorganization.main_grid.columns.organizationtype')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'organizationtype'" :label="$t('entities.hrorganization.main_grid.columns.organizationtype')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrorganization.main_grid.columns.organizationtype')}}
......@@ -62,7 +62,7 @@
</el-table-column>
</template>
<template v-if="getColumnState('shortname')">
<el-table-column show-overflow-tooltip :prop="'shortname'" :label="$t('entities.hrorganization.main_grid.columns.shortname')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'shortname'" :label="$t('entities.hrorganization.main_grid.columns.shortname')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrorganization.main_grid.columns.shortname')}}
......@@ -74,7 +74,7 @@
</el-table-column>
</template>
<template v-if="getColumnState('operationunittype')">
<el-table-column show-overflow-tooltip :prop="'operationunittype'" :label="$t('entities.hrorganization.main_grid.columns.operationunittype')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'operationunittype'" :label="$t('entities.hrorganization.main_grid.columns.operationunittype')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrorganization.main_grid.columns.operationunittype')}}
......@@ -88,7 +88,7 @@
</el-table-column>
</template>
<template v-if="getColumnState('showorder')">
<el-table-column show-overflow-tooltip :prop="'showorder'" :label="$t('entities.hrorganization.main_grid.columns.showorder')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'showorder'" :label="$t('entities.hrorganization.main_grid.columns.showorder')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrorganization.main_grid.columns.showorder')}}
......
config.xml
浏览文件 @ e0482b1b
......@@ -37,11 +37,11 @@
git clone -b master $para2 ibizhumanresources/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizhumanresources/
mvn clean package -Phrapi
cd humanresource-provider/humanresource-provider-hrapi
mvn -Phrapi docker:build
mvn -Phrapi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-provider-hrapi.yaml iBizEE --with-registry-auth
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
浏览文件 @ e0482b1b
......@@ -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 8080
EXPOSE 10327
ADD humanresource-app-pim.jar /humanresource-app-pim.jar
humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml
浏览文件 @ e0482b1b
......@@ -3,9 +3,25 @@ services:
humanresource-app-pim:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
ports:
- "8080:8080"
- "10327:10327"
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-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile
浏览文件 @ e0482b1b
......@@ -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-provider-hrapi.jar
EXPOSE 10317
EXPOSE 8081
ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar
humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml
浏览文件 @ e0482b1b
......@@ -3,25 +3,9 @@ services:
humanresource-provider-hrapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
ports:
- "10317:10317"
- "8081:8081"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=10317
- 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:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或