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

zoo457790531 发布系统代码 [ibz-lite,应用]

上级 abd61bb0
...@@ -44,6 +44,7 @@ function getLocaleResourceBase(){ ...@@ -44,6 +44,7 @@ function getLocaleResourceBase(){
configname: commonLogic.appcommonhandle("名称",null), configname: commonLogic.appcommonhandle("名称",null),
status: commonLogic.appcommonhandle("状态",null), status: commonLogic.appcommonhandle("状态",null),
systemid: commonLogic.appcommonhandle("系统标识",null), systemid: commonLogic.appcommonhandle("系统标识",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
}, },
nodata:commonLogic.appcommonhandle("",null), nodata:commonLogic.appcommonhandle("",null),
uiactions: { uiactions: {
......
...@@ -44,6 +44,7 @@ function getLocaleResourceBase(){ ...@@ -44,6 +44,7 @@ function getLocaleResourceBase(){
configname: commonLogic.appcommonhandle("名称",null), configname: commonLogic.appcommonhandle("名称",null),
status: commonLogic.appcommonhandle("状态",null), status: commonLogic.appcommonhandle("状态",null),
systemid: commonLogic.appcommonhandle("系统标识",null), systemid: commonLogic.appcommonhandle("系统标识",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
}, },
nodata:commonLogic.appcommonhandle("",null), nodata:commonLogic.appcommonhandle("",null),
uiactions: { uiactions: {
......
...@@ -44,6 +44,7 @@ function getLocaleResourceBase(){ ...@@ -44,6 +44,7 @@ function getLocaleResourceBase(){
configname: commonLogic.appcommonhandle("名称",null), configname: commonLogic.appcommonhandle("名称",null),
status: commonLogic.appcommonhandle("状态",null), status: commonLogic.appcommonhandle("状态",null),
systemid: commonLogic.appcommonhandle("系统标识",null), systemid: commonLogic.appcommonhandle("系统标识",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
}, },
nodata:commonLogic.appcommonhandle("",null), nodata:commonLogic.appcommonhandle("",null),
uiactions: { uiactions: {
......
...@@ -60,6 +60,18 @@ ...@@ -60,6 +60,18 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('dynainstid')">
<el-table-column show-overflow-tooltip :prop="'dynainstid'" :label="$t('entities.dynamicmodelconfig.main_grid.columns.dynainstid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.dynamicmodelconfig.main_grid.columns.dynainstid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.dynainstid}}</span>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState"> <template v-if="adaptiveState">
<el-table-column></el-table-column> <el-table-column></el-table-column>
</template> </template>
...@@ -644,6 +656,15 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -644,6 +656,15 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false, isEnableRowEdit: false,
enableCond: 3 , enableCond: 3 ,
}, },
{
name: 'dynainstid',
label: '动态实例标识',
langtag: 'entities.dynamicmodelconfig.main_grid.columns.dynainstid',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
] ]
/** /**
...@@ -1348,7 +1369,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1348,7 +1369,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase * @memberof MainBase
*/ */
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) { public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['configname','status','systemid']; let allColumns:Array<any> = ['configname','status','systemid','dynainstid'];
if(row && row.children) { if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) { if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1]; return [1, allColumns.length+1];
...@@ -1431,6 +1452,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1431,6 +1452,7 @@ export default class MainBase extends Vue implements ControlInterface {
configname:'', configname:'',
status:'', status:'',
systemid:'', systemid:'',
dynainstid:'',
children: children children: children
} }
groupTree.push(tree); groupTree.push(tree);
...@@ -1460,6 +1482,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1460,6 +1482,7 @@ export default class MainBase extends Vue implements ControlInterface {
configname:'', configname:'',
status:'', status:'',
systemid:'', systemid:'',
dynainstid:'',
children: child children: child
} }
if(child && child.length > 0){ if(child && child.length > 0){
...@@ -1509,6 +1532,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1509,6 +1532,7 @@ export default class MainBase extends Vue implements ControlInterface {
configname:'', configname:'',
status:'', status:'',
systemid:'', systemid:'',
dynainstid:'',
children: children, children: children,
} }
groupTree.push(tree); groupTree.push(tree);
......
...@@ -26,6 +26,11 @@ export default class MainModel { ...@@ -26,6 +26,11 @@ export default class MainModel {
] ]
}else{ }else{
return [ return [
{
name: 'dynainstid',
prop: 'dynainstid',
dataType: 'TEXT',
},
{ {
name: 'systemid', name: 'systemid',
prop: 'system_id', prop: 'system_id',
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册