From b7e43b69fc9c33fee373fc525e73aad929f6c342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Thu, 13 Jul 2023 11:37:15 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=816=E4=B8=AA=E7=9C=8B=E6=9D=BF+?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=E5=BC=80?= =?UTF-8?q?=E5=8F=91=202=E3=80=81=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0+?= =?UTF-8?q?=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PC/InterFace.Dash/public/config.js | 1 + PC/InterFace.Dash/src/App.vue | 1 + PC/InterFace.Dash/src/api/wms-api.js | 10 +- .../src/components/umyTable/index.vue | 7 +- PC/InterFace.Dash/src/permission.js | 5 +- .../src/router/modules/baseConfig.js | 9 +- .../src/router/modules/interfaceBoard.js | 51 +- .../src/utils/baseData/urlOption.js | 40 +- .../src/utils/detailsTableColumns/index.js | 3179 +------------ .../utils/detailsTableColumns_api/index.js | 24 +- PC/InterFace.Dash/src/utils/index.js | 23 +- .../src/utils/quicklySearchOption/index.js | 9 - .../src/utils/summaryTableColumns/index.js | 85 +- .../src/utils/tableColumns/index.js | 12 - .../src/utils/tableColumns/index_new.js | 4026 ----------------- .../src/utils/tableColumns_api/index.js | 176 +- .../src/utils/tabsDesTions/index.js | 2689 +---------- .../src/utils/tabsDesTions_api/index.js | 34 +- ...Config.vue => ExportCustomUserSetting.vue} | 51 +- .../src/views/interfaceBoard/IncomingData.vue | 2 +- .../interfaceBoard/IncomingDataHistory.vue | 101 + .../interfaceBoard/MesProductL7PartsNote.vue | 101 + .../views/interfaceBoard/MessageReceive.vue | 101 + .../src/views/interfaceBoard/OutgoingData.vue | 101 + .../interfaceBoard/OutgoingDataHistory.vue | 101 + 25 files changed, 807 insertions(+), 10132 deletions(-) delete mode 100644 PC/InterFace.Dash/src/utils/tableColumns/index_new.js rename PC/InterFace.Dash/src/views/basicConfig/{exportConfig.vue => ExportCustomUserSetting.vue} (73%) create mode 100644 PC/InterFace.Dash/src/views/interfaceBoard/IncomingDataHistory.vue create mode 100644 PC/InterFace.Dash/src/views/interfaceBoard/MesProductL7PartsNote.vue create mode 100644 PC/InterFace.Dash/src/views/interfaceBoard/MessageReceive.vue create mode 100644 PC/InterFace.Dash/src/views/interfaceBoard/OutgoingData.vue create mode 100644 PC/InterFace.Dash/src/views/interfaceBoard/OutgoingDataHistory.vue diff --git a/PC/InterFace.Dash/public/config.js b/PC/InterFace.Dash/public/config.js index 4e25ab5..d026a2e 100644 --- a/PC/InterFace.Dash/public/config.js +++ b/PC/InterFace.Dash/public/config.js @@ -1,6 +1,7 @@ // dev_win window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:60068' window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-configuration' +window.SITE_CONFIG['columnsApiNamesZh'] = 'Z' window.SITE_CONFIG['isAutoLogin'] = true window.SITE_CONFIG['isSinglePage'] = false window.SITE_CONFIG['userNameOrEmailAddress'] = 'admin' diff --git a/PC/InterFace.Dash/src/App.vue b/PC/InterFace.Dash/src/App.vue index 99de5f8..b84602c 100644 --- a/PC/InterFace.Dash/src/App.vue +++ b/PC/InterFace.Dash/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/PC/InterFace.Dash/src/api/wms-api.js b/PC/InterFace.Dash/src/api/wms-api.js index 27e2da8..4cd4c8c 100644 --- a/PC/InterFace.Dash/src/api/wms-api.js +++ b/PC/InterFace.Dash/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/PC/InterFace.Dash/src/components/umyTable/index.vue b/PC/InterFace.Dash/src/components/umyTable/index.vue index 22a3612..8e0fff9 100644 --- a/PC/InterFace.Dash/src/components/umyTable/index.vue +++ b/PC/InterFace.Dash/src/components/umyTable/index.vue @@ -368,7 +368,8 @@ label="值" >