提交 f4135c49 编写于 作者: ibizdev's avatar ibizdev

jackwang 部署微服务应用

上级 dc134f1b
...@@ -511,7 +511,7 @@ ...@@ -511,7 +511,7 @@
}, },
"hrdistributionv_002": { "hrdistributionv_002": {
"title": "工作人员分配", "title": "工作人员分配",
"caption": "工作人员分配", "caption": "快速新建",
"viewtype": "DEOPTVIEW", "viewtype": "DEOPTVIEW",
"viewmodule": "HumanResource", "viewmodule": "HumanResource",
"viewname": "HRDistributionV_002", "viewname": "HRDistributionV_002",
...@@ -540,8 +540,8 @@ ...@@ -540,8 +540,8 @@
"memo": "" "memo": ""
}, },
"hrpostrelv_002": { "hrpostrelv_002": {
"title": "直接上级职位", "title": "快速新建",
"caption": "直接上级职位", "caption": "快速新建",
"viewtype": "DEOPTVIEW", "viewtype": "DEOPTVIEW",
"viewmodule": "HumanResource", "viewmodule": "HumanResource",
"viewname": "HRPostRelV_002", "viewname": "HRPostRelV_002",
......
...@@ -28,7 +28,7 @@ export default { ...@@ -28,7 +28,7 @@ export default {
title: "工作人员分配编辑视图", title: "工作人员分配编辑视图",
}, },
v_002: { v_002: {
caption: "工作人员分配", caption: "快速新建",
title: "工作人员分配", title: "工作人员分配",
}, },
}, },
...@@ -55,9 +55,9 @@ export default { ...@@ -55,9 +55,9 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
hrdistributionname: "工作人员分配名称", hremployeename: "员工姓名",
updateman: "更新人", begintime: "入职时间",
updatedate: "更新时间", endtime: "离职时间",
}, },
uiactions: { uiactions: {
}, },
......
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
title: "工作人员分配编辑视图", title: "工作人员分配编辑视图",
}, },
v_002: { v_002: {
caption: "工作人员分配", caption: "快速新建",
title: "工作人员分配", title: "工作人员分配",
}, },
}, },
...@@ -54,9 +54,9 @@ export default { ...@@ -54,9 +54,9 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
hrdistributionname: "工作人员分配名称", hremployeename: "员工姓名",
updateman: "更新人", begintime: "入职时间",
updatedate: "更新时间", endtime: "离职时间",
}, },
uiactions: { uiactions: {
}, },
......
...@@ -28,8 +28,8 @@ export default { ...@@ -28,8 +28,8 @@ export default {
title: "职位关系编辑视图", title: "职位关系编辑视图",
}, },
v_002: { v_002: {
caption: "直接上级职位", caption: "快速新建",
title: "直接上级职位", title: "快速新建",
}, },
}, },
main_form: { main_form: {
......
...@@ -27,8 +27,8 @@ export default { ...@@ -27,8 +27,8 @@ export default {
title: "职位关系编辑视图", title: "职位关系编辑视图",
}, },
v_002: { v_002: {
caption: "直接上级职位", caption: "快速新建",
title: "直接上级职位", title: "快速新建",
}, },
}, },
main_form: { main_form: {
......
...@@ -417,7 +417,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -417,7 +417,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
}, },
"hrdistributionv_002": { "hrdistributionv_002": {
"title": "工作人员分配", "title": "工作人员分配",
"caption": "工作人员分配", "caption": "快速新建",
"viewtype": "DEOPTVIEW", "viewtype": "DEOPTVIEW",
"viewmodule": "HumanResource", "viewmodule": "HumanResource",
"viewname": "HRDistributionV_002", "viewname": "HRDistributionV_002",
...@@ -440,8 +440,8 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -440,8 +440,8 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag": "d32b549b3c49b790b092eca97d1de2c1" "viewtag": "d32b549b3c49b790b092eca97d1de2c1"
}, },
"hrpostrelv_002": { "hrpostrelv_002": {
"title": "直接上级职位", "title": "快速新建",
"caption": "直接上级职位", "caption": "快速新建",
"viewtype": "DEOPTVIEW", "viewtype": "DEOPTVIEW",
"viewmodule": "HumanResource", "viewmodule": "HumanResource",
"viewname": "HRPostRelV_002", "viewname": "HRPostRelV_002",
......
<studio-view-style2 viewName="hrdistributionv_002" viewTitle="工作人员分配" class='deoptview hrdistribution-v-002'> <studio-view-style2 viewName="hrdistributionv_002" viewTitle="工作人员分配" class='deoptview hrdistribution-v-002'>
<template slot='title'>
<span class='caption-info'>{{$t(model.srfTitle)}}</span>
</template>
<view_form <view_form
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
......
...@@ -6,7 +6,7 @@ import OptionViewEngine from '@engine/view/option-view-engine'; ...@@ -6,7 +6,7 @@ import OptionViewEngine from '@engine/view/option-view-engine';
import HRPostRelUIService from '@/uiservice/hrpost-rel/hrpost-rel-ui-service'; import HRPostRelUIService from '@/uiservice/hrpost-rel/hrpost-rel-ui-service';
/** /**
* 直接上级职位视图基类 * 快速新建视图基类
* *
* @export * @export
* @class HRPostRelV_002Base * @class HRPostRelV_002Base
......
<studio-view-style2 viewName="hrpostrelv_002" viewTitle="直接上级职位" class='deoptview hrpost-rel-v-002'> <studio-view-style2 viewName="hrpostrelv_002" viewTitle="快速新建" class='deoptview hrpost-rel-v-002'>
<template slot='title'>
<span class='caption-info'>{{$t(model.srfTitle)}}</span>
</template>
<view_form <view_form
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
......
...@@ -6,7 +6,7 @@ import { HRPostRelV_002Base } from './hrpost-rel-v-002-base'; ...@@ -6,7 +6,7 @@ import { HRPostRelV_002Base } from './hrpost-rel-v-002-base';
import view_form from '@widgets/hrpost-rel/main-form/main-form.vue'; import view_form from '@widgets/hrpost-rel/main-form/main-form.vue';
/** /**
* 直接上级职位视图 * 快速新建视图
* *
* @export * @export
* @class HRPostRelV_002 * @class HRPostRelV_002
......
...@@ -101,25 +101,25 @@ export class MainGridBase extends GridControlBase { ...@@ -101,25 +101,25 @@ export class MainGridBase extends GridControlBase {
*/ */
public allColumns: any[] = [ public allColumns: any[] = [
{ {
name: 'hrdistributionname', name: 'hremployeename',
label: '工作人员分配名称', label: '员工姓名',
langtag: 'entities.hrdistribution.main_grid.columns.hrdistributionname', langtag: 'entities.hrdistribution.main_grid.columns.hremployeename',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updateman', name: 'begintime',
label: '更新人', label: '入职时间',
langtag: 'entities.hrdistribution.main_grid.columns.updateman', langtag: 'entities.hrdistribution.main_grid.columns.begintime',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updatedate', name: 'endtime',
label: '更新时间', label: '离职时间',
langtag: 'entities.hrdistribution.main_grid.columns.updatedate', langtag: 'entities.hrdistribution.main_grid.columns.endtime',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
...@@ -158,9 +158,9 @@ export class MainGridBase extends GridControlBase { ...@@ -158,9 +158,9 @@ export class MainGridBase extends GridControlBase {
* @memberof MainBase * @memberof MainBase
*/ */
public hasRowEdit: any = { public hasRowEdit: any = {
'hrdistributionname':false, 'hremployeename':false,
'updateman':false, 'begintime':false,
'updatedate':false, 'endtime':false,
}; };
/** /**
...@@ -186,14 +186,6 @@ export class MainGridBase extends GridControlBase { ...@@ -186,14 +186,6 @@ export class MainGridBase extends GridControlBase {
*/ */
public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> { public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
return super.formatExcelData(filterVal, jsonData, [ return super.formatExcelData(filterVal, jsonData, [
{
name: 'updateman',
srfkey: 'SysOperator',
codelistType : 'DYNAMIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]); ]);
} }
......
...@@ -26,6 +26,11 @@ export default class MainModel { ...@@ -26,6 +26,11 @@ export default class MainModel {
] ]
}else{ }else{
return [ return [
{
name: 'endtime',
prop: 'endtime',
dataType: 'DATE',
},
{ {
name: 'hrpostid', name: 'hrpostid',
prop: 'hrpostid', prop: 'hrpostid',
...@@ -37,19 +42,14 @@ export default class MainModel { ...@@ -37,19 +42,14 @@ export default class MainModel {
dataType: 'PICKUP', dataType: 'PICKUP',
}, },
{ {
name: 'updateman', name: 'hremployeename',
prop: 'updateman', prop: 'hremployeename',
dataType: 'TEXT', dataType: 'PICKUPTEXT',
},
{
name: 'hrdistributionname',
prop: 'hrdistributionname',
dataType: 'TEXT',
}, },
{ {
name: 'updatedate', name: 'begintime',
prop: 'updatedate', prop: 'begintime',
dataType: 'DATETIME', dataType: 'DATE',
}, },
{ {
name: 'srfmajortext', name: 'srfmajortext',
......
...@@ -23,41 +23,39 @@ ...@@ -23,41 +23,39 @@
<template v-if="!isSingleSelect"> <template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column> <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template> </template>
<template v-if="getColumnState('hrdistributionname')"> <template v-if="getColumnState('hremployeename')">
<el-table-column show-overflow-tooltip :prop="'hrdistributionname'" :label="$t('entities.hrdistribution.main_grid.columns.hrdistributionname')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'hremployeename'" :label="$t('entities.hrdistribution.main_grid.columns.hremployeename')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrdistribution.main_grid.columns.hrdistributionname')}} {{$t('entities.hrdistribution.main_grid.columns.hremployeename')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<span>{{row.hrdistributionname}}</span> <span>{{row.hremployeename}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updateman')"> <template v-if="getColumnState('begintime')">
<el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrdistribution.main_grid.columns.updateman')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'begintime'" :label="$t('entities.hrdistribution.main_grid.columns.begintime')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrdistribution.main_grid.columns.updateman')}} {{$t('entities.hrdistribution.main_grid.columns.begintime')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template > <app-format-data format="YYYY-MM-DD" :data="row.begintime"></app-format-data>
<codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updatedate')"> <template v-if="getColumnState('endtime')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrdistribution.main_grid.columns.updatedate')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'endtime'" :label="$t('entities.hrdistribution.main_grid.columns.endtime')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrdistribution.main_grid.columns.updatedate')}} {{$t('entities.hrdistribution.main_grid.columns.endtime')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.updatedate"></app-format-data> <app-format-data format="YYYY-MM-DD" :data="row.endtime"></app-format-data>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<!--输出实体[HRDISTRIBUTION]数据结构 --> <!--输出实体[HRDISTRIBUTION]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrdistribution-29-2"> <changeSet author="a_LAB01_e85d8801c" id="tab-hrdistribution-33-2">
<createTable tableName="T_HRDISTRIBUTION"> <createTable tableName="T_HRDISTRIBUTION">
<column name="UPDATEMAN" remarks="" type="VARCHAR(60)"> <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
</column> </column>
...@@ -380,7 +380,7 @@ ...@@ -380,7 +380,7 @@
<!--输出实体[HRPOSTREL]数据结构 --> <!--输出实体[HRPOSTREL]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrpostrel-27-16"> <changeSet author="a_LAB01_e85d8801c" id="tab-hrpostrel-29-16">
<createTable tableName="T_HRPOSTREL"> <createTable tableName="T_HRPOSTREL">
<column name="CREATEMAN" remarks="" type="VARCHAR(60)"> <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column> </column>
...@@ -408,10 +408,10 @@ ...@@ -408,10 +408,10 @@
<!--输出实体[HRATTENDANCE]外键关系 --> <!--输出实体[HRATTENDANCE]外键关系 -->
<!--输出实体[HRDISTRIBUTION]外键关系 --> <!--输出实体[HRDISTRIBUTION]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrdistribution-29-17"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrdistribution-33-17">
<addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRDISTRIBUTION" constraintName="DER1N_HRDISTRIBUTION_HREMPLOYE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/> <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRDISTRIBUTION" constraintName="DER1N_HRDISTRIBUTION_HREMPLOYE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
</changeSet> </changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hrdistribution-29-18"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrdistribution-33-18">
<addForeignKeyConstraint baseColumnNames="HRPOSTID" baseTableName="T_HRDISTRIBUTION" constraintName="DER1N_HRDISTRIBUTION_HRPOST_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/> <addForeignKeyConstraint baseColumnNames="HRPOSTID" baseTableName="T_HRDISTRIBUTION" constraintName="DER1N_HRDISTRIBUTION_HRPOST_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[HRDUTY]外键关系 --> <!--输出实体[HRDUTY]外键关系 -->
...@@ -455,10 +455,10 @@ ...@@ -455,10 +455,10 @@
<addForeignKeyConstraint baseColumnNames="HRORGANIZATIONID" baseTableName="T_HRPOST" constraintName="DER1N_HRPOST_HRORGANIZATION_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/> <addForeignKeyConstraint baseColumnNames="HRORGANIZATIONID" baseTableName="T_HRPOST" constraintName="DER1N_HRPOST_HRORGANIZATION_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[HRPOSTREL]外键关系 --> <!--输出实体[HRPOSTREL]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrpostrel-27-29"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrpostrel-29-29">
<addForeignKeyConstraint baseColumnNames="HRPOSTID" baseTableName="T_HRPOSTREL" constraintName="DER1N_HRPOSTREL_HRPOST_HRPOSTI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/> <addForeignKeyConstraint baseColumnNames="HRPOSTID" baseTableName="T_HRPOSTREL" constraintName="DER1N_HRPOSTREL_HRPOST_HRPOSTI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
</changeSet> </changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hrpostrel-27-30"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrpostrel-29-30">
<addForeignKeyConstraint baseColumnNames="PHRPOSTID" baseTableName="T_HRPOSTREL" constraintName="DER1N_HRPOSTREL_HRPOST_PHRPOST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/> <addForeignKeyConstraint baseColumnNames="PHRPOSTID" baseTableName="T_HRPOSTREL" constraintName="DER1N_HRPOSTREL_HRPOST_PHRPOST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
</changeSet> </changeSet>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册