Skip to content

I
ibzrt
提交 6ee9e485 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

zhouweidong 部署微服务应用 [ibiz-rt，ibizlab-runtime]

上级 19c0ba08
显示空白字符变更
内嵌 并排
正在显示 包含 87 行增加 和 5 行删除
app_Web/src/locale/lanres/entities/sys-department/sys-department_en_US_base.ts
浏览文件 @ 6ee9e485
......@@ -117,6 +117,7 @@ function getLocaleResourceBase(){
shortname: commonLogic.appcommonhandle("Others",null),
bcode: commonLogic.appcommonhandle("Condition",null),
leadername: commonLogic.appcommonhandle("分管领导",null),
isvalid: commonLogic.appcommonhandle("启用标识",null),
showorder: commonLogic.appcommonhandle("排序",null),
createdate: commonLogic.appcommonhandle("{0}[{1}] relational data [{2}] cannot be deleted!",null),
updatedate: commonLogic.appcommonhandle("The [{0}] value is not a character type",null),
......
app_Web/src/locale/lanres/entities/sys-department/sys-department_zh_CN_base.ts
浏览文件 @ 6ee9e485
......@@ -117,6 +117,7 @@ function getLocaleResourceBase(){
shortname: commonLogic.appcommonhandle("部门简称",null),
bcode: commonLogic.appcommonhandle("业务编码",null),
leadername: commonLogic.appcommonhandle("分管领导",null),
isvalid: commonLogic.appcommonhandle("启用标识",null),
showorder: commonLogic.appcommonhandle("排序",null),
createdate: commonLogic.appcommonhandle("创建时间",null),
updatedate: commonLogic.appcommonhandle("最后修改时间",null),
......
app_Web/src/locale/lanres/entities/sys-organization/sys-organization_en_US_base.ts
浏览文件 @ 6ee9e485
......@@ -100,6 +100,7 @@ function getLocaleResourceBase(){
shortname: commonLogic.appcommonhandle("Cancel",null),
porgname: commonLogic.appcommonhandle("上级单位",null),
porgid: commonLogic.appcommonhandle("上级单位",null),
isvalid: commonLogic.appcommonhandle("启用标识",null),
showorder: commonLogic.appcommonhandle("排序",null),
createdate: commonLogic.appcommonhandle("Print",null),
updatedate: commonLogic.appcommonhandle("Actor",null),
......
app_Web/src/locale/lanres/entities/sys-organization/sys-organization_zh_CN_base.ts
浏览文件 @ 6ee9e485
......@@ -100,6 +100,7 @@ function getLocaleResourceBase(){
shortname: commonLogic.appcommonhandle("单位简称",null),
porgname: commonLogic.appcommonhandle("上级单位",null),
porgid: commonLogic.appcommonhandle("上级单位",null),
isvalid: commonLogic.appcommonhandle("启用标识",null),
showorder: commonLogic.appcommonhandle("排序",null),
createdate: commonLogic.appcommonhandle("创建时间",null),
updatedate: commonLogic.appcommonhandle("最后修改时间",null),
......
app_Web/src/widgets/sys-department/main-grid/main-grid-base.vue
浏览文件 @ 6ee9e485
......@@ -117,6 +117,20 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('isvalid')">
<el-table-column show-overflow-tooltip :prop="'isvalid'" :label="$t('entities.sysdepartment.main_grid.columns.isvalid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysdepartment.main_grid.columns.isvalid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.isvalid" tag='YesNo' 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.sysdepartment.main_grid.columns.showorder')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......@@ -818,6 +832,15 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'isvalid',
label: '启用标识',
langtag: 'entities.sysdepartment.main_grid.columns.isvalid',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'showorder',
label: '排序',
......@@ -1361,6 +1384,14 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public async formatExcelData(filterVal:any, jsonData:any) {
let codelistColumns:Array<any> = [
{
name: 'isvalid',
srfkey: 'YesNo',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
];
let _this = this;
for (const codelist of codelistColumns) {
......@@ -1567,7 +1598,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['deptcode','deptname','orgname','pdeptname','deptlevel','shortname','bcode','leadername','showorder','createdate','updatedate','orgid','pdeptid','leaderid'];
let allColumns:Array<any> = ['deptcode','deptname','orgname','pdeptname','deptlevel','shortname','bcode','leadername','isvalid','showorder','createdate','updatedate','orgid','pdeptid','leaderid'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1655,6 +1686,7 @@ export default class MainBase extends Vue implements ControlInterface {
shortname:'',
bcode:'',
leadername:'',
isvalid:'',
showorder:'',
createdate:'',
updatedate:'',
......@@ -1695,6 +1727,7 @@ export default class MainBase extends Vue implements ControlInterface {
shortname:'',
bcode:'',
leadername:'',
isvalid:'',
showorder:'',
createdate:'',
updatedate:'',
......@@ -1755,6 +1788,7 @@ export default class MainBase extends Vue implements ControlInterface {
shortname:'',
bcode:'',
leadername:'',
isvalid:'',
showorder:'',
createdate:'',
updatedate:'',
......
app_Web/src/widgets/sys-department/main-grid/main-grid-model.ts
浏览文件 @ 6ee9e485
......@@ -67,6 +67,11 @@ export default class MainModel {
prop: 'leadername',
dataType: 'TEXT',
},
{
name: 'isvalid',
prop: 'isvalid',
dataType: 'YESNO',
},
{
name: 'pdeptid',
prop: 'parentdeptid',
......
app_Web/src/widgets/sys-organization/main-grid/main-grid-base.vue
浏览文件 @ 6ee9e485
......@@ -105,6 +105,20 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('isvalid')">
<el-table-column show-overflow-tooltip :prop="'isvalid'" :label="$t('entities.sysorganization.main_grid.columns.isvalid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysorganization.main_grid.columns.isvalid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.isvalid" tag='YesNo' 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.sysorganization.main_grid.columns.showorder')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......@@ -761,6 +775,15 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'isvalid',
label: '启用标识',
langtag: 'entities.sysorganization.main_grid.columns.isvalid',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'showorder',
label: '排序',
......@@ -1277,6 +1300,14 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public async formatExcelData(filterVal:any, jsonData:any) {
let codelistColumns:Array<any> = [
{
name: 'isvalid',
srfkey: 'YesNo',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
];
let _this = this;
for (const codelist of codelistColumns) {
......@@ -1483,7 +1514,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['orgid','orgcode','orgname','orglevel','shortname','porgname','porgid','showorder','createdate','updatedate'];
let allColumns:Array<any> = ['orgid','orgcode','orgname','orglevel','shortname','porgname','porgid','isvalid','showorder','createdate','updatedate'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1570,6 +1601,7 @@ export default class MainBase extends Vue implements ControlInterface {
shortname:'',
porgname:'',
porgid:'',
isvalid:'',
showorder:'',
createdate:'',
updatedate:'',
......@@ -1606,6 +1638,7 @@ export default class MainBase extends Vue implements ControlInterface {
shortname:'',
porgname:'',
porgid:'',
isvalid:'',
showorder:'',
createdate:'',
updatedate:'',
......@@ -1662,6 +1695,7 @@ export default class MainBase extends Vue implements ControlInterface {
shortname:'',
porgname:'',
porgid:'',
isvalid:'',
showorder:'',
createdate:'',
updatedate:'',
......
app_Web/src/widgets/sys-organization/main-grid/main-grid-model.ts
浏览文件 @ 6ee9e485
......@@ -52,15 +52,20 @@ export default class MainModel {
dataType: 'TEXT',
},
{
name: 'srfkey',
name: 'srfdataaccaction',
prop: 'orgid',
dataType: 'TEXT',
isEditable:true
},
{
name: 'srfdataaccaction',
name: 'srfkey',
prop: 'orgid',
dataType: 'TEXT',
isEditable:true
},
{
name: 'isvalid',
prop: 'isvalid',
dataType: 'YESNO',
},
{
name: 'orgcode',
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或