diff --git a/fe/PC/src/api/wms-interface.js b/fe/PC/src/api/wms-interface.js index 08b3db456..23ac5371a 100644 --- a/fe/PC/src/api/wms-interface.js +++ b/fe/PC/src/api/wms-interface.js @@ -103,7 +103,15 @@ export function TestSchool(data, includeDetails) { }) } -// 测试数据-新增、编辑 +// 测试数据-列表-根据id获取详情 +export function TestSchoolItemById(id) { + return axios({ + method:'get', + url: base_api + 'api/app/test-school/'+id, + }) +} + +// 测试数据-列表-新增、编辑 export function TestSchool_save(data,isAdd) { let _type = isAdd ? 'create' : 'update-by-id' // let _url = isEdit ? '/api/TestSchool/base/update-by-id?id='+ data.id : '/api/TestSchool/base/create' @@ -118,11 +126,29 @@ export function TestSchool_save(data,isAdd) { }) } -// 测试数据-删除 +// 测试数据-列表-删除 export function TestSchool_delete(id) { return axios({ method:'DELETE', - url: base_api + 'outgoing-to-external/' + id, + url: base_api + 'api/TestSchool/base/delete-by-id', + params:{id:id} + }) +} + +// 测试数据-明细-列表 +export function TestSchoolDetailList(data,includeDetails) { + return axios({ + method:'post', + url: base_api + 'api/TestStudentDetail/base/get-list-page-by-filter?includeDetails='+Boolean(includeDetails), + data }) } +// 测试数据-明细-删除 +export function TestSchoolDetailList_delete(id) { + return axios({ + method:'DELETE', + url: base_api + 'api/TestStudentDetail/base/delete-by-id', + params:{id:id} + }) +} \ No newline at end of file diff --git a/fe/PC/src/components/filterForDetailPage/index.vue b/fe/PC/src/components/filterForDetailPage/index.vue new file mode 100644 index 000000000..287ea6e4d --- /dev/null +++ b/fe/PC/src/components/filterForDetailPage/index.vue @@ -0,0 +1,197 @@ + + + \ No newline at end of file diff --git a/fe/PC/src/components/tablePagination/index.vue b/fe/PC/src/components/tablePagination/index.vue index 89d948364..df6940230 100644 --- a/fe/PC/src/components/tablePagination/index.vue +++ b/fe/PC/src/components/tablePagination/index.vue @@ -45,7 +45,7 @@ :tableColumns="tableColumns | isTableColumns" :isShowIndex="isShowIndex" :selectionTable="tableSelection" - :setUTableHeight="uTableTopHeight" + :setUTableHeight="setUTableHeight || uTableTopHeight" @sortChange="sortChange" @handleSelectionChange="handleSelectionChange" @inlineDialog="inlineDialog" @@ -85,6 +85,11 @@ export default { rowDrop }, props: { + // 已app-main高度为100% 需要减掉的高度 + setUTableHeight: { + type: Number, + default: null + }, // 超出内容是否提示 showOverflowTooltip:{ type: Boolean, diff --git a/fe/PC/src/main.js b/fe/PC/src/main.js index 46cbb8fa9..672751e96 100644 --- a/fe/PC/src/main.js +++ b/fe/PC/src/main.js @@ -34,7 +34,8 @@ import { defaultFreshBtn, defaultFilterBtn, defaultImportBtn, - defaultExportBtn + defaultExportBtn, + defaultFilterForDetailBtn } from '@/utils/defaultButtons'; Vue.prototype.defaultFieldSettingBtn = defaultFieldSettingBtn; @@ -43,6 +44,7 @@ Vue.prototype.defaultFreshBtn = defaultFreshBtn; Vue.prototype.defaultFilterBtn = defaultFilterBtn; Vue.prototype.defaultImportBtn = defaultImportBtn; Vue.prototype.defaultExportBtn = defaultExportBtn; +Vue.prototype.defaultFilterForDetailBtn = defaultFilterForDetailBtn; import * as filters from './filters' // global filters diff --git a/fe/PC/src/utils/defaultButtons.js b/fe/PC/src/utils/defaultButtons.js index 2cbac6f98..bf997a29b 100644 --- a/fe/PC/src/utils/defaultButtons.js +++ b/fe/PC/src/utils/defaultButtons.js @@ -92,7 +92,17 @@ export function defaultFilterBtn(option) { }) } - +// 明细查询按钮 +export function defaultFilterForDetailBtn(option) { + return __defaultBtnOption(option,{ + type: "warning", + icon: "el-icon-finished", + label: "明细查询", + name: "filterForDetail", + size: "mini", + float: 'right', + }) +} // 默认按钮规则 function __defaultBtnOption(option,specific){ diff --git a/fe/PC/src/utils/isLocalApiDetailsTableColumns/index.js b/fe/PC/src/utils/isLocalApiDetailsTableColumns/index.js new file mode 100644 index 000000000..ddd34a333 --- /dev/null +++ b/fe/PC/src/utils/isLocalApiDetailsTableColumns/index.js @@ -0,0 +1,26 @@ +//全局从接口缓存的明细(如:接口监控看板) +// import { getInterfaceBoard } from "@/api/wms-interface" + +// getList = () => { +// getInterfaceBoard().then(result => { + +// localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.data.localization.values.Dashboard)); +// }) +// .catch(err => { +// }) +// } +let _Dashboard = localStorage.getItem("interfaceBoardColumnsNames") +if(_Dashboard && _Dashboard != 'undefined' && _Dashboard != 'null') { + _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) +} +// 用于如果没有表头数据时候报错问题处理 +const initDashboardLable = (data) => { + return _Dashboard ? _Dashboard[data] : null +} + +// 测试数据 +export const TestSchool = [ + { label: '学生33', prop: "studentName" }, + { label: 'orderType33', prop: "orderType" }, + { label: '创建时间33', prop: "creationTime", type:'dateTime' }, +] \ No newline at end of file diff --git a/fe/PC/src/utils/isLocalApiTableColums/index.js b/fe/PC/src/utils/isLocalApiTableColums/index.js index 9f60bf473..76c1d2945 100644 --- a/fe/PC/src/utils/isLocalApiTableColums/index.js +++ b/fe/PC/src/utils/isLocalApiTableColums/index.js @@ -1,4 +1,4 @@ - +//全局从接口缓存的表头(如:接口监控看板) // import { getInterfaceBoard } from "@/api/wms-interface" // getList = () => { @@ -246,32 +246,7 @@ export const comingFromOut_file = [ // 测试数据 export const TestSchool = [ - { label: initDashboardLable('OutgoingToExternalNumber'), prop: "number" }, - { label: initDashboardLable('OutgoingToExternalRemark'), prop: "remark", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalDataType'), prop: "dataType", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalTableType'), prop: "tableType" }, - { label: initDashboardLable('OutgoingToExternalDataAction'), prop: "dataAction" }, - { label: initDashboardLable('OutgoingToExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, - { label: initDashboardLable('OutgoingToExternalStatus'), prop: "status" }, - { label: initDashboardLable('OutgoingToExternalSourceSystem'), prop: "sourceSystem", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalSourceDataId'), prop: "sourceDataId" }, - { label: initDashboardLable('OutgoingToExternalSourceDataGroupCode'), prop: "sourceDataGroupCode", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalSourceDataDetailCode'), prop: "sourceDataDetailCode", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" }, - { label: initDashboardLable('OutgoingToExternalWriteTime'), prop: "writeTime",type:'dateTime' }, - { label: initDashboardLable('OutgoingToExternalWriter'), prop: "writer" }, - { label: initDashboardLable('OutgoingToExternalDestinationSystem'), prop: "destinationSystem", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalDestinationDataId'), prop: "destinationDataId" }, - { label: initDashboardLable('OutgoingToExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" }, - { label: initDashboardLable('OutgoingToExternalReadTime'), prop: "readTime",type:'dateTime' }, - { label: initDashboardLable('OutgoingToExternalReader'), prop: "reader" }, - { label: initDashboardLable('OutgoingToExternalErrorCode'), prop: "errorCode" }, - { label: initDashboardLable('OutgoingToExternalErrorMessage'), prop: "errorMessage", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalRetryTimes'), prop: "retryTimes" }, - // ************** 暂时隐藏 ************************ - // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' }, - // { label: _Public.creatorId, prop: "creatorId" }, - // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' }, - // { label: _Public.lastModifierId, prop: "lastModifierId" }, - // { label: _Public.ID, prop: "ID" }, + { label: '名称11', prop: "schoolName", fixed: "left", type: "name" }, + { label: 'orderType11', prop: "orderType" }, + { label: '创建时间11', prop: "creationTime", type:'dateTime' }, ] \ No newline at end of file diff --git a/fe/PC/src/utils/isLocalApiTableDesTions/index.js b/fe/PC/src/utils/isLocalApiTableDesTions/index.js new file mode 100644 index 000000000..ee238b5fa --- /dev/null +++ b/fe/PC/src/utils/isLocalApiTableDesTions/index.js @@ -0,0 +1,252 @@ +//全局从接口缓存的详情(如:接口监控看板) +// import { getInterfaceBoard } from "@/api/wms-interface" + +// getList = () => { +// getInterfaceBoard().then(result => { + +// localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.data.localization.values.Dashboard)); +// }) +// .catch(err => { +// }) +// } +let _Dashboard = localStorage.getItem("interfaceBoardColumnsNames") +if(_Dashboard && _Dashboard != 'undefined' && _Dashboard != 'null') { + _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) +} +// 用于如果没有表头数据时候报错问题处理 +const initDashboardLable = (data) => { + return _Dashboard ? _Dashboard[data] : null +} + +// 1外部数据转换 +export const dataExchangeFromOut = [ + { label: initDashboardLable('OutgoingToExternalNumber'), prop: "number" }, + { label: initDashboardLable('OutgoingToExternalRemark'), prop: "remark", type:"showDetail" }, + { label: initDashboardLable('OutgoingToExternalDataType'), prop: "dataType", type:"showDetail" }, + { label: initDashboardLable('OutgoingToExternalTableType'), prop: "tableType" }, + { label: initDashboardLable('OutgoingToExternalDataAction'), prop: "dataAction" }, + { label: initDashboardLable('OutgoingToExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, + { label: initDashboardLable('OutgoingToExternalStatus'), prop: "status" }, + { label: initDashboardLable('OutgoingToExternalSourceSystem'), prop: "sourceSystem", type:"showDetail" }, + { label: initDashboardLable('OutgoingToExternalSourceDataId'), prop: "sourceDataId" }, + { label: initDashboardLable('OutgoingToExternalSourceDataGroupCode'), prop: "sourceDataGroupCode", type:"showDetail" }, + { label: initDashboardLable('OutgoingToExternalSourceDataDetailCode'), prop: "sourceDataDetailCode", type:"showDetail" }, + { label: initDashboardLable('OutgoingToExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" }, + { label: initDashboardLable('OutgoingToExternalWriteTime'), prop: "writeTime",type:'dateTime' }, + { label: initDashboardLable('OutgoingToExternalWriter'), prop: "writer" }, + { label: initDashboardLable('OutgoingToExternalDestinationSystem'), prop: "destinationSystem", type:"showDetail" }, + { label: initDashboardLable('OutgoingToExternalDestinationDataId'), prop: "destinationDataId" }, + { label: initDashboardLable('OutgoingToExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" }, + { label: initDashboardLable('OutgoingToExternalReadTime'), prop: "readTime",type:'dateTime' }, + { label: initDashboardLable('OutgoingToExternalReader'), prop: "reader" }, + { label: initDashboardLable('OutgoingToExternalErrorCode'), prop: "errorCode" }, + { label: initDashboardLable('OutgoingToExternalErrorMessage'), prop: "errorMessage", type:"showDetail" }, + { label: initDashboardLable('OutgoingToExternalRetryTimes'), prop: "retryTimes" }, + // ************** 暂时隐藏 ************************ + // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' }, + // { label: _Public.creatorId, prop: "creatorId" }, + // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' }, + // { label: _Public.lastModifierId, prop: "lastModifierId" }, + // { label: _Public.ID, prop: "ID" }, +] + +// 2归档外部数据转换 +export const dataExchangeFromOut_file = [ + { label: initDashboardLable('ArchivedOutgoingToExternalNumber'), prop: "number" }, + { label: initDashboardLable('ArchivedOutgoingToExternalRemark'), prop: "remark", type:"showDetail" }, + { label: initDashboardLable('ArchivedOutgoingToExternalDataType'), prop: "dataType" }, + { label: initDashboardLable('ArchivedOutgoingToExternalTableType'), prop: "tableType" }, + { label: initDashboardLable('ArchivedOutgoingToExternalDataAction'), prop: "dataAction" }, + { label: initDashboardLable('ArchivedOutgoingToExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, + { label: initDashboardLable('ArchivedOutgoingToExternalStatus'), prop: "status" }, + { label: initDashboardLable('ArchivedOutgoingToExternalSourceSystem'), prop: "sourceSystem" }, + { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataId'), prop: "sourceDataId" }, + { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" }, + { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" }, + { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" }, + { label: initDashboardLable('ArchivedOutgoingToExternalWriteTime'), prop: "writeTime",type:'dateTime' }, + { label: initDashboardLable('ArchivedOutgoingToExternalWriter'), prop: "writer" }, + { label: initDashboardLable('ArchivedOutgoingToExternalDestinationSystem'), prop: "destinationSystem" }, + { label: initDashboardLable('ArchivedOutgoingToExternalDestinationDataId'), prop: "destinationDataId" }, + { label: initDashboardLable('ArchivedOutgoingToExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" }, + { label: initDashboardLable('ArchivedOutgoingToExternalReadTime'), prop: "readTime",type:'dateTime' }, + { label: initDashboardLable('ArchivedOutgoingToExternalReader'), prop: "reader" }, + { label: initDashboardLable('ArchivedOutgoingToExternalErrorCode'), prop: "errorCode" }, + { label: initDashboardLable('ArchivedOutgoingToExternalErrorMessage'), prop: "errorMessage", type:"showDetail" }, + { label: initDashboardLable('ArchivedOutgoingToExternalRetryTimes'), prop: "retryTimes" }, +// ************** 暂时隐藏 ************************ + // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' }, + // { label: _Public.creatorId, prop: "creatorId" }, + // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' }, + // { label: _Public.lastModifierId, prop: "lastModifierId" }, + // { label: _Public.ID, prop: "ID" }, +] + +// 3WMS数据接收 +export const comingToWms = [ + { label: initDashboardLable('IncomingToWmsNumber'), prop: "number" }, + { label: initDashboardLable('IncomingToWmsRemark'), prop: "remark", type:"showDetail" }, + { label: initDashboardLable('IncomingToWmsDataType'), prop: "dataType" }, + { label: initDashboardLable('IncomingToWmsDataAction'), prop: "dataAction" }, + { label: initDashboardLable('IncomingToWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, + { label: initDashboardLable('IncomingToWmsStatus'), prop: "status" }, + { label: initDashboardLable('IncomingToWmsDataIdentityCode'), prop: "dataIdentityCode" }, + { label: initDashboardLable('IncomingToWmsDataContent'), prop: "dataContent", type:"showJsonTable" }, + { label: initDashboardLable('IncomingToWmsSourceSystem'), prop: "sourceSystem" }, + { label: initDashboardLable('IncomingToWmsWriteTime'), prop: "writeTime",type:'dateTime' }, + { label: initDashboardLable('IncomingToWmsReadTime'), prop: "readTime",type:'dateTime' }, + { label: initDashboardLable('IncomingToWmsErrorCode'), prop: "errorCode" }, + { label: initDashboardLable('IncomingToWmsErrorMessage'), prop: "errorMessage", type:"showDetail" }, + { label: initDashboardLable('IncomingToWmsRetryTimes'), prop: "retryTimes" }, +// ************** 暂时隐藏 ************************ + // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' }, + // { label: _Public.creatorId, prop: "creatorId" }, + // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' }, + // { label: _Public.lastModifierId, prop: "lastModifierId" }, + // { label: _Public.ID, prop: "ID" }, +] + +// 4归档WMS数据接收 +export const comingToWms_file = [ + { label: initDashboardLable('ArchivedIncomingToWmsNumber'), prop: "number" }, + { label: initDashboardLable('ArchivedIncomingToWmsRemark'), prop: "remark", type:"showDetail" }, + { label: initDashboardLable('ArchivedIncomingToWmsDataType'), prop: "dataType" }, + { label: initDashboardLable('ArchivedIncomingToWmsDataAction'), prop: "dataAction" }, + { label: initDashboardLable('ArchivedIncomingToWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, + { label: initDashboardLable('ArchivedIncomingToWmsStatus'), prop: "status" }, + { label: initDashboardLable('ArchivedIncomingToWmsDataIdentityCode'), prop: "dataIdentityCode" }, + { label: initDashboardLable('ArchivedIncomingToWmsDataContent'), prop: "dataContent", type:"showJsonTable" }, + { label: initDashboardLable('ArchivedIncomingToWmsSourceSystem'), prop: "sourceSystem" }, + { label: initDashboardLable('ArchivedIncomingToWmsWriteTime'), prop: "writeTime",type:'dateTime' }, + { label: initDashboardLable('ArchivedIncomingToWmsReadTime'), prop: "readTime",type:'dateTime' }, + { label: initDashboardLable('ArchivedIncomingToWmsErrorCode'), prop: "errorCode" }, + { label: initDashboardLable('ArchivedIncomingToWmsErrorMessage'), prop: "errorMessage", type:"showDetail" }, + { label: initDashboardLable('ArchivedIncomingToWmsRetryTimes'), prop: "retryTimes" }, +// ************** 暂时隐藏 ************************ + // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' }, + // { label: _Public.creatorId, prop: "creatorId" }, + // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' }, + // { label: _Public.lastModifierId, prop: "lastModifierId" }, + // { label: _Public.ID, prop: "ID" }, +] + +// 5WMS数据转换 +export const dataExchangeFromWms = [ + { label: initDashboardLable('DataExchange_OutgoingFromWmsNumber'), prop: "number" }, + { label: initDashboardLable('DataExchange_OutgoingFromWmsRemark'), prop: "remark", type:"showDetail" }, + { label: initDashboardLable('DataExchange_OutgoingFromWmsDataType'), prop: "dataType" }, + { label: initDashboardLable('DataExchange_OutgoingFromWmsDataAction'), prop: "dataAction" }, + { label: initDashboardLable('DataExchange_OutgoingFromWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, + { label: initDashboardLable('DataExchange_OutgoingFromWmsStatus'), prop: "status" }, + { label: initDashboardLable('DataExchange_OutgoingFromWmsDataIdentityCode'), prop: "dataIdentityCode" }, + { label: initDashboardLable('DataExchange_OutgoingFromWmsDataContent'), prop: "dataContent", type:"showJsonTable" }, + { label: initDashboardLable('DataExchange_OutgoingFromWmsSourceSystem'), prop: "sourceSystem" }, + { label: initDashboardLable('DataExchange_OutgoingFromWmsWriteTime'), prop: "writeTime",type:'dateTime' }, + { label: initDashboardLable('DataExchange_OutgoingFromWmsDestinationSystem'), prop: "destinationSystem" }, + { label: initDashboardLable('DataExchange_OutgoingFromWmsReadTime'), prop: "readTime",type:'dateTime' }, + { label: initDashboardLable('DataExchange_OutgoingFromWmsErrorCode'), prop: "errorCode" }, + { label: initDashboardLable('DataExchange_OutgoingFromWmsErrorMessage'), prop: "errorMessage", type:"showDetail" }, + { label: initDashboardLable('DataExchange_OutgoingFromWmsRetryTimes'), prop: "retryTimes" }, +// ************** 暂时隐藏 ************************ + // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' }, + // { label: _Public.creatorId, prop: "creatorId" }, + // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' }, + // { label: _Public.lastModifierId, prop: "lastModifierId" }, + // { label: _Public.ID, prop: "ID" }, +] + +// 6归档WMS数据转换 +export const dataExchangeFromWms_file = [ + { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsNumber'), prop: "number" }, + { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsRemark'), prop: "remark", type:"showDetail" }, + { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataType'), prop: "dataType" }, + { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataAction'), prop: "dataAction" }, + { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, + { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsStatus'), prop: "status" }, + { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataIdentityCode'), prop: "dataIdentityCode" }, + { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataContent'), prop: "dataContent", type:"showJsonTable" }, + { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsSourceSystem'), prop: "sourceSystem" }, + { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsWriteTime'), prop: "writeTime",type:'dateTime' }, + // { label: _Dashboard.destinationSystem, prop: "destinationSystem" }, + { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsReadTime'), prop: "readTime",type:'dateTime' }, + { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsErrorCode'), prop: "errorCode" }, + { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsErrorMessage'), prop: "errorMessage", type:"showDetail" }, + { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsRetryTimes'), prop: "retryTimes" }, +// ************** 暂时隐藏 ************************ + // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' }, + // { label: _Public.creatorId, prop: "creatorId" }, + // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' }, + // { label: _Public.lastModifierId, prop: "lastModifierId" }, + // { label: _Public.ID, prop: "ID" }, +] + +// 7外部数据接收 +export const comingFromOut = [ + { label: initDashboardLable('DataExchange_IncomingFromExternalNumber'), prop: "number" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalRemark'), prop: "remark", type:"showDetail" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalDataType'), prop: "dataType" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalTableType'), prop: "tableType" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalDataAction'), prop: "dataAction" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, + { label: initDashboardLable('DataExchange_IncomingFromExternalStatus'), prop: "status" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalSourceSystem'), prop: "sourceSystem" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataId'), prop: "sourceDataId" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalWriteTime'), prop: "writeTime",type:'dateTime' }, + { label: initDashboardLable('DataExchange_IncomingFromExternalWriter'), prop: "writer" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationSystem'), prop: "destinationSystem" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationDataId'), prop: "destinationDataId" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalReadTime'), prop: "readTime",type:'dateTime' }, + { label: initDashboardLable('DataExchange_IncomingFromExternalReader'), prop: "reader" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalErrorCode'), prop: "errorCode" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalErrorMessage'), prop: "errorMessage", type:"showDetail" }, + { label: initDashboardLable('DataExchange_IncomingFromExternalRetryTimes'), prop: "retryTimes" }, +// ************** 暂时隐藏 ************************ + // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' }, + // { label: _Public.creatorId, prop: "creatorId" }, + // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' }, + // { label: _Public.lastModifierId, prop: "lastModifierId" }, + // { label: _Public.ID, prop: "ID" }, +] + +// 8归档外部数据接收 +export const comingFromOut_file = [ + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalNumber'), prop: "number" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalRemark'), prop: "remark", type:"showDetail" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDataType'), prop: "dataType" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalTableType'), prop: "tableType" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDataAction'), prop: "dataAction" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalStatus'), prop: "status" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceSystem'), prop: "sourceSystem" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataId'), prop: "sourceDataId" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalWriteTime'), prop: "writeTime",type:'dateTime' }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalWriter'), prop: "writer" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationSystem'), prop: "destinationSystem" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationDataId'), prop: "destinationDataId" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalReadTime'), prop: "readTime",type:'dateTime' }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalReader'), prop: "reader" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalErrorCode'), prop: "errorCode" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalErrorMessage'), prop: "errorMessage", type:"showDetail" }, + { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalRetryTimes'), prop: "retryTimes" }, +// ************** 暂时隐藏 ************************ + // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' }, + // { label: _Public.creatorId, prop: "creatorId" }, + // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' }, + // { label: _Public.lastModifierId, prop: "lastModifierId" }, + // { label: _Public.ID, prop: "ID" }, +] + +// 测试数据 +export const TestSchool = [ + { label: '名称22', prop: "schoolName", fixed: "left", type: "name" }, + { label: 'orderType22', prop: "orderType" }, + { label: '创建时间22', prop: "creationTime", type:'dateTime' }, +] \ No newline at end of file diff --git a/fe/PC/src/utils/utils.js b/fe/PC/src/utils/utils.js index 5445d889d..c5354744b 100644 --- a/fe/PC/src/utils/utils.js +++ b/fe/PC/src/utils/utils.js @@ -62,6 +62,7 @@ import newAndEdiDialog from '@/components/newAndEdiDialog' //普通新增与编 import stepsForm from '@/components/StepsForm' //步骤新增 import handelFrom from '@/components/handelFrom' //执行表单 import umyTable from '@/components/umyTable' // 用于数据量过大table +import filterForDetailPage from '@/components/filterForDetailPage' //明细查询 // Mixins // import { tableMixins } from "@/mixins/TableMixins" @@ -113,6 +114,7 @@ Vue.component('newAndEdiDialog', newAndEdiDialog) Vue.component('stepsForm', stepsForm) Vue.component('handelFrom', handelFrom) Vue.component('umyTable', umyTable) +Vue.component('filterForDetailPage', filterForDetailPage) Vue.prototype.$echarts = eCharts Vue.prototype.$isMobile = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i) Vue.prototype.$isAndroid = navigator.userAgent.indexOf('Android') > -1 || navigator.userAgent.indexOf('Adr') > -1 diff --git a/fe/PC/src/views/interfaceBoard/TestSchool.vue b/fe/PC/src/views/interfaceBoard/TestSchool.vue index 7b2d58a8f..f96a39b40 100644 --- a/fe/PC/src/views/interfaceBoard/TestSchool.vue +++ b/fe/PC/src/views/interfaceBoard/TestSchool.vue @@ -10,7 +10,7 @@ :totalCount="totalCount" :multipleSelection="multipleSelection" :MaxResultCount="PageListParams.MaxResultCount" - @topbutton="topbutton" + @topbutton="customTopbutton" @inlineDialog="inlineDialog" @sortChange="sortChange" @alertoldSkipCount="alertoldSkipCount" @@ -23,8 +23,7 @@ :primarySearchOption="primarySearchOption" @overallSearchFormClick="overallSearchFormClick" :httpOverallSearchData="httpOverallSearchData" - > - + > + diff --git a/fe/PC/src/views/interfaceBoard/comingFromOut_file.vue b/fe/PC/src/views/interfaceBoard/comingFromOut_file.vue index ce7cfdf14..f05c4e0da 100644 --- a/fe/PC/src/views/interfaceBoard/comingFromOut_file.vue +++ b/fe/PC/src/views/interfaceBoard/comingFromOut_file.vue @@ -58,22 +58,23 @@ this.paging(); }, methods: { - //渲染数据 - paging(callback) { - this.Loading.tableLoading = true; - this.apiTableColumns = isLocalApiTableColums[this.$route.name] - this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount - comingFromOut_file(this.PageListParams) - .then(result => { - let res = result.data - this.tableData = res.items - this.totalCount = res.totalCount - this.pagingCallback(callback) - }) - .catch(err => { - this.Loading.tableLoading = false - }) - }, + //渲染数据 + paging(callback) { + this.Loading.tableLoading = true; + this.apiTableColumns = isLocalApiTableColums[this.$route.name] + this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount + comingFromOut_file(this.PageListParams) + .then(result => { + let res = result.data + this.tableData = res.items + this.totalCount = res.totalCount + this.pagingCallback(callback) + }) + .catch(err => { + this.Loading.tableLoading = false + this.$message.error("数据获取失败") + }) + }, } } diff --git a/fe/PC/src/views/interfaceBoard/comingToWms.vue b/fe/PC/src/views/interfaceBoard/comingToWms.vue index 24f544bac..c19f27170 100644 --- a/fe/PC/src/views/interfaceBoard/comingToWms.vue +++ b/fe/PC/src/views/interfaceBoard/comingToWms.vue @@ -59,22 +59,23 @@ this.paging(); }, methods: { - //渲染数据 - paging(callback) { - this.Loading.tableLoading = true; - this.apiTableColumns = isLocalApiTableColums[this.$route.name] - this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount - comingToWms(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 - }) - }, + //渲染数据 + paging(callback) { + this.Loading.tableLoading = true; + this.apiTableColumns = isLocalApiTableColums[this.$route.name] + this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount + comingToWms(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 + this.$message.error("数据获取失败") + }) + }, } } diff --git a/fe/PC/src/views/interfaceBoard/comingToWms_file.vue b/fe/PC/src/views/interfaceBoard/comingToWms_file.vue index 9d77d6231..8da5214d2 100644 --- a/fe/PC/src/views/interfaceBoard/comingToWms_file.vue +++ b/fe/PC/src/views/interfaceBoard/comingToWms_file.vue @@ -58,22 +58,23 @@ this.paging(); }, methods: { - //渲染数据 - paging(callback) { - this.Loading.tableLoading = true; - this.apiTableColumns = isLocalApiTableColums[this.$route.name] - this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount - comingToWms_file(this.PageListParams) - .then(result => { - let res = result.data - this.tableData = res.items - this.totalCount = res.totalCount - this.pagingCallback(callback) - }) - .catch(err => { - this.Loading.tableLoading = false - }) - }, + //渲染数据 + paging(callback) { + this.Loading.tableLoading = true; + this.apiTableColumns = isLocalApiTableColums[this.$route.name] + this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount + comingToWms_file(this.PageListParams) + .then(result => { + let res = result.data + this.tableData = res.items + this.totalCount = res.totalCount + this.pagingCallback(callback) + }) + .catch(err => { + this.Loading.tableLoading = false + this.$message.error("数据获取失败") + }) + }, } } diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue index 3cb47b621..8a788c1ac 100644 --- a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue +++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue @@ -87,6 +87,7 @@ }) .catch(err => { this.Loading.tableLoading = false + this.$message.error("数据获取失败") }) }, } diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue index d5a3cb819..f79b9aa94 100644 --- a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue +++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue @@ -65,15 +65,16 @@ this.apiTableColumns = isLocalApiTableColums[this.$route.name] this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount, dataExchangeFromOut_file(this.PageListParams) - .then(result => { - let res = result.data - this.tableData = res.items - this.totalCount = res.totalCount - this.pagingCallback(callback) - }) - .catch(err => { - this.Loading.tableLoading = false - }) + .then(result => { + let res = result.data + this.tableData = res.items + this.totalCount = res.totalCount + this.pagingCallback(callback) + }) + .catch(err => { + this.Loading.tableLoading = false + this.$message.error("数据获取失败") + }) }, } }; diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue index 139e0e450..9115f4b37 100644 --- a/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue +++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue @@ -58,22 +58,23 @@ this.paging(); }, methods: { - //渲染数据 - paging(callback) { - this.Loading.tableLoading = true; - this.apiTableColumns = isLocalApiTableColums[this.$route.name] - this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount - dataExchangeFromWms(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 - }) - }, + //渲染数据 + paging(callback) { + this.Loading.tableLoading = true; + this.apiTableColumns = isLocalApiTableColums[this.$route.name] + this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount + dataExchangeFromWms(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 + this.$message.error("数据获取失败") + }) + }, } } diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue index 1cc15f19f..71c13c6e9 100644 --- a/fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue +++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue @@ -60,19 +60,20 @@ methods: { //渲染数据 paging(callback) { - this.Loading.tableLoading = true; - this.apiTableColumns = isLocalApiTableColums[this.$route.name] - this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount - dataExchangeFromWms_file(this.PageListParams) - .then(result => { - let res = result.data - this.tableData = res.items - this.totalCount = res.totalCount - this.pagingCallback(callback) - }) - .catch(err => { - this.Loading.tableLoading = false - }) + this.Loading.tableLoading = true; + this.apiTableColumns = isLocalApiTableColums[this.$route.name] + this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount + dataExchangeFromWms_file(this.PageListParams) + .then(result => { + let res = result.data + this.tableData = res.items + this.totalCount = res.totalCount + this.pagingCallback(callback) + }) + .catch(err => { + this.Loading.tableLoading = false + this.$message.error("数据获取失败") + }) }, } }