Merge branch 'lyt' of https://git.lotus-wallet.com/Loki/yudao-ui-admin into zyh

src/assets/less/common.less

@@ -71,4 +71,507 @@
 /* 内嵌子表背景颜色 */
 .j-inner-table-wrapper /deep/ .ant-table-expanded-row .ant-table-wrapper .ant-table-tbody .ant-table-row {
   background-color: #FFFFFF;
-}
+}
+body {
+  /*打开滚动条固定显示*/
+  overflow-y: scroll;
+
+  &.colorWeak {
+    filter: invert(80%);
+  }
+}
+
+.layout {
+  min-height: 100vh !important;
+  overflow-x: hidden;
+
+  &.mobile {
+
+    .ant-layout-content {
+
+      .content {
+        margin: 24px 0 0;
+      }
+    }
+
+    /**
+     * ant-table-wrapper
+     * 覆盖的表格手机模式样式，如果想修改在手机上表格最低宽度，可以在这里改动
+     */
+    .ant-table-wrapper {
+      .ant-table-content {
+        overflow-y: auto;
+      }
+      .ant-table-body {
+        min-width: 800px;
+      }
+    }
+    .sidemenu {
+      .ant-header-fixedHeader {
+
+        &.ant-header-side-opened, &.ant-header-side-closed {
+          width: 100%
+        }
+      }
+    }
+
+    .topmenu {
+      /* 必须为 topmenu  才能启用流式布局 */
+      &.content-width-Fluid {
+        .header-index-wide {
+          margin-left: 0;
+        }
+      }
+    }
+    .header, .top-nav-header-index {
+      .user-wrapper .action {
+        padding: 0 12px;
+      }
+    }
+  }
+
+  &.ant-layout-has-sider {
+    flex-direction: row;
+  }
+
+  .trigger {
+    font-size: 22px;
+    line-height: 42px;
+    padding: 0 18px;
+    cursor: pointer;
+    transition: color 300ms, background 300ms;
+
+    &:hover {
+      background: rgba(255, 255, 255, 0.3);
+    }
+  }
+
+  .topmenu {
+    .ant-header-fixedHeader {
+      position: fixed;
+      top: 0;
+      right: 0;
+      z-index: 9;
+      width: 100%;
+      transition: width .2s;
+
+      &.ant-header-side-opened {
+        width: 100%;
+      }
+
+      &.ant-header-side-closed {
+        width: 100%;
+      }
+    }
+    /* 必须为 topmenu  才能启用流式布局 */
+    &.content-width-Fluid {
+      .header-index-wide {
+        max-width: unset;
+        margin-left: 24px;
+      }
+
+      .page-header-index-wide {
+        max-width: unset;
+      }
+    }
+
+  }
+
+  .sidemenu {
+    .ant-header-fixedHeader {
+      position: fixed;
+      top: 0;
+      right: 0;
+      z-index: 9;
+      width: 100%;
+      transition: width .2s;
+
+      &.ant-header-side-opened {
+        width: calc(100% - 200px)
+      }
+
+      &.ant-header-side-closed {
+        width: calc(100% - 80px)
+      }
+    }
+  }
+
+  .header {
+    height: 64px;
+    padding: 0 12px 0 0;
+    background: #fff;
+    box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
+    position: relative;
+  }
+
+  .header, .top-nav-header-index {
+
+    .user-wrapper {
+      float: right;
+      height: 100%;
+
+      .action {
+        cursor: pointer;
+        padding: 0 14px;
+        display: inline-block;
+        transition: all .3s;
+
+        height: 70%;
+        line-height: 46px;
+
+        &.action-full {
+          height: 100%;
+        }
+
+        &:hover {
+          background: rgba(255, 255, 255, 0.3);
+        }
+
+        .avatar {
+          margin: 20px 10px 20px 0;
+          color: #1890ff;
+          background: hsla(0, 0%, 100%, .85);
+          vertical-align: middle;
+        }
+
+        .icon {
+          font-size: 16px;
+          padding: 4px;
+        }
+
+        .anticon {
+          color: white;
+        }
+      }
+    }
+
+    &.dark {
+      .user-wrapper {
+
+        .action {
+          color: black;
+
+          &:hover {
+            background: rgba(0, 0, 0, 0.05);
+          }
+
+          .anticon {
+            color: black;
+          }
+        }
+      }
+    }
+  }
+
+  &.mobile {
+    .top-nav-header-index {
+
+      .header-index-wide {
+
+        .header-index-left {
+
+          .trigger {
+            color: rgba(255, 255, 255, 0.85);
+            padding: 0 12px;
+          }
+
+          .logo.top-nav-header {
+            text-align: center;
+            width: 56px;
+            line-height: 58px;
+          }
+        }
+      }
+
+      .user-wrapper .action .avatar {
+        margin: 20px 0;
+      }
+
+      &.light {
+
+        .header-index-wide {
+
+          .header-index-left {
+            .trigger {
+              color: rgba(0, 0, 0, 0.65);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  &.tablet {
+    /*overflow: hidden; text-overflow:ellipsis; white-space: nowrap;*/
+    .top-nav-header-index {
+
+      .header-index-wide {
+
+        .header-index-left {
+          .logo > a {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+        }
+      }
+    }
+
+  }
+
+  .top-nav-header-index {
+    box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
+    position: relative;
+    transition: background .3s, width .2s;
+
+    .header-index-wide {
+      width: 100%;
+      margin: auto;
+      padding: 0 20px 0 0;
+      display: flex;
+      height: 59px;
+
+      .ant-menu.ant-menu-horizontal {
+        border: none;
+        height: 64px;
+        line-height: 64px;
+      }
+
+      .header-index-left {
+        flex: 1 1;
+        display: flex;
+
+        .logo.top-nav-header {
+          width: 165px;
+          height: 64px;
+          position: relative;
+          line-height: 64px;
+          transition: all .3s;
+          overflow: hidden;
+
+          img {
+            display: inline-block;
+            vertical-align: middle;
+            height: 32px;
+          }
+
+          h1 {
+            color: #fff;
+            display: inline-block;
+            vertical-align: top;
+            font-size: 16px;
+            margin: 0 0 0 12px;
+            font-weight: 400;
+          }
+        }
+      }
+
+      .header-index-right {
+        float: right;
+        height: 59px;
+        overflow: hidden;
+        .action:hover {
+          background-color: rgba(0, 0, 0, 0.05);
+        }
+      }
+    }
+
+    &.light {
+      background-color: #fff;
+
+      .header-index-wide {
+        .header-index-left {
+          .logo {
+            h1 {
+              color: #002140;
+            }
+          }
+        }
+      }
+    }
+
+    &.dark {
+
+      .user-wrapper {
+
+        .action {
+          color: white;
+
+          &:hover {
+            background: rgba(255, 255, 255, 0.3);
+          }
+        }
+      }
+      .header-index-wide .header-index-left .trigger:hover {
+        background: rgba(255, 255, 255, 0.3);
+      }
+    }
+
+  }
+
+  /*内容区*/
+  .layout-content {
+    margin: 24px 24px 0px;
+    height: 64px;
+    padding: 0 12px 0 0;
+  }
+
+}
+
+.topmenu {
+  .page-header-index-wide {
+    margin: 0 auto;
+    width: 100%;
+  }
+}
+
+/* drawer-sider 自定义*/
+.ant-drawer.drawer-sider {
+  .sider {
+    box-shadow: none;
+  }
+
+  &.dark {
+    .ant-drawer-content {
+      background-color: rgb(0, 21, 41);
+    }
+  }
+  &.light {
+    box-shadow: none;
+    .ant-drawer-content {
+      background-color: #fff;
+    }
+  }
+
+  .ant-drawer-body {
+    padding: 0
+  }
+}
+
+/* 菜单样式*/
+.sider {
+  box-shadow: 2px 116px 6px 0 rgba(0, 21, 41, .35);
+  position: relative;
+  z-index: 10;
+
+  &.ant-fixed-sidemenu {
+    position: fixed;
+    height: 100%;
+  }
+
+  .logo {
+    height: 64px;
+    position: relative;
+    line-height: 64px;
+    padding-left: 10px;
+    -webkit-transition: all .3s;
+    transition: all .3s;
+    background: #ffffff;
+    overflow: hidden;
+
+    img, h1 {
+      display: inline-block;
+      vertical-align: middle;
+    }
+
+    img {
+      height: 32px;
+    }
+
+    h1 {
+      color: #fff;
+      font-size: 18px;
+      margin: 0 0 10px 8px;
+      font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+      font-weight: 600;
+    }
+  }
+
+  &.light {
+    background-color: #fff;
+    box-shadow: 2px 116px 8px 0 rgba(29, 35, 41, 0.05);
+
+    .logo {
+      background: #fff;
+      box-shadow: 1px 1px 0 0 #e8e8e8;
+
+      h1 {
+        color: unset;
+      }
+    }
+
+    .ant-menu-light {
+      border-right-color: transparent;
+    }
+  }
+
+}
+
+/*外置的样式控制*/
+.user-dropdown-menu-wrapper.ant-dropdown-menu {
+  padding: 4px 0;
+
+  .ant-dropdown-menu-item {
+    width: 160px;
+  }
+
+  .ant-dropdown-menu-item > .anticon:first-child,
+  .ant-dropdown-menu-item > a > .anticon:first-child,
+  .ant-dropdown-menu-submenu-title > .anticon:first-child
+  .ant-dropdown-menu-submenu-title > a > .anticon:first-child {
+    min-width: 12px;
+    margin-right: 8px;
+  }
+
+}
+
+/* 数据列表 样式*/
+.table-alert {
+  margin-bottom: 16px;
+}
+
+.table-page-search-wrapper {
+
+  .ant-form-inline {
+
+    .ant-form-item {
+      display: flex;
+      margin-bottom: 24px;
+      margin-right: 0;
+
+      .ant-form-item-control-wrapper {
+        flex: 1 1;
+        display: inline-block;
+        vertical-align: middle;
+      }
+
+      > .ant-form-item-label {
+        line-height: 32px;
+        padding-right: 8px;
+        width: auto;
+      }
+      .ant-form-item-control {
+        height: 32px;
+        line-height: 32px;
+      }
+    }
+  }
+
+  .table-page-search-submitButtons {
+    display: block;
+    margin-bottom: 24px;
+    white-space: nowrap;
+  }
+
+}
+
+.content {
+
+  .table-operator {
+    margin-bottom: 18px;
+
+    button {
+      margin-right: 8px;
+    }
+  }
+}

src/assets/styles/sidebar.scss

@@ -22,7 +22,7 @@
     top: 0;
     bottom: 0;
     left: 0;
-    z-index: 1001;
+    z-index: 1000;
     overflow: hidden;
     -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
     box-shadow: 2px 0 6px rgba(0,21,41,.35);

src/views/erp/bill/AllocationOutList.vue

@@ -211,6 +211,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/bill/AssembleList.vue

@@ -211,6 +211,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/bill/DisassembleList.vue

@@ -211,6 +211,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/bill/InventoryReview.vue

@@ -219,6 +219,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/bill/OtherInList.vue

@@ -229,6 +229,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/bill/OtherOutList.vue

@@ -229,6 +229,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/bill/PurchaseBackList.vue

@@ -241,6 +241,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/bill/PurchaseInList.vue

@@ -250,6 +250,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+@import "~@assets/less/common.less";
 </style>

src/views/erp/bill/PurchaseOrderList.vue

@@ -225,6 +225,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/bill/RetailBackList.vue

@@ -239,6 +239,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/bill/RetailOutList.vue

@@ -233,6 +233,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/bill/SaleBackList.vue

@@ -241,6 +241,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/bill/SaleOrderList.vue

@@ -240,6 +240,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/bill/SaleOutList.vue

@@ -249,6 +249,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/bill/mixins/BillListMixin.js

@@ -114,7 +114,7 @@ export const BillListMixin = {
       });
     },
     getDepotData() {
-      getAction('/depot/findDepotByCurrentUser').then((res)=>{
+      getAction('erp/depot/findDepotByCurrentUser').then((res)=>{
         if(res.code === 200){
           this.depotList = res.data;
         }else{

src/views/erp/bill/mixins/BillModalMixin.js

@@ -58,7 +58,7 @@ export const BillModalMixin = {
   },
   methods: {
     addInit(amountNum) {
-      getAction('/sequence/buildNumber').then((res) => {
+      getAction('/erp/sequence/buildNumber').then((res) => {
         if (res && res.code === 200) {
           this.form.setFieldsValue({'number':amountNum + res.data.defaultNumber})
         }
@@ -83,7 +83,7 @@ export const BillModalMixin = {
       this.manyAccountBtnStatus = false
     },
     copyAddInit(amountNum) {
-      getAction('/sequence/buildNumber').then((res) => {
+      getAction('/erp/sequence/buildNumber').then((res) => {
         if (res && res.code === 200) {
           this.form.setFieldsValue({'number':amountNum + res.data.defaultNumber})
         }
@@ -169,7 +169,7 @@ export const BillModalMixin = {
     },
     initDepot() {
       let that = this;
-      getAction('/depot/findDepotByCurrentUser').then((res) => {
+      getAction('/erp/depot/findDepotByCurrentUser').then((res) => {
         if(res.code === 200){
           let arr = res.data
           for(let item of that.materialTable.columns){
@@ -311,7 +311,7 @@ export const BillModalMixin = {
     },
     onAdded(event) {
       const { row, target } = event
-      getAction('/depot/findDepotByCurrentUser').then((res) => {
+      getAction('/erp/depot/findDepotByCurrentUser').then((res) => {
         if (res.code === 200) {
           let arr = res.data
           for (let i = 0; i < arr.length; i++) {

src/views/erp/financial/AdvanceInList.vue

@@ -195,6 +195,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/financial/GiroList.vue

@@ -182,6 +182,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/financial/ItemInList.vue

@@ -195,6 +195,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/financial/ItemOutList.vue

@@ -194,6 +194,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/financial/MoneyInList.vue

@@ -198,6 +198,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/financial/MoneyOutList.vue

@@ -198,6 +198,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/material/MaterialAttributeList.vue

@@ -75,9 +75,9 @@
           }
         ],
         url: {
-          list: "/materialAttribute/list",
-          delete: "/materialAttribute/delete",
-          deleteBatch: "/materialAttribute/deleteBatch"
+          list: "/erp/materialAttribute/list",
+          delete: "/erp/materialAttribute/delete",
+          deleteBatch: "/erp/materialAttribute/deleteBatch"
         }
       }
     },
@@ -89,6 +89,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/material/MaterialList.vue

@@ -289,6 +289,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/material/MaterialPropertyList.vue

@@ -118,6 +118,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/material/modules/MaterialModal.vue

@@ -736,7 +736,7 @@
         let params = {};
         params.currentPage = 1;
         params.pageSize = 100;
-        getAction('/unit/list', params).then((res) => {
+        getAction('/erp/unit/list', params).then((res) => {
           if(res){
             that.unitList = res.data.rows;      
             that.unitList.forEach(item => {

src/views/erp/report/AccountReport.vue

@@ -176,6 +176,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/report/AllocationDetail.vue

@@ -253,6 +253,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/report/BuyInReport.vue

@@ -159,6 +159,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/report/CustomerAccount.vue

@@ -241,6 +241,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/report/InDetail.vue

@@ -245,6 +245,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/report/InMaterialCount.vue

@@ -215,6 +215,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/report/InOutStockReport.vue

@@ -221,6 +221,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/report/MaterialStock.vue

@@ -266,6 +266,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/report/OutDetail.vue

@@ -245,6 +245,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/report/OutMaterialCount.vue

@@ -215,6 +215,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/report/SaleOutReport.vue

@@ -167,6 +167,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/report/StockWarningReport.vue

@@ -166,6 +166,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/report/VendorAccount.vue

@@ -242,6 +242,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/report/batchStock.vue

@@ -168,6 +168,6 @@
     }
   }
 </script>
-<style scoped>
+<style lang="less" scoped>
   @import '~@assets/less/common.less';
 </style>

src/views/erp/report/modules/AccountInOutList.vue

@@ -158,6 +158,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/report/modules/MaterialInOutList.vue

@@ -128,6 +128,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/system/AccountList.vue

@@ -175,6 +175,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/system/CustomerList.vue

@@ -189,6 +189,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/system/DepotList.vue

@@ -172,6 +172,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/system/FunctionList.vue

@@ -140,6 +140,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/system/InOutItemList.vue

@@ -153,6 +153,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/system/LogList.vue

@@ -183,6 +183,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/system/MemberList.vue

@@ -185,6 +185,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/system/PersonList.vue

@@ -153,6 +153,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/system/PlatformConfigList.vue

@@ -101,6 +101,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/system/PluginList.vue

@@ -247,6 +247,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/system/RoleList.vue

@@ -189,6 +189,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/system/SystemConfigList.vue

@@ -169,6 +169,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/system/TenantList.vue

@@ -155,6 +155,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/system/UnitList.vue

@@ -137,9 +137,9 @@
           }
         ],
         url: {
-          list: "/unit/list",
-          delete: "/unit/delete",
-          deleteBatch: "/unit/deleteBatch"
+          list: "/erp/unit/list",
+          delete: "/erp/unit/delete",
+          deleteBatch: "/erp/unit/deleteBatch"
         }
       }
     },
@@ -158,6 +158,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/system/UserList.vue

@@ -208,6 +208,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>

src/views/erp/system/VendorList.vue

@@ -188,6 +188,6 @@
     }
   }
 </script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
 </style>