diff --git a/Code/Fe/public/config.js b/Code/Fe/public/config.js index 1841a3f..f150e76 100644 --- a/Code/Fe/public/config.js +++ b/Code/Fe/public/config.js @@ -1,6 +1,7 @@ // dev_win window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:60069' window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-configuration' +window.SITE_CONFIG['columnsApiNamesZh'] = 'Winin' window.SITE_CONFIG['isAutoLogin'] = false window.SITE_CONFIG['isSinglePage'] = false window.SITE_CONFIG['userNameOrEmailAddress'] = 'admin' diff --git a/Code/Fe/src/App.vue b/Code/Fe/src/App.vue index 99de5f8..b84602c 100644 --- a/Code/Fe/src/App.vue +++ b/Code/Fe/src/App.vue @@ -10,6 +10,7 @@ export default { } localStorage.setItem('base',window.SITE_CONFIG['base']) localStorage.setItem('columnsApiNames',window.SITE_CONFIG['columnsApiNames']) +localStorage.setItem('columnsApiNamesZh',window.SITE_CONFIG['columnsApiNamesZh']) localStorage.setItem('isAutoLogin',window.SITE_CONFIG['isAutoLogin']) localStorage.setItem('isSinglePage',window.SITE_CONFIG['isSinglePage']) localStorage.setItem('userNameOrEmailAddress',window.SITE_CONFIG['userNameOrEmailAddress']) diff --git a/Code/Fe/src/api/wms-api.js b/Code/Fe/src/api/wms-api.js index 27e2da8..4cd4c8c 100644 --- a/Code/Fe/src/api/wms-api.js +++ b/Code/Fe/src/api/wms-api.js @@ -23,9 +23,11 @@ export function postCreate(data, url) { //编辑 export function postUpdate(data, id, url) { return request({ - url: baseURL + url + '/' + id, + // url: baseURL + url + '/' + id, + url: baseURL + url, method: 'put', - data + data, + params:{id:id} }) } //申请流程 @@ -47,8 +49,10 @@ export function postDetailUpdate(data, id, UrlData, url) { //删除 export function postDelete(id, url) { return request({ - url: baseURL + url + '/' + id, + // url: baseURL + url + '/' + id, + url: baseURL + url, method: 'delete', + params:{id:id} }) } //子表删除 diff --git a/Code/Fe/src/api/wms-interface.js b/Code/Fe/src/api/wms-interface.js index a594b66..a11d6a2 100644 --- a/Code/Fe/src/api/wms-interface.js +++ b/Code/Fe/src/api/wms-interface.js @@ -2,14 +2,6 @@ import request from '@/utils/request' let base_api = localStorage.getItem('base') let colum_url = localStorage.getItem('columnsApiNames') -// 转义传参 -const initParams = (data) => { - return { - skipCount:data.SkipCount, - maxResultCount:data.MaxResultCount, - sorting:data.Sorting - } -} // 获取表头数据 export function getInterfaceBoard() { @@ -19,136 +11,6 @@ export function getInterfaceBoard() { }) } -// 获取导出配置信息接口 -// export function getExportConfigList(name) { -// return request({ -// url: base_api + '/get-by-user-and-table-name', -// method: 'post', -// params:{ -// userId:JSON.parse(localStorage.getItem("currentUserInfo")).id, -// exportTableName:name -// }, -// }) -// } - -//外部数据转换 -// export function dataExchangeFromOut(data) { -// return axios({ -// method:'get', -// url: interfaceBoard_api + 'outgoing-to-external', -// params:initParams(data) -// }) -// } - -// //归档外部数据转换 -// export function dataExchangeFromOut_file(data) { -// return axios({ -// method:'get', -// url: interfaceBoard_api + 'archived-outgoing-to-external', -// params:initParams(data) -// }) -// } - -// //wms数据接收 -// export function comingToWms(data) { -// return axios({ -// method:'get', -// url: interfaceBoard_api + 'incoming-to-wms', -// params:initParams(data) -// }) -// } - -// //归档wms数据接收 -// export function comingToWms_file(data) { -// return axios({ -// method:'get', -// url: interfaceBoard_api + 'archived-incoming-to-wms', -// params:initParams(data) -// }) -// } - -// //wms数据转换 -// export function dataExchangeFromWms(data) { -// return axios({ -// method:'get', -// url: interfaceBoard_api + 'data-exchange_Outgoing-from-wms', -// params:initParams(data) -// }) -// } - -// // 归档wms数据转换 -// export function dataExchangeFromWms_file(data) { -// return axios({ -// method:'get', -// url: interfaceBoard_api + 'data-exchange_Archived-outgoing-from-wms', -// params:initParams(data) -// }) -// } - -// //外部数据接收 -// export function comingFromOut(data) { -// return axios({ -// method:'get', -// url: interfaceBoard_api + 'data-exchange_Incoming-from-external', -// params:initParams(data) -// }) -// } - -// //归档外部数据接收 -// export function comingFromOut_file(data) { -// return axios({ -// method:'get', -// url: interfaceBoard_api + 'data-exchange_Archived-incoming-from-external', -// params:initParams(data) -// }) -// } - -// 测试数据-列表 -// export function TestSchool(data, includeDetails) { -// return request({ -// method:'post', -// url: base_api + '/api/TestSchool/base/get-list-page-by-filter?includeDetails='+Boolean(includeDetails), -// data -// }) -// } - -// // 测试数据-列表-根据id获取详情 -// export function TestSchoolItemById(id) { -// return request({ -// method:'get', -// url: base_api + '/api/app/test-school/'+id, -// }) -// } - -// // 测试数据-列表-新增、编辑 -// export function TestSchool_save(data,isAdd) { -// let _type = isAdd ? 'create' : 'update-by-id' -// return request({ -// method:'post', -// url: base_api + '/api/TestSchool/base/'+_type, -// data:data, -// params:{id:data.id} -// }) -// } - -// // 测试数据-列表-删除 -// export function TestSchool_delete(id) { -// return request({ -// method:'DELETE', -// url: base_api + '/api/TestSchool/base/delete-by-id', -// params:{id:id} -// }) -// } - -// // 测试数据-明细-列表 -// export function TestSchoolDetailList(data,includeDetails) { -// return request({ -// method:'post', -// url: base_api + '/api/TestStudentDetail/base/get-list-page-by-filter?includeDetails='+Boolean(includeDetails), -// data -// }) -// } - // // 测试数据-明细-删除 // export function TestSchoolDetailList_delete(id) { // return request({ diff --git a/Code/Fe/src/components/umyTable/index.vue b/Code/Fe/src/components/umyTable/index.vue index 22a3612..8e0fff9 100644 --- a/Code/Fe/src/components/umyTable/index.vue +++ b/Code/Fe/src/components/umyTable/index.vue @@ -368,7 +368,8 @@ label="值" >