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

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

上级 73c6591c
...@@ -718,7 +718,6 @@ export default { ...@@ -718,7 +718,6 @@ export default {
ibizordername: "订单名称", ibizordername: "订单名称",
ordertype: "订单类型", ordertype: "订单类型",
orderstate: "订单状态", orderstate: "订单状态",
memo: "备注",
}, },
nodata:"", nodata:"",
uiactions: { uiactions: {
......
...@@ -717,7 +717,6 @@ export default { ...@@ -717,7 +717,6 @@ export default {
ibizordername: "订单名称", ibizordername: "订单名称",
ordertype: "订单类型", ordertype: "订单类型",
orderstate: "订单状态", orderstate: "订单状态",
memo: "备注",
}, },
nodata:"", nodata:"",
uiactions: { uiactions: {
......
...@@ -254,7 +254,7 @@ export default class ListExpViewlistexpbarBase extends Vue implements ControlInt ...@@ -254,7 +254,7 @@ export default class ListExpViewlistexpbarBase extends Vue implements ControlInt
* @type {number} * @type {number}
* @memberof ListExpViewlistexpbarBase * @memberof ListExpViewlistexpbarBase
*/ */
public ctrlWidth:number = 0; public ctrlWidth:number = 500;
/** /**
* 控件高度 * 控件高度
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('orderstate')"> <template v-if="getColumnState('orderstate')">
<el-table-column show-overflow-tooltip :prop="'orderstate'" :label="$t('entities.ibizorder.main2_grid.columns.orderstate')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'orderstate'" :label="$t('entities.ibizorder.main2_grid.columns.orderstate')" :min-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.ibizorder.main2_grid.columns.orderstate')}} {{$t('entities.ibizorder.main2_grid.columns.orderstate')}}
...@@ -61,18 +61,6 @@ ...@@ -61,18 +61,6 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('memo')">
<el-table-column show-overflow-tooltip :prop="'memo'" :label="$t('entities.ibizorder.main2_grid.columns.memo')" :min-width="1" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizorder.main2_grid.columns.memo')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.memo}}</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>
...@@ -653,15 +641,6 @@ export default class Main2Base extends Vue implements ControlInterface { ...@@ -653,15 +641,6 @@ export default class Main2Base extends Vue implements ControlInterface {
label: '订单状态', label: '订单状态',
langtag: 'entities.ibizorder.main2_grid.columns.orderstate', langtag: 'entities.ibizorder.main2_grid.columns.orderstate',
show: true, show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'memo',
label: '备注',
langtag: 'entities.ibizorder.main2_grid.columns.memo',
show: true,
unit: 'STAR', unit: 'STAR',
isEnableRowEdit: false, isEnableRowEdit: false,
enableCond: 3 , enableCond: 3 ,
...@@ -1377,7 +1356,7 @@ export default class Main2Base extends Vue implements ControlInterface { ...@@ -1377,7 +1356,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','orderstate','memo']; let allColumns:Array<any> = ['ibizordername','ordertype','orderstate'];
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];
...@@ -1460,7 +1439,6 @@ export default class Main2Base extends Vue implements ControlInterface { ...@@ -1460,7 +1439,6 @@ export default class Main2Base extends Vue implements ControlInterface {
ibizordername:'', ibizordername:'',
ordertype:'', ordertype:'',
orderstate:'', orderstate:'',
memo:'',
children: children children: children
} }
groupTree.push(tree); groupTree.push(tree);
...@@ -1491,7 +1469,6 @@ export default class Main2Base extends Vue implements ControlInterface { ...@@ -1491,7 +1469,6 @@ export default class Main2Base extends Vue implements ControlInterface {
ibizordername:'', ibizordername:'',
ordertype:'', ordertype:'',
orderstate:'', orderstate:'',
memo:'',
children: child children: child
} }
if(child && child.length > 0){ if(child && child.length > 0){
...@@ -1555,7 +1532,6 @@ export default class Main2Base extends Vue implements ControlInterface { ...@@ -1555,7 +1532,6 @@ export default class Main2Base extends Vue implements ControlInterface {
ibizordername:'', ibizordername:'',
ordertype:'', ordertype:'',
orderstate:'', orderstate:'',
memo:'',
children: children, children: children,
} }
groupTree.push(tree); groupTree.push(tree);
......
...@@ -31,11 +31,6 @@ export default class Main2Model { ...@@ -31,11 +31,6 @@ export default class Main2Model {
prop: 'ibizcustomerid', prop: 'ibizcustomerid',
dataType: 'PICKUP', dataType: 'PICKUP',
}, },
{
name: 'memo',
prop: 'memo',
dataType: 'LONGTEXT_1000',
},
{ {
name: 'orderstate', name: 'orderstate',
prop: 'orderstate', prop: 'orderstate',
......
...@@ -262,7 +262,7 @@ export default class TreeExpViewtreeexpbarBase extends Vue implements ControlInt ...@@ -262,7 +262,7 @@ export default class TreeExpViewtreeexpbarBase extends Vue implements ControlInt
* @type {number} * @type {number}
* @memberof TreeExpViewtreeexpbarBase * @memberof TreeExpViewtreeexpbarBase
*/ */
public ctrlWidth:number = 0; public ctrlWidth:number = 500;
/** /**
* 可搜索字段名称 * 可搜索字段名称
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册