From 32a02312127eca18b80eb8d560618b2dba801deb Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Mon, 6 May 2024 16:53:22 +0800
Subject: [PATCH] 1111

---
 src/api/baseinfo/brands/brand.js        |  10 +-
 src/api/baseinfo/category/category.js   |  12 +-
 src/api/baseinfo/factory/factory.js     |  10 +-
 src/api/baseinfo/goods/goods.js         |   8 +-
 src/api/baseinfo/unit/unit.js           |  49 ++
 src/layout/components/Sidebar/index.vue | 821 ++++++++++++------------
 src/router/index.js                     | 112 +++-
 src/views/baseInfo/unit/index.vue       | 245 +++++++
 src/views/baseInfo/unit/unitAdd.vue     | 210 ++++++
 src/views/login/login.vue               |  37 +-
 10 files changed, 1044 insertions(+), 470 deletions(-)
 create mode 100644 src/api/baseinfo/unit/unit.js
 create mode 100644 src/views/baseInfo/unit/index.vue
 create mode 100644 src/views/baseInfo/unit/unitAdd.vue

diff --git a/src/api/baseinfo/brands/brand.js b/src/api/baseinfo/brands/brand.js
index 66e1ef0..b8d23d5 100644
--- a/src/api/baseinfo/brands/brand.js
+++ b/src/api/baseinfo/brands/brand.js
@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/base/basegoodsbrand/listPage',
+      url: '/wms/apiadmin/base/basegoodsbrand/listPage',
       method: 'post',
       data: params,
     })
@@ -14,7 +14,7 @@ export default {
   // 类别查询
   getAllBrand: function(params) {
     return request({
-      url: '/base/basegoodsbrand/getAllType',
+      url: '/wms/apiadmin/base/basegoodsbrand/listAll',
       method: 'get'
     })
   },
@@ -23,7 +23,7 @@ export default {
   // 修改是否可用状态
   updateIsEnable: function(sid,isEnable) {
   	return request({
-  		url: '/base/basegoodsbrand/updateIsEnable/'+sid+"/"+isEnable
+  		url: '/wms/apiadmin/base/basegoodsbrand/updateIsEnable/'+sid+"/"+isEnable
   	});
   },
 
@@ -31,7 +31,7 @@ export default {
   // 新增、保存
   saveBrands: function(data) {
     return request({
-      url: '/base/basegoodsbrand/saveOrUpdate',
+      url: '/wms/apiadmin/base/basegoodsbrand/saveOrUpdate',
       method: 'post',
       data: data
     });
@@ -40,7 +40,7 @@ export default {
   // 初始化
   initBrands: function(data) {
     return request({
-      url: '/base/basegoodsbrand/initialization/' + data,
+      url: '/wms/apiadmin/base/basegoodsbrand/initialization/' + data,
       method: 'get'
     });
   },
diff --git a/src/api/baseinfo/category/category.js b/src/api/baseinfo/category/category.js
index 9039b8b..4523584 100644
--- a/src/api/baseinfo/category/category.js
+++ b/src/api/baseinfo/category/category.js
@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/base/basegoodstype/listPage',
+      url: '/wms/apiadmin/base/basegoodstype/listPage',
       method: 'post',
       data: params,
     })
@@ -14,7 +14,7 @@ export default {
   // 类别查询
   getAllType: function(params) {
     return request({
-      url: '/base/basegoodstype/getAllType',
+      url: '/wms/apiadmin/base/basegoodstype/listAll',
       method: 'get'
     })
   },
@@ -23,21 +23,21 @@ export default {
   // 修改是否可用状态
   updateIsEnable: function(sid, isEnable) {
     return request({
-      url: '/base/basegoodstype/updateIsEnable/' + sid + "/" + isEnable
+      url: '/wms/apiadmin/base/basegoodstype/updateIsEnable/' + sid + "/" + isEnable
     });
   },
 
   // 修改是否一品一码
   updateIsGoodsID: function(sid, isGoodsID) {
     return request({
-      url: '/base/basegoodstype/updateIsGoodsID/' + sid + "/" + isGoodsID
+      url: '/wms/apiadmin/base/basegoodstype/updateIsGoodsID/' + sid + "/" + isGoodsID
     });
   },
 
   // 新增、保存
   saveTypes: function(data) {
     return request({
-      url: '/base/basegoodstype/saveOrUpdate',
+      url: '/wms/apiadmin/base/basegoodstype/saveOrUpdate',
       method: 'post',
       data: data
     });
@@ -46,7 +46,7 @@ export default {
   // 初始化
   initTypes: function(data) {
     return request({
-      url: '/base/basegoodstype/initialization/' + data,
+      url: '/wms/apiadmin/base/basegoodstype/initialization/' + data,
       method: 'get'
     });
   },
diff --git a/src/api/baseinfo/factory/factory.js b/src/api/baseinfo/factory/factory.js
index 710da4c..df6af06 100644
--- a/src/api/baseinfo/factory/factory.js
+++ b/src/api/baseinfo/factory/factory.js
@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/base/basemanufacturer/listPage',
+      url: '/wms/apiadmin/base/basemanufacturer/listPage',
       method: 'post',
       data: params,
     })
@@ -14,7 +14,7 @@ export default {
  // 厂家查询
   getAllFacturer: function(params) {
     return request({
-      url: '/base/basemanufacturer/getAllType',
+      url: '/wms/apiadmin/base/basemanufacturer/listAll',
       method: 'get'
     })
   },
@@ -22,7 +22,7 @@ export default {
   // 修改是否可用状态
   updateIsEnable: function(sid,isEnable) {
   	return request({
-  		url: '/base/basemanufacturer/updateIsEnable/'+sid+"/"+isEnable
+  		url: '/wms/apiadmin/base/basemanufacturer/updateIsEnable/'+sid+"/"+isEnable
   	});
   },
 
@@ -30,7 +30,7 @@ export default {
   // 新增、保存
   saveFacturer: function(data) {
     return request({
-      url: '/base/basemanufacturer/saveOrUpdate',
+      url: '/wms/apiadmin/base/basemanufacturer/saveOrUpdate',
       method: 'post',
       data: data
     });
@@ -39,7 +39,7 @@ export default {
   // 初始化
   initFacturer: function(data) {
     return request({
-      url: '/base/basemanufacturer/initialization/' + data,
+      url: '/wms/apiadmin/base/basemanufacturer/initialization/' + data,
       method: 'get'
     });
   },
diff --git a/src/api/baseinfo/goods/goods.js b/src/api/baseinfo/goods/goods.js
index e3d72f0..0fd74e5 100644
--- a/src/api/baseinfo/goods/goods.js
+++ b/src/api/baseinfo/goods/goods.js
@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/base/basegoodsspu/listPage',
+      url: '/wms/apiadmin/base/basegoodsspu/listPage',
       method: 'post',
       data: params,
     })
@@ -14,14 +14,14 @@ export default {
   // 修改是否可用状态
   updateIsEnable: function(sid, isEnable) {
     return request({
-      url: '/base/basegoodsspu/updateIsEnable/' + sid + "/" + isEnable
+      url: '/wms/apiadmin/base/basegoodsspu/updateIsEnable/' + sid + "/" + isEnable
     });
   },
 
   // 新增、保存
   saveGoods: function(data) {
     return request({
-      url: '/base/basegoodsspu/saveOrUpdate',
+      url: '/wms/apiadmin/base/basegoodsspu/saveOrUpdate',
       method: 'post',
       data: data
     });
@@ -30,7 +30,7 @@ export default {
   // 初始化
   initGoods: function(data) {
     return request({
-      url: '/base/basegoodsspu/initialization/' + data,
+      url: '/wms/apiadmin/base/basegoodsspu/initialization/' + data,
       method: 'get'
     });
   },
diff --git a/src/api/baseinfo/unit/unit.js b/src/api/baseinfo/unit/unit.js
new file mode 100644
index 0000000..eb42b6d
--- /dev/null
+++ b/src/api/baseinfo/unit/unit.js
@@ -0,0 +1,49 @@
+import request from '@/utils/request'
+
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodsunit/listPage',
+      method: 'post',
+      data: params,
+    })
+  },
+
+  // 单位查询
+  getAllUnit: function(params) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodsunit/listAll',
+      method: 'get'
+    })
+  },
+
+
+  // 修改是否可用状态
+  updateIsEnable: function(sid,isEnable) {
+  	return request({
+  		url: '/wms/apiadmin/base/basegoodsunit/updateIsEnable/'+sid+"/"+isEnable
+  	});
+  },
+
+
+  // 新增、保存
+  saveUnits: function(data) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodsunit/saveOrUpdate',
+      method: 'post',
+      data: data
+    });
+  },
+
+  // 初始化
+  initUnits: function(data) {
+    return request({
+      url: '/base/basegoodsunit/initialization/' + data,
+      method: 'get'
+    });
+  },
+
+
+}
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index f364933..ae7d453 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,452 +1,471 @@
 <template>
   <div :class="{ 'has-logo': showLogo }">
-    <logo v-if="showLogo" :collapse="isCollapse"/>
+    <logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar wrap-class="scrollbar-wrapper">
-      <el-menu :default-active="$route.path" :background-color="variables.menuBg" :text-color="variables.menuText" :unique-opened="false" :active-text-color="variables.menuActiveText" :collapse-transition="false" mode="vertical">
-        <sidebar-item v-for="route in routes" :key="route.path" :item="route" :base-path="route.path"/>
+      <el-menu :default-active="$route.path" :background-color="variables.menuBg" :text-color="variables.menuText"
+        :unique-opened="false" :active-text-color="variables.menuActiveText" :collapse-transition="false"
+        mode="vertical">
+        <sidebar-item v-for="route in routes" :key="route.path" :item="route" :base-path="route.path" />
       </el-menu>
     </el-scrollbar>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import Logo from './Logo'
-import SidebarItem from './SidebarItem'
-import variables from '@/styles/variables.scss'
-import {
-  getrolemenus,
-  loginDetails
-} from '@/api/system/Role/role.js'
-import {
-  getStorage
-} from '@/utils/auth'
-import Layout from '@/layout'
+  import {
+    mapGetters
+  } from 'vuex'
+  import Logo from './Logo'
+  import SidebarItem from './SidebarItem'
+  import variables from '@/styles/variables.scss'
+  import {
+    getrolemenus,
+    loginDetails
+  } from '@/api/system/Role/role.js'
+  import {
+    getStorage
+  } from '@/utils/auth'
+  import Layout from '@/layout'
 
-export default {
-  components: {
-    SidebarItem,
-    Logo
-  },
-  data() {
-    return {
-      YongHuid: [],
-      // routes: [],
-      params: {
-        sourceSid: '',
-        userSid: ''
-      },
-      routes: [
-        {
-          alwaysShow: true,
-          component: 'baseInfo',
-          meta: {
-            icon: 'el-icon-menu',
-            title: '基础信息'
-          },
-          name: '/baseInfo',
-          path: '/baseInfo',
-          children: [
-            // {
-            //   alwaysShow: true,
-            //   component: 'brands',
-            //   meta: {
-            //     icon: 'el-icon-help',
-            //     title: '品牌管理'
-            //   },
-            //   name: '/baseInfo/brands',
-            //   path: '/baseInfo/brands'
-            // }, {
-            //   alwaysShow: true,
-            //   component: 'category',
-            //   meta: {
-            //     icon: 'el-icon-help',
-            //     title: '类别管理'
-            //   },
-            //   name: '/baseInfo/category',
-            //   path: '/baseInfo/category'
-            // },
-            // {
-            //   alwaysShow: true,
-            //   component: 'goods',
-            //   meta: {
-            //     icon: 'el-icon-help',
-            //     title: '商品管理'
-            //   },
-            //   name: '/baseInfo/goods',
-            //   path: '/baseInfo/goods'
-            // },
-            // {
-            //   alwaysShow: true,
-            //   component: 'factory',
-            //   meta: {
-            //     icon: 'el-icon-help',
-            //     title: '厂家管理'
-            //   },
-            //   name: '/baseInfo/factory',
-            //   path: '/baseInfo/factory'
-            // },
-            {
-              alwaysShow: true,
-              component: 'warehouse',
-              meta: {
-                icon: 'el-icon-help',
-                title: '仓库管理'
-              },
-              name: '/baseInfo/warehouse',
-              path: '/baseInfo/warehouse'
+  export default {
+    components: {
+      SidebarItem,
+      Logo
+    },
+    data() {
+      return {
+        YongHuid: [],
+        // routes: [],
+        params: {
+          sourceSid: '',
+          userSid: ''
+        },
+        routes: [{
+            alwaysShow: true,
+            component: 'baseInfo',
+            meta: {
+              icon: 'el-icon-menu',
+              title: '基础信息'
             },
-            {
-              alwaysShow: true,
-              component: 'warehouseArea',
-              meta: {
-                icon: 'el-icon-help',
-                title: '库区管理'
+            name: '/baseInfo',
+            path: '/baseInfo',
+            children: [{
+                alwaysShow: true,
+                component: 'brands',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '品牌管理'
+                },
+                name: '/baseInfo/brands',
+                path: '/baseInfo/brands'
+              }, {
+                alwaysShow: true,
+                component: 'category',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '类别管理'
+                },
+                name: '/baseInfo/category',
+                path: '/baseInfo/category'
               },
-              name: '/baseInfo/warehouseArea',
-              path: '/baseInfo/warehouseArea'
-            },
-            {
-              alwaysShow: true,
-              component: 'warehouseAreaType',
-              meta: {
-                icon: 'el-icon-help',
-                title: '库区类型管理'
+              {
+                alwaysShow: true,
+                component: 'unit',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '单位管理'
+                },
+                name: '/baseInfo/unit',
+                path: '/baseInfo/unit'
               },
-              name: '/baseInfo/warehouseAreaType',
-              path: '/baseInfo/warehouseAreaType'
-            },
-            {
-              alwaysShow: true,
-              component: 'goodsShelves',
-              meta: {
-                icon: 'el-icon-help',
-                title: '库位管理'
+              {
+                alwaysShow: true,
+                component: 'factory',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '厂家管理'
+                },
+                name: '/baseInfo/factory',
+                path: '/baseInfo/factory'
               },
-              name: '/baseInfo/goodsShelves',
-              path: '/baseInfo/goodsShelves'
-            }
-          ]
-        },
-        {
-          alwaysShow: true,
-          component: 'warehouse',
-          meta: {
-            icon: 'el-icon-menu',
-            title: '仓库信息'
-          },
-          name: '/warehouse',
-          path: '/warehouse',
-          children: [
-
-            {
-              alwaysShow: true,
-              component: 'inStorage',
-              meta: {
-                icon: 'el-icon-help',
-                title: '入库管理'
+              {
+                alwaysShow: true,
+                component: 'goods',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '商品管理'
+                },
+                name: '/baseInfo/goods',
+                path: '/baseInfo/goods'
               },
-              name: '/warehouse/inStorage',
-              path: '/warehouse/inStorage'
-            },
-
-            {
-              alwaysShow: true,
-              component: 'reservationInStorage',
-              meta: {
-                icon: 'el-icon-help',
-                title: '预约入库'
+              {
+                alwaysShow: true,
+                component: 'warehouse',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '仓库管理'
+                },
+                name: '/baseInfo/warehouse',
+                path: '/baseInfo/warehouse'
               },
-              name: '/warehouse/reservationInStorage',
-              path: '/warehouse/reservationInStorage'
-            },
-            {
-              alwaysShow: true,
-              component: 'outStorage',
-              meta: {
-                icon: 'el-icon-help',
-                title: '出库管理'
+              {
+                alwaysShow: true,
+                component: 'warehouseArea',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '库区管理'
+                },
+                name: '/baseInfo/warehouseArea',
+                path: '/baseInfo/warehouseArea'
+              },
+              {
+                alwaysShow: true,
+                component: 'warehouseAreaType',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '库区类型管理'
+                },
+                name: '/baseInfo/warehouseAreaType',
+                path: '/baseInfo/warehouseAreaType'
               },
-              name: '/warehouse/outStorage',
-              path: '/warehouse/outStorage'
+              {
+                alwaysShow: true,
+                component: 'goodsShelves',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '库位管理'
+                },
+                name: '/baseInfo/goodsShelves',
+                path: '/baseInfo/goodsShelves'
+              }
+            ]
+          },
+          {
+            alwaysShow: true,
+            component: 'warehouse',
+            meta: {
+              icon: 'el-icon-menu',
+              title: '仓库信息'
             },
-            // {
-            //   alwaysShow: true,
-            //   component: 'distribution',
-            //   meta: {
-            //     icon: 'el-icon-help',
-            //     title: '配货管理'
-            //   },
-            //   name: '/warehouse/distribution',
-            //   path: '/warehouse/distribution'
-            // },
-            {
-              alwaysShow: true,
-              component: 'inventory',
-              meta: {
-                icon: 'el-icon-help',
-                title: '库存查询'
+            name: '/warehouse',
+            path: '/warehouse',
+            children: [
+
+              {
+                alwaysShow: true,
+                component: 'inStorage',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '入库管理'
+                },
+                name: '/warehouse/inStorage',
+                path: '/warehouse/inStorage'
               },
-              name: '/warehouse/inventory',
-              path: '/warehouse/inventory'
-            }, {
-              alwaysShow: true,
-              component: 'inOutStorage',
-              meta: {
-                icon: 'el-icon-help',
-                title: '出入库查询'
+
+              {
+                alwaysShow: true,
+                component: 'reservationInStorage',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '预约入库'
+                },
+                name: '/warehouse/reservationInStorage',
+                path: '/warehouse/reservationInStorage'
               },
-              name: '/warehouse/inOutStorage',
-              path: '/warehouse/inOutStorage'
-            },
-            {
-              alwaysShow: true,
-              component: 'stocktaking',
-              meta: {
-                icon: 'el-icon-help',
-                title: '盘点管理'
+              {
+                alwaysShow: true,
+                component: 'outStorage',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '出库管理'
+                },
+                name: '/warehouse/outStorage',
+                path: '/warehouse/outStorage'
               },
-              name: '/warehouse/stocktaking',
-              path: '/warehouse/stocktaking'
-            },
-            {
-              alwaysShow: true,
-              component: 'allocation',
-              meta: {
-                icon: 'el-icon-help',
-                title: '调拨管理'
+              // {
+              //   alwaysShow: true,
+              //   component: 'distribution',
+              //   meta: {
+              //     icon: 'el-icon-help',
+              //     title: '配货管理'
+              //   },
+              //   name: '/warehouse/distribution',
+              //   path: '/warehouse/distribution'
+              // },
+              {
+                alwaysShow: true,
+                component: 'inventory',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '库存查询'
+                },
+                name: '/warehouse/inventory',
+                path: '/warehouse/inventory'
+              }, {
+                alwaysShow: true,
+                component: 'inOutStorage',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '出入库查询'
+                },
+                name: '/warehouse/inOutStorage',
+                path: '/warehouse/inOutStorage'
               },
-              name: '/warehouse/allocation',
-              path: '/warehouse/allocation'
-            },
-            {
-              alwaysShow: true,
-              component: 'deliveryNotice',
-              meta: {
-                icon: 'el-icon-help',
-                title: '到货单管理'
+              {
+                alwaysShow: true,
+                component: 'stocktaking',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '盘点管理'
+                },
+                name: '/warehouse/stocktaking',
+                path: '/warehouse/stocktaking'
               },
-              name: '/warehouse/deliveryNotice',
-              path: '/warehouse/deliveryNotice'
-            },
-            {
-              alwaysShow: true,
-              component: 'receivingGoods',
-              meta: {
-                icon: 'el-icon-help',
-                title: '收货单管理'
+              {
+                alwaysShow: true,
+                component: 'allocation',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '调拨管理'
+                },
+                name: '/warehouse/allocation',
+                path: '/warehouse/allocation'
               },
-              name: '/warehouse/receivingGoods',
-              path: '/warehouse/receivingGoods'
-            },
-            {
-              alwaysShow: true,
-              component: 'upShelf',
-              meta: {
-                icon: 'el-icon-help',
-                title: '上架单管理'
+              {
+                alwaysShow: true,
+                component: 'deliveryNotice',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '到货单管理'
+                },
+                name: '/warehouse/deliveryNotice',
+                path: '/warehouse/deliveryNotice'
               },
-              name: '/warehouse/upShelf',
-              path: '/warehouse/upShelf'
-            },
-            {
-              alwaysShow: true,
-              component: 'oldPartsFactory',
-              meta: {
-                icon: 'el-icon-help',
-                title: '旧件返厂'
+              {
+                alwaysShow: true,
+                component: 'receivingGoods',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '收货单管理'
+                },
+                name: '/warehouse/receivingGoods',
+                path: '/warehouse/receivingGoods'
               },
-              name: '/warehouse/oldPartsFactory',
-              path: '/warehouse/oldPartsFactory'
-            },
-            {
-              alwaysShow: true,
-              component: 'oldPartsCope',
-              meta: {
-                icon: 'el-icon-help',
-                title: '旧件处理'
+              {
+                alwaysShow: true,
+                component: 'upShelf',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '上架单管理'
+                },
+                name: '/warehouse/upShelf',
+                path: '/warehouse/upShelf'
               },
-              name: '/warehouse/oldPartsCope',
-              path: '/warehouse/oldPartsCope'
-            },
-            {
-              alwaysShow: true,
-              component: 'oldPartsRecovery',
-              meta: {
-                icon: 'el-icon-help',
-                title: '旧件回收'
+              {
+                alwaysShow: true,
+                component: 'oldPartsFactory',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '旧件返厂'
+                },
+                name: '/warehouse/oldPartsFactory',
+                path: '/warehouse/oldPartsFactory'
               },
-              name: '/warehouse/oldPartsRecovery',
-              path: '/warehouse/oldPartsRecovery'
-            },
-            {
-              alwaysShow: true,
-              component: 'oldPartsInStorage',
-              meta: {
-                icon: 'el-icon-help',
-                title: '旧件入库'
+              {
+                alwaysShow: true,
+                component: 'oldPartsCope',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '旧件处理'
+                },
+                name: '/warehouse/oldPartsCope',
+                path: '/warehouse/oldPartsCope'
               },
-              name: '/warehouse/oldPartsInStorage',
-              path: '/warehouse/oldPartsInStorage'
-            },
-            {
-              alwaysShow: true,
-              component: 'oldPartsInvertory',
-              meta: {
-                icon: 'el-icon-help',
-                title: '旧件库存'
+              {
+                alwaysShow: true,
+                component: 'oldPartsRecovery',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '旧件回收'
+                },
+                name: '/warehouse/oldPartsRecovery',
+                path: '/warehouse/oldPartsRecovery'
               },
-              name: '/warehouse/oldPartsInvertory',
-              path: '/warehouse/oldPartsInvertory'
-            },
-            {
-              alwaysShow: true,
-              component: 'oldPartsInAndOutStorage',
-              meta: {
-                icon: 'el-icon-help',
-                title: '旧件出入库查询'
+              {
+                alwaysShow: true,
+                component: 'oldPartsInStorage',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '旧件入库'
+                },
+                name: '/warehouse/oldPartsInStorage',
+                path: '/warehouse/oldPartsInStorage'
               },
-              name: '/warehouse/oldPartsInAndOutStorage',
-              path: '/warehouse/oldPartsInAndOutStorage'
-            }
-          ]
-        },
-        {
-          path: '/inventory',
-          component: Layout,
-          redirect: '/inventory',
-          meta: {
-            title: '库存查询'
+              {
+                alwaysShow: true,
+                component: 'oldPartsInvertory',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '旧件库存'
+                },
+                name: '/warehouse/oldPartsInvertory',
+                path: '/warehouse/oldPartsInvertory'
+              },
+              {
+                alwaysShow: true,
+                component: 'oldPartsInAndOutStorage',
+                meta: {
+                  icon: 'el-icon-help',
+                  title: '旧件出入库查询'
+                },
+                name: '/warehouse/oldPartsInAndOutStorage',
+                path: '/warehouse/oldPartsInAndOutStorage'
+              }
+            ]
           },
-          children: [
-            {
+          {
+            path: '/inventory',
+            component: Layout,
+            redirect: '/inventory',
+            meta: {
+              title: '库存查询'
+            },
+            children: [{
               path: '/inventory/inventory',
               component: () => import('@/views/inventory/inventory.vue'),
               name: 'Inventory',
-              meta: { title: '库存查询', noCache: true }
-            }
-          ]
-        },
-        {
-          path: '/storageage',
-          component: Layout,
-          redirect: '/storageage',
-          meta: {
-            title: '库龄查询'
+              meta: {
+                title: '库存查询',
+                noCache: true
+              }
+            }]
           },
-          children: [
-            {
+          {
+            path: '/storageage',
+            component: Layout,
+            redirect: '/storageage',
+            meta: {
+              title: '库龄查询'
+            },
+            children: [{
               path: '/storageage/storageage',
               component: () => import('@/views/storageage/storageage.vue'),
               name: 'StorageAge',
-              meta: { title: '库龄查询', noCache: true }
-            }
-          ]
-        },
-        {
-          path: '/carryover',
-          component: Layout,
-          redirect: '/carryover',
-          meta: {
-            title: '结转查询'
+              meta: {
+                title: '库龄查询',
+                noCache: true
+              }
+            }]
           },
-          children: [
-            {
-              path: '/carryover/carryforwardrecord',
-              component: () => import('@/views/carryover/carryforwardrecord.vue'),
-              name: 'CarryForwardRecord',
-              meta: { title: '结转记录查询', noCache: true }
+          {
+            path: '/carryover',
+            component: Layout,
+            redirect: '/carryover',
+            meta: {
+              title: '结转查询'
             },
-            {
-              path: '/carryover/carryoverstock',
-              component: () => import('@/views/carryover/carryoverstock.vue'),
-              name: 'CarryoverStock',
-              meta: { title: '结转库存查询', noCache: true }
-            }
-          ]
-        }
-      ]
-    }
-  },
-  computed: {
-    ...mapGetters(['sidebar']),
-    // routes() {
-    // f4d2e507-c4ed-451c-b364-04c08f962045
-    //   console.log('78979789', this.$router.options.routes)
-    //   return this.$router.options.routes
-    // },
-    activeMenu() {
-      // const route = this.$route
-      // const {
-      //   meta,
-      //   path
-      // } = route
-      // // if set path, the sidebar will highlight the path you set
-      // if (meta.activeMenu) {
-      //   return meta.activeMenu
-      // }
-      return '/index'
+            children: [{
+                path: '/carryover/carryforwardrecord',
+                component: () => import('@/views/carryover/carryforwardrecord.vue'),
+                name: 'CarryForwardRecord',
+                meta: {
+                  title: '结转记录查询',
+                  noCache: true
+                }
+              },
+              {
+                path: '/carryover/carryoverstock',
+                component: () => import('@/views/carryover/carryoverstock.vue'),
+                name: 'CarryoverStock',
+                meta: {
+                  title: '结转库存查询',
+                  noCache: true
+                }
+              }
+            ]
+          }
+        ]
+      }
     },
-    showLogo() {
-      return this.$store.state.settings.sidebarLogo
+    computed: {
+      ...mapGetters(['sidebar']),
+      // routes() {
+      // f4d2e507-c4ed-451c-b364-04c08f962045
+      //   console.log('78979789', this.$router.options.routes)
+      //   return this.$router.options.routes
+      // },
+      activeMenu() {
+        // const route = this.$route
+        // const {
+        //   meta,
+        //   path
+        // } = route
+        // // if set path, the sidebar will highlight the path you set
+        // if (meta.activeMenu) {
+        //   return meta.activeMenu
+        // }
+        return '/index'
+      },
+      showLogo() {
+        return this.$store.state.settings.sidebarLogo
+      },
+      variables() {
+        return variables
+      },
+      isCollapse() {
+        return !this.sidebar.opened
+      }
     },
-    variables() {
-      return variables
+    created() {
+      this.postHuoquyonghu()
     },
-    isCollapse() {
-      return !this.sidebar.opened
-    }
-  },
-  created() {
-    this.postHuoquyonghu()
-  },
-  methods: {
-    // 获取用户信息
-    postHuoquyonghu() {
-      // var token = getStorage()
-      // loginDetails(token).then((response) => {
-      //   console.log('resss', response)
-      //   if (response.code === '200') {
-      //     this.YongHuid = response.data
-      //     this.params.userSid = this.YongHuid.sid
-      //     getrolemenus(this.params).then((res) => {
-      //       const userRoles = this.resRouter(res.data)
-      this.routes.push({
-        path: '*',
-        redirect: '/404',
-        hidden: true
-      })
-      console.log('左侧菜单', this.routes)
-      return this.routes
-      //     })
-      //   }
-      // })
+    methods: {
+      // 获取用户信息
+      postHuoquyonghu() {
+        // var token = getStorage()
+        // loginDetails(token).then((response) => {
+        //   console.log('resss', response)
+        //   if (response.code === '200') {
+        //     this.YongHuid = response.data
+        //     this.params.userSid = this.YongHuid.sid
+        //     getrolemenus(this.params).then((res) => {
+        //       const userRoles = this.resRouter(res.data)
+        this.routes.push({
+          path: '*',
+          redirect: '/404',
+          hidden: true
+        })
+        console.log('左侧菜单', this.routes)
+        return this.routes
+        //     })
+        //   }
+        // })
 
-    },
-    resRouter(menus) {
-      // 递归，将后台传来数组
-      for (var i = 0; i < menus.length; i++) {
-        if (menus[i].children && menus[i].children.length != 0) {
-          this.resRouter(menus[i].children)
-        }
-        if (menus[i].children.length == 0) {
-          delete menus[i].children
-          delete menus[i].redirect
-        }
-        if (menus[i].component == '') {
-          console.log('55555', menus[i])
-          menus[i] = {
-            path: menus[i].path,
-            component: '',
-            redirect: menus[i].path,
-            children: [menus[i]]
+      },
+      resRouter(menus) {
+        // 递归，将后台传来数组
+        for (var i = 0; i < menus.length; i++) {
+          if (menus[i].children && menus[i].children.length != 0) {
+            this.resRouter(menus[i].children)
+          }
+          if (menus[i].children.length == 0) {
+            delete menus[i].children
+            delete menus[i].redirect
+          }
+          if (menus[i].component == '') {
+            console.log('55555', menus[i])
+            menus[i] = {
+              path: menus[i].path,
+              component: '',
+              redirect: menus[i].path,
+              children: [menus[i]]
+            }
           }
         }
+        this.routes = menus
+        console.log('左侧菜单', this.routes)
+        return menus
       }
-      this.routes = menus
-      console.log('左侧菜单', this.routes)
-      return menus
     }
   }
-}
 </script>
diff --git a/src/router/index.js b/src/router/index.js
index 3f3050f..64de3e5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,14 +11,14 @@ import codemenu from './modules/codemenu'
 
 export const constantRoutes = [
 
- {
-   path: '/',
-   redirect: 'login'
- },
- {
-   path: '/login',
-   component: () => import('@/views/login/login.vue')
- },
+  {
+    path: '/',
+    redirect: 'login'
+  },
+  {
+    path: '/login',
+    component: () => import('@/views/login/login.vue')
+  },
 
 
   // {
@@ -55,14 +55,15 @@ export const constantRoutes = [
     meta: {
       title: '库存查询'
     },
-    children: [
-      {
-        path: '/inventory/inventory',
-        component: () => import('@/views/inventory/inventory.vue'),
-        name: 'Inventory',
-        meta: { title: '库存查询', noCache: true }
+    children: [{
+      path: '/inventory/inventory',
+      component: () => import('@/views/inventory/inventory.vue'),
+      name: 'Inventory',
+      meta: {
+        title: '库存查询',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/storageage',
@@ -71,14 +72,15 @@ export const constantRoutes = [
     meta: {
       title: '库龄查询'
     },
-    children: [
-      {
-        path: '/storageage/storageage',
-        component: () => import('@/views/storageage/storageage.vue'),
-        name: 'StorageAge',
-        meta: { title: '库龄查询', noCache: true }
+    children: [{
+      path: '/storageage/storageage',
+      component: () => import('@/views/storageage/storageage.vue'),
+      name: 'StorageAge',
+      meta: {
+        title: '库龄查询',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/carryover',
@@ -87,18 +89,23 @@ export const constantRoutes = [
     meta: {
       title: '结转查询'
     },
-    children: [
-      {
+    children: [{
         path: '/carryover/carryforwardrecord',
         component: () => import('@/views/carryover/carryforwardrecord.vue'),
         name: 'CarryForwardRecord',
-        meta: { title: '结转记录查询', noCache: true }
+        meta: {
+          title: '结转记录查询',
+          noCache: true
+        }
       },
       {
         path: '/carryover/carryoverstock',
         component: () => import('@/views/carryover/carryoverstock.vue'),
         name: 'CarryoverStock',
-        meta: { title: '结转库存查询', noCache: true }
+        meta: {
+          title: '结转库存查询',
+          noCache: true
+        }
       }
     ]
   },
@@ -109,7 +116,53 @@ export const constantRoutes = [
     meta: {
       title: '基础信息'
     },
-    children: [
+    children: [{
+        path: 'brands',
+        name: 'brands',
+        component: () => import('@/views/baseInfo/brands/index'),
+        meta: {
+          title: '品牌管理',
+          icon: 'product-list'
+        }
+      },
+      {
+        path: 'category',
+        name: 'category',
+        component: () => import('@/views/baseInfo/category/index'),
+        meta: {
+          title: '类别管理',
+          icon: 'product-add'
+        }
+      }, {
+        path: 'unit',
+        name: 'unit',
+        component: () => import('@/views/baseInfo/unit/index'),
+        meta: {
+          title: '单位管理',
+          icon: 'product-add'
+        },
+        hidden: true
+      },
+      {
+        path: 'factory',
+        name: 'factory',
+        component: () => import('@/views/baseInfo/factory/index'),
+        meta: {
+          title: '厂家管理',
+          icon: 'product-add'
+        },
+        hidden: true
+      },
+      {
+        path: 'goods',
+        name: 'goods',
+        component: () => import('@/views/baseInfo/goods/index'),
+        meta: {
+          title: '商品管理',
+          icon: 'product-add'
+        },
+        hidden: true
+      },
       {
         path: 'warehouse',
         name: 'warehouse',
@@ -153,15 +206,14 @@ export const constantRoutes = [
 
     ]
   },
- {
+  {
     path: '/warehouse',
     component: Layout,
     redirect: null,
     meta: {
       title: '库存信息'
     },
-    children: [
-      {
+    children: [{
         path: 'inOutStorage',
         name: 'inOutStorage',
         component: () => import('@/views/warehouse/inOutStorage/index'),
diff --git a/src/views/baseInfo/unit/index.vue b/src/views/baseInfo/unit/index.vue
new file mode 100644
index 0000000..c247313
--- /dev/null
+++ b/src/views/baseInfo/unit/index.vue
@@ -0,0 +1,245 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar ref="btnbar" view-title="单位列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">
+            {{ searchxianshitit }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header">
+              <el-form-item label="单位名称">
+                <el-input v-model="queryParams.params.name" placeholder="" clearable />
+              </el-form-item>
+
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">单位列表</div>
+        </div>
+        <!-- End 项目列表头部 -->
+        <!-- Start 项目列表 -->
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
+            <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column label="操作" align="center" width="180">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
+                <!-- <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> -->
+              </template>
+            </el-table-column>
+            <el-table-column label="是否可用" align="center" width="140">
+              <template slot-scope="scope">
+                <el-switch v-model="scope.row.isEnable" active-text="是" inactive-text="否" active-value="1"
+                  inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="unitName" label="单位名称" align="center" />
+            <el-table-column prop="remarks" label="单位备注" align="center" />
+
+          </el-table>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+        </div>
+      </div>
+    </div>
+    <!-- End 查询和其列表部分 -->
+    <!-- 新增修改部分组件 -->
+    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+  </div>
+</template>
+
+<script>
+  import req from '@/api/baseinfo/unit/unit.js'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import divAdd from './unitAdd.vue'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye,
+      divAdd
+    },
+    data() {
+      return {
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        dataList: [],
+        btnList: [{
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toAdd',
+            btnLabel: '新增'
+          },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            name: ''
+          }
+        },
+        sids: []
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      this.loadList()
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      loadList() {
+        this.tableLoading = true
+        req.listPage(this.queryParams).then((resp) => {
+          this.tableLoading = false
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            name: ''
+          }
+        }
+        this.loadList()
+      },
+      toAdd() {
+        this.viewState = 2
+        this.$refs['divadd'].showAdd()
+      },
+
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      },
+      toRelevancy(row) {
+        this.viewState = 3
+        this.$refs['divadd'].showEdit(row)
+      },
+      toRelevancyInfo(row) {
+        const tip = '请确认是否删除所选品牌?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          req.deleteGoods(row.sid).then((resp) => {
+            loading.close()
+            if (resp.success) {
+              this.$message({
+                type: 'success',
+                message: resp.msg,
+                showClose: true
+              })
+              this.loadList()
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          }).catch(e => {
+            loading.close()
+          })
+        }).catch(() => {})
+      },
+      resetState() {
+        this.viewState = 1
+      },
+      enableChange(sid, state) {
+        console.log('sid', sid)
+        console.log('state', state)
+        req.updateIsEnable(sid, state).then((resp) => {
+          if (resp.success) {
+            this.$message({
+              type: 'success',
+              message: '状态已更新',
+              showClose: true
+            })
+          } else { // 根据resp.code进行异常情况处理
+          }
+        }).catch(e => {
+          console.log(e)
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>
diff --git a/src/views/baseInfo/unit/unitAdd.vue b/src/views/baseInfo/unit/unitAdd.vue
new file mode 100644
index 0000000..f1c26b8
--- /dev/null
+++ b/src/views/baseInfo/unit/unitAdd.vue
@@ -0,0 +1,210 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>单位信息</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+      <el-card class="box-card">
+        <div class="item">
+          <span class="item_text">单位名称：</span>
+          <el-input v-model="formobj.unitName" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text">单位备注：</span>
+          <el-input v-model="formobj.remarks" placeholder="" class="item_input" clearable />
+        </div>
+        <!--  <div class="item">
+          <span class="item_text">品牌故事：</span>
+          <el-input v-model="formobj.brandStory" placeholder="" class="item_input" clearable />
+        </div> -->
+
+        <!--  <div class="item" style="margin-bottom: 100px;margin-top: 100px;">
+
+          <div style="flex: 1;display: flex;flex-direction: row;align-items: center;">
+            <span class="item_text2" >品牌Logo：</span>
+            <upload ref="uploadImg2" v-model="imgList" style="margin-top: 20px;" class="item_input2"  :limit="1"
+              bucket="map" :class="{ hide: hideUploadBtn }" :upload-data="{ type: '0001' }" @change="backData" />
+          </div>
+          <div style="flex: 1;display: flex;flex-direction: row;align-items: center;">
+          <span class="item_text2">专区大图：</span>
+          <upload ref="uploadImg2" v-model="imgList2" style="margin-top: 20px;" class="item_input2" :limit="1"
+            bucket="map" :class="{ hide: hideUploadBtn2 }" :upload-data="{ type: '0001' }" @change="backData2" />
+          </div>
+
+
+        </div> -->
+       <!-- <div class="item" style="margin-bottom: 100px;margin-top: 100px;">
+          <span class="item_text">品牌Logo：</span>
+          <upload ref="uploadImg" v-model="imgList" style="" class="item_input" :limit="1"
+            bucket="map" :class="{ hide: hideUploadBtn }" :upload-data="{ type: '0001' }" @change="backData" />
+        </div> -->
+
+      </el-card>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/baseinfo/unit/unit.js'
+  import upload from '@/components/uploadFile/upload_yanchejianchaTuBiao.vue'
+  export default {
+    components: {
+      upload,
+    },
+    data() {
+      return {
+        submitdisabled: false,
+        formobj: {
+          sid: '',
+          unitName: '',
+          remarks: '',
+
+        },
+      }
+    },
+    created() {
+      // this.initData()
+    },
+    methods: {
+
+      saveOrUpdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+        req.saveUnits(this.formobj)
+          .then(resp => {
+            if (resp.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+              this.handleReturn('true')
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          })
+          .catch(() => {})
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+          sid: '',
+          unitName: '',
+          remarks: '',
+        }
+        this.$emit('doback')
+      },
+      showAdd() {
+      },
+      showEdit(row) {
+        req.initUnits(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+          })
+          .catch(e => {
+            this.formobj = row
+          })
+      },
+
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  // 隐藏上传组件
+
+  ::v-deep .hide {
+    .el-upload--picture-card {
+      display: none !important;
+    }
+  }
+
+  .box-card {
+    margin-left: 60px;
+    margin-right: 60px;
+    min-width: 70%;
+    margin-top: 20px;
+
+    .item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      margin-top: 15px;
+      height: 40px;
+      line-height: 40px;
+
+      .item_text {
+        flex: 0.8;
+        font-size: 18px;
+        text-align: right;
+      }
+
+      .item_input {
+        flex: 4;
+        font-size: 16px;
+        margin-left: 10px;
+        margin-right: 80px;
+      }
+
+      .item_text2 {
+        flex: 1;
+        font-size: 18px;
+        text-align: right;
+      }
+
+
+      .item_input2 {
+        flex: 1;
+        font-size: 16px;
+        margin-left: 10px;
+        margin-right: 80px;
+      }
+
+      .item_left_input {
+        width: 20%;
+      }
+
+      .item_left_text {
+        height: 30px;
+        margin-left: 20px;
+        line-height: 30px;
+        color: #018AD2;
+        padding: 0px 15px;
+        border: 1.5px solid #018AD2;
+        border-radius: 5px;
+
+      }
+
+      .item_right {
+        flex: 1;
+        justify-items: center;
+
+        .item_right_list_text {
+          font-size: 16px;
+        }
+
+        .item_right_list_delect {
+          color: #5E94FF;
+          margin-left: 20px;
+          font-size: 16px;
+          text-decoration: underline;
+        }
+      }
+
+    }
+
+  }
+</style>
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index 60ea83a..d1adb06 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -134,12 +134,12 @@
       },
 
       login() {
-       const loading = this.$loading({
-         lock: true,
-         text: 'Loading',
-         spinner: 'el-icon-loading',
-         background: 'rgba(0, 0, 0, 0.7)'
-       })
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
         doLogin(this.loginForm).then((response) => {
           if (response.code == 200) {
             this.$router.push({
@@ -152,9 +152,9 @@
             window.sessionStorage.setItem('staffSid', response.data.staffSid)
             window.sessionStorage.setItem('userName', response.data.userName)
 
-         console.log(" token",  sessionStorage.getItem('token'))
-          }else{
-             loading.close()
+            console.log(" token", sessionStorage.getItem('token'))
+          } else {
+            loading.close()
           }
 
         }).catch(() => {
@@ -192,12 +192,13 @@
 </script>
 
 
-<style lang="scss">
-  .el-input__inner {
-    border: none;
-    color: #000;
-    font-size: 16px;
-  }
+<style  lang="scss">
+
+  // .el-input__inner {
+  //   border: none;
+  //   color: #000;
+  //   font-size: 16px;
+  // }
 
   input:-webkit-autofill {
     -webkit-box-shadow: 0 0 0px 1000px white inset;
@@ -314,8 +315,7 @@
           .input {
             margin-top: 10px;
             width: 100%;
-            height: 45px;
-            border-bottom: 1px #ccc solid;
+            height: 50px;
           }
         }
 
@@ -330,8 +330,7 @@
           .input {
             margin-top: 10px;
             width: 100%;
-            height: 45px;
-            border-bottom: 1px #ccc solid;
+            height: 50px;
           }
 
           .sendCode1 {