From 87ae42f7fe875d7a251d7e5fef6d130f180a18af Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 14 Apr 2023 15:58:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppIntegratingOrder/components/GirdList.vue | 11 +++++++++--
 .../AppIntegratingOrder/components/ResidentList.vue | 13 ++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue b/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue
index d1124479..67e9748a 100644
--- a/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue
+++ b/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue
@@ -4,7 +4,7 @@
       <ai-search-bar>
         <template slot="left">
           <ai-select
-            v-model="search.type"
+            v-model="search.goodsType"
             @change="(search.current = 1), getList()"
             placeholder="请选择商品类型"
             :selectList="dict.getDict('integralSGType')">
@@ -31,6 +31,13 @@
             placeholder="选择订单结束日期"
             @change="search.current = 1, getList()">
           </el-date-picker>
+          <ai-download
+            :instance="instance"
+            url="/app/appintegralsupermarketorder/export"
+            :params="search"
+            fileName="订单列表"
+            :disabled="tableData.length == 0">
+          </ai-download>
         </template>
         <template slot="right">
           <el-input
@@ -110,7 +117,7 @@
     data() {
       return {
         search: {
-          type: '',
+          goodsType: '',
           title: '',
           current: 1,
           status: '',
diff --git a/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue b/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
index 0facea45..1036b139 100644
--- a/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
+++ b/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
@@ -4,7 +4,7 @@
       <ai-search-bar>
         <template slot="left">
           <ai-select
-            v-model="search.type"
+            v-model="search.goodsType"
             @change="(search.current = 1), getList()"
             placeholder="请选择商品类型"
             :selectList="dict.getDict('integralSGType')">
@@ -31,6 +31,13 @@
             placeholder="选择订单结束日期"
             @change="search.current = 1, getList()">
           </el-date-picker>
+          <ai-download
+            :instance="instance"
+            url="/app/appintegralsupermarketorder/export"
+            :params="search"
+            fileName="订单列表"
+            :disabled="tableData.length == 0">
+          </ai-download>
         </template>
         <template slot="right">
           <el-input
@@ -111,7 +118,7 @@
     data() {
       return {
         search: {
-          type: '',
+          goodsType: '',
           title: '',
           current: 1,
           status: '',
@@ -155,7 +162,7 @@
           params: {
             ...this.search,
             type: 1,
-            areaId: this.areaId
+            girdCode: this.areaId
           }
         }).then((res) => {
           if (res.code == 0) {