From 5932b38ab64ac5564f0455c31c522f744d268a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 30 Jun 2023 17:22:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9B=91=E6=8E=A7=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E4=BD=BF=E7=94=A8=E6=8E=A5=E5=8F=A3=E8=A1=A8=E5=A4=B4?=
 =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/public/config.js                        |    2 +
 fe/PC/public/version.json                     |    2 +-
 fe/PC/src/App.vue                             |    2 +-
 fe/PC/src/api/wms-interface_new.js            |  117 +
 fe/PC/src/lang/zh.js                          |    1 +
 fe/PC/src/permission.js                       |   12 +
 fe/PC/src/utils/tableColumns/index.js         |    4 +-
 fe/PC/src/utils/tableColumns/index_new.js     | 3734 +++++++++++++++++
 fe/PC/src/utils/tabsDesTions/index.js         |   54 +-
 .../interfaceBoard/_dataExchangeFromOut.vue   |  304 ++
 .../views/interfaceBoard/comingFromOut.vue    |    2 +-
 .../interfaceBoard/comingFromOut_file.vue     |    2 +-
 .../src/views/interfaceBoard/comingToWms.vue  |    2 +-
 .../views/interfaceBoard/comingToWms_file.vue |    2 +-
 .../interfaceBoard/dataExchangeFromOut.vue    |  213 +-
 .../dataExchangeFromOut_file.vue              |   52 +-
 .../interfaceBoard/dataExchangeFromWms.vue    |    2 +-
 .../dataExchangeFromWms_file.vue              |    2 +-
 18 files changed, 4259 insertions(+), 250 deletions(-)
 create mode 100644 fe/PC/src/api/wms-interface_new.js
 create mode 100644 fe/PC/src/utils/tableColumns/index_new.js
 create mode 100644 fe/PC/src/views/interfaceBoard/_dataExchangeFromOut.vue

diff --git a/fe/PC/public/config.js b/fe/PC/public/config.js
index c443cca3b..5e620a5ee 100644
--- a/fe/PC/public/config.js
+++ b/fe/PC/public/config.js
@@ -23,6 +23,8 @@ window.SITE_CONFIG['versionUrl'] = 'http://dev.ccwin-in.com:60070'
 window.SITE_CONFIG['companyName'] = '长春一汽富维东阳汽车塑料零部件（安徽）有限公司'
 // 接口看板地址
 window.SITE_CONFIG['interfaceBoardUrl'] = 'http://dev.ccwin-in.com:60090/'
+// 接口看板表头获取地址
+window.SITE_CONFIG['interfaceBoardColumnsApi'] = 'api/abp/application-configuration'
 
 // mock
 // window.SITE_CONFIG['apifoxToken'] = 'NXHNi5mp0dnUHGt0wkCrjvfcidsFKV33'
diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json
index 3a1d429ca..9287b0af9 100644
--- a/fe/PC/public/version.json
+++ b/fe/PC/public/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "1.0.34"
+    "version": "1.0.35"
 }
\ No newline at end of file
diff --git a/fe/PC/src/App.vue b/fe/PC/src/App.vue
index f98313b85..c52b9824e 100644
--- a/fe/PC/src/App.vue
+++ b/fe/PC/src/App.vue
@@ -18,7 +18,7 @@ localStorage.setItem('apifoxToken',window.SITE_CONFIG['apifoxToken'])
 localStorage.setItem('reportsUrl',window.SITE_CONFIG['reportsUrl'])
 localStorage.setItem('companyName',window.SITE_CONFIG['companyName'])
 localStorage.setItem('interfaceBoardUrl',window.SITE_CONFIG['interfaceBoardUrl'])
-
+localStorage.setItem('interfaceBoardColumnsApi',window.SITE_CONFIG['interfaceBoardColumnsApi'])
 
 </script>
 <style lang="scss">
diff --git a/fe/PC/src/api/wms-interface_new.js b/fe/PC/src/api/wms-interface_new.js
new file mode 100644
index 000000000..fa3f55d2b
--- /dev/null
+++ b/fe/PC/src/api/wms-interface_new.js
@@ -0,0 +1,117 @@
+// 接口监控看板相关api
+import axios from 'axios'
+import request from '@/utils/request'
+let filter = 'get-page-list-by-filter'
+let base_api = localStorage.getItem('interfaceBoardUrl')
+let colum_url = localStorage.getItem('interfaceBoardColumnsApi')
+let interfaceBoard_api = base_api + 'api/app/'
+// 转义传参
+const initParams = (data) => {
+    return {
+        skipCount:data.SkipCount,
+        maxResultCount:data.MaxResultCount,
+        sorting:data.Sorting
+    }
+}
+
+// 获取表头数据
+export function getInterfaceBoard() {
+    return axios({
+        method:'get',
+        url: base_api + colum_url
+    })
+}
+
+//外部数据转换
+export function dataExchangeFromOut(data,includeDetails) {
+    return axios({
+        method:'post',
+        url: interfaceBoard_api + 'outgoing-to-external/' + filter + '?includeDetails='+ Boolean(includeDetails),
+        data
+    })
+}
+
+//归档外部数据转换
+export function dataExchangeFromOut_file(data,includeDetails) {
+    return axios({
+        method:'post',
+        url: interfaceBoard_api + 'archived-outgoing-to-external/' + filter + '?includeDetails='+ Boolean(includeDetails),
+        data
+    })
+}
+
+//wms数据接收
+export function comingToWms(data,includeDetails) {
+    return axios({
+        method:'post',
+        url: interfaceBoard_api + 'incoming-to-wms/' + filter + '?includeDetails='+ Boolean(includeDetails),
+        data
+    })
+}
+
+//归档wms数据接收
+export function comingToWms_file(data,includeDetails) {
+    return axios({
+        method:'post',
+        url: interfaceBoard_api + 'archived-incoming-to-wms/' + filter + '?includeDetails='+ Boolean(includeDetails),
+        data
+    })
+}
+
+//wms数据转换
+export function dataExchangeFromWms(data,includeDetails) {
+    return axios({
+        method:'post',
+        url: interfaceBoard_api + 'data-exchange_Outgoing-from-wms/' + filter + '?includeDetails='+ Boolean(includeDetails),
+        data
+    })
+}
+
+// 归档wms数据转换
+export function dataExchangeFromWms_file(data,includeDetails) {
+    return axios({
+        method:'post',
+        url: interfaceBoard_api + 'data-exchange_Archived-outgoing-from-wms/' + filter + '?includeDetails='+ Boolean(includeDetails),
+        data
+    })
+}
+
+//外部数据接收
+export function comingFromOut(data,includeDetails) {
+    return axios({
+        method:'post',
+        url: interfaceBoard_api + 'data-exchange_Incoming-from-external/' + filter + '?includeDetails='+ Boolean(includeDetails),
+        data
+    })
+}
+
+//归档外部数据接收
+export function comingFromOut_file(data,includeDetails) {
+    return axios({
+        method:'post',
+        url: interfaceBoard_api + 'data-exchange_Archived-incoming-from-external/' + filter + '?includeDetails='+ Boolean(includeDetails),
+        data
+    })
+}
+
+//外部数据转换新增、编辑
+export function dataExchangeFromOut_save(data,add) {
+    let _type = add  ? 'CreateModal' : 'EditModal'
+    return axios({
+        method:'post',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+        },
+        url: base_api + 'AppBusiness/OutgoingToExternal/OutgoingToExternal/'+_type,
+        data:data
+    })
+}
+
+//外部数据转换删除
+export function dataExchangeFromOut_delete(id) {
+    return axios({
+        method:'DELETE',
+        url: base_api + 'outgoing-to-external/' + id,
+    })
+}
+
diff --git a/fe/PC/src/lang/zh.js b/fe/PC/src/lang/zh.js
index 53102b095..031525d6d 100644
--- a/fe/PC/src/lang/zh.js
+++ b/fe/PC/src/lang/zh.js
@@ -89,6 +89,7 @@ export default {
   },
 
   // 接口监控看板
+  // 现使用接口数据：config文件中【interfaceBoardUrl】+【interfaceBoardColumnsApi】地址
   ColumsDashboard:{
     number:'编号',
     dataType:'数据类型',
diff --git a/fe/PC/src/permission.js b/fe/PC/src/permission.js
index 3a23b98f8..24eb7c26d 100644
--- a/fe/PC/src/permission.js
+++ b/fe/PC/src/permission.js
@@ -12,6 +12,7 @@ import getPageTitle from '@/utils/get-page-title'
 import {
   asyncRoutes
 } from '@/router'
+import { getInterfaceBoard } from "@/api/wms-interface"
 
 NProgress.configure({
   showSpinner: false
@@ -47,6 +48,17 @@ router.beforeEach(async (to, from, next) => {
         try {
           // get user info
           // note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
+          // 除了登录页以外，如果缓存中没有 interfaceBoardColumnsNames(监控数据表头信息) 的缓存 则跳出登录页
+            // getInterfaceBoard().then(result => {
+            //   // let _obj = {"OutgoingToExternal":"外部数据转换","OutgoingToExternalNumber":"编号","OutgoingToExternalRemark":"备注11111111111","OutgoingToExternalDataType":"数据类型","OutgoingToExternalTableType":"数据表类型","OutgoingToExternalDataAction":"数据动作","OutgoingToExternalEffectiveDate":"生效日期","OutgoingToExternalStatus":"数据状态","OutgoingToExternalSourceSystem":"来源系统","OutgoingToExternalSourceDataId":"来源数据ID","OutgoingToExternalSourceDataGroupCode":"来源数据组码","OutgoingToExternalSourceDataDetailCode":"来源数据明细码","OutgoingToExternalSourceDataContent":"来源数据内容","OutgoingToExternalWriteTime":"写入时间","OutgoingToExternalWriter":"写入者","OutgoingToExternalDestinationDataId":"目标数据ID","OutgoingToExternalDestinationDataContent":"目标数据内容","OutgoingToExternalDestinationSystem":"目标系统","OutgoingToExternalReadTime":"读取时间","OutgoingToExternalReader":"读取者","OutgoingToExternalErrorCode":"错误代码","OutgoingToExternalErrorMessage":"错误信息","OutgoingToExternalRetryTimes":"重试次数"}
+            //   // localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(_obj));
+            //   localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.data.localization.values.Dashboard));
+            //   console.log(5858585858,localStorage.getItem("interfaceBoardColumnsNames"))
+            // })
+            // .catch(err => {
+
+            // })
+
           const {
             roles
           } = await store.dispatch('user/getInfo')
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 5bb5f8b37..ea5bf4bef 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -3489,8 +3489,8 @@ export const dataExchangeFromOut = [
   { 
     label: _Dashboard.number, 
     prop: "number",
-    fixed: "left",
-    type: "name"
+    // fixed: "left",
+    // type: "name"
   },
   { label: _Public.remark, prop: "remark", type:"showDetail" },
   { label: _Dashboard.dataType, prop: "dataType", type:"showDetail" },
diff --git a/fe/PC/src/utils/tableColumns/index_new.js b/fe/PC/src/utils/tableColumns/index_new.js
new file mode 100644
index 000000000..fefb5b4b8
--- /dev/null
+++ b/fe/PC/src/utils/tableColumns/index_new.js
@@ -0,0 +1,3734 @@
+// 通用配置
+const orderWidth = 180
+import zh from '@/lang/zh'
+let _Public = zh.ColumsPublic // 字段通用
+// let _Dashboard = zh.ColumsDashboard // 接口监控看板
+let _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) // 接口监控看板
+let _Names = zh.ColumsNames // 接口监控看板
+window.addEventListener('setItemEvent', (item) => {
+  if(item.key == "interfaceBoardColumnsNames"){
+    _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) // 接口监控看板
+    console.log(11,_Dashboard)
+  }
+})
+// 基础信息数据管理
+/**/
+// 物品基础信息
+export const ItemBasic = [
+  {
+    label: _Names.itemCode,
+    prop: "code",
+    fixed: "left",
+    type: "name"
+  },
+  { label: _Names.itemName, prop: "name" },
+  { label: _Names.itemDesc1, prop: "desc1" },
+  { label: _Names.itemDesc2, prop: "desc2" },
+  { label: _Public.status, prop: "status", type: "filter", filters: "itemStatus" },
+  { label: _Public.type, prop: 'type', type: "filter", filters: "ItemTypeBasic" },
+  { label: _Names.abcClass, prop: 'abcClass', type: "filter", filters: "abcClass" },
+  { label: _Names.canMake, prop: 'canMake', type: "filter", filters: "whetherOrNot" },
+  { label: _Names.canBuy, prop: 'canBuy', type: "filter", filters: "whetherOrNot" },
+  { label: _Names.canOutsourcing, prop: 'canOutsourcing', type: "filter", filters: "whetherOrNot" },
+  { label: _Names.isRecycled, prop: 'isRecycled', type: "filter", filters: "whetherOrNot" },
+  { label: _Names.isPhantom, prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
+  { label: _Names.productLine, prop: 'productLine' },
+  { label: _Names.elevel, prop: 'elevel' },
+  { label: _Names.color, prop: "color" },
+  // ---------------------------------------
+  { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+  { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
+  { label: _Names.category, prop: "category" },
+  { label: _Names.group, prop: "group" },
+  { label: _Names.configuration, prop: "configuration" },
+  { label: _Names.basicUom, prop: "basicUom" },
+  { label: _Names.stdPackQty, prop: "stdPackQty" },
+  { label: _Names.project, prop: "project" },
+  { label: _Names.version, prop: "version" },
+  { label: _Names.eco, prop: "eco" },
+  { label: _Names.validity, prop: "validity" },
+  { label: _Names.validityUnit, prop: "validityUnit", type: "filter", filters: "validityUnit" },
+  { label: _Names.manageType, prop: "manageType", type: "filter", filters: "manageType" },
+  { label: _Public.remark, prop: "remark" },
+  // {
+  //   label: _Public.operation,
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 物品质量信息
+export const ItemQuality = [
+  {
+    label: _Names.itemCode,
+    prop: "itemCode",
+    fixed: "left",
+    type: "name"
+  },
+  { label: _Names.supplierCode, prop: 'supplierCode' },
+  { label: _Public.status, prop: 'status', type: "filter", filters: "openToClose" },
+  { label: _Names.inspectType, prop: 'inspectType', type: "filter", filters: "inspectType" },
+  { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+  { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
+  { label: _Public.remark, prop: "remark" },
+  { label: _Public.description, prop: "description" },
+  // {
+  //   label: _Public.operation,
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 物品分类信息
+export const ItemCategory = [
+  {
+    label: _Names.itemCode,
+    prop: "itemCode",
+    fixed: "left",
+    type: "name"
+  },
+  { label: _Names.categoryCode, prop: 'categoryCode' },
+  { label: _Names.categoryValue, prop: 'value' },
+  { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+  { label: _Public.remark, prop: "remark" },
+  { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
+  // {
+  //   label: _Public.creationTime,
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 物品包装信息
+export const ItemPack = [
+  { 
+    label: _Names.itemCode, 
+    prop: "itemCode",
+    fixed: "left",
+    type: "name" 
+  },
+  { label: _Names.packCode, prop: "packCode", },
+  { label: _Names.packName, prop: "packName" },
+  { label: _Names.packType, prop: "packType" },
+  { label: _Names.packBasicUom, prop: "basicUom" },
+  { label: _Names.packQty, prop: "qty" },
+  { label: _Public.remark, prop: "remark" },
+  { label: _Public.creationTime, prop: "creationTime", type:'dateTime' },
+  { label: _Public.lastModificationTime, prop: "lastModificationTime",  type:'dateTime' },
+  // {
+  //   label: _Public.creationTime,
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 物品质检标准信息
+export const AQL = [
+  {
+    label: _Names.itemCode,
+    prop: "itemCode",
+    fixed: "left",
+    type: "name"
+  },
+  { label: _Names.supplierCode, prop: "supplierCode" },
+  { label: _Names.abcClass, prop: 'abcClass', type: "filter", filters: "abcClass" },
+  { label: _Names.ceilingQty, prop: 'ceilingQty' },
+  { label: _Names.floorQty, prop: "floorQty" },
+  { label: _Names.isUsePercent, prop: 'isUsePercent', type: "filter", filters: "whetherOrNot" },
+  { label: _Names.samplePercent, prop: 'samplePercent' },
+  { label: _Names.sampleQty, prop: 'sampleQty' },
+  { label: _Public.remark, prop: "remark" },
+  { label: _Public.creationTime, prop: "creationTime", type:'dateTime' },
+  { label: _Public.lastModificationTime, prop: "lastModificationTime",  type:'dateTime' },
+  // {
+  //   label: _Public.creationTime,
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 物品清单信息
+export const Bom = [
+  {
+    label: _Names.productCode,
+    prop: "product",
+    fixed: "left",
+    type: "name"
+  },
+  { label: _Names.componentCode, prop: "component" },
+  { label: _Names.componentQty, prop: 'componentQty' },
+  { label: _Names.componentUom, prop: 'componentUom' },
+  { label: _Names.erpOp, prop: "erpOp" },
+  { label: _Names.mfgOp, prop: "mfgOp" },
+  { label: _Names.distributionType, prop: "distributionType", type: "filter", filters: "distributionType" },
+  { label: _Names.truncType, prop: "truncType", type: "filter", filters: "truncType" },
+  { label: _Names.plannedSplitRule, prop: "plannedSplitRule", type: "filter", filters: "plannedSplitRule" },
+  { label: _Public.beginTime, prop: "beginTime", type: "dateTime" },
+  { label: _Public.endTime, prop: "endTime", type: "dateTime" },
+  { label: _Public.remark, prop: 'remark' },
+  { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+  { label: _Public.lastModificationTime, prop: 'lastModificationTime', type: "dateTime" },
+  { label: _Names.layer, prop: "layer" },
+  // {
+  //   label: _Public.operation,
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 物品清单信息 - 详情【父物品信息、子物品信息】
+export const BomInner = [
+  {
+    label: _Names.productCode,
+    prop: "product",
+    fixed: "left",
+    type: "name"
+  },
+  { label: _Names.componentCode, prop: "component" },
+  { label: _Names.componentQty, prop: 'componentQty' },
+  { label: _Names.componentUom, prop: 'componentUom' },
+  { label: _Names.erpOp, prop: "erpOp" },
+  { label: _Names.mfgOp, prop: "mfgOp" },
+  { label: _Names.distributionType, prop: "distributionType", type: "filter", filters: "distributionType" },
+  { label: _Names.truncType, prop: "truncType", type: "filter", filters: "truncType" },
+  { label: _Names.plannedSplitRule, prop: "plannedSplitRule", type: "filter", filters: "plannedSplitRule" },
+  { label: _Public.beginTime, prop: "beginTime", type:'dateTime' },
+  { label: _Public.endTime, prop: "endTime", type:'dateTime' },
+  { label: _Public.remark, prop: 'remark' },
+  { label: _Names.layer, prop: "layer" },
+  { label: _Public.creationTime, prop: "creationTime", type:'dateTime' },
+  { label: _Public.lastModificationTime, prop: "lastModificationTime",  type:'dateTime' },
+  // ************** 确认隐藏 ************************
+  // { label: _Public.tenantId, prop: "tenantId" },
+  // { label: _Public.creatorId, prop: "creatorId" },
+  // { label: _Public.lastModifierId, prop: "lastModifierId" },
+  // { label: _Public.id, prop: 'id' },
+  // ************** 确认隐藏 ************************
+  // {
+  //   label: _Public.operation,
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 客户信息
+export const Customer = [
+  {
+    label: _Names.customerCode,
+    prop: "code",
+    fixed: "left",
+    type: "name"
+  },
+  { label: _Names.customerName, prop: "name" },
+  { label: _Public.status, prop: "isActive", type: "filter", filters: "openToCloseBit" },
+  { label: _Names.contact, prop: "contacts" },
+  { label: _Names.phone, prop: "phone" },
+  { label: _Names.fax, prop: "fax" },
+  { label: _Names.postID, prop: "postID" },
+  { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+  { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
+  { label: _Public.remark, prop: "remark" },
+  { label: _Names.customerShortName, prop: "shortName" },
+  { label: _Names.address, prop: "address" },
+  { label: _Names.country, prop: "country" },
+  { label: _Names.city, prop: "city" },
+  { label: _Names.currency, prop: "currency" },
+  // ************** 确认隐藏 ************************
+  // { label: _Public.type, prop: 'type' },
+  // ************** 确认隐藏 ************************
+  // {
+  //   label: _Public.operation,
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 客户物品信息
+export const CustomerItem = [
+  {
+    label: _Names.customerCode,
+    prop: "customerCode",
+    fixed: "left",
+    type: "name"
+  },
+  { label: _Names.customerItemCode, prop: "customerItemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
+  { label: _Names.customerPackQty, prop: "customerPackQty" },
+  { label: _Names.customerPackUom, prop: "customerPackUom" },
+  { label: _Public.beginTime, prop: "beginTime", type: "dateTime" },
+  { label: _Public.endTime, prop: "endTime", type: "dateTime" },
+  { label: _Public.remark, prop: 'remark' },
+  { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+  { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
+  { label: _Names.version, prop: 'version' },
+  // {
+  //   label: _Public.operation,
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 客户地址信息
+export const CustomerAddress = [
+  { label: _Names.customerCode, 
+    prop: "customerCode",
+    fixed: "left",
+    type: "name"
+  },
+  { label: _Names.customerAdrName, prop: "name" },
+  { label: _Names.customerAdrCode, prop: "code" },
+  { label: _Names.warehouseCode, prop: "warehouseCode" },
+  { label: _Names.locationCode, prop: "locationCode" },
+  { label: _Names.city, prop: "city" },
+  { label: _Names.address, prop: "address" },
+  { label: _Names.contact, prop: "contact" },
+  { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+  { label: _Public.lastModificationTime, prop: "lastModificationTime" },
+  { label: _Public.remark, prop: "remark" },
+  { label: _Public.description, prop: "desc" },
+  // {
+  //   label: _Public.operation,
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 客户项目信息
+export const Project = [
+  {
+    label: _Names.projectCode,
+    prop: "code",
+    fixed: "left",
+    type: "name"
+  },
+  { label: _Names.projectName, prop: "name" },
+  { label: _Names.customerCode, prop: "customerCode" },
+  { label: _Public.beginTime, prop: "beginTime", type: "dateTime" },
+  { label: _Public.endTime, prop: "endTime", type: "dateTime" },
+  { label: _Public.description, prop: "description" },
+  { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+  { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
+  { label: _Public.remark, prop: "remark" },
+  // {
+  //   label: _Public.operation,
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 供应商信息 20230328
+export const Supplier = [
+  {
+    label: "供应商代码",
+    prop: "code",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "供应商名称", prop: "name" },
+  { label: "简称", prop: "shortName" },
+  { label: "税率", prop: "taxRate" },
+  { label: "状态", prop: "isActive", type: "filter", filters: "openToCloseBit" },
+  { label: "类型", prop: "type", type: "filter", filters: "supplierType" },
+  { label: "联系人", prop: "contacts" },
+  { label: "电话", prop: "phone" },
+  { label: "传真", prop: 'fax' },
+  { label: "邮编", prop: 'postID' },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "地址", prop: 'address' },
+  { label: "国家", prop: 'country' },
+  { label: "城市", prop: 'city' },
+  { label: "银行", prop: 'bank' },
+  { label: "货币", prop: 'currency' },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 供应商物品信息 20230328
+export const SupplierItem = [
+  {
+    label: "供应商代码",
+    prop: 'supplierCode',
+    fixed: "left",
+    type: "name"
+  },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "供应商物品代码", prop: "supplierItemCode" },
+  { label: "供应商物品名称", prop: "itemName" },
+  { label: "供应商简称", prop: "supplierSimpleName" },
+  { label: "版本", prop: "version" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+  { label: "备注", prop: "remark" },
+  { label: "供应商包装计量单位", prop: "supplierPackUom" },
+  { label: "供应商包装数量", prop: "supplierPackQty" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 供应商时间窗口 20230328
+export const SupplierTimeWindow = [
+  {
+    label: "供应商代码",
+    prop: 'supplierCode',
+    fixed: "left",
+    type: "name"
+  },
+  { label: "供应商名称", prop: "supplierName" },
+  { label: "当前星期", prop: "week", type: "filter", filters: "week" },
+  { label: "时间窗口", prop: "timeSlot" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+  { label: "备注", prop: "remark" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 收货口信息 20230328
+export const Dock = [
+  {
+    label: "仓库代码",
+    fixed: "left",
+    type: "name",
+    prop: "warehouseCode"
+  },
+  { label: "默认库位代码", prop: "defaultLocationCode" },
+  { label: "收货口代码", prop: "code" },
+  { label: "收货口名称", prop: 'name' },
+  { label: "描述", prop: "description" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+  { label: "备注", prop: "remark" },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 区域信息 20230328
+export const Area = [
+  {
+    label: "区域代码",
+    prop: "code",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "区域名称", prop: "name" },
+  { label: "是否功能区", prop: "isFunctional", type: "filter", filters: "whetherOrNot" },
+  { label: "类型", prop: "areaType", type: "filter", filters: "areaType" },
+  { label: "描述", prop: "description" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+  { label: "备注", prop: "remark" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 库位组信息 20230328
+export const LocationGroup = [
+  {
+    label: "库位组代码",
+    fixed: "left",
+    type: "name",
+    prop: "code"
+  },
+  { label: "区域代码", prop: "areaCode" },
+  { label: "库位组名称", prop: 'name' },
+  { label: "仓库代码", prop: "warehouseCode" },
+  { label: "库位组类型", prop: "groupType", type: "filter", filters: "locationType" },
+  { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" },
+  { label: "拣料优先级", prop: "pickPriority" },
+  { label: "描述", prop: "description" },
+  { label: "溢流库位组", prop: "overflowLocationGroup" },
+  { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
+  { label: "是否负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
+  { label: "是否保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
+  { label: "是否动态盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
+  { label: "是否领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
+  { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
+  { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
+  { label: "是否拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+  { label: "备注", prop: "remark" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 工作组信息 20230328
+export const WorkGroup = [
+  {
+    label: "工作组代码",
+    fixed: "left",
+    type: "name",
+    prop: "code"
+  },
+  { label: "工作组名称", prop: 'name' },
+  { label: "仓库代码", prop: "warehouseCode" },
+  { label: "描述", prop: "description" },
+  { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "备注", prop: "remark" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 库位信息 20230328
+export const Location = [
+  {
+    label: "库位代码",
+    fixed: "left",
+    type: "name",
+    prop: "code"
+  },
+  { label: "库位名称", prop: "name" },
+  { label: "仓库代码", prop: "warehouseCode" },
+  { label: "区域代码", prop: "areaCode" },
+  { label: "库位组代码", prop: "locationGroupCode" },
+  { label: "工作组代码", prop: "workGroupCode" },
+  { label: "库位类型", prop: "type", type: "filter", filters: "locationType" },
+  { label: "ERP系统库位代码", prop: "erpLocationCode" },
+  { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage", width:'130px' },
+  { label: "货架号", prop: "shelfCode" },
+  { label: "行号", prop: "rowCode" },
+  { label: "列号", prop: "columnCode" },
+  { label: "拣料优先级", prop: "pickPriority" },
+  { label: "拣料顺序", prop: "pickOrder" },
+  { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
+  { label: "是否负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
+  { label: "是否保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
+  { label: "是否动态盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
+  { label: "是否领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
+  { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
+  { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
+  { label: "备注", prop: "remark" },
+  { label: "描述", prop: "description" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 库位零件关系 20230331
+export const ItemStoreRelation = [
+  {
+    label: "物品代码",
+    prop: "itemCode",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "仓库代码", prop: "warehouseCode" },
+  { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
+  { label: "值", prop: "storeValue" },
+  { label: "是否可用", prop: "enabled", type: "filter", filters: "whetherOrNot" },
+  { label: "主存储容量", prop: "umQty" },
+  { label: "主存储单位", prop: "storeUM" },
+  { label: "次要存储容量", prop: "altUmQty" },
+  { label: "次要存储单位", prop: "altUm" },
+  { label: "存储单位", prop: "pramaryUM", type: "filter", filters: "pramaryUm" },
+  { label: "是否定制位置", prop: "isFixed", type: "filter", filters: "whetherOrNot" },
+  { label: "是否占用多库位", prop: "multiLoc", type: "filter", filters: "whetherOrNot" },
+  { label: "库位代码", prop: "locationCode" },
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 库位可用容量信息 20230331
+export const InventoryLocationCapacity = [
+  {
+    label: "库位代码",
+    prop: "locationCode",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "可用容量(%)", prop: "availableCapacity" },
+  { label: "是否无穷大", prop: "isInfinity", type: "filter", filters: "whetherOrNot" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "备注", prop: "remark" },
+  { label: "已用容量", prop: "usedCapacity" },
+  { label: "可承受过载容量", prop: "bearableOverloadCapacity" },
+  { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 物品安全库存信息 20230328
+export const ItemSafetyStock = [
+  {
+    label: "物品代码",
+    prop: "itemCode",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "仓库代码", prop: "warehouseCode" },
+  { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
+  { label: "存储关系代码", prop: "storeValue" },
+  { label: "最大库存", prop: "maxStock" },
+  { label: "最小库存", prop: "minStock" },
+  { label: "安全库存", prop: "safetyStock" },
+  { label: "补料点", prop: "feedLine" },
+  { label: "补料数量", prop: "feedQty" },
+  { label: "补料单位", prop: "feedUM" },
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 事务类型信息 20230328
+export const TransactionType = [
+  {
+    label: "事务ID",
+    prop: "id",
+    fixed: "left",
+    type: "name", 
+    showProp: true
+  },
+  { label: "事务类型", prop: "transType", type: "filter", filters: "TransTypeBase" },
+  { label: "事务子类型", prop: "transSubType", type: "filter", filters: "transSubType" },
+  { label: "入库库位类型", prop: 'inLocationTypes', type: "filterList", filters: "locationType", width: "300px" },
+  { label: "出库库位类型", prop: 'outLocationTypes', type: "filterList", filters: "locationType", width: "300px" },
+  { label: "物品状态", prop: 'itemStatuses', type: "filterList", filters: "ItemStatus" },
+  { label: "物品类型", prop: 'itemTypes', type: "filterList", filters: "ItemType" },
+  { label: "来源库存状态", prop: 'outInventoryStatuses', type: "filterList", filters: "inventoryStage" }, 
+  { label: "目标库存状态", prop: 'inInventoryStatuses', type: "filterList", filters: "inventoryStage" },
+  { label: "是否可用", prop: 'enabled', type: "filter", filters: "whetherOrNot" },
+  // { label: "入库库区列表", prop: 'inLocationAreas', type: "filterList", filters: "inventoryStage" },
+  // { label: "出库库区列表", prop: 'outLocationAreas', type: "filterList", filters: "inventoryStage" },
+  { label: "入库库区列表", prop: 'inLocationAreas' },
+  { label: "出库库区列表", prop: 'outLocationAreas' },
+  { label: "创建时间", prop: "creationTime", type:'dateTime' },
+  { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
+  { label: "备注", prop: "remark" },
+  { label: "描述", prop: "description" },
+  // ************** 确认隐藏 ************************
+  // { label: "自动提交审批", prop: 'autoSubmitRequest', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgreeRequest', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandleRequest', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑', 
+  //   buttonName:'edit',
+  //   fixed: "right"
+  // },
+]
+// 车间信息 20230328
+export const Workshop = [
+  {
+    label: "车间代码",
+    fixed: "left",
+    type: "name",
+    prop: "code"
+  },
+  { label: "车间名称", prop: "name" },
+  { label: "描述", prop: "description" },
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 生产线信息 20230328
+export const ProductionLine = [
+  { label: "生产线代码", prop: "code", fixed: "left", type: "name" },
+  { label: "生产线名称", prop: 'name' },
+  { label: "类型", prop: "type" },
+  { label: "车间代码", prop: "workshopCode" },
+  { label: "原料库位", prop: "rawLocationCode" },
+  { label: "成品库位", prop: "productLocationCode" },
+  { label: "原料库位组", prop: "rawLocationGroupCode" },
+  { label: "描述", prop: "description" },
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 生产线零件关系 20230328
+export const ProductionLineItem = [
+  { label: "物品代码", prop: "itemCode", type: "name" },
+  { label: "生产线代码", prop: "prodLineCode" },
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'删除', 
+  //   buttonName:'delete',
+  //   fixed: "right"
+  // },
+]
+// 工作中心信息 20230328
+export const WorkCenter = [
+  {
+    label: "编号",
+    fixed: "left",
+    type: "name",
+    prop: "code"
+  },
+  { label: "生产线", prop: "productionLineCode" },
+  { label: "工作中心类型", prop: "type", type: "filter", filters: "workCenterType" },
+  { label: "名称", prop: "name" },
+  { label: "工作中心描述", prop: "description" },
+  { label: "原料库位", prop: "rawLocationCode" },
+  { label: "成品库位", prop: "productLocationCode" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: "remark" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 班组信息 20230328
+export const Team = [
+  {
+    label: "编号",
+    fixed: "left",
+    type: "name",
+    prop: "code"
+  },
+  { label: "名称", prop: "name" },
+  { label: "描述", prop: "description" },
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "成员", prop: "members" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 班次信息 20230328
+export const Shift = [
+  {
+    label: "班次代码",
+    fixed: "left",
+    type: "name",
+    prop: "code"
+  },
+  { label: "班次名称", prop: "name" },
+  { label: "结束到下一天", prop: "endAtNextDay", type: "filter", filters: "whetherOrNot" },
+  { label: "开始时间", prop: "beginTime", type: "dateTime" },
+  { label: "结束时间", prop: "endTime", type: "dateTime" },
+  { label: "描述", prop: "description" },
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 作业指导书信息 20230328
+export const ItemGuideBook = [
+  {
+    label: "物品代码",
+    prop: "itemCode",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "步骤", prop: "step" },
+  { label: "图片存储名称", prop: "pictureBlobName" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 账期信息 20230328
+export const accountPeriodNote = [
+  {
+    label: "代码",
+    prop: "code",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "启日", prop: "beginTime", type:'dateTime' },
+  { label: "迄日期", prop: "endTime", type:'dateTime' },
+  { label: "最后异动时间", prop: "convertToTime", type:'dateTime' },
+  { label: "名称", prop: "name" },
+  { label: "创建时间", prop: "creationTime", type:'dateTime' },
+  { label: "备注", prop: "remark" },
+  { label: "年", prop: "year" },
+  { label: "月", prop: "month" },
+  { label: "转换生效时间", prop: "convertToTime", type:'dateTime' },
+  { label: "描述", prop: "description" },
+]
+// 字典信息 20230328
+export const Dict = [
+  {
+    label: "字典编号",
+    prop: "code",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "字典名称", prop: "name" },
+  { label: "描述", prop: "description" },
+  { label: "创建时间", prop: "creationTime", type:'dateTime' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: "remark" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 分类信息 20230328
+export const Category = [
+  {
+    label: "分类代码",
+    prop: "code",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "分类名称", prop: "name" },
+  { label: "描述", prop: "description" },
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 计量单位信息 20230328
+export const Uom = [
+  {
+    label: "计量单位编号",
+    prop: "code",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "计量单位名称", prop: "name" },
+  { label: "类型", prop: "type", type: "filter", filters: "uomType" },
+  { label: "描述", prop: "description" },
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 日历信息 20230328
+export const Calendar = [
+  {
+    label: "模块",
+    prop: "module",
+    type: "name",
+    fixed: "left"
+  },
+  { label: "状态", prop: "status", type: "filter", filters: "calendarStatus" },
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "开始时间", prop: "beginTime",type: "dateTime" },
+  { label: "结束时间", prop: "endTime", type: "dateTime" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 配置信息 20230328 暂无接口
+export const Configuration = [
+  {
+    label: "键",
+    fixed: "left",
+    type: "name",
+    prop: "key"
+  },
+  { label: "值", prop: "value" },
+  { label: "描述", prop: "description" },
+  { label: "备注", prop: "remark" },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+// 文档信息 20230328
+export const documentBasic = [
+  {
+    label: "编码",
+    fixed: "left",
+    type: "name",
+    prop: "code",
+    width:"200px"
+  },
+  { label: "名称", prop: "name" },
+  { label: "描述", prop: "description" },
+  { label: "事务类型", type: "filter", prop: "transactionType", filters: "TransTypeBaseForStr" },
+  { label: "单号前缀", prop: "numberPrefix" },
+  { label: "单号格式", prop: "numberFormat" },
+  { label: "单号流水长度", prop: "numberSerialLength" },
+  { label: "单号分隔符", prop: "numberSeparator" },
+  { label: "创建时间", prop: "creationTime", type:'dateTime' },
+  { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
+  { label: "备注", prop: "remark" },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: "creatorId" },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // ************** 确认隐藏 ************************
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
+
+
+// 原料管理
+// 供应商发货通知 20230404
+export const SupplierAsn = [
+  {
+    label: "发货单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "订单号", prop: "poNumber",width: orderWidth },
+  { label: "供应商代码", prop: "supplierCode" },
+  { label: "供应商名称", prop: "supplierName" },
+  { label: "供应商地址", prop: "supplierAddress" },
+  { label: "要求到货日期", prop: "planArriveDate", type: "dateTime" },
+  { label: "发货日期", prop: "shipDate",type: "dateTime" },
+  { label: "订单备注", prop: 'remark' },
+  { label: "操作员", prop: 'worker' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "要货计划单号", prop: 'rpNumber' },
+  { label: "车牌号", prop: 'truckNumber' },
+  { label: "收货口", prop: 'dockCode' },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "联系人姓名", prop: 'contactName' },
+  { label: "联系人电话", prop: 'contactPhone' },
+  { label: "联系人邮件", prop: 'contactEmail' },
+  { label: "到期日期", prop: 'dueDate', type: "dateTime" },
+  { label: "时间窗口", prop: 'timeWindow' },
+  { label: "筹措员代码", prop: 'planUserCode' },
+  // ************** 确认隐藏 ************************
+  // { label: "status", prop: 'status' },
+  // { label: "createType", prop: 'createType' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 采购订单信息 20230404
+export const PurchaseOrder = [
+  {
+    label: "采购订单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "供应商代码", prop: "supplierCode" },
+  { label: "供应商名称", prop: "supplierName" },
+  { label: "供应商地址", prop: "supplierAddress",showProp: true },
+  { label: "订单备注", prop: 'remark' },
+  { label: "创建时间", prop: 'creationTime', type:'dateTime' },
+  { label: "操作员", prop: 'worker' },
+  { label: "联系人姓名", prop: 'contactName' },
+  { label: "联系人电话", prop: 'contactPhone' },
+  { label: "联系人邮件", prop: 'contactEmail' },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "订单类型", prop: 'poType' },
+  { label: "是否寄存订单", prop: 'isConsignment', type: "filter", filters: "whetherOrNot" },
+  { label: "订单日期", prop: 'orderDate',type: "dateTime" },
+  { label: "截止日期", prop: 'dueDate',type: "dateTime" },
+  { label: "版本", prop: 'version' },
+  { label: "税率", prop: 'taxRate' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  // ************** 确认隐藏 ************************
+  // { label: "orderStatus", prop: 'orderStatus' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 到货请求 20230404
+export const PurchaseReceiptRequest = [
+  {
+    label: "到货单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "请求状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+  { label: "订单号", prop: "poNumber",width: orderWidth },
+  { label: "发货单号", prop: 'asnNumber',width: orderWidth },
+  { label: "供应商代码", prop: "supplierCode" },
+  { label: "供应商名称", prop: "supplierName",showProp: true },
+  { label: "供应商地址", prop: "supplierAddress",showProp: true },
+  { label: "计划到货日期", prop: "planArriveDate", type: "dateTime" },
+  { label: "订单备注", prop: 'remark' },
+  { label: "创建时间", prop: 'creationTime', type:'dateTime' },
+  { label: "操作员", prop: 'worker' },
+  { label: "要货计划单号", prop: 'rpNumber',width: orderWidth },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "车牌号", prop: 'truckNumber' },
+  { label: "收货口", prop: 'dockCode' },
+  { label: "时间窗口", prop: 'timeWindow' },
+  // ************** 确认隐藏 ************************
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+]
+// 采购收货任务 20230404
+export const PurchaseReceiptJob =  [
+  {
+    label: "收货任务编号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" },
+  { label: "发货单号", prop: "asnNumber", width: orderWidth },
+  { label: "到货单号", prop: "purchaseReceiptRequestNumber", width: orderWidth },
+  { label: "采购订单号", prop: "poNumber", width: orderWidth },
+  { label: "供应商代码", prop: "supplierCode" },
+  { label: "供应商名称", prop: "supplierName" },
+  { label: "供应商地址", prop: "supplierAddress",showProp: true  },
+  { label: "要求到货日期", prop: "planArriveDate" ,type: "dateTime" },
+  { label: "完成时间", prop: "completeTime",type: "dateTime" },
+  { label: "订单备注", prop: 'remark' },
+  { label: "创建时间", prop: 'creationTime', type:'dateTime' },
+  { label: "操作员", prop: 'worker' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "要货计划单号", prop: 'rpNumber' },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "上游任务编号", prop: 'upStreamJobNumber' },
+  { label: "任务类型", prop: 'jobType' },
+  { label: "优先级", prop: 'priority' },
+  { label: "优先级增量", prop: 'priorityIncrement' },
+  { label: "工作组", prop: 'workGroupCode' },
+  { label: "承接者用户名", prop: 'acceptUserName' },
+  { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+  { label: "完成者用户名", prop: 'completeUserName' },
+  { label: "任务描述", prop: 'jobDescription' },
+  { label: "时间窗口", prop: 'timeWindow' },
+  // ************** 确认隐藏 ************************
+  // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
+  // { label: "完成者ID", prop: 'completeUserId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "承接者ID", prop: 'acceptUserId' },
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "type", prop: 'type' },
+  // ************** 确认隐藏 ************************
+]
+// 采购收货记录 已调整 20230404
+export const PurchaseReceiptNote = [
+  {
+    label: "收货单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth,
+  },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "发货单号", prop: "asnNumber", width:orderWidth },
+  { label: "到货单号", prop: "purchaseReceiptRequestNumber", width:orderWidth },
+  { label: "采购订单号", prop: "poNumber", width:orderWidth },
+  { label: "供应商代码", prop: "supplierCode" },
+  { label: "供应商名称", prop: "supplierName" },
+  { label: "供应商地址", prop: "supplierAddress" },
+  { label: "备注", prop: 'remark' },
+  { label: "收货时间", prop: 'receiveTime',type: "dateTime" },
+  { label: "操作员", prop: 'worker' },
+  { label: "生效日期", prop: "activeDate",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "要货计划单号", prop: 'rpNumber' },
+  { label: "任务代码", prop: 'jobNumber' },
+  // ************** 确认隐藏 ************************
+  // { label: "type", prop: 'type' },
+  // { label: "status", prop: 'status' },
+  // ************** 确认隐藏 ************************
+]
+// 采购收货记录-详情【合格品收货明细】 20230404
+export const qualifiedInfo = [
+  {
+    label: "检验单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态",prop: "purchaseReceiptInspectStatus",  type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "数量", prop: "qty" },
+  { label: "物品单位", prop: "uom" },
+  { label: "批次", prop: "lot" },
+  { label: "箱码", prop: "packingCode" },
+  { label: "ERP库位", prop: "locationErpCode" },
+  { label: "到货日期", prop: "arriveDate",type: "dateTime" },
+  { label: "过期时间", prop: "expireDate",type: "dateTime" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "订单号", prop: "poNumber" },
+  { label: "订单行", prop: "poLine" },
+  { label: "推荐箱码", prop: "recommendPackingCode" },
+  { label: "实际箱码", prop: "handledPackingCode" },
+  { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
+  { label: "实际ERP库位", prop: "handledToLocationErpCode" },
+  { label: "推荐数量", prop: "recommendQty" },
+  { label: "实际数量", prop: "handledQty" },
+  { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" },
+  { label: "实际批次到货日期", prop: "handledArriveDate",type: "dateTime" },
+  { label: "生产时间", prop: "produceDate",type: "dateTime" },
+  { label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" },
+  { label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" },
+  { label: "推荐批次过期时间", prop: "recommendExpireDate",type: "dateTime" },
+  { label: "实际批次过期时间", prop: "handledExpireDate",type: "dateTime" },
+  { label: "库位代码", prop: "locationCode" },
+  { label: "推荐库位", prop: "recommendToLocationCode" },
+  { label: "实际库位", prop: "handledToLocationCode" },
+  { label: "库区", prop: "locationArea" },
+  { label: "推荐库区", prop: "recommendToLocationArea" },
+  { label: "实际库区", prop: "handledToLocationArea" },
+  { label: "库位组", prop: "locationGroup" },
+  { label: "实际库位组", prop: "handledToLocationGroup" },
+  { label: "标包数量", prop: "stdPackQty" },
+  { label: "推荐批次排序", prop: "recommendLot" },
+  { label: "实际批次排序", prop: "handledLot" },
+  { label: "供应商批次", prop: "supplierBatch" },
+  { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
+  { label: "实际批次供应商批次", prop: "handledSupplierBatch" },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "推荐仓库", prop: 'recommendToWarehouseCode' },
+  { label: "实际仓库", prop: 'handledToWarehouseCode' },
+  { label: "备注", prop: 'remark' },
+  { label: "目检照片Json", prop: 'inspectPhotoJson' },
+  { label: "不合格原因代码", prop: 'failedReason' },
+  { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
+  { label: "质量缺陷", prop: "massDefect" },
+  { label: "供应商包装计量单位", prop: "supplierPackUom" },
+  { label: "供应商包装数量", prop: "supplierPackQty" },
+  // ************** 确认隐藏 ************************
+  // { label: "status", prop: 'status' },
+  // ************** 确认隐藏 ************************
+]
+// 采购收货记录-详情【不合格品收货明细】 20230404
+export const unqualifiedInfo = [
+  {
+    label: "检验单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "数量", prop: "qty" },
+  { label: "物品单位", prop: "uom" },
+  { label: "箱码", prop: "packingCode" },
+  { label: "ERP库位", prop: "locationErpCode" },
+  { label: "不合格原因代码", prop: 'failedReason' },
+  { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
+  { label: "质量缺陷", prop: "massDefect" },
+  { label: "到货日期", prop: "arriveDate",type: "dateTime" },
+  { label: "过期时间", prop: "expireDate",type: "dateTime" },
+  { label:"查看照片",type:"button", fixed: "right",tableAlign:"center",tableHeaderAlign:"center" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "订单号", prop: "poNumber" },
+  { label: "订单行", prop: "poLine" },
+  { label: "推荐箱码", prop: "recommendPackingCode" },
+  { label: "实际箱码", prop: "handledPackingCode" },
+  { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
+  { label: "实际ERP库位", prop: "handledToLocationErpCode" },
+  { label: "推荐数量", prop: "recommendQty" },
+  { label: "实际数量", prop: "handledQty" },
+  { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" },
+  { label: "实际批次到货日期", prop: "handledArriveDate",type: "dateTime" },
+  { label: "生产时间", prop: "produceDate",type: "dateTime" },
+  { label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" },
+  { label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" },
+  { label: "推荐批次过期时间", prop: "recommendExpireDate",type: "dateTime" },
+  { label: "实际批次过期时间", prop: "handledExpireDate",type: "dateTime" },
+  { label: "库位代码", prop: "locationCode" },
+  { label: "推荐库位", prop: "recommendToLocationCode" },
+  { label: "实际库位", prop: "handledToLocationCode" },
+  { label: "库区", prop: "locationArea" },
+  { label: "推荐库区", prop: "recommendToLocationArea" },
+  { label: "实际库区", prop: "handledToLocationArea" },
+  { label: "库位组", prop: "locationGroup" },
+  { label: "实际库位组", prop: "handledToLocationGroup" },
+  { label: "标包数量", prop: "stdPackQty" },
+  { label: "批次排序", prop: "lot" },
+  { label: "推荐批次排序", prop: "recommendLot" },
+  { label: "实际批次排序", prop: "handledLot" },
+  { label: "供应商批次", prop: "supplierBatch" },
+  { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
+  { label: "实际批次供应商批次", prop: "handledSupplierBatch" },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "推荐仓库", prop: 'recommendToWarehouseCode' },
+  { label: "实际仓库", prop: 'handledToWarehouseCode' },
+  { label: "备注", prop: 'remark' },
+  { label: "目检照片Json", prop: 'inspectPhotoJson' },
+  { label: "供应商包装计量单位", prop: "supplierPackUom" },
+  { label: "供应商包装数量", prop: "supplierPackQty" },
+  // ************** 确认隐藏 ************************
+  // { label: "status", prop: 'status' },
+  // ************** 确认隐藏 ************************
+]
+// 采购收货记录-详情【收货缺料明细】 20230404
+export const lackMaterialsInfo = [
+  { label: "物品代码", prop: "itemCode",fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "批次", prop: "lot" },
+  { label: "ERP库位", prop: "locationErpCode" },
+  { label: "单据号", prop: "number" },
+  { label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "订单号", prop: "poNumber" },
+  { label: "订单行", prop: "poLine" },
+  { label: "箱码", prop: "packingCode" },
+  { label: "推荐箱码", prop: "recommendPackingCode" },
+  { label: "实际箱码", prop: "handledPackingCode" },
+  { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
+  { label: "实际ERP库位", prop: "handledToLocationErpCode" },
+  { label: "物品单位", prop: "uom" },
+  { label: "数量", prop: "qty" },
+  { label: "推荐数量", prop: "recommendQty" },
+  { label: "实际数量", prop: "handledQty" },
+  { label: "到货日期", prop: "arriveDate",type: "dateTime" },
+  { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" },
+  { label: "实际批次到货日期", prop: "handledArriveDate",type: "dateTime" },
+  { label: "生产时间", prop: "produceDate",type: "dateTime" },
+  { label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" },
+  { label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" },
+  { label: "过期时间", prop: "expireDate",type: "dateTime" },
+  { label: "推荐批次过期时间", prop: "recommendExpireDate",type: "dateTime" },
+  { label: "实际批次过期时间", prop: "handledExpireDate",type: "dateTime" },
+  { label: "库位代码", prop: "locationCode" },
+  { label: "推荐库位", prop: "recommendToLocationCode" },
+  { label: "实际库位", prop: "handledToLocationCode" },
+  { label: "库区", prop: "locationArea" },
+  { label: "推荐库区", prop: "recommendToLocationArea" },
+  { label: "实际库区", prop: "handledToLocationArea" },
+  { label: "库位组", prop: "locationGroup" },
+  { label: "实际库位组", prop: "handledToLocationGroup" },
+  { label: "标包数量", prop: "stdPackQty" },
+  { label: "推荐批次排序", prop: "recommendLot" },
+  { label: "实际批次排序", prop: "handledLot" },
+  { label: "供应商批次", prop: "supplierBatch" },
+  { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
+  { label: "实际批次供应商批次", prop: "handledSupplierBatch" },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "推荐仓库", prop: 'recommendToWarehouseCode' },
+  { label: "实际仓库", prop: 'handledToWarehouseCode' },
+  { label: "备注", prop: 'remark' },
+  { label: "目检照片Json", prop: 'inspectPhotoJson' },
+  { label: "不合格原因代码", prop: 'failedReason' },
+  { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
+  { label: "质量缺陷", prop: "massDefect" },
+  { label: "供应商包装计量单位", prop: "supplierPackUom" },
+  { label: "供应商包装数量", prop: "supplierPackQty" },
+  // ************** 确认隐藏 ************************
+  // { label: "status", prop: 'status' },
+  // ************** 确认隐藏 ************************
+]
+// 报检单 20230410
+export const InspectRequest =  [
+  {
+    label: "检验单号",
+    prop: "inspectNumber",
+    fixed: "left",
+    type: "name",
+  },
+  { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" },
+  { label: "单据号", prop: 'number', width: orderWidth },
+  { label: "操作员", prop: "worker" },
+  { label: "采购订单号", prop: "poNumber",width: orderWidth },
+  { label: "发货单号", prop: "asnNumber",width: orderWidth },
+  { label: "收货单号", prop: "receiptNumber",width: orderWidth },
+  { label: "到货单号", prop: 'purchaseReceiptRequestNumber' },
+  { label: "供应商代码", prop: "supplierCode" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "要货计划单号", prop: 'rpNumber' },
+  { label: "上游任务编号", prop: 'upStreamJobNumber' },
+  { label: "任务类型", prop: 'jobType' },
+  { label: "优先级", prop: 'priority' },
+  { label: "优先级增量", prop: 'priorityIncrement' },
+  { label: "工作组", prop: 'workGroupCode' },
+  { label: "承接者用户名", prop: 'acceptUserName' },
+  { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+  { label: "完成者用户名", prop: 'completeUserName' },
+  { label: "完成时间", prop: 'completeTime', type: "dateTime" },
+  { label: "任务描述", prop: 'jobDescription' },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "完成者ID", prop: 'completeUserId' },
+  // { label: "承接者ID", prop: 'acceptUserId' },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
+  // { label: "nextAction", prop: 'nextAction' },
+  // ************** 确认隐藏 ************************
+]
+// 检验记录 20230407
+export const InspectNote = [
+  {
+    label: "检验单号",
+    prop: "inspectNumber",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "单据号", prop: 'number',width: orderWidth },
+  { label: "到货单号", prop: 'purchaseReceiptRequestNumber' },
+  { label: "采购订单号", prop: "poNumber" ,width: orderWidth },
+  { label: "发货单号", prop: "asnNumber",width: orderWidth },
+  { label: "收货单号", prop: "receiptNumber",width: orderWidth },
+  { label: "供应商代码", prop: "supplierCode" },
+  { label: "筹措员代码", prop: "worker" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "要货计划单号", prop: 'rpNumber',width: orderWidth },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "检验规则", prop: 'nextAction',type: "filter", filters: "nextAction" },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "ID", prop: 'id' },
+  // ************** 确认隐藏 ************************
+]
+// 不合格库存（不合格转合格） 已调整
+export const unqualifiedToQualified = [
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "数量", prop: "qty" },
+  { label: "单位", prop: "uom" },
+  { label: "批次", prop: "lot" },
+  { label: "箱码", prop: "packingCode" },
+  { label: "库位", prop: 'locationCode' },
+  { label: "入库时间", prop: 'putInTime',type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "ERP库位", prop: "locationErpCode" },
+  { label: "标包数量", prop: "stdPackQty" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "供应商批次", prop: 'supplierBatch' },
+  { label: "到货日期", prop: 'arriveDate', type: "dateTime" },
+  { label: "生产时间", prop: 'produceDate', type: "dateTime" },
+  { label: "过期时间", prop: 'expireDate', type: "dateTime" },
+  { label: "序号", prop: 'serialNumber' },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "库位组", prop: 'locationGroup' },
+  { label: "库区", prop: 'locationArea' },
+  { label: "最后盘点时间", prop: 'lastCountTime' },
+  { label: "最后盘点计划", prop: 'lastCountPlanNumber' },
+  { label: "最后盘点标签", prop: 'lastCountLabel' },
+  { label: "是否可用", prop: 'isActive' },
+  { label: "最后事务号", prop: 'lastTransNumber' },
+  { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "ID", prop: 'id' },
+  // { label: "manageType", prop: 'manageType' },
+  // { label: "status", prop: 'status' },
+  // ************** 确认隐藏 ************************
+]
+// 不合格转合格记录 已调整 20230407
+export const unqualifiedToQualifiedNote = [
+  {
+    label: "转合格单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+]
+// 采购上架记录 20230410
+export const PutawayNote =  [
+  {
+    label: "上架记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    fixed: "left",
+    width: orderWidth
+  },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "操作员", prop: 'worker' },
+  { label: "备注", prop: 'remark' },
+  { label: "任务单号", prop: 'jobNumber',width: orderWidth },
+  { label: "到货单号", prop: "purchaseReceiptRequestNumber", width: orderWidth },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "供应商代码", prop: 'supplierCode' },
+  { label: "检验单号", prop: 'inspectNumber' },
+  { label: "收货单号", prop: 'receiptNumber' },
+  { label: "发货单号", prop: 'asnNumber' },
+  { label: "要货计划单号", prop: 'rpNumber' },
+  { label: "完工收货单号", prop: 'productReceiptNumber' },
+  // ************** 确认隐藏 ************************
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "type", prop: 'type' },
+  // ************** 确认隐藏 ************************
+]
+// 人工叫料申请 20230411
+export const IssueRequest =  [
+  {
+    label: "叫料申请编号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "备注", prop: 'remark' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "叫料类型", prop: 'type' },
+  { label: "备料计划单号", prop: 'preparationPlanNumber',width: orderWidth },
+  { label: "生产线", prop: 'prodLine' },
+  { label: "车间", prop: 'workshop' },
+  { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 人工发料任务  20230411
+export const IssueJob =  [
+  {
+    label: "发料任务编号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+  { label: "申请单号", prop: "materialRequestNumber",width: orderWidth },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "完成时间", prop: "completeTime", type: "dateTime" },
+  { label: "操作员", prop: 'worker' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "上游任务编号", prop: 'upStreamJobNumber' },
+  { label: "任务类型", prop: 'jobType' },
+  { label: "优先级", prop: 'priority' },
+  { label: "优先级增量", prop: 'priorityIncrement' },
+  { label: "工作组", prop: 'workGroupCode' },
+  { label: "承接者用户名", prop: 'acceptUserName' },
+  { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+  { label: "完成者用户名", prop: 'completeUserName' },
+  { label: "任务描述", prop: 'jobDescription' },
+  { label: "叫料请求类型", prop: 'requestType' },
+  { label: "生产线", prop: 'prodLine' },
+  { label: "车间", prop: 'workshop' },
+  { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+  // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "承接者ID", prop: 'acceptUserId' },
+  // { label: "完成者", prop: 'completeUserId' },
+  // ************** 确认隐藏 ************************
+]
+// 人工发料记录 20230411
+export const IssueNote =  [
+  {
+    label: "发料记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "申请单号", prop: 'requestNumber',width: orderWidth },
+  { label: "任务单号", prop: 'jobNumber',width: orderWidth },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "操作员", prop: 'worker' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "生效日期", prop: 'activeDate',type: "dateTime" },
+  { label: "车间", prop: 'workshop' },
+  { label: "叫料请求类型", prop: 'requestType' },
+  { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
+  { label: "确认时间", prop: 'confirmTime' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 自动叫料申请 20230411
+export const automaticCallApply =  [
+  {
+    label: "叫料申请编号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "备注", prop: 'remark' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "叫料类型", prop: 'type' },
+  { label: "备料计划单号", prop: 'preparationPlanNumber',width: orderWidth },
+  { label: "生产线", prop: 'prodLine' },
+  { label: "车间", prop: 'workshop' },
+  { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 自动发料任务 20230411
+export const automaticCallJob =  [
+  {
+    label: "发料任务编号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+  { label: "申请单号", prop: "materialRequestNumber",width: orderWidth },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "完成时间", prop: "completeTime", type: "dateTime" },
+  { label: "操作员", prop: 'worker' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "上游任务编号", prop: 'upStreamJobNumber' },
+  { label: "任务类型", prop: 'jobType' },
+  { label: "优先级", prop: 'priority' },
+  { label: "优先级增量", prop: 'priorityIncrement' },
+  { label: "工作组", prop: 'workGroupCode' },
+  { label: "承接者用户名", prop: 'acceptUserName' },
+  { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+  { label: "完成者用户名", prop: 'completeUserName' },
+  { label: "任务描述", prop: 'jobDescription' },
+  { label: "叫料请求类型", prop: 'requestType' },
+  { label: "生产线", prop: 'prodLine' },
+  { label: "车间", prop: 'workshop' },
+  { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+  // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "承接者ID", prop: 'acceptUserId' },
+  // { label: "完成者ID", prop: 'completeUserId' },
+  // ************** 确认隐藏 ************************
+]
+// 自动发料记录 20230411
+export const automaticCallNote =  [
+  {
+    label: "发料记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "申请单号", prop: 'requestNumber',width: orderWidth },
+  { label: "任务单号", prop: 'jobNumber',width: orderWidth },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "操作员", prop: 'worker' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "生效日期", prop: 'activeDate',type: "dateTime" },
+  { label: "车间", prop: 'workshop' },
+  { label: "叫料请求类型", prop: 'requestType' },
+  { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
+  { label: "确认时间", prop: 'confirmTime' },
+  // ************** 确认隐藏 ************************
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "创建者ID", prop: 'creatorId' },
+  // ************** 确认隐藏 ************************
+]
+// 上架前退货记录 20230412
+export const beforeGroundingReturnNote = [
+  {
+    label: "退货单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "发货单号", prop: "asnNumber",width: orderWidth },
+  { label: "收货单号", prop: "rpNumber", width: orderWidth },
+  { label: "供应商代码", prop: "supplierCode" },
+  { label: "退货时间", prop: "returnTime",type: "dateTime" },
+  { label: "操作员", prop: 'worker' },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "任务单号", prop: 'jobNumber' },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "订单号", prop: 'poNumber' },
+  { label: "退货请求单号", prop: 'purchaseReturnRequestNumber' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "returnType", prop: 'returnType' },
+  // { label: "status", prop: 'status' },
+  // ************** 确认隐藏 ************************
+]
+// 上架后退货申请 20230412
+export const PurchaseReturnRequest =  [
+  { label: "退货申请单号", 
+    prop: "number",
+    fixed: "left",
+    type: "name", 
+    width: orderWidth
+  },
+  { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
+  { label: "创建时间", prop: "creationTime",type:"dateTime" },
+  { label: "发货单号", prop: "asnNumber", width: orderWidth },
+  { label: "订单号", prop: "poNumber",width: orderWidth },
+  { label: "供应商代码", prop: "supplierCode" },
+  { label: "退货时间", prop: "returnTime", type:"dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "备注", prop: 'remark' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "收货单号", prop: 'rpNumber' },
+  // ************** 确认隐藏 ************************
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "returnType", prop: 'returnType' },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "returnType", prop: 'returnType' },
+  // ************** 确认隐藏 ************************
+]
+// 上架后退货任务 20230412
+export const PurchaseReturnJob =  [
+  {
+    label: "退货任务编号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" },
+  { label: "退货申请单号", prop: "purchaseReturnRequestNumber",width: orderWidth },
+  { label: "发货单号", prop: "asnNumber", width: orderWidth },
+  { label: "订单号", prop: "poNumber",width: orderWidth },
+  { label: "退货时间", prop: "returnTime", type:"dateTime" },
+  { label: "退货原因代码", prop: 'returnReason' },
+  { label: "退货原因说明", prop: 'returnReason', type: "filter", filters: "getDict" , dictType:"PurReturnReason" },
+  { label: "操作员", prop: "worker" },
+  { label: "创建时间", prop: "creationTime",type:"dateTime" },
+  { label: "供应商代码", prop: "supplierCode" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "上游任务编号", prop: 'upStreamJobNumber' },
+  { label: "任务类型", prop: 'jobType' },
+  { label: "优先级", prop: 'priority' },
+  { label: "优先级增量", prop: 'priorityIncrement' },
+  { label: "工作组", prop: 'workGroupCode' },
+  { label: "承接者用户名", prop: 'acceptUserName' },
+  { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+  { label: "完成者用户名", prop: 'completeUserName' },
+  { label: "完成时间", prop: 'completeTime', type: "dateTime" },
+  { label: "任务描述", prop: 'jobDescription' },
+  { label: "收货单号", prop: 'rpNumber' },
+  // ************** 确认隐藏 ************************
+  // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "承接者ID", prop: 'acceptUserId' },
+  // { label: "完成者", prop: 'completeUserId' },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 上架后退货记录 20230412
+export const PurchaseReturnNote = [
+  {
+    label: "退货记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "订单号", prop: "poNumber",width: orderWidth },
+  { label: "发货单号", prop: "asnNumber", width: orderWidth },
+  { label: "供应商代码", prop: "supplierCode" },
+  { label: "退货时间", prop: "returnTime", type:"dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "创建时间", prop: "creationTime",type:"dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "生效日期", prop: 'activeDate',type: "dateTime" },
+  { label: "任务单号", prop: 'jobNumber',width: orderWidth },
+  { label: "收货单号", prop: 'rpNumber',width: orderWidth },
+  { label: "退货请求单号", prop: 'purchaseReturnRequestNumber',width: orderWidth },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "returnType", prop: 'returnType' },
+  // { label: "status", prop: 'status' },
+  // ************** 确认隐藏 ************************
+]
+// 原料报废记录 20230412
+export const ScrapNote =  [
+  {
+    label: "报废记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "报废日期", prop: "activeDate",type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "报废类型", prop: 'type' },
+  { label: "报废请求单号", prop: 'scrapRequestNumber',width: orderWidth },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "任务ID", prop: 'jobNumber' },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 原料直发客户记录 20230412
+export const materialDirectSendNote =  [
+  {
+    label: "发货单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "发货日期", prop: "deliverTime",type: "dateTime" },
+  { label: "客户代码", prop: 'customerCode' },
+  { label: "客户地址", prop: 'customerAddressCode' },
+  { label: "操作员", prop: "worker" },
+  { label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "发货计划单号", prop: 'deliverPlanNumber',width: orderWidth },
+  { label: "发货申请单号", prop: 'deliverRequestNumber',width: orderWidth },
+  { label: "发货类型", prop: "deliverRequestType",type: "filter", filters: "deliverRequestType" },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "任务ID", prop: 'jobNumber',width: orderWidth },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 直接发料记录 20230413
+export const directIssueNote =  [
+  {
+    label: "发料记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "申请单号", prop: 'requestNumber',width: orderWidth },
+  { label: "任务单号", prop: 'jobNumber',width: orderWidth },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "操作员", prop: 'worker' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "生效日期", prop: 'activeDate',type: "dateTime" },
+  { label: "车间", prop: 'workshop' },
+  { label: "叫料请求类型", prop: 'requestType' },
+  { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
+  { label: "确认时间", prop: 'confirmTime' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+
+// 成品管理
+/**/
+// 完工收货缴库申请 20230415
+export const ProductReceiptRequest =  [
+  {
+    label: "缴库申请单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "操作员", prop: 'worker' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "生产计划编号", prop: 'productionPlanNumber' },
+  { label: "车间", prop: 'workshop' },
+  { label: "生产线", prop: 'prodLine' },
+  { label: "班次", prop: 'shift' },
+  { label: "班组", prop: 'team' },
+  { label: "计划日期", prop: 'planDate' },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "type", prop: 'type' },
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+]
+// 完工收货缴库记录 20230413
+export const ProductReceiptNote =  [
+  {
+    label: "缴库记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "操作员", prop: 'worker' },
+  { label: "生效日期", prop: 'activeDate',type: "dateTime" },
+  { label: "完工时间", prop: 'completeTime',type: "dateTime" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "上级关联菜单号", prop: 'sourceNumber',width: orderWidth },
+  { label: "生产计划单号", prop: 'productionPlanNumber',width: orderWidth },
+  { label: "车间", prop: 'workShop' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "任务ID", prop: 'jobNumber',width: orderWidth },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "type", prop: 'type' },
+  // { label: "receiptType", prop: 'receiptType' },
+  // ************** 确认隐藏 ************************
+]
+// 完工收货报废申请 20230412
+export const ProductReceiptScrapRequest =  [
+  {
+    label: "报废申请单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus", },
+  { label: "操作员", prop: 'worker' },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+ { label: "报废类型", prop: 'type' },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" }, 
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+]
+
+// 完工收货报废记录 20230412
+export const ProductReceiptScrapNote =  [
+  {
+    label: "报废记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "报废日期", prop: "activeDate",type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "报废类型", prop: 'type' },
+  { label: "报废请求单号", prop: 'scrapRequestNumber',width: orderWidth },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "任务ID", prop: 'jobNumber' },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 半成品上架记录 20230415
+export const partiallyPreparedProductsNote =  [
+  {
+    label: "上架记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    fixed: "left",
+    width: orderWidth
+  },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "操作员", prop: 'worker' },
+  { label: "备注", prop: 'remark' },
+  { label: "任务单号", prop: 'jobNumber',width: orderWidth },
+  { label: "到货单号", prop: "purchaseReceiptRequestNumber", width: orderWidth },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "供应商代码", prop: 'supplierCode' },
+  { label: "检验单号", prop: 'inspectNumber' },
+  { label: "收货单号", prop: 'receiptNumber' },
+  { label: "发货单号", prop: 'asnNumber' },
+  { label: "要货计划单号", prop: 'rpNumber' },
+  { label: "完工收货单号", prop: 'productReceiptNumber' },
+  // ************** 确认隐藏 ************************
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "type", prop: 'type' },
+  // ************** 确认隐藏 ************************
+]
+// 成品发货申请 20230414
+export const DeliverRequest = [
+  {
+    label: "发货申请单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态",prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+  { label: "发货时间", prop: "deliverTime",type: "dateTime" },
+  { label: "客户代码", prop: "customerCode" },
+  { label: "操作员", prop: 'worker' },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "发货计划单号", prop: 'deliverPlanNumber' },
+  { label: "客户地址", prop: 'customerAddressCode' },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+]
+// 成品发货任务 20230414
+export const DeliverJob =  [
+  {
+    label: "发货任务编号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "发货申请单号", prop: "deliverRequestNumber",width:orderWidth },
+  { label: "发货时间", prop: "deliverTime",type: "dateTime" },
+  { label: "客户代码", prop: "customerCode" },
+  { label: "操作员", prop: 'worker' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "上游任务编号", prop: 'upStreamJobNumber' },
+  { label: "任务类型", prop: 'jobType' },
+  { label: "优先级", prop: 'priority' },
+  { label: "优先级增量", prop: 'priorityIncrement' },
+  { label: "工作组", prop: 'workGroupCode' },
+  { label: "承接者用户名", prop: 'acceptUserName' },
+  { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+  { label: "完成者用户名", prop: 'completeUserName' },
+  { label: "完成时间", prop: 'completeTime', type: "dateTime" },
+  { label: "任务描述", prop: 'jobDescription' },
+  { label: "客户地址", prop: 'customerAddressCode' },
+  { label: "发货计划单号", prop: 'deliverPlanNumber' },
+  // ************** 确认隐藏 ************************
+  // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "承接者ID", prop: 'acceptUserId' },
+  // { label: "完成者ID", prop: 'completeUserId' },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 成品发货记录 20230414
+export const DeliverNote =  [
+  {
+    label: "发货记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "发货申请单号", prop: "deliverRequestNumber",width:orderWidth },
+  { label: "发货时间", prop: "deliverTime",type: "dateTime" },
+  { label: "客户代码", prop: "customerCode" },
+  { label: "操作员", prop: 'worker' },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "发货任务单号", prop: "jobNumber", width:orderWidth },
+  { label: "备注", prop: 'remark' },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "客户地址", prop: 'customerAddressCode' },
+  { label: "发货计划单号", prop: 'deliverPlanNumber' },
+  { label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType" },
+  { label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // ************** 确认隐藏 ************************
+]
+// FIS发货申请 20230414
+export const FISDeliverRequest =  [
+  {
+    label: "发货申请单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "发货时间", prop: "deliverTime", type: "dateTime" },
+  { label: "客户代码", prop: "customerCode" },
+  { label: "操作员", prop: 'worker' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "发货计划单号", prop: 'deliverPlanNumber' },
+  { label: "客户地址", prop: 'customerAddressCode' },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+]
+// FIS发货记录 20230415
+export const FISDeliverNote =  [
+  {
+    label: "发货记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "发货申请单号", prop: "deliverRequestNumber",width:orderWidth },
+  { label: "发货时间", prop: "deliverTime",type: "dateTime" },
+  { label: "客户代码", prop: "customerCode" },
+  { label: "操作员", prop: 'worker' },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "发货任务单号", prop: "jobNumber", width:orderWidth },
+  { label: "备注", prop: 'remark' },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "客户地址", prop: 'customerAddressCode' },
+  { label: "发货计划单号", prop: 'deliverPlanNumber' },
+  { label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType" },
+  { label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 客户退拆申请 20230415
+export const customerDismantle = [
+  {
+    label: "退拆申请单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" },
+  { label: "操作员", prop: "worker" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "班次", prop: 'shift' },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "车间", prop: 'workshop' },
+  // ************** 确认隐藏 ************************
+  // { label: "ID", prop: 'id' },
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+]
+// 客户退拆记录 20230415
+export const customerDismantleNote = [
+  {
+    label: "退拆记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "班次", prop: 'shift' },
+  { label: "车间", prop: 'workshop' },
+  { label: "回收时间", prop: "recycleTime",type: "dateTime" },
+  { label: "生效时间", prop: "activeDate",type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "申请编号", prop: 'requestNumber', width:orderWidth },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 客户退拆记录-明细【即回冲记录】 20230415
+export const customerDismantleBackFlushNote = [
+  { label: "退拆物品号", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "预定开工日", prop: "preStartTime" ,type: "dateTime", },
+  { label: "退拆数量", prop: "qty" },
+  { label: "扣账库位", prop: 'locationCode' },
+  { label: "转移工时", prop: 'workHour' },
+  { label: "缴库库位", prop: 'rawLocationCode' },
+  { label: "转移料号（子零件号）", prop: 'rawItemCode' },
+  { label: "转移量（子零件）", prop: 'rawQty' },
+]
+// 生产退库申请 20230415
+export const productionReturnRequest =  [
+  { 
+    label: "退库申请单号", 
+    prop: "number",
+    type: "name", 
+    fixed: "left",
+    width: orderWidth
+  },
+  { label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" },
+  { label: "操作员", prop: 'worker' },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+]
+// 生产退库任务 20230415
+export const productionReturnJob =  [
+  { 
+    label: "退库任务单号", 
+    prop: "number",
+    type: "name", 
+    fixed: "left",
+    width: orderWidth
+  },
+  { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "退库单号", prop: "productionReturnRequestNumber", width:orderWidth },
+  { label: "操作员", prop: 'worker' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "上游任务编号", prop: 'upStreamJobNumber',width:orderWidth },
+  { label: "任务类型", prop: 'jobType' },
+  { label: "优先级", prop: 'priority' },
+  { label: "优先级增量", prop: 'priorityIncrement' },
+  { label: "工作组", prop: 'workGroupCode' },
+  { label: "承接者用户名", prop: 'acceptUserName' },
+  { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+  { label: "完成者用户名", prop: 'completeUserName' },
+  { label: "完成时间", prop: 'completeTime', type: "dateTime" },
+  { label: "任务描述", prop: 'jobDescription' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "承接者ID", prop: 'acceptUserId' },
+  // { label: "完成者ID", prop: 'completeUserId' },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+]
+// 生产退库记录 20230413
+export const productionReturnNote =  [
+  { 
+    label: "退库记录单号", 
+    prop: "number",
+    type: "name", 
+    fixed: "left",
+    width: orderWidth
+  },
+  { label: "退库单号", prop: "productionReturnRequestNumber", width:orderWidth },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "操作员", prop: 'worker' },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "退料时间", prop: 'returnTime', type: "dateTime" },
+  { label: "任务单号", prop: 'jobNumber', width:orderWidth },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 线边仓缴库申请 20230415
+export const lineSideWarehousePaymentRequest =  [
+  {
+    label: "缴库申请单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "操作员", prop: 'worker' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "生产计划编号", prop: 'productionPlanNumber' },
+  { label: "车间", prop: 'workshop' },
+  { label: "生产线", prop: 'prodLine' },
+  { label: "班次", prop: 'shift' },
+  { label: "班组", prop: 'team' },
+  { label: "计划日期", prop: 'planDate' },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // { label: "type", prop: 'type' },
+  // ************** 确认隐藏 ************************
+]
+// 线边仓缴库记录 20230415
+export const lineSideWarehousePaymentNote =  [
+  {
+    label: "缴库记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "操作员", prop: 'worker' },
+  { label: "生效日期", prop: 'activeDate',type: "dateTime" },
+  { label: "完工时间", prop: 'completeTime',type: "dateTime" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "上级关联菜单号", prop: 'sourceNumber',width: orderWidth },
+  { label: "生产计划单号", prop: 'productionPlanNumber',width: orderWidth },
+  { label: "车间", prop: 'workShop' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "任务ID", prop: 'jobNumber',width: orderWidth },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "type", prop: 'type' },
+  // { label: "receiptType", prop: 'receiptType' },
+  // ************** 确认隐藏 ************************
+]
+// 线边仓报废申请 20230412
+export const lineSideWarehouseScrappingRequest =  [
+  {
+    label: "报废申请单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus", },
+  { label: "操作员", prop: 'worker' },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "报废类型", prop: 'type' },
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+]
+// 线边仓报废记录 20230412
+export const lineSideWarehouseScrappingNote =  [
+  {
+    label: "报废记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "报废日期", prop: "activeDate",type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "报废请求单号", prop: 'scrapRequestNumber',width: orderWidth },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "任务ID", prop: 'jobNumber' },
+  // { label: "报废类型", prop: 'type' },
+  // ************** 确认隐藏 ************************
+]
+
+// 标签管理
+/**/
+// 标签查询 20230410
+export const labelsList =  [
+  { 
+    label: "箱码", 
+    prop: "code",
+    type: "name",
+    fixed:"left" 
+  },
+  { label: "物品代码",  prop: 'itemCode' },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "数量", prop: "qty" },
+  { label: "单位", prop: "uom" },
+  { label: "批次", prop: "lot" },
+  { label: "库位", prop: "recommendLocationCode" },
+  { label: "ERP库位", prop: "locationErpCode" },
+  { label: "创建时间", prop: "creationTime",type:"dateTime" },
+  { label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" },
+  { label: "备注", prop: "remark" },
+  { label: "到达时间", prop: "arriveDate",type:"dateTime" },
+  { label: "生产时间", prop: "produceDate",type:"dateTime" },
+  { label: "过期时间", prop: "expireDate",type:"dateTime" },
+  { label: "采购单号", prop: "asnNumber",width:orderWidth },
+  { label: "要货计划单号", prop: "rpNumber",width:orderWidth },
+  { label: "订单号", prop: "poNumber" },
+  { label: "供应商代码", prop: 'supplierCode' },
+  { label: "供应商名称", prop: 'supplierName' },
+  { label: "供应商简称", prop: 'supplierSimpleName' },
+  { label: "供应商物品代码", prop: "supplierItemCode" },
+  { label: "供应商物品名称", prop: 'supplierItemName' },
+  { label: "上次修改时间", prop: "lastModificationTime",type:"dateTime" },
+  { label: "完整条码文本", prop: "fullBarcodeString" },
+  { label: "供应商批次", prop: 'supplierBatch' },
+  { label: "标包数量", prop: 'stdPackQty' },
+  { label: "器具号", prop: 'containerCode' },
+  { label: "质量级别", prop: "qLevel" },
+  { label: "质检文件", prop: "qualityFile" },
+  { label: "生产线", prop: 'prodLine' },
+  { label: "班组", prop: 'team' },
+  { label: "班次", prop: 'shift' },
+  { label: "规格", prop: "specifications" },
+  { label: "labelStatus", prop: "labelStatus" },
+]
+
+// 库存管理
+/**/
+// 库存初始化记录
+export const InventoryInitialNote = [
+  {
+    label: "单据号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "操作员", prop: 'worker' },
+  { label: "仓库代码", prop: "warehouseCode" },
+  { label: "生效日期", prop: "activeDate" },
+  { label: "库存初始化请求单号", prop: "requestNumber" },
+]
+// 库存余额 20230407
+export const InventoryBalance = [
+  {
+    label: "物品代码",
+    prop: "itemCode",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "物品名称", prop: 'itemName' },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "库存数量", prop: "qty" },
+  { label: "计量单位", prop: "uom" },
+  { label: "批次", prop: "lot" },
+  { label: "库位代码", prop: "locationCode" },
+  { label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status" },
+  { label: "箱码", prop: "packingCode" },
+  { label: "ERP库位", prop: "locationErpCode" },
+  { label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "生产日期", prop: "produceDate" ,type: "dateTime" },
+  { label: "入库时间", prop: "putInTime", type: "dateTime" },
+  { label: "过期日期", prop: "expireDate" ,type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "最后盘点时间", prop: "lastCountTime",type: "dateTime" },
+  { label: "最后盘点计划单号", prop: "lastCountPlanNumber",width: orderWidth },	
+  { label: "最后盘点标签", prop: "lastCountLabel" },
+  { label: "标包数量", prop: "stdPackQty" },
+  { label: "库位组", prop: "locationGroup" },
+  { label: "库区", prop: "locationArea" },
+  { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
+  { label: "序号", prop: "serialNumber" },
+  { label: "备注", prop: "remark" },
+  { label: "到货日期", prop: "arriveDate",type: "dateTime" },
+  { label: "供应商批次", prop: "supplierBatch" },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
+  { label: "最后事务编号", prop: 'lastTransNumber' },
+]
+// 库存事务 20230410
+export const InventoryTransaction = [
+  {
+    label: "事务编号",
+    prop: "transNumber",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "事务分类", prop: "transType",type: "filter", filters: "TransTypeBase" },
+  { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
+  { label: "接口对应类型", prop: "interfaceType", width: '360px', showProp: true },
+  { label: "事务数量", prop: "qty" },
+  { label: "箱码", prop: "packingCode" },
+  { label: "ERP库位", prop: "locationErpCode" },
+  { label: "库位代码", prop: "locationCode" },
+  { label: "批次", prop: "lot" },
+  { label: "到货单位", prop: "uom" },
+  { label: "库存状态", prop: "status",type: "filter", filters: "inventoryStage" },
+  { label: "任务编号", prop: "jobNumber",width: orderWidth },
+  { label: "事务时间", prop: "transTime" ,type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "单据号", prop: "docNumber" },
+  { label: "库位组", prop: "locationGroup" },
+  { label: "库区", prop: "locationArea" },
+  { label: "到货日期", prop: "arriveDate",type: "dateTime" },
+  { label: "生产日期", prop: "produceDate",type: "dateTime" },
+  { label: "过期时间", prop: "expireDate",type: "dateTime" },
+  { label: "标包数量", prop: "stdPackQty" },
+  { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
+  { label: "事务替代类型", prop: "transSubType", type: "filter", filters: "TransSubType" },
+  { label: "供应商批次", prop: "supplierBatch" },
+  { label: "备注", prop: "remark" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "仓库代码", prop: 'warehouseCode' },
+]
+// 库存快照
+export const InventorySnapshot = [
+  {
+    label: "盘点标签",
+    prop: "countLabel",
+    fixed: "left",
+    type: "name",
+    showProp: true
+  },
+  { label: "备注", prop: 'remark', },
+]
+// 库存转移日志 20230410
+export const InventoryTransferLog =  [
+  {
+    label: "库存转移编号",
+    prop: "transferNumber",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "从状态", prop: "fromStatus",type: "filter", filters: "inventoryStage" },
+  { label: "到状态", prop: "toStatus", type: "filter", filters: "inventoryStage" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "到货数量", prop: "qty" },
+  { label: "到货单位", prop: "uom" },
+  { label: "从库位代码", prop: "fromLocationCode" },
+  { label: "到库位代码", prop: "toLocationCode" },
+  { label: "到箱码", prop: "toPackingCode" },
+  { label: "事务类型", prop: "transType", type: "filter", filters: "TransType" },
+  { label: "子事务类型", prop: "transSubType", type: "filter", filters: "transSubType" },
+  { label: "接口对应类型", prop: "interfaceType", width: '360px', showProp: true },
+  { label: "从事务编号", prop: "fromTransNumber", width: orderWidth },
+  { label: "到事务编号", prop: "toTransNumber", width: orderWidth },
+  { label: "操作员", prop: "worker" },
+  { label: "单据号", prop: "docNumber" },
+  { label: "任务编号", prop: "jobNumber" },
+  { label: "标包数", prop: "stdPackQty" },
+  { label: "从排序批次", prop: "fromLot" },
+  { label: "到排序批次", prop: 'toLot' },
+  { label: "供应商批次", prop: "supplierBatch" },
+  { label: "从箱码", prop: "fromPackingCode" },
+  { label: "从仓库代码", prop: "fromWarehouseCode" },
+  { label: "从库位组", prop: "fromLocationGroup" },
+  { label: "到库位组", prop: 'toLocationGroup' },
+  { label: "从库区", prop: "fromLocationArea" },
+  { label: "到库区", prop: "toLocationArea" },
+  { label: "从ERP库位", prop: "fromLocationErpCode" },
+  { label: "目标ERP库位", prop: "toLocationErpCode" },
+  { label: "备注", prop: "remark" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "生产日期", prop: "produceDate",type: "dateTime" },
+  { label: "到达时间", prop: "arriveDate",type:"dateTime" },
+  { label: "事务时间", prop: "transferTime",type: "dateTime" },
+  { label: "过期时间", prop: "expireDate",type:"dateTime" },
+  { label: "到仓库代码", prop: "toWarehouseCode" },
+]
+// 预计入库存(+自定义tab页) 20230411
+export const expectOut = [
+  { 
+    label: "任务编号", 
+    prop: "jobNumber",
+    fixed: "left",
+    type: "name", 
+    width: orderWidth
+  },
+  { label: "状态", prop: "status",type: "tagFilter", filters: "jobStatus" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "占用数量", prop: "qty" },
+  { label: "计量单位", prop: "uom" },
+  { label: "库位代码", prop: "locationCode" },
+  { label: "箱码", prop: "packingCode" },
+  { label: "供应商批次", prop: "supplierBatch" },
+  { label: "库区", prop: "locationArea" },
+  { label: "库位组", prop: "locationGroup" },
+  { label: "ERP库位", prop: "locationErpCode" },
+  { label: "批次", prop: "lot" },
+  { label: "到货日期", prop: "arriveDate",type:"dateTime" },
+  { label: "生产日期", prop: "produceDate",type: "dateTime" },
+  { label: "过期时间", prop: "expireDate",type:"dateTime" },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "序号", prop: "serialNumber" },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 预计入库存(+自定义tab页) 20230411
+export const expectIn = [
+  { 
+    label: "任务编号", 
+    prop: "jobNumber",
+    fixed: "left",
+    type: "name", 
+    width: orderWidth
+  },
+  { label: "状态", prop: "status", type: "tagFilter", filters: "jobStatus" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "占用数量", prop: "qty" },
+  { label: "计量单位", prop: "uom" },
+  { label: "库位代码", prop: "locationCode" },
+  { label: "箱码", prop: "packingCode" },
+  { label: "批次", prop: "lot" },
+  { label: "供应商批次", prop: "supplierBatch" },
+  { label: "库区", prop: "locationArea" },
+  { label: "库位组", prop: "locationGroup" },
+  { label: "ERP库位", prop: "locationErpCode" },
+  { label: "到货日期", prop: "arriveDate",type: "dateTime" },
+  { label: "生产日期", prop: "produceDate",type: "dateTime" },
+  { label: "过期时间", prop: "expireDate",type:"dateTime" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "序号", prop: 'serialNumber' },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+
+// 物品安全库存预警 
+export const safetyStockWarning =  [
+  {
+    label: "物品代码",
+    prop: "itemCode",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "最小库存", prop: 'minStock' },
+  { label: "最大库存", prop: 'maxStock' },
+  { label: "安全库存", prop: 'safetyStock' },
+  // { label: "安全库存状态", prop: 'safetyStockStatus' },
+  { label: "仓库代码", prop: "warehouseCode" },
+  { label: "存储关系代码", prop: "storeValue" },
+  { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
+]
+
+// 拆箱记录
+export const splitPackingList =  [
+  {
+    label: "单号",
+    prop: "number",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "创建时间", prop: 'creationTime', type:'dateTime' },
+  { label: "备注", prop: 'remark' },
+  { label: "操作员", prop: 'worker' },
+  // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+]
+
+// 非生产领料申请 20230417
+export const pickingRequest =  [
+  { 
+    label: "领料单号", 
+    prop: "number", 
+    fixed: "left",  
+    type: "name", 
+    width: orderWidth
+  },
+  { label: "状态", prop: 'requestStatus',type: "tagFilter",  filters: "requestStatus" },
+  { label: "建档日期", prop: "buildDate", type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "部门代码", prop: "deptCode" },
+  { label: "部门名称", prop: "deptName" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+]
+// 非生产领料审批 20230417
+export const pickingApproval =  [
+  { 
+    label: "领料单号", 
+    prop: "number", 
+    fixed: "left",  
+    type: "name", 
+    width: orderWidth
+  },
+  { label: "状态", prop: 'requestStatus',type: "tagFilter",  filters: "requestStatus" },
+  { label: "建档日期", prop: "buildDate", type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "部门代码", prop: "deptCode" },
+  { label: "部门名称", prop: "deptName" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+]
+// 非生产领料记录 20230417
+export const pickingNote =  [
+  { 
+    label: "领料记录单号", 
+    prop: "number", 
+    fixed: "left",  
+    type: "name",
+    width: orderWidth
+  },
+  { label: "建档日期", prop: "buildDate", type: "dateTime" },
+  { label: "请求单号", prop: 'unplannedIssueRequestNumber',width: orderWidth},
+  { label: "操作员", prop: "worker" },
+  { label: "部门代码", prop: "deptCode" },
+  { label: "部门名称", prop: "deptName" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 非生产退料申请 20230417
+export const materialReturnRequest =  [
+  { 
+    label: "退料单号", 
+    prop: "number", 
+    fixed: "left",  
+    type: "name", 
+    width: orderWidth
+  },
+  { label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" },
+  { label: "建档日期", prop: "buildDate", type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "部门代码", prop: "deptCode" },
+  { label: "部门名称", prop: "deptName" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+]
+// 非生产退料审批 20230417
+export const materialReturnApproval =  [
+  { 
+    label: "退料单号", 
+    prop: "number", 
+    fixed: "left",  
+    type: "name", 
+    width: orderWidth
+  },
+  { label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" },
+  { label: "建档日期", prop: "buildDate", type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "部门代码", prop: "deptCode" },
+  { label: "部门名称", prop: "deptName" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+ { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+]
+// 非生产退料记录 20230417
+export const materialReturnNote =  [
+  { 
+    label: "退料记录单号", 
+    prop: "number", 
+    fixed: "left",  
+    type: "name", 
+    width: orderWidth
+  },
+  { label: "建档日期", prop: "buildDate", type: "dateTime" },
+  { label: "请求单号", prop: 'unplannedReceiptRequestNumber',width: orderWidth },
+  { label: "操作员", prop: "worker" },
+  { label: "部门代码", prop: "deptCode" },
+  { label: "部门名称", prop: "deptName" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 回收料收货记录 20230415
+export const recycledMaterialsReceipt = [
+  {
+    label: "回收料收货记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "生效日期", prop: "activeDate" ,type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 回收料调整申请 20230415
+export const recycledMaterialsAdjustmentApply =  [
+  {
+    label: "回收料调整申请单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" },
+  { label: "创建时间", prop: "creationTime" ,type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "自动提交审批", prop: 'autoSubmit',type: "filter",  filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 回收料调整记录 20230415
+export const materialsAdjustment = [
+  {
+    label: "回收料调整记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "申请单号", prop: "requestNumber",width: orderWidth },
+  { label: "创建日期", prop: "creationTime",type: "dateTime" },
+  { label: "操作员", prop: "worker",},
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "任务单号", prop: "jobNumber" },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "type", prop: 'type' },
+  // { label: "创建者ID", prop: 'creatorId' },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // ************** 确认隐藏 ************************
+]
+// 线边仓调拨申请 20230417
+export const lineSideWarehouseAllocationRequest =  [
+  {
+    label: "调拨申请单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
+  { label: "生效日期", prop: "activeDate",type:"dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "创建时间", prop: "creationTime",type:"dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+  // { label: "调拨类型", prop: 'type' },
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot"},
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot"},
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot"},
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot"},
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot"},
+  // ************** 确认隐藏 ************************
+]
+// 线边仓调拨确认 20230417
+export const lineSideWarehouseAllocationConfirm =  [
+  {
+    label: "调拨确认单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot"  },
+  { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth },
+  { label: "申请日期", prop: "activeDate",type:"dateTime" },
+  { label: "确认时间", prop: "confirmTime",type:"dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: "creatorId" },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "任务ID", prop: 'jobNumber',width: orderWidth },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "调拨类型", prop: 'type' },
+  // ************** 确认隐藏 ************************
+]
+// 线边仓调拨记录 20230417
+export const lineSideWarehouseAllocationNote =  [
+  {
+    label: "调拨确认单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot"  },
+  { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth },
+  { label: "申请日期", prop: "activeDate",type:"dateTime" },
+  { label: "确认时间", prop: "confirmTime",type:"dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "任务单号", prop: 'jobNumber',width: orderWidth },
+  { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+   // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: "creatorId" },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "调拨类型", prop: 'type' },
+  // ************** 确认隐藏 ************************
+]
+// 储位调拨记录 20230417
+export const interStorageAllocationNote =  [
+  {
+    label: "调拨单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth },
+  { label: "申请日期", prop: "activeDate",type:"dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: "creatorId" },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "任务ID", prop: 'jobNumber',width: orderWidth },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "调拨类型", prop: 'type' },
+  // { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot"  },
+  // { label: "确认时间", prop: "confirmTime",type:"dateTime" },
+  // ************** 确认隐藏 ************************
+]
+// 客户储位调拨申请 20230410
+export const customerStorageAllocationRequest =  [
+  {
+    label: "调拨申请单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
+  { label: "生效日期", prop: "activeDate",type:"dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "创建时间", prop: "creationTime",type:"dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+  // { label: "调拨类型", prop: 'type' },
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot"},
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot"},
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot"},
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot"},
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot"},
+  // ************** 确认隐藏 ************************
+]
+// 客户储位调拨确认 20230410
+export const customerStorageAllocationConfirm =  [
+  {
+    label: "调拨确认单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot"  },
+  { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth },
+  { label: "申请日期", prop: "activeDate",type:"dateTime" },
+  { label: "确认时间", prop: "confirmTime",type:"dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "任务单号", prop: 'jobNumber',width: orderWidth },
+  { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "创建者ID", prop: "creatorId" },
+  // { label: "调拨类型", prop: 'type' },
+  // ************** 确认隐藏 ************************
+]
+// 客户储位调拨记录 20230410
+export const customerStorageAllocationNote =  [
+  {
+    label: "调拨确认单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot"  },
+  { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth },
+  { label: "申请日期", prop: "activeDate",type:"dateTime" },
+  { label: "确认时间", prop: "confirmTime",type:"dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "任务单号", prop: 'jobNumber',width: orderWidth },
+  { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: "creatorId" },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "调拨类型", prop: 'type' },
+  // ************** 确认隐藏 ************************
+]
+// 储位内移库记录 20230410
+export const intraStorageTransferNote =  [
+  {
+    label: "移库单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "移库时间", prop: "activeDate",type:"dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  { label: "调拨申请单号", prop: "requestNumber",width: orderWidth },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: "任务单号", prop: 'jobNumber',width: orderWidth },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: "creatorId" },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "type", prop: 'type' },
+  //  { label: "确认时间", prop: "confirmTime",type:"dateTime" },
+  // { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+]
+// 线边仓调整申请 20230417
+export const lineSideWarehouseAdjustmentSheetRequest =  [
+  {
+    label: "申请单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
+  { label: "操作员", prop: 'worker' },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: "creatorId" },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // { label: "type", prop: 'type' },
+  // ************** 确认隐藏 ************************
+]
+// 线边仓调整记录 20230417
+export const lineSideWarehouseAdjustmentSheetNote =  [
+  {
+    label: "记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "操作员", prop: 'worker' },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "调整单号", prop: "requestNumber",width: orderWidth },
+  { label: "备注", prop: 'remark' },
+  { label: "任务单号", prop: 'jobNumber',width: orderWidth },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: "creatorId" },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "类型", prop: 'type' },
+  // { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" },
+  // { label: "确认时间", prop: "confirmTime",type:"dateTime" },
+  // ************** 确认隐藏 ************************
+]
+// 盘点计划 20230415
+export const CountPlan = [
+  {
+    label: "盘点计划单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width:orderWidth
+  },
+  { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+  { label: "开始时间", prop: "beginTime",type: "dateTime" },
+  { label: "结束时间", prop: "endTime", type: "dateTime" },
+  { label: "计划时间", prop: 'planTime', type: "dateTime"},
+  { label: "盘点执行方式", prop: "requestType",type: "filter", filters: "requestType" },
+  { label: "根据", prop: "countMethod",type: "filter", filters: "countMethod" },
+  { label: "描述", prop: "description" },
+  { label: "备注", prop: 'remark', },
+  { label: "操作员", prop: 'worker',},
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "类型", prop: "type",type: "filter", filters: "checkType" },
+  { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" },
+  { label: "生效时间", prop: 'activeDate', type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "物品代码JSON", prop: 'jsonItemCodes' },
+  { label: "库位JSON", prop: 'jsonLocationCodes' },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: "creatorId" },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "jsonInventoryStatus", prop: 'jsonInventoryStatus' },
+  // ************** 确认隐藏 ************************
+]
+// 盘点任务 20230415
+export const CountJob =  [
+  {
+    label: "任务编号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width:orderWidth
+  },
+  { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+  { label: "盘点计划号", prop: "countPlanNumber",width:orderWidth },
+  { label: "盘点根据", prop: "countMethod",type: "filter", filters: "countMethod" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "承接时间", prop: "acceptTime", type: "dateTime" },
+  { label: "承接用户", prop: "acceptUserName" },
+  { label: "完成时间", prop: "completeTime",type: "dateTime" },
+  { label: "完成用户", prop: "completeUserName" },
+  { label: "操作员", prop: 'worker' },
+  { label: "物品代码", prop: 'itemCode' },
+  { label: "库位代码", prop: "locationCode" },
+  { label: "上游任务编号", prop: "upStreamJobNumber", width:orderWidth},
+  { label: "阶段", prop: "countStage", type: "filter", filters: "checkStage" },
+  { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
+  { label: "类型", prop: "type",type: "filter", filters: "checkType"  },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "优先级", prop: 'priority',},
+  { label: "优先级增量", prop: 'priorityIncrement',},
+  { label: "备注", prop: 'remark' },
+  { label: "描述", prop: "description" },
+  { label: "任务描述", prop: 'jobDescription' },
+  { label: "工作组代码", prop: "workGroupCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
+  // ************** 确认隐藏 ************************
+  // { label: "创建者ID", prop: "creatorId" },
+  // { label: "承接者ID", prop: "acceptUserId" },
+  // { label: "完成者ID", prop: "completeUserId" },
+  // { label: "上次修改者Id", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot"},
+  // ************** 确认隐藏 ************************
+]
+// 盘点记录 20230415
+export const CountNote = [
+  {
+    label: "盘点记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "是否已生成盘点调整申请", prop: "adjusted", type: "tagFilter", filters: "whetherOrNot" },
+  { label: "盘点计划单号", prop: "countPlanNumber", width: orderWidth },
+  { label: "开始时间", prop: "beginTime", type: "dateTime" },
+  { label: "结束时间", prop: "endTime", type: "dateTime" },
+  { label: "操作员", prop: 'worker',},
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "类型", prop: "type", type: "filter", filters: "checkType" },
+  { label: "阶段", prop: "stage", type: "filter", filters: "stageType" },
+  { label: "备注", prop: 'remark' },
+  { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
+  { label: "生效时间", prop: "activeDate", type: "dateTime" },
+  { label: "描述", prop: "description" },
+  // ************** 确认隐藏 ************************
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "创建者ID", prop: "creatorId" },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // ************** 确认隐藏 ************************
+]
+// 盘点调整申请 20230415
+export const CountPlanAdjust = [
+  {
+    label: "盘点调整申请单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "状态", type: "tagFilter", filters: "requestStatus", prop: "requestStatus" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "操作员", prop: 'worker' },
+  { label: "盘点记录单号", prop: 'countNoteNumber', width: orderWidth },
+  { label: "盘点计划单号", prop: "countPlanNumber",width: orderWidth },
+  { label: "备注", prop: 'remark' },
+  { label: "生效时间", prop: 'activeDate', type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
+  // ************** 确认隐藏 ************************
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "创建者ID", prop: "creatorId"},
+  // { label: "ID", prop: 'id' },
+  // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+]
+// 盘点调整记录 20230415
+export const CountAdjustNote = [
+  {
+    label: "盘点调整单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+    width: orderWidth
+  },
+  { label: "盘点记录单号", prop: 'countNoteNumber',width: orderWidth },
+  { label: "盘点计划单号", prop: 'countPlanNumber', width: orderWidth },
+  { label: "创建时间", prop: "creationTime",type: "dateTime",showProp: true },
+  { label: "操作员", prop: 'worker' },
+  { label: "类型", prop: "type" },
+  { label: "备注", prop: "remark" },
+  { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime',showProp: true },
+  { label: "生效时间", prop: "activeDate", type: "dateTime" },
+  // ************** 确认隐藏 ************************
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "创建者ID", prop: "creatorId" },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "isAdjusted", prop: 'isAdjusted' },
+  // ************** 确认隐藏 ************************
+]
+
+// 消息管理
+/**/
+// 消息类型 20230414
+export const MessageType = [
+  {
+    label: "消息类别代码",
+    prop: "messageTypeCode",
+    fixed: "left",
+    type: "name",
+    width: "300px"
+  },
+  { label: "消息类别名称", prop: "messageTypeName" },
+  { label: "备注", prop: 'remark' },
+  { label: "创建时间", prop: "creationTime",type: "dateTime",showProp: true },
+  { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime',showProp: true },
+  { label: "消息使用的邮件模板名称", prop: "emailTemplate" },
+  { label: "消息使用的短信模板名称", prop: "smsTemplate" },
+  { label: "是否发送邮件", prop: "isSendEmail", type: "filter", filters: "whetherOrNot" },
+  { label: "是否发送短信", prop: "isSendSms", type: "filter", filters: "whetherOrNot" },
+  // ************** 确认隐藏 ************************
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "上次修改者", prop: "lastModifierId" },
+  // { label: "创建者ID", prop: "creatorId" },
+  // ************** 确认隐藏 ************************
+]
+
+// 系统权限管理
+/**/
+// 部门信息维护
+export const Department =  [
+  {
+    label: "部门代码",
+    prop: "code",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "部门名称", prop: "name" },
+  { label: "描述", prop: "description" },
+  { label: "备注", prop: 'remark' },
+]
+
+// 接口监控看板
+const initDashboardLable = (data) => {
+  return _Dashboard ? _Dashboard[data] : null
+}
+// 外部数据转换
+export const dataExchangeFromOut = [
+  { 
+    label: initDashboardLable('OutgoingToExternalNumber'), 
+    prop: "number",
+    // fixed: "left",
+    // type: "name"
+  },
+  { 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" },
+]
+
+// 归档外部数据转换
+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" },
+]
+
+// WMS数据接收
+// export const comingToWms = [
+//   { label: _Dashboard.IncomingToWmsNumber, prop: "number" },
+//   { label: _Dashboard.IncomingToWmsRemark, prop: "remark", type:"showDetail" },
+//   { label: _Dashboard.IncomingToWmsDataType, prop: "dataType" },
+//   { label: _Dashboard.IncomingToWmsDataAction, prop: "dataAction" },
+//   { label: _Dashboard.IncomingToWmsEffectiveDate, prop: "effectiveDate",type:'dateTime' },
+//   { label: _Dashboard.IncomingToWmsStatus, prop: "status" },
+//   { label: _Dashboard.IncomingToWmsDataIdentityCode, prop: "dataIdentityCode" },
+//   { label: _Dashboard.IncomingToWmsDataContent, prop: "dataContent", type:"showJsonTable" },
+//   { label: _Dashboard.IncomingToWmsSourceSystem, prop: "sourceSystem" },
+//   { label: _Dashboard.IncomingToWmsWriteTime, prop: "writeTime",type:'dateTime' },
+//   { label: _Dashboard.IncomingToWmsReadTime, prop: "readTime",type:'dateTime' },
+//   { label: _Dashboard.IncomingToWmsErrorCode, prop: "errorCode" },
+//   { label: _Dashboard.IncomingToWmsErrorMessage, prop: "errorMessage", type:"showDetail" },
+//   { label: _Dashboard.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" },
+// ]
+
+// // 归档WMS数据接收
+// export const comingToWms_file = [
+//   { label: _Dashboard.ArchivedIncomingToWmsNumber, prop: "number" },
+//   { label: _Dashboard.ArchivedIncomingToWmsRemark, prop: "remark", type:"showDetail" },
+//   { label: _Dashboard.ArchivedIncomingToWmsDataType, prop: "dataType" },
+//   { label: _Dashboard.ArchivedIncomingToWmsDataAction, prop: "dataAction" },
+//   { label: _Dashboard.ArchivedIncomingToWmsEffectiveDate, prop: "effectiveDate",type:'dateTime' },
+//   { label: _Dashboard.ArchivedIncomingToWmsStatus, prop: "status" },
+//   { label: _Dashboard.ArchivedIncomingToWmsDataIdentityCode, prop: "dataIdentityCode" },
+//   { label: _Dashboard.ArchivedIncomingToWmsDataContent, prop: "dataContent", type:"showJsonTable" },
+//   { label: _Dashboard.ArchivedIncomingToWmsSourceSystem, prop: "sourceSystem" },
+//   { label: _Dashboard.ArchivedIncomingToWmsWriteTime, prop: "writeTime",type:'dateTime' },
+//   { label: _Dashboard.ArchivedIncomingToWmsReadTime, prop: "readTime",type:'dateTime' },
+//   { label: _Dashboard.ArchivedIncomingToWmsErrorCode, prop: "errorCode" },
+//   { label: _Dashboard.ArchivedIncomingToWmsErrorMessage, prop: "errorMessage", type:"showDetail" },
+//   { label: _Dashboard.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" },
+// ]
+
+// // WMS数据转换
+// export const dataExchangeFromWms = [
+//   { label: _Dashboard.DataExchange_OutgoingFromWmsNumber, prop: "number" },
+//   { label: _Dashboard.DataExchange_OutgoingFromWmsRemark, prop: "remark", type:"showDetail" },
+//   { label: _Dashboard.DataExchange_OutgoingFromWmsDataType, prop: "dataType" },
+//   { label: _Dashboard.DataExchange_OutgoingFromWmsDataAction, prop: "dataAction" },
+//   { label: _Dashboard.DataExchange_OutgoingFromWmsEffectiveDate, prop: "effectiveDate",type:'dateTime' },
+//   { label: _Dashboard.DataExchange_OutgoingFromWmsStatus, prop: "status" },
+//   { label: _Dashboard.DataExchange_OutgoingFromWmsDataIdentityCode, prop: "dataIdentityCode" },
+//   { label: _Dashboard.DataExchange_OutgoingFromWmsDataContent, prop: "dataContent", type:"showJsonTable" },
+//   { label: _Dashboard.DataExchange_OutgoingFromWmsSourceSystem, prop: "sourceSystem" },
+//   { label: _Dashboard.DataExchange_OutgoingFromWmsWriteTime, prop: "writeTime",type:'dateTime' },
+//   { label: _Dashboard.DataExchange_OutgoingFromWmsDestinationSystem, prop: "destinationSystem" },
+//   { label: _Dashboard.DataExchange_OutgoingFromWmsReadTime, prop: "readTime",type:'dateTime' },
+//   { label: _Dashboard.DataExchange_OutgoingFromWmsErrorCode, prop: "errorCode" },
+//   { label: _Dashboard.DataExchange_OutgoingFromWmsErrorMessage, prop: "errorMessage", type:"showDetail" },
+//   { label: _Dashboard.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" },
+// ]
+
+// // 归档WMS数据转换
+// export const dataExchangeFromWms_file = [
+//   { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsNumber, prop: "number" },
+//   { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsRemark, prop: "remark", type:"showDetail" },
+//   { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsDataType, prop: "dataType" },
+//   { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsDataAction, prop: "dataAction" },
+//   { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsEffectiveDate, prop: "effectiveDate",type:'dateTime' },
+//   { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsStatus, prop: "status" },
+//   { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsDataIdentityCode, prop: "dataIdentityCode" },
+//   { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsDataContent, prop: "dataContent", type:"showJsonTable" },
+//   { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsSourceSystem, prop: "sourceSystem" },
+//   { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsWriteTime, prop: "writeTime",type:'dateTime' },
+//   // { label: _Dashboard.destinationSystem, prop: "destinationSystem" },
+//   { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsReadTime, prop: "readTime",type:'dateTime' },
+//   { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsErrorCode, prop: "errorCode" },
+//   { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsErrorMessage, prop: "errorMessage", type:"showDetail" },
+//   { label: _Dashboard.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" },
+// ]
+
+
+// // 外部数据接收
+// export const comingFromOut = [
+//   { label: _Dashboard.DataExchange_IncomingFromExternalNumber, prop: "number" },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalRemark, prop: "remark", type:"showDetail" },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalDataType, prop: "dataType" },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalTableType, prop: "tableType" },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalDataAction, prop: "dataAction" },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalEffectiveDate, prop: "effectiveDate",type:'dateTime' },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalStatus, prop: "status" },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalSourceSystem, prop: "sourceSystem" },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalSourceDataId, prop: "sourceDataId" },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalSourceDataGroupCode, prop: "sourceDataGroupCode" },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalSourceDataDetailCode, prop: "sourceDataDetailCode" },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalSourceDataContent, prop: "sourceDataContent", type:"showJsonTable" },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalWriteTime, prop: "writeTime",type:'dateTime' },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalWriter, prop: "writer" },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalDestinationSystem, prop: "destinationSystem" },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalDestinationDataId, prop: "destinationDataId" },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalDestinationDataContent, prop: "destinationDataContent", type:"showJsonTable" },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalReadTime, prop: "readTime",type:'dateTime' },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalReader, prop: "reader" },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalErrorCode, prop: "errorCode" },
+//   { label: _Dashboard.DataExchange_IncomingFromExternalErrorMessage, prop: "errorMessage", type:"showDetail" },
+//   { label: _Dashboard.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" },
+// ]
+
+// // 归档外部数据接收 
+// export const comingFromOut_file = [
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalNumber, prop: "number" },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalRemark, prop: "remark", type:"showDetail" },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalDataType, prop: "dataType" },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalTableType, prop: "tableType" },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalDataAction, prop: "dataAction" },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalEffectiveDate, prop: "effectiveDate",type:'dateTime' },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalStatus, prop: "status" },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalSourceSystem, prop: "sourceSystem" },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalSourceDataId, prop: "sourceDataId" },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalSourceDataGroupCode, prop: "sourceDataGroupCode" },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalSourceDataDetailCode, prop: "sourceDataDetailCode" },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalSourceDataContent, prop: "sourceDataContent", type:"showJsonTable" },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalWriteTime, prop: "writeTime",type:'dateTime' },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalWriter, prop: "writer" },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalDestinationSystem, prop: "destinationSystem" },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalDestinationDataId, prop: "destinationDataId" },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalDestinationDataContent, prop: "destinationDataContent", type:"showJsonTable" },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalReadTime, prop: "readTime",type:'dateTime' },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalReader, prop: "reader" },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalErrorCode, prop: "errorCode" },
+//   { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalErrorMessage, prop: "errorMessage", type:"showDetail" },
+//   { label: _Dashboard.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" },
+// ]
+
+
+
+// 字段说明
+// showProp: true //隐藏该字段的高级筛选+列表排序
+// sortable: false //隐藏该字段的列表排序
+// type:showDetail //此类型点击弹窗所有信息，适用于接口监控看板等文本过长使用
+// type:showJsonTable //此类型点击弹窗可以以表格的形式看解析的json，适用于接口监控看板中json数据等
\ No newline at end of file
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index f24417a00..595231746 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -1,6 +1,7 @@
 import zh from '@/lang/zh'
 let _Public = zh.ColumsPublic // 字段通用
-let _Dashboard = zh.ColumsDashboard // 接口监控看板
+// let _Dashboard = zh.ColumsDashboard // 接口监控看板
+let _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) // 接口监控看板
 let _Names = zh.ColumsNames // 接口监控看板
 
 // 基础信息数据管理
@@ -2691,35 +2692,38 @@ export const Department =  [
 ]
 
 // 接口监控看板
+const initDashboardLable = (data) => {
+  return _Dashboard ? _Dashboard[data] : null
+}
 // 外部数据转换
 export const dataExchangeFromOut = [
   { 
-    label: _Dashboard.number, 
+    label: initDashboardLable('OutgoingToExternalNumber'), 
     prop: "number",
-    fixed: "left",
-    type: "name"
+    // fixed: "left",
+    // type: "name"
   },
-  { label: _Public.remark, prop: "remark", type:"showDetail" },
-  { label: _Dashboard.dataType, prop: "dataType", type:"showDetail" },
-  { label: _Dashboard.tableType, prop: "tableType" },
-  { label: _Dashboard.dataAction, prop: "dataAction" },
-  { label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' },
-  { label: _Dashboard.status, prop: "status" },
-  { label: _Dashboard.sourceSystem, prop: "sourceSystem", type:"showDetail" },
-  { label: _Dashboard.sourceDataId, prop: "sourceDataId" },
-  { label: _Dashboard.sourceDataGroupCode, prop: "sourceDataGroupCode", type:"showDetail" },
-  { label: _Dashboard.sourceDataDetailCode, prop: "sourceDataDetailCode", type:"showDetail" },
-  { label: _Dashboard.sourceDataContent, prop: "sourceDataContent", type:"showJsonTable" },
-  { label: _Dashboard.writeTime, prop: "writeTime",type:'dateTime' },
-  { label: _Dashboard.writer, prop: "writer" },
-  { label: _Dashboard.destinationSystem, prop: "destinationSystem", type:"showDetail" },
-  { label: _Dashboard.destinationDataId, prop: "destinationDataId" },
-  { label: _Dashboard.destinationDataContent, prop: "destinationDataContent", type:"showJsonTable" },
-  { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' },
-  { label: _Dashboard.reader, prop: "reader" },
-  { label: _Dashboard.errorCode, prop: "errorCode" },
-  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" },
-  { label: _Dashboard.retryTimes, prop: "retryTimes" },
+  { 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" },
diff --git a/fe/PC/src/views/interfaceBoard/_dataExchangeFromOut.vue b/fe/PC/src/views/interfaceBoard/_dataExchangeFromOut.vue
new file mode 100644
index 000000000..4187f894a
--- /dev/null
+++ b/fe/PC/src/views/interfaceBoard/_dataExchangeFromOut.vue
@@ -0,0 +1,304 @@
+<template>
+    <div class="page-box" v-loading="Loading.appMainLoading">
+      <tablePagination
+        :currenButtonData="currenButtonData"
+        :tableData="tableData"
+        :tableLoading="Loading.tableLoading"
+        :tableColumns="tableColumns"
+        @rowDrop="rowDrop"
+        :totalCount="totalCount"
+        :multipleSelection="multipleSelection"
+        :MaxResultCount="PageListParams.MaxResultCount"
+        @topbutton="topbutton"
+        @inlineDialog="inlineDialog"
+        @sortChange="sortChange"
+        @alertoldSkipCount="alertoldSkipCount"
+        @alterResultCount="alterResultCount"
+        @handleSelectionChange="handleSelectionChange"
+        :currentPageProps="oldSkipCount"
+        :quicklySearchOption="quicklySearchOption"
+        @quicklySearchClick="quicklySearchClick"
+        @quicklySearchClear="quicklySearchClear"
+        :primarySearchOption="primarySearchOption"
+        @overallSearchFormClick="overallSearchFormClick"
+        :httpOverallSearchData="httpOverallSearchData"
+      >
+      </tablePagination>
+      <!-- 新增与编辑 -->
+      <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>
+      <curren-Drawer
+        :title="tableColumns"
+        :tableColumns="tableColumns"
+        :DrawerLoading="Loading.DrawerLoading"
+        :drawer="displayDialog.detailsDialog"
+        :dropdownData="dropdownData"
+        :propsData="propsData"
+        :tabsDesTions="tabsDesTions"
+        @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+        @drawerbutton="drawerbutton"
+        @handleCommand="drawerHandle"
+        @close-value="closeValue"
+      ></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 { dataExchangeFromOut,dataExchangeFromOut_save,dataExchangeFromOut_delete } from "@/api/wms-interface"
+  import { getToken } from '@/utils/auth'
+  
+  export default {
+    name: "dataExchangeFromOut",
+    mixins: [
+      tableMixins,
+      LoadingMixins,
+      drawerMixins,
+      TableHeaderMixins,
+      mixins,
+      filterSelectMixins,
+      newAndEdiDialogMixins
+    ],
+    computed: {
+      editDialog: {
+        get: function () {
+          return this.displayDialog.newDialog || this.displayDialog.editDialog;
+        },
+      },
+    },
+    data() {
+      let _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) // 接口监控看板
+      return {
+        tableLoading:false,
+        //常用按钮数据
+        currenButtonData: [
+          // this.defaultAddBtn(),//新增
+          this.defaultFieldSettingBtn(),//字段设置
+          this.defaultFreshBtn(),//刷新
+          // this.defaultFilterBtn(),//筛选
+        ],
+        //新增
+        CreateFormData: {
+          number: null,//数字+点*
+          remark: null,
+          dataType: null,
+          tableType: null,//数字+点*
+          dataAction: null,//数字+点*
+          effectiveDate: null,//*
+          status: null,//数字+点*
+          sourceSystem: null,
+          sourceDataId: null,
+          sourceDataGroupCode: null,
+          sourceDataDetailCode: null,
+          sourceDataContent: null,
+          writeTime: null,//*
+          writer: null,
+          destinationSystem: null,
+          destinationDataId: null,
+          destinationDataContent: null,
+          readTime: null,//*
+          reader: null,
+          errorCode: null,//数字+点*
+          errorMessage: null,
+          retryTimes: null,//数字+点*
+        },
+        //新增
+        editFormData: {
+          number: null,//数字+点*
+          remark: null,
+          dataType: null,
+          tableType: null,//数字+点*
+          dataAction: null,//数字+点*
+          effectiveDate: null,//*
+          status: null,//数字+点*
+          sourceSystem: null,
+          sourceDataId: null,
+          sourceDataGroupCode: null,
+          sourceDataDetailCode: null,
+          sourceDataContent: null,
+          writeTime: null,//*
+          writer: null,
+          destinationSystem: null,
+          destinationDataId: null,
+          destinationDataContent: null,
+          readTime: null,//*
+          reader: null,
+          errorCode: null,//数字+点*
+          errorMessage: null,
+          retryTimes: null,//数字+点*
+        },
+        CreateForm: [
+          { type: "input", label: _Dashboard.OutgoingToExternalNumber, prop: 'number', colSpan: 12, validType:'pointNumber' },
+          { type: "input", label: _Dashboard.OutgoingToExternalRemark, prop: 'remark', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalDataType, prop: 'dataType', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalTableType, prop: 'tableType', colSpan: 12, validType:'pointNumber' },
+          { type: "input", label: _Dashboard.OutgoingToExternalDataAction, prop: 'dataAction', colSpan: 12, validType:'pointNumber' },
+          { type: "dateTime", label: _Dashboard.OutgoingToExternalEffectiveDate, prop: 'effectiveDate', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalStatus, prop: 'status', colSpan: 12, validType:'pointNumber' },
+          { type: "input", label: _Dashboard.OutgoingToExternalSourceSystem, prop: 'sourceSystem', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalSourceDataId, prop: 'sourceDataId', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalSourceDataGroupCode, prop: 'sourceDataGroupCode', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalSourceDataDetailCode, prop: 'sourceDataDetailCode', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalSourceDataContent, prop: 'sourceDataContent', colSpan: 12, },
+          { type: "dateTime", label: _Dashboard.OutgoingToExternalWriteTime, prop: 'writeTime', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalWriter, prop: 'writer', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalDestinationSystem, prop: 'destinationSystem', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalDestinationDataId, prop: 'destinationDataId', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalDestinationDataContent, prop: 'destinationDataContent', colSpan: 12, },
+          { type: "dateTime", label: _Dashboard.OutgoingToExternalReadTime, prop: 'readTime', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalReader, prop: 'reader', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalErrorCode, prop: 'errorCode', colSpan: 12, validType:'pointNumber' },
+          { type: "input", label: _Dashboard.OutgoingToExternalErrorMessage, prop: 'errorMessage', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalRetryTimes, prop: 'retryTimes', colSpan: 12, validType:'pointNumber'},
+        ],
+        editForm: [
+          { type: "input", label: _Dashboard.OutgoingToExternalNumber, prop: 'number', colSpan: 12, validType:'pointNumber' },
+          { type: "input", label: _Dashboard.OutgoingToExternalRemark, prop: 'remark', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalDataType, prop: 'dataType', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalTableType, prop: 'tableType', colSpan: 12, validType:'pointNumber' },
+          { type: "input", label: _Dashboard.OutgoingToExternalDataAction, prop: 'dataAction', colSpan: 12, validType:'pointNumber' },
+          { type: "dateTime", label: _Dashboard.OutgoingToExternalEffectiveDate, prop: 'effectiveDate', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalStatus, prop: 'status', colSpan: 12, validType:'pointNumber' },
+          { type: "input", label: _Dashboard.OutgoingToExternalSourceSystem, prop: 'sourceSystem', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalSourceDataId, prop: 'sourceDataId', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalSourceDataGroupCode, prop: 'sourceDataGroupCode', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalSourceDataDetailCode, prop: 'sourceDataDetailCode', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalSourceDataContent, prop: 'sourceDataContent', colSpan: 12, },
+          { type: "dateTime", label: _Dashboard.OutgoingToExternalWriteTime, prop: 'writeTime', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalWriter, prop: 'writer', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalDestinationSystem, prop: 'destinationSystem', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalDestinationDataId, prop: 'destinationDataId', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalDestinationDataContent, prop: 'destinationDataContent', colSpan: 12, },
+          { type: "dateTime", label: _Dashboard.OutgoingToExternalReadTime, prop: 'readTime', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalReader, prop: 'reader', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalErrorCode, prop: 'errorCode', colSpan: 12, validType:'pointNumber' },
+          { type: "input", label: _Dashboard.OutgoingToExternalErrorMessage, prop: 'errorMessage', colSpan: 12, },
+          { type: "input", label: _Dashboard.OutgoingToExternalRetryTimes, prop: 'retryTimes', colSpan: 12, validType:'pointNumber'},
+        ],
+        editOptions: {},
+        editRules: {
+          cerateRule: {
+            number: [{ required: true, trigger: "blur", message: "不可为空" }],
+            tableType: [{ required: true, trigger: "blur", message: "不可为空" }],
+            dataAction: [{ required: true, trigger: "blur", message: "不可为空" }],
+            effectiveDate: [{ required: true, trigger: "blur", message: "不可为空" }],
+            status: [{ required: true, trigger: "blur", message: "不可为空" }],
+            writeTime: [{ required: true, trigger: "blur", message: "不可为空" }],
+            readTime: [{ required: true, trigger: "blur", message: "不可为空" }],
+            errorCode: [{ required: true, trigger: "blur", message: "不可为空" }],
+            retryTimes: [{ required: true, trigger: "blur", message: "不可为空" }],
+          },
+          editRule: {
+            number: [{ required: true, trigger: "blur", message: "不可为空" }],
+            tableType: [{ required: true, trigger: "blur", message: "不可为空" }],
+            dataAction: [{ required: true, trigger: "blur", message: "不可为空" }],
+            effectiveDate: [{ required: true, trigger: "blur", message: "不可为空" }],
+            status: [{ required: true, trigger: "blur", message: "不可为空" }],
+            writeTime: [{ required: true, trigger: "blur", message: "不可为空" }],
+            readTime: [{ required: true, trigger: "blur", message: "不可为空" }],
+            errorCode: [{ required: true, trigger: "blur", message: "不可为空" }],
+            retryTimes: [{ required: true, trigger: "blur", message: "不可为空" }],
+          }
+        },
+      };
+    },
+    mounted() {
+      this.paging();
+    },
+    methods: {
+      //渲染数据
+      paging(callback) {
+        this.Loading.tableLoading = true;
+        this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
+        dataExchangeFromOut(this.PageListParams)
+          .then(result => {
+            let res = result.data
+            this.tableData = res.items
+            this.totalCount = res.totalCount
+            this.pagingCallback(callback)
+          })
+          .catch(err => {
+              this.Loading.tableLoading = false
+          })
+      },
+      //打开抽屉
+      inlineDialog(val) {
+        this.Loading.DrawerLoading = true
+        this.displayDialog.detailsDialog = true;
+        dataExchangeFromOut(this.PageListParams)
+          .then(result => {
+            this.propsData = result.data.items.filter(item=>{
+              return item.id == val.id
+            })[0]
+            this.inlineDialogCallback()
+          })
+          .catch(err => {
+            this.Loading.DrawerLoading = false
+          })
+      },
+      // 新增/编辑提交
+      FormSubmit(val){
+        this.Loading.tableLoading = true
+        const _data = new URLSearchParams();
+        for(let item in this.CreateFormData){
+          _data.append('ViewModel.'+item.slice(0,1).toUpperCase() +item.slice(1).toLowerCase(), this.CreateFormData[item])
+        }
+        // todo:1、接口302  2、token取值的问题
+        _data.append('__RequestVerificationToken',getToken())
+        // this.formReveal为真是新增
+        dataExchangeFromOut_save(_data,this.formReveal)
+          .then(result => {
+            this.Loading.tableLoading = false
+          })
+          .catch(err => {
+              this.Loading.tableLoading = false
+          })
+      },
+      // 重载抽屉 删除按钮
+      drawerHandle(val) {
+        if (val == 'delete') {
+          this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.Loading.appMainLoading = true
+            this.displayDialog.detailsDialog = false
+            // todo:1、接口302
+            dataExchangeFromOut_delete(this.propsData.id).then(res => {
+              this.$successMsg('删除成功!')
+              this.Loading.appMainLoading = false
+              this.paging()
+            }).catch(err => {
+              this.Loading.appMainLoading = false
+            })
+          }).catch(() => {
+            //取消操作
+          });
+        }
+      }
+    }
+  }
+  </script>
+<style lang="scss" scoped>
+@import "@/styles/basicData.scss";
+</style>
\ No newline at end of file
diff --git a/fe/PC/src/views/interfaceBoard/comingFromOut.vue b/fe/PC/src/views/interfaceBoard/comingFromOut.vue
index 15f347a17..b99dec2fe 100644
--- a/fe/PC/src/views/interfaceBoard/comingFromOut.vue
+++ b/fe/PC/src/views/interfaceBoard/comingFromOut.vue
@@ -47,7 +47,7 @@
         currenButtonData: [
           this.defaultFieldSettingBtn(),//字段设置
           this.defaultFreshBtn(),//刷新
-        //   this.defaultFilterBtn(),//筛选
+          // this.defaultFilterBtn(),//筛选
         ],
       };
     },
diff --git a/fe/PC/src/views/interfaceBoard/comingFromOut_file.vue b/fe/PC/src/views/interfaceBoard/comingFromOut_file.vue
index 40646beda..a6512c1d5 100644
--- a/fe/PC/src/views/interfaceBoard/comingFromOut_file.vue
+++ b/fe/PC/src/views/interfaceBoard/comingFromOut_file.vue
@@ -47,7 +47,7 @@
         currenButtonData: [
           this.defaultFieldSettingBtn(),//字段设置
           this.defaultFreshBtn(),//刷新
-        //   this.defaultFilterBtn(),//筛选
+          // this.defaultFilterBtn(),//筛选
         ],
       };
     },
diff --git a/fe/PC/src/views/interfaceBoard/comingToWms.vue b/fe/PC/src/views/interfaceBoard/comingToWms.vue
index a53aef709..c2a5e9db6 100644
--- a/fe/PC/src/views/interfaceBoard/comingToWms.vue
+++ b/fe/PC/src/views/interfaceBoard/comingToWms.vue
@@ -48,7 +48,7 @@
         currenButtonData: [
           this.defaultFieldSettingBtn(),//字段设置
           this.defaultFreshBtn(),//刷新
-        //   this.defaultFilterBtn(),//筛选
+          // this.defaultFilterBtn(),//筛选
         ],
       };
     },
diff --git a/fe/PC/src/views/interfaceBoard/comingToWms_file.vue b/fe/PC/src/views/interfaceBoard/comingToWms_file.vue
index 64b432d0f..a4160d1cb 100644
--- a/fe/PC/src/views/interfaceBoard/comingToWms_file.vue
+++ b/fe/PC/src/views/interfaceBoard/comingToWms_file.vue
@@ -47,7 +47,7 @@
         currenButtonData: [
           this.defaultFieldSettingBtn(),//字段设置
           this.defaultFreshBtn(),//刷新
-        //   this.defaultFilterBtn(),//筛选
+          // this.defaultFilterBtn(),//筛选
         ],
       };
     },
diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue
index 0e69e73d3..9a2edd9f3 100644
--- a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue
+++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue
@@ -24,36 +24,6 @@
         :httpOverallSearchData="httpOverallSearchData"
       >
       </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>
-      <curren-Drawer
-        :title="tableColumns"
-        :tableColumns="tableColumns"
-        :DrawerLoading="Loading.DrawerLoading"
-        :drawer="displayDialog.detailsDialog"
-        :dropdownData="dropdownData"
-        :propsData="propsData"
-        :tabsDesTions="tabsDesTions"
-        @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-        @drawerbutton="drawerbutton"
-        @handleCommand="drawerHandle"
-        @close-value="closeValue"
-      ></curren-Drawer>
     </div>
   </template>
   <script>
@@ -64,7 +34,7 @@
   import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
   import { mixins } from "@/mixins/mixins";
   import { filterSelectMixins } from '@/mixins/filter-Select'
-  import { dataExchangeFromOut,dataExchangeFromOut_save,dataExchangeFromOut_delete } from "@/api/wms-interface"
+  import { getInterfaceBoard,dataExchangeFromOut,dataExchangeFromOut_save,dataExchangeFromOut_delete } from "@/api/wms-interface"
   import { getToken } from '@/utils/auth'
   
   export default {
@@ -94,131 +64,8 @@
           // this.defaultAddBtn(),//新增
           this.defaultFieldSettingBtn(),//字段设置
           this.defaultFreshBtn(),//刷新
-        //   this.defaultFilterBtn(),//筛选
-        ],
-        //新增
-        CreateFormData: {
-          number: null,//数字+点*
-          remark: null,
-          dataType: null,
-          tableType: null,//数字+点*
-          dataAction: null,//数字+点*
-          effectiveDate: null,//*
-          status: null,//数字+点*
-          sourceSystem: null,
-          sourceDataId: null,
-          sourceDataGroupCode: null,
-          sourceDataDetailCode: null,
-          sourceDataContent: null,
-          writeTime: null,//*
-          writer: null,
-          destinationSystem: null,
-          destinationDataId: null,
-          destinationDataContent: null,
-          readTime: null,//*
-          reader: null,
-          errorCode: null,//数字+点*
-          errorMessage: null,
-          retryTimes: null,//数字+点*
-        },
-        //新增
-        editFormData: {
-          number: null,//数字+点*
-          remark: null,
-          dataType: null,
-          tableType: null,//数字+点*
-          dataAction: null,//数字+点*
-          effectiveDate: null,//*
-          status: null,//数字+点*
-          sourceSystem: null,
-          sourceDataId: null,
-          sourceDataGroupCode: null,
-          sourceDataDetailCode: null,
-          sourceDataContent: null,
-          writeTime: null,//*
-          writer: null,
-          destinationSystem: null,
-          destinationDataId: null,
-          destinationDataContent: null,
-          readTime: null,//*
-          reader: null,
-          errorCode: null,//数字+点*
-          errorMessage: null,
-          retryTimes: null,//数字+点*
-        },
-        CreateForm: [
-          { type: "input", label: _this.$t("ColumsDashboard.number"), prop: 'number', colSpan: 12, validType:'pointNumber' },
-          { type: "input", label: _this.$t("ColumsPublic.remark"), prop: 'remark', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.dataType"), prop: 'dataType', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.tableType"), prop: 'tableType', colSpan: 12, validType:'pointNumber' },
-          { type: "input", label: _this.$t("ColumsDashboard.dataAction"), prop: 'dataAction', colSpan: 12, validType:'pointNumber' },
-          { type: "dateTime", label: _this.$t("ColumsDashboard.effectiveDate"), prop: 'effectiveDate', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.status"), prop: 'status', colSpan: 12, validType:'pointNumber' },
-          { type: "input", label: _this.$t("ColumsDashboard.sourceSystem"), prop: 'sourceSystem', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.sourceDataId"), prop: 'sourceDataId', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.sourceDataGroupCode"), prop: 'sourceDataGroupCode', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.sourceDataDetailCode"), prop: 'sourceDataDetailCode', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.sourceDataContent"), prop: 'sourceDataContent', colSpan: 12, },
-          { type: "dateTime", label: _this.$t("ColumsDashboard.writeTime"), prop: 'writeTime', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.writer"), prop: 'writer', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.destinationSystem"), prop: 'destinationSystem', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.destinationDataId"), prop: 'destinationDataId', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.destinationDataContent"), prop: 'destinationDataContent', colSpan: 12, },
-          { type: "dateTime", label: _this.$t("ColumsDashboard.readTime"), prop: 'readTime', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.reader"), prop: 'reader', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.errorCode"), prop: 'errorCode', colSpan: 12, validType:'pointNumber' },
-          { type: "input", label: _this.$t("ColumsDashboard.errorMessage"), prop: 'errorMessage', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.retryTimes"), prop: 'retryTimes', colSpan: 12, validType:'pointNumber'},
-        ],
-        editForm: [
-          { type: "input", label: _this.$t("ColumsDashboard.number"), prop: 'number', colSpan: 12, validType:'pointNumber' },
-          { type: "input", label: _this.$t("ColumsPublic.remark"), prop: 'remark', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.dataType"), prop: 'dataType', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.tableType"), prop: 'tableType', colSpan: 12, validType:'pointNumber' },
-          { type: "input", label: _this.$t("ColumsDashboard.dataAction"), prop: 'dataAction', colSpan: 12, validType:'pointNumber' },
-          { type: "dateTime", label: _this.$t("ColumsDashboard.effectiveDate"), prop: 'effectiveDate', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.status"), prop: 'status', colSpan: 12, validType:'pointNumber' },
-          { type: "input", label: _this.$t("ColumsDashboard.sourceSystem"), prop: 'sourceSystem', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.sourceDataId"), prop: 'sourceDataId', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.sourceDataGroupCode"), prop: 'sourceDataGroupCode', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.sourceDataDetailCode"), prop: 'sourceDataDetailCode', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.sourceDataContent"), prop: 'sourceDataContent', colSpan: 12, },
-          { type: "dateTime", label: _this.$t("ColumsDashboard.writeTime"), prop: 'writeTime', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.writer"), prop: 'writer', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.destinationSystem"), prop: 'destinationSystem', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.destinationDataId"), prop: 'destinationDataId', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.destinationDataContent"), prop: 'destinationDataContent', colSpan: 12, },
-          { type: "dateTime", label: _this.$t("ColumsDashboard.readTime"), prop: 'readTime', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.reader"), prop: 'reader', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.errorCode"), prop: 'errorCode', colSpan: 12, validType:'pointNumber' },
-          { type: "input", label: _this.$t("ColumsDashboard.errorMessage"), prop: 'errorMessage', colSpan: 12, },
-          { type: "input", label: _this.$t("ColumsDashboard.retryTimes"), prop: 'retryTimes', colSpan: 12, validType:'pointNumber'},
+          // this.defaultFilterBtn(),//筛选
         ],
-        editOptions: {},
-        editRules: {
-          cerateRule: {
-            number: [{ required: true, trigger: "blur", message: "不可为空" }],
-            // tableType: [{ required: true, trigger: "blur", message: "不可为空" }],
-            // dataAction: [{ required: true, trigger: "blur", message: "不可为空" }],
-            // effectiveDate: [{ required: true, trigger: "blur", message: "不可为空" }],
-            // status: [{ required: true, trigger: "blur", message: "不可为空" }],
-            // writeTime: [{ required: true, trigger: "blur", message: "不可为空" }],
-            // readTime: [{ required: true, trigger: "blur", message: "不可为空" }],
-            // errorCode: [{ required: true, trigger: "blur", message: "不可为空" }],
-            // retryTimes: [{ required: true, trigger: "blur", message: "不可为空" }],
-          },
-          editRule: {
-            number: [{ required: true, trigger: "blur", message: "不可为空" }],
-            tableType: [{ required: true, trigger: "blur", message: "不可为空" }],
-            dataAction: [{ required: true, trigger: "blur", message: "不可为空" }],
-            effectiveDate: [{ required: true, trigger: "blur", message: "不可为空" }],
-            status: [{ required: true, trigger: "blur", message: "不可为空" }],
-            writeTime: [{ required: true, trigger: "blur", message: "不可为空" }],
-            readTime: [{ required: true, trigger: "blur", message: "不可为空" }],
-            errorCode: [{ required: true, trigger: "blur", message: "不可为空" }],
-            retryTimes: [{ required: true, trigger: "blur", message: "不可为空" }],
-          }
-        },
       };
     },
     mounted() {
@@ -240,62 +87,6 @@
               this.Loading.tableLoading = false
           })
       },
-      //打开抽屉
-      inlineDialog(val) {
-        this.Loading.DrawerLoading = true
-        this.displayDialog.detailsDialog = true;
-        dataExchangeFromOut(this.PageListParams)
-          .then(result => {
-            this.propsData = result.data.items.filter(item=>{
-              return item.id == val.id
-            })[0]
-            this.inlineDialogCallback()
-          })
-          .catch(err => {
-            this.Loading.DrawerLoading = false
-          })
-      },
-      // 新增/编辑提交
-      FormSubmit(val){
-        this.Loading.tableLoading = true
-        const _data = new URLSearchParams();
-        for(let item in this.CreateFormData){
-          _data.append('ViewModel.'+item.slice(0,1).toUpperCase() +item.slice(1).toLowerCase(), this.CreateFormData[item])
-        }
-        // todo:1、接口302  2、token取值的问题
-        _data.append('__RequestVerificationToken',getToken())
-        // this.formReveal为真是新增
-        dataExchangeFromOut_save(_data,this.formReveal)
-          .then(result => {
-            this.Loading.tableLoading = false
-          })
-          .catch(err => {
-              this.Loading.tableLoading = false
-          })
-      },
-      // 重载抽屉 删除按钮
-      drawerHandle(val) {
-        if (val == 'delete') {
-          this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            this.Loading.appMainLoading = true
-            this.displayDialog.detailsDialog = false
-            // todo:1、接口302
-            dataExchangeFromOut_delete(this.propsData.id).then(res => {
-              this.$successMsg('删除成功!')
-              this.Loading.appMainLoading = false
-              this.paging()
-            }).catch(err => {
-              this.Loading.appMainLoading = false
-            })
-          }).catch(() => {
-            //取消操作
-          });
-        }
-      }
     }
   }
   </script>
diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue
index aaef0872f..efb9d88b6 100644
--- a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue
+++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue
@@ -31,7 +31,7 @@
   import { LoadingMixins } from "@/mixins/LoadingMixins";
   import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
   import { mixins } from "@/mixins/mixins";
-  import { dataExchangeFromOut_file } from "@/api/wms-interface"
+  import { getInterfaceBoard,dataExchangeFromOut_file } from "@/api/wms-interface"
   
   export default {
     name: "dataExchangeFromOut_file",
@@ -47,16 +47,60 @@
         currenButtonData: [
           this.defaultFieldSettingBtn(),//字段设置
           this.defaultFreshBtn(),//刷新
-        //   this.defaultFilterBtn(),//筛选
+          // this.defaultFilterBtn(),//筛选
         ],
+        setInterfaceBoardTableColumns:this.setTableColumns()
       };
     },
     mounted() {
       this.paging();
     },
     methods: {
-        //渲染数据
-        paging(callback) {
+      setTableColumns(){
+        let interfaceBoardColumnsNames = localStorage.getItem("interfaceBoardColumnsNames")
+        if(!interfaceBoardColumnsNames){
+          console.log('获取接口监控看板表头数据并存储')
+          
+          .catch(err => {
+          })
+        }else{
+          let _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) // 接口监控看板
+          return [
+            { label: '11111', prop: "number" },
+            { label: _Dashboard.ArchivedOutgoingToExternalNumber, prop: "number" },
+            { label: _Dashboard.ArchivedOutgoingToExternalRemark, prop: "remark", type:"showDetail" },
+            { label: _Dashboard.ArchivedOutgoingToExternalDataType, prop: "dataType" },
+            { label: _Dashboard.ArchivedOutgoingToExternalTableType, prop: "tableType" },
+            { label: _Dashboard.ArchivedOutgoingToExternalDataAction, prop: "dataAction" },
+            { label: _Dashboard.ArchivedOutgoingToExternalEffectiveDate, prop: "effectiveDate",type:'dateTime' },
+            { label: _Dashboard.ArchivedOutgoingToExternalStatus, prop: "status" },
+            { label: _Dashboard.ArchivedOutgoingToExternalSourceSystem, prop: "sourceSystem" },
+            { label: _Dashboard.ArchivedOutgoingToExternalSourceDataId, prop: "sourceDataId" },
+            { label: _Dashboard.ArchivedOutgoingToExternalSourceDataGroupCode, prop: "sourceDataGroupCode" },
+            { label: _Dashboard.ArchivedOutgoingToExternalSourceDataDetailCode, prop: "sourceDataDetailCode" },
+            { label: _Dashboard.ArchivedOutgoingToExternalSourceDataContent, prop: "sourceDataContent", type:"showJsonTable" },
+            { label: _Dashboard.ArchivedOutgoingToExternalWriteTime, prop: "writeTime",type:'dateTime' },
+            { label: _Dashboard.ArchivedOutgoingToExternalWriter, prop: "writer" },
+            { label: _Dashboard.ArchivedOutgoingToExternalDestinationSystem, prop: "destinationSystem" },
+            { label: _Dashboard.ArchivedOutgoingToExternalDestinationDataId, prop: "destinationDataId" },
+            { label: _Dashboard.ArchivedOutgoingToExternalDestinationDataContent, prop: "destinationDataContent", type:"showJsonTable" },
+            { label: _Dashboard.ArchivedOutgoingToExternalReadTime, prop: "readTime",type:'dateTime' },
+            { label: _Dashboard.ArchivedOutgoingToExternalReader, prop: "reader" },
+            { label: _Dashboard.ArchivedOutgoingToExternalErrorCode, prop: "errorCode" },
+            { label: _Dashboard.ArchivedOutgoingToExternalErrorMessage, prop: "errorMessage", type:"showDetail" },
+            { label: _Dashboard.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" },
+          ]
+        }
+        
+      },
+      //渲染数据
+      paging(callback) {
         this.Loading.tableLoading = true;
         this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
         dataExchangeFromOut_file(this.PageListParams)
diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue
index 6cc8f4081..2f90c41d6 100644
--- a/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue
+++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue
@@ -47,7 +47,7 @@
         currenButtonData: [
           this.defaultFieldSettingBtn(),//字段设置
           this.defaultFreshBtn(),//刷新
-        //   this.defaultFilterBtn(),//筛选
+          // this.defaultFilterBtn(),//筛选
         ],
       };
     },
diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue
index 4e831e7d5..24821e6ee 100644
--- a/fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue
+++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue
@@ -47,7 +47,7 @@
         currenButtonData: [
           this.defaultFieldSettingBtn(),//字段设置
           this.defaultFreshBtn(),//刷新
-        //   this.defaultFilterBtn(),//筛选
+          // this.defaultFilterBtn(),//筛选
         ],
       };
     },