From 87416e14804540a7fec3568db3b9c2e2273adf02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 20 Jul 2023 16:31:13 +0800
Subject: [PATCH] =?UTF-8?q?table=E7=BB=84=E4=BB=B6=E5=B7=A6=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E6=93=8D=E4=BD=9C=E5=88=97=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PC/InterFace.Dash/README.md                   |  2 +-
 .../commonTabel-drawer copy/index.vue         | 10 ++--
 .../components/commonTabel-drawer/index.vue   | 10 ++--
 .../src/components/tablePagination/index.vue  | 10 ++--
 .../src/components/umyTable/index.vue         | 48 +++++++++++++++----
 PC/InterFace.Dash/src/mixins/TableMixins.js   |  2 +-
 .../basicConfig/ExportCustomUserSetting.vue   |  6 +--
 .../src/views/demo/demo_detail_addbase.vue    |  4 +-
 .../src/views/menuList/AsnMstr.vue            |  6 +--
 .../menuList/ExportCustomUserSetting.vue      |  6 +--
 .../views/menuList/OutgoingDataHistory.vue    |  6 +--
 .../src/views/menuList/PoMstr.vue             |  6 +--
 .../src/views/menuList/ReceiptMstr.vue        |  6 +--
 .../src/views/menuList/ReturnMstr.vue         |  6 +--
 14 files changed, 79 insertions(+), 49 deletions(-)

diff --git a/PC/InterFace.Dash/README.md b/PC/InterFace.Dash/README.md
index df3021f..4208571 100644
--- a/PC/InterFace.Dash/README.md
+++ b/PC/InterFace.Dash/README.md
@@ -46,7 +46,7 @@ alertoldSkipCount       主列表-分页-当前页条数
 alterResultCount        主列表-分页-每页最大页数
 handleSelectionChange   主列表-选择-行数据方法 tablePagination ==> currenTable
 <----20230207添加  begin---->
-buttonOperationClick    主列表-操作列按钮点击事件
+buttonOperationClick_left    主列表-操作列按钮点击事件
 currentPageProps        主列表-当前页码值
                         使用的是@/mixins/TableMixins的oldSkipCount值
 quicklySearchOption     主表查询-快速搜索数据配置 ==> 通用配置在@/utils/quicklySearchOption/index
diff --git a/PC/InterFace.Dash/src/components/commonTabel-drawer copy/index.vue b/PC/InterFace.Dash/src/components/commonTabel-drawer copy/index.vue
index 687acab..ce11d6a 100644
--- a/PC/InterFace.Dash/src/components/commonTabel-drawer copy/index.vue	
+++ b/PC/InterFace.Dash/src/components/commonTabel-drawer copy/index.vue	
@@ -117,8 +117,8 @@
             @handleSelectionChange="handleSelectionChange"
             @inlineDialog="inlineDialog"
             @buttonClick="buttonClick"
-            :buttonOperationList="buttonOperationList"
-            @buttonOperationClick="buttonOperationClick"
+            :buttonOperationList_left="buttonOperationList_left"
+            @buttonOperationClick_left="buttonOperationClick_left"
           >
             <template>
               <slot></slot>
@@ -257,7 +257,7 @@ export default {
   ],
   props: {
     // 操作列按钮
-    buttonOperationList:{
+    buttonOperationList_left:{
       type: Array,
       default: null,
     },
@@ -479,7 +479,7 @@ export default {
       this.displayDialog.detailInfoDialog = val || false
     },
     // 明细-操作列事件
-    buttonOperationClick(row, item, index){
+    buttonOperationClick_left(row, item, index){
       // 查看详情
       if(item.name == "info"){
         this.displayDialog.detailInfoDialog = true
@@ -487,7 +487,7 @@ export default {
         let _name = allUrlOption[this.$route.name].detailInfoName
         this.detailInfoTitle = _name ? row[_name] + ' 详情' : '详情'
       }
-      this.$emit('buttonOperationClick',row, item, index)
+      this.$emit('buttonOperationClick_left',row, item, index)
     },
     rowDrop(data,type) {
       this.$emit('rowDrop',data,type)
diff --git a/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue b/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue
index 1036836..b297019 100644
--- a/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue
+++ b/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue
@@ -78,8 +78,8 @@
             :currentPageProps="oldSkipCount"
             @overallSearchFormClick="overallSearchClickForDetail"
             :httpOverallSearchData="httpOverallSearchData"
-            @buttonOperationClick="buttonOperationClick"
-            :buttonOperationList="buttonOperationList"
+            @buttonOperationClick_left="buttonOperationClick_left"
+            :buttonOperationList_left="buttonOperationList_left"
             :tableLoading="Loading.tableLoading"
           ></tablePagination>
           <!-- 新增汇总 表头 区分明细表头使用 summaryTableColumns -->
@@ -205,7 +205,7 @@ export default {
   ],
   props: {
     // 操作列按钮
-    buttonOperationList:{
+    buttonOperationList_left:{
       type: Array,
       default: null,
     },
@@ -531,7 +531,7 @@ export default {
       this.displayDialog.detailInfoDialog = val || false
     },
     // 明细-操作列事件
-    buttonOperationClick(row, item, index){
+    buttonOperationClick_left(row, item, index){
       // 查看详情
       if(item.name == "info"){
         this.displayDialog.detailInfoDialog = true
@@ -539,7 +539,7 @@ export default {
         let _name = allUrlOption[this.$route.name].detailInfoName
         this.detailInfoTitle = _name ? row[_name] + ' 详情' : '详情'
       }
-      this.$emit('buttonOperationClick',row, item, index)
+      this.$emit('buttonOperationClick_left',row, item, index)
     },
     rowDrop(data,type) {
       this.$emit('rowDrop',data,type)
diff --git a/PC/InterFace.Dash/src/components/tablePagination/index.vue b/PC/InterFace.Dash/src/components/tablePagination/index.vue
index ec27cf7..d0eabdd 100644
--- a/PC/InterFace.Dash/src/components/tablePagination/index.vue
+++ b/PC/InterFace.Dash/src/components/tablePagination/index.vue
@@ -51,8 +51,8 @@
         @sortChange="sortChange"
         @handleSelectionChange="handleSelectionChange"
         @inlineDialog="inlineDialog"
-        :buttonOperationList="buttonOperationList"
-        @buttonOperationClick="buttonOperationClick"
+        :buttonOperationList_left="buttonOperationList_left"
+        @buttonOperationClick_left="buttonOperationClick_left"
         :tableBorder="true"
         :firstFixed="true"
         :cellStyle = "cellStyle"
@@ -116,7 +116,7 @@ export default {
       }
     },
     // 操作列按钮
-    buttonOperationList:{
+    buttonOperationList_left:{
       type: Array,
       default: null,
     },
@@ -342,8 +342,8 @@ export default {
       this.$emit('sortChange', data)
     },
     //点击table操作列按钮
-    buttonOperationClick(row, item, index) {
-      this.$emit("buttonOperationClick", row, item, index);
+    buttonOperationClick_left(row, item, index) {
+      this.$emit("buttonOperationClick_left", row, item, index);
     },
     // 全面筛选组件配置
     // 全面筛选组件内部显示/隐藏更改触发，同步当前的showSearchOverall值
diff --git a/PC/InterFace.Dash/src/components/umyTable/index.vue b/PC/InterFace.Dash/src/components/umyTable/index.vue
index b42d59f..1294a08 100644
--- a/PC/InterFace.Dash/src/components/umyTable/index.vue
+++ b/PC/InterFace.Dash/src/components/umyTable/index.vue
@@ -19,9 +19,9 @@
     header-row-class-name="uTableHeader"
   >
     <!-- :tree-props="treeProps" 与 “height”  不能共存， 此组件暂不支持tree的格式-->
-    <!-- 操作列 -->
+    <!-- 操作列 （左侧）-->
     <u-table-column
-      v-if="buttonOperationList"
+      v-if="buttonOperationList_left"
       :fixed="'left'"
       :width="120"
       :align="'center'"
@@ -32,11 +32,32 @@
       </template>
       <template slot-scope="scope">
         <el-button
-          v-for="(itemButton, indexButton) in buttonOperationList"
+          v-for="(itemButton, indexButton) in buttonOperationList_left"
           :key="indexButton"
           type="text"
           size="mini"
-          @click="buttonOperationClick(scope.row, itemButton, indexButton)"
+          @click="buttonOperationClick_left(scope.row, itemButton, indexButton)"
+        >{{itemButton.label}}</el-button>
+      </template>
+    </u-table-column>
+    <!-- 操作列 （右侧）-->
+    <u-table-column
+      v-if="buttonOperationList_right"
+      :fixed="'right'"
+      :width="120"
+      :align="'center'"
+      :header-align="'center'"
+    >
+      <template #header>
+        <span>操作</span>
+      </template>
+      <template slot-scope="scope">
+        <el-button
+          v-for="(itemButton, indexButton) in buttonOperationList_right"
+          :key="indexButton"
+          type="text"
+          size="mini"
+          @click="buttonOperationClick_right(scope.row, itemButton, indexButton)"
         >{{itemButton.label}}</el-button>
       </template>
     </u-table-column>
@@ -442,8 +463,13 @@ export default {
     },
   },
   props: {
-    // 操作列按钮
-    buttonOperationList:{
+    // 操作列按钮（左侧）
+    buttonOperationList_left:{
+      type: Array,
+      default: null,
+    },
+    // 操作列按钮(右侧)
+    buttonOperationList_right:{
       type: Array,
       default: null,
     },
@@ -881,9 +907,13 @@ export default {
     buttonClick(row, index, label) {
       this.$emit("buttonClick", row, index, label);
     },
-    //点击table操作列按钮
-    buttonOperationClick(row, item, index) {
-      this.$emit("buttonOperationClick", row, item, index);
+    //点击table操作列(左侧)按钮
+    buttonOperationClick_left(row, item, index) {
+      this.$emit("buttonOperationClick_left", row, item, index);
+    },
+    //点击table操作列(右侧)按钮
+    buttonOperationClick_right(row, item, index) {
+      this.$emit("buttonOperationClick_right", row, item, index);
     },
   },
 };
diff --git a/PC/InterFace.Dash/src/mixins/TableMixins.js b/PC/InterFace.Dash/src/mixins/TableMixins.js
index 0404865..a4618d6 100644
--- a/PC/InterFace.Dash/src/mixins/TableMixins.js
+++ b/PC/InterFace.Dash/src/mixins/TableMixins.js
@@ -240,7 +240,7 @@ export const tableMixins = {
      * @param {*} item 按钮信息
      * @param {*} index 按钮索引
      */
-    buttonOperationClick(row, item, index) {
+    buttonOperationClick_left(row, item, index) {
       // 获取当前行数据，赋值给 propsData
       this.propsData = row
       // 查看详情
diff --git a/PC/InterFace.Dash/src/views/basicConfig/ExportCustomUserSetting.vue b/PC/InterFace.Dash/src/views/basicConfig/ExportCustomUserSetting.vue
index ff31f28..df9ce45 100644
--- a/PC/InterFace.Dash/src/views/basicConfig/ExportCustomUserSetting.vue
+++ b/PC/InterFace.Dash/src/views/basicConfig/ExportCustomUserSetting.vue
@@ -17,7 +17,7 @@
         @alertoldSkipCount="alertoldSkipCount"
         @alterResultCount="alterResultCount"
         @handleSelectionChange="handleSelectionChange"
-        @buttonOperationClick="buttonOperationClick"
+        @buttonOperationClick_left="buttonOperationClick_left"
         :currentPageProps="oldSkipCount"
         :quicklySearchOption="quicklySearchOption"
         @quicklySearchClick="quicklySearchClick"
@@ -25,7 +25,7 @@
         :primarySearchOption="primarySearchOption"
         @overallSearchFormClick="overallSearchFormClick"
         :httpOverallSearchData="httpOverallSearchData"
-        :buttonOperationList="operationButtonsTable"
+        :buttonOperationList_left="operationButtonsTable"
       >
         <!-- <div slot="tableTopSlot">
           上方按钮插槽位置预留
@@ -101,7 +101,7 @@
         :MaxResultCount="MaxResultCountDetails"
         @alterResultCountDetails="alterResultCountDetails"
         @alertoldSkipCountDetails="alertoldSkipCountDetails"
-        :buttonOperationList="operationButtonsDetail"
+        :buttonOperationList_left="operationButtonsDetail"
     ></curren-Drawer>
       <!-- <curren-Drawer
         :title="apiColumns_DesTions"
diff --git a/PC/InterFace.Dash/src/views/demo/demo_detail_addbase.vue b/PC/InterFace.Dash/src/views/demo/demo_detail_addbase.vue
index dd61419..33a9be8 100644
--- a/PC/InterFace.Dash/src/views/demo/demo_detail_addbase.vue
+++ b/PC/InterFace.Dash/src/views/demo/demo_detail_addbase.vue
@@ -24,8 +24,8 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
-      @buttonOperationClick="buttonOperationClick"
-      :buttonOperationList="operationButtonsTable"
+      @buttonOperationClick_left="buttonOperationClick_left"
+      :buttonOperationList_left="operationButtonsTable"
     ></tablePagination>
     <curren-Drawer
       :title="apiColumns_DesTions"
diff --git a/PC/InterFace.Dash/src/views/menuList/AsnMstr.vue b/PC/InterFace.Dash/src/views/menuList/AsnMstr.vue
index b441ae6..4cd3dff 100644
--- a/PC/InterFace.Dash/src/views/menuList/AsnMstr.vue
+++ b/PC/InterFace.Dash/src/views/menuList/AsnMstr.vue
@@ -23,8 +23,8 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
-      @buttonOperationClick="buttonOperationClick"
-      :buttonOperationList="operationButtonsTable"
+      @buttonOperationClick_left="buttonOperationClick_left"
+      :buttonOperationList_left="operationButtonsTable"
     ></tablePagination>
     <curren-Drawer
       ref="currenDrawer_Ref"
@@ -45,7 +45,7 @@
       :MaxResultCount="MaxResultCountDetails"
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
-      :buttonOperationList="operationButtonsDetail"
+      :buttonOperationList_left="operationButtonsDetail"
     ></curren-Drawer>
     <!-- 明细查询页面 -->
     <filterForDetailPage
diff --git a/PC/InterFace.Dash/src/views/menuList/ExportCustomUserSetting.vue b/PC/InterFace.Dash/src/views/menuList/ExportCustomUserSetting.vue
index ff31f28..df9ce45 100644
--- a/PC/InterFace.Dash/src/views/menuList/ExportCustomUserSetting.vue
+++ b/PC/InterFace.Dash/src/views/menuList/ExportCustomUserSetting.vue
@@ -17,7 +17,7 @@
         @alertoldSkipCount="alertoldSkipCount"
         @alterResultCount="alterResultCount"
         @handleSelectionChange="handleSelectionChange"
-        @buttonOperationClick="buttonOperationClick"
+        @buttonOperationClick_left="buttonOperationClick_left"
         :currentPageProps="oldSkipCount"
         :quicklySearchOption="quicklySearchOption"
         @quicklySearchClick="quicklySearchClick"
@@ -25,7 +25,7 @@
         :primarySearchOption="primarySearchOption"
         @overallSearchFormClick="overallSearchFormClick"
         :httpOverallSearchData="httpOverallSearchData"
-        :buttonOperationList="operationButtonsTable"
+        :buttonOperationList_left="operationButtonsTable"
       >
         <!-- <div slot="tableTopSlot">
           上方按钮插槽位置预留
@@ -101,7 +101,7 @@
         :MaxResultCount="MaxResultCountDetails"
         @alterResultCountDetails="alterResultCountDetails"
         @alertoldSkipCountDetails="alertoldSkipCountDetails"
-        :buttonOperationList="operationButtonsDetail"
+        :buttonOperationList_left="operationButtonsDetail"
     ></curren-Drawer>
       <!-- <curren-Drawer
         :title="apiColumns_DesTions"
diff --git a/PC/InterFace.Dash/src/views/menuList/OutgoingDataHistory.vue b/PC/InterFace.Dash/src/views/menuList/OutgoingDataHistory.vue
index f7d4184..308e7bd 100644
--- a/PC/InterFace.Dash/src/views/menuList/OutgoingDataHistory.vue
+++ b/PC/InterFace.Dash/src/views/menuList/OutgoingDataHistory.vue
@@ -24,8 +24,8 @@
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
     ></tablePagination>
-    <!-- @buttonOperationClick="buttonOperationClick"
-      :buttonOperationList="operationButtonsTable" -->
+    <!-- @buttonOperationClick_left="buttonOperationClick_left"
+      :buttonOperationList_left="operationButtonsTable" -->
     <curren-Drawer
       ref="currenDrawer_Ref"
       :title="apiColumns_DesTions"
@@ -45,7 +45,7 @@
       :MaxResultCount="MaxResultCountDetails"
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
-      :buttonOperationList="operationButtonsDetail"
+      :buttonOperationList_left="operationButtonsDetail"
     ></curren-Drawer>
     <!-- 导出弹窗 -->
     <exportDrop 
diff --git a/PC/InterFace.Dash/src/views/menuList/PoMstr.vue b/PC/InterFace.Dash/src/views/menuList/PoMstr.vue
index fd2b84b..d8bec17 100644
--- a/PC/InterFace.Dash/src/views/menuList/PoMstr.vue
+++ b/PC/InterFace.Dash/src/views/menuList/PoMstr.vue
@@ -23,8 +23,8 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
-      @buttonOperationClick="buttonOperationClick"
-      :buttonOperationList="operationButtonsTable"
+      @buttonOperationClick_left="buttonOperationClick_left"
+      :buttonOperationList_left="operationButtonsTable"
     ></tablePagination>
     <curren-Drawer
       ref="currenDrawer_Ref"
@@ -45,7 +45,7 @@
       :MaxResultCount="MaxResultCountDetails"
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
-      :buttonOperationList="operationButtonsDetail"
+      :buttonOperationList_left="operationButtonsDetail"
     ></curren-Drawer>
     <!-- 明细查询页面 -->
     <filterForDetailPage
diff --git a/PC/InterFace.Dash/src/views/menuList/ReceiptMstr.vue b/PC/InterFace.Dash/src/views/menuList/ReceiptMstr.vue
index 3765a32..67c6857 100644
--- a/PC/InterFace.Dash/src/views/menuList/ReceiptMstr.vue
+++ b/PC/InterFace.Dash/src/views/menuList/ReceiptMstr.vue
@@ -23,8 +23,8 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
-      @buttonOperationClick="buttonOperationClick"
-      :buttonOperationList="operationButtonsTable"
+      @buttonOperationClick_left="buttonOperationClick_left"
+      :buttonOperationList_left="operationButtonsTable"
     ></tablePagination>
     <curren-Drawer
       ref="currenDrawer_Ref"
@@ -45,7 +45,7 @@
       :MaxResultCount="MaxResultCountDetails"
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
-      :buttonOperationList="operationButtonsDetail"
+      :buttonOperationList_left="operationButtonsDetail"
     ></curren-Drawer>
     <!-- 明细查询页面 -->
     <filterForDetailPage
diff --git a/PC/InterFace.Dash/src/views/menuList/ReturnMstr.vue b/PC/InterFace.Dash/src/views/menuList/ReturnMstr.vue
index eace95d..9b7d0a5 100644
--- a/PC/InterFace.Dash/src/views/menuList/ReturnMstr.vue
+++ b/PC/InterFace.Dash/src/views/menuList/ReturnMstr.vue
@@ -23,8 +23,8 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
-      @buttonOperationClick="buttonOperationClick"
-      :buttonOperationList="operationButtonsTable"
+      @buttonOperationClick_left="buttonOperationClick_left"
+      :buttonOperationList_left="operationButtonsTable"
     ></tablePagination>
     <curren-Drawer
       ref="currenDrawer_Ref"
@@ -45,7 +45,7 @@
       :MaxResultCount="MaxResultCountDetails"
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
-      :buttonOperationList="operationButtonsDetail"
+      :buttonOperationList_left="operationButtonsDetail"
     ></curren-Drawer>
     <!-- 明细查询页面 -->
     <filterForDetailPage