From 9af8a199226b73fc45916d892ec3d2d43625cad3 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 24 May 2023 14:09:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=8A=A0=E6=98=AF=E5=90=A6=E4=BB=A3?=
 =?UTF-8?q?=E5=85=91=E6=8D=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppIntegratingOrder/components/ResidentList.vue  | 12 ++++++++++--
 .../AppIntegratingOrder/components/ResidentList.vue  | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

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()">
           </el-date-picker>
+          <ai-select
+            v-model="search.agentOrder"
+            @change="(search.current = 1), getList()"
+            placeholder="是否代兑换"
+            :selectList="dict.getDict('yesOrNo')">
+          </ai-select>
           <ai-download
             v-if="permissions('app_appintegralsupermarketorder_export')"
             :instance="instance"
@@ -129,7 +135,8 @@
           size: 10,
           startTime: '',
           type: 1,
-          endTime: ''
+          endTime: '',
+          agentOrder: ''
         },
         isShow: false,
         form: {
@@ -141,6 +148,7 @@
         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' },
@@ -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()">
           </el-date-picker>
+          <ai-select
+            v-model="search.agentOrder"
+            @change="(search.current = 1), getList()"
+            placeholder="是否代兑换"
+            :selectList="dict.getDict('yesOrNo')">
+          </ai-select>
           <ai-download
             v-if="permissions('app_appintegralsupermarketorder_export')"
             :instance="instance"
@@ -128,7 +134,8 @@
           size: 10,
           type: 1,
           startTime: '',
-          endTime: ''
+          endTime: '',
+          agentOrder: ''
         },
         isShow: false,
         form: {
@@ -140,6 +147,7 @@
         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' },
@@ -155,7 +163,7 @@
     },
 
     created () {
-      this.dict.load('integralSGType', 'integralSGOStatus').then(() => {
+      this.dict.load('integralSGType', 'integralSGOStatus', 'yesOrNo').then(() => {
         this.getList()
       })
     },