Merge remote-tracking branch 'origin/busUser' into zhairh

public/config.json

@@ -1,7 +1,7 @@
 {
     "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/",
-    "BASE_URL":"http://192.168.0.180:9991",
+    "BASE_URL":"http://192.168.0.109:9991",
-    "SERVER_IP": "http://192.168.0.180:9991/",
+    "SERVER_IP": "http://192.168.0.109:9991/",
     "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/",
     "hosp_name": "平和县医院"
 }

src/router/index.js

@@ -28,6 +28,9 @@ import invWarehouse from "../views/basic/invWarehouse"
 import BussinessType from "../views/basic/BussinessType.vue";
 import BussinessTypeLocl from "../views/basic/BussinessTypeLocl.vue";
 import bussinessTypeThird from "../views/basic/BussinessTypeThird.vue";
+import bussinessTypeChange from "../views/basic/BusTypeChange.vue";
+
+
 import basicUnitMaintain from "../views/basic/CorpMaintain.vue";
 import corpImport from "../views/basic/CorpImport.vue";
 import corpExport from "../views/basic/CorpExport.vue";
@@ -40,6 +43,21 @@ import udiInfoDb from "../views/basic/UdiInfoDb.vue";
 import UdidbImportLog from "../views/basic/UdidbImportLog.vue";
 import spsSyncData from "../views/thrsys/SysUdimsData.vue";
 
+//资质审核
+import supCompany from "../views/purchase/supCompanyAdd.vue";
+import supCompanyAudit from "../views/purchase/supCompanyAudit.vue";
+import supCompanySearch from "../views/purchase/supCompanySearch.vue";
+import supManufacturer from "../views/purchase/supManufacturerAdd.vue";
+import supManufacturerAudit from "../views/purchase/supManufacturerAudit.vue";
+import supManufacturerSearch from "../views/purchase/supManufacturerSearch.vue";
+import supProduct from "../views/purchase/supProductAdd.vue";
+import supProductAudit from "../views/purchase/supProductAudit.vue";
+import supProductSearch from "../views/purchase/supProductSearch.vue";
+import supCertAudit from "../views/purchase/supCertAudit.vue";
+import supCertSearch from "../views/purchase/supCertSearch.vue";
+import supCertSet from "../views/purchase/supCertSet.vue";
+import supCertificationAdd from "../views/purchase/supCertificationAdd.vue";
+
 import UdiInfoSmpUpload from "../views/smp/UdiInfoSmpUpload.vue";
 // import ErpOrderSmpUpload from "../views/smp/ErpOrderSmpUpload.vue";
 
@@ -73,6 +91,9 @@ import thirdUploadSet from "@/views/thrsys/thirdUploadSet";
 
 //库存管理
 import stockCheck from "../views/inventory/stockCheck.vue";
+
+
+import innerOrder from "../views/inventory/innerOrder.vue";
 import onHand from "../views/inventory/OnHand.vue";
 import inCodeLog from "../views/inventory/InCodeLog.vue";
 import stockPrint from "../views/inventory/IncodeSearch.vue";
@@ -81,6 +102,7 @@ import stockCode from "../views/inventory/stockCode.vue";
 import stockOrderDelSearch from "../views/business/stockOrderDelSearch";
 import stockOrderInvSearch from "../views/business/stockOrderInvSearch";
 import stockOrderDelete from "../views/business/stockOrderDelete";
+import stockOrderChange from "../views/inout/stockOrderChange";
 
 //盘点管理
 import invCountOrderNew from "@/views/inventory/invCountOrderNew";
@@ -133,6 +155,20 @@ import BasicEntrutsRece from "../views/basic/BasicEntrutsRece.vue";
 //同步管理
 import sysUdimsDownloadData from "../views/thrsys/SysUdimsDownloadData";
 
+
+//采购管理
+
+import purApply from "../views/purchase/purApply";
+import pureApplyAudit from "../views/purchase/pureApplyAudit";
+import pureApplySearch from "../views/purchase/pureApplySearch";
+import purPlan from "../views/purchase/purPlan";
+import purPlanAudit from "../views/purchase/purPlanAudit";
+import purPlanSearch from "../views/purchase/purPlanSearch";
+
+import platform from "../views/userManage/platform";
+import bindPlatform from "@/views/userManage/bindPlatform";
+
+
 // Vue.use(VueRouter);
 
 const err401 = r =>
@@ -312,6 +348,16 @@ export const asyncRouterMap = [
                             authRule: ["system/BussinessTypeLocl"]
                         }
                     },
+                    {
+                        path: "bussinessTypeChange",
+                        name: "单据流转设置",
+                        component: bussinessTypeChange,
+                        meta: {
+                            authRule: ["admin/bussinessTypeChange"]
+                        }
+                    },
+
+
                 ]
             },
 
@@ -414,7 +460,36 @@ export const asyncRouterMap = [
                     },
                 ]
             },
-
+            {
+                path: "/platformManage",
+                component: Empty,
+                name: "医院客户管理",
+                redirect: "/platformManage/platform",
+                icon: "",
+                meta: {
+                    authRule: [""]
+                },
+                children: [
+                    {
+                        path: "platform",
+                        component: platform,
+                        name: "医院自助平台",
+                        icon: "",
+                        meta: {
+                            authRule: ["userManage/platform"]
+                        }
+                    },
+                    {
+                        path: "bindPlatform",
+                        component: bindPlatform,
+                        name: "医院客户",
+                        icon: "",
+                        meta: {
+                            authRule: ["userManage/bindPlatform"]
+                        }
+                    }
+                ]
+            }
 
             // {
             //     path: "bussinessType",
@@ -571,6 +646,207 @@ export const asyncRouterMap = [
 
         ]
     },
+
+    {
+        path: "/firstCamp",
+        component: Home,
+        redirect: "/firstCamp/certAdd",
+        icon: "tongyong",
+        name: "首营资质",
+        noDropdown: false,
+        meta: {
+            authRule: ["firstCamp"]
+        },
+        children: [
+
+
+            {
+                path: "/certAdd",
+                redirect: "/certAdd/supplierAdd",
+                name: "资质新增",
+                component: Empty,
+                meta: {
+                    authRule: ["firstCamp/certAdd"]
+                },
+                children: [
+                    {
+                        path: "supplierAdd",
+                        name: "配送企业资质新增",
+                        component: supCompany,
+                        meta: {
+                            authRule: ["firstCamp/certAdd/supplierAdd"]
+                        }
+                    },
+                    {
+                        path: "manufacturerAdd",
+                        name: "生产企业资质新增",
+                        hidden: true,
+                        component: supManufacturer,
+                        meta: {
+                            authRule: ["firstCamp/certAdd/manufacturerAdd"]
+                        }
+                    },
+
+                    {
+                        path: "productAdd",
+                        name: "配送产品资质新增",
+                        component: supCertificationAdd,
+                        meta: {
+                            authRule: ["firstCamp/certAdd/productAdd"]
+                        }
+                    },
+                ]
+            },
+
+
+            {
+                path: "certAudit",
+                component: supCertAudit,
+                name: "资质审核",
+                icon: "",
+                meta: {
+                    authRule: ["firstCamp/certAudit"]
+                }
+            },
+
+            {
+                path: "certSearch",
+                component: supCertSearch,
+                name: "资质查询",
+                icon: "",
+                meta: {
+                    authRule: ["firstCamp/certSearch"]
+                }
+            },
+
+            {
+                path: "certSet",
+                component: supCertSet,
+                name: "资质上传设置",
+                icon: "",
+                meta: {
+                    authRule: ["firstCamp/certSet"]
+                }
+            },
+
+
+            {
+                path: "/supplierManage",
+                redirect: "/supplierManage/supplierAdd",
+                name: "供应商资质管理",
+                hidden: true,
+                component: Empty,
+                meta: {
+                    authRule: ["firstCamp/supplierManage"]
+                },
+                children: [
+                    {
+                        path: "supplierAdd",
+                        name: "供应商资质新增",
+                        component: supCompany,
+                        meta: {
+                            authRule: ["firstCamp/supplierManage/supplierAdd"]
+                        }
+                    },
+                    {
+                        path: "supplierAudit",
+                        name: "供应商资质审核",
+                        component: supCompanyAudit,
+                        meta: {
+                            authRule: ["firstCamp/supplierManage/supplierAudit"]
+                        }
+                    },
+
+                    {
+                        path: "supplierSearch",
+                        name: "供应商资质查询",
+                        component: supCompanySearch,
+                        meta: {
+                            authRule: ["firstCamp/supplierManage/supplierSearch"]
+                        }
+                    },
+                ]
+            },
+
+
+            {
+                path: "/manufacturerManage",
+                redirect: "/manufacturerManage/manufacturerAdd",
+                name: "生产企业资质管理",
+                hidden: true,
+                component: Empty,
+                meta: {
+                    authRule: ["firstCamp/manufacturerManage"]
+                },
+                children: [
+                    {
+                        path: "manufacturerAdd",
+                        name: "生产企业资质新增",
+                        component: supManufacturer,
+                        meta: {
+                            authRule: ["firstCamp/manufacturerManage/manufacturerAdd"]
+                        }
+                    },
+                    {
+                        path: "manufacturerAudit",
+                        name: "生产企业资质审核",
+                        component: supManufacturerAudit,
+                        meta: {
+                            authRule: ["firstCamp/manufacturerManage/manufacturerAudit"]
+                        }
+                    },
+
+                    {
+                        path: "manufacturerSearch",
+                        name: "生产企业资质查询",
+                        component: supManufacturerSearch,
+                        meta: {
+                            authRule: ["firstCamp/manufacturerManage/manufacturerSearch"]
+                        }
+                    },
+                ]
+            },
+
+            {
+                path: "/productManage",
+                redirect: "/productManage/productAdd",
+                name: "产品资质管理",
+                component: Empty,
+                hidden: true,
+                meta: {
+                    authRule: ["firstCamp/productManage"]
+                },
+                children: [
+                    {
+                        path: "productAdd",
+                        name: "产品资质新增",
+                        component: supProduct,
+                        meta: {
+                            authRule: ["firstCamp/productManage/productAdd"]
+                        }
+                    },
+                    {
+                        path: "supProductAudit",
+                        name: "产品资质审核",
+                        component: supProductAudit,
+                        meta: {
+                            authRule: ["firstCamp/productManage/supProductAudit"]
+                        }
+                    },
+
+                    {
+                        path: "supProductSearch",
+                        name: "产品资质查询",
+                        component: supProductSearch,
+                        meta: {
+                            authRule: ["firstCamp/productManage/supProductSearch"]
+                        }
+                    },
+                ]
+            },
+        ]
+    },
+
     {
         path: "/inout",
         component: Home,
@@ -807,6 +1083,99 @@ export const asyncRouterMap = [
 
         ]
     },
+
+
+    {
+        path: "/purchase",
+        component: Home,
+        redirect: "/purchase/apply",
+        icon: "tongyong",
+        name: "采购管理",
+        noDropdown: false,
+        meta: {
+            authRule: ["purchase"]
+        },
+        children: [
+
+            {
+                path: "/apply",
+                component: Empty,
+                name: "产品申购管理",
+                redirect: "/apply/applyAdd",
+                meta: {
+                    authRule: ["purchase/apply"]
+                },
+                children: [
+                    {
+                        path: "applyAdd",
+                        component: purApply,
+                        name: "新增申购单据",
+                        meta: {
+                            authRule: ["purchase/apply/add"]
+                        }
+                    },
+                    {
+                        path: "applyAudit",
+                        component: pureApplyAudit,
+                        name: "申购单据审核",
+                        meta: {
+                            authRule: ["purchase/apply/audit"]
+                        }
+                    },
+                    {
+                        path: "applySearch",
+                        component: pureApplySearch,
+                        name: "申购单据查询",
+                        meta: {
+                            authRule: ["purchase/apply/search"]
+                        }
+                    },
+
+                ]
+            },
+
+            {
+                path: "/plan",
+                component: Empty,
+                name: "采购计划管理",
+                redirect: "/plan/planAdd",
+                meta: {
+                    authRule: ["plan/planAdd"]
+                },
+                children: [
+                    {
+                        path: "planAdd",
+                        component: purPlan,
+                        name: "新增采购计划",
+                        meta: {
+                            authRule: ["purchase/plan/planAdd"]
+                        }
+                    },
+                    {
+                        path: "planAudit",
+                        component: purPlanAudit,
+                        name: "采购计划审核",
+                        meta: {
+                            authRule: ["purchase/plan/planAudit"]
+                        }
+                    },
+                    {
+                        path: "planSearch",
+                        component: purPlanSearch,
+                        name: "采购计划查询",
+                        meta: {
+                            authRule: ["purchase/plan/planSearch"]
+                        }
+                    },
+
+                ]
+            },
+
+
+        ]
+    },
+
+
     {
         path: "/warehouse",
         redirect: "/warehouse/product",
@@ -997,6 +1366,25 @@ export const asyncRouterMap = [
                 }
             },
 
+            {
+                path: "onHand",
+                name: "现存量查询",
+                component: onHand,
+                meta: {
+                    authRule: ["warehouse/onHand"]
+                }
+            },
+
+            {
+                path: "innerOrder",
+                component: innerOrder,
+                name: "内部码打印",
+                meta: {
+                    authRule: ["inv/innerOrder"]
+                }
+            },
+
+
             {
                 path: "/invManage",
                 component: Empty,