diff --git a/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue b/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
index 2b95d147..1f4660e3 100644
--- a/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
+++ b/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
@@ -31,6 +31,12 @@
placeholder="选择订单结束日期"
@change="search.current = 1, getList()">
+
+
this.dict.getLabel('yesOrNo', v) },
{ prop: 'goodsType', label: '商品类型', align: 'center', format: v => this.dict.getLabel('integralSGType', v) },
{ prop: 'quantity', label: '数量', align: 'center', format: v => `${v}` },
{ prop: 'usedIntegral', label: '消耗积分', align: 'center' },
@@ -156,7 +164,7 @@
},
created () {
- this.dict.load('integralSGType', 'integralSGOStatus').then(() => {
+ this.dict.load('integralSGType', 'integralSGOStatus', 'yesOrNo').then(() => {
this.getList()
})
},
diff --git a/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue b/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue
index 02e7abd0..41dedc01 100644
--- a/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue
+++ b/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue
@@ -31,6 +31,12 @@
placeholder="选择订单结束日期"
@change="search.current = 1, getList()">
+
+
this.dict.getLabel('yesOrNo', v) },
{ prop: 'goodsType', label: '商品类型', align: 'center', format: v => this.dict.getLabel('integralSGType', v) },
{ prop: 'quantity', label: '数量', align: 'center', format: v => `${v}` },
{ prop: 'usedIntegral', label: '消耗积分', align: 'center' },
@@ -155,7 +163,7 @@
},
created () {
- this.dict.load('integralSGType', 'integralSGOStatus').then(() => {
+ this.dict.load('integralSGType', 'integralSGOStatus', 'yesOrNo').then(() => {
this.getList()
})
},