代码更新及整理

Code/Fe/public/config.js

@@ -1,6 +1,7 @@
 // dev_win
 window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:60069'
 window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-configuration'
+window.SITE_CONFIG['columnsApiNamesZh'] = 'Winin'
 window.SITE_CONFIG['isAutoLogin'] = false
 window.SITE_CONFIG['isSinglePage'] = false
 window.SITE_CONFIG['userNameOrEmailAddress'] = 'admin'

Code/Fe/src/App.vue

@@ -10,6 +10,7 @@ export default {
 }
 localStorage.setItem('base',window.SITE_CONFIG['base'])
 localStorage.setItem('columnsApiNames',window.SITE_CONFIG['columnsApiNames'])
+localStorage.setItem('columnsApiNamesZh',window.SITE_CONFIG['columnsApiNamesZh'])
 localStorage.setItem('isAutoLogin',window.SITE_CONFIG['isAutoLogin'])
 localStorage.setItem('isSinglePage',window.SITE_CONFIG['isSinglePage'])
 localStorage.setItem('userNameOrEmailAddress',window.SITE_CONFIG['userNameOrEmailAddress'])

Code/Fe/src/api/wms-api.js

@@ -23,9 +23,11 @@ export function postCreate(data, url) {
 //编辑
 export function postUpdate(data, id, url) {
   return request({
-    url: baseURL + url + '/' + id,
+    // url: baseURL + url + '/' + id,
+    url: baseURL + url,
     method: 'put',
-    data
+    data,
+    params:{id:id}
   })
 }
 //申请流程
@@ -47,8 +49,10 @@ export function postDetailUpdate(data, id, UrlData, url) {
 //删除
 export function postDelete(id, url) {
   return request({
-    url: baseURL + url + '/' + id,
+    // url: baseURL + url + '/' + id,
+    url: baseURL + url,
     method: 'delete',
+    params:{id:id}
   })
 }
 //子表删除

Code/Fe/src/api/wms-interface.js

@@ -2,14 +2,6 @@
 import request from '@/utils/request'
 let base_api = localStorage.getItem('base')
 let colum_url = localStorage.getItem('columnsApiNames')
-// 转义传参
-const initParams = (data) => {
-    return {
-        skipCount:data.SkipCount,
-        maxResultCount:data.MaxResultCount,
-        sorting:data.Sorting
-    }
-}
 
 // 获取表头数据
 export function getInterfaceBoard() {
@@ -19,136 +11,6 @@ export function getInterfaceBoard() {
     })
 }
 
-// 获取导出配置信息接口
-// export function getExportConfigList(name) {
-//     return request({
-//         url: base_api + '/get-by-user-and-table-name',
-//         method: 'post',
-//         params:{
-//             userId:JSON.parse(localStorage.getItem("currentUserInfo")).id,
-//             exportTableName:name
-//         },
-//     })
-// }
-
-//外部数据转换
-// export function dataExchangeFromOut(data) {
-//     return axios({
-//         method:'get',
-//         url: interfaceBoard_api + 'outgoing-to-external',
-//         params:initParams(data)
-//     })
-// }
-
-// //归档外部数据转换
-// export function dataExchangeFromOut_file(data) {
-//     return axios({
-//         method:'get',
-//         url: interfaceBoard_api + 'archived-outgoing-to-external',
-//         params:initParams(data)
-//     })
-// }
-
-// //wms数据接收
-// export function comingToWms(data) {
-//     return axios({
-//         method:'get',
-//         url: interfaceBoard_api + 'incoming-to-wms',
-//         params:initParams(data)
-//     })
-// }
-
-// //归档wms数据接收
-// export function comingToWms_file(data) {
-//     return axios({
-//         method:'get',
-//         url: interfaceBoard_api + 'archived-incoming-to-wms',
-//         params:initParams(data)
-//     })
-// }
-
-// //wms数据转换
-// export function dataExchangeFromWms(data) {
-//     return axios({
-//         method:'get',
-//         url: interfaceBoard_api + 'data-exchange_Outgoing-from-wms',
-//         params:initParams(data)
-//     })
-// }
-
-// // 归档wms数据转换
-// export function dataExchangeFromWms_file(data) {
-//     return axios({
-//         method:'get',
-//         url: interfaceBoard_api + 'data-exchange_Archived-outgoing-from-wms',
-//         params:initParams(data)
-//     })
-// }
-
-// //外部数据接收
-// export function comingFromOut(data) {
-//     return axios({
-//         method:'get',
-//         url: interfaceBoard_api + 'data-exchange_Incoming-from-external',
-//         params:initParams(data)
-//     })
-// }
-
-// //归档外部数据接收
-// export function comingFromOut_file(data) {
-//     return axios({
-//         method:'get',
-//         url: interfaceBoard_api + 'data-exchange_Archived-incoming-from-external',
-//         params:initParams(data)
-//     })
-// }
-
-// 测试数据-列表
-// export function TestSchool(data, includeDetails) {
-//     return request({
-//         method:'post',
-//         url: base_api + '/api/TestSchool/base/get-list-page-by-filter?includeDetails='+Boolean(includeDetails),
-//         data
-//     })
-// }
-
-// // 测试数据-列表-根据id获取详情
-// export function TestSchoolItemById(id) {
-//     return request({
-//         method:'get',
-//         url: base_api + '/api/app/test-school/'+id,
-//     })
-// }
-
-// // 测试数据-列表-新增、编辑
-// export function TestSchool_save(data,isAdd) {
-//     let _type = isAdd ? 'create' : 'update-by-id'
-//     return request({
-//         method:'post',
-//         url: base_api + '/api/TestSchool/base/'+_type,
-//         data:data,
-//         params:{id:data.id}
-//     })
-// }
-
-// // 测试数据-列表-删除
-// export function TestSchool_delete(id) {
-//     return request({
-//         method:'DELETE',
-//         url: base_api + '/api/TestSchool/base/delete-by-id',
-//         params:{id:id}
-//     })
-// }
-
-// // 测试数据-明细-列表
-// export function TestSchoolDetailList(data,includeDetails) {
-//     return request({
-//         method:'post',
-//         url: base_api + '/api/TestStudentDetail/base/get-list-page-by-filter?includeDetails='+Boolean(includeDetails),
-//         data
-//     })
-// }
-
 // // 测试数据-明细-删除
 // export function TestSchoolDetailList_delete(id) {
 //     return request({

Code/Fe/src/components/umyTable/index.vue

@@ -368,7 +368,8 @@
           label="值"
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.name != 'Details'">{{scope.row.value}}</span>
+            <!-- DETAILS todo:DETAILS判断条件需要优化，使用传参的方式 -->
+            <span v-if="(scope.row.name).toUpperCase != 'DETAILS'">{{scope.row.value}}</span>
             <el-table
               v-else
               height="300"
@@ -793,8 +794,8 @@ export default {
         }else{
           // 如果是数组
           if(Array.isArray(_json[item])){
-            //  如果是 Details
+            //  如果是 DETAILS todo:DETAILS判断条件需要优化，使用传参的方式
-            let _value = item == 'Details' ? __initJson(_json[item][0]) : (_json[item]).join(",")
+            let _value = (item).toUpperCase == 'DETAILS' ? __initJson(_json[item][0]) : (_json[item]).join(",")
             _arr.push({name:item,value:_value})
           }
           // 如果是对象

Code/Fe/src/permission.js

@@ -82,9 +82,10 @@ router.beforeEach(async (to, from, next) => {
   }else{
     // 重新获取api接口表头
     const _interfaceBoardColumnsNames = localStorage.getItem("interfaceBoardColumnsNames")
-    if( !_interfaceBoardColumnsNames ){
+    if( !_interfaceBoardColumnsNames || _interfaceBoardColumnsNames == 'undefined' || _interfaceBoardColumnsNames == 'null'){
       getInterfaceBoard().then(result => {
-        localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.localization.values.Winin));
+        let _zh = localStorage.getItem('columnsApiNamesZh')
+        localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.localization.values[_zh]));
         setTimeout(()=>{
           next()
         },0)

Code/Fe/src/router/modules/baseConfig.js

@@ -1,4 +1,5 @@
 import Layout from '@/layout'
+import { initFromApiColumnsLable } from '@/utils/index'
 const interfaceBoardRouter = {
   path: '/basicConfig',
   alwaysShow:true,
@@ -10,11 +11,11 @@ const interfaceBoardRouter = {
     roles:'skip'
   },
   children: [{
-      path: 'exportConfig',
+      path: 'ExportCustomUserSetting',
-      name: 'exportConfig',
+      name: 'ExportCustomUserSetting',
-      component: () => import('@/views/basicConfig/exportConfig'),
+      component: () => import('@/views/basicConfig/ExportCustomUserSetting'),
       meta: {
-        title: '导出配置',
+        title: initFromApiColumnsLable('ExportCustomUserSetting'),//导出配置
         icon: '用户',
         roles: 'skip'
       }

Code/Fe/src/router/modules/interfaceBoard.js

@@ -1,4 +1,5 @@
 import Layout from '@/layout'
+import { initFromApiColumnsLable } from '@/utils/index'
 const interfaceBoardRouter = {
   path: '/interfaceBoard',
   alwaysShow:true,
@@ -14,79 +15,7 @@ const interfaceBoardRouter = {
       name: 'TestSchool',
       component: () => import('@/views/interfaceBoard/TestSchool'),
       meta: {
-        title: 'TestSchool',
+        title: initFromApiColumnsLable('TestSchool'),
-        icon: '用户',
-        roles: 'skip'
-      }
-    },{
-      path: 'dataExchangeFromOut',
-      name: 'dataExchangeFromOut',
-      component: () => import('@/views/interfaceBoard/dataExchangeFromOut'),
-      meta: {
-        title: '外部数据转换',
-        icon: '用户',
-        roles: 'skip'
-      }
-    },{
-      path: 'dataExchangeFromOut_file',
-      name: 'dataExchangeFromOut_file',
-      component: () => import('@/views/interfaceBoard/dataExchangeFromOut_file'),
-      meta: {
-        title: '归档外部数据转换',
-        icon: '用户',
-        roles: 'skip'
-      }
-    },{
-      path: 'comingToWms',
-      name: 'comingToWms',
-      component: () => import('@/views/interfaceBoard/comingToWms'),
-      meta: {
-        title: 'WMS数据接收',
-        icon: '用户',
-        roles: 'skip'
-      }
-    },{
-      path: 'comingToWms_file',
-      name: 'comingToWms_file',
-      component: () => import('@/views/interfaceBoard/comingToWms_file'),
-      meta: {
-        title: '归档WMS数据接收',
-        icon: '用户',
-        roles: 'skip'
-      }
-    },{
-      path: 'dataExchangeFromWms',
-      name: 'dataExchangeFromWms',
-      component: () => import('@/views/interfaceBoard/dataExchangeFromWms'),
-      meta: {
-        title: 'WMS数据转换',
-        icon: '用户',
-        roles: 'skip'
-      }
-    },{
-      path: 'dataExchangeFromWms_file',
-      name: 'dataExchangeFromWms_file',
-      component: () => import('@/views/interfaceBoard/dataExchangeFromWms_file'),
-      meta: {
-        title: '归档WMS数据转换',
-        icon: '用户',
-        roles: 'skip'
-      }
-    },{
-      path: 'comingFromOut',
-      name: 'comingFromOut',
-      component: () => import('@/views/interfaceBoard/comingFromOut'),
-      meta: {
-        title: '外部数据接收',
-        icon: '用户',
-        roles: 'skip'
-      }
-    },{
-      path: 'comingFromOut_file',
-      name: 'comingFromOut_file',
-      component: () => import('@/views/interfaceBoard/comingFromOut_file'),
-      meta: {
-        title: '归档外部数据接收',
         icon: '用户',
         roles: 'skip'
       }

Code/Fe/src/utils/baseData/urlOption.js

@@ -12,66 +12,7 @@ export const TestSchool = {
 }
 
 // 基础数据管理-导出配置
-export const exportConfig = {
+export const ExportCustomUserSetting = {
-    baseURL:'get-by-user-and-table-name',//主表-列表
+    baseURL:'ExportCustomUserSetting/base',//主表-列表
-    // detailURL:'app/test-school',//主表-明细 + 明细-查看主表
+    detailURL:'app/export-custom-user-setting',//主表-明细 + 明细-查看主表
-    // detailListURL:'TestStudentDetail/base',//明细-列表
-    // parentURL:null,//明细-查看主表:特殊接口，如果没有则走detailURL
-}
-
-// 接口看板管理-外部数据转换
-export const dataExchangeFromOut = {
-    baseURL:'TestSchool/base',//主表-列表
-    detailURL:'app/test-school',//主表-明细 + 明细-查看主表
-    detailListURL:'TestStudentDetail/base',//明细-列表
-}
-
-// 接口看板管理-归档外部数据转换
-export const dataExchangeFromOut_file = {
-    baseURL:'TestSchool/base',//主表-列表
-    detailURL:'app/test-school',//主表-明细 + 明细-查看主表
-    detailListURL:'TestStudentDetail/base',//明细-列表
-}
-
-// 接口看板管理-WMS数据接收
-export const comingToWms = {
-    baseURL:'TestSchool/base',//主表-列表
-    detailURL:'app/test-school',//主表-明细 + 明细-查看主表
-    detailListURL:'TestStudentDetail/base',//明细-列表
-}
-
-// 接口看板管理-归档WMS数据接收
-export const comingToWms_file = {
-    baseURL:'TestSchool/base',//主表-列表
-    detailURL:'app/test-school',//主表-明细 + 明细-查看主表
-    detailListURL:'TestStudentDetail/base',//明细-列表
 }
-
-// 接口看板管理-WMS数据转换
-export const dataExchangeFromWms = {
-    baseURL:'TestSchool/base',//主表-列表
-    detailURL:'app/test-school',//主表-明细 + 明细-查看主表
-    detailListURL:'TestStudentDetail/base',//明细-列表
-}
-
-// 接口看板管理-归档WMS数据转换
-export const dataExchangeFromWms_file = {
-    baseURL:'TestSchool/base',//主表-列表
-    detailURL:'app/test-school',//主表-明细 + 明细-查看主表
-    detailListURL:'TestStudentDetail/base',//明细-列表
-}
-
-// 接口看板管理-外部数据接收
-export const comingFromOut = {
-    baseURL:'TestSchool/base',//主表-列表
-    detailURL:'app/test-school',//主表-明细 + 明细-查看主表
-    detailListURL:'TestStudentDetail/base',//明细-列表
-}
-
-// 接口看板管理-归档外部数据接收
-export const comingFromOut_file = {
-    baseURL:'TestSchool/base',//主表-列表
-    detailURL:'app/test-school',//主表-明细 + 明细-查看主表
-    detailListURL:'TestStudentDetail/base',//明细-列表
-}
-

Code/Fe/src/utils/detailsTableColumns_api/index.js

@@ -1,253 +1,9 @@
-//全局从接口缓存的明细（如：接口监控看板）
-// import { getInterfaceBoard } from "@/api/wms-interface"
-
-// getList = () => {
-//     getInterfaceBoard().then(result => {
-        
-//         localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.data.localization.values.Dashboard));
-//     })
-//     .catch(err => {
-//     })
-// }
 // 此文件为【明细 - 列表】表头从接口缓存的表头
 
-let _Dashboard = localStorage.getItem("interfaceBoardColumnsNames")
+import { initFromApiColumnsLable } from '@/utils/index'
-if(_Dashboard && _Dashboard != 'undefined' && _Dashboard != 'null') {
-    _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) 
-}
-// 用于如果没有表头数据时候报错问题处理
-const initDashboardLable = (data) => {
-    return _Dashboard ? _Dashboard[data] : null
-}
-
-// 1外部数据转换
-export const dataExchangeFromOut = [
-  { label: initDashboardLable('OutgoingToExternalNumber'), prop: "number" },
-  { label: initDashboardLable('OutgoingToExternalRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalDataType'), prop: "dataType", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalTableType'), prop: "tableType" },
-  { label: initDashboardLable('OutgoingToExternalDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('OutgoingToExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('OutgoingToExternalStatus'), prop: "status" },
-  { label: initDashboardLable('OutgoingToExternalSourceSystem'), prop: "sourceSystem", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalSourceDataId'), prop: "sourceDataId" },
-  { label: initDashboardLable('OutgoingToExternalSourceDataGroupCode'), prop: "sourceDataGroupCode", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalSourceDataDetailCode'), prop: "sourceDataDetailCode", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('OutgoingToExternalWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('OutgoingToExternalWriter'), prop: "writer" },
-  { label: initDashboardLable('OutgoingToExternalDestinationSystem'), prop: "destinationSystem", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalDestinationDataId'), prop: "destinationDataId" },
-  { label: initDashboardLable('OutgoingToExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('OutgoingToExternalReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('OutgoingToExternalReader'), prop: "reader" },
-  { label: initDashboardLable('OutgoingToExternalErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('OutgoingToExternalErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalRetryTimes'), prop: "retryTimes" },
-    // ************** 暂时隐藏 ************************
-    // { 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.ID, prop: "ID" },
-]
-
-// 2归档外部数据转换
-export const dataExchangeFromOut_file = [
-  { label: initDashboardLable('ArchivedOutgoingToExternalNumber'), prop: "number" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalDataType'), prop: "dataType" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalTableType'), prop: "tableType" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('ArchivedOutgoingToExternalStatus'), prop: "status" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataId'), prop: "sourceDataId" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('ArchivedOutgoingToExternalWriter'), prop: "writer" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalDestinationSystem'), prop: "destinationSystem" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalDestinationDataId'), prop: "destinationDataId" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('ArchivedOutgoingToExternalReader'), prop: "reader" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 3WMS数据接收
-export const comingToWms = [
-  { label: initDashboardLable('IncomingToWmsNumber'), prop: "number" },
-  { label: initDashboardLable('IncomingToWmsRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('IncomingToWmsDataType'), prop: "dataType" },
-  { label: initDashboardLable('IncomingToWmsDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('IncomingToWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('IncomingToWmsStatus'), prop: "status" },
-  { label: initDashboardLable('IncomingToWmsDataIdentityCode'), prop: "dataIdentityCode" },
-  { label: initDashboardLable('IncomingToWmsDataContent'), prop: "dataContent", type:"showJsonTable" },
-  { label: initDashboardLable('IncomingToWmsSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('IncomingToWmsWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('IncomingToWmsReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('IncomingToWmsErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('IncomingToWmsErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('IncomingToWmsRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 4归档WMS数据接收
-export const comingToWms_file = [
-  { label: initDashboardLable('ArchivedIncomingToWmsNumber'), prop: "number" },
-  { label: initDashboardLable('ArchivedIncomingToWmsRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('ArchivedIncomingToWmsDataType'), prop: "dataType" },
-  { label: initDashboardLable('ArchivedIncomingToWmsDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('ArchivedIncomingToWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('ArchivedIncomingToWmsStatus'), prop: "status" },
-  { label: initDashboardLable('ArchivedIncomingToWmsDataIdentityCode'), prop: "dataIdentityCode" },
-  { label: initDashboardLable('ArchivedIncomingToWmsDataContent'), prop: "dataContent", type:"showJsonTable" },
-  { label: initDashboardLable('ArchivedIncomingToWmsSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('ArchivedIncomingToWmsWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('ArchivedIncomingToWmsReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('ArchivedIncomingToWmsErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('ArchivedIncomingToWmsErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('ArchivedIncomingToWmsRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 5WMS数据转换
-export const dataExchangeFromWms = [
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsNumber'), prop: "number" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsDataType'), prop: "dataType" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsStatus'), prop: "status" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsDataIdentityCode'), prop: "dataIdentityCode" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsDataContent'), prop: "dataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsDestinationSystem'), prop: "destinationSystem" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 6归档WMS数据转换
-export const dataExchangeFromWms_file = [
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsNumber'), prop: "number" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataType'), prop: "dataType" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsStatus'), prop: "status" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataIdentityCode'), prop: "dataIdentityCode" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataContent'), prop: "dataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsWriteTime'), prop: "writeTime",type:'dateTime' },
-  // { label: _Dashboard.destinationSystem, prop: "destinationSystem" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 7外部数据接收
-export const comingFromOut = [
-  { label: initDashboardLable('DataExchange_IncomingFromExternalNumber'), prop: "number" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalDataType'), prop: "dataType" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalTableType'), prop: "tableType" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalStatus'), prop: "status" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataId'), prop: "sourceDataId" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalWriter'), prop: "writer" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationSystem'), prop: "destinationSystem" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationDataId'), prop: "destinationDataId" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalReader'), prop: "reader" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 8归档外部数据接收 
-export const comingFromOut_file = [
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalNumber'), prop: "number" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDataType'), prop: "dataType" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalTableType'), prop: "tableType" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalStatus'), prop: "status" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataId'), prop: "sourceDataId" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalWriter'), prop: "writer" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationSystem'), prop: "destinationSystem" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationDataId'), prop: "destinationDataId" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalReader'), prop: "reader" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
 
 // 测试数据
 export const TestSchool = [
-  { label: initDashboardLable('TestStudentDetailStudentName'), prop: "studentName" },
+  { label: initFromApiColumnsLable('TestStudentDetailStudentName'), prop: "studentName" },
-  { label: initDashboardLable('TestStudentDetailOrderType'), prop: "orderType" },
+  { label: initFromApiColumnsLable('TestStudentDetailOrderType'), prop: "orderType" },
 ]

Code/Fe/src/utils/index.js

@@ -556,3 +556,24 @@ export function initDataToHttpFormat (date) {
 export function createNewTabs (url) {
   window.open(url, "_blank")
 }
+
+// 转义及读取api接口返回的表头信息
+export function initFromApiColumnsLable (data) {
+  //todo:待定：重新获取全局从接口缓存的表头（如：接口监控看板）
+  // import { getInterfaceBoard } from "@/api/wms-interface"
+
+  // getList = () => {
+  //     getInterfaceBoard().then(result => {
+          
+  //         localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.data.localization.values.Dashboard));
+  //     })
+  //     .catch(err => {
+  //     })
+  // }
+  let _Dashboard = null
+  let _names = localStorage.getItem("interfaceBoardColumnsNames")
+  if(_names && _names != 'undefined' && _names != 'null') {
+      _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) 
+  }
+  return _Dashboard ? _Dashboard[data] : null
+}

Code/Fe/src/utils/quicklySearchOption/index.js

@@ -5,12 +5,3 @@
 //   prop:'code',//接口要查的参数
 //   placeholder:'请输入物品代码',//placeholder
 // }
-
-// 原料管理
-/**/
-// 报检单
-export const InspectRequest = {
-  // action:"==",//默认等于
-  prop:'asnNumber',
-  placeholder:'请输入发货单号',
-}

Code/Fe/src/utils/summaryTableColumns/index.js

@@ -1,86 +1,3 @@
 
 // 通用配置
 const orderWidth = 180
-// 原料管理
-/**/
-// 报检单 20230410
-export const InspectRequest =  [
-  { label: "物品代码", prop: "itemCode" },
-  { label: "物品名称", prop: "itemName" },
-  { label: "物品描述1", prop: "itemDesc1" },
-  { label: "物品描述2", prop: "itemDesc2" },
-  { label: "生产批次", prop: "lot" },
-  { label: "收货数量", prop: 'receiveQty' },
-  { label: "检验数量", prop: 'inspectQty' },
-  { label: "合格数量", prop: 'goodQty' },
-  { label: "不合格数量", prop: 'failedQty' },
-  // -----------------------------------------------------------------------
-  { label: "检验人", prop: 'inspectUser' },
-  { label: "检验单号", prop: "number" },
-  { label: "创建时间", prop: "creationTime",type: "dateTime" },
-  { label: "创建者ID", prop: "creatorId" },
-  { label: "状态", prop: "summaryInspectStatus", type: "filter", filters: "summaryInspectStatus" },
-  { label: "ABC类", prop: 'abcClass', type: "filter", filters: "abcClass" },
-  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者ID", prop: "lastModifierId" },
-  { label: "备注", prop: 'remark' },
-  { label: "计量单位", prop: 'uom' },
-  { label: "标包数量", prop: 'stdPackQty' },
-  { label: "供应商批次", prop: 'supplierBatch' },
-  { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
-  { label: "生产时间", prop: 'produceDate', type: "dateTime" },
-  { label: "过期时间", prop: 'expireDate', type: "dateTime" },
-  { label: "订单号", prop: 'poNumber',width: orderWidth },
-  { label: "订单行", prop: 'poLine' },
-  { label: "样品率", prop: 'samplePercent' },
-  { label: "破坏数量", prop: 'crackQty' },
-  { label: "最终不合格数量", prop: 'notPassedQty' },
-  { label: "检验报告", prop: 'inspectReport' },
-  { label: "事务ID", prop: "tenantId" },
-  { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" },
-  { label: "不合格原因代码", prop: 'failedReason' },
-  { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
-  // ************** 确定隐藏 ************************
-  // { label: "ID", prop: 'id' },
-  // { label: "主表ID", prop: "masterID" },
-  // ************** 确定隐藏 ************************
-]
-// 检验记录  字段需要确定
-export const InspectNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
-  { label: "物品名称", prop: "itemName" },
-  { label: "物品描述1", prop: "itemDesc1" },
-  { label: "物品描述2", prop: "itemDesc2" },
-  { label: "生产批次", prop: "lot" },
-  { label: "计量单位", prop: 'uom' },
-  { label: "收货数量", prop: 'receiveQty' },
-  { label: "检验数量", prop: 'inspectQty' },
-  { label: "合格数量", prop: 'goodQty' },
-  { label: "不合格数量", prop: 'failedQty' },
-  { label: "检验人", prop: 'inspectUser' },
-  { label: "不合格原因代码", prop: 'failedReason' },
-  { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" },
-  // -----------------------------------------------------------------------
-  { label: "单据号", prop: "number" },
-  { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "创建者ID", prop: 'creatorId' },
-  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者ID", prop: 'lastModifierId' },
-  { label: "备注", prop: 'remark' },
-  { label: "供应商批次", prop: 'supplierBatch' },
-  { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
-  { label: "生产时间", prop: 'produceDate', type: "dateTime" },
-  { label: "过期时间", prop: 'expireDate', type: "dateTime" },
-  { label: "订单号", prop: 'poNumber' },
-  { label: "订单行", prop: 'poLine' },
-  { label: "标包数量", prop: 'stdPackQty' },
-  { label: "样品率", prop: 'samplePercent' },
-  { label: "破坏数量", prop: 'crackQty' },
-  { label: "最终不合格数量", prop: 'notPassedQty' },
-  { label: "事务ID", prop: "tenantId" },
-  { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" },
-  // ************** 确定隐藏 ************************
-  // { label: "masterID", prop: "masterID" },
-  // { label: "ID", prop: "id" },
-  // ************** 确定隐藏 ************************
-]

Code/Fe/src/utils/tableColumns_api/index.js

@@ -1,256 +1,9 @@
-//全局从接口缓存的表头（如：接口监控看板）
-// import { getInterfaceBoard } from "@/api/wms-interface"
-
-// getList = () => {
-//     getInterfaceBoard().then(result => {
-        
-//         localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.data.localization.values.Dashboard));
-//     })
-//     .catch(err => {
-//     })
-// }
-
 // 此文件为【主表-列表】表头从接口缓存的表头
 
-// 用于如果没有表头数据时候报错问题处理
+import { initFromApiColumnsLable } from '@/utils/index'
-const initDashboardLable = (data) => {
-  let _Dashboard = null
-  let _names = localStorage.getItem("interfaceBoardColumnsNames")
-  if(_names && _names != 'undefined' && _names != 'null') {
-      _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) 
-  }
-  return _Dashboard ? _Dashboard[data] : null
-}
-
-// 1外部数据转换
-export const dataExchangeFromOut = [
-  { label: initDashboardLable('OutgoingToExternalNumber'), prop: "number" },
-  { label: initDashboardLable('OutgoingToExternalRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalDataType'), prop: "dataType", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalTableType'), prop: "tableType" },
-  { label: initDashboardLable('OutgoingToExternalDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('OutgoingToExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('OutgoingToExternalStatus'), prop: "status" },
-  { label: initDashboardLable('OutgoingToExternalSourceSystem'), prop: "sourceSystem", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalSourceDataId'), prop: "sourceDataId" },
-  { label: initDashboardLable('OutgoingToExternalSourceDataGroupCode'), prop: "sourceDataGroupCode", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalSourceDataDetailCode'), prop: "sourceDataDetailCode", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('OutgoingToExternalWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('OutgoingToExternalWriter'), prop: "writer" },
-  { label: initDashboardLable('OutgoingToExternalDestinationSystem'), prop: "destinationSystem", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalDestinationDataId'), prop: "destinationDataId" },
-  { label: initDashboardLable('OutgoingToExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('OutgoingToExternalReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('OutgoingToExternalReader'), prop: "reader" },
-  { label: initDashboardLable('OutgoingToExternalErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('OutgoingToExternalErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalRetryTimes'), prop: "retryTimes" },
-    // ************** 暂时隐藏 ************************
-    // { 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.ID, prop: "ID" },
-]
-
-// 2归档外部数据转换
-export const dataExchangeFromOut_file = [
-  { label: initDashboardLable('ArchivedOutgoingToExternalNumber'), prop: "number" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalDataType'), prop: "dataType" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalTableType'), prop: "tableType" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('ArchivedOutgoingToExternalStatus'), prop: "status" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataId'), prop: "sourceDataId" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('ArchivedOutgoingToExternalWriter'), prop: "writer" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalDestinationSystem'), prop: "destinationSystem" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalDestinationDataId'), prop: "destinationDataId" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('ArchivedOutgoingToExternalReader'), prop: "reader" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 3WMS数据接收
-export const comingToWms = [
-  { label: initDashboardLable('IncomingToWmsNumber'), prop: "number" },
-  { label: initDashboardLable('IncomingToWmsRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('IncomingToWmsDataType'), prop: "dataType" },
-  { label: initDashboardLable('IncomingToWmsDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('IncomingToWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('IncomingToWmsStatus'), prop: "status" },
-  { label: initDashboardLable('IncomingToWmsDataIdentityCode'), prop: "dataIdentityCode" },
-  { label: initDashboardLable('IncomingToWmsDataContent'), prop: "dataContent", type:"showJsonTable" },
-  { label: initDashboardLable('IncomingToWmsSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('IncomingToWmsWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('IncomingToWmsReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('IncomingToWmsErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('IncomingToWmsErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('IncomingToWmsRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 4归档WMS数据接收
-export const comingToWms_file = [
-  { label: initDashboardLable('ArchivedIncomingToWmsNumber'), prop: "number" },
-  { label: initDashboardLable('ArchivedIncomingToWmsRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('ArchivedIncomingToWmsDataType'), prop: "dataType" },
-  { label: initDashboardLable('ArchivedIncomingToWmsDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('ArchivedIncomingToWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('ArchivedIncomingToWmsStatus'), prop: "status" },
-  { label: initDashboardLable('ArchivedIncomingToWmsDataIdentityCode'), prop: "dataIdentityCode" },
-  { label: initDashboardLable('ArchivedIncomingToWmsDataContent'), prop: "dataContent", type:"showJsonTable" },
-  { label: initDashboardLable('ArchivedIncomingToWmsSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('ArchivedIncomingToWmsWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('ArchivedIncomingToWmsReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('ArchivedIncomingToWmsErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('ArchivedIncomingToWmsErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('ArchivedIncomingToWmsRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 5WMS数据转换
-export const dataExchangeFromWms = [
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsNumber'), prop: "number" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsDataType'), prop: "dataType" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsStatus'), prop: "status" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsDataIdentityCode'), prop: "dataIdentityCode" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsDataContent'), prop: "dataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsDestinationSystem'), prop: "destinationSystem" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 6归档WMS数据转换
-export const dataExchangeFromWms_file = [
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsNumber'), prop: "number" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataType'), prop: "dataType" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsStatus'), prop: "status" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataIdentityCode'), prop: "dataIdentityCode" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataContent'), prop: "dataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsWriteTime'), prop: "writeTime",type:'dateTime' },
-  // { label: _Dashboard.destinationSystem, prop: "destinationSystem" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 7外部数据接收
-export const comingFromOut = [
-  { label: initDashboardLable('DataExchange_IncomingFromExternalNumber'), prop: "number" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalDataType'), prop: "dataType" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalTableType'), prop: "tableType" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalStatus'), prop: "status" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataId'), prop: "sourceDataId" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalWriter'), prop: "writer" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationSystem'), prop: "destinationSystem" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationDataId'), prop: "destinationDataId" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalReader'), prop: "reader" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 8归档外部数据接收 
-export const comingFromOut_file = [
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalNumber'), prop: "number" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDataType'), prop: "dataType" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalTableType'), prop: "tableType" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalStatus'), prop: "status" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataId'), prop: "sourceDataId" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalWriter'), prop: "writer" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationSystem'), prop: "destinationSystem" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationDataId'), prop: "destinationDataId" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalReader'), prop: "reader" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
 
 // 测试数据
 export const TestSchool = [
-  { label: initDashboardLable('TestSchoolSchoolName'), prop: "schoolName", fixed: "left", type: "name" },
+  { label: initFromApiColumnsLable('TestSchoolSchoolName'), prop: "schoolName", fixed: "left", type: "name" },
-  { label: initDashboardLable('TestStudentDetailOrderType'), prop: "orderType" },
+  { label: initFromApiColumnsLable('TestStudentDetailOrderType'), prop: "orderType" },
 ]

Code/Fe/src/utils/tabsDesTions_api/index.js

@@ -1,254 +1,9 @@
-//全局从接口缓存的详情（如：接口监控看板）
-// import { getInterfaceBoard } from "@/api/wms-interface"
-
-// getList = () => {
-//     getInterfaceBoard().then(result => {
-        
-//         localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.data.localization.values.Dashboard));
-//     })
-//     .catch(err => {
-//     })
-// }
-
 // 此文件为【主表-明细】表头从接口缓存的表头
 
-let _Dashboard = localStorage.getItem("interfaceBoardColumnsNames")
+import { initFromApiColumnsLable } from '@/utils/index'
-if(_Dashboard && _Dashboard != 'undefined' && _Dashboard != 'null') {
-    _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) 
-}
-// 用于如果没有表头数据时候报错问题处理
-const initDashboardLable = (data) => {
-    return _Dashboard ? _Dashboard[data] : null
-}
-
-// 1外部数据转换
-export const dataExchangeFromOut = [
-  { label: initDashboardLable('OutgoingToExternalNumber'), prop: "number" },
-  { label: initDashboardLable('OutgoingToExternalRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalDataType'), prop: "dataType", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalTableType'), prop: "tableType" },
-  { label: initDashboardLable('OutgoingToExternalDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('OutgoingToExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('OutgoingToExternalStatus'), prop: "status" },
-  { label: initDashboardLable('OutgoingToExternalSourceSystem'), prop: "sourceSystem", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalSourceDataId'), prop: "sourceDataId" },
-  { label: initDashboardLable('OutgoingToExternalSourceDataGroupCode'), prop: "sourceDataGroupCode", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalSourceDataDetailCode'), prop: "sourceDataDetailCode", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('OutgoingToExternalWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('OutgoingToExternalWriter'), prop: "writer" },
-  { label: initDashboardLable('OutgoingToExternalDestinationSystem'), prop: "destinationSystem", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalDestinationDataId'), prop: "destinationDataId" },
-  { label: initDashboardLable('OutgoingToExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('OutgoingToExternalReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('OutgoingToExternalReader'), prop: "reader" },
-  { label: initDashboardLable('OutgoingToExternalErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('OutgoingToExternalErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('OutgoingToExternalRetryTimes'), prop: "retryTimes" },
-    // ************** 暂时隐藏 ************************
-    // { 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.ID, prop: "ID" },
-]
-
-// 2归档外部数据转换
-export const dataExchangeFromOut_file = [
-  { label: initDashboardLable('ArchivedOutgoingToExternalNumber'), prop: "number" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalDataType'), prop: "dataType" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalTableType'), prop: "tableType" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('ArchivedOutgoingToExternalStatus'), prop: "status" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataId'), prop: "sourceDataId" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('ArchivedOutgoingToExternalWriter'), prop: "writer" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalDestinationSystem'), prop: "destinationSystem" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalDestinationDataId'), prop: "destinationDataId" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('ArchivedOutgoingToExternalReader'), prop: "reader" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('ArchivedOutgoingToExternalRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 3WMS数据接收
-export const comingToWms = [
-  { label: initDashboardLable('IncomingToWmsNumber'), prop: "number" },
-  { label: initDashboardLable('IncomingToWmsRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('IncomingToWmsDataType'), prop: "dataType" },
-  { label: initDashboardLable('IncomingToWmsDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('IncomingToWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('IncomingToWmsStatus'), prop: "status" },
-  { label: initDashboardLable('IncomingToWmsDataIdentityCode'), prop: "dataIdentityCode" },
-  { label: initDashboardLable('IncomingToWmsDataContent'), prop: "dataContent", type:"showJsonTable" },
-  { label: initDashboardLable('IncomingToWmsSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('IncomingToWmsWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('IncomingToWmsReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('IncomingToWmsErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('IncomingToWmsErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('IncomingToWmsRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 4归档WMS数据接收
-export const comingToWms_file = [
-  { label: initDashboardLable('ArchivedIncomingToWmsNumber'), prop: "number" },
-  { label: initDashboardLable('ArchivedIncomingToWmsRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('ArchivedIncomingToWmsDataType'), prop: "dataType" },
-  { label: initDashboardLable('ArchivedIncomingToWmsDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('ArchivedIncomingToWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('ArchivedIncomingToWmsStatus'), prop: "status" },
-  { label: initDashboardLable('ArchivedIncomingToWmsDataIdentityCode'), prop: "dataIdentityCode" },
-  { label: initDashboardLable('ArchivedIncomingToWmsDataContent'), prop: "dataContent", type:"showJsonTable" },
-  { label: initDashboardLable('ArchivedIncomingToWmsSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('ArchivedIncomingToWmsWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('ArchivedIncomingToWmsReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('ArchivedIncomingToWmsErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('ArchivedIncomingToWmsErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('ArchivedIncomingToWmsRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 5WMS数据转换
-export const dataExchangeFromWms = [
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsNumber'), prop: "number" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsDataType'), prop: "dataType" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsStatus'), prop: "status" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsDataIdentityCode'), prop: "dataIdentityCode" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsDataContent'), prop: "dataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsDestinationSystem'), prop: "destinationSystem" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_OutgoingFromWmsRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 6归档WMS数据转换
-export const dataExchangeFromWms_file = [
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsNumber'), prop: "number" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataType'), prop: "dataType" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsStatus'), prop: "status" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataIdentityCode'), prop: "dataIdentityCode" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataContent'), prop: "dataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsWriteTime'), prop: "writeTime",type:'dateTime' },
-  // { label: _Dashboard.destinationSystem, prop: "destinationSystem" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 7外部数据接收
-export const comingFromOut = [
-  { label: initDashboardLable('DataExchange_IncomingFromExternalNumber'), prop: "number" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalDataType'), prop: "dataType" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalTableType'), prop: "tableType" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalStatus'), prop: "status" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataId'), prop: "sourceDataId" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalWriter'), prop: "writer" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationSystem'), prop: "destinationSystem" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationDataId'), prop: "destinationDataId" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalReader'), prop: "reader" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_IncomingFromExternalRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
-
-// 8归档外部数据接收 
-export const comingFromOut_file = [
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalNumber'), prop: "number" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalRemark'), prop: "remark", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDataType'), prop: "dataType" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalTableType'), prop: "tableType" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDataAction'), prop: "dataAction" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalStatus'), prop: "status" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceSystem'), prop: "sourceSystem" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataId'), prop: "sourceDataId" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalWriteTime'), prop: "writeTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalWriter'), prop: "writer" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationSystem'), prop: "destinationSystem" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationDataId'), prop: "destinationDataId" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalReadTime'), prop: "readTime",type:'dateTime' },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalReader'), prop: "reader" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalErrorCode'), prop: "errorCode" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalErrorMessage'), prop: "errorMessage", type:"showDetail" },
-  { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalRetryTimes'), prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
-  // { 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.ID, prop: "ID" },
-]
 
 // 测试数据
 export const TestSchool = [
-  { label: initDashboardLable('TestSchoolSchoolName'), prop: "schoolName", fixed: "left", type: "name" },
+  { label: initFromApiColumnsLable('TestSchoolSchoolName'), prop: "schoolName", fixed: "left", type: "name" },
-  { label: initDashboardLable('TestStudentDetailOrderType'), prop: "orderType" },
+  { label: initFromApiColumnsLable('TestStudentDetailOrderType'), prop: "orderType" },
 ]

Code/Fe/src/views/basicConfig/ExportCustomUserSetting.vue

@@ -0,0 +1,207 @@
+
+<template>
+  <div class="page-box" v-loading="Loading.appMainLoading">
+    <tablePagination
+      v-if="apiColumns_Table"
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="apiColumns_Table"
+      @rowDrop="rowDrop"
+      :totalCount="totalCount"
+      :multipleSelection="multipleSelection"
+      :MaxResultCount="PageListParams.MaxResultCount"
+      @topbutton="topbutton"
+      @inlineDialog="inlineDialog"
+      @sortChange="sortChange"
+      @alertoldSkipCount="alertoldSkipCount"
+      @alterResultCount="alterResultCount"
+      @handleSelectionChange="handleSelectionChange"
+      @buttonOperationClick="buttonOperationClick"
+      :currentPageProps="oldSkipCount"
+      :quicklySearchOption="quicklySearchOption"
+      @quicklySearchClick="quicklySearchClick"
+      @quicklySearchClear="quicklySearchClear"
+      :primarySearchOption="primarySearchOption"
+      @overallSearchFormClick="overallSearchFormClick"
+      :httpOverallSearchData="httpOverallSearchData"
+    >
+      <!-- <div slot="tableTopSlot">
+        上方按钮插槽位置预留
+      </div>
+      <div slot="searchPrimarySlot">
+        普通初级搜索插槽位置预留
+      </div> -->
+      <!-- <template>表格内容插槽位置预留</template> -->
+    </tablePagination>
+    <!-- 新增与编辑 -->
+    <newAndEdiDialog
+      :loading="Loading.newAndEdiLoading"
+      :active="active"
+      :pageStatus="pageStatus"
+      :formReveal="formReveal"
+      :formTitle="formTitle"
+      :displayDialog="editDialog"
+      :FormData="formReveal ? CreateFormData : editFormData"
+      :Form="formReveal ? CreateForm : editForm"
+      :Options="editOptions"
+      :Handle="editHandle"
+      :Rules="formReveal ? editRules.cerateRule : editRules.editRule"
+      @FormSubmit="FormSubmit"
+      @close="FormClose"
+      @goBack="goBack"
+    ></newAndEdiDialog>
+    <!-- 搜索按钮——窗体组件 -->
+    <searchPage
+      ref="searchTable"
+      :tableLoading="Loading.autoTableLoading"
+      :advancedFilter="advancedFilter()"
+      :filterPageListParams="filterPageListParams"
+      :formTitle="searchTitle"
+      :displayDialog="displayDialog.AddNewDialog"
+      :searchTableData="searchData"
+      :searchTableColumns="searchColumns"
+      :searchTotalCount="searchTotalCount"
+      :supplierItemPage="searchPageListParams"
+      @handleSelectionChange="prepareFormData"
+      @SizeChange="searchAlterResultCount($event, searchPageListParams)"
+      @CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)"
+      @tableButtonClick="searchSubmit(arguments)"
+    ></searchPage>
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
+    <!--抽屉-->
+    <curren-Drawer
+      :title="apiColumns_DesTions"
+      :tableColumns="apiColumns_DetailsTable"
+      :tabsDesTions="apiColumns_DesTions"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :dropdownData="dropdownData"
+      :propsData="propsData"
+      :tableLoading="tableLoading"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+      :firstTabs="firstTabs"
+    ></curren-Drawer>
+  </div>
+</template>
+<script>
+import { tableMixins } from "@/mixins/TableMixins"
+import { LoadingMixins } from "@/mixins/LoadingMixins"
+import { drawerMixins } from "@/mixins/drawerMixins"
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
+import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
+import { mixins } from "@/mixins/mixins"
+import { filterSelectMixins } from '@/mixins/filter-Select'
+import  * as tableColumns_api from "@/utils/tableColumns_api/index" //全局从接口缓存的表头
+import  * as tabsDesTions_api from "@/utils/tabsDesTions_api/index" //全局从接口缓存的详情
+import  * as detailsTableColumns_api from "@/utils/detailsTableColumns_api/index" //全局从接口缓存的详情
+import { initFromApiColumnsLable } from '@/utils/index'
+// import { getExportConfigList } from '@/api/wms-interface'
+
+export default {
+  name: "ExportCustomUserSetting",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    filterSelectMixins,
+    newAndEdiDialogMixins
+  ],
+  computed: {
+    editDialog: {
+      get: function () {
+        return this.displayDialog.newDialog || this.displayDialog.editDialog;
+      },
+    },
+  },
+  data () {
+      const userInfo=JSON.parse(localStorage.getItem("currentUserInfo"))
+    return {
+      tableLoading:false,
+      //常用按钮数据
+      currenButtonData: [
+        this.defaultAddBtn(),//新增
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+      //新增
+      CreateFormData: {
+          customUserSetting: null,
+          exportUserName: userInfo.name,
+          exportUserId: userInfo.id,
+          exportColumnName: null,
+          exportTableName: null,
+      },
+      //编辑
+      editFormData: {
+          customUserSetting: null,
+          exportUserName: userInfo.name,
+          exportUserId: userInfo.id,
+          exportColumnName: null,
+          exportTableName: null,
+      },
+      editOptions: {},
+      CreateForm: [
+        { type: "input", label: initFromApiColumnsLable('ExportCustomUserSettingCustomUserSetting'), prop: "customUserSetting", colSpan: 12 },
+        { type: "input", label: initFromApiColumnsLable('ExportCustomUserSettingExportColumnName'), prop: "exportColumnName", colSpan: 12 },
+        { type: "input", label: initFromApiColumnsLable('ExportCustomUserSettingExportTableName'), prop: "exportTableName", colSpan: 12 },
+      ],
+      editForm: [
+        { type: "input", label: initFromApiColumnsLable('ExportCustomUserSettingCustomUserSetting'), prop: "customUserSetting", colSpan: 12 },
+        { type: "input", label:initFromApiColumnsLable('ExportCustomUserSettingExportColumnName'), prop: "exportColumnName", colSpan: 12 },
+        { type: "input", label: initFromApiColumnsLable('ExportCustomUserSettingExportTableName'), prop: "exportTableName", colSpan: 12 },
+      ],
+      editRules: {
+        cerateRule: {
+          exportColumnName: [{ required: true, trigger: "blur", message: "不可为空" }],
+          exportTableName: [{ required: true, trigger: "blur", message: "不可为空" }],
+        },
+        editRule: {
+          exportColumnName: [{ required: true, trigger: "blur", message: "不可为空" }],
+          exportTableName: [{ required: true, trigger: "blur", message: "不可为空" }],
+        }
+      },
+    };
+  },
+  mounted () {
+    this.initApiColumns()
+    this.paging();
+  },
+  methods:{
+    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
+    initApiColumns(){
+      this.apiColumns_Table = tableColumns_api[this.$route.name]
+      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
+      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
+    },
+    //渲染数据
+    // paging(callback) {
+    //     this.Loading.tableLoading = true;
+    //     getExportConfigList('TestSchool').then(res => {
+    //         this.tableData = res
+    //         this.pagingCallback(callback)
+    //     }).catch(err => {
+    //         this.Loading.tableLoading = false
+    //     })
+    // },
+  }
+};
+</script>
+<style lang="scss" scoped>
+  @import "@/styles/basicData.scss";
+</style>

Code/Fe/src/views/basicConfig/exportConfig.vue

@@ -1,192 +0,0 @@
-
-<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"
-        @buttonOperationClick="buttonOperationClick"
-        :currentPageProps="oldSkipCount"
-        :quicklySearchOption="quicklySearchOption"
-        @quicklySearchClick="quicklySearchClick"
-        @quicklySearchClear="quicklySearchClear"
-        :primarySearchOption="primarySearchOption"
-        @overallSearchFormClick="overallSearchFormClick"
-        :httpOverallSearchData="httpOverallSearchData"
-      >
-        <!-- <div slot="tableTopSlot">
-          上方按钮插槽位置预留
-        </div>
-        <div slot="searchPrimarySlot">
-          普通初级搜索插槽位置预留
-        </div> -->
-        <!-- <template>表格内容插槽位置预留</template> -->
-      </tablePagination>
-      <!-- 新增与编辑 -->
-      <newAndEdiDialog
-        :loading="Loading.newAndEdiLoading"
-        :active="active"
-        :pageStatus="pageStatus"
-        :formReveal="formReveal"
-        :formTitle="formTitle"
-        :displayDialog="editDialog"
-        :FormData="formReveal ? CreateFormData : editFormData"
-        :Form="formReveal ? CreateForm : editForm"
-        :Options="editOptions"
-        :Handle="editHandle"
-        :Rules="formReveal ? editRules.cerateRule : editRules.editRule"
-        @FormSubmit="FormSubmit"
-        @close="FormClose"
-        @goBack="goBack"
-      ></newAndEdiDialog>
-      <!-- 搜索按钮——窗体组件 -->
-      <searchPage
-        ref="searchTable"
-        :tableLoading="Loading.autoTableLoading"
-        :advancedFilter="advancedFilter()"
-        :filterPageListParams="filterPageListParams"
-        :formTitle="searchTitle"
-        :displayDialog="displayDialog.AddNewDialog"
-        :searchTableData="searchData"
-        :searchTableColumns="searchColumns"
-        :searchTotalCount="searchTotalCount"
-        :supplierItemPage="searchPageListParams"
-        @handleSelectionChange="prepareFormData"
-        @SizeChange="searchAlterResultCount($event, searchPageListParams)"
-        @CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)"
-        @tableButtonClick="searchSubmit(arguments)"
-      ></searchPage>
-      <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
-      <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
-      <importFile
-        :loading="Loading.importLoading"
-        :show="displayDialog.importDialog"
-        :disabledMethod = {method1:false,method2:false,method3:false}
-        :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
-        isAllowPartImportValue="1"
-        @importClick="postImportMergeClick(arguments)"
-        @postImportDown="importDown"
-      ></importFile>
-      <!--抽屉-->
-      <curren-Drawer
-        :title="tableColumns"
-        :DrawerLoading="Loading.DrawerLoading"
-        :drawer="displayDialog.detailsDialog"
-        :dropdownData="dropdownData"
-        :propsData="propsData"
-        :tabsDesTions="tabsDesTions"
-        :tableLoading="tableLoading"
-        @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-        @drawerbutton="drawerbutton"
-        @handleCommand="drawerHandle"
-        @close-value="closeValue"
-        :firstTabs="firstTabs"
-      ></curren-Drawer>
-    </div>
-  </template>
-  <script>
-  import { tableMixins } from "@/mixins/TableMixins"
-  import { LoadingMixins } from "@/mixins/LoadingMixins"
-  import { drawerMixins } from "@/mixins/drawerMixins"
-  import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
-  import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
-  import { mixins } from "@/mixins/mixins"
-  import { filterSelectMixins } from '@/mixins/filter-Select'
-  // import { getExportConfigList } from '@/api/wms-interface'
-  
-  export default {
-    name: "exportConfig",
-    mixins: [
-      tableMixins,
-      LoadingMixins,
-      drawerMixins,
-      TableHeaderMixins,
-      mixins,
-      filterSelectMixins,
-      newAndEdiDialogMixins
-    ],
-    computed: {
-      editDialog: {
-        get: function () {
-          return this.displayDialog.newDialog || this.displayDialog.editDialog;
-        },
-      },
-    },
-    data () {
-        const userInfo=JSON.parse(localStorage.getItem("currentUserInfo"))
-      return {
-        tableLoading:false,
-        //常用按钮数据
-        currenButtonData: [
-          this.defaultAddBtn(),//新增
-          this.defaultFreshBtn(),//刷新
-          this.defaultFilterBtn(),//筛选
-        ],
-        //新增
-        CreateFormData: {
-            customUserSetting: null,
-            exportUserName: userInfo.name,
-            exportUserId: userInfo.id,
-            exportColumnName: null,
-            exportTableName: null,
-        },
-        //编辑
-        editFormData: {
-            customUserSetting: null,
-            exportUserName: userInfo.name,
-            exportUserId: userInfo.id,
-            exportColumnName: null,
-            exportTableName: null,
-        },
-        editOptions: {},
-        CreateForm: [
-            { type: "input", label: "排除表头", prop: "exportColumnName", colSpan: 12 },
-            { type: "input", label: "表名", prop: "exportTableName", colSpan: 12 },
-        ],
-        editForm: [
-            { type: "input", label: "排除表头", prop: "exportColumnName", colSpan: 12 },
-            { type: "input", label: "表名", prop: "exportTableName", colSpan: 12 },
-        ],
-        editRules: {
-          cerateRule: {
-            exportColumnName: [{ required: true, trigger: "blur", message: "不可为空" }],
-            exportTableName: [{ required: true, trigger: "blur", message: "不可为空" }],
-          },
-          editRule: {
-            exportColumnName: [{ required: true, trigger: "blur", message: "不可为空" }],
-            exportTableName: [{ required: true, trigger: "blur", message: "不可为空" }],
-          }
-        },
-      };
-    },
-    mounted () {
-      this.paging();
-    },
-    methods:{
-        //渲染数据
-        // paging(callback) {
-        //     this.Loading.tableLoading = true;
-        //     getExportConfigList('TestSchool').then(res => {
-        //         this.tableData = res
-        //         this.pagingCallback(callback)
-        //     }).catch(err => {
-        //         this.Loading.tableLoading = false
-        //     })
-        // },
-    }
-  };
-  </script>
-  <style lang="scss" scoped>
-    @import "@/styles/basicData.scss";
-  </style>

Code/Fe/src/views/interfaceBoard/comingFromOut.vue

@@ -1,113 +0,0 @@
-<template>
-  <div class="page-box" v-loading="Loading.appMainLoading">
-    <!-- 外部数据接收页面 -->
-    <tablePagination
-      v-if="apiColumns_Table"
-      :currenButtonData="currenButtonData"
-      :tableData="tableData"
-      :tableLoading="Loading.tableLoading"
-      :tableColumns="apiColumns_Table"
-      @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>
-    <curren-Drawer
-      :title="apiColumns_DesTions"
-      :tableColumns="apiColumns_DetailsTable"
-      :tabsDesTions="apiColumns_DesTions"
-      :DrawerLoading="Loading.DrawerLoading"
-      :drawer="displayDialog.detailsDialog"
-      :Butttondata="[]"
-      :propsData="propsData"
-      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
-      @handleCommand="drawerHandle"
-      @close-value="closeValue"
-      :totalCount="totalCountDetails"
-      :currentPage="oldSkipCountDetails"
-      :MaxResultCount="MaxResultCountDetails"
-      @alterResultCountDetails="alterResultCountDetails"
-      @alertoldSkipCountDetails="alertoldSkipCountDetails"
-    ></curren-Drawer>
-    <filterForDetailPage
-      v-if="filterForDetailShow"
-      :listApi="detailListURL"
-      :parentApi="detailURL"
-      :listColumns="apiColumns_DetailsTable"
-      :parentColumns="apiColumns_Table"
-      @closeDialog="changeFilterForDetailShow"
-    ></filterForDetailPage>
-  </div>
-</template>
-<script>
-import { tableMixins } from "@/mixins/TableMixins";
-import { LoadingMixins } from "@/mixins/LoadingMixins";
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
-import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
-import { mixins } from "@/mixins/mixins";
-import { filterSelectMixins } from '@/mixins/filter-Select'
-import { getToken } from '@/utils/auth'
-import  * as tableColumns_api from "@/utils/tableColumns_api/index" //全局从接口缓存的表头
-import  * as tabsDesTions_api from "@/utils/tabsDesTions_api/index" //全局从接口缓存的详情
-import  * as detailsTableColumns_api from "@/utils/detailsTableColumns_api/index" //全局从接口缓存的详情
-
-
-export default {
-  name: "comingFromOut",
-  mixins: [
-    tableMixins,
-    LoadingMixins,
-    drawerMixins,
-    TableHeaderMixins,
-    mixins,
-    filterSelectMixins,
-    newAndEdiDialogMixins
-  ],
-  data() {
-    return {
-      //常用按钮数据
-      currenButtonData: [
-        this.defaultExportBtn({
-          isRedundance:true,
-          isDetailExport:true
-        }),//导出
-        this.defaultFreshBtn(),//刷新
-        this.defaultFilterBtn(),//筛选
-        this.defaultFilterForDetailBtn()//明细查询按钮
-      ],
-      // 明细查询弹窗显示
-      filterForDetailShow:false,
-    };
-  },
-  mounted() {
-    this.initApiColumns()
-    this.paging();
-  },
-  methods: {
-    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(){
-      this.apiColumns_Table = tableColumns_api[this.$route.name]
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    },
-  }
-}
-</script>
-<style lang="scss" scoped>
-@import "@/styles/basicData.scss";
-</style>

Code/Fe/src/views/interfaceBoard/comingFromOut_file.vue

@@ -1,113 +0,0 @@
-<template>
-  <div class="page-box" v-loading="Loading.appMainLoading">
-    <!-- 归档外部数据接收页面 -->
-    <tablePagination
-      v-if="apiColumns_Table"
-      :currenButtonData="currenButtonData"
-      :tableData="tableData"
-      :tableLoading="Loading.tableLoading"
-      :tableColumns="apiColumns_Table"
-      @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>
-    <curren-Drawer
-      :title="apiColumns_DesTions"
-      :tableColumns="apiColumns_DetailsTable"
-      :tabsDesTions="apiColumns_DesTions"
-      :DrawerLoading="Loading.DrawerLoading"
-      :drawer="displayDialog.detailsDialog"
-      :Butttondata="[]"
-      :propsData="propsData"
-      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
-      @handleCommand="drawerHandle"
-      @close-value="closeValue"
-      :totalCount="totalCountDetails"
-      :currentPage="oldSkipCountDetails"
-      :MaxResultCount="MaxResultCountDetails"
-      @alterResultCountDetails="alterResultCountDetails"
-      @alertoldSkipCountDetails="alertoldSkipCountDetails"
-    ></curren-Drawer>
-    <filterForDetailPage
-      v-if="filterForDetailShow"
-      :listApi="detailListURL"
-      :parentApi="detailURL"
-      :listColumns="apiColumns_DetailsTable"
-      :parentColumns="apiColumns_Table"
-      @closeDialog="changeFilterForDetailShow"
-    ></filterForDetailPage>
-  </div>
-</template>
-<script>
-import { tableMixins } from "@/mixins/TableMixins";
-import { LoadingMixins } from "@/mixins/LoadingMixins";
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
-import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
-import { mixins } from "@/mixins/mixins";
-import { filterSelectMixins } from '@/mixins/filter-Select'
-import { getToken } from '@/utils/auth'
-import  * as tableColumns_api from "@/utils/tableColumns_api/index" //全局从接口缓存的表头
-import  * as tabsDesTions_api from "@/utils/tabsDesTions_api/index" //全局从接口缓存的详情
-import  * as detailsTableColumns_api from "@/utils/detailsTableColumns_api/index" //全局从接口缓存的详情
-
-
-export default {
-  name: "comingFromOut_file",
-  mixins: [
-    tableMixins,
-    LoadingMixins,
-    drawerMixins,
-    TableHeaderMixins,
-    mixins,
-    filterSelectMixins,
-    newAndEdiDialogMixins
-  ],
-  data() {
-    return {
-      //常用按钮数据
-      currenButtonData: [
-        this.defaultExportBtn({
-          isRedundance:true,
-          isDetailExport:true
-        }),//导出
-        this.defaultFreshBtn(),//刷新
-        this.defaultFilterBtn(),//筛选
-        this.defaultFilterForDetailBtn()//明细查询按钮
-      ],
-      // 明细查询弹窗显示
-      filterForDetailShow:false,
-    };
-  },
-  mounted() {
-    this.initApiColumns()
-    this.paging();
-  },
-  methods: {
-    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(){
-      this.apiColumns_Table = tableColumns_api[this.$route.name]
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    },
-  }
-}
-</script>
-<style lang="scss" scoped>
-@import "@/styles/basicData.scss";
-</style>

Code/Fe/src/views/interfaceBoard/comingToWms.vue

@@ -1,113 +0,0 @@
-<template>
-  <div class="page-box" v-loading="Loading.appMainLoading">
-    <!-- WMS数据接收页面 -->
-    <tablePagination
-      v-if="apiColumns_Table"
-      :currenButtonData="currenButtonData"
-      :tableData="tableData"
-      :tableLoading="Loading.tableLoading"
-      :tableColumns="apiColumns_Table"
-      @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>
-    <curren-Drawer
-      :title="apiColumns_DesTions"
-      :tableColumns="apiColumns_DetailsTable"
-      :tabsDesTions="apiColumns_DesTions"
-      :DrawerLoading="Loading.DrawerLoading"
-      :drawer="displayDialog.detailsDialog"
-      :Butttondata="[]"
-      :propsData="propsData"
-      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
-      @handleCommand="drawerHandle"
-      @close-value="closeValue"
-      :totalCount="totalCountDetails"
-      :currentPage="oldSkipCountDetails"
-      :MaxResultCount="MaxResultCountDetails"
-      @alterResultCountDetails="alterResultCountDetails"
-      @alertoldSkipCountDetails="alertoldSkipCountDetails"
-    ></curren-Drawer>
-    <filterForDetailPage
-      v-if="filterForDetailShow"
-      :listApi="detailListURL"
-      :parentApi="detailURL"
-      :listColumns="apiColumns_DetailsTable"
-      :parentColumns="apiColumns_Table"
-      @closeDialog="changeFilterForDetailShow"
-    ></filterForDetailPage>
-  </div>
-</template>
-<script>
-import { tableMixins } from "@/mixins/TableMixins";
-import { LoadingMixins } from "@/mixins/LoadingMixins";
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
-import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
-import { mixins } from "@/mixins/mixins";
-import { filterSelectMixins } from '@/mixins/filter-Select'
-import { getToken } from '@/utils/auth'
-import  * as tableColumns_api from "@/utils/tableColumns_api/index" //全局从接口缓存的表头
-import  * as tabsDesTions_api from "@/utils/tabsDesTions_api/index" //全局从接口缓存的详情
-import  * as detailsTableColumns_api from "@/utils/detailsTableColumns_api/index" //全局从接口缓存的详情
-
-
-export default {
-  name: "comingToWms",
-  mixins: [
-    tableMixins,
-    LoadingMixins,
-    drawerMixins,
-    TableHeaderMixins,
-    mixins,
-    filterSelectMixins,
-    newAndEdiDialogMixins
-  ],
-  data() {
-    return {
-      //常用按钮数据
-      currenButtonData: [
-        this.defaultExportBtn({
-          isRedundance:true,
-          isDetailExport:true
-        }),//导出
-        this.defaultFreshBtn(),//刷新
-        this.defaultFilterBtn(),//筛选
-        this.defaultFilterForDetailBtn()//明细查询按钮
-      ],
-      // 明细查询弹窗显示
-      filterForDetailShow:false,
-    };
-  },
-  mounted() {
-    this.initApiColumns()
-    this.paging();
-  },
-  methods: {
-    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(){
-      this.apiColumns_Table = tableColumns_api[this.$route.name]
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    },
-  }
-}
-</script>
-<style lang="scss" scoped>
-@import "@/styles/basicData.scss";
-</style>

Code/Fe/src/views/interfaceBoard/comingToWms_file.vue

@@ -1,113 +0,0 @@
-<template>
-  <div class="page-box" v-loading="Loading.appMainLoading">
-    <!-- 归档WMS数据接收页面 -->
-    <tablePagination
-      v-if="apiColumns_Table"
-      :currenButtonData="currenButtonData"
-      :tableData="tableData"
-      :tableLoading="Loading.tableLoading"
-      :tableColumns="apiColumns_Table"
-      @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>
-    <curren-Drawer
-      :title="apiColumns_DesTions"
-      :tableColumns="apiColumns_DetailsTable"
-      :tabsDesTions="apiColumns_DesTions"
-      :DrawerLoading="Loading.DrawerLoading"
-      :drawer="displayDialog.detailsDialog"
-      :Butttondata="[]"
-      :propsData="propsData"
-      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
-      @handleCommand="drawerHandle"
-      @close-value="closeValue"
-      :totalCount="totalCountDetails"
-      :currentPage="oldSkipCountDetails"
-      :MaxResultCount="MaxResultCountDetails"
-      @alterResultCountDetails="alterResultCountDetails"
-      @alertoldSkipCountDetails="alertoldSkipCountDetails"
-    ></curren-Drawer>
-    <filterForDetailPage
-      v-if="filterForDetailShow"
-      :listApi="detailListURL"
-      :parentApi="detailURL"
-      :listColumns="apiColumns_DetailsTable"
-      :parentColumns="apiColumns_Table"
-      @closeDialog="changeFilterForDetailShow"
-    ></filterForDetailPage>
-  </div>
-</template>
-<script>
-import { tableMixins } from "@/mixins/TableMixins";
-import { LoadingMixins } from "@/mixins/LoadingMixins";
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
-import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
-import { mixins } from "@/mixins/mixins";
-import { filterSelectMixins } from '@/mixins/filter-Select'
-import { getToken } from '@/utils/auth'
-import  * as tableColumns_api from "@/utils/tableColumns_api/index" //全局从接口缓存的表头
-import  * as tabsDesTions_api from "@/utils/tabsDesTions_api/index" //全局从接口缓存的详情
-import  * as detailsTableColumns_api from "@/utils/detailsTableColumns_api/index" //全局从接口缓存的详情
-
-
-export default {
-  name: "comingToWms_file",
-  mixins: [
-    tableMixins,
-    LoadingMixins,
-    drawerMixins,
-    TableHeaderMixins,
-    mixins,
-    filterSelectMixins,
-    newAndEdiDialogMixins
-  ],
-  data() {
-    return {
-      //常用按钮数据
-      currenButtonData: [
-        this.defaultExportBtn({
-          isRedundance:true,
-          isDetailExport:true
-        }),//导出
-        this.defaultFreshBtn(),//刷新
-        this.defaultFilterBtn(),//筛选
-        this.defaultFilterForDetailBtn()//明细查询按钮
-      ],
-      // 明细查询弹窗显示
-      filterForDetailShow:false,
-    };
-  },
-  mounted() {
-    this.initApiColumns()
-    this.paging();
-  },
-  methods: {
-    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(){
-      this.apiColumns_Table = tableColumns_api[this.$route.name]
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    },
-  }
-}
-</script>
-<style lang="scss" scoped>
-@import "@/styles/basicData.scss";
-</style>

Code/Fe/src/views/interfaceBoard/dataExchangeFromOut.vue

@@ -1,113 +0,0 @@
-<template>
-  <div class="page-box" v-loading="Loading.appMainLoading">
-    <!-- 外部数据转换页面 -->
-    <tablePagination
-      v-if="apiColumns_Table"
-      :currenButtonData="currenButtonData"
-      :tableData="tableData"
-      :tableLoading="Loading.tableLoading"
-      :tableColumns="apiColumns_Table"
-      @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>
-    <curren-Drawer
-      :title="apiColumns_DesTions"
-      :tableColumns="apiColumns_DetailsTable"
-      :tabsDesTions="apiColumns_DesTions"
-      :DrawerLoading="Loading.DrawerLoading"
-      :drawer="displayDialog.detailsDialog"
-      :Butttondata="[]"
-      :propsData="propsData"
-      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
-      @handleCommand="drawerHandle"
-      @close-value="closeValue"
-      :totalCount="totalCountDetails"
-      :currentPage="oldSkipCountDetails"
-      :MaxResultCount="MaxResultCountDetails"
-      @alterResultCountDetails="alterResultCountDetails"
-      @alertoldSkipCountDetails="alertoldSkipCountDetails"
-    ></curren-Drawer>
-    <filterForDetailPage
-      v-if="filterForDetailShow"
-      :listApi="detailListURL"
-      :parentApi="detailURL"
-      :listColumns="apiColumns_DetailsTable"
-      :parentColumns="apiColumns_Table"
-      @closeDialog="changeFilterForDetailShow"
-    ></filterForDetailPage>
-  </div>
-</template>
-<script>
-import { tableMixins } from "@/mixins/TableMixins";
-import { LoadingMixins } from "@/mixins/LoadingMixins";
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
-import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
-import { mixins } from "@/mixins/mixins";
-import { filterSelectMixins } from '@/mixins/filter-Select'
-import { getToken } from '@/utils/auth'
-import  * as tableColumns_api from "@/utils/tableColumns_api/index" //全局从接口缓存的表头
-import  * as tabsDesTions_api from "@/utils/tabsDesTions_api/index" //全局从接口缓存的详情
-import  * as detailsTableColumns_api from "@/utils/detailsTableColumns_api/index" //全局从接口缓存的详情
-
-
-export default {
-  name: "dataExchangeFromOut",
-  mixins: [
-    tableMixins,
-    LoadingMixins,
-    drawerMixins,
-    TableHeaderMixins,
-    mixins,
-    filterSelectMixins,
-    newAndEdiDialogMixins
-  ],
-  data() {
-    return {
-      //常用按钮数据
-      currenButtonData: [
-        this.defaultExportBtn({
-          isRedundance:true,
-          isDetailExport:true
-        }),//导出
-        this.defaultFreshBtn(),//刷新
-        this.defaultFilterBtn(),//筛选
-        this.defaultFilterForDetailBtn()//明细查询按钮
-      ],
-      // 明细查询弹窗显示
-      filterForDetailShow:false,
-    };
-  },
-  mounted() {
-    this.initApiColumns()
-    this.paging();
-  },
-  methods: {
-    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(){
-      this.apiColumns_Table = tableColumns_api[this.$route.name]
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    },
-  }
-}
-</script>
-<style lang="scss" scoped>
-@import "@/styles/basicData.scss";
-</style>

Code/Fe/src/views/interfaceBoard/dataExchangeFromOut_file.vue

@@ -1,113 +0,0 @@
-<template>
-  <div class="page-box" v-loading="Loading.appMainLoading">
-    <!-- 归档外部数据转换页面 -->
-    <tablePagination
-      v-if="apiColumns_Table"
-      :currenButtonData="currenButtonData"
-      :tableData="tableData"
-      :tableLoading="Loading.tableLoading"
-      :tableColumns="apiColumns_Table"
-      @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>
-    <curren-Drawer
-      :title="apiColumns_DesTions"
-      :tableColumns="apiColumns_DetailsTable"
-      :tabsDesTions="apiColumns_DesTions"
-      :DrawerLoading="Loading.DrawerLoading"
-      :drawer="displayDialog.detailsDialog"
-      :Butttondata="[]"
-      :propsData="propsData"
-      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
-      @handleCommand="drawerHandle"
-      @close-value="closeValue"
-      :totalCount="totalCountDetails"
-      :currentPage="oldSkipCountDetails"
-      :MaxResultCount="MaxResultCountDetails"
-      @alterResultCountDetails="alterResultCountDetails"
-      @alertoldSkipCountDetails="alertoldSkipCountDetails"
-    ></curren-Drawer>
-    <filterForDetailPage
-      v-if="filterForDetailShow"
-      :listApi="detailListURL"
-      :parentApi="detailURL"
-      :listColumns="apiColumns_DetailsTable"
-      :parentColumns="apiColumns_Table"
-      @closeDialog="changeFilterForDetailShow"
-    ></filterForDetailPage>
-  </div>
-</template>
-<script>
-import { tableMixins } from "@/mixins/TableMixins";
-import { LoadingMixins } from "@/mixins/LoadingMixins";
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
-import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
-import { mixins } from "@/mixins/mixins";
-import { filterSelectMixins } from '@/mixins/filter-Select'
-import { getToken } from '@/utils/auth'
-import  * as tableColumns_api from "@/utils/tableColumns_api/index" //全局从接口缓存的表头
-import  * as tabsDesTions_api from "@/utils/tabsDesTions_api/index" //全局从接口缓存的详情
-import  * as detailsTableColumns_api from "@/utils/detailsTableColumns_api/index" //全局从接口缓存的详情
-
-
-export default {
-  name: "dataExchangeFromOut_file",
-  mixins: [
-    tableMixins,
-    LoadingMixins,
-    drawerMixins,
-    TableHeaderMixins,
-    mixins,
-    filterSelectMixins,
-    newAndEdiDialogMixins
-  ],
-  data() {
-    return {
-      //常用按钮数据
-      currenButtonData: [
-        this.defaultExportBtn({
-          isRedundance:true,
-          isDetailExport:true
-        }),//导出
-        this.defaultFreshBtn(),//刷新
-        this.defaultFilterBtn(),//筛选
-        this.defaultFilterForDetailBtn()//明细查询按钮
-      ],
-      // 明细查询弹窗显示
-      filterForDetailShow:false,
-    };
-  },
-  mounted() {
-    this.initApiColumns()
-    this.paging();
-  },
-  methods: {
-    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(){
-      this.apiColumns_Table = tableColumns_api[this.$route.name]
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    },
-  }
-}
-</script>
-<style lang="scss" scoped>
-@import "@/styles/basicData.scss";
-</style>

Code/Fe/src/views/interfaceBoard/dataExchangeFromWms.vue

@@ -1,113 +0,0 @@
-<template>
-  <div class="page-box" v-loading="Loading.appMainLoading">
-    <!-- WMS数据转换页面 -->
-    <tablePagination
-      v-if="apiColumns_Table"
-      :currenButtonData="currenButtonData"
-      :tableData="tableData"
-      :tableLoading="Loading.tableLoading"
-      :tableColumns="apiColumns_Table"
-      @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>
-    <curren-Drawer
-      :title="apiColumns_DesTions"
-      :tableColumns="apiColumns_DetailsTable"
-      :tabsDesTions="apiColumns_DesTions"
-      :DrawerLoading="Loading.DrawerLoading"
-      :drawer="displayDialog.detailsDialog"
-      :Butttondata="[]"
-      :propsData="propsData"
-      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
-      @handleCommand="drawerHandle"
-      @close-value="closeValue"
-      :totalCount="totalCountDetails"
-      :currentPage="oldSkipCountDetails"
-      :MaxResultCount="MaxResultCountDetails"
-      @alterResultCountDetails="alterResultCountDetails"
-      @alertoldSkipCountDetails="alertoldSkipCountDetails"
-    ></curren-Drawer>
-    <filterForDetailPage
-      v-if="filterForDetailShow"
-      :listApi="detailListURL"
-      :parentApi="detailURL"
-      :listColumns="apiColumns_DetailsTable"
-      :parentColumns="apiColumns_Table"
-      @closeDialog="changeFilterForDetailShow"
-    ></filterForDetailPage>
-  </div>
-</template>
-<script>
-import { tableMixins } from "@/mixins/TableMixins";
-import { LoadingMixins } from "@/mixins/LoadingMixins";
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
-import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
-import { mixins } from "@/mixins/mixins";
-import { filterSelectMixins } from '@/mixins/filter-Select'
-import { getToken } from '@/utils/auth'
-import  * as tableColumns_api from "@/utils/tableColumns_api/index" //全局从接口缓存的表头
-import  * as tabsDesTions_api from "@/utils/tabsDesTions_api/index" //全局从接口缓存的详情
-import  * as detailsTableColumns_api from "@/utils/detailsTableColumns_api/index" //全局从接口缓存的详情
-
-
-export default {
-  name: "dataExchangeFromWms",
-  mixins: [
-    tableMixins,
-    LoadingMixins,
-    drawerMixins,
-    TableHeaderMixins,
-    mixins,
-    filterSelectMixins,
-    newAndEdiDialogMixins
-  ],
-  data() {
-    return {
-      //常用按钮数据
-      currenButtonData: [
-        this.defaultExportBtn({
-          isRedundance:true,
-          isDetailExport:true
-        }),//导出
-        this.defaultFreshBtn(),//刷新
-        this.defaultFilterBtn(),//筛选
-        this.defaultFilterForDetailBtn()//明细查询按钮
-      ],
-      // 明细查询弹窗显示
-      filterForDetailShow:false,
-    };
-  },
-  mounted() {
-    this.initApiColumns()
-    this.paging();
-  },
-  methods: {
-    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(){
-      this.apiColumns_Table = tableColumns_api[this.$route.name]
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    },
-  }
-}
-</script>
-<style lang="scss" scoped>
-@import "@/styles/basicData.scss";
-</style>

Code/Fe/src/views/interfaceBoard/dataExchangeFromWms_file.vue

@@ -1,113 +0,0 @@
-<template>
-  <div class="page-box" v-loading="Loading.appMainLoading">
-    <!-- 归档WMS数据转换页面 -->
-    <tablePagination
-      v-if="apiColumns_Table"
-      :currenButtonData="currenButtonData"
-      :tableData="tableData"
-      :tableLoading="Loading.tableLoading"
-      :tableColumns="apiColumns_Table"
-      @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>
-    <curren-Drawer
-      :title="apiColumns_DesTions"
-      :tableColumns="apiColumns_DetailsTable"
-      :tabsDesTions="apiColumns_DesTions"
-      :DrawerLoading="Loading.DrawerLoading"
-      :drawer="displayDialog.detailsDialog"
-      :Butttondata="[]"
-      :propsData="propsData"
-      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
-      @handleCommand="drawerHandle"
-      @close-value="closeValue"
-      :totalCount="totalCountDetails"
-      :currentPage="oldSkipCountDetails"
-      :MaxResultCount="MaxResultCountDetails"
-      @alterResultCountDetails="alterResultCountDetails"
-      @alertoldSkipCountDetails="alertoldSkipCountDetails"
-    ></curren-Drawer>
-    <filterForDetailPage
-      v-if="filterForDetailShow"
-      :listApi="detailListURL"
-      :parentApi="detailURL"
-      :listColumns="apiColumns_DetailsTable"
-      :parentColumns="apiColumns_Table"
-      @closeDialog="changeFilterForDetailShow"
-    ></filterForDetailPage>
-  </div>
-</template>
-<script>
-import { tableMixins } from "@/mixins/TableMixins";
-import { LoadingMixins } from "@/mixins/LoadingMixins";
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
-import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
-import { mixins } from "@/mixins/mixins";
-import { filterSelectMixins } from '@/mixins/filter-Select'
-import { getToken } from '@/utils/auth'
-import  * as tableColumns_api from "@/utils/tableColumns_api/index" //全局从接口缓存的表头
-import  * as tabsDesTions_api from "@/utils/tabsDesTions_api/index" //全局从接口缓存的详情
-import  * as detailsTableColumns_api from "@/utils/detailsTableColumns_api/index" //全局从接口缓存的详情
-
-
-export default {
-  name: "dataExchangeFromWms_file",
-  mixins: [
-    tableMixins,
-    LoadingMixins,
-    drawerMixins,
-    TableHeaderMixins,
-    mixins,
-    filterSelectMixins,
-    newAndEdiDialogMixins
-  ],
-  data() {
-    return {
-      //常用按钮数据
-      currenButtonData: [
-        this.defaultExportBtn({
-          isRedundance:true,
-          isDetailExport:true
-        }),//导出
-        this.defaultFreshBtn(),//刷新
-        this.defaultFilterBtn(),//筛选
-        this.defaultFilterForDetailBtn()//明细查询按钮
-      ],
-      // 明细查询弹窗显示
-      filterForDetailShow:false,
-    };
-  },
-  mounted() {
-    this.initApiColumns()
-    this.paging();
-  },
-  methods: {
-    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(){
-      this.apiColumns_Table = tableColumns_api[this.$route.name]
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    },
-  }
-}
-</script>
-<style lang="scss" scoped>
-@import "@/styles/basicData.scss";
-</style>