diff --git a/fe/NEV.Faster.InterFace/public/config.js b/fe/NEV.Faster.InterFace/public/config.js index 9fb75498d..4ce0346ce 100644 --- a/fe/NEV.Faster.InterFace/public/config.js +++ b/fe/NEV.Faster.InterFace/public/config.js @@ -1,6 +1,6 @@ // dev_win -window.SITE_CONFIG['baseApi'] = 'http://dev.ccwin-in.com:20007' -window.SITE_CONFIG['authApi'] = 'http://dev.ccwin-in.com:20006' +window.SITE_CONFIG['baseApi'] = 'http://192.168.1.75:60081' +window.SITE_CONFIG['authApi'] = 'http://192.168.1.75:60080' window.SITE_CONFIG['businessApi'] = 'http://dev.ccwin-in.com:20003' //是否登录配置信息【loginName】 window.SITE_CONFIG['isConfigLogin'] = false @@ -11,22 +11,16 @@ window.SITE_CONFIG['configLoginPass'] = '1q2w3E*' // 是否单页面(不显示菜单头部等部分) window.SITE_CONFIG['isSinglePage'] = false // 项目配置 -window.SITE_CONFIG['appClientId'] = 'Z_App' +window.SITE_CONFIG['appClientId'] = 'Dy_Exchange' // 项目配置内部名称 -window.SITE_CONFIG['appClientScope'] = 'Z' +window.SITE_CONFIG['appClientScope'] = 'Dy_Exchange' // 浏览器名称 -window.SITE_CONFIG['browserTitle'] = '接口看板-QAD&WMS' +window.SITE_CONFIG['browserTitle'] = '接口看板-NEV' // 单点登录使用数据 window.SITE_CONFIG['oidcLogin_url'] = 'http://dev.ccwin-in.com:20006', window.SITE_CONFIG['oidcLogin_clientId'] = 'InterfaceDash_App' window.SITE_CONFIG['oidcLogin_scopes'] = 'offline_access Z profile' // 隐藏的页面 -window.SITE_CONFIG['menuHiddenConfig'] = [ - 'AsnDet','PoDet','ReceiptDet','ReturnDet', - // 'AbpIdentityMarkUsers' -] +window.SITE_CONFIG['menuHiddenConfig'] = [] -// window.SITE_CONFIG['isAutoLogin'] = true -// window.SITE_CONFIG['userNameOrEmailAddress'] = 'admin' -// window.SITE_CONFIG['client_secret'] = '1q2w3E*' -// window.SITE_CONFIG['columnsApiNamesZh'] = 'Z' \ No newline at end of file +// window.SITE_CONFIG['isAutoLogin'] = true \ No newline at end of file diff --git a/fe/NEV.Faster.InterFace/src/App.vue b/fe/NEV.Faster.InterFace/src/App.vue index a19d843fb..998be4b2a 100644 --- a/fe/NEV.Faster.InterFace/src/App.vue +++ b/fe/NEV.Faster.InterFace/src/App.vue @@ -27,8 +27,6 @@ localStorage.setItem('oidcLogin_scopes',window.SITE_CONFIG['oidcLogin_scopes']) localStorage.setItem('menuHiddenConfig',window.SITE_CONFIG['menuHiddenConfig']) // localStorage.setItem('isAutoLogin',window.SITE_CONFIG['isAutoLogin']) -// localStorage.setItem('userNameOrEmailAddress',window.SITE_CONFIG['userNameOrEmailAddress']) -// localStorage.setItem('client_secret',window.SITE_CONFIG['client_secret']) // 获取浏览器语言 const language_brow = (navigator.language || navigator.browserLanguage) diff --git a/fe/NEV.Faster.InterFace/src/api/wms-api.js b/fe/NEV.Faster.InterFace/src/api/wms-api.js index 0218ff993..cde911185 100644 --- a/fe/NEV.Faster.InterFace/src/api/wms-api.js +++ b/fe/NEV.Faster.InterFace/src/api/wms-api.js @@ -60,7 +60,7 @@ export function getPageListForDetail(data, url, includeDetails) { // 根据id获取主表信息 export function getListDesById(url,id) { return request({ - method:'get', + method:'post', url: baseURL + url + '/' + id }) } @@ -130,7 +130,7 @@ export function postImportDown(url) { export function getDetailed(id, url) { return request({ url: baseURL + url + '/' + id, - method: 'get', + method: 'post', }) } //获取分页+筛选(只查询) diff --git a/fe/NEV.Faster.InterFace/src/store/modules/definition.js b/fe/NEV.Faster.InterFace/src/store/modules/definition.js index 89467b79d..34e71888e 100644 --- a/fe/NEV.Faster.InterFace/src/store/modules/definition.js +++ b/fe/NEV.Faster.InterFace/src/store/modules/definition.js @@ -29,15 +29,19 @@ const mutations = { // 通过url做方法处理转换(S/C/U/G等)目前做了S查询/C新增/U编辑。如果有需要在丰富 export function initDtoTypeByUrl(url){ - if(url.lastIndexOf('/base/get-list-page-by-filter') >= 0){ + const _url_last = url.substring(url.lastIndexOf("/") + 1); + if(_url_last.toLowerCase() == 'get-list-page-by-filter'){ return "S" } - else if(url.lastIndexOf('/base/create') >= 0){ + else if(_url_last.toLowerCase() == 'create'){ return "C" } - else if(url.lastIndexOf('/base/update-by-id') >= 0){ + else if(_url_last.toLowerCase() == 'update'){ return "U" } + else if(_url_last.toLowerCase() == 'delete'){ + return "D" + } else{ return url } @@ -45,6 +49,7 @@ export function initDtoTypeByUrl(url){ // dto和枚举转义 export function initDtoTypesAndEnums(res,typeName,apiName) { + if(!res.types[typeName])return // 通过returnValue.type 在 res.types 中获取全部的dto let _dtos = res.types[typeName].properties _dtos.forEach(d=>{ @@ -118,6 +123,7 @@ export function initDtoColumnTypes(res,commit) { S:Object.assign({},inner_item,{dtoType: 'S'}), C:Object.assign({},inner_item,{dtoType: 'C'}), U:Object.assign({},inner_item,{dtoType: 'U'}), + D:Object.assign({},inner_item,{dtoType: 'D'}), } for(let ac in _controller[item].actions){ let _actions = _controller[item].actions[ac] @@ -141,6 +147,12 @@ export function initDtoColumnTypes(res,commit) { _item.U.actionsUrl = _actions.url _item.U.columnsType = _type _item.U.dtoList = initDtoTypesAndEnums(res,_type,_api) + + } + // 删除处理 + if( initDtoTypeByUrl(_actions.url) == 'D' ){ + _item.D.actionsUrl = _actions.url + _item.U.columnsType = _type } } _allData[_api] = _item diff --git a/fe/NEV.Faster.InterFace/src/utils/baseData/urlOption.js b/fe/NEV.Faster.InterFace/src/utils/baseData/urlOption.js index 15ece6109..0d01da616 100644 --- a/fe/NEV.Faster.InterFace/src/utils/baseData/urlOption.js +++ b/fe/NEV.Faster.InterFace/src/utils/baseData/urlOption.js @@ -21,6 +21,88 @@ export const ExportCustomUserSetting = { hasDetail:false, } +//开始------------------只有主表 ArchivedIncomingToWm------------------ +export const ArchivedIncomingToWm = { + baseURL:'ArchivedIncomingToWm/base',//主表-列表 + detailURL:'ArchivedIncomingToWm/base/get-by-id',//主表-明细 + 明细-查看主表 + hasDetail:false +} +//结束------------------------------------ + +//开始------------------只有主表 ArchivedOutgoingToExternal------------------ +export const ArchivedOutgoingToExternal = { + baseURL:'ArchivedOutgoingToExternal/base',//主表-列表 + detailURL:'ArchivedOutgoingToExternal/base/get-by-id',//主表-明细 + 明细-查看主表 + hasDetail:false +} +//结束------------------------------------ + +//开始------------------只有主表 DataExchangeArchivedIncomingFromExternal------------------ +export const DataExchangeArchivedIncomingFromExternal = { + baseURL:'DataExchangeArchivedIncomingFromExternal/base',//主表-列表 + detailURL:'DataExchangeArchivedIncomingFromExternal/base/get-by-id',//主表-明细 + 明细-查看主表 + hasDetail:false +} +//结束------------------------------------ + +//开始------------------只有主表 DataExchangeArchivedOutgoingFromWm------------------ +export const DataExchangeArchivedOutgoingFromWm = { + baseURL:'DataExchangeArchivedOutgoingFromWm/base',//主表-列表 + detailURL:'DataExchangeArchivedOutgoingFromWm/base/get-by-id',//主表-明细 + 明细-查看主表 + hasDetail:false +} +//结束------------------------------------ + +//开始------------------只有主表 DataExchangeIncomingFromExternal------------------ +export const DataExchangeIncomingFromExternal = { + baseURL:'DataExchangeIncomingFromExternal/base',//主表-列表 + detailURL:'DataExchangeIncomingFromExternal/base/get-by-id',//主表-明细 + 明细-查看主表 + hasDetail:false +} +//结束------------------------------------ + +//开始------------------只有主表 DataExchangeInterfaceConfig------------------ +export const DataExchangeInterfaceConfig = { + baseURL:'DataExchangeInterfaceConfig/base',//主表-列表 + detailURL:'DataExchangeInterfaceConfig/base/get-by-id',//主表-明细 + 明细-查看主表 + hasDetail:false +} +//结束------------------------------------ + +//开始------------------只有主表 DataExchangeMessageReceive------------------ +export const DataExchangeMessageReceive = { + baseURL:'DataExchangeMessageReceive/base',//主表-列表 + detailURL:'DataExchangeMessageReceive/base/get-by-id',//主表-明细 + 明细-查看主表 + hasDetail:false +} +//结束------------------------------------ + +//开始------------------只有主表 DataExchangeOutgoingFromWm------------------ +export const DataExchangeOutgoingFromWm = { + baseURL:'DataExchangeOutgoingFromWm/base',//主表-列表 + detailURL:'DataExchangeOutgoingFromWm/base/get-by-id',//主表-明细 + 明细-查看主表 + hasDetail:false +} +//结束------------------------------------ + +//开始------------------只有主表 IncomingToWm------------------ +export const IncomingToWm = { + baseURL:'IncomingToWm/base',//主表-列表 + detailURL:'IncomingToWm/base/get-by-id',//主表-明细 + 明细-查看主表 + hasDetail:false +} +//结束------------------------------------ + +//开始------------------只有主表 OutgoingToExternal------------------ +export const OutgoingToExternal = { + baseURL:'OutgoingToExternal/base',//主表-列表 + detailURL:'OutgoingToExternal/base/get-by-id',//主表-明细 + 明细-查看主表 + hasDetail:false +} +//结束------------------------------------ + + + // 接口看板管理-AsnMstr【主子表】 // export const AsnMstr = { // baseURL:'AsnMstr/base',//主表-列表 diff --git a/fe/NEV.Faster.InterFace/src/views/menuList/ArchivedIncomingToWm.vue b/fe/NEV.Faster.InterFace/src/views/menuList/ArchivedIncomingToWm.vue new file mode 100644 index 000000000..6ab7c3b9e --- /dev/null +++ b/fe/NEV.Faster.InterFace/src/views/menuList/ArchivedIncomingToWm.vue @@ -0,0 +1,102 @@ + + + \ No newline at end of file diff --git a/fe/NEV.Faster.InterFace/src/views/menuList/ArchivedOutgoingToExternal.vue b/fe/NEV.Faster.InterFace/src/views/menuList/ArchivedOutgoingToExternal.vue new file mode 100644 index 000000000..4e542cf74 --- /dev/null +++ b/fe/NEV.Faster.InterFace/src/views/menuList/ArchivedOutgoingToExternal.vue @@ -0,0 +1,102 @@ + + + \ No newline at end of file diff --git a/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeArchivedIncomingFromExternal.vue b/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeArchivedIncomingFromExternal.vue new file mode 100644 index 000000000..4423bc546 --- /dev/null +++ b/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeArchivedIncomingFromExternal.vue @@ -0,0 +1,102 @@ + + + \ No newline at end of file diff --git a/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeArchivedOutgoingFromWm.vue b/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeArchivedOutgoingFromWm.vue new file mode 100644 index 000000000..c51bb4fe8 --- /dev/null +++ b/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeArchivedOutgoingFromWm.vue @@ -0,0 +1,102 @@ + + + \ No newline at end of file diff --git a/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeIncomingFromExternal.vue b/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeIncomingFromExternal.vue new file mode 100644 index 000000000..70ce3d9c3 --- /dev/null +++ b/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeIncomingFromExternal.vue @@ -0,0 +1,102 @@ + + + \ No newline at end of file diff --git a/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeInterfaceConfig.vue b/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeInterfaceConfig.vue new file mode 100644 index 000000000..6fdb0322b --- /dev/null +++ b/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeInterfaceConfig.vue @@ -0,0 +1,153 @@ + + + \ No newline at end of file diff --git a/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeMessageReceive.vue b/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeMessageReceive.vue new file mode 100644 index 000000000..ec3e9ac94 --- /dev/null +++ b/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeMessageReceive.vue @@ -0,0 +1,102 @@ + + + \ No newline at end of file diff --git a/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeOutgoingFromWm.vue b/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeOutgoingFromWm.vue new file mode 100644 index 000000000..ed1f8bf9a --- /dev/null +++ b/fe/NEV.Faster.InterFace/src/views/menuList/DataExchangeOutgoingFromWm.vue @@ -0,0 +1,102 @@ + + + \ No newline at end of file diff --git a/fe/NEV.Faster.InterFace/src/views/menuList/IncomingToWm.vue b/fe/NEV.Faster.InterFace/src/views/menuList/IncomingToWm.vue new file mode 100644 index 000000000..0d7c4ac5f --- /dev/null +++ b/fe/NEV.Faster.InterFace/src/views/menuList/IncomingToWm.vue @@ -0,0 +1,102 @@ + + + \ No newline at end of file diff --git a/fe/NEV.Faster.InterFace/src/views/menuList/OutgoingToExternal.vue b/fe/NEV.Faster.InterFace/src/views/menuList/OutgoingToExternal.vue new file mode 100644 index 000000000..ec3660151 --- /dev/null +++ b/fe/NEV.Faster.InterFace/src/views/menuList/OutgoingToExternal.vue @@ -0,0 +1,102 @@ + + + \ No newline at end of file