diff --git a/PC/InterFace.Dash/public/config.js b/PC/InterFace.Dash/public/config.js
index 22fc6b8..a0d0f9a 100644
--- a/PC/InterFace.Dash/public/config.js
+++ b/PC/InterFace.Dash/public/config.js
@@ -1,6 +1,6 @@
// dev_win
-// window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:60068'
-window.SITE_CONFIG['base'] = 'http://192.168.0.197:60068'
+window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:60068'
+// window.SITE_CONFIG['base'] = 'http://192.168.0.197:60068'
window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-localization'
// window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-configuration'
window.SITE_CONFIG['columnsApiNamesZh'] = 'Z'
diff --git a/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue b/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue
index da24323..1036836 100644
--- a/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue
+++ b/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue
@@ -399,13 +399,14 @@ export default {
// 明细列表 - 获取明细列表(后端分页)
getDetailList(data,successFn,errorFn){
// 获取明细分页信息
+ if(data)this.PageListParams.condition.filters = []
let _hasId = false
this.PageListParams.condition.filters.forEach(item=>{
if(item.column == this.URLOption_masterId){
_hasId = true
}
})
- if(!_hasId){
+ if(!_hasId || data){
this.PageListParams.condition.filters.push({
logic: "And",
column: this.URLOption_masterId,
diff --git a/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue b/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue
index 4fa0bbc..d98ad3d 100644
--- a/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue
+++ b/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue
@@ -162,7 +162,7 @@ props: {
// 超出内容是否提示
showOverflowTooltip:{
type: Boolean,
- default: true,
+ default: false,
},
// 删除api
diff --git a/PC/InterFace.Dash/src/components/tablePagination/index.vue b/PC/InterFace.Dash/src/components/tablePagination/index.vue
index 15a853c..ec27cf7 100644
--- a/PC/InterFace.Dash/src/components/tablePagination/index.vue
+++ b/PC/InterFace.Dash/src/components/tablePagination/index.vue
@@ -101,7 +101,7 @@ export default {
// 超出内容是否提示
showOverflowTooltip:{
type: Boolean,
- default: true,
+ default: false,
},
// 显示搜索配置
quicklySearchOption:{
diff --git a/PC/InterFace.Dash/src/components/umyTable/index.vue b/PC/InterFace.Dash/src/components/umyTable/index.vue
index 0e618d0..b42d59f 100644
--- a/PC/InterFace.Dash/src/components/umyTable/index.vue
+++ b/PC/InterFace.Dash/src/components/umyTable/index.vue
@@ -450,7 +450,7 @@ export default {
// 超出内容是否提示
showOverflowTooltip:{
type: Boolean,
- default: true,
+ default: false,
},
// table是否有border
tableBorder: {
diff --git a/PC/InterFace.Dash/src/utils/detailsPageColumns_api/index.js b/PC/InterFace.Dash/src/utils/detailsPageColumns_api/index.js
index b10817e..ac750f2 100644
--- a/PC/InterFace.Dash/src/utils/detailsPageColumns_api/index.js
+++ b/PC/InterFace.Dash/src/utils/detailsPageColumns_api/index.js
@@ -4,27 +4,27 @@ import { initFromApiColumnsLable } from '@/utils/index'
// AsnMstr
export const AsnMstr = [
- { label: initFromApiColumnsLable('AsnDetAsnMstrId'), prop: "asnMstrId"},
- { label: initFromApiColumnsLable('AsnDetAsnNbr'), prop: "asnNbr" },
- { label: initFromApiColumnsLable('AsnDetEntireBarCode'), prop: "entireBarCode" },
- { label: initFromApiColumnsLable('AsnDetLabelCode'), prop: "labelCode" },
- { label: initFromApiColumnsLable('AsnDetLocUm'), prop: "locUm" },
- { label: initFromApiColumnsLable('AsnDetLot'), prop: "lot" },
- { label: initFromApiColumnsLable('AsnDetPalletLabelCode'), prop: "palletLabelCode" },
- { label: initFromApiColumnsLable('AsnDetPartCode'), prop: "partCode" },
- { label: initFromApiColumnsLable('AsnDetPartType'), prop: "partType" },
- { label: initFromApiColumnsLable('AsnDetPoLine'), prop: "poLine" },
- { label: initFromApiColumnsLable('AsnDetPoNbr'), prop: "poNbr" },
- { label: initFromApiColumnsLable('AsnDetPoUm'), prop: "poUm" },
+ { label: initFromApiColumnsLable('AsnDetAsnMstrId'), prop: "asnMstrId",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetAsnNbr'), prop: "asnNbr" ,type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetEntireBarCode'), prop: "entireBarCode",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetLabelCode'), prop: "labelCode",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetLocUm'), prop: "locUm",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetLot'), prop: "lot" ,type:'showDetail'},
+ { label: initFromApiColumnsLable('AsnDetPalletLabelCode'), prop: "palletLabelCode",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetPartCode'), prop: "partCode",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetPartType'), prop: "partType",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetPoLine'), prop: "poLine",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetPoNbr'), prop: "poNbr",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetPoUm'), prop: "poUm",type:'showDetail' },
{ label: initFromApiColumnsLable('AsnDetProductionDate'), prop: "productionDate",type:'dateTime' },
{ label: initFromApiColumnsLable('AsnDetQty'), prop: "qty" },
- { label: initFromApiColumnsLable('AsnDetRemark'), prop: "remark" },
+ { label: initFromApiColumnsLable('AsnDetRemark'), prop: "remark",type:'showDetail' ,type:'showDetail'},
{ label: initFromApiColumnsLable('AsnDetStatus'), prop: "status" },
- { label: initFromApiColumnsLable('AsnDetStdPackQty'), prop: "stdPackQty" },
- { label: initFromApiColumnsLable('AsnDetSupplierlot'), prop: "supplierlot" },
- { label: initFromApiColumnsLable('AsnDetUmConv'), prop: "umConv" },
- { label: initFromApiColumnsLable('AsnDetWareClass'), prop: "wareClass" },
- { label: initFromApiColumnsLable('AsnDetWareCode'), prop: "wareCode" },
+ { label: initFromApiColumnsLable('AsnDetStdPackQty'), prop: "stdPackQty" ,type:'showDetail'},
+ { label: initFromApiColumnsLable('AsnDetSupplierlot'), prop: "supplierlot",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetUmConv'), prop: "umConv",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetWareClass'), prop: "wareClass" ,type:'showDetail'},
+ { label: initFromApiColumnsLable('AsnDetWareCode'), prop: "wareCode" ,type:'showDetail'},
]
// 测试数据
diff --git a/PC/InterFace.Dash/src/utils/detailsTableColumns_api/index.js b/PC/InterFace.Dash/src/utils/detailsTableColumns_api/index.js
index d789163..8f9fa59 100644
--- a/PC/InterFace.Dash/src/utils/detailsTableColumns_api/index.js
+++ b/PC/InterFace.Dash/src/utils/detailsTableColumns_api/index.js
@@ -6,26 +6,26 @@ import { initFromApiColumnsLable } from '@/utils/index'
// AsnMstr
export const AsnMstr = [
{ label: initFromApiColumnsLable('AsnDetAsnMstrId'), prop: "asnMstrId",showProp:true},
- { label: initFromApiColumnsLable('AsnDetAsnNbr'), prop: "asnNbr" },
- { label: initFromApiColumnsLable('AsnDetEntireBarCode'), prop: "entireBarCode" },
- { label: initFromApiColumnsLable('AsnDetLabelCode'), prop: "labelCode" },
- { label: initFromApiColumnsLable('AsnDetLocUm'), prop: "locUm" },
- { label: initFromApiColumnsLable('AsnDetLot'), prop: "lot" },
- { label: initFromApiColumnsLable('AsnDetPalletLabelCode'), prop: "palletLabelCode" },
- { label: initFromApiColumnsLable('AsnDetPartCode'), prop: "partCode" },
- { label: initFromApiColumnsLable('AsnDetPartType'), prop: "partType" },
- { label: initFromApiColumnsLable('AsnDetPoLine'), prop: "poLine" },
- { label: initFromApiColumnsLable('AsnDetPoNbr'), prop: "poNbr" },
- { label: initFromApiColumnsLable('AsnDetPoUm'), prop: "poUm" },
+ { label: initFromApiColumnsLable('AsnDetAsnNbr'), prop: "asnNbr" ,type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetEntireBarCode'), prop: "entireBarCode",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetLabelCode'), prop: "labelCode",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetLocUm'), prop: "locUm",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetLot'), prop: "lot" ,type:'showDetail'},
+ { label: initFromApiColumnsLable('AsnDetPalletLabelCode'), prop: "palletLabelCode",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetPartCode'), prop: "partCode",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetPartType'), prop: "partType",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetPoLine'), prop: "poLine",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetPoNbr'), prop: "poNbr",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetPoUm'), prop: "poUm",type:'showDetail' },
{ label: initFromApiColumnsLable('AsnDetProductionDate'), prop: "productionDate",type:'dateTime' },
{ label: initFromApiColumnsLable('AsnDetQty'), prop: "qty" },
- { label: initFromApiColumnsLable('AsnDetRemark'), prop: "remark" },
+ { label: initFromApiColumnsLable('AsnDetRemark'), prop: "remark",type:'showDetail' ,type:'showDetail'},
{ label: initFromApiColumnsLable('AsnDetStatus'), prop: "status" },
- { label: initFromApiColumnsLable('AsnDetStdPackQty'), prop: "stdPackQty" },
- { label: initFromApiColumnsLable('AsnDetSupplierlot'), prop: "supplierlot" },
- { label: initFromApiColumnsLable('AsnDetUmConv'), prop: "umConv" },
- { label: initFromApiColumnsLable('AsnDetWareClass'), prop: "wareClass" },
- { label: initFromApiColumnsLable('AsnDetWareCode'), prop: "wareCode" },
+ { label: initFromApiColumnsLable('AsnDetStdPackQty'), prop: "stdPackQty" ,type:'showDetail'},
+ { label: initFromApiColumnsLable('AsnDetSupplierlot'), prop: "supplierlot",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetUmConv'), prop: "umConv",type:'showDetail' },
+ { label: initFromApiColumnsLable('AsnDetWareClass'), prop: "wareClass" ,type:'showDetail'},
+ { label: initFromApiColumnsLable('AsnDetWareCode'), prop: "wareCode" ,type:'showDetail'},
]
// 测试数据
diff --git a/PC/InterFace.Dash/src/utils/tableColumns_api/index.js b/PC/InterFace.Dash/src/utils/tableColumns_api/index.js
index 8b07b68..74c42eb 100644
--- a/PC/InterFace.Dash/src/utils/tableColumns_api/index.js
+++ b/PC/InterFace.Dash/src/utils/tableColumns_api/index.js
@@ -13,25 +13,25 @@ export const ExportCustomUserSetting = [
// AsnMstr
export const AsnMstr = [
- { label: initFromApiColumnsLable('AsnMstrAsnNbr'), prop: "asnNbr", fixed:'left'},
- { label: initFromApiColumnsLable('AsnMstrCompany'), prop: "company" },
- { label: initFromApiColumnsLable('AsnMstrContacts'), prop: "contacts" },
- { label: initFromApiColumnsLable('AsnMstrDock'), prop: "dock" },
+ { label: initFromApiColumnsLable('AsnMstrAsnNbr'), prop: "asnNbr", fixed:'left', type:"showDetail"},
+ { label: initFromApiColumnsLable('AsnMstrCompany'), prop: "company" , type:"showDetail" },
+ { label: initFromApiColumnsLable('AsnMstrContacts'), prop: "contacts", type:"showDetail" },
+ { label: initFromApiColumnsLable('AsnMstrDock'), prop: "dock", type:"showDetail" },
{ label: initFromApiColumnsLable('AsnMstrDueDate'), prop: "dueDate",type:'dateTime' },
- { label: initFromApiColumnsLable('AsnMstrErrorCode'), prop: "errorCode" },
+ { label: initFromApiColumnsLable('AsnMstrErrorCode'), prop: "errorCode" , type:"showDetail"},
{ label: initFromApiColumnsLable('AsnMstrErrorMessage'), prop: "errorMessage", type:"showDetail" },
- { label: initFromApiColumnsLable('AsnMstrPhone'), prop: "phone" },
- { label: initFromApiColumnsLable('AsnMstrPoNbr'), prop: "poNbr" },
- { label: initFromApiColumnsLable('AsnMstrRemark'), prop: "remark" },
- { label: initFromApiColumnsLable('AsnMstrRpNbr'), prop: "rpNbr" },
+ { label: initFromApiColumnsLable('AsnMstrPhone'), prop: "phone", type:"showDetail" },
+ { label: initFromApiColumnsLable('AsnMstrPoNbr'), prop: "poNbr" , type:"showDetail"},
+ { label: initFromApiColumnsLable('AsnMstrRemark'), prop: "remark", type:"showDetail" },
+ { label: initFromApiColumnsLable('AsnMstrRpNbr'), prop: "rpNbr", type:"showDetail" },
{ label: initFromApiColumnsLable('AsnMstrShipDate'), prop: "shipDate" ,type:'dateTime' },
- { label: initFromApiColumnsLable('AsnMstrSite'), prop: "site" },
- { label: initFromApiColumnsLable('AsnMstrStatus'), prop: "status" },
- { label: initFromApiColumnsLable('AsnMstrTimeWindow'), prop: "timeWindow" },
- { label: initFromApiColumnsLable('AsnMstrTraceId'), prop: "traceId" },
- { label: initFromApiColumnsLable('AsnMstrTruckNbr'), prop: "truckNbr" },
- { label: initFromApiColumnsLable('AsnMstrVendorCode'), prop: "vendorCode" },
- { label: initFromApiColumnsLable('AsnMstrWhse'), prop: "whse" },
+ { label: initFromApiColumnsLable('AsnMstrSite'), prop: "site", type:"showDetail" },
+ { label: initFromApiColumnsLable('AsnMstrStatus'), prop: "status", type:"showDetail" },
+ { label: initFromApiColumnsLable('AsnMstrTimeWindow'), prop: "timeWindow" , type:"showDetail"},
+ { label: initFromApiColumnsLable('AsnMstrTraceId'), prop: "traceId", type:"showDetail" },
+ { label: initFromApiColumnsLable('AsnMstrTruckNbr'), prop: "truckNbr" , type:"showDetail"},
+ { label: initFromApiColumnsLable('AsnMstrVendorCode'), prop: "vendorCode", type:"showDetail" },
+ { label: initFromApiColumnsLable('AsnMstrWhse'), prop: "whse", type:"showDetail" },
// {
// label: '操作',
// type:"buttonOperation",
@@ -43,110 +43,110 @@ export const AsnMstr = [
// IncomingData
export const IncomingData = [
- { label: initFromApiColumnsLable('IncomingDataCompany'), prop: "company" },
- { label: initFromApiColumnsLable('IncomingDataDataContent'), prop: "dataContent", type:"showJsonTable" },
- { label: initFromApiColumnsLable('IncomingDataDataType'), prop: "dataType" },
- { label: initFromApiColumnsLable('IncomingDataDestinationSystem'), prop: "destinationSystem" },
+ { label: initFromApiColumnsLable('IncomingDataCompany'), prop: "company", type:"showDetail" },
+ { label: initFromApiColumnsLable('IncomingDataDataContent'), prop: "dataContent", type:"showDetail" },
+ { label: initFromApiColumnsLable('IncomingDataDataType'), prop: "dataType" , type:"showDetail"},
+ { label: initFromApiColumnsLable('IncomingDataDestinationSystem'), prop: "destinationSystem" , type:"showDetail"},
{ label: initFromApiColumnsLable('IncomingDataEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
- { label: initFromApiColumnsLable('IncomingDataErrorCode'), prop: "errorCode" },
+ { label: initFromApiColumnsLable('IncomingDataErrorCode'), prop: "errorCode", type:"showDetail" },
{ label: initFromApiColumnsLable('IncomingDataErrorMessage'), prop: "errorMessage", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataNumber'), prop: "number" },
+ { label: initFromApiColumnsLable('IncomingDataNumber'), prop: "number", type:"showDetail" },
{ label: initFromApiColumnsLable('IncomingDataReadTime'), prop: "readTime",type:'dateTime' },
- { label: initFromApiColumnsLable('IncomingDataReader'), prop: "reader" },
- { label: initFromApiColumnsLable('IncomingDataRemark'), prop: "remark" },
- { label: initFromApiColumnsLable('IncomingDataRetryTimes'), prop: "retryTimes" },
- { label: initFromApiColumnsLable('IncomingDataSourceSystem'), prop: "sourceSystem" },
- { label: initFromApiColumnsLable('IncomingDataStatus'), prop: "status" },
- { label: initFromApiColumnsLable('IncomingDataWriteTime'), prop: "writeTime", type:"dateTime" },
- { label: initFromApiColumnsLable('IncomingDataWriter'), prop: "writer" },
+ { label: initFromApiColumnsLable('IncomingDataReader'), prop: "reader", type:"showDetail" },
+ { label: initFromApiColumnsLable('IncomingDataRemark'), prop: "remark", type:"showDetail" },
+ { label: initFromApiColumnsLable('IncomingDataRetryTimes'), prop: "retryTimes" , type:"showDetail"},
+ { label: initFromApiColumnsLable('IncomingDataSourceSystem'), prop: "sourceSystem", type:"showDetail" },
+ { label: initFromApiColumnsLable('IncomingDataStatus'), prop: "status", type:"showDetail" },
+ { label: initFromApiColumnsLable('IncomingDataWriteTime'), prop: "writeTime", type:"dateTime" , type:"showDetail"},
+ { label: initFromApiColumnsLable('IncomingDataWriter'), prop: "writer", type:"showDetail" },
]
// IncomingDataHistory
export const IncomingDataHistory = [
- { label: initFromApiColumnsLable('IncomingDataHistoryCompany'), prop: "company" },
- { label: initFromApiColumnsLable('IncomingDataHistoryDataContent'), prop: "dataContent", type:"showJsonTable" },
- { label: initFromApiColumnsLable('IncomingDataHistoryDataType'), prop: "dataType" },
- { label: initFromApiColumnsLable('IncomingDataHistoryDestinationSystem'), prop: "destinationSystem" },
+ { label: initFromApiColumnsLable('IncomingDataHistoryCompany'), prop: "company" , type:"showDetail"},
+ { label: initFromApiColumnsLable('IncomingDataHistoryDataContent'), prop: "dataContent", type:"showDetail" },
+ { label: initFromApiColumnsLable('IncomingDataHistoryDataType'), prop: "dataType", type:"showDetail" },
+ { label: initFromApiColumnsLable('IncomingDataHistoryDestinationSystem'), prop: "destinationSystem", type:"showDetail" },
{ label: initFromApiColumnsLable('IncomingDataHistoryEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
- { label: initFromApiColumnsLable('IncomingDataHistoryErrorCode'), prop: "errorCode" },
+ { label: initFromApiColumnsLable('IncomingDataHistoryErrorCode'), prop: "errorCode", type:"showDetail" },
{ label: initFromApiColumnsLable('IncomingDataHistoryErrorMessage'), prop: "errorMessage", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataHistoryNumber'), prop: "number" },
+ { label: initFromApiColumnsLable('IncomingDataHistoryNumber'), prop: "number", type:"showDetail" },
{ label: initFromApiColumnsLable('IncomingDataHistoryReadTime'), prop: "readTime",type:'dateTime' },
- { label: initFromApiColumnsLable('IncomingDataHistoryReader'), prop: "reader" },
- { label: initFromApiColumnsLable('IncomingDataHistoryRemark'), prop: "remark" },
- { label: initFromApiColumnsLable('IncomingDataHistoryRetryTimes'), prop: "retryTimes" },
- { label: initFromApiColumnsLable('IncomingDataHistorySourceSystem'), prop: "sourceSystem" },
- { label: initFromApiColumnsLable('IncomingDataHistoryStatus'), prop: "status" },
+ { label: initFromApiColumnsLable('IncomingDataHistoryReader'), prop: "reader", type:"showDetail" },
+ { label: initFromApiColumnsLable('IncomingDataHistoryRemark'), prop: "remark", type:"showDetail" },
+ { label: initFromApiColumnsLable('IncomingDataHistoryRetryTimes'), prop: "retryTimes" , type:"showDetail"},
+ { label: initFromApiColumnsLable('IncomingDataHistorySourceSystem'), prop: "sourceSystem" , type:"showDetail"},
+ { label: initFromApiColumnsLable('IncomingDataHistoryStatus'), prop: "status", type:"showDetail" },
{ label: initFromApiColumnsLable('IncomingDataHistoryWriteTime'), prop: "writeTime", type:"dateTime" },
- { label: initFromApiColumnsLable('IncomingDataHistoryWriter'), prop: "writer" },
+ { label: initFromApiColumnsLable('IncomingDataHistoryWriter'), prop: "writer" , type:"showDetail"},
]
// OutgoingData
export const OutgoingData = [
- { label: initFromApiColumnsLable('OutgoingDataCompany'), prop: "company" },
+ { label: initFromApiColumnsLable('OutgoingDataCompany'), prop: "company" , type:"showDetail"},
{ label: initFromApiColumnsLable('OutgoingDataDataContent'), prop: "dataContent", type:"showJsonTable" },
- { label: initFromApiColumnsLable('OutgoingDataDataType'), prop: "dataType" },
- { label: initFromApiColumnsLable('OutgoingDataDestinationSystem'), prop: "destinationSystem" },
+ { label: initFromApiColumnsLable('OutgoingDataDataType'), prop: "dataType" , type:"showDetail"},
+ { label: initFromApiColumnsLable('OutgoingDataDestinationSystem'), prop: "destinationSystem", type:"showDetail" },
{ label: initFromApiColumnsLable('OutgoingDataEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
- { label: initFromApiColumnsLable('OutgoingDataErrorCode'), prop: "errorCode" },
+ { label: initFromApiColumnsLable('OutgoingDataErrorCode'), prop: "errorCode", type:"showDetail" },
{ label: initFromApiColumnsLable('OutgoingDataErrorMessage'), prop: "errorMessage", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataNumber'), prop: "number" },
+ { label: initFromApiColumnsLable('OutgoingDataNumber'), prop: "number", type:"showDetail" },
{ label: initFromApiColumnsLable('OutgoingDataReadTime'), prop: "readTime",type:'dateTime' },
- { label: initFromApiColumnsLable('OutgoingDataReader'), prop: "reader" },
- { label: initFromApiColumnsLable('OutgoingDataRemark'), prop: "remark" },
- { label: initFromApiColumnsLable('OutgoingDataRetryTimes'), prop: "retryTimes" },
- { label: initFromApiColumnsLable('OutgoingDataSourceSystem'), prop: "sourceSystem" },
- { label: initFromApiColumnsLable('OutgoingDataStatus'), prop: "status" },
+ { label: initFromApiColumnsLable('OutgoingDataReader'), prop: "reader", type:"showDetail" },
+ { label: initFromApiColumnsLable('OutgoingDataRemark'), prop: "remark", type:"showDetail" },
+ { label: initFromApiColumnsLable('OutgoingDataRetryTimes'), prop: "retryTimes" , type:"showDetail"},
+ { label: initFromApiColumnsLable('OutgoingDataSourceSystem'), prop: "sourceSystem", type:"showDetail" },
+ { label: initFromApiColumnsLable('OutgoingDataStatus'), prop: "status", type:"showDetail" },
{ label: initFromApiColumnsLable('OutgoingDataWriteTime'), prop: "writeTime", type:"dateTime" },
- { label: initFromApiColumnsLable('OutgoingDataWriter'), prop: "writer" },
+ { label: initFromApiColumnsLable('OutgoingDataWriter'), prop: "writer", type:"showDetail" },
]
// OutgoingDataHistory
export const OutgoingDataHistory = [
- { label: initFromApiColumnsLable('OutgoingDataHistoryCompany'), prop: "company" },
+ { label: initFromApiColumnsLable('OutgoingDataHistoryCompany'), prop: "company", type:"showDetail" },
{ label: initFromApiColumnsLable('OutgoingDataHistoryDataContent'), prop: "dataContent", type:"showJsonTable" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryDataType'), prop: "dataType" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryDestinationSystem'), prop: "destinationSystem" },
+ { label: initFromApiColumnsLable('OutgoingDataHistoryDataType'), prop: "dataType", type:"showDetail" },
+ { label: initFromApiColumnsLable('OutgoingDataHistoryDestinationSystem'), prop: "destinationSystem", type:"showDetail" },
{ label: initFromApiColumnsLable('OutgoingDataHistoryEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
- { label: initFromApiColumnsLable('OutgoingDataHistoryErrorCode'), prop: "errorCode" },
+ { label: initFromApiColumnsLable('OutgoingDataHistoryErrorCode'), prop: "errorCode" , type:"showDetail"},
{ label: initFromApiColumnsLable('OutgoingDataHistoryErrorMessage'), prop: "errorMessage", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryNumber'), prop: "number" },
+ { label: initFromApiColumnsLable('OutgoingDataHistoryNumber'), prop: "number", type:"showDetail"},
{ label: initFromApiColumnsLable('OutgoingDataHistoryReadTime'), prop: "readTime",type:'dateTime' },
- { label: initFromApiColumnsLable('OutgoingDataHistoryReader'), prop: "reader" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryRemark'), prop: "remark" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryRetryTimes'), prop: "retryTimes" },
- { label: initFromApiColumnsLable('OutgoingDataHistorySourceSystem'), prop: "sourceSystem" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryStatus'), prop: "status" },
+ { label: initFromApiColumnsLable('OutgoingDataHistoryReader'), prop: "reader", type:"showDetail" },
+ { label: initFromApiColumnsLable('OutgoingDataHistoryRemark'), prop: "remark" , type:"showDetail"},
+ { label: initFromApiColumnsLable('OutgoingDataHistoryRetryTimes'), prop: "retryTimes", type:"showDetail" },
+ { label: initFromApiColumnsLable('OutgoingDataHistorySourceSystem'), prop: "sourceSystem", type:"showDetail" },
+ { label: initFromApiColumnsLable('OutgoingDataHistoryStatus'), prop: "status", type:"showDetail"},
{ label: initFromApiColumnsLable('OutgoingDataHistoryWriteTime'), prop: "writeTime", type:"dateTime" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryWriter'), prop: "writer" },
+ { label: initFromApiColumnsLable('OutgoingDataHistoryWriter'), prop: "writer", type:"showDetail" },
]
// MessageReceive
export const MessageReceive = [
- { label: initFromApiColumnsLable('MessageReceiveErrorCount'), prop: "errorCount" },
+ { label: initFromApiColumnsLable('MessageReceiveErrorCount'), prop: "errorCount", type:"showDetail" },
{ label: initFromApiColumnsLable('MessageReceiveErrorMessage'), prop: "errorMessage", type:"showDetail" },
{ label: initFromApiColumnsLable('MessageReceiveLastUpdateTime'), prop: "updateTime",type:'dateTime' },
{ label: initFromApiColumnsLable('MessageReceiveMessageContent'), prop: "messageContent", type:"showDetail" },
- { label: initFromApiColumnsLable('MessageReceiveMessageFileName'), prop: "messageFileName" },
- { label: initFromApiColumnsLable('MessageReceiveMessageFileType'), prop: "messageFileType" },
- { label: initFromApiColumnsLable('MessageReceiveOperateType'), prop: "operateType" },
- { label: initFromApiColumnsLable('MessageReceiveReceiveStatus'), prop: "receiveStatus" },
+ { label: initFromApiColumnsLable('MessageReceiveMessageFileName'), prop: "messageFileName", type:"showDetail" },
+ { label: initFromApiColumnsLable('MessageReceiveMessageFileType'), prop: "messageFileType", type:"showDetail" },
+ { label: initFromApiColumnsLable('MessageReceiveOperateType'), prop: "operateType" , type:"showDetail"},
+ { label: initFromApiColumnsLable('MessageReceiveReceiveStatus'), prop: "receiveStatus", type:"showDetail" },
{ label: initFromApiColumnsLable('MessageReceiveReceiveTime'), prop: "receiveTime", type:"dateTime" },
]
// MesProductL7PartsNote
export const MesProductL7PartsNote = [
- { label: initFromApiColumnsLable('MesProductL7PartsNoteConfiguration'), prop: "configuration" },
+ { label: initFromApiColumnsLable('MesProductL7PartsNoteConfiguration'), prop: "configuration" , type:"showDetail"},
{ label: initFromApiColumnsLable('MesProductL7PartsNoteCreateDate'), prop: "createDate", type:"dateTime" },
- { label: initFromApiColumnsLable('MesProductL7PartsNoteFATA'), prop: "fata" },
- { label: initFromApiColumnsLable('MesProductL7PartsNoteL7Part'), prop: "l7Part" },
- { label: initFromApiColumnsLable('MesProductL7PartsNotePosition'), prop: "position" },
- { label: initFromApiColumnsLable('MesProductL7PartsNoteProductNo'), prop: "productNo" },
- { label: initFromApiColumnsLable('MesProductL7PartsNoteProgram'), prop: "program" },
- { label: initFromApiColumnsLable('MesProductL7PartsNoteQty'), prop: "qty" },
- { label: initFromApiColumnsLable('MesProductL7PartsNoteRemark'), prop: "remark" },
- { label: initFromApiColumnsLable('MesProductL7PartsNoteRowID'), prop: "rowID" },
- { label: initFromApiColumnsLable('MesProductL7PartsNoteState'), prop: "state" },
+ { label: initFromApiColumnsLable('MesProductL7PartsNoteFATA'), prop: "fata", type:"showDetail" },
+ { label: initFromApiColumnsLable('MesProductL7PartsNoteL7Part'), prop: "l7Part" , type:"showDetail"},
+ { label: initFromApiColumnsLable('MesProductL7PartsNotePosition'), prop: "position" , type:"showDetail"},
+ { label: initFromApiColumnsLable('MesProductL7PartsNoteProductNo'), prop: "productNo" , type:"showDetail"},
+ { label: initFromApiColumnsLable('MesProductL7PartsNoteProgram'), prop: "program", type:"showDetail" },
+ { label: initFromApiColumnsLable('MesProductL7PartsNoteQty'), prop: "qty" , type:"showDetail"},
+ { label: initFromApiColumnsLable('MesProductL7PartsNoteRemark'), prop: "remark" , type:"showDetail"},
+ { label: initFromApiColumnsLable('MesProductL7PartsNoteRowID'), prop: "rowID", type:"showDetail" },
+ { label: initFromApiColumnsLable('MesProductL7PartsNoteState'), prop: "state", type:"showDetail" },
]
// 测试数据
diff --git a/PC/InterFace.Dash/src/views/interfaceBoard/IncomingData.vue b/PC/InterFace.Dash/src/views/interfaceBoard/IncomingData.vue
index 48189fc..739965a 100644
--- a/PC/InterFace.Dash/src/views/interfaceBoard/IncomingData.vue
+++ b/PC/InterFace.Dash/src/views/interfaceBoard/IncomingData.vue
@@ -24,24 +24,12 @@
@overallSearchFormClick="overallSearchFormClick"
:httpOverallSearchData="httpOverallSearchData"
>
- (displayDialog.detailsDialog = val)"
- @drawerbutton="drawerbutton"
- @handleCommand="drawerHandle"
- @close-value="closeValue"
- :totalCount="totalCountDetails"
- :currentPage="oldSkipCountDetails"
- :MaxResultCount="MaxResultCountDetails"
- @alterResultCountDetails="alterResultCountDetails"
- @alertoldSkipCountDetails="alertoldSkipCountDetails"
- >
+
+