|
|
@@ -91,7 +91,7 @@
|
|
|
:dataSource="dataSource"
|
|
|
:pagination="ipagination"
|
|
|
:loading="loading"
|
|
|
- :scroll="{ x: 1730}"
|
|
|
+ :scroll="{ x: scrollX}"
|
|
|
class="j-table-force-nowrap"
|
|
|
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,getCheckboxProps:getCheckboxProps}"
|
|
|
@change="handleTableChange">
|
|
|
@@ -208,10 +208,13 @@
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
- title: '用户合同',
|
|
|
+ title: '订单状态',
|
|
|
align: 'left',
|
|
|
width: 150,
|
|
|
- dataIndex: 'workContractType_dictText',
|
|
|
+ dataIndex: 'status_dictText',
|
|
|
+ customRender: function(value, record) {
|
|
|
+ return value ? value : '--';
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
title: '验收进度',
|
|
|
@@ -220,13 +223,10 @@
|
|
|
dataIndex: 'isCheck_dictText'
|
|
|
},
|
|
|
{
|
|
|
- title: '订单进度',
|
|
|
+ title: '用户合同',
|
|
|
align: 'left',
|
|
|
width: 150,
|
|
|
- dataIndex: 'status_dictText',
|
|
|
- customRender: function(value, record) {
|
|
|
- return value ? value : '--';
|
|
|
- }
|
|
|
+ dataIndex: 'workContractType_dictText',
|
|
|
},
|
|
|
{
|
|
|
title: '操作',
|
|
|
@@ -283,10 +283,13 @@
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
- title: '用户合同',
|
|
|
+ title: '订单状态',
|
|
|
align: 'left',
|
|
|
width: 150,
|
|
|
- dataIndex: 'workContractType_dictText',
|
|
|
+ dataIndex: 'status_dictText',
|
|
|
+ customRender: function(value, record) {
|
|
|
+ return value ? value : '--';
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
title: '验收进度',
|
|
|
@@ -295,15 +298,6 @@
|
|
|
dataIndex: 'isCheck_dictText'
|
|
|
},
|
|
|
{
|
|
|
- title: '订单进度',
|
|
|
- align: 'left',
|
|
|
- width: 150,
|
|
|
- dataIndex: 'status_dictText',
|
|
|
- customRender: function(value, record) {
|
|
|
- return value ? value : '--';
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
title: '操作',
|
|
|
dataIndex: 'action',
|
|
|
align: 'left',
|
|
|
@@ -312,6 +306,7 @@
|
|
|
scopedSlots: { customRender: 'action' }
|
|
|
}
|
|
|
],
|
|
|
+ scrollX: 1780,
|
|
|
isorter: {
|
|
|
column: 'updateTime',
|
|
|
order: 'desc'
|
|
|
@@ -348,8 +343,10 @@
|
|
|
console.log('bo',bo)
|
|
|
if (bo) {
|
|
|
this.columns = this.defColumns;
|
|
|
+ this.scrollX = 1780;
|
|
|
} else {
|
|
|
this.columns = this.comColumns;
|
|
|
+ this.scrollX = 1630;
|
|
|
}
|
|
|
},
|
|
|
getQueryParams(){
|