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

tony001 发布系统代码 [后台服务,演示应用]

上级 bbe91609
...@@ -257,7 +257,7 @@ export default class GridExpViewgridexpbarBase extends Vue implements ControlInt ...@@ -257,7 +257,7 @@ export default class GridExpViewgridexpbarBase extends Vue implements ControlInt
* @type {number} * @type {number}
* @memberof GridExpViewgridexpbarBase * @memberof GridExpViewgridexpbarBase
*/ */
public ctrlWidth:number = 0; public ctrlWidth:number = 220;
/** /**
* 控件高度 * 控件高度
......
...@@ -47,18 +47,6 @@ ...@@ -47,18 +47,6 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('ibizcustomername')">
<el-table-column show-overflow-tooltip :prop="'ibizcustomername'" :label="$t('entities.ibizorder.main2_grid.columns.ibizcustomername')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizorder.main2_grid.columns.ibizcustomername')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.ibizcustomername}}</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>
...@@ -634,15 +622,6 @@ export default class Main2Base extends Vue implements ControlInterface { ...@@ -634,15 +622,6 @@ export default class Main2Base extends Vue implements ControlInterface {
isEnableRowEdit: false, isEnableRowEdit: false,
enableCond: 3 , enableCond: 3 ,
}, },
{
name: 'ibizcustomername',
label: '客户名称',
langtag: 'entities.ibizorder.main2_grid.columns.ibizcustomername',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
] ]
/** /**
...@@ -1346,7 +1325,7 @@ export default class Main2Base extends Vue implements ControlInterface { ...@@ -1346,7 +1325,7 @@ export default class Main2Base extends Vue implements ControlInterface {
* @memberof Main2Base * @memberof Main2Base
*/ */
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) { public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['ibizordername','ordertype','ibizcustomername']; let allColumns:Array<any> = ['ibizordername','ordertype'];
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];
...@@ -1428,7 +1407,6 @@ export default class Main2Base extends Vue implements ControlInterface { ...@@ -1428,7 +1407,6 @@ export default class Main2Base extends Vue implements ControlInterface {
group: group.label, group: group.label,
ibizordername:'', ibizordername:'',
ordertype:'', ordertype:'',
ibizcustomername:'',
children: children children: children
} }
groupTree.push(tree); groupTree.push(tree);
...@@ -1458,7 +1436,6 @@ export default class Main2Base extends Vue implements ControlInterface { ...@@ -1458,7 +1436,6 @@ export default class Main2Base extends Vue implements ControlInterface {
group: this.$t('app.gridpage.other'), group: this.$t('app.gridpage.other'),
ibizordername:'', ibizordername:'',
ordertype:'', ordertype:'',
ibizcustomername:'',
children: child children: child
} }
if(child && child.length > 0){ if(child && child.length > 0){
...@@ -1521,7 +1498,6 @@ export default class Main2Base extends Vue implements ControlInterface { ...@@ -1521,7 +1498,6 @@ export default class Main2Base extends Vue implements ControlInterface {
group: group, group: group,
ibizordername:'', ibizordername:'',
ordertype:'', ordertype:'',
ibizcustomername:'',
children: children, children: children,
} }
groupTree.push(tree); groupTree.push(tree);
......
...@@ -41,11 +41,6 @@ export default class Main2Model { ...@@ -41,11 +41,6 @@ export default class Main2Model {
prop: 'ibizorderid', prop: 'ibizorderid',
dataType: 'GUID', dataType: 'GUID',
}, },
{
name: 'ibizcustomername',
prop: 'ibizcustomername',
dataType: 'PICKUPTEXT',
},
{ {
name: 'wfstep', name: 'wfstep',
prop: 'wfstep', prop: 'wfstep',
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册