Skip to content

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

jackwang 部署微服务应用

上级 f1689b09
隐藏空白字符变更
内嵌 并排
正在显示 包含 181 行增加 和 329 行删除
app_PIM/src/locale/lanres/entities/hrlegal/hrlegal_en_US.ts
浏览文件 @ 2561d2ce
......@@ -61,7 +61,6 @@ export default {
legalname: "法人名称",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
organizationtype: "组织类型",
bank: "开户行",
bankaccount: "银行账号",
......@@ -92,7 +91,6 @@ export default {
legalname: "法人名称",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
bank: "开户行",
bankaccount: "银行账号",
uscc: "统一社会信用代码",
......@@ -117,7 +115,6 @@ export default {
legalname: "法人名称",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
legalid: "法人标识",
},
uiactions: {
......@@ -128,7 +125,6 @@ export default {
legalname: "法人名称",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
},
uiactions: {
},
......
app_PIM/src/locale/lanres/entities/hrlegal/hrlegal_zh_CN.ts
浏览文件 @ 2561d2ce
......@@ -60,7 +60,6 @@ export default {
legalname: "法人名称",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
organizationtype: "组织类型",
bank: "开户行",
bankaccount: "银行账号",
......@@ -91,7 +90,6 @@ export default {
legalname: "法人名称",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
bank: "开户行",
bankaccount: "银行账号",
uscc: "统一社会信用代码",
......@@ -116,7 +114,6 @@ export default {
legalname: "法人名称",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
legalid: "法人标识",
},
uiactions: {
......@@ -127,7 +124,6 @@ export default {
legalname: "法人名称",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
},
uiactions: {
},
......
app_PIM/src/locale/lanres/entities/hroperation-unit/hroperation-unit_en_US.ts
浏览文件 @ 2561d2ce
......@@ -55,10 +55,9 @@ export default {
srfdeid: "",
srfsourcekey: "",
operationunitname: "运营单位名称",
operationunittype: "运营单位类型",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
operationunittype: "运营单位类型",
organizationtype: "组织类型",
memo: "备注",
operationunitid: "运营单位标识",
......@@ -83,10 +82,9 @@ export default {
srfdeid: "",
srfsourcekey: "",
operationunitname: "运营单位名称",
operationunittype: "运营单位类型",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
operationunittype: "运营单位类型",
memo: "备注",
operationunitid: "运营单位标识",
},
......@@ -106,10 +104,9 @@ export default {
srfdeid: "",
srfsourcekey: "",
operationunitname: "运营单位名称",
operationunittype: "运营单位类型",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
operationunittype: "运营单位类型",
operationunitid: "运营单位标识",
},
uiactions: {
......@@ -118,10 +115,9 @@ export default {
main_grid: {
columns: {
operationunitname: "运营单位名称",
operationunittype: "运营单位类型",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
operationunittype: "运营单位类型",
},
uiactions: {
},
......
app_PIM/src/locale/lanres/entities/hroperation-unit/hroperation-unit_zh_CN.ts
浏览文件 @ 2561d2ce
......@@ -54,10 +54,9 @@ export default {
srfdeid: "",
srfsourcekey: "",
operationunitname: "运营单位名称",
operationunittype: "运营单位类型",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
operationunittype: "运营单位类型",
organizationtype: "组织类型",
memo: "备注",
operationunitid: "运营单位标识",
......@@ -82,10 +81,9 @@ export default {
srfdeid: "",
srfsourcekey: "",
operationunitname: "运营单位名称",
operationunittype: "运营单位类型",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
operationunittype: "运营单位类型",
memo: "备注",
operationunitid: "运营单位标识",
},
......@@ -105,10 +103,9 @@ export default {
srfdeid: "",
srfsourcekey: "",
operationunitname: "运营单位名称",
operationunittype: "运营单位类型",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
operationunittype: "运营单位类型",
operationunitid: "运营单位标识",
},
uiactions: {
......@@ -117,10 +114,9 @@ export default {
main_grid: {
columns: {
operationunitname: "运营单位名称",
operationunittype: "运营单位类型",
orgcode: "组织编码",
shortname: "组织简称",
showorder: "排序号",
operationunittype: "运营单位类型",
},
uiactions: {
},
......
app_PIM/src/locale/lanres/entities/hrorganization/hrorganization_en_US.ts
浏览文件 @ 2561d2ce
......@@ -63,12 +63,11 @@ export default {
},
main_grid: {
columns: {
orgcode: "组织编码",
organizationname: "组织名称",
organizationtype: "组织类型",
orgcode: "组织编码",
shortname: "组织简称",
organizationtype: "组织类型",
operationunittype: "运营单位类型",
showorder: "排序号",
},
uiactions: {
},
......
app_PIM/src/locale/lanres/entities/hrorganization/hrorganization_zh_CN.ts
浏览文件 @ 2561d2ce
......@@ -62,12 +62,11 @@ export default {
},
main_grid: {
columns: {
orgcode: "组织编码",
organizationname: "组织名称",
organizationtype: "组织类型",
orgcode: "组织编码",
shortname: "组织简称",
organizationtype: "组织类型",
operationunittype: "运营单位类型",
showorder: "排序号",
},
uiactions: {
},
......
app_PIM/src/widgets/hrlegal/ef-001-form/ef-001-form-base.tsx
浏览文件 @ 2561d2ce
......@@ -85,7 +85,6 @@ export class EF_001EditFormBase extends EditFormControlBase {
legalname: null,
orgcode: null,
shortname: null,
showorder: null,
legalid: null,
hrlegal:null,
};
......@@ -97,6 +96,18 @@ export class EF_001EditFormBase extends EditFormControlBase {
* @memberof EF_001EditFormBase
*/
public rules: any = {
legalname: [
{ required: true, type: 'string', message: '法人名称 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '法人名称 值不能为空', trigger: 'blur' },
],
orgcode: [
{ required: true, type: 'string', message: '组织编码 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '组织编码 值不能为空', trigger: 'blur' },
],
shortname: [
{ required: true, type: 'string', message: '组织简称 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '组织简称 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -141,8 +152,6 @@ export class EF_001EditFormBase extends EditFormControlBase {
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 }),
legalid: new FormItemModel({ caption: '法人标识', detailType: 'FORMITEM', name: 'legalid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
};
......
app_PIM/src/widgets/hrlegal/ef-001-form/ef-001-form-model.ts
浏览文件 @ 2561d2ce
......@@ -70,11 +70,6 @@ export default class EF_001Model {
prop: 'shortname',
dataType: 'INHERIT',
},
{
name: 'showorder',
prop: 'showorder',
dataType: 'INHERIT',
},
{
name: 'legalid',
prop: 'legalid',
......
app_PIM/src/widgets/hrlegal/ef-001-form/ef-001-form.html
浏览文件 @ 2561d2ce
......@@ -47,20 +47,6 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.showorder.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='showorder' :itemRules="this.rules.showorder" class='' :caption="$t('entities.hrlegal.ef_001_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_PIM/src/widgets/hrlegal/if-001-form/if-001-form-base.tsx
浏览文件 @ 2561d2ce
......@@ -94,7 +94,6 @@ export class IF_001EditFormBase extends EditFormControlBase {
legalname: null,
orgcode: null,
shortname: null,
showorder: null,
bank: null,
bankaccount: null,
uscc: null,
......@@ -164,8 +163,6 @@ export class IF_001EditFormBase extends EditFormControlBase {
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 }),
......
app_PIM/src/widgets/hrlegal/if-001-form/if-001-form-model.ts
浏览文件 @ 2561d2ce
......@@ -70,11 +70,6 @@ export default class IF_001Model {
prop: 'shortname',
dataType: 'INHERIT',
},
{
name: 'showorder',
prop: 'showorder',
dataType: 'INHERIT',
},
{
name: 'bank',
prop: 'bank',
......
app_PIM/src/widgets/hrlegal/if-001-form/if-001-form.html
浏览文件 @ 2561d2ce
......@@ -35,16 +35,6 @@
</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.if_001_form.details.showorder')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.showorder.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='showorder' :value="data.showorder" dataType="INHERIT" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
</row>
......
app_PIM/src/widgets/hrlegal/main-form/main-form-base.tsx
浏览文件 @ 2561d2ce
......@@ -85,7 +85,6 @@ export class MainEditFormBase extends EditFormControlBase {
legalname: null,
orgcode: null,
shortname: null,
showorder: null,
organizationtype: null,
bank: null,
bankaccount: null,
......@@ -102,6 +101,18 @@ export class MainEditFormBase extends EditFormControlBase {
* @memberof MainEditFormBase
*/
public rules: any = {
legalname: [
{ required: true, type: 'string', message: '法人名称 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '法人名称 值不能为空', trigger: 'blur' },
],
orgcode: [
{ required: true, type: 'string', message: '组织编码 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '组织编码 值不能为空', trigger: 'blur' },
],
shortname: [
{ required: true, type: 'string', message: '组织简称 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '组织简称 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -150,8 +161,6 @@ export class MainEditFormBase extends EditFormControlBase {
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 }),
organizationtype: new FormItemModel({ caption: '组织类型', detailType: 'FORMITEM', name: 'organizationtype', 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 }),
......
app_PIM/src/widgets/hrlegal/main-form/main-form-model.ts
浏览文件 @ 2561d2ce
......@@ -70,11 +70,6 @@ export default class MainModel {
prop: 'shortname',
dataType: 'INHERIT',
},
{
name: 'showorder',
prop: 'showorder',
dataType: 'INHERIT',
},
{
name: 'organizationtype',
prop: 'organizationtype',
......
app_PIM/src/widgets/hrlegal/main-form/main-form.html
浏览文件 @ 2561d2ce
......@@ -47,20 +47,6 @@
</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_PIM/src/widgets/hrlegal/main-grid/main-grid-base.tsx
浏览文件 @ 2561d2ce
......@@ -99,7 +99,7 @@ export class MainGridBase extends GridControlBase {
* @type {string}
* @memberof MainGridBase
*/
public minorSortPSDEF: string = 'showorder';
public minorSortPSDEF: string = 'orgcode';
/**
* 所有列成员
......@@ -132,14 +132,6 @@ export class MainGridBase extends GridControlBase {
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'showorder',
label: '排序号',
langtag: 'entities.hrlegal.main_grid.columns.showorder',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
]
/**
......@@ -177,7 +169,6 @@ export class MainGridBase extends GridControlBase {
'legalname':false,
'orgcode':false,
'shortname':false,
'showorder':false,
};
/**
......
app_PIM/src/widgets/hrlegal/main-grid/main-grid-model.ts
浏览文件 @ 2561d2ce
......@@ -36,11 +36,6 @@ export default class MainModel {
prop: 'legalname',
dataType: 'TEXT',
},
{
name: 'showorder',
prop: 'showorder',
dataType: 'INHERIT',
},
{
name: 'shortname',
prop: 'shortname',
......
app_PIM/src/widgets/hrlegal/main-grid/main-grid.html
浏览文件 @ 2561d2ce
......@@ -59,18 +59,6 @@
</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="150" :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>
......
app_PIM/src/widgets/hroperation-unit/ef-001-form/ef-001-form-base.tsx
浏览文件 @ 2561d2ce
......@@ -83,10 +83,9 @@ export class EF_001EditFormBase extends EditFormControlBase {
srfdeid: null,
srfsourcekey: null,
operationunitname: null,
operationunittype: null,
orgcode: null,
shortname: null,
showorder: null,
operationunittype: null,
operationunitid: null,
hroperationunit:null,
};
......@@ -98,6 +97,22 @@ export class EF_001EditFormBase extends EditFormControlBase {
* @memberof EF_001EditFormBase
*/
public rules: any = {
operationunitname: [
{ required: true, type: 'string', message: '运营单位名称 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '运营单位名称 值不能为空', trigger: 'blur' },
],
orgcode: [
{ required: true, type: 'string', message: '组织编码 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '组织编码 值不能为空', trigger: 'blur' },
],
shortname: [
{ required: true, type: 'string', message: '组织简称 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '组织简称 值不能为空', trigger: 'blur' },
],
operationunittype: [
{ required: true, type: 'string', message: '运营单位类型 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '运营单位类型 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -138,13 +153,11 @@ export class EF_001EditFormBase extends EditFormControlBase {
operationunitname: new FormItemModel({ caption: '运营单位名称', detailType: 'FORMITEM', name: 'operationunitname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
operationunittype: new FormItemModel({ caption: '运营单位类型', detailType: 'FORMITEM', name: 'operationunittype', 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 }),
operationunittype: new FormItemModel({ caption: '运营单位类型', detailType: 'FORMITEM', name: 'operationunittype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
operationunitid: new FormItemModel({ caption: '运营单位标识', detailType: 'FORMITEM', name: 'operationunitid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......
app_PIM/src/widgets/hroperation-unit/ef-001-form/ef-001-form-model.ts
浏览文件 @ 2561d2ce
......@@ -60,11 +60,6 @@ export default class EF_001Model {
prop: 'operationunitname',
dataType: 'TEXT',
},
{
name: 'operationunittype',
prop: 'operationunittype',
dataType: 'INHERIT',
},
{
name: 'orgcode',
prop: 'orgcode',
......@@ -76,8 +71,8 @@ export default class EF_001Model {
dataType: 'INHERIT',
},
{
name: 'showorder',
prop: 'showorder',
name: 'operationunittype',
prop: 'operationunittype',
dataType: 'INHERIT',
},
{
......
app_PIM/src/widgets/hroperation-unit/ef-001-form/ef-001-form.html
浏览文件 @ 2561d2ce
......@@ -19,26 +19,6 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.operationunittype.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
<app-form-item name='operationunittype' :itemRules="this.rules.operationunittype" class='' :caption="$t('entities.hroperationunit.ef_001_form.details.operationunittype')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.operationunittype.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list
v-model="data.operationunittype"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.operationunittype.disabled"
valueType="string"
tag='CL_HR_0001'
codelistType='STATIC'
placeholder='请选择...'
/>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.orgcode.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
<app-form-item name='orgcode' :itemRules="this.rules.orgcode" class='' :caption="$t('entities.hroperationunit.ef_001_form.details.orgcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgcode.error" :isEmptyCaption="false" labelPos="LEFT">
......@@ -68,17 +48,23 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.showorder.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
<app-form-item name='showorder' :itemRules="this.rules.showorder" class='' :caption="$t('entities.hroperationunit.ef_001_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>
<i-col class="form-layout-container" v-show="detailsModel.operationunittype.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
<app-form-item name='operationunittype' :itemRules="this.rules.operationunittype" class='' :caption="$t('entities.hroperationunit.ef_001_form.details.operationunittype')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.operationunittype.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list
v-model="data.operationunittype"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.operationunittype.disabled"
valueType="string"
tag='CL_HR_0001'
codelistType='STATIC'
placeholder='请选择...'
/>
</app-form-item>
</i-col>
......
app_PIM/src/widgets/hroperation-unit/if-001-form/if-001-form-base.tsx
浏览文件 @ 2561d2ce
......@@ -92,10 +92,9 @@ export class IF_001EditFormBase extends EditFormControlBase {
srfdeid: null,
srfsourcekey: null,
operationunitname: null,
operationunittype: null,
orgcode: null,
shortname: null,
showorder: null,
operationunittype: null,
memo: null,
operationunitid: null,
hroperationunit:null,
......@@ -156,13 +155,11 @@ export class IF_001EditFormBase extends EditFormControlBase {
operationunitname: new FormItemModel({ caption: '运营单位名称', detailType: 'FORMITEM', name: 'operationunitname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
operationunittype: new FormItemModel({ caption: '运营单位类型', detailType: 'FORMITEM', name: 'operationunittype', 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 }),
operationunittype: new FormItemModel({ caption: '运营单位类型', detailType: 'FORMITEM', name: 'operationunittype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
memo: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'memo', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......
app_PIM/src/widgets/hroperation-unit/if-001-form/if-001-form-model.ts
浏览文件 @ 2561d2ce
......@@ -60,11 +60,6 @@ export default class IF_001Model {
prop: 'operationunitname',
dataType: 'TEXT',
},
{
name: 'operationunittype',
prop: 'operationunittype',
dataType: 'INHERIT',
},
{
name: 'orgcode',
prop: 'orgcode',
......@@ -76,8 +71,8 @@ export default class IF_001Model {
dataType: 'INHERIT',
},
{
name: 'showorder',
prop: 'showorder',
name: 'operationunittype',
prop: 'operationunittype',
dataType: 'INHERIT',
},
{
......
app_PIM/src/widgets/hroperation-unit/if-001-form/if-001-form.html
浏览文件 @ 2561d2ce
......@@ -15,16 +15,6 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.operationunittype.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='operationunittype' :itemRules="this.rules.operationunittype" class='' :caption="$t('entities.hroperationunit.if_001_form.details.operationunittype')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.operationunittype.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='operationunittype' :value="data.operationunittype" dataType="INHERIT" :precision="0"
tag='CL_HR_0001' codelistType='STATIC' :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.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.hroperationunit.if_001_form.details.orgcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgcode.error" :isEmptyCaption="false" labelPos="LEFT">
......@@ -46,11 +36,11 @@ tag='CL_HR_0001' codelistType='STATIC' :data="data" :context="context" :viewpara
</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.hroperationunit.if_001_form.details.showorder')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.showorder.error" :isEmptyCaption="false" labelPos="LEFT">
<i-col class="form-layout-container" v-show="detailsModel.operationunittype.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='operationunittype' :itemRules="this.rules.operationunittype" class='' :caption="$t('entities.hroperationunit.if_001_form.details.operationunittype')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.operationunittype.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='showorder' :value="data.showorder" dataType="INHERIT" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
<app-span name='operationunittype' :value="data.operationunittype" dataType="INHERIT" :precision="0"
tag='CL_HR_0001' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
......
app_PIM/src/widgets/hroperation-unit/main-form/main-form-base.tsx
浏览文件 @ 2561d2ce
......@@ -83,10 +83,9 @@ export class MainEditFormBase extends EditFormControlBase {
srfdeid: null,
srfsourcekey: null,
operationunitname: null,
operationunittype: null,
orgcode: null,
shortname: null,
showorder: null,
operationunittype: null,
organizationtype: null,
memo: null,
operationunitid: null,
......@@ -100,6 +99,22 @@ export class MainEditFormBase extends EditFormControlBase {
* @memberof MainEditFormBase
*/
public rules: any = {
operationunitname: [
{ required: true, type: 'string', message: '运营单位名称 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '运营单位名称 值不能为空', trigger: 'blur' },
],
orgcode: [
{ required: true, type: 'string', message: '组织编码 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '组织编码 值不能为空', trigger: 'blur' },
],
shortname: [
{ required: true, type: 'string', message: '组织简称 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '组织简称 值不能为空', trigger: 'blur' },
],
operationunittype: [
{ required: true, type: 'string', message: '运营单位类型 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '运营单位类型 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -142,13 +157,11 @@ export class MainEditFormBase extends EditFormControlBase {
operationunitname: new FormItemModel({ caption: '运营单位名称', detailType: 'FORMITEM', name: 'operationunitname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
operationunittype: new FormItemModel({ caption: '运营单位类型', detailType: 'FORMITEM', name: 'operationunittype', 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 }),
operationunittype: new FormItemModel({ caption: '运营单位类型', detailType: 'FORMITEM', name: 'operationunittype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
organizationtype: new FormItemModel({ caption: '组织类型', detailType: 'FORMITEM', name: 'organizationtype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......
app_PIM/src/widgets/hroperation-unit/main-form/main-form-model.ts
浏览文件 @ 2561d2ce
......@@ -60,11 +60,6 @@ export default class MainModel {
prop: 'operationunitname',
dataType: 'TEXT',
},
{
name: 'operationunittype',
prop: 'operationunittype',
dataType: 'INHERIT',
},
{
name: 'orgcode',
prop: 'orgcode',
......@@ -76,8 +71,8 @@ export default class MainModel {
dataType: 'INHERIT',
},
{
name: 'showorder',
prop: 'showorder',
name: 'operationunittype',
prop: 'operationunittype',
dataType: 'INHERIT',
},
{
......
app_PIM/src/widgets/hroperation-unit/main-form/main-form.html
浏览文件 @ 2561d2ce
......@@ -19,26 +19,6 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.operationunittype.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='operationunittype' :itemRules="this.rules.operationunittype" class='' :caption="$t('entities.hroperationunit.main_form.details.operationunittype')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.operationunittype.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list
v-model="data.operationunittype"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.operationunittype.disabled"
valueType="string"
tag='CL_HR_0001'
codelistType='STATIC'
placeholder='请选择...'
/>
</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.hroperationunit.main_form.details.orgcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgcode.error" :isEmptyCaption="false" labelPos="LEFT">
......@@ -68,17 +48,23 @@
</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.hroperationunit.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>
<i-col class="form-layout-container" v-show="detailsModel.operationunittype.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='operationunittype' :itemRules="this.rules.operationunittype" class='' :caption="$t('entities.hroperationunit.main_form.details.operationunittype')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.operationunittype.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list
v-model="data.operationunittype"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.operationunittype.disabled"
valueType="string"
tag='CL_HR_0001'
codelistType='STATIC'
placeholder='请选择...'
/>
</app-form-item>
</i-col>
......
app_PIM/src/widgets/hroperation-unit/main-grid/main-grid-base.tsx
浏览文件 @ 2561d2ce
......@@ -99,7 +99,7 @@ export class MainGridBase extends GridControlBase {
* @type {string}
* @memberof MainGridBase
*/
public minorSortPSDEF: string = 'showorder';
public minorSortPSDEF: string = 'orgcode';
/**
* 所有列成员
......@@ -116,14 +116,6 @@ export class MainGridBase extends GridControlBase {
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'operationunittype',
label: '运营单位类型',
langtag: 'entities.hroperationunit.main_grid.columns.operationunittype',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'orgcode',
label: '组织编码',
......@@ -141,9 +133,9 @@ export class MainGridBase extends GridControlBase {
isEnableRowEdit: false,
},
{
name: 'showorder',
label: '排序号',
langtag: 'entities.hroperationunit.main_grid.columns.showorder',
name: 'operationunittype',
label: '运营单位类型',
langtag: 'entities.hroperationunit.main_grid.columns.operationunittype',
show: true,
util: 'PX',
isEnableRowEdit: false,
......@@ -183,10 +175,9 @@ export class MainGridBase extends GridControlBase {
*/
public hasRowEdit: any = {
'operationunitname':false,
'operationunittype':false,
'orgcode':false,
'shortname':false,
'showorder':false,
'operationunittype':false,
};
/**
......
app_PIM/src/widgets/hroperation-unit/main-grid/main-grid-model.ts
浏览文件 @ 2561d2ce
......@@ -31,11 +31,6 @@ export default class MainModel {
prop: 'orgcode',
dataType: 'INHERIT',
},
{
name: 'showorder',
prop: 'showorder',
dataType: 'INHERIT',
},
{
name: 'shortname',
prop: 'shortname',
......
app_PIM/src/widgets/hroperation-unit/main-grid/main-grid.html
浏览文件 @ 2561d2ce
......@@ -35,20 +35,6 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('operationunittype')">
<el-table-column show-overflow-tooltip :prop="'operationunittype'" :label="$t('entities.hroperationunit.main_grid.columns.operationunittype')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hroperationunit.main_grid.columns.operationunittype')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.operationunittype" tag='CL_HR_0001' codelistType='STATIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('orgcode')">
<el-table-column show-overflow-tooltip :prop="'orgcode'" :label="$t('entities.hroperationunit.main_grid.columns.orgcode')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......@@ -73,15 +59,17 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('showorder')">
<el-table-column show-overflow-tooltip :prop="'showorder'" :label="$t('entities.hroperationunit.main_grid.columns.showorder')" :width="150" :align="'left'" :sortable="'custom'">
<template v-if="getColumnState('operationunittype')">
<el-table-column show-overflow-tooltip :prop="'operationunittype'" :label="$t('entities.hroperationunit.main_grid.columns.operationunittype')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hroperationunit.main_grid.columns.showorder')}}
{{$t('entities.hroperationunit.main_grid.columns.operationunittype')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.showorder}}</span>
<template >
<codelist :value="row.operationunittype" tag='CL_HR_0001' codelistType='STATIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
......
app_PIM/src/widgets/hrorganization/main-grid/main-grid-base.tsx
浏览文件 @ 2561d2ce
......@@ -85,6 +85,22 @@ export class MainGridBase extends GridControlBase {
*/
protected localStorageTag: string = 'hrorganization_main_grid';
/**
* 排序方向
*
* @type {string}
* @memberof MainGridBase
*/
public minorSortDir: string = 'ASC';
/**
* 排序字段
*
* @type {string}
* @memberof MainGridBase
*/
public minorSortPSDEF: string = 'orgcode';
/**
* 所有列成员
*
......@@ -92,14 +108,6 @@ export class MainGridBase extends GridControlBase {
* @memberof MainGridBase
*/
public allColumns: any[] = [
{
name: 'orgcode',
label: '组织编码',
langtag: 'entities.hrorganization.main_grid.columns.orgcode',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'organizationname',
label: '组织名称',
......@@ -109,9 +117,9 @@ export class MainGridBase extends GridControlBase {
isEnableRowEdit: false,
},
{
name: 'organizationtype',
label: '组织类型',
langtag: 'entities.hrorganization.main_grid.columns.organizationtype',
name: 'orgcode',
label: '组织编码',
langtag: 'entities.hrorganization.main_grid.columns.orgcode',
show: true,
util: 'PX',
isEnableRowEdit: false,
......@@ -125,17 +133,17 @@ export class MainGridBase extends GridControlBase {
isEnableRowEdit: false,
},
{
name: 'operationunittype',
label: '运营单位类型',
langtag: 'entities.hrorganization.main_grid.columns.operationunittype',
name: 'organizationtype',
label: '组织类型',
langtag: 'entities.hrorganization.main_grid.columns.organizationtype',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'showorder',
label: '排序号',
langtag: 'entities.hrorganization.main_grid.columns.showorder',
name: 'operationunittype',
label: '运营单位类型',
langtag: 'entities.hrorganization.main_grid.columns.operationunittype',
show: true,
util: 'PX',
isEnableRowEdit: false,
......@@ -174,12 +182,11 @@ export class MainGridBase extends GridControlBase {
* @memberof MainBase
*/
public hasRowEdit: any = {
'orgcode':false,
'organizationname':false,
'organizationtype':false,
'orgcode':false,
'shortname':false,
'organizationtype':false,
'operationunittype':false,
'showorder':false,
};
/**
......
app_PIM/src/widgets/hrorganization/main-grid/main-grid-model.ts
浏览文件 @ 2561d2ce
......@@ -41,11 +41,6 @@ export default class MainModel {
prop: 'organizationtype',
dataType: 'SSCODELIST',
},
{
name: 'showorder',
prop: 'showorder',
dataType: 'BIGINT',
},
{
name: 'shortname',
prop: 'shortname',
......
app_PIM/src/widgets/hrorganization/main-grid/main-grid.html
浏览文件 @ 2561d2ce
......@@ -23,18 +23,6 @@
<template v-if="!isSingleSelect">
<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="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrorganization.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('organizationname')">
<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}">
......@@ -47,17 +35,15 @@
</template>
</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="150" :align="'left'" :sortable="'custom'">
<template v-if="getColumnState('orgcode')">
<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.organizationtype')}}
{{$t('entities.hrorganization.main_grid.columns.orgcode')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.organizationtype" tag='OrganizationType' codelistType='STATIC' ></codelist>
</template>
<span>{{row.orgcode}}</span>
</template>
</el-table-column>
</template>
......@@ -73,29 +59,31 @@
</template>
</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="150" :align="'left'" :sortable="'custom'">
<template v-if="getColumnState('organizationtype')">
<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.operationunittype')}}
{{$t('entities.hrorganization.main_grid.columns.organizationtype')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.operationunittype" tag='CL_HR_0001' codelistType='STATIC' ></codelist>
<codelist :value="row.organizationtype" tag='OrganizationType' codelistType='STATIC' ></codelist>
</template>
</template>
</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="150" :align="'left'" :sortable="'custom'">
<template v-if="getColumnState('operationunittype')">
<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.showorder')}}
{{$t('entities.hrorganization.main_grid.columns.operationunittype')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.showorder}}</span>
<template >
<codelist :value="row.operationunittype" tag='CL_HR_0001' codelistType='STATIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 2561d2ce
......@@ -52,7 +52,7 @@
<!--输出实体[HRDUTY]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrduty-58-3">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrduty-63-3">
<createTable tableName="T_HRDUTY">
<column name="HRDUTYID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRDUTY_HRDUTYID"/>
......@@ -74,7 +74,7 @@
<!--输出实体[HRDUTYCERT]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrdutycert-21-4">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrdutycert-23-4">
<createTable tableName="T_HRDUTYCERT">
<column name="HRDUTYCERTNAME" remarks="" type="VARCHAR(200)">
</column>
......@@ -100,7 +100,7 @@
<!--输出实体[HRDUTYEDU]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrdutyedu-20-5">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrdutyedu-22-5">
<createTable tableName="T_HRDUTYEDU">
<column name="HRDUTYEDUID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRDUTYEDU_HRDUTYEDUID"/>
......@@ -126,7 +126,7 @@
<!--输出实体[HRDUTYSKILL]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrdutyskill-19-6">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrdutyskill-21-6">
<createTable tableName="T_HRDUTYSKILL">
<column name="HRDUTYSKILLNAME" remarks="" type="VARCHAR(200)">
</column>
......@@ -194,7 +194,7 @@
<!--输出实体[HRLEGAL]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrlegal-82-9">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrlegal-88-9">
<createTable tableName="LEGAL">
<column name="LEGALNAME" remarks="" type="VARCHAR(200)">
</column>
......@@ -314,7 +314,7 @@
<!--输出实体[HROPERATIONUNIT]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hroperationunit-57-14">
<changeSet author="a_LAB01_e85d8801c" id="tab-hroperationunit-64-14">
<createTable tableName="OPERATIONUNIT">
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
......@@ -392,7 +392,7 @@
<!--输出实体[HRORGANIZATION]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrorganization-29-17">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrorganization-32-17">
<createTable tableName="ORGANIZATION">
<column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
</column>
......@@ -496,15 +496,15 @@
</changeSet>
<!--输出实体[HRDUTY]外键关系 -->
<!--输出实体[HRDUTYCERT]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrdutycert-21-22">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrdutycert-23-22">
<addForeignKeyConstraint baseColumnNames="HRDUTYID" baseTableName="T_HRDUTYCERT" constraintName="DER1N_HRDUTYCERT_HRDUTY_HRDUTY" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRDUTYID" referencedTableName="T_HRDUTY" validate="true"/>
</changeSet>
<!--输出实体[HRDUTYEDU]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrdutyedu-20-23">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrdutyedu-22-23">
<addForeignKeyConstraint baseColumnNames="HRDUTYID" baseTableName="T_HRDUTYEDU" constraintName="DER1N_HRDUTYEDU_HRDUTY_HRDUTYI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRDUTYID" referencedTableName="T_HRDUTY" validate="true"/>
</changeSet>
<!--输出实体[HRDUTYSKILL]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrdutyskill-19-24">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrdutyskill-21-24">
<addForeignKeyConstraint baseColumnNames="HRDUTYID" baseTableName="T_HRDUTYSKILL" constraintName="DER1N_HRDUTYSKILL_HRDUTY_HRDUT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRDUTYID" referencedTableName="T_HRDUTY" validate="true"/>
</changeSet>
<!--输出实体[HREMPLOYEE]外键关系 -->
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或