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

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

上级 69ecb0f1
......@@ -677,9 +677,11 @@ export default {
columns: {
orderuid: "订单编号",
ibizordername: "订单名称",
ordertime: "订单时间",
orderstate: "订单状态",
ordertype: "订单类型",
ordertime: "订单时间",
updatedate: "更新时间",
memo: "备注",
},
nodata:"",
uiactions: {
......
......@@ -676,9 +676,11 @@ export default {
columns: {
orderuid: "订单编号",
ibizordername: "订单名称",
ordertime: "订单时间",
orderstate: "订单状态",
ordertype: "订单类型",
ordertime: "订单时间",
updatedate: "更新时间",
memo: "备注",
},
nodata:"",
uiactions: {
......
......@@ -22,7 +22,7 @@
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('orderuid')">
<el-table-column show-overflow-tooltip :prop="'orderuid'" :label="$t('entities.ibizorder.main_grid.columns.orderuid')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'orderuid'" :label="$t('entities.ibizorder.main_grid.columns.orderuid')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizorder.main_grid.columns.orderuid')}}
......@@ -34,7 +34,7 @@
</el-table-column>
</template>
<template v-if="getColumnState('ibizordername')">
<el-table-column show-overflow-tooltip :prop="'ibizordername'" :label="$t('entities.ibizorder.main_grid.columns.ibizordername')" :min-width="1" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'ibizordername'" :label="$t('entities.ibizorder.main_grid.columns.ibizordername')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizorder.main_grid.columns.ibizordername')}}
......@@ -45,34 +45,48 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('ordertime')">
<el-table-column show-overflow-tooltip :prop="'ordertime'" :label="$t('entities.ibizorder.main_grid.columns.ordertime')" :width="100" :align="'left'" :sortable="'custom'">
<template v-if="getColumnState('orderstate')">
<el-table-column show-overflow-tooltip :prop="'orderstate'" :label="$t('entities.ibizorder.main_grid.columns.orderstate')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizorder.main_grid.columns.ordertime')}}
{{$t('entities.ibizorder.main_grid.columns.orderstate')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD" :data="row.ordertime"></app-format-data>
<template >
<codelist :value="row.orderstate" tag='ORDERSTATE' codelistType='STATIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('orderstate')">
<el-table-column show-overflow-tooltip :prop="'orderstate'" :label="$t('entities.ibizorder.main_grid.columns.orderstate')" :width="100" :align="'left'" :sortable="'custom'">
<template v-if="getColumnState('ordertype')">
<el-table-column show-overflow-tooltip :prop="'ordertype'" :label="$t('entities.ibizorder.main_grid.columns.ordertype')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizorder.main_grid.columns.orderstate')}}
{{$t('entities.ibizorder.main_grid.columns.ordertype')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.orderstate" tag='ORDERSTATE' codelistType='STATIC' ></codelist>
<codelist :value="row.ordertype" tag='ORDERTYPE' codelistType='DYNAMIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('ordertime')">
<el-table-column show-overflow-tooltip :prop="'ordertime'" :label="$t('entities.ibizorder.main_grid.columns.ordertime')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizorder.main_grid.columns.ordertime')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD" :data="row.ordertime"></app-format-data>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('updatedate')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.ibizorder.main_grid.columns.updatedate')" :width="145" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.ibizorder.main_grid.columns.updatedate')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizorder.main_grid.columns.updatedate')}}
......@@ -83,6 +97,18 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('memo')">
<el-table-column show-overflow-tooltip :prop="'memo'" :label="$t('entities.ibizorder.main_grid.columns.memo')" :min-width="1" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizorder.main_grid.columns.memo')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.memo}}</span>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState">
<el-table-column></el-table-column>
</template>
......@@ -654,23 +680,32 @@ export default class MainBase extends Vue implements ControlInterface {
label: '订单名称',
langtag: 'entities.ibizorder.main_grid.columns.ibizordername',
show: true,
unit: 'STAR',
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'ordertime',
label: '订单时间',
langtag: 'entities.ibizorder.main_grid.columns.ordertime',
name: 'orderstate',
label: '订单状态',
langtag: 'entities.ibizorder.main_grid.columns.orderstate',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'orderstate',
label: '订单状态',
langtag: 'entities.ibizorder.main_grid.columns.orderstate',
name: 'ordertype',
label: '订单类型',
langtag: 'entities.ibizorder.main_grid.columns.ordertype',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'ordertime',
label: '订单时间',
langtag: 'entities.ibizorder.main_grid.columns.ordertime',
show: true,
unit: 'PX',
isEnableRowEdit: false,
......@@ -685,6 +720,15 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'memo',
label: '备注',
langtag: 'entities.ibizorder.main_grid.columns.memo',
show: true,
unit: 'STAR',
isEnableRowEdit: false,
enableCond: 3 ,
},
]
/**
......@@ -1454,7 +1498,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['orderuid','IBIZordername','ordertime','orderstate','updatedate'];
let allColumns:Array<any> = ['orderuid','IBIZordername','orderstate','ordertype','ordertime','updatedate','memo'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1536,9 +1580,11 @@ export default class MainBase extends Vue implements ControlInterface {
group: group.label,
orderuid:'',
IBIZordername:'',
ordertime:'',
orderstate:'',
ordertype:'',
ordertime:'',
updatedate:'',
memo:'',
children: children
}
groupTree.push(tree);
......@@ -1568,9 +1614,11 @@ export default class MainBase extends Vue implements ControlInterface {
group: this.$t('app.gridpage.other'),
orderuid:'',
IBIZordername:'',
ordertime:'',
orderstate:'',
ordertype:'',
ordertime:'',
updatedate:'',
memo:'',
children: child
}
if(child && child.length > 0){
......@@ -1633,9 +1681,11 @@ export default class MainBase extends Vue implements ControlInterface {
group: group,
orderuid:'',
IBIZordername:'',
ordertime:'',
orderstate:'',
ordertype:'',
ordertime:'',
updatedate:'',
memo:'',
children: children,
}
groupTree.push(tree);
......
......@@ -71,6 +71,11 @@ export default class MainModel {
]
}else{
return [
{
name: 'memo',
prop: 'memo',
dataType: 'LONGTEXT_1000',
},
{
name: 'ibizcustomerid',
prop: 'ibizcustomerid',
......@@ -91,16 +96,16 @@ export default class MainModel {
prop: 'wfstep',
dataType: 'SSCODELIST',
},
{
name: 'ordertype',
prop: 'ordertype',
dataType: 'SSCODELIST',
},
{
name: 'ordertime',
prop: 'ordertime',
dataType: 'DATE',
},
{
name: 'updatedate',
prop: 'updatedate',
dataType: 'DATETIME',
},
{
name: 'ibizordername',
prop: 'ibizordername',
......@@ -110,9 +115,10 @@ export default class MainModel {
name: 'srfmstag',
},
{
name: 'srfmajortext',
prop: 'ibizordername',
dataType: 'TEXT',
name: 'srfkey',
prop: 'ibizorderid',
dataType: 'GUID',
isEditable:true
},
{
name: 'srfdataaccaction',
......@@ -120,10 +126,14 @@ export default class MainModel {
dataType: 'GUID',
},
{
name: 'srfkey',
prop: 'ibizorderid',
dataType: 'GUID',
isEditable:true
name: 'srfmajortext',
prop: 'ibizordername',
dataType: 'TEXT',
},
{
name: 'updatedate',
prop: 'updatedate',
dataType: 'DATETIME',
},
{
name: 'orderuid',
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册