From 8d242ea503e4f45782a82dd73e0ee90fd687648e Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 24 Mar 2022 22:16:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config.json | 8 ++-- src/router/index.js | 2 +- src/views/basic/BussinessType.vue | 53 ++++++++++++--------- src/views/basic/BussinessTypeLocl.vue | 23 ++++----- src/views/basic/BussinessTypeLoclModify.vue | 4 +- src/views/basic/CorpExport.vue | 2 +- src/views/basic/CorpExportSmp.vue | 2 +- src/views/basic/CorpImport.vue | 2 +- src/views/basic/CorpMaintain.vue | 2 +- src/views/basic/CorpSelect.vue | 2 +- src/views/basic/UdiInfoDonwloadSmp.vue | 2 +- src/views/basic/UdiInfoImport.vue | 2 +- src/views/basic/UdidbImportLog.vue | 2 +- src/views/basic/UdiinfoExport.vue | 2 +- src/views/basic/UdiinfoExportSmp.vue | 2 +- src/views/userManage/admin/authRole.vue | 16 +++---- 16 files changed, 68 insertions(+), 58 deletions(-) diff --git a/public/config.json b/public/config.json index 7ca6b5f..dc76ca6 100644 --- a/public/config.json +++ b/public/config.json @@ -1,6 +1,6 @@ { - "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/", - "BASE_URL":"http://192.168.0.109:9991/", - "SERVER_IP": "http://192.168.0.109:9991/", - "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/" + "UDI_SYNC_SERVER_IP": "http://127.0.0.1:9995/", + "BASE_URL":"http://127.0.0.1:9991/", + "SERVER_IP": "http://127.0.0.1:9991/", + "WEBSOCKET_URL": "ws://127.0.0.1:9991/UDI_WMS_MC/api/websocket/" } diff --git a/src/router/index.js b/src/router/index.js index 04fe97b..bc85d1c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -907,7 +907,7 @@ export const asyncRouterMap = [ component: Home, icon: "tongyong", name: "内部码管理", - hidden: false, + hidden: true, noDropdown: false, meta: { authRule: ["myCode"] diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index 0a6eac7..745d206 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -4,13 +4,19 @@ - + + + + + + + + @@ -19,34 +25,37 @@ - 查询 + 查询 新增 导出单据类型 - - - - - - - - - - - + + + + + + + + + + + - - + - - + + + + - + @@ -130,6 +130,7 @@ export default { thirdType: "", page: 1, limit: 20, + name:null, }, addDialogVisible: false, modifyDialogVisible: false, @@ -247,9 +248,9 @@ export default { name: "", enable: "", remark: "", - mainAction: "", + mainAction: null, thirdSysFk: "", - id: "", + id: null, advanceType: null, localAction: null, changeEnable: null, diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue index c1f5a44..705a292 100644 --- a/src/views/basic/BussinessTypeLoclModify.vue +++ b/src/views/basic/BussinessTypeLoclModify.vue @@ -84,7 +84,7 @@
+ :disabled="!changeEnable || inputQuery.mainAction=='WareHouseIn' || inputQuery.id == null || inputQuery.mainAction==null"> 缺量自动补单
@@ -108,7 +108,7 @@ - + diff --git a/src/views/basic/CorpExport.vue b/src/views/basic/CorpExport.vue index d2f7e88..15f182d 100644 --- a/src/views/basic/CorpExport.vue +++ b/src/views/basic/CorpExport.vue @@ -211,7 +211,7 @@ this.getList(); }, deleteDialog(rowId) { - this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", { + this.$confirm("此操作将删除该往来单位信息, 是否继续?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", diff --git a/src/views/basic/CorpExportSmp.vue b/src/views/basic/CorpExportSmp.vue index c8d5c02..258c3c1 100644 --- a/src/views/basic/CorpExportSmp.vue +++ b/src/views/basic/CorpExportSmp.vue @@ -204,7 +204,7 @@ this.getList(); }, deleteDialog(rowId) { - this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", { + this.$confirm("此操作将删除该往来单位信息, 是否继续?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", diff --git a/src/views/basic/CorpImport.vue b/src/views/basic/CorpImport.vue index 90746e0..9cb020b 100644 --- a/src/views/basic/CorpImport.vue +++ b/src/views/basic/CorpImport.vue @@ -198,7 +198,7 @@ export default { this.getList(); }, deleteDialog(rowId) { - this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", { + this.$confirm("此操作将删除该往来单位信息, 是否继续?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", diff --git a/src/views/basic/CorpMaintain.vue b/src/views/basic/CorpMaintain.vue index 96f9c4e..ca509b3 100644 --- a/src/views/basic/CorpMaintain.vue +++ b/src/views/basic/CorpMaintain.vue @@ -534,7 +534,7 @@ }, deleteDialog(rowId) { - this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", { + this.$confirm("此操作将永久删除该往来单位信息, 是否继续?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", diff --git a/src/views/basic/CorpSelect.vue b/src/views/basic/CorpSelect.vue index f669c20..bd60cc3 100644 --- a/src/views/basic/CorpSelect.vue +++ b/src/views/basic/CorpSelect.vue @@ -520,7 +520,7 @@ }, deleteDialog(rowId) { - this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", { + this.$confirm("此操作将永久删除该往来单位信息, 是否继续?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", diff --git a/src/views/basic/UdiInfoDonwloadSmp.vue b/src/views/basic/UdiInfoDonwloadSmp.vue index 3202712..580bccc 100644 --- a/src/views/basic/UdiInfoDonwloadSmp.vue +++ b/src/views/basic/UdiInfoDonwloadSmp.vue @@ -218,7 +218,7 @@ export default { this.getList(); }, deleteDialog(rowId) { - this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", { + this.$confirm("此操作将删除该产品信息, 是否继续?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", diff --git a/src/views/basic/UdiInfoImport.vue b/src/views/basic/UdiInfoImport.vue index e49051a..05581fd 100644 --- a/src/views/basic/UdiInfoImport.vue +++ b/src/views/basic/UdiInfoImport.vue @@ -212,7 +212,7 @@ this.getList(); }, deleteDialog(rowId) { - this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", { + this.$confirm("此操作将删除该产品信息, 是否继续?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", diff --git a/src/views/basic/UdidbImportLog.vue b/src/views/basic/UdidbImportLog.vue index 6116a82..3e171d0 100644 --- a/src/views/basic/UdidbImportLog.vue +++ b/src/views/basic/UdidbImportLog.vue @@ -197,7 +197,7 @@ export default { this.getList(); }, deleteDialog(rowId) { - this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", { + this.$confirm("此操作将删除该产品信息, 是否继续?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", diff --git a/src/views/basic/UdiinfoExport.vue b/src/views/basic/UdiinfoExport.vue index d21d081..4548b87 100644 --- a/src/views/basic/UdiinfoExport.vue +++ b/src/views/basic/UdiinfoExport.vue @@ -213,7 +213,7 @@ this.getList(); }, deleteDialog(rowId) { - this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", { + this.$confirm("此操作将删除该产品信息, 是否继续?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", diff --git a/src/views/basic/UdiinfoExportSmp.vue b/src/views/basic/UdiinfoExportSmp.vue index 529b97c..0073c1c 100644 --- a/src/views/basic/UdiinfoExportSmp.vue +++ b/src/views/basic/UdiinfoExportSmp.vue @@ -209,7 +209,7 @@ this.getList(); }, deleteDialog(rowId) { - this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", { + this.$confirm("此操作将删除该产品信息, 是否继续?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", diff --git a/src/views/userManage/admin/authRole.vue b/src/views/userManage/admin/authRole.vue index 4a0e205..e87406f 100644 --- a/src/views/userManage/admin/authRole.vue +++ b/src/views/userManage/admin/authRole.vue @@ -4,13 +4,13 @@ - - - - - - - + + + + + + + @@ -130,7 +130,7 @@ > - + 禁用 正常