From edde990200cc4cb5d3a139b66a5c6c196e83c6d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 5 Dec 2023 09:08:56 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E3=80=91=E6=8E=A5=E5=8F=A3=E5=8F=91=E5=87=BA=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=8F=8A=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E9=87=8D=E5=8F=91?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/menuList/OutgoingData.vue       | 61 ++++++++++++++++---
 .../views/menuList/OutgoingDataHistory.vue    | 26 --------
 2 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/PC/InterFace.Dash/src/views/menuList/OutgoingData.vue b/PC/InterFace.Dash/src/views/menuList/OutgoingData.vue
index 0c85bbd..fdd56d1 100644
--- a/PC/InterFace.Dash/src/views/menuList/OutgoingData.vue
+++ b/PC/InterFace.Dash/src/views/menuList/OutgoingData.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="page-box" v-loading="Loading.tableLoading">
     <tablePagination
+      ref="tablePagination_Ref"
       v-if="apiColumns_Table"
       :currenButtonData="currenButtonData"
       :tableData="tableData"
@@ -10,7 +11,7 @@
       :totalCount="totalCount"
       :multipleSelection="multipleSelection"
       :MaxResultCount="PageListParams.MaxResultCount"
-      @topbutton="topbutton"
+      @topbutton="topbuttonHandle"
       @inlineDialog="inlineDialog"
       @sortChange="sortChange"
       @alertoldSkipCount="alertoldSkipCount"
@@ -27,6 +28,8 @@
       @buttonOperationClick_right="buttonOperationClick_right"
       :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left"
+      :tableSelection="true"
+      :selectionColumnHandle="selectionColumnHandle"
     ></tablePagination>
     <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left" -->
@@ -89,6 +92,14 @@ export default {
           isRedundance:true,
           isDetailExport:true
         }),//导出
+        {
+          type: "danger",
+          icon: "el-icon-finished",
+          label: '批量重推',
+          name: "isRepushMany",
+          size: "mini",
+          isNoPermission:true
+        },
         this.defaultFieldSettingBtn(),//字段设置  
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
@@ -99,6 +110,34 @@ export default {
     this.paging();
   },
   methods:{
+    selectionColumnHandle(data,index){
+      return data.status == '-1' || data.status == '-2' || data.status == '-3' || data.status == '-4'
+    },
+    // 重推事件
+    repushHttpHandle(ids){
+      if(!ids || ids.length <= 0){
+        this.$warningMsg('请选择一条数据')
+        return
+      }
+      let _tip = `您确定要重新推送吗?`
+      if(ids.length > 1){_tip = `您确定要重新推送【${ids.length}】条数据吗?`}
+      this.$confirm(_tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.Loading.tableLoading = true;
+        resetHandle({remark:null},ids,'out-going-data').then(result => {
+          this.$successMsg("重推成功");
+          this.paging()
+          this.$refs.tablePagination_Ref.clearTableSelection();
+        }).catch(()=>{
+          this.Loading.tableLoading = false;
+        })
+      }).catch((err) => {
+        console.log(err)
+      });
+    },
     buttonOperationList_right(data){
       let _btn = [{
         label:'重新推送',
@@ -112,15 +151,19 @@ export default {
     },
     buttonOperationClick_right(row, item, index){
       if(item.name == 'isRepush'){
-        this.Loading.tableLoading = true;
-        resetHandle({remark:null},[row.id],'out-going-data').then(result => {
-          this.$successMsg("重推成功");
-          this.paging()
-        }).catch(()=>{
-          this.Loading.tableLoading = false;
-        })
+        this.repushHttpHandle([row.id])
+      }
+    },
+    topbuttonHandle(row){
+      // 批量重推
+      if(row == 'isRepushMany'){
+        let _ids = []
+        this.multipleSelection.forEach(item=>{_ids.push(item.id)})
+        this.repushHttpHandle(_ids)
+      }else{
+        this.topbutton(row)
       }
-    }
+    },
   }
 }
 </script>
diff --git a/PC/InterFace.Dash/src/views/menuList/OutgoingDataHistory.vue b/PC/InterFace.Dash/src/views/menuList/OutgoingDataHistory.vue
index d4fc652..88c83f2 100644
--- a/PC/InterFace.Dash/src/views/menuList/OutgoingDataHistory.vue
+++ b/PC/InterFace.Dash/src/views/menuList/OutgoingDataHistory.vue
@@ -23,8 +23,6 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
-      :buttonOperationList_right="buttonOperationList_right"
-      @buttonOperationClick_right="buttonOperationClick_right"
       :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left"
     ></tablePagination>
@@ -98,30 +96,6 @@ export default {
   mounted() {
     this.paging();
   },
-  methods:{
-    buttonOperationList_right(data){
-      let _btn = [{
-        label:'重新推送',
-        name:'isRepush',
-        hide:true
-      }]
-      if(data.status == '-1'){
-        _btn[0].hide = false
-      }
-      return _btn
-    },
-    buttonOperationClick_right(row, item, index){
-      if(item.name == 'isRepush'){
-        this.Loading.tableLoading = true;
-        resetHandle({remark:null},[row.id],'out-going-data-history').then(result => {
-          this.$successMsg("重推成功");
-          this.paging()
-        }).catch(()=>{
-          this.Loading.tableLoading = false;
-        })
-      }
-    }
-  }
 }
 </script>
 <style lang="scss" scoped>