diff --git a/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue b/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue index 1f4660e3..67644302 100644 --- a/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue +++ b/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue @@ -148,12 +148,12 @@ colConfigs: [ { prop: 'goodsSerialNumber', label: '商品ID', align: 'left' }, { slot: 'goods', align: 'center' }, - { prop: 'agentOrder', label: '是否代兑换', align: 'center', format: v => 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' }, { prop: 'payMoney', label: '兑换后再付', align: 'center' }, { prop: 'integralUserName', label: '兑换人', align: 'center' }, + { prop: 'agentOrder', label: '是否代兑换', align: 'center', format: v => this.dict.getLabel('yesOrNo', v) }, { prop: 'createTime', width: 150, label: '创建时间', align: 'center' }, { prop: 'status', label: '状态', align: 'center', format: v => this.dict.getLabel('integralSGOStatus', v) } ] diff --git a/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue b/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue index 41dedc01..1016da09 100644 --- a/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue +++ b/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue @@ -147,12 +147,12 @@ colConfigs: [ { prop: 'goodsSerialNumber', label: '商品ID', align: 'left' }, { slot: 'goods', align: 'center' }, - { prop: 'agentOrder', label: '是否代兑换', align: 'center', format: v => 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' }, { prop: 'payMoney', label: '兑换后再付', align: 'center' }, { prop: 'integralUserName', label: '兑换人', align: 'center' }, + { prop: 'agentOrder', label: '是否代兑换', align: 'center', format: v => this.dict.getLabel('yesOrNo', v) }, { prop: 'createTime', width: 150, label: '创建时间', align: 'center' }, { prop: 'status', label: '状态', align: 'center', format: v => this.dict.getLabel('integralSGOStatus', v) } ]