From c37a19036aa5401184495554c39aa20a6b3a4ff4 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 14 Apr 2023 14:49:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B6=85=E5=B8=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppIntegratingSupermarket.vue                    | 12 +++---------
 .../components/AddStore.vue                          |  8 ++++----
 .../components/GoodsList.vue                         |  6 ++----
 .../components/StoreList.vue                         |  6 ++----
 ui/packages/basic/AiTable.vue                        |  1 -
 5 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/project/fengdu/app/AppIntegratingSupermarket/AppIntegratingSupermarket.vue b/project/fengdu/app/AppIntegratingSupermarket/AppIntegratingSupermarket.vue
index 94c81e14..1b5c55a8 100644
--- a/project/fengdu/app/AppIntegratingSupermarket/AppIntegratingSupermarket.vue
+++ b/project/fengdu/app/AppIntegratingSupermarket/AppIntegratingSupermarket.vue
@@ -7,13 +7,13 @@
     <template slot="tabs">
       <el-tabs v-model="currIndex">
         <el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label">
-          <component :areaId="areaId" :ref="String(i)" v-if="currIndex == i" :is="tab.comp" @change="onChange" lazy :instance="instance" :dict="dict" :permissions="permissions"/>
+          <component :ref="String(i)" v-if="currIndex == i" :is="tab.comp" @change="onChange" lazy :instance="instance" :dict="dict" :permissions="permissions"/>
         </el-tab-pane>
       </el-tabs>
     </template>
   </ai-list>
-  <AddGoods v-else-if="componentName === 'AddGoods'" :areaId="areaId" :params="params" :instance="instance" :dict="dict" @change="onChange"></AddGoods>
-  <AddStore v-else-if="componentName === 'AddStore'" :areaId="areaId" :params="params" :instance="instance" :dict="dict" @change="onChange"></AddStore>
+  <AddGoods v-else-if="componentName === 'AddGoods'" :params="params" :instance="instance" :dict="dict" @change="onChange"></AddGoods>
+  <AddStore v-else-if="componentName === 'AddStore'" :params="params" :instance="instance" :dict="dict" @change="onChange"></AddStore>
 </template>
 
 <script>
@@ -61,16 +61,10 @@
         currIndex: '0',
         componentName: '',
         params: {},
-        areaName: '',
-        areaId: '',
         isShowDetail: false
       }
     },
 
-    created () {
-      this.areaId = this.user.info.areaId
-    },
-
     methods: {
       onAreaChange () {
         if (this.currIndex === '0') {
diff --git a/project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue b/project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue
index 21332951..92aa2448 100644
--- a/project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue
+++ b/project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue
@@ -259,8 +259,7 @@
       getList () {
         this.instance.post(`/app/appintegralsupermarketgoods/list`, null, {
           params: {
-            ...this.search,
-            areaId: this.areaId,
+            ...this.search
           }
         }).then((res) => {
           if (res.code == 0) {
@@ -288,8 +287,9 @@
         this.$nextTick(() => {
           if (this.form.goodsList.length) {
             this.form.goodsList.map(v => v.goods).forEach(v => {
-              console.log(v)
-              this.$refs.aiTable.toggleRowSelection(v, true)
+              if (this.tableData.filter(e => e.id === v.id).length) {
+                this.$refs.aiTable.toggleRowSelection(this.tableData.filter(e => e.id === v.id)[0], true)
+              }
             })
           }
         })
diff --git a/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue b/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue
index 94263f0a..bd566965 100644
--- a/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue
+++ b/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue
@@ -77,8 +77,7 @@
     props: {
       instance: Function,
       dict: Object,
-      permissions: Function,
-      areaId: String,
+      permissions: Function
     },
 
     data() {
@@ -116,8 +115,7 @@
       getList () {
         this.instance.post(`/app/appintegralsupermarketgoods/list`, null, {
           params: {
-            ...this.search,
-            areaId: this.areaId,
+            ...this.search
           }
         }).then((res) => {
           if (res.code == 0) {
diff --git a/project/fengdu/app/AppIntegratingSupermarket/components/StoreList.vue b/project/fengdu/app/AppIntegratingSupermarket/components/StoreList.vue
index 521af4f3..3c0d07ec 100644
--- a/project/fengdu/app/AppIntegratingSupermarket/components/StoreList.vue
+++ b/project/fengdu/app/AppIntegratingSupermarket/components/StoreList.vue
@@ -69,8 +69,7 @@
     props: {
       instance: Function,
       dict: Object,
-      permissions: Function,
-      areaId: String,
+      permissions: Function
     },
 
     data() {
@@ -110,8 +109,7 @@
       getList () {
         this.instance.post(`/app/appintegralsupermarketshop/list`, null, {
           params: {
-            ...this.search,
-            areaId: this.areaId,
+            ...this.search
           }
         }).then((res) => {
           if (res.code == 0) {
diff --git a/ui/packages/basic/AiTable.vue b/ui/packages/basic/AiTable.vue
index a91598a3..0036773b 100644
--- a/ui/packages/basic/AiTable.vue
+++ b/ui/packages/basic/AiTable.vue
@@ -193,7 +193,6 @@ export default {
       this.$refs[this.refName].clearSelection()
     },
     toggleRowSelection() {
-      console.log(22)
       this.$refs[this.refName].toggleRowSelection(...arguments)
     },
     toggleAllSelection() {