|
@@ -41,7 +41,7 @@
|
|
<span>{{ row.amount | decimalFormat }}</span>
|
|
<span>{{ row.amount | decimalFormat }}</span>
|
|
</template>
|
|
</template>
|
|
<template slot-scope="{ row }" slot="orderStatus">
|
|
<template slot-scope="{ row }" slot="orderStatus">
|
|
- <span v-for="item in $refs.crud.DIC.orderStatus" :style="{color: item.colour}" v-if="item.dictValue == row.orderStatus">{{row.orderStatus}}</span>
|
|
|
|
|
|
+ <span v-for="item in orderStatusList" :style="{color: item.colour}" v-if="item.dictValue == row.orderStatus">{{row.orderStatus}}</span>
|
|
</template>
|
|
</template>
|
|
<template slot-scope="{ row }" slot="purchaseAmount">
|
|
<template slot-scope="{ row }" slot="purchaseAmount">
|
|
<span>{{ row.purchaseAmount | decimalFormat }}</span>
|
|
<span>{{ row.purchaseAmount | decimalFormat }}</span>
|
|
@@ -174,6 +174,7 @@ export default {
|
|
total: 0,
|
|
total: 0,
|
|
pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
|
|
pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
|
|
},
|
|
},
|
|
|
|
+ orderStatusList:[],
|
|
show: true,
|
|
show: true,
|
|
detailData: {},
|
|
detailData: {},
|
|
loading: false,
|
|
loading: false,
|
|
@@ -248,6 +249,7 @@ export default {
|
|
this.getWorkDicts("order_status").then(res => {
|
|
this.getWorkDicts("order_status").then(res => {
|
|
this.findObject(this.option.column, "orderStatus").dicData =
|
|
this.findObject(this.option.column, "orderStatus").dicData =
|
|
res.data.data;
|
|
res.data.data;
|
|
|
|
+ this.orderStatusList = res.data.data
|
|
});
|
|
});
|
|
gainUser().then(res => {
|
|
gainUser().then(res => {
|
|
this.findObject(this.option.column, "createUser").dicData = res.data.data;
|
|
this.findObject(this.option.column, "createUser").dicData = res.data.data;
|