Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

chenhaozhe

5 天以前 cfd0b53967daca92d98cd304e4d4e0577e2efbd3

 src/store/modules/permission.js

@@ -41,6 +41,63 @@
              icon: "build",
              link: null,
              noCache: false,
              title: "物流管理",
            },
            hidden: false,
            name: "Logistics",
            path: "/logistics",
            redirect: "noRedirect",
            children: [
              {
                meta: {
                  icon: "build",
                  link: null,
                  noCache: false,
                  title: "运输定位",
                },
                hidden: false,
                name: "TransportGPS",
                path: "transportGPS",
                redirect: "noRedirect",
                component: "Layout",
                children: [
                  {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "出运单",
                    },
                    component: () =>
                      import("@/views/logistics/transportGPS/WL_YayBill.vue"),
                    hidden: false,
                    name: "WL_YayBill",
                    path: "WL_YayBill",
                  },
                  // {
                  //   meta: {
                  //     icon: "build",
                  //     link: null,
                  //     noCache: false,
                  //     title: "运单编辑",
                  //   },
                  //   component: () =>
                  //     import("@/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue"),
                  //   hidden: false,
                  //   name: "Add_Edit_WL_YayBill",
                  //   path: "Add_Edit_WL_YayBill",
                  // },
                ],
              },
            ],
          },
          {
            alwaysShow: true,
            component: "Layout",
            meta: {
              icon: "build",
              link: null,
              noCache: false,
              title: "销售管理",
            },
            hidden: false,
@@ -520,7 +577,9 @@
                      title: "承运合同单据",
                    },
                    component: () =>
                      import("@/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue"),
                      import(
                        "@/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue"
                      ),
                    hidden: false,
                    name: "CgContractTransportBillList",
                    path: "cgContractTransportBillList",
@@ -579,7 +638,7 @@
                    name: "GyCartypelist",
                    path: "gyCartypelist",
                  },
                   {
                  {
                    meta: {
                      icon: "build",
                      link: null,
@@ -636,6 +695,33 @@
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "货币列表",
                    },
                    component: () =>
                      import("@/views/basic/gyCurrency/gyCurrency.vue"),
                    hidden: false,
                    name: "GyCurrency",
                    path: "gyCurrency",
                  },

                  {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "计量单位列表",
                    },
                    component: () => import("@/views/basic/gyUnit/gyUnit.vue"),
                    hidden: false,
                    name: "GyUnit",
                    path: "gyUnit",
                  },

                  {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "供应商列表",
                    },
                    component: () => import("@/views/basic/gy/gySupplier.vue"),
@@ -675,7 +761,8 @@
                      noCache: false,
                      title: "辅助属性列表",
                    },
                    component: () => import("@/views/basic/gyProperty/gyPropertyList.vue"),
                    component: () =>
                      import("@/views/basic/gyProperty/gyPropertyList.vue"),
                    hidden: false,
                    name: "GyProperty",
                    path: "gyProperty",
@@ -888,7 +975,7 @@
                    hidden: false,
                    name: "Kf_POStockInBackBillList",
                    path: "Kf_POStockInBackBillList",
                    query: "{\"type\":1}"
                    query: '{"type":1}',
                  },
                  {
                    meta: {
@@ -904,7 +991,7 @@
                    hidden: false,
                    name: "Kf_POStockInBackBillList",
                    path: "Kf_POStockInBackBillList0",
                    query: "{\"type\":0}"
                    query: '{"type":0}',
                  },
                ],
              },
@@ -1422,7 +1509,7 @@
                      noCache: false,
                      title: "驾驶员列表",
                    },
                    component: () =>import("@/views/system/user/GyDriver.vue"),
                    component: () => import("@/views/system/user/GyDriver.vue"),
                    hidden: false,
                    name: "gyDriver",
                    path: "GyDriver",