From 2a615b798d90dbd9af0164c22dc4ddc648b1c154 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, 27 Jun 2023 17:15:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9B=91=E6=8E=A7=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/components/umyTable/index.vue       |  13 +-
 fe/PC/src/router/index.js                     |  27 ++++
 fe/PC/src/utils/tableColumns/index.js         | 135 +++++++++++++++---
 .../views/interfaceBoard/comingFromOut.vue    |  78 ++++++++++
 .../interfaceBoard/comingFromOut_file.vue     |  78 ++++++++++
 .../src/views/interfaceBoard/comingToWms.vue  |   2 +-
 .../views/interfaceBoard/comingToWms_file.vue |   1 -
 .../interfaceBoard/dataExchangeFromOut.vue    |   1 -
 .../dataExchangeFromOut_file.vue              |   1 -
 .../interfaceBoard/dataExchangeFromWms.vue    |   1 -
 .../dataExchangeFromWms_file.vue              |  78 ++++++++++
 11 files changed, 383 insertions(+), 32 deletions(-)
 create mode 100644 fe/PC/src/views/interfaceBoard/comingFromOut.vue
 create mode 100644 fe/PC/src/views/interfaceBoard/comingFromOut_file.vue
 create mode 100644 fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue

diff --git a/fe/PC/src/components/umyTable/index.vue b/fe/PC/src/components/umyTable/index.vue
index 3aba21480..ed2087e30 100644
--- a/fe/PC/src/components/umyTable/index.vue
+++ b/fe/PC/src/components/umyTable/index.vue
@@ -348,10 +348,11 @@
     <!-- 点开查看Json转换后table弹窗 -->
     <el-dialog 
       :visible.sync="showJsonDialog"
-      width="35%"
       :modal-append-to-body="false"
       :append-to-body="true"
       :show-close="true"
+      :close-on-click-modal="true"
+      :close-on-press-escape="true"
       :title="'内容详情'"
     >
       <el-table
@@ -360,24 +361,26 @@
         style="width: 100%">
         <el-table-column
           prop="name"
+          width="220"
           label="属性">
         </el-table-column>
         <el-table-column
           label="值"
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.name != 'Details'">{{scope.row}}</span>
+            <span v-if="scope.row.name != 'Details'">{{scope.row.value}}</span>
             <el-table
               v-else
+              height="300"
               :data="scope.row.value"
               :border="true"
               style="width: 100%">
               <el-table-column
                 prop="name"
-                label="属性"
+                label="子属性"
               ></el-table-column>
               <el-table-column
-                label="值"
+                label="子值"
                 prop="value"
               ></el-table-column>
             </el-table>
@@ -802,7 +805,7 @@ export default {
               _arr = [..._obj_arr]
             }else{
               // 空对象
-              _arr.push({name:item,value:JSON.stringify(_json[item])})
+              _arr.push({name:item,value:""})
             }
           }
         }
diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js
index 54c3f409d..ac44e53e5 100644
--- a/fe/PC/src/router/index.js
+++ b/fe/PC/src/router/index.js
@@ -209,6 +209,33 @@ export const constantRoutes = [
           title: 'WMS数据转换',
           icon: '报表查看',
         }
+      },{
+        path: '/dataExchangeFromWms_file',
+        component: () => import('@/views/interfaceBoard/dataExchangeFromWms_file'),
+        name: 'dataExchangeFromWms_file',
+        meta: {
+          keepAlive : true, 
+          title: '归档WMS数据转换',
+          icon: '报表查看',
+        }
+      },{
+        path: '/comingFromOut',
+        component: () => import('@/views/interfaceBoard/comingFromOut'),
+        name: 'comingFromOut',
+        meta: {
+          keepAlive : true, 
+          title: '外部数据接收',
+          icon: '报表查看',
+        }
+      },{
+        path: '/comingFromOut_file',
+        component: () => import('@/views/interfaceBoard/comingFromOut_file'),
+        name: 'comingFromOut_file',
+        meta: {
+          keepAlive : true, 
+          title: '归档外部数据接收',
+          icon: '报表查看',
+        }
       },
     ]
   }, 
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index c7c98fa67..684e459db 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -3493,12 +3493,12 @@ export const dataExchangeFromOut = [
   { label: "来源数据ID", prop: "sourceDataId" },
   { label: "来源数据组码", prop: "sourceDataGroupCode", type:"showDetail" },
   { label: "来源数据明细码", prop: "sourceDataDetailCode", type:"showDetail" },
-  { label: "来源数据内容", prop: "sourceDataContent", type:"showDetail" },
+  { label: "来源数据内容", prop: "sourceDataContent", type:"showJsonTable" },
   { label: "写入时间", prop: "writeTime",type:'dateTime' },
   { label: "写入者", prop: "writer" },
   { label: "目标系统", prop: "destinationSystem", type:"showDetail" },
   { label: "目标数据ID", prop: "destinationDataId" },
-  { label: "目标数据内容", prop: "destinationDataContent", type:"showDetail" },
+  { label: "目标数据内容", prop: "destinationDataContent", type:"showJsonTable" },
   { label: "读取时间", prop: "readTime",type:'dateTime' },
   { label: "读取者", prop: "reader" },
   { label: "错误代码", prop: "errorCode" },
@@ -3516,21 +3516,21 @@ export const dataExchangeFromOut = [
 export const dataExchangeFromOut_file = [
   { label: "编号", prop: "number" },
   { label: "备注", prop: "remark", type:"showDetail" },
-  { label: "数据类型", prop: "dataType", type:"showDetail" },
+  { label: "数据类型", prop: "dataType" },
   { label: "数据表类型", prop: "tableType" },
   { label: "数据动作", prop: "dataAction" },
   { label: "生效时间", prop: "effectiveDate",type:'dateTime' },
   { label: "数据状态", prop: "status" },
-  { label: "来源系统", prop: "sourceSystem", type:"showDetail" },
+  { label: "来源系统", prop: "sourceSystem" },
   { label: "来源数据ID", prop: "sourceDataId" },
-  { label: "来源数据组码", prop: "sourceDataGroupCode", type:"showDetail" },
-  { label: "来源数据明细码", prop: "sourceDataDetailCode", type:"showDetail" },
-  { label: "来源数据内容", prop: "sourceDataContent", type:"showDetail" },
+  { label: "来源数据组码", prop: "sourceDataGroupCode" },
+  { label: "来源数据明细码", prop: "sourceDataDetailCode" },
+  { label: "来源数据内容", prop: "sourceDataContent", type:"showJsonTable" },
   { label: "写入时间", prop: "writeTime",type:'dateTime' },
   { label: "写入者", prop: "writer" },
-  { label: "目标系统", prop: "destinationSystem", type:"showDetail" },
+  { label: "目标系统", prop: "destinationSystem" },
   { label: "目标数据ID", prop: "destinationDataId" },
-  { label: "目标数据内容", prop: "destinationDataContent", type:"showDetail" },
+  { label: "目标数据内容", prop: "destinationDataContent", type:"showJsonTable" },
   { label: "读取时间", prop: "readTime",type:'dateTime' },
   { label: "读取者", prop: "reader" },
   { label: "错误代码", prop: "errorCode" },
@@ -3548,13 +3548,13 @@ export const dataExchangeFromOut_file = [
 export const comingToWms = [
   { label: "编号", prop: "number" },
   { label: "备注", prop: "remark", type:"showDetail" },
-  { label: "数据类型", prop: "dataType", type:"showDetail" },
+  { label: "数据类型", prop: "dataType" },
   { label: "数据动作", prop: "dataAction" },
   { label: "生效时间", prop: "effectiveDate",type:'dateTime' },
   { label: "数据状态", prop: "status" },
-  { label: "数据识别码", prop: "dataIdentityCode", type:"showDetail" },
-  { label: "数据内容", prop: "dataContent", type:"showDetail" },
-  { label: "来源系统", prop: "sourceSystem", type:"showDetail" },
+  { label: "数据识别码", prop: "dataIdentityCode" },
+  { label: "数据内容", prop: "dataContent", type:"showJsonTable" },
+  { label: "来源系统", prop: "sourceSystem" },
   { label: "写入时间", prop: "writeTime",type:'dateTime' },
   { label: "读取时间", prop: "readTime",type:'dateTime' },
   { label: "错误代码", prop: "errorCode" },
@@ -3572,13 +3572,13 @@ export const comingToWms = [
 export const comingToWms_file = [
   { label: "编号", prop: "number" },
   { label: "备注", prop: "remark", type:"showDetail" },
-  { label: "数据类型", prop: "dataType", type:"showDetail" },
+  { label: "数据类型", prop: "dataType" },
   { label: "数据动作", prop: "dataAction" },
   { label: "生效时间", prop: "effectiveDate",type:'dateTime' },
   { label: "数据状态", prop: "status" },
-  { label: "数据识别码", prop: "dataIdentityCode", type:"showDetail" },
-  { label: "数据内容", prop: "dataContent", type:"showDetail" },
-  { label: "来源系统", prop: "sourceSystem", type:"showDetail" },
+  { label: "数据识别码", prop: "dataIdentityCode" },
+  { label: "数据内容", prop: "dataContent", type:"showJsonTable" },
+  { label: "来源系统", prop: "sourceSystem" },
   { label: "写入时间", prop: "writeTime",type:'dateTime' },
   { label: "读取时间", prop: "readTime",type:'dateTime' },
   { label: "错误代码", prop: "errorCode" },
@@ -3596,16 +3596,106 @@ export const comingToWms_file = [
 export const dataExchangeFromWms = [
   { label: "编号", prop: "number" },
   { label: "备注", prop: "remark", type:"showDetail" },
-  { label: "数据类型", prop: "dataType", type:"showDetail" },
+  { label: "数据类型", prop: "dataType" },
   { label: "数据动作", prop: "dataAction" },
   { label: "生效时间", prop: "effectiveDate",type:'dateTime' },
   { label: "数据状态", prop: "status" },
-  { label: "数据识别码", prop: "dataIdentityCode", type:"showDetail" },
+  { label: "数据识别码", prop: "dataIdentityCode" },
   { label: "数据内容", prop: "dataContent", type:"showJsonTable" },
-  { label: "来源系统", prop: "sourceSystem", type:"showDetail" },
+  { label: "来源系统", prop: "sourceSystem" },
   { label: "写入时间", prop: "writeTime",type:'dateTime' },
-  { label: "目标系统", prop: "destinationSystem", type:"showDetail" },
+  { label: "目标系统", prop: "destinationSystem" },
+  { label: "读取时间", prop: "readTime",type:'dateTime' },
+  { label: "错误代码", prop: "errorCode" },
+  { label: "错误信息", prop: "errorMessage", type:"showDetail" },
+  { label: "重试次数", prop: "retryTimes" },
+// ************** 暂时隐藏 ************************
+  // { label: "创建时间", prop: "creationTime",type:'dateTime' },
+  // { label: "创建者ID", prop: "creatorId" },
+  // { label: "上次修改时间", prop: "lastModificationTime",type:'dateTime' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "ID", prop: "ID" },
+]
+
+// 归档WMS数据转换
+export const dataExchangeFromWms_file = [
+  { label: "编号", prop: "number" },
+  { label: "备注", prop: "remark", type:"showDetail" },
+  { label: "数据类型", prop: "dataType" },
+  { label: "数据动作", prop: "dataAction" },
+  { label: "生效时间", prop: "effectiveDate",type:'dateTime' },
+  { label: "数据状态", prop: "status" },
+  { label: "数据识别码", prop: "dataIdentityCode" },
+  { label: "数据内容", prop: "dataContent", type:"showJsonTable" },
+  { label: "来源系统", prop: "sourceSystem" },
+  { label: "写入时间", prop: "writeTime",type:'dateTime' },
+  { label: "目标系统", prop: "destinationSystem" },
+  { label: "读取时间", prop: "readTime",type:'dateTime' },
+  { label: "错误代码", prop: "errorCode" },
+  { label: "错误信息", prop: "errorMessage", type:"showDetail" },
+  { label: "重试次数", prop: "retryTimes" },
+// ************** 暂时隐藏 ************************
+  // { label: "创建时间", prop: "creationTime",type:'dateTime' },
+  // { label: "创建者ID", prop: "creatorId" },
+  // { label: "上次修改时间", prop: "lastModificationTime",type:'dateTime' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "ID", prop: "ID" },
+]
+
+
+// 外部数据接收
+export const comingFromOut = [
+  { label: "编号", prop: "number" },
+  { label: "备注", prop: "remark", type:"showDetail" },
+  { label: "数据类型", prop: "dataType" },
+  { label: "数据表类型", prop: "tableType" },
+  { label: "数据动作", prop: "dataAction" },
+  { label: "生效时间", prop: "effectiveDate",type:'dateTime' },
+  { label: "数据状态", prop: "status" },
+  { label: "来源系统", prop: "sourceSystem" },
+  { label: "来源数据ID", prop: "sourceDataId" },
+  { label: "来源数据组码", prop: "sourceDataGroupCode" },
+  { label: "来源数据明细码", prop: "sourceDataDetailCode" },
+  { label: "来源数据内容", prop: "sourceDataContent", type:"showJsonTable" },
+  { label: "写入时间", prop: "writeTime",type:'dateTime' },
+  { label: "写入者", prop: "writer" },
+  { label: "目标系统", prop: "destinationSystem" },
+  { label: "目标数据ID", prop: "destinationDataId" },
+  { label: "目标数据内容", prop: "destinationDataContent", type:"showJsonTable" },
+  { label: "读取时间", prop: "readTime",type:'dateTime' },
+  { label: "读取者", prop: "reader" },
+  { label: "错误代码", prop: "errorCode" },
+  { label: "错误信息", prop: "errorMessage", type:"showDetail" },
+  { label: "重试次数", prop: "retryTimes" },
+// ************** 暂时隐藏 ************************
+  // { label: "创建时间", prop: "creationTime",type:'dateTime' },
+  // { label: "创建者ID", prop: "creatorId" },
+  // { label: "上次修改时间", prop: "lastModificationTime",type:'dateTime' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "ID", prop: "ID" },
+]
+
+// 归档外部数据接收
+export const comingFromOut_file = [
+  { label: "编号", prop: "number" },
+  { label: "备注", prop: "remark", type:"showDetail" },
+  { label: "数据类型", prop: "dataType" },
+  { label: "数据表类型", prop: "tableType" },
+  { label: "数据动作", prop: "dataAction" },
+  { label: "生效时间", prop: "effectiveDate",type:'dateTime' },
+  { label: "数据状态", prop: "status" },
+  { label: "来源系统", prop: "sourceSystem" },
+  { label: "来源数据ID", prop: "sourceDataId" },
+  { label: "来源数据组码", prop: "sourceDataGroupCode" },
+  { label: "来源数据明细码", prop: "sourceDataDetailCode" },
+  { label: "来源数据内容", prop: "sourceDataContent", type:"showJsonTable" },
+  { label: "写入时间", prop: "writeTime",type:'dateTime' },
+  { label: "写入者", prop: "writer" },
+  { label: "目标系统", prop: "destinationSystem" },
+  { label: "目标数据ID", prop: "destinationDataId" },
+  { label: "目标数据内容", prop: "destinationDataContent", type:"showJsonTable" },
   { label: "读取时间", prop: "readTime",type:'dateTime' },
+  { label: "读取者", prop: "reader" },
   { label: "错误代码", prop: "errorCode" },
   { label: "错误信息", prop: "errorMessage", type:"showDetail" },
   { label: "重试次数", prop: "retryTimes" },
@@ -3622,4 +3712,5 @@ export const dataExchangeFromWms = [
 // 字段说明
 // showProp: true //隐藏该字段的高级筛选+列表排序
 // sortable: false //隐藏该字段的列表排序
-// type:showDetail //此类型点击弹窗所有信息，适用于接口监控看板等文本过长使用
\ No newline at end of file
+// type:showDetail //此类型点击弹窗所有信息，适用于接口监控看板等文本过长使用
+// type:showJsonTable //此类型点击弹窗可以以表格的形式看解析的json，适用于接口监控看板中json数据等
\ No newline at end of file
diff --git a/fe/PC/src/views/interfaceBoard/comingFromOut.vue b/fe/PC/src/views/interfaceBoard/comingFromOut.vue
new file mode 100644
index 000000000..15f347a17
--- /dev/null
+++ b/fe/PC/src/views/interfaceBoard/comingFromOut.vue
@@ -0,0 +1,78 @@
+<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="topbutton"
+        @inlineDialog="inlineDialog"
+        @sortChange="sortChange"
+        @alertoldSkipCount="alertoldSkipCount"
+        @alterResultCount="alterResultCount"
+        @handleSelectionChange="handleSelectionChange"
+        :currentPageProps="oldSkipCount"
+        :quicklySearchOption="quicklySearchOption"
+        @quicklySearchClick="quicklySearchClick"
+        @quicklySearchClear="quicklySearchClear"
+        :primarySearchOption="primarySearchOption"
+        @overallSearchFormClick="overallSearchFormClick"
+        :httpOverallSearchData="httpOverallSearchData"
+      >
+      </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 { comingFromOut } from "@/api/wms-interface"
+  
+  export default {
+    name: "comingFromOut",
+    mixins: [
+      tableMixins,
+      LoadingMixins,
+      TableHeaderMixins,
+      mixins,
+    ],
+    data() {
+      return {
+        //常用按钮数据
+        currenButtonData: [
+          this.defaultFieldSettingBtn(),//字段设置
+          this.defaultFreshBtn(),//刷新
+        //   this.defaultFilterBtn(),//筛选
+        ],
+      };
+    },
+    mounted() {
+      this.paging();
+    },
+    methods: {
+        //渲染数据
+        paging(callback) {
+            this.Loading.tableLoading = true;
+            this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
+            comingFromOut(this.PageListParams)
+                .then(result => {
+                  let res = result.data
+                  this.tableData = res.items
+                  this.totalCount = res.totalCount
+                  this.pagingCallback(callback)
+                })
+                .catch(err => {
+                    this.Loading.tableLoading = false
+                })
+        },
+    }
+  }
+  </script>
+<style lang="scss" scoped>
+@import "@/styles/basicData.scss";
+</style>
\ No newline at end of file
diff --git a/fe/PC/src/views/interfaceBoard/comingFromOut_file.vue b/fe/PC/src/views/interfaceBoard/comingFromOut_file.vue
new file mode 100644
index 000000000..40646beda
--- /dev/null
+++ b/fe/PC/src/views/interfaceBoard/comingFromOut_file.vue
@@ -0,0 +1,78 @@
+<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="topbutton"
+        @inlineDialog="inlineDialog"
+        @sortChange="sortChange"
+        @alertoldSkipCount="alertoldSkipCount"
+        @alterResultCount="alterResultCount"
+        @handleSelectionChange="handleSelectionChange"
+        :currentPageProps="oldSkipCount"
+        :quicklySearchOption="quicklySearchOption"
+        @quicklySearchClick="quicklySearchClick"
+        @quicklySearchClear="quicklySearchClear"
+        :primarySearchOption="primarySearchOption"
+        @overallSearchFormClick="overallSearchFormClick"
+        :httpOverallSearchData="httpOverallSearchData"
+      >
+      </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 { comingFromOut_file } from "@/api/wms-interface"
+  
+  export default {
+    name: "comingFromOut_file",
+    mixins: [
+      tableMixins,
+      LoadingMixins,
+      TableHeaderMixins,
+      mixins,
+    ],
+    data() {
+      return {
+        //常用按钮数据
+        currenButtonData: [
+          this.defaultFieldSettingBtn(),//字段设置
+          this.defaultFreshBtn(),//刷新
+        //   this.defaultFilterBtn(),//筛选
+        ],
+      };
+    },
+    mounted() {
+      this.paging();
+    },
+    methods: {
+        //渲染数据
+        paging(callback) {
+            this.Loading.tableLoading = true;
+            this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
+            comingFromOut_file(this.PageListParams)
+                .then(result => {
+                  let res = result.data
+                  this.tableData = res.items
+                  this.totalCount = res.totalCount
+                  this.pagingCallback(callback)
+                })
+                .catch(err => {
+                    this.Loading.tableLoading = false
+                })
+        },
+    }
+  }
+  </script>
+<style lang="scss" scoped>
+@import "@/styles/basicData.scss";
+</style>
\ No newline at end of file
diff --git a/fe/PC/src/views/interfaceBoard/comingToWms.vue b/fe/PC/src/views/interfaceBoard/comingToWms.vue
index 2d0bc5f0a..a53aef709 100644
--- a/fe/PC/src/views/interfaceBoard/comingToWms.vue
+++ b/fe/PC/src/views/interfaceBoard/comingToWms.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="page-box" v-loading="Loading.appMainLoading">
+      <!-- :showOverflowTooltip="false" -->
       <tablePagination
         :currenButtonData="currenButtonData"
         :tableData="tableData"
@@ -22,7 +23,6 @@
         :primarySearchOption="primarySearchOption"
         @overallSearchFormClick="overallSearchFormClick"
         :httpOverallSearchData="httpOverallSearchData"
-        :showOverflowTooltip="false"
       >
       </tablePagination>
     </div>
diff --git a/fe/PC/src/views/interfaceBoard/comingToWms_file.vue b/fe/PC/src/views/interfaceBoard/comingToWms_file.vue
index 0d83678ae..64b432d0f 100644
--- a/fe/PC/src/views/interfaceBoard/comingToWms_file.vue
+++ b/fe/PC/src/views/interfaceBoard/comingToWms_file.vue
@@ -22,7 +22,6 @@
         :primarySearchOption="primarySearchOption"
         @overallSearchFormClick="overallSearchFormClick"
         :httpOverallSearchData="httpOverallSearchData"
-        :showOverflowTooltip="false"
       >
       </tablePagination>
     </div>
diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue
index 2d7c0dbec..2bf7fcf43 100644
--- a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue
+++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue
@@ -22,7 +22,6 @@
         :primarySearchOption="primarySearchOption"
         @overallSearchFormClick="overallSearchFormClick"
         :httpOverallSearchData="httpOverallSearchData"
-        :showOverflowTooltip="false"
       >
       </tablePagination>
     </div>
diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue
index e67fc410e..aaef0872f 100644
--- a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue
+++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue
@@ -22,7 +22,6 @@
         :primarySearchOption="primarySearchOption"
         @overallSearchFormClick="overallSearchFormClick"
         :httpOverallSearchData="httpOverallSearchData"
-        :showOverflowTooltip="false"
       >
       </tablePagination>
     </div>
diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue
index d86c2d707..6cc8f4081 100644
--- a/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue
+++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue
@@ -22,7 +22,6 @@
         :primarySearchOption="primarySearchOption"
         @overallSearchFormClick="overallSearchFormClick"
         :httpOverallSearchData="httpOverallSearchData"
-        :showOverflowTooltip="false"
       >
       </tablePagination>
     </div>
diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue
new file mode 100644
index 000000000..4e831e7d5
--- /dev/null
+++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue
@@ -0,0 +1,78 @@
+<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="topbutton"
+        @inlineDialog="inlineDialog"
+        @sortChange="sortChange"
+        @alertoldSkipCount="alertoldSkipCount"
+        @alterResultCount="alterResultCount"
+        @handleSelectionChange="handleSelectionChange"
+        :currentPageProps="oldSkipCount"
+        :quicklySearchOption="quicklySearchOption"
+        @quicklySearchClick="quicklySearchClick"
+        @quicklySearchClear="quicklySearchClear"
+        :primarySearchOption="primarySearchOption"
+        @overallSearchFormClick="overallSearchFormClick"
+        :httpOverallSearchData="httpOverallSearchData"
+      >
+      </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 { dataExchangeFromWms_file } from "@/api/wms-interface"
+  
+  export default {
+    name: "dataExchangeFromWms_file",
+    mixins: [
+      tableMixins,
+      LoadingMixins,
+      TableHeaderMixins,
+      mixins,
+    ],
+    data() {
+      return {
+        //常用按钮数据
+        currenButtonData: [
+          this.defaultFieldSettingBtn(),//字段设置
+          this.defaultFreshBtn(),//刷新
+        //   this.defaultFilterBtn(),//筛选
+        ],
+      };
+    },
+    mounted() {
+      this.paging();
+    },
+    methods: {
+        //渲染数据
+        paging(callback) {
+            this.Loading.tableLoading = true;
+            this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
+            dataExchangeFromWms_file(this.PageListParams)
+                .then(result => {
+                  let res = result.data
+                  this.tableData = res.items
+                  this.totalCount = res.totalCount
+                  this.pagingCallback(callback)
+                })
+                .catch(err => {
+                    this.Loading.tableLoading = false
+                })
+        },
+    }
+  }
+  </script>
+<style lang="scss" scoped>
+@import "@/styles/basicData.scss";
+</style>
\ No newline at end of file