diff --git a/src/router/index.js b/src/router/index.js index b9078c0..0ad60fe 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -232,15 +232,7 @@ export const asyncRouterMap = [ }, ] }, - { - path: "phoneRegisterManage", - component: phoneRegisterManage, - name: "设备管理", - icon: "", - meta: { - authRule: ["admin/phoneRegisterManage"] - } - }, + { path: "/systemParam", component: Empty, @@ -251,6 +243,15 @@ export const asyncRouterMap = [ authRule: ["systemParam/systemParamConfig"] }, children: [ + { + path: "phoneRegisterManage", + component: phoneRegisterManage, + name: "设备管理", + icon: "", + meta: { + authRule: ["admin/phoneRegisterManage"] + } + }, { path: "systemParamConfig", component: systemParamConfig, @@ -277,22 +278,7 @@ export const asyncRouterMap = [ authRule: ["system/BussinessTypeLocl"] } }, - { - path: "bussinessTypeThird", - name: "第三方单据类型", - component: bussinessTypeThird, - meta: { - authRule: ["system/bussinessTypeThird"] - } - }, - { - path: "thirdSys", - name: "第三方系统", - component: thirdSys, - meta: { - authRule: ["system/thirdSys"] - } - }, + ] }, @@ -350,7 +336,7 @@ export const asyncRouterMap = [ { path: "spsSyncData", component: spsSyncData, - name: "数据同步", + name: "同步记录", icon: "", meta: { authRule: ["spsSyncMange/spsSyncData"] @@ -358,6 +344,35 @@ export const asyncRouterMap = [ }, ] }, + { + path: "/thrsysMange", + component: Empty, + name: "第三方系统", + redirect: "/thrsysMange/bussinessTypeThird", + icon: "", + meta: { + authRule: ["thrsysMange/manage"] + }, + children: [ + { + path: "bussinessTypeThird", + name: "单据类型", + component: bussinessTypeThird, + meta: { + authRule: ["thrsysMange/bussinessTypeThird"] + } + }, + { + path: "thirdSys", + name: "接口设置", + component: thirdSys, + meta: { + authRule: ["thrsysMange/thirdSys"] + } + }, + ] + }, + // { // path: "bussinessType", @@ -729,179 +744,180 @@ export const asyncRouterMap = [ } ] }, + + ] + }, + { + path: "/thrsys", + redirect: "/products/thrProducts", + component: Empty, + name: "第三方数据", + icon: "tongyong", + hidden: false, + noDropdown: false, + meta: { + authRule: ["thrsys"] + }, + children: [ + { + path: "thrInvWarehouse", + component: thrInvWarehouse, + name: "仓库信息", + icon: "", + meta: { + authRule: ["thrsys/thrInvWarehouse"] + } + }, { - path: "/thrsys", + path: "/products", redirect: "/products/thrProducts", + name: "产品信息", component: Empty, - name: "第三方数据", - hidden: false, - noDropdown: false, meta: { - authRule: ["thrsys"] + authRule: ["thrsys/thrProducts"] }, children: [ { - path: "thrInvWarehouse", - component: thrInvWarehouse, - name: "仓库信息", - icon: "", + path: "thrProducts", + name: "产品信息查询", + component: thrProducts, + meta: { + authRule: ["thrsys/thrProducts/search"] + }, + }, + { + path: "thrProductsImport", + name: "产品信息导入", + component: thrProductsImport, meta: { - authRule: ["thrsys/thrInvWarehouse"] + authRule: ["thrsys/thrProductsImport"] } }, { - path: "/products", - redirect: "/products/thrProducts", - name: "产品信息", - component: Empty, + path: "thrProductsExport", + name: "产品信息导出", + component: thrProductsExport, meta: { - authRule: ["thrsys/thrProducts"] - }, - children: [ - { - path: "thrProducts", - name: "产品信息查询", - component: thrProducts, - meta: { - authRule: ["thrsys/thrProducts/search"] - }, - }, - { - path: "thrProductsImport", - name: "产品信息导入", - component: thrProductsImport, - meta: { - authRule: ["thrsys/thrProductsImport"] - } - }, - { - path: "thrProductsExport", - name: "产品信息导出", - component: thrProductsExport, - meta: { - authRule: ["thrsys/thrProductsExport"] - } - }, - ] + authRule: ["thrsys/thrProductsExport"] + } }, + ] + }, + { + path: "/corps", + redirect: "/corps/ThrCorps", + name: "往来单位", + component: Empty, + meta: { + authRule: ["thrsys/corp"] + }, + children: [ { - path: "/corps", - redirect: "/corps/ThrCorps", - name: "往来单位", - component: Empty, + path: "ThrCorps", + name: "往来单位查询", + component: ThrCorps, meta: { - authRule: ["thrsys/corp"] - }, - children: [ - { - path: "ThrCorps", - name: "往来单位查询", - component: ThrCorps, - meta: { - authRule: ["thrsys/ThrCorps"] - } - }, - - { - path: "thrCorpsImport", - name: "往来单位导入", - component: thrCorpsImport, - meta: { - authRule: ["thrsys/thrCorpsImport"] - } - }, - { - path: "thrCorpsExport", - name: "往来单位导出", - component: thrCorpsExport, - meta: { - authRule: ["thrsys/thrCorpsExport"] - } - } - ], + authRule: ["thrsys/ThrCorps"] + } }, + { - path: "/orders", - redirect: "/orders/ThrOrders", - name: "业务单据", - component: Empty, + path: "thrCorpsImport", + name: "往来单位导入", + component: thrCorpsImport, meta: { - authRule: ["thrsys/throrders"] - }, - children: [ - { - path: "ThrOrders", - name: "业务单据查询", - component: ThrOrders, - meta: { - authRule: ["thrsys/order/search"] - } - }, - { - path: "thrOrderImport", - name: "业务单据导入", - component: thrOrderImport, - meta: { - authRule: ["thrsys/thrOrderImport"] - } - }, - { - path: "thrOrderExport", - name: "业务单据导出", - component: thrOrderExport, - meta: { - authRule: ["thrsys/thrOrderExport"] - } - },], + authRule: ["thrsys/thrCorpsImport"] + } }, { - path: "/invProducts", - redirect: "/invProducts/ThrInvProducts", - name: "库存信息", - component: Empty, + path: "thrCorpsExport", + name: "往来单位导出", + component: thrCorpsExport, meta: { - authRule: ["thrsys/inv"] - }, - children: [ - - { - path: "ThrInvProducts", - name: "库存信息查询", - component: ThrInvProducts, - meta: { - authRule: ["thrsys/ThrInvProducts"] - } - }, - { - path: "thrInvProductsImport", - name: "库存信息导入", - component: thrInvProductsImport, - meta: { - authRule: ["thrsys/thrInvProductsImport"] - } - }, - { - path: "thrInvProductsExport", - name: "库存信息导出", - component: thrInvProductsExport, - meta: { - authRule: ["thrsys/thrInvProductsExport"] - } - },] + authRule: ["thrsys/thrCorpsExport"] + } + } + ], + }, + { + path: "/orders", + redirect: "/orders/ThrOrders", + name: "业务单据", + component: Empty, + meta: { + authRule: ["thrsys/throrders"] + }, + children: [ + { + path: "ThrOrders", + name: "业务单据查询", + component: ThrOrders, + meta: { + authRule: ["thrsys/order/search"] + } }, + { + path: "thrOrderImport", + name: "业务单据导入", + component: thrOrderImport, + meta: { + authRule: ["thrsys/thrOrderImport"] + } + }, + { + path: "thrOrderExport", + name: "业务单据导出", + component: thrOrderExport, + meta: { + authRule: ["thrsys/thrOrderExport"] + } + },], + }, + { + path: "/invProducts", + redirect: "/invProducts/ThrInvProducts", + name: "库存信息", + component: Empty, + meta: { + authRule: ["thrsys/inv"] + }, + children: [ - // { - // path: "thirdSys", - // name: "参数设置", - // component: thirdSys, - // meta: { - // authRule: ["thrsys/thirdSys"] - // } - // }, - - ] + { + path: "ThrInvProducts", + name: "库存信息查询", + component: ThrInvProducts, + meta: { + authRule: ["thrsys/ThrInvProducts"] + } + }, + { + path: "thrInvProductsImport", + name: "库存信息导入", + component: thrInvProductsImport, + meta: { + authRule: ["thrsys/thrInvProductsImport"] + } + }, + { + path: "thrInvProductsExport", + name: "库存信息导出", + component: thrInvProductsExport, + meta: { + authRule: ["thrsys/thrInvProductsExport"] + } + },] }, + // { + // path: "thirdSys", + // name: "参数设置", + // component: thirdSys, + // meta: { + // authRule: ["thrsys/thirdSys"] + // } + // }, + ] }, @@ -1140,7 +1156,7 @@ export const asyncRouterMap = [ component: Home, icon: "tongyong", name: "API接口", - hidden: false, + hidden: true, noDropdown: false, meta: { authRule: ["api"] diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index 78da58a..5b83558 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -27,6 +27,7 @@ 查询 新增 @@ -159,6 +160,7 @@ import modifyDialog from "./BussinessTypeModify"; import axios from "axios"; import store from "@/store"; import {getLocalJoinBusType} from "@/api/basic/busLocalType"; +import {findConfig} from "@/api/thrsys/spsSyncStatus"; export default { data() { @@ -226,6 +228,7 @@ export default { multipleSelection: [], uploadFileUrl: null, headers: {}, + configParms: {}, }; }, @@ -461,6 +464,16 @@ export default { ADMIN_TOKEN: store.getters.token, }; }, + getSyncConfig() { + findConfig() + .then((response) => { + if (response.code == 20000) { + this.configParms = response.data; + } + }) + .catch(() => { + }); + }, }, components: { modifyDialog, @@ -469,6 +482,7 @@ export default { }, created() { this.init(); + this.getSyncConfig(); this.getList(); }, }; diff --git a/src/views/basic/BussinessTypeLocl.vue b/src/views/basic/BussinessTypeLocl.vue index bdf8e6b..b3f743b 100644 --- a/src/views/basic/BussinessTypeLocl.vue +++ b/src/views/basic/BussinessTypeLocl.vue @@ -21,6 +21,7 @@ 查询 新增 @@ -117,6 +118,7 @@ import {getLocalBusType, addLocalBusType, updateLocalBusType, deleteLocalBusType} from "@/api/basic/busLocalType"; import modifyDialog from "./BussinessTypeLoclModify"; +import {findConfig} from "@/api/thrsys/spsSyncStatus"; export default { data() { @@ -155,6 +157,7 @@ export default { total: 0, multipleSelection: [], + configParms: {}, }; }, @@ -294,6 +297,16 @@ export default { .catch(() => { }); }, + getSyncConfig() { + findConfig() + .then((response) => { + if (response.code == 20000) { + this.configParms = response.data; + } + }) + .catch(() => { + }); + }, }, components: { modifyDialog, @@ -301,7 +314,9 @@ export default { mounted() { }, created() { + this.getSyncConfig(); this.getList(); + }, }; diff --git a/src/views/basic/BussinessTypeThird.vue b/src/views/basic/BussinessTypeThird.vue index ea737c0..96b48fc 100644 --- a/src/views/basic/BussinessTypeThird.vue +++ b/src/views/basic/BussinessTypeThird.vue @@ -29,6 +29,7 @@ 查询 新增 @@ -132,6 +133,7 @@ import { import modifyDialog from "./BussinessTypeThirdModify"; import axios from "axios"; import {filterDetailByKey, getBasicThirdSys} from "@/api/basic/basicThirdSys"; +import {findConfig} from "@/api/thrsys/spsSyncStatus"; export default { data() { @@ -164,6 +166,7 @@ export default { uploadFileUrl: null, loading: false, thirdSysDetail: {}, + configParms:{}, }; }, @@ -372,6 +375,16 @@ export default { this.getList(); } }, + getSyncConfig() { + findConfig() + .then((response) => { + if (response.code == 20000) { + this.configParms = response.data; + } + }) + .catch(() => { + }); + }, }, components: { modifyDialog, @@ -380,6 +393,7 @@ export default { }, created() { this.init(); + this.getSyncConfig(); this.getBasicThirdSys(); this.getList(); diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue index 4cd454c..dbcd340 100644 --- a/src/views/thrsys/SysUdimsConfig.vue +++ b/src/views/thrsys/SysUdimsConfig.vue @@ -10,7 +10,7 @@ 同步服务 - +
- 说明: 修改同步参数时,请关闭数据同步服务 + 说明: 修改同步参数时,请关闭数据同步服务
diff --git a/src/views/userManage/admin/authAdmin.vue b/src/views/userManage/admin/authAdmin.vue index b7bd64d..c63f28b 100644 --- a/src/views/userManage/admin/authAdmin.vue +++ b/src/views/userManage/admin/authAdmin.vue @@ -22,6 +22,7 @@ >查询 新增 @@ -171,6 +172,7 @@ import { authAdminSave, authAdminDelete } from "../../../api/auth/authAdmin"; +import {findConfig} from "@/api/thrsys/spsSyncStatus"; const formJson = { id: "", passWord: "", @@ -216,6 +218,7 @@ export default { add: "新增", edit: "编辑" }, + configParms: {}, formLoading: false, formVisible: false, formData: formJson, @@ -394,7 +397,17 @@ export default { this.$message.info("取消删除"); }); } - } + }, + getSyncConfig() { + findConfig() + .then((response) => { + if (response.code == 20000) { + this.configParms = response.data; + } + }) + .catch(() => { + }); + }, }, filters: { statusFilterType(status) { @@ -422,6 +435,7 @@ export default { this.query.limit = parseInt(this.query.limit); // 加载表格数据 this.getList(); + this.getSyncConfig(); // 加载角色列表 this.getRoleList(); }