From 95894cb7dffb5af02afe264980e34b3244810cc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 23 Oct 2023 14:20:37 +0800
Subject: [PATCH] =?UTF-8?q?exchangeData=E6=89=B9=E9=87=8F=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E9=A1=B5=E9=9D=A2=E7=AD=9B=E9=80=89=E5=8F=8A=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/tableColumns/index.js                 |  8 ++++----
 .../interfaceBoard/exchangeDataMaintenancePage.vue    | 11 +++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 651ab4cf0..6396b45fd 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -199,7 +199,7 @@ export const BomInner = [
   { label: _Public.creationTime, prop: "creationTime", type:'dateTime' },
   { label: _Public.lastModificationTime, prop: "lastModificationTime",  type:'dateTime' },
   // ************** 确认隐藏 ************************
-  // { label: _Public.tenantId, prop: "tenantId" },
+  // { label: _Names.tenantId, prop: "tenantId" },
   // { label: _Public.creatorId, prop: "creatorId" },
   // { label: _Public.lastModifierId, prop: "lastModifierId" },
   // { label: _Public.id, prop: 'id' },
@@ -3768,6 +3768,8 @@ export const comingFromOut_file = [
 
 // exchangeData批量操作页面
 export const exchangeDataMaintenancePage = [
+  { label: 'tyrpNumber', prop: "tyrpNumber" },
+  { label: _Public.id, prop: "id" },
   { label: _Dashboard.dataAction, prop: "dataAction"},
   { label: _Dashboard.dataContent, prop: "dataContent", type:"showJsonTable" },
   { label: _Dashboard.dataIdentityCode, prop: "dataIdentityCode" },
@@ -3775,14 +3777,12 @@ export const exchangeDataMaintenancePage = [
   { label: _Dashboard.destinationSystem, prop: "destinationSystem", type:"showDetail" },
   { label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' },
   { label: _Dashboard.sourceSystem, prop: "sourceSystem" },
-  { label: 'tyrpNumber', prop: "tyrpNumber" },
   { label: _Public.remark, prop: "remark", type:"showDetail" },
   { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
   { label: _Public.creatorId, prop: "creatorId" },
   { label: _Public.lastModificationTime, prop: "lastModificationTime",type:'dateTime' },
   { label: _Public.lastModifierId, prop: "lastModifierId" },
-  { label: _Public.tenantId, prop: "tenantId" },
-  { label: _Public.id, prop: "ID" },
+  { label: _Names.tenantId, prop: "tenantId" },
 ]
 
 
diff --git a/fe/PC/src/views/interfaceBoard/exchangeDataMaintenancePage.vue b/fe/PC/src/views/interfaceBoard/exchangeDataMaintenancePage.vue
index 72fce637a..c523dc820 100644
--- a/fe/PC/src/views/interfaceBoard/exchangeDataMaintenancePage.vue
+++ b/fe/PC/src/views/interfaceBoard/exchangeDataMaintenancePage.vue
@@ -49,7 +49,7 @@
         currenButtonData: [
             this.defaultFieldSettingBtn(),//字段设置
             this.defaultFreshBtn(),//刷新
-            // this.defaultFilterBtn(),//筛选
+            this.defaultFilterBtn(),//筛选
             {
                 type: "primary",
                 icon: "el-icon-refresh",
@@ -70,7 +70,12 @@
         },
         topbuttonHandle(val,item){
             if(val == 'resend'){
+              if(this.selectData && this.selectData.length > 0){
+                this.Loading.appMainLoading = true
                 this.resendHandle(0)
+              }else{
+                this.$warningMsg('请选择数据')
+              }
             }else{
                 this.topbutton(val,item)
             }
@@ -78,7 +83,8 @@
         // 递归处理
         async resendHandle(index){
           if(index >= this.selectData.length){
-            this.$successMsg("全部数据重发成功！")
+            this.Loading.appMainLoading = false
+            this.$successMsg("全部数据（共"+ this.selectData.length +"条）重发成功！")
             return
           }
           let _resultBack = await this.resendApiHandle(this.selectData[index].id)
@@ -89,6 +95,7 @@
           }
           //失败了提示不进行任何处理
           else{
+            this.Loading.appMainLoading = false
             this.$errorMsg(`${this.selectData[index].id} 重发失败`)
           }
         },