From 98eade2f9c940c0f2cb93596d9329b9aff613a19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 20 Oct 2023 20:01:12 +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=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/api/wms-api.js                      |   9 ++
 fe/PC/src/router/index.js                     |  55 +++-----
 fe/PC/src/utils/tableColumns/index.js         |  35 ++++--
 fe/PC/src/utils/tableColumns/index_new.js     |  32 ++---
 .../exchangeDataMaintenancePage.vue           | 119 ++++++++++++++++++
 5 files changed, 189 insertions(+), 61 deletions(-)
 create mode 100644 fe/PC/src/views/interfaceBoard/exchangeDataMaintenancePage.vue

diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js
index 05e69d6d9..86ba7a673 100644
--- a/fe/PC/src/api/wms-api.js
+++ b/fe/PC/src/api/wms-api.js
@@ -612,6 +612,15 @@ export function getFilestore(data) {
 }
 
 
+// exchangeData批量操作页面--重新发送
+export async function exchangeDataResendById(id) {
+    return request({
+        url: baseURL + 'wms/store/exchange-data/re-send-by-id/' + id,
+        method: 'post',
+    })
+}
+
+
 // 根据编号获取字典信息
 // export function getDictByCode(code) {
 //   return request({
diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js
index cc24cbf9b..ad1f63c6a 100644
--- a/fe/PC/src/router/index.js
+++ b/fe/PC/src/router/index.js
@@ -119,16 +119,29 @@ export const constantRoutes = [
       }
     }]
   }, 
+  // 前端模拟报表页面
   {
     path: '/InventoryBookDetail_innerPage',
     component: () => import('@/views/activeReportManage/reportForm/InventoryBookDetail_innerPage'),
     hidden: true
   },
-  // {
-  //   path: '/report-test',
-  //   component: () => import('@/views/activeReportManage/reportForm/InventoryBookDetail_innerPage'),
-  //   hidden: true
-  // },
+  // exchangeData批量操作页面
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/exchangeDataMaintenancePage',
+    hidden: true,
+    children: [{
+      path: 'exchangeDataMaintenancePage',
+      component: () => import('@/views/interfaceBoard/exchangeDataMaintenancePage'),
+      name: 'exchangeDataMaintenancePage',
+      meta: {
+        keepAlive : true, 
+        title: 'exchangeData批量操作',
+        icon: '系统首页',
+      }
+    }]
+  }, 
   // {
   //   path: '/',
   //   component: Layout,
@@ -145,38 +158,6 @@ export const constantRoutes = [
   //     }
   //   }]
   // }, 
-  
-  // 开发中模拟路由
-  // {
-  //   path: '/',
-  //   component: Layout,
-  //   redirect: '/ceshi',
-  //   hidden: true,
-  //   children: [{
-  //     path: 'ceshi',
-  //     component: () => import('@/views/ceshi/ceshi.vue'),
-  //     name: 'ceshi',
-  //     meta: {
-  //       title: 'ceshi',
-  //       icon: '',
-  //     }
-  //   }]
-  // },
-  // {
-  //   path: '/',
-  //   component: Layout,
-  //   redirect: '/_dashboard2',
-  //   hidden: true,
-  //   children: [{
-  //     path: '_dashboard2',
-  //     component: () => import('@/views/dashboard/_index2'),
-  //     name: '_dashboard2',
-  //     meta: {
-  //       title: '_dashboard2',
-  //       icon: '系统首页',
-  //     }
-  //   }]
-  // },
 ]
 
 /**
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index df03bd080..651ab4cf0 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -3568,7 +3568,7 @@ export const dataExchangeFromOut = [
   // { label: _Public.creatorId, prop: "creatorId" },
   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-  // { label: _Public.ID, prop: "ID" },
+  // { label: _Public.id, prop: "ID" },
 ]
 
 // 归档外部数据转换
@@ -3600,7 +3600,7 @@ export const dataExchangeFromOut_file = [
   // { label: _Public.creatorId, prop: "creatorId" },
   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-  // { label: _Public.ID, prop: "ID" },
+  // { label: _Public.id, prop: "ID" },
 ]
 
 // WMS数据接收
@@ -3624,7 +3624,7 @@ export const comingToWms = [
   // { label: _Public.creatorId, prop: "creatorId" },
   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-  // { label: _Public.ID, prop: "ID" },
+  // { label: _Public.id, prop: "ID" },
 ]
 
 // 归档WMS数据接收
@@ -3648,7 +3648,7 @@ export const comingToWms_file = [
   // { label: _Public.creatorId, prop: "creatorId" },
   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-  // { label: _Public.ID, prop: "ID" },
+  // { label: _Public.id, prop: "ID" },
 ]
 
 // WMS数据转换
@@ -3673,7 +3673,7 @@ export const dataExchangeFromWms = [
   // { label: _Public.creatorId, prop: "creatorId" },
   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-  // { label: _Public.ID, prop: "ID" },
+  // { label: _Public.id, prop: "ID" },
 ]
 
 // 归档WMS数据转换
@@ -3698,7 +3698,7 @@ export const dataExchangeFromWms_file = [
   // { label: _Public.creatorId, prop: "creatorId" },
   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-  // { label: _Public.ID, prop: "ID" },
+  // { label: _Public.id, prop: "ID" },
 ]
 
 
@@ -3731,7 +3731,7 @@ export const comingFromOut = [
   // { label: _Public.creatorId, prop: "creatorId" },
   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-  // { label: _Public.ID, prop: "ID" },
+  // { label: _Public.id, prop: "ID" },
 ]
 
 // 归档外部数据接收 
@@ -3763,7 +3763,26 @@ export const comingFromOut_file = [
   // { label: _Public.creatorId, prop: "creatorId" },
   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-  // { label: _Public.ID, prop: "ID" },
+  // { label: _Public.id, prop: "ID" },
+]
+
+// exchangeData批量操作页面
+export const exchangeDataMaintenancePage = [
+  { label: _Dashboard.dataAction, prop: "dataAction"},
+  { label: _Dashboard.dataContent, prop: "dataContent", type:"showJsonTable" },
+  { label: _Dashboard.dataIdentityCode, prop: "dataIdentityCode" },
+  { label: _Dashboard.dataType, prop: "dataType", type:"showDetail" },
+  { 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" },
 ]
 
 
diff --git a/fe/PC/src/utils/tableColumns/index_new.js b/fe/PC/src/utils/tableColumns/index_new.js
index 232e9e63b..911845a8f 100644
--- a/fe/PC/src/utils/tableColumns/index_new.js
+++ b/fe/PC/src/utils/tableColumns/index_new.js
@@ -3581,7 +3581,7 @@ export const dataExchangeFromOut = [
   // { label: _Public.creatorId, prop: "creatorId" },
   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-  // { label: _Public.ID, prop: "ID" },
+  // { label: _Public.id, prop: "ID" },
 ]
 
 // 2归档外部数据转换
@@ -3613,7 +3613,7 @@ export const dataExchangeFromOut_file = [
   // { label: _Public.creatorId, prop: "creatorId" },
   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-  // { label: _Public.ID, prop: "ID" },
+  // { label: _Public.id, prop: "ID" },
 ]
 
 // 3WMS数据接收
@@ -3637,7 +3637,7 @@ export const comingToWms = [
   // { label: _Public.creatorId, prop: "creatorId" },
   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-  // { label: _Public.ID, prop: "ID" },
+  // { label: _Public.id, prop: "ID" },
 ]
 
 // 4归档WMS数据接收
@@ -3661,7 +3661,7 @@ export const comingToWms_file = [
   // { label: _Public.creatorId, prop: "creatorId" },
   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-  // { label: _Public.ID, prop: "ID" },
+  // { label: _Public.id, prop: "ID" },
 ]
 
 // 5WMS数据转换
@@ -3686,7 +3686,7 @@ export const dataExchangeFromWms = [
   // { label: _Public.creatorId, prop: "creatorId" },
   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-  // { label: _Public.ID, prop: "ID" },
+  // { label: _Public.id, prop: "ID" },
 ]
 
 // 6归档WMS数据转换
@@ -3711,7 +3711,7 @@ export const dataExchangeFromWms_file = [
   // { label: _Public.creatorId, prop: "creatorId" },
   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-  // { label: _Public.ID, prop: "ID" },
+  // { label: _Public.id, prop: "ID" },
 ]
 
 // 7外部数据接收
@@ -3743,7 +3743,7 @@ export const comingFromOut = [
   // { label: _Public.creatorId, prop: "creatorId" },
   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-  // { label: _Public.ID, prop: "ID" },
+  // { label: _Public.id, prop: "ID" },
 ]
 
 // 8归档外部数据接收 
@@ -3775,7 +3775,7 @@ export const comingFromOut_file = [
   // { label: _Public.creatorId, prop: "creatorId" },
   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-  // { label: _Public.ID, prop: "ID" },
+  // { label: _Public.id, prop: "ID" },
 ]
 
 
@@ -3813,7 +3813,7 @@ export const comingFromOut_file = [
 //   // { label: _Public.creatorId, prop: "creatorId" },
 //   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
 //   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-//   // { label: _Public.ID, prop: "ID" },
+//   // { label: _Public.id, prop: "ID" },
 // ]
 
 // // 归档外部数据转换
@@ -3845,7 +3845,7 @@ export const comingFromOut_file = [
 //   // { label: _Public.creatorId, prop: "creatorId" },
 //   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
 //   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-//   // { label: _Public.ID, prop: "ID" },
+//   // { label: _Public.id, prop: "ID" },
 // ]
 
 // WMS数据接收
@@ -3869,7 +3869,7 @@ export const comingFromOut_file = [
 //   // { label: _Public.creatorId, prop: "creatorId" },
 //   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
 //   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-//   // { label: _Public.ID, prop: "ID" },
+//   // { label: _Public.id, prop: "ID" },
 // ]
 
 // // 归档WMS数据接收
@@ -3893,7 +3893,7 @@ export const comingFromOut_file = [
 //   // { label: _Public.creatorId, prop: "creatorId" },
 //   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
 //   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-//   // { label: _Public.ID, prop: "ID" },
+//   // { label: _Public.id, prop: "ID" },
 // ]
 
 // // WMS数据转换
@@ -3918,7 +3918,7 @@ export const comingFromOut_file = [
 //   // { label: _Public.creatorId, prop: "creatorId" },
 //   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
 //   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-//   // { label: _Public.ID, prop: "ID" },
+//   // { label: _Public.id, prop: "ID" },
 // ]
 
 // // 归档WMS数据转换
@@ -3943,7 +3943,7 @@ export const comingFromOut_file = [
 //   // { label: _Public.creatorId, prop: "creatorId" },
 //   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
 //   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-//   // { label: _Public.ID, prop: "ID" },
+//   // { label: _Public.id, prop: "ID" },
 // ]
 
 
@@ -3976,7 +3976,7 @@ export const comingFromOut_file = [
 //   // { label: _Public.creatorId, prop: "creatorId" },
 //   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
 //   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-//   // { label: _Public.ID, prop: "ID" },
+//   // { label: _Public.id, prop: "ID" },
 // ]
 
 // // 归档外部数据接收 
@@ -4008,7 +4008,7 @@ export const comingFromOut_file = [
 //   // { label: _Public.creatorId, prop: "creatorId" },
 //   // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
 //   // { label: _Public.lastModifierId, prop: "lastModifierId" },
-//   // { label: _Public.ID, prop: "ID" },
+//   // { label: _Public.id, prop: "ID" },
 // ]
 
 
diff --git a/fe/PC/src/views/interfaceBoard/exchangeDataMaintenancePage.vue b/fe/PC/src/views/interfaceBoard/exchangeDataMaintenancePage.vue
new file mode 100644
index 000000000..4e3212f0c
--- /dev/null
+++ b/fe/PC/src/views/interfaceBoard/exchangeDataMaintenancePage.vue
@@ -0,0 +1,119 @@
+<template>
+    <div class="page-box" v-loading="Loading.appMainLoading">
+      <tablePagination
+        :currenButtonData="currenButtonData"
+        :tableData="tableData"
+        :tableLoading="Loading.tableLoading"
+        :tableColumns="tableColumns"
+        @rowDrop="rowDrop"
+        :totalCount="totalCount"
+        :multipleSelection="multipleSelection"
+        :MaxResultCount="PageListParams.MaxResultCount"
+        @topbutton="topbuttonHandle"
+        @inlineDialog="inlineDialog"
+        @sortChange="sortChange"
+        @alertoldSkipCount="alertoldSkipCount"
+        @alterResultCount="alterResultCount"
+        @handleSelectionChange="handleSelectionChange"
+        :currentPageProps="oldSkipCount"
+        :quicklySearchOption="quicklySearchOption"
+        @quicklySearchClick="quicklySearchClick"
+        @quicklySearchClear="quicklySearchClear"
+        :primarySearchOption="primarySearchOption"
+        @overallSearchFormClick="overallSearchFormClick"
+        :httpOverallSearchData="httpOverallSearchData"
+        :tableSelection="true"
+      >
+      </tablePagination>
+    </div>
+  </template>
+  <script>
+  import { tableMixins } from "@/mixins/TableMixins";
+  import { LoadingMixins } from "@/mixins/LoadingMixins";
+  import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+  import { mixins } from "@/mixins/mixins";
+  import { exchangeDataResendById } from "@/api/wms-api"
+  
+  export default {
+    name: "exchangeDataMaintenancePage",
+    mixins: [
+      tableMixins,
+      LoadingMixins,
+      TableHeaderMixins,
+      mixins,
+    ],
+    data() {
+      return {
+        URL: 'wms/store/exchange-data',
+        //常用按钮数据
+        currenButtonData: [
+            this.defaultFieldSettingBtn(),//字段设置
+            this.defaultFreshBtn(),//刷新
+            // this.defaultFilterBtn(),//筛选
+            {
+                type: "primary",
+                icon: "el-icon-refresh",
+                label: "批量重发",
+                name: "resend",
+                size: "mini",
+            }
+        ],
+        selectData:null,//已选数据
+      };
+    },
+    mounted() {
+      this.paging();
+    },
+    methods: {
+        handleSelectionChange(val){
+            this.selectData = val
+        },
+        topbuttonHandle(val,item){
+            if(val == 'resend'){
+                // this.resendHandle()
+            }else{
+                this.topbutton(val,item)
+            }
+        },
+        async resendHandle(){
+            let _resultBack = null
+            for(var i = 0;i<this.selectData.length;i++){
+                _resultBack = await this.resendApiHandle(this.selectData[i].id)
+                console.log(_resultBack)
+                if(_resultBack == 0){
+                    this.$errorMsg(`${this.selectData[i].id},失败`)
+                    break
+                }else{
+                    _resultBack = this.resendHandle()
+                }
+            }
+        },
+        async resendApiHandle(id){
+            let resultBack = null
+            await exchangeDataResendById(id)
+                .then(res=>{ resultBack = 1 })
+                .catch(err=>{ resultBack = 0 })
+            return resultBack
+        },
+        // async resendApiBack(data) {
+        //     try {
+        //         let result = await exchangeDataResendById(data.id)
+        //         console.log(90,result)
+        //         return result
+        //     } catch (err) {
+        //         return new Promise((resolve, reject) => {
+        //             reject(false)
+        //         })
+        //     }
+        // },
+        // resendApiHandle (data){
+        //     return new Promise((resolve, reject) => {
+        //         resolve(data)
+        //     })
+        // }
+    }
+  };
+  </script>
+<style lang="scss" scoped>
+@import "@/styles/basicData.scss";
+</style>
\ No newline at end of file