diff --git a/src/router/index.js b/src/router/index.js index 1dc9b87..0721da8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -284,15 +284,6 @@ export const asyncRouterMap = [ }, - { - path: "phoneRegisterManage", - component: phoneRegisterManage, - name: "设备管理", - icon: "", - meta: { - authRule: ["admin/phoneRegisterManage"] - } - }, { path: "/systemParam", @@ -304,6 +295,15 @@ export const asyncRouterMap = [ authRule: ["systemParam/systemParamConfig"] }, children: [ + { + path: "phoneRegisterManage", + component: phoneRegisterManage, + name: "设备管理", + icon: "", + meta: { + authRule: ["admin/phoneRegisterManage"] + } + }, { path: "systemParamConfig", component: systemParamConfig, @@ -330,22 +330,9 @@ export const asyncRouterMap = [ authRule: ["product/BussinessTypeLocl"] } }, - { - path: "bussinessTypeThird", - name: "第三方单据类型", - component: bussinessTypeThird, - meta: { - authRule: ["system/bussinessTypeThird"] - } - }, - { - path: "thirdSys", - name: "第三方系统", - component: thirdSys, - meta: { - authRule: ["thrsys/thirdSys"] - } - }, + + + ] }, @@ -402,7 +389,7 @@ export const asyncRouterMap = [ { path: "spsSyncData", component: spsSyncData, - name: "数据同步", + name: "同步记录", icon: "", meta: { authRule: ["spsSyncMange/spsSyncData"] @@ -411,6 +398,39 @@ 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: "systemPDFTemplate", // component: systemPDFTemplate, @@ -538,149 +558,8 @@ export const asyncRouterMap = [ }, ] }, - { - path: "/thrsys", - redirect: "/thrsys/manage", - name: "第三方数据", - component: Empty, - meta: { - authRule: ["thrsys/manage"] - }, - children: [ - { - path: "thrInvWarehouse", - component: thrInvWarehouse, - name: "仓库信息", - icon: "", - meta: { - authRule: ["thrsys/thrInvWarehouse"] - } - }, - { - path: "/corps", - redirect: "/corps/ThrCorps", - name: "往来单位", - component: Empty, - 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"] - // } - // } - ], - }, - - { - path: "/products", - redirect: "/products/thrProducts", - name: "产品信息", - component: Empty, - meta: { - authRule: ["thrsys/products"] - }, - children: [ - { - path: "thrProducts", - name: "产品信息查询", - component: thrProducts, - meta: { - authRule: ["thrsys/thrProducts"] - } - }, - { - path: "thrProductsImport", - name: "产品信息导入", - component: thrProductsImport, - meta: { - authRule: ["thrsys/thrProductsImport"] - } - }, - ], - }, - - { - path: "/orders", - redirect: "/orders/ThrOrders", - name: "业务单据", - component: Empty, - meta: { - authRule: ["thrsys/orders"] - }, - children: [ - { - path: "ThrOrders", - name: "业务单据查询", - component: ThrOrders, - meta: { - authRule: ["thrsys/ThrOrders"] - } - }, - { - path: "thrOrderImport", - name: "业务单据导入", - component: thrOrderImport, - meta: { - authRule: ["thrsys/thrOrderImport"] - } - }, - ], - }, - { - path: "/udplatGoods", - redirect: "/udplatGoods/ThrOrders", - name: "阳光采购平台", - hidden: true, - component: Empty, - meta: { - authRule: ["thrsys/udplatGoods"] - }, - children: [ - { - path: "thrUdplatGoods", - name: "阳光采购平台查询", - component: udplatGoods, - meta: { - authRule: ["thrsys/thrUdplatGoods"] - } - }, - { - path: "thrUdplatGoodsImport", - name: "阳光采购平台导入", - component: udplatGoodsImport, - meta: { - authRule: ["thrsys/thrUdplatGoodsImport"] - } - }, - ], - }, - ] - } - ] }, @@ -1089,6 +968,150 @@ export const asyncRouterMap = [ // } // }, + { + path: "/thrsys", + redirect: "/thrsys/manage", + name: "第三方数据", + component: Home, + icon: "tongyong", + meta: { + authRule: ["thrsys/manage"] + }, + children: [ + { + path: "thrInvWarehouse", + component: thrInvWarehouse, + name: "仓库信息", + icon: "", + meta: { + authRule: ["thrsys/thrInvWarehouse"] + } + }, + { + path: "/corps", + redirect: "/corps/ThrCorps", + name: "往来单位", + component: Empty, + 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"] + // } + // } + ], + }, + + { + path: "/products", + redirect: "/products/thrProducts", + name: "产品信息", + component: Empty, + meta: { + authRule: ["thrsys/products"] + }, + children: [ + { + path: "thrProducts", + name: "产品信息查询", + component: thrProducts, + meta: { + authRule: ["thrsys/thrProducts"] + } + }, + { + path: "thrProductsImport", + name: "产品信息导入", + component: thrProductsImport, + meta: { + authRule: ["thrsys/thrProductsImport"] + } + }, + ], + }, + + { + path: "/orders", + redirect: "/orders/ThrOrders", + name: "业务单据", + component: Empty, + meta: { + authRule: ["thrsys/orders"] + }, + children: [ + { + path: "ThrOrders", + name: "业务单据查询", + component: ThrOrders, + meta: { + authRule: ["thrsys/ThrOrders"] + } + }, + { + path: "thrOrderImport", + name: "业务单据导入", + component: thrOrderImport, + meta: { + authRule: ["thrsys/thrOrderImport"] + } + }, + ], + }, + { + path: "/udplatGoods", + redirect: "/udplatGoods/ThrOrders", + name: "阳光采购平台", + hidden: true, + component: Empty, + meta: { + authRule: ["thrsys/udplatGoods"] + }, + children: [ + { + path: "thrUdplatGoods", + name: "阳光采购平台查询", + component: udplatGoods, + meta: { + authRule: ["thrsys/thrUdplatGoods"] + } + }, + { + path: "thrUdplatGoodsImport", + name: "阳光采购平台导入", + component: udplatGoodsImport, + meta: { + authRule: ["thrsys/thrUdplatGoodsImport"] + } + }, + ], + }, + + + ] + }, + { path: "/supplier", redirect: "/supplier/basicInstrumentMaintain", diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index 79f530c..3ff3cdf 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -27,20 +27,21 @@ 查询 新增 - - 导入单据类型 - + + + + + + + + + + + @@ -153,6 +154,7 @@ import { import modifyDialog from "./BussinessTypeModify"; import axios from "axios"; import store from "@/store"; +import {findConfig} from "@/api/thrsys/spsSyncStatus"; export default { data() { @@ -216,6 +218,7 @@ export default { multipleSelection: [], uploadFileUrl: null, headers: {}, + configParms: {}, }; }, @@ -391,6 +394,16 @@ export default { ADMIN_TOKEN: store.getters.token, }; }, + getSyncConfig() { + findConfig() + .then((response) => { + if (response.code == 20000) { + this.configParms = response.data; + } + }) + .catch(() => { + }); + }, }, components: { modifyDialog, @@ -399,7 +412,9 @@ export default { }, created() { this.init(); + this.getSyncConfig(); this.getList(); + }, }; diff --git a/src/views/basic/BussinessTypeLocl.vue b/src/views/basic/BussinessTypeLocl.vue index 0b2b807..c90e3ad 100644 --- a/src/views/basic/BussinessTypeLocl.vue +++ b/src/views/basic/BussinessTypeLocl.vue @@ -14,6 +14,7 @@ 查询 新增 @@ -119,6 +120,7 @@ import {getLocalBusType, addLocalBusType, updateLocalBusType, deleteLocalBusType} from "@/api/basic/busLocalType"; import modifyDialog from "./BussinessTypeLoclModify"; +import {findConfig} from "@/api/thrsys/spsSyncStatus"; export default { data() { @@ -156,6 +158,7 @@ export default { total: 0, multipleSelection: [], + configParms: {}, }; }, @@ -295,6 +298,16 @@ export default { .catch(() => { }); }, + getSyncConfig() { + findConfig() + .then((response) => { + if (response.code == 20000) { + this.configParms = response.data; + } + }) + .catch(() => { + }); + }, }, components: { modifyDialog, @@ -302,6 +315,7 @@ export default { mounted() { }, created() { + this.getSyncConfig(); this.getList(); }, }; diff --git a/src/views/basic/BussinessTypeThird.vue b/src/views/basic/BussinessTypeThird.vue index 1b2b3ed..97bcf14 100644 --- a/src/views/basic/BussinessTypeThird.vue +++ b/src/views/basic/BussinessTypeThird.vue @@ -29,10 +29,11 @@ 查询 新增 - 更新下载 + @@ -125,6 +126,7 @@ import { import modifyDialog from "./BussinessTypeThirdModify"; import axios from "axios"; import {getBasicThirdSys} from "@/api/basic/basicThirdSys"; +import {findConfig} from "@/api/thrsys/spsSyncStatus"; export default { data() { @@ -155,6 +157,7 @@ export default { multipleSelection: [], uploadFileUrl: null, loading: false, + configParms: {}, }; }, @@ -333,6 +336,16 @@ export default { this.getList(); } }, + getSyncConfig() { + findConfig() + .then((response) => { + if (response.code == 20000) { + this.configParms = response.data; + } + }) + .catch(() => { + }); + }, }, components: { modifyDialog, @@ -341,6 +354,7 @@ export default { }, created() { this.init(); + this.getSyncConfig(); this.getBasicThirdSys(); this.getList(); diff --git a/src/views/basic/UdiInfoRelevance.vue b/src/views/basic/UdiInfoRelevance.vue index 6601ae3..bea6eae 100644 --- a/src/views/basic/UdiInfoRelevance.vue +++ b/src/views/basic/UdiInfoRelevance.vue @@ -246,7 +246,7 @@ > - - + diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue index e47e020..d31c88c 100644 --- a/src/views/thrsys/SysUdimsConfig.vue +++ b/src/views/thrsys/SysUdimsConfig.vue @@ -10,7 +10,7 @@ 同步服务 - +
- 说明: 修改同步参数时,请关闭数据同步服务 + 说明: 修改同步参数时,请关闭数据同步服务
@@ -40,7 +40,7 @@ style="width: 100px" size="small" type="number" - v-model="configQuery.syncTime" + v-model="configQuery.syncTime" :disabled="configQuery.downstreamEnable" splaceholder="请输入内容" > diff --git a/src/views/thrsys/SysUdimsData.vue b/src/views/thrsys/SysUdimsData.vue index 3b61380..feda1d0 100644 --- a/src/views/thrsys/SysUdimsData.vue +++ b/src/views/thrsys/SysUdimsData.vue @@ -32,10 +32,24 @@ 查询 - 同步单据 - 同步单据类型 - 同步基础信息 - 同步国家库DI数据 + 同步单据 + + + 同步单据类型 + + 同步基础信息 + + 同步国家库DI数据 +
@@ -178,6 +192,7 @@ export default { templateDlUrl: null, checked: false, syncTime: null, + configParms: {}, }; }, @@ -260,7 +275,7 @@ export default { createScheduleDialog(type) { if (this.$isNotBlank(this.syncTime)) { - this.$confirm("此操作将从"+this.syncTime+"开始同步最新数据,是否继续", "提示", { + this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据,是否继续", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", @@ -352,8 +367,17 @@ export default { 2: "danger", }; return statusMap[status]; - } - , + }, + getSyncConfig() { + findConfig() + .then((response) => { + if (response.code == 20000) { + this.configParms = response.data; + } + }) + .catch(() => { + }); + }, }, mounted() { @@ -364,6 +388,7 @@ export default { ADMIN_ID: store.getters.adminId, ADMIN_TOKEN: store.getters.token, }; + this.getSyncConfig(); this.getList(); this.getConfig(); }, diff --git a/src/views/userManage/admin/authAdmin.vue b/src/views/userManage/admin/authAdmin.vue index 4a377a2..d5346b9 100644 --- a/src/views/userManage/admin/authAdmin.vue +++ b/src/views/userManage/admin/authAdmin.vue @@ -1,456 +1,470 @@