diff --git a/src/api/thrsys/spsSyncStatus.js b/src/api/thrsys/spsSyncStatus.js
index a6ca2e2..5aa1e88 100644
--- a/src/api/thrsys/spsSyncStatus.js
+++ b/src/api/thrsys/spsSyncStatus.js
@@ -43,3 +43,12 @@ export function updateConfig(query) {
});
}
+
+export function testConnect(query) {
+ return axios({
+ url: "/spssync/basic/connect/test",
+ method: "get",
+ params: query
+ });
+}
+
diff --git a/src/router/index.js b/src/router/index.js
index 7972ad3..66c9891 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -186,33 +186,49 @@ export const asyncRouterMap = [
// noDropdown: true,
children: [
+
{
- path: "authAdmin",
- component: authAdmin,
- name: "用户管理",
- icon: "",
- meta: {
- authRule: ["admin/auth_admin"]
- }
- },
- {
- path: "authRole",
- component: authRole,
- name: "角色管理",
- icon: "",
- meta: {
- authRule: ["admin/auth_role"]
- }
- },
- {
- path: "authPermissionRule",
- component: authPermissionRule,
+ path: "/authMange",
+ component: Empty,
name: "权限管理",
+ redirect: "/authMange/authAdmin",
icon: "",
meta: {
- authRule: ["admin/auth_permission_rule"]
- }
+ authRule: ["authMange/home"]
+ },
+ children: [
+ {
+ path: "authAdmin",
+ component: authAdmin,
+ name: "用户管理",
+ icon: "",
+ meta: {
+ authRule: ["authMange/auth_admin"]
+ }
+ },
+
+
+ {
+ path: "authRole",
+ component: authRole,
+ name: "角色管理",
+ icon: "",
+ meta: {
+ authRule: ["authMange/auth_role"]
+ }
+ },
+ {
+ path: "authPermissionRule",
+ component: authPermissionRule,
+ name: "功能配置",
+ icon: "",
+ meta: {
+ authRule: ["authMange/auth_permission_rule"]
+ }
+ },
+ ]
},
+
{
path: "/systemParam",
component: Empty,
@@ -653,8 +669,6 @@ export const asyncRouterMap = [
}
},]
},
-
-
{
path: "/udidb",
redirect: "/udidb/udidbSearch",
@@ -682,182 +696,182 @@ export const asyncRouterMap = [
}
]
},
-
- ]
- },
- {
- path: "/thrsys",
- redirect: "/products/thrProducts",
- component: Home,
- icon: "tongyong",
- name: "第三方数据",
- hidden: false,
- noDropdown: false,
- meta: {
- authRule: ["thrsys"]
- },
- children: [
- {
- path: "thrInvWarehouse",
- component: thrInvWarehouse,
- name: "仓库信息",
- icon: "",
- meta: {
- authRule: ["thrsys/thrInvWarehouse"]
- }
- },
{
- path: "/products",
+ path: "/thrsys",
redirect: "/products/thrProducts",
- name: "产品信息",
component: Empty,
+ name: "第三方数据",
+ hidden: false,
+ noDropdown: false,
meta: {
- authRule: ["thrsys/thrProducts"]
+ authRule: ["thrsys"]
},
children: [
{
- path: "thrProducts",
- name: "产品信息查询",
- component: thrProducts,
- meta: {
- authRule: ["thrsys/thrProducts/search"]
- },
- },
- {
- path: "thrProductsImport",
- name: "产品信息导入",
- component: thrProductsImport,
+ path: "thrInvWarehouse",
+ component: thrInvWarehouse,
+ name: "仓库信息",
+ icon: "",
meta: {
- authRule: ["thrsys/thrProductsImport"]
+ authRule: ["thrsys/thrInvWarehouse"]
}
},
{
- path: "thrProductsExport",
- name: "产品信息导出",
- component: thrProductsExport,
+ path: "/products",
+ redirect: "/products/thrProducts",
+ name: "产品信息",
+ component: Empty,
meta: {
- authRule: ["thrsys/thrProductsExport"]
- }
+ 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"]
+ }
+ },
+ ]
},
- ]
- },
- {
- path: "/corps",
- redirect: "/corps/ThrCorps",
- name: "往来单位",
- component: Empty,
- meta: {
- authRule: ["thrsys/corp"]
- },
- children: [
{
- path: "ThrCorps",
- name: "往来单位查询",
- component: ThrCorps,
+ path: "/corps",
+ redirect: "/corps/ThrCorps",
+ name: "往来单位",
+ component: Empty,
meta: {
- authRule: ["thrsys/ThrCorps"]
- }
- },
+ authRule: ["thrsys/corp"]
+ },
+ children: [
+ {
+ path: "ThrCorps",
+ name: "往来单位查询",
+ component: ThrCorps,
+ meta: {
+ authRule: ["thrsys/ThrCorps"]
+ }
+ },
- {
- path: "thrCorpsImport",
- name: "往来单位导入",
- component: thrCorpsImport,
- meta: {
- authRule: ["thrsys/thrCorpsImport"]
- }
+ {
+ path: "thrCorpsImport",
+ name: "往来单位导入",
+ component: thrCorpsImport,
+ meta: {
+ authRule: ["thrsys/thrCorpsImport"]
+ }
+ },
+ {
+ path: "thrCorpsExport",
+ name: "往来单位导出",
+ component: thrCorpsExport,
+ meta: {
+ authRule: ["thrsys/thrCorpsExport"]
+ }
+ }
+ ],
},
{
- path: "thrCorpsExport",
- name: "往来单位导出",
- component: thrCorpsExport,
- meta: {
- 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,
+ path: "/orders",
+ redirect: "/orders/ThrOrders",
+ name: "业务单据",
+ component: Empty,
meta: {
- authRule: ["thrsys/thrOrderImport"]
- }
+ 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: "thrOrderExport",
- name: "业务单据导出",
- component: thrOrderExport,
+ path: "/invProducts",
+ redirect: "/invProducts/ThrInvProducts",
+ name: "库存信息",
+ component: Empty,
meta: {
- authRule: ["thrsys/thrOrderExport"]
- }
- },],
- },
- {
- path: "/invProducts",
- redirect: "/invProducts/ThrInvProducts",
- name: "库存信息",
- component: Empty,
- meta: {
- authRule: ["thrsys/inv"]
- },
- children: [
+ authRule: ["thrsys/inv"]
+ },
+ children: [
- {
- path: "ThrInvProducts",
- name: "库存信息查询",
- component: ThrInvProducts,
- meta: {
- authRule: ["thrsys/ThrInvProducts"]
- }
- },
- {
- path: "thrInvProductsImport",
- name: "库存信息导入",
- component: thrInvProductsImport,
- meta: {
- authRule: ["thrsys/thrInvProductsImport"]
- }
+ {
+ 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: "thrInvProductsExport",
- name: "库存信息导出",
- component: thrInvProductsExport,
- meta: {
- authRule: ["thrsys/thrInvProductsExport"]
- }
- },]
- },
- // {
- // path: "thirdSys",
- // name: "参数设置",
- // component: thirdSys,
- // meta: {
- // authRule: ["thrsys/thirdSys"]
- // }
- // },
+ // {
+ // path: "thirdSys",
+ // name: "参数设置",
+ // component: thirdSys,
+ // meta: {
+ // authRule: ["thrsys/thirdSys"]
+ // }
+ // },
+
+ ]
+ },
]
},
+
{
path: "/smp",
redirect: "/smp/udiinfoExportSmp",
diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index bac086b..d891e6c 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -1018,11 +1018,13 @@ export default {
removeRl(query)
.then((response) => {
if (response.code == 20000) {
- this.getThirdSysDetail()();
this.$message({
type: "success",
message: "删除成功！",
});
+ this.getList();
+ this.cancelDialog();
+ this.getThirdSysDetail()();
} else {
this.$message.error(response.message);
}
diff --git a/src/views/basic/UdiInfoRelevance.vue b/src/views/basic/UdiInfoRelevance.vue
index 58ad486..9c4e1d0 100644
--- a/src/views/basic/UdiInfoRelevance.vue
+++ b/src/views/basic/UdiInfoRelevance.vue
@@ -414,6 +414,7 @@ export default {
this.combineQuery.thirdId = "";
}
this.combineQuery.manufactory = this.currentRow.manufactory;
+ this.combineQuery.price = this.currentRow.price;
combineUdi(this.combineQuery)
.then((response) => {
if (response.code == 20000) {
diff --git a/src/views/basic/UdiInfoselectErpUdi.vue b/src/views/basic/UdiInfoselectErpUdi.vue
index 24d482f..af1761e 100644
--- a/src/views/basic/UdiInfoselectErpUdi.vue
+++ b/src/views/basic/UdiInfoselectErpUdi.vue
@@ -557,6 +557,8 @@ export default {
this.combineQuery.thirdId = this.currentRow.code;
this.combineQuery.erpName = this.currentRow.name;
this.combineQuery.manufactory = this.currentRow.manufactory;
+ this.combineQuery.price = this.currentRow.price;
+ this.combineQuery.supName = this.currentRow.supName;
this.erpQuery.manufactory = this.currentRow.manufactory;
diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue
index 4a4f824..c0510aa 100644
--- a/src/views/thrsys/SysUdimsConfig.vue
+++ b/src/views/thrsys/SysUdimsConfig.vue
@@ -17,11 +17,15 @@
服务地址:
+ 测试连通
+
+
@@ -142,17 +146,6 @@
-
-
-
-
-
-
-
-
-
-
-