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

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

上级 98632077
...@@ -199,13 +199,13 @@ export default { ...@@ -199,13 +199,13 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
ibizorderdetailname: "订单明细名称",
ibizordername: "订单名称", ibizordername: "订单名称",
ibizuniproductname: "产品名称", ibizuniproductname: "产品名称",
quantity: "数量", quantity: "数量",
unitprice: "单价", unitprice: "单价",
amount: "小计", amount: "小计",
unit: "单位", unit: "单位",
updatedate: "更新时间",
}, },
nodata:"", nodata:"",
uiactions: { uiactions: {
......
...@@ -198,13 +198,13 @@ export default { ...@@ -198,13 +198,13 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
ibizorderdetailname: "订单明细名称",
ibizordername: "订单名称", ibizordername: "订单名称",
ibizuniproductname: "产品名称", ibizuniproductname: "产品名称",
quantity: "数量", quantity: "数量",
unitprice: "单价", unitprice: "单价",
amount: "小计", amount: "小计",
unit: "单位", unit: "单位",
updatedate: "更新时间",
}, },
nodata:"", nodata:"",
uiactions: { uiactions: {
......
...@@ -21,6 +21,18 @@ ...@@ -21,6 +21,18 @@
<template v-if="!isSingleSelect"> <template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column> <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template> </template>
<template v-if="getColumnState('ibizorderdetailname')">
<el-table-column show-overflow-tooltip :prop="'ibizorderdetailname'" :label="$t('entities.ibizorderdetail.main_grid.columns.ibizorderdetailname')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizorderdetail.main_grid.columns.ibizorderdetailname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.ibizorderdetailname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('ibizordername')"> <template v-if="getColumnState('ibizordername')">
<el-table-column show-overflow-tooltip :prop="'ibizordername'" :label="$t('entities.ibizorderdetail.main_grid.columns.ibizordername')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'ibizordername'" :label="$t('entities.ibizorderdetail.main_grid.columns.ibizordername')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
...@@ -82,7 +94,7 @@ ...@@ -82,7 +94,7 @@
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('unit')"> <template v-if="getColumnState('unit')">
<el-table-column show-overflow-tooltip :prop="'unit'" :label="$t('entities.ibizorderdetail.main_grid.columns.unit')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'unit'" :label="$t('entities.ibizorderdetail.main_grid.columns.unit')" :min-width="1" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.ibizorderdetail.main_grid.columns.unit')}} {{$t('entities.ibizorderdetail.main_grid.columns.unit')}}
...@@ -93,18 +105,6 @@ ...@@ -93,18 +105,6 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updatedate')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.ibizorderdetail.main_grid.columns.updatedate')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizorderdetail.main_grid.columns.updatedate')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.updatedate"></app-format-data>
</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>
...@@ -303,7 +303,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -303,7 +303,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @type {string} * @type {string}
* @memberof MainBase * @memberof MainBase
*/ */
public majorInfoColName:string = ""; public majorInfoColName:string = "ibizorderdetailname";
/** /**
* 界面UI服务对象 * 界面UI服务对象
...@@ -662,6 +662,15 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -662,6 +662,15 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase * @memberof MainBase
*/ */
public allColumns: any[] = [ public allColumns: any[] = [
{
name: 'ibizorderdetailname',
label: '订单明细名称',
langtag: 'entities.ibizorderdetail.main_grid.columns.ibizorderdetailname',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{ {
name: 'ibizordername', name: 'ibizordername',
label: '订单名称', label: '订单名称',
...@@ -712,16 +721,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -712,16 +721,7 @@ export default class MainBase extends Vue implements ControlInterface {
label: '单位', label: '单位',
langtag: 'entities.ibizorderdetail.main_grid.columns.unit', langtag: 'entities.ibizorderdetail.main_grid.columns.unit',
show: true, show: true,
unit: 'px', unit: 'STAR',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'updatedate',
label: '更新时间',
langtag: 'entities.ibizorderdetail.main_grid.columns.updatedate',
show: true,
unit: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
enableCond: 3 , enableCond: 3 ,
}, },
...@@ -1411,7 +1411,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1411,7 +1411,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> = ['IBIZordername','IBIZuniproductname','quantity','unitprice','amount','unit','updatedate']; let allColumns:Array<any> = ['ibizorderdetailname','IBIZordername','IBIZuniproductname','quantity','unitprice','amount','unit'];
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];
...@@ -1491,13 +1491,13 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1491,13 +1491,13 @@ export default class MainBase extends Vue implements ControlInterface {
const tree: any ={ const tree: any ={
groupById: Number((i+1)*100), groupById: Number((i+1)*100),
group: group.label, group: group.label,
ibizorderdetailname:'',
IBIZordername:'', IBIZordername:'',
IBIZuniproductname:'', IBIZuniproductname:'',
quantity:'', quantity:'',
unitprice:'', unitprice:'',
amount:'', amount:'',
unit:'', unit:'',
updatedate:'',
children: children children: children
} }
groupTree.push(tree); groupTree.push(tree);
...@@ -1525,13 +1525,13 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1525,13 +1525,13 @@ export default class MainBase extends Vue implements ControlInterface {
const Tree: any = { const Tree: any = {
groupById: Number((allGroup.length+1)*100), groupById: Number((allGroup.length+1)*100),
group: this.$t('app.gridpage.other'), group: this.$t('app.gridpage.other'),
ibizorderdetailname:'',
IBIZordername:'', IBIZordername:'',
IBIZuniproductname:'', IBIZuniproductname:'',
quantity:'', quantity:'',
unitprice:'', unitprice:'',
amount:'', amount:'',
unit:'', unit:'',
updatedate:'',
children: child children: child
} }
if(child && child.length > 0){ if(child && child.length > 0){
...@@ -1592,13 +1592,13 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1592,13 +1592,13 @@ export default class MainBase extends Vue implements ControlInterface {
const tree: any ={ const tree: any ={
groupById: Number((groupIndex+1)*100), groupById: Number((groupIndex+1)*100),
group: group, group: group,
ibizorderdetailname:'',
IBIZordername:'', IBIZordername:'',
IBIZuniproductname:'', IBIZuniproductname:'',
quantity:'', quantity:'',
unitprice:'', unitprice:'',
amount:'', amount:'',
unit:'', unit:'',
updatedate:'',
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: 'ibizorderdetailname',
prop: 'ibizorderdetailname',
dataType: 'TEXT',
},
{ {
name: 'ibizuniproductid', name: 'ibizuniproductid',
prop: 'ibizuniproductid', prop: 'ibizuniproductid',
...@@ -82,11 +87,6 @@ export default class MainModel { ...@@ -82,11 +87,6 @@ export default class MainModel {
prop: 'quantity', prop: 'quantity',
dataType: 'INT', dataType: 'INT',
}, },
{
name: 'updatedate',
prop: 'updatedate',
dataType: 'DATETIME',
},
{ {
name: 'ibizorderdetailid', name: 'ibizorderdetailid',
prop: 'ibizorderdetailid', prop: 'ibizorderdetailid',
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册