From c9f77d8b9247b91c3d02aa79ad1b4cd3558036a8 Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Fri, 3 Jul 2020 10:57:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E5=8F=96=E6=B6=88=E9=80=89=E4=B8=AD=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E8=A1=8C=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/mixins/tablePageMixin.js                     | 12 ++++++++++++
 vue/src/views/message/manage/index.vue               |  2 +-
 vue/src/views/purchase/inbound/index.vue             |  2 +-
 .../purchase/order/components/SupplierSelector.vue   |  2 +-
 vue/src/views/purchase/order/index.vue               |  2 +-
 .../views/sell/order/components/CustomerSelector.vue |  2 +-
 vue/src/views/sell/order/index.vue                   |  2 +-
 vue/src/views/sell/outbound/index.vue                |  2 +-
 vue/src/views/system/customer/index.vue              |  2 +-
 vue/src/views/system/resource/index.vue              |  2 +-
 vue/src/views/system/role/index.vue                  |  2 +-
 vue/src/views/system/supplier/index.vue              |  2 +-
 vue/src/views/system/user/index.vue                  |  2 +-
 13 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/vue/src/mixins/tablePageMixin.js b/vue/src/mixins/tablePageMixin.js
index 4c20607..ae6b62b 100644
--- a/vue/src/mixins/tablePageMixin.js
+++ b/vue/src/mixins/tablePageMixin.js
@@ -21,18 +21,30 @@ const mixin = {
             type: 'see'
         }
     },
+
     components: {AbstractTable},
+
     watch: {
         row(v) {
             !v && this.$refs.table && this.$refs.table.setCurrentRow()
         }
     },
+
     methods: {
+        rowClick(row) {
+            if (this.row === row) {
+                this.$refs.table.setCurrentRow()
+                this.row = null
+            }
+            else this.row = row
+        },
+
         pageChange(v) {
             this.searchForm.page = v
             this.search()
         },
     },
+
     mounted() {
         this.search()
     }
diff --git a/vue/src/views/message/manage/index.vue b/vue/src/views/message/manage/index.vue
index 6451dfc..3591c45 100644
--- a/vue/src/views/message/manage/index.vue
+++ b/vue/src/views/message/manage/index.vue
@@ -28,7 +28,7 @@
         </el-row>
 
         <el-row v-loading="config.loading" class="table-container">
-            <abstract-table :data="tableData" @row-click="row=$event">
+            <abstract-table :data="tableData" @row-click="rowClick">
                 <el-table-column align="center" label="#" type="index" width="80"/>
                 <el-table-column align="center" label="标 题" prop="title" show-overflow-tooltip/>
                 <el-table-column align="center" label="类 型" show-overflow-tooltip>
diff --git a/vue/src/views/purchase/inbound/index.vue b/vue/src/views/purchase/inbound/index.vue
index 608aea0..23b7443 100644
--- a/vue/src/views/purchase/inbound/index.vue
+++ b/vue/src/views/purchase/inbound/index.vue
@@ -53,7 +53,7 @@
         <el-row v-loading="config.loading" class="table-container">
             <abstract-table
                     :data="tableData"
-                    @row-click="row=$event"
+                    @row-click="rowClick"
                     @expand-change="getSubList"
             >
                 <el-table-column align="center" type="expand">
diff --git a/vue/src/views/purchase/order/components/SupplierSelector.vue b/vue/src/views/purchase/order/components/SupplierSelector.vue
index 81f1b2e..dd73ca6 100644
--- a/vue/src/views/purchase/order/components/SupplierSelector.vue
+++ b/vue/src/views/purchase/order/components/SupplierSelector.vue
@@ -32,7 +32,7 @@
                         current-row-key="id"
                         highlight-current-row
                         row-key="id"
-                        @row-click="row=$event"
+                        @row-click="rowClick"
                         @row-dblclick="dbclick"
                 >
                     <el-table-column align="center" label="#" type="index" width="80"/>
diff --git a/vue/src/views/purchase/order/index.vue b/vue/src/views/purchase/order/index.vue
index 1c83e21..1a2aa93 100644
--- a/vue/src/views/purchase/order/index.vue
+++ b/vue/src/views/purchase/order/index.vue
@@ -67,7 +67,7 @@
         <el-row v-loading="config.loading" class="table-container">
             <abstract-table
                     :data="tableData"
-                    @row-click="row=$event"
+                    @row-click="rowClick"
                     @expand-change="getSubList"
             >
                 <el-table-column align="center" type="expand">
diff --git a/vue/src/views/sell/order/components/CustomerSelector.vue b/vue/src/views/sell/order/components/CustomerSelector.vue
index d38ecc1..0b8c74e 100644
--- a/vue/src/views/sell/order/components/CustomerSelector.vue
+++ b/vue/src/views/sell/order/components/CustomerSelector.vue
@@ -28,7 +28,7 @@
             <el-row class="table-container">
                 <liner-progress :show="config.loading"/>
 
-                <abstract-table :data="tableData" @row-click="row=$event" @row-dblclick="dbclick">
+                <abstract-table :data="tableData" @row-click="rowClick" @row-dblclick="dbclick">
                     <el-table-column align="center" label="#" type="index" width="80"/>
                     <el-table-column align="center" label="客 户" prop="name" show-overflow-tooltip/>
                     <el-table-column align="center" label="行政区域" prop="region_name" show-overflow-tooltip/>
diff --git a/vue/src/views/sell/order/index.vue b/vue/src/views/sell/order/index.vue
index 33f29c4..63900a5 100644
--- a/vue/src/views/sell/order/index.vue
+++ b/vue/src/views/sell/order/index.vue
@@ -74,7 +74,7 @@
         </el-row>
 
         <el-row v-loading="config.loading" class="table-container">
-            <abstract-table :data="tableData" @row-click="row=$event" @expand-change="getSubList">
+            <abstract-table :data="tableData" @row-click="rowClick" @expand-change="getSubList">
                 <el-table-column align="center" type="expand">
                     <template v-slot="{row}">
                         <liner-progress :show="row._loading"/>
diff --git a/vue/src/views/sell/outbound/index.vue b/vue/src/views/sell/outbound/index.vue
index 46ed05d..75afb5c 100644
--- a/vue/src/views/sell/outbound/index.vue
+++ b/vue/src/views/sell/outbound/index.vue
@@ -58,7 +58,7 @@
         </el-row>
 
         <el-row v-loading="config.loading" class="table-container">
-            <abstract-table :data="tableData" @row-click="row=$event" @expand-change="getSubList">
+            <abstract-table :data="tableData" @row-click="rowClick" @expand-change="getSubList">
                 <el-table-column align="center" type="expand">
                     <template v-slot="{row}">
                         <liner-progress :show="row._loading"/>
diff --git a/vue/src/views/system/customer/index.vue b/vue/src/views/system/customer/index.vue
index 8651a26..f1fc982 100644
--- a/vue/src/views/system/customer/index.vue
+++ b/vue/src/views/system/customer/index.vue
@@ -48,7 +48,7 @@
         </el-row>
 
         <el-row v-loading="config.loading" class="table-container">
-            <abstract-table :data="tableData" @row-click="row=$event">
+            <abstract-table :data="tableData" @row-click="rowClick">
                 <el-table-column align="center" label="#" type="index" width="80"/>
                 <el-table-column align="center" label="客 户" prop="name" show-overflow-tooltip/>
                 <el-table-column align="center" label="行政区域" prop="region_name" show-overflow-tooltip/>
diff --git a/vue/src/views/system/resource/index.vue b/vue/src/views/system/resource/index.vue
index a9e28d6..495fefe 100644
--- a/vue/src/views/system/resource/index.vue
+++ b/vue/src/views/system/resource/index.vue
@@ -6,7 +6,7 @@
         </el-row>
 
         <el-row v-loading="config.loading" class="table-container">
-            <abstract-table :data="tableData" @row-click="row=$event">
+            <abstract-table :data="tableData" @row-click="rowClick">
                 <el-table-column label="名称" prop="fullName" show-overflow-tooltip/>
                 <el-table-column label="访问路径" prop="url" show-overflow-tooltip/>
                 <el-table-column label="总频率" prop="total_rate" show-overflow-tooltip/>
diff --git a/vue/src/views/system/role/index.vue b/vue/src/views/system/role/index.vue
index 84e45b2..3f948e8 100644
--- a/vue/src/views/system/role/index.vue
+++ b/vue/src/views/system/role/index.vue
@@ -34,7 +34,7 @@
         <el-row v-loading="config.loading" class="table-container">
             <abstract-table
                     :data="tableData"
-                    @row-click="row=$event"
+                    @row-click="rowClick"
             >
                 <el-table-column align="center" label="#" type="index" width="80"/>
                 <el-table-column align="center" label="角色名" prop="name" show-overflow-tooltip/>
diff --git a/vue/src/views/system/supplier/index.vue b/vue/src/views/system/supplier/index.vue
index 7d526a4..32e63b0 100644
--- a/vue/src/views/system/supplier/index.vue
+++ b/vue/src/views/system/supplier/index.vue
@@ -49,7 +49,7 @@
         </el-row>
 
         <el-row v-loading="config.loading" class="table-container">
-            <abstract-table :data="tableData" @row-click="row=$event">
+            <abstract-table :data="tableData" @row-click="rowClick">
                 <el-table-column align="center" label="#" type="index" width="80"/>
                 <el-table-column align="center" label="供应商" prop="name" show-overflow-tooltip/>
                 <el-table-column align="center" label="行政区域" prop="region_name" show-overflow-tooltip/>
diff --git a/vue/src/views/system/user/index.vue b/vue/src/views/system/user/index.vue
index 1147c81..201487d 100644
--- a/vue/src/views/system/user/index.vue
+++ b/vue/src/views/system/user/index.vue
@@ -36,7 +36,7 @@
         </el-row>
 
         <el-row v-loading="config.loading" class="table-container">
-            <abstract-table :data="tableData" @row-click="row=$event">
+            <abstract-table :data="tableData" @row-click="rowClick">
                 <el-table-column align="center" label="#" type="index" width="80"/>
                 <el-table-column align="center" label="头像" width="100">
                     <img