代码整理

导航栏样式修改
6 years ago · c7a6d6784f
parent f7366130ea
commit c7a6d6784f
48 changed files with 291 additions and 303 deletions
--- a/vue/public/index.html
+++ b/vue/public/index.html
@ -2,9 +2,6 @@
 <html>
 <head>
    <meta charset="utf-8">
-    <meta http-equiv="Pragma" content="no-cache">
-    <meta http-equiv="Cache-Control" content="no-cache">
-    <meta http-equiv="Expires" content="0">
    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
    <meta content="webkit" name="renderer">
    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
@ -37,21 +34,21 @@
 </body>

 <!--echarts-->
-<script defer src="https://cdn.bootcss.com/echarts/4.6.0/echarts.min.js"></script>
+<script defer src="https://lib.baomitu.com/echarts/4.6.0/echarts.min.js"></script>
 <script defer src="<%= BASE_URL %>static/echarts/macarons.js"></script>

 <!--两种图片预览插件-->
-<link href="https://cdn.bootcss.com/photoswipe/4.1.3/photoswipe.min.css" rel="stylesheet">
-<link href="https://cdn.bootcss.com/photoswipe/4.1.3/default-skin/default-skin.min.css" rel="stylesheet">
-<script defer src="https://cdn.bootcss.com/photoswipe/4.1.3/photoswipe.min.js"></script>
-<script defer src="https://cdn.bootcss.com/photoswipe/4.1.3/photoswipe-ui-default.min.js"></script>
-<link href="https://cdn.bootcss.com/viewerjs/1.5.0/viewer.min.css" rel="stylesheet">
-<script async src="https://cdn.bootcss.com/viewerjs/1.5.0/viewer.min.js"></script>
+<link href="https://lib.baomitu.com/photoswipe/4.1.3/photoswipe.min.css" rel="stylesheet">
+<link href="https://lib.baomitu.com/photoswipe/4.1.3/default-skin/default-skin.min.css" rel="stylesheet">
+<script defer src="https://lib.baomitu.com/photoswipe/4.1.3/photoswipe.min.js"></script>
+<script defer src="https://lib.baomitu.com/photoswipe/4.1.3/photoswipe-ui-default.min.js"></script>
+<link href="https://lib.baomitu.com/viewerjs/1.5.0/viewer.min.css" rel="stylesheet">
+<script async src="https://lib.baomitu.com/viewerjs/1.5.0/viewer.min.js"></script>

 <!--excel-->
 <script async src="<%= BASE_URL %>static/js/xlsx.full.min.js"></script>
 <script async src="<%= BASE_URL %>static/js/exceljs.min.js"></script>

 <!--富文本-->
-<script async src="https://cdn.bootcdn.net/ajax/libs/tinymce/5.3.1/tinymce.min.js"></script>
+<script async src="https://lib.baomitu.com/tinymce/5.4.1/tinymce.min.js"></script>
 </html>
--- a/vue/src/api/account.js
+++ b/vue/src/api/account.js
@ -1,6 +1,6 @@
-import request from '@/config/request'
+import request from "@/config/request"

-const baseUrl = '/account'
+export const baseUrl = '/account'

 export function login(data) {
    return request.post(`${baseUrl}/login`, data).then(({data}) => data.data)
--- a/vue/src/api/document/purchase/inbound.js
+++ b/vue/src/api/document/purchase/inbound.js
@ -0,0 +1,43 @@
+import request from "@/config/request"
+
+const baseUrl = '/document/purchase/inbound'
+
+export function getById(id) {
+    return request.get(`${baseUrl}/getById?id=${id}`).then(({data}) => data.data)
+}
+
+export function getSubById(id) {
+    return request.get(`${baseUrl}/getSubById?id=${id}`).then(({data}) => data.data)
+}
+
+export function search(data) {
+    return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)
+}
+
+export function add(data) {
+    return request.post(`${baseUrl}/add`, data).then(({data}) => data)
+}
+
+export function update(data) {
+    return request.post(`${baseUrl}/update`, data).then(({data}) => data)
+}
+
+export function commit(data) {
+    return request.post(`${baseUrl}/commit`, data).then(({data}) => data)
+}
+
+export function withdraw(data) {
+    return request.post(`${baseUrl}/withdraw`, data).then(({data}) => data)
+}
+
+export function pass(data) {
+    return request.post(`${baseUrl}/pass`, data).then(({data}) => data)
+}
+
+export function reject(data) {
+    return request.post(`${baseUrl}/reject`, data).then(({data}) => data)
+}
+
+export function del(id) {
+    return request.get(`${baseUrl}/del?id=${id}`).then(({data}) => data)
+}
--- a/vue/src/api/document/purchase/order.js
+++ b/vue/src/api/document/purchase/order.js
@ -0,0 +1,43 @@
+import request from "@/config/request"
+
+export const baseUrl = '/document/purchase/order'
+
+export function getById(id) {
+    return request.get(`${baseUrl}/getById?id=${id}`).then(({data}) => data.data)
+}
+
+export function getSubById(id) {
+    return request.get(`${baseUrl}/getSubById?id=${id}`).then(({data}) => data.data)
+}
+
+export function search(data) {
+    return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)
+}
+
+export function add(data) {
+    return request.post(`${baseUrl}/add`, data).then(({data}) => data)
+}
+
+export function update(data) {
+    return request.post(`${baseUrl}/update`, data).then(({data}) => data)
+}
+
+export function commit(data) {
+    return request.post(`${baseUrl}/commit`, data).then(({data}) => data)
+}
+
+export function withdraw(data) {
+    return request.post(`${baseUrl}/withdraw`, data).then(({data}) => data)
+}
+
+export function pass(data) {
+    return request.post(`${baseUrl}/pass?`, data).then(({data}) => data)
+}
+
+export function reject(data) {
+    return request.post(`${baseUrl}/reject`, data).then(({data}) => data)
+}
+
+export function del(id) {
+    return request.get(`${baseUrl}/del?id=${id}`).then(({data}) => data)
+}
--- a/vue/src/api/document/sell/order.js
+++ b/vue/src/api/document/sell/order.js
@ -0,0 +1,43 @@
+import request from "@/config/request"
+
+export const baseUrl = `/document/sell/order`
+
+export function getById(id) {
+    return request.get(`${baseUrl}/getById?id=${id}`).then(({data}) => data.data)
+}
+
+export function getSubById(id) {
+    return request.get(`${baseUrl}/getSubById?id=${id}`).then(({data}) => data.data)
+}
+
+export function search(data) {
+    return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)
+}
+
+export function add(data) {
+    return request.post(`${baseUrl}/add`, data).then(({data}) => data)
+}
+
+export function update(data) {
+    return request.post(`${baseUrl}/update`, data).then(({data}) => data)
+}
+
+export function commit(data) {
+    return request.post(`${baseUrl}/commit`, data).then(({data}) => data)
+}
+
+export function withdraw(data) {
+    return request.post(`${baseUrl}/withdraw`, data).then(({data}) => data)
+}
+
+export function pass(data) {
+    return request.post(`${baseUrl}/pass?`, data).then(({data}) => data)
+}
+
+export function reject(data) {
+    return request.post(`${baseUrl}/reject`, data).then(({data}) => data)
+}
+
+export function del(id) {
+    return request.get(`${baseUrl}/del?id=${id}`).then(({data}) => data)
+}
--- a/vue/src/api/document/sell/outbound.js
+++ b/vue/src/api/document/sell/outbound.js
@ -0,0 +1,43 @@
+import request from "@/config/request"
+
+export const baseUrl = `/document/sell/outbound`
+
+export function getById(id) {
+    return request.get(`${baseUrl}/getById?id=${id}`).then(({data}) => data.data)
+}
+
+export function getSubById(id) {
+    return request.get(`${baseUrl}/getSubById?id=${id}`).then(({data}) => data.data)
+}
+
+export function search(data) {
+    return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)
+}
+
+export function add(data) {
+    return request.post(`${baseUrl}/add`, data).then(({data}) => data)
+}
+
+export function update(data) {
+    return request.post(`${baseUrl}/update`, data).then(({data}) => data)
+}
+
+export function commit(data) {
+    return request.post(`${baseUrl}/commit`, data).then(({data}) => data)
+}
+
+export function withdraw(data) {
+    return request.post(`${baseUrl}/withdraw`, data).then(({data}) => data)
+}
+
+export function pass(data) {
+    return request.post(`${baseUrl}/pass?`, data).then(({data}) => data)
+}
+
+export function reject(data) {
+    return request.post(`${baseUrl}/reject`, data).then(({data}) => data)
+}
+
+export function del(id) {
+    return request.get(`${baseUrl}/del?id=${id}`).then(({data}) => data)
+}
--- a/vue/src/api/documentHistory.js
+++ b/vue/src/api/documentHistory.js
@ -1,7 +1,7 @@
-import request from '@/config/request'
+import request from "@/config/request"

-const baseUrl = '/document/history'
+export const baseUrl = '/document/history'

 export function getDocumentHistoryByPid(pid) {
-    return request.get(baseUrl + '/get?pid=' + pid).then(({data}) => data.data)
+    return request.get(`${baseUrl}/get?pid=${pid}`).then(({data}) => data.data)
 }
--- a/vue/src/api/message/manage.js
+++ b/vue/src/api/message/manage.js
@ -1,4 +1,4 @@
-import request from '@/config/request'
+import request from "@/config/request"

 const baseUrl = '/message/manage'

--- a/vue/src/api/message/user.js
+++ b/vue/src/api/message/user.js
@ -1,15 +1,15 @@
-import request from '@/config/request'
+import request from "@/config/request"

 const baseUrl = '/message/user'

 export function search(data) {
-    return request.post(baseUrl + '/search', data).then(({data}) => data.data)
+    return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)
 }

 export function read(id) {
-    return request.get(baseUrl + `/read?id=${id}`).then(({data}) => data)
+    return request.get(`${baseUrl}/read?id=${id}`).then(({data}) => data)
 }

 export function readAll() {
-    return request.get(baseUrl + '/readAll').then(({data}) => data)
+    return request.get(`${baseUrl}/readAll`).then(({data}) => data)
 }
--- a/vue/src/api/purchase/inbound.js
+++ b/vue/src/api/purchase/inbound.js
@ -1,43 +0,0 @@
-import request from '@/config/request'
-
-const baseUrl = '/purchase/inbound'
-
-export function getById(id) {
-    return request.get(baseUrl + '/getById?id=' + id).then(({data}) => data.data)
-}
-
-export function getSubById(id) {
-    return request.get(baseUrl + '/getSubById?id=' + id).then(({data}) => data.data)
-}
-
-export function search(data) {
-    return request.post(baseUrl + '/search', data).then(({data}) => data.data)
-}
-
-export function add(data) {
-    return request.post(baseUrl + '/add', data).then(({data}) => data)
-}
-
-export function update(data) {
-    return request.post(baseUrl + '/update', data).then(({data}) => data)
-}
-
-export function commit(data) {
-    return request.post(baseUrl + '/commit', data).then(({data}) => data)
-}
-
-export function withdraw(data) {
-    return request.post(baseUrl + '/withdraw', data).then(({data}) => data)
-}
-
-export function pass(data) {
-    return request.post(baseUrl + '/pass?', data).then(({data}) => data)
-}
-
-export function reject(data) {
-    return request.post(baseUrl + '/reject', data).then(({data}) => data)
-}
-
-export function del(id) {
-    return request.get(baseUrl + '/del?id=' + id).then(({data}) => data)
-}
--- a/vue/src/api/purchase/order.js
+++ b/vue/src/api/purchase/order.js
@ -1,43 +0,0 @@
-import request from '@/config/request'
-
-const baseUrl = '/purchase/order'
-
-export function getById(id) {
-    return request.get(baseUrl + '/getById?id=' + id).then(({data}) => data.data)
-}
-
-export function getSubById(id) {
-    return request.get(baseUrl + '/getSubById?id=' + id).then(({data}) => data.data)
-}
-
-export function search(data) {
-    return request.post(baseUrl + '/search', data).then(({data}) => data.data)
-}
-
-export function add(data) {
-    return request.post(baseUrl + '/add', data).then(({data}) => data)
-}
-
-export function update(data) {
-    return request.post(baseUrl + '/update', data).then(({data}) => data)
-}
-
-export function commit(data) {
-    return request.post(baseUrl + '/commit', data).then(({data}) => data)
-}
-
-export function withdraw(data) {
-    return request.post(baseUrl + '/withdraw', data).then(({data}) => data)
-}
-
-export function pass(data) {
-    return request.post(baseUrl + '/pass?', data).then(({data}) => data)
-}
-
-export function reject(data) {
-    return request.post(baseUrl + '/reject', data).then(({data}) => data)
-}
-
-export function del(id) {
-    return request.get(baseUrl + '/del?id=' + id).then(({data}) => data)
-}
--- a/vue/src/api/record.js
+++ b/vue/src/api/record.js
@ -1,6 +1,6 @@
-import request from '@/config/request'
+import request from "@/config/request"

-const baseUrl = '/record'
+export const baseUrl = '/record'

 export function searchLoginHistory(data) {
    return request.post(`${baseUrl}/searchLoginHistory`, data).then(({data}) => data.data)
--- a/vue/src/api/sell/order.js
+++ b/vue/src/api/sell/order.js
@ -1,43 +0,0 @@
-import request from '@/config/request'
-
-const baseUrl = '/sell/order'
-
-export function getById(id) {
-    return request.get(baseUrl + '/getById?id=' + id).then(({data}) => data.data)
-}
-
-export function getSubById(id) {
-    return request.get(baseUrl + '/getSubById?id=' + id).then(({data}) => data.data)
-}
-
-export function search(data) {
-    return request.post(baseUrl + '/search', data).then(({data}) => data.data)
-}
-
-export function add(data) {
-    return request.post(baseUrl + '/add', data).then(({data}) => data)
-}
-
-export function update(data) {
-    return request.post(baseUrl + '/update', data).then(({data}) => data)
-}
-
-export function commit(data) {
-    return request.post(baseUrl + '/commit', data).then(({data}) => data)
-}
-
-export function withdraw(data) {
-    return request.post(baseUrl + '/withdraw', data).then(({data}) => data)
-}
-
-export function pass(data) {
-    return request.post(baseUrl + '/pass?', data).then(({data}) => data)
-}
-
-export function reject(data) {
-    return request.post(baseUrl + '/reject', data).then(({data}) => data)
-}
-
-export function del(id) {
-    return request.get(baseUrl + '/del?id=' + id).then(({data}) => data)
-}
--- a/vue/src/api/sell/outbound.js
+++ b/vue/src/api/sell/outbound.js
@ -1,43 +0,0 @@
-import request from '@/config/request'
-
-const baseUrl = '/sell/outbound'
-
-export function getById(id) {
-    return request.get(baseUrl + '/getById?id=' + id).then(({data}) => data.data)
-}
-
-export function getSubById(id) {
-    return request.get(baseUrl + '/getSubById?id=' + id).then(({data}) => data.data)
-}
-
-export function search(data) {
-    return request.post(baseUrl + '/search', data).then(({data}) => data.data)
-}
-
-export function add(data) {
-    return request.post(baseUrl + '/add', data).then(({data}) => data)
-}
-
-export function update(data) {
-    return request.post(baseUrl + '/update', data).then(({data}) => data)
-}
-
-export function commit(data) {
-    return request.post(baseUrl + '/commit', data).then(({data}) => data)
-}
-
-export function withdraw(data) {
-    return request.post(baseUrl + '/withdraw', data).then(({data}) => data)
-}
-
-export function pass(data) {
-    return request.post(baseUrl + '/pass?', data).then(({data}) => data)
-}
-
-export function reject(data) {
-    return request.post(baseUrl + '/reject', data).then(({data}) => data)
-}
-
-export function del(id) {
-    return request.get(baseUrl + '/del?id=' + id).then(({data}) => data)
-}
--- a/vue/src/api/statistic.js
+++ b/vue/src/api/statistic.js
@ -1,19 +1,19 @@
-import request from '@/config/request'
+import request from "@/config/request"

-const baseUrl = '/statistic'
+export const baseUrl = `/statistic`

 export function getFourBlock() {
-    return request.get(baseUrl + '/getFourBlock').then(({data}) => data.data)
+    return request.get(`${baseUrl}/getFourBlock`).then(({data}) => data.data)
 }

 export function getDailyProfitStat() {
-    return request.get(baseUrl + '/getDailyProfitStat').then(({data}) => data.data)
+    return request.get(`${baseUrl}/getDailyProfitStat`).then(({data}) => data.data)
 }

 export function getDailyFinishOrder() {
-    return request.get(baseUrl + '/getDailyFinishOrder').then(({data}) => data.data)
+    return request.get(`${baseUrl}/getDailyFinishOrder`).then(({data}) => data.data)
 }

 export function getTotalProfitGoods() {
-    return request.get(baseUrl + '/getTotalProfitGoods').then(({data}) => data.data)
+    return request.get(`${baseUrl}/getTotalProfitGoods`).then(({data}) => data.data)
 }
--- a/vue/src/api/stock/current.js
+++ b/vue/src/api/stock/current.js
@ -1,15 +1,15 @@
-import request from '@/config/request'
+import request from "@/config/request"

-const baseUrl = '/stock/current'
+export const baseUrl = '/stock/current'

 export function search(data) {
-    return request.post(baseUrl + '/search', data).then(({data}) => data.data)
+    return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)
 }

-export function getDetail(cid) {
-    return request.get(baseUrl + '/getDetail?cid=' + cid).then(({data}) => data.data)
+export function getDetail(cids) {
+    return request.get(`${baseUrl}/getDetail?cids=${cids}`).then(({data}) => data.data)
 }

 export function getDetailById(ids) {
-    return request.get(baseUrl + '/getDetailById?ids=' + ids).then(({data}) => data.data)
+    return request.get(`${baseUrl}/getDetailById?ids=${ids}`).then(({data}) => data.data)
 }
--- a/vue/src/api/system/category.js
+++ b/vue/src/api/system/category.js
@ -1,23 +1,23 @@
-import request from '@/config/request'
+import request from "@/config/request"

-const baseUrl = '/system/category'
+export const baseUrl = `/system/category`

 export function search(data) {
-    return request.post(baseUrl + '/search', data).then(({data}) => data.data)
+    return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)
 }

-export function getAllCategories() {
-    return request.get(baseUrl + '/getAll').then(({data}) => data.data)
+export function getAll() {
+    return request.get(`${baseUrl}/getAll`).then(({data}) => data.data)
 }

-export function addCategory(data) {
-    return request.post(baseUrl + '/add', data).then(({data}) => data)
+export function add(data) {
+    return request.post(`${baseUrl}/add`, data).then(({data}) => data)
 }

-export function updateCategory(data) {
-    return request.post(baseUrl + '/update', data).then(({data}) => data)
+export function update(data) {
+    return request.post(`${baseUrl}/update`, data).then(({data}) => data)
 }

-export function delCategory(data) {
-    return request.post(baseUrl + '/del', data).then(({data}) => data)
+export function del(data) {
+    return request.post(`${baseUrl}/del`, data).then(({data}) => data)
 }
--- a/vue/src/api/system/customer.js
+++ b/vue/src/api/system/customer.js
@ -1,23 +1,23 @@
-import request from '@/config/request'
+import request from "@/config/request"

-const baseUrl = '/system/customer'
+export const baseUrl = `/system/customer`

 export function getLimitRegion() {
-    return request.get(baseUrl + '/getLimitRegion').then(({data}) => data.data)
+    return request.get(`${baseUrl}/getLimitRegion`).then(({data}) => data.data)
 }

 export function getCustomers(data) {
-    return request.post(baseUrl + '/search', data).then(({data}) => data.data)
+    return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)
 }

 export function addCustomer(data) {
-    return request.post(baseUrl + '/add', data).then(({data}) => data)
+    return request.post(`${baseUrl}/add`, data).then(({data}) => data)
 }

 export function updateCustomer(data) {
-    return request.post(baseUrl + '/update', data).then(({data}) => data)
+    return request.post(`${baseUrl}/update`, data).then(({data}) => data)
 }

 export function delCustomer(data) {
-    return request.post(baseUrl + '/del', data).then(({data}) => data)
+    return request.post(`${baseUrl}/del`, data).then(({data}) => data)
 }
--- a/vue/src/api/system/department.js
+++ b/vue/src/api/system/department.js
@ -1,23 +1,23 @@
-import request from '@/config/request'
+import request from "@/config/request"

-const baseUrl = '/system/department'
+export const baseUrl = `/system/department`

 export function getDepartments() {
-    return request.get(baseUrl + '/get').then(({data}) => data.data)
+    return request.get(`${baseUrl}/get`).then(({data}) => data.data)
 }

 export function getAllDepartments() {
-    return request.get(baseUrl + '/getAll').then(({data}) => data.data)
+    return request.get(`${baseUrl}/getAll`).then(({data}) => data.data)
 }

 export function addDepartment(data) {
-    return request.post(baseUrl + '/add', data).then(({data}) => data)
+    return request.post(`${baseUrl}/add`, data).then(({data}) => data)
 }

 export function updateDepartment(data) {
-    return request.post(baseUrl + '/update', data).then(({data}) => data)
+    return request.post(`${baseUrl}/update`, data).then(({data}) => data)
 }

 export function delDepartment(data) {
-    return request.post(baseUrl + '/del', data).then(({data}) => data)
+    return request.post(`${baseUrl}/del`, data).then(({data}) => data)
 }
--- a/vue/src/api/system/monitor.js
+++ b/vue/src/api/system/monitor.js
@ -1,7 +0,0 @@
-import request from '@/config/request'
-
-const baseUrl = '/system/monitor'
-
-export function getMonitorInfo() {
-    return request.get(baseUrl + '/get').then(({data}) => data.data)
-}
--- a/vue/src/api/system/resource.js
+++ b/vue/src/api/system/resource.js
@ -1,15 +1,15 @@
-import request from '@/config/request'
+import request from "@/config/request"

-const baseUrl = '/system/resource'
+export const baseUrl = `/system/resource`

 export function getResources() {
-    return request.get(baseUrl + '/get').then(({data}) => data.data)
+    return request.get(`${baseUrl}/get`).then(({data}) => data.data)
 }

 export function getAllResources() {
-    return request.get(baseUrl + '/getAll').then(({data}) => data.data)
+    return request.get(`${baseUrl}/getAll`).then(({data}) => data.data)
 }

 export function updateResource(data) {
-    return request.post(baseUrl + '/update', data).then(({data}) => data)
+    return request.post(`${baseUrl}/update`, data).then(({data}) => data)
 }
--- a/vue/src/api/system/role.js
+++ b/vue/src/api/system/role.js
@ -1,23 +1,23 @@
-import request from '@/config/request'
+import request from "@/config/request"

-const baseUrl = '/system/role'
+export const baseUrl = `/system/role`

 export function searchRoles(data) {
-    return request.post(baseUrl + '/search', data).then(({data}) => data.data)
+    return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)
 }

 export function getRoles() {
-    return request.get(baseUrl + '/get').then(({data}) => data.data)
+    return request.get(`${baseUrl}/get`).then(({data}) => data.data)
 }

 export function addRole(data) {
-    return request.post(baseUrl + '/add', data).then(({data}) => data)
+    return request.post(`${baseUrl}/add`, data).then(({data}) => data)
 }

 export function updateRole(data) {
-    return request.post(baseUrl + '/update', data).then(({data}) => data)
+    return request.post(`${baseUrl}/update`, data).then(({data}) => data)
 }

 export function delRole(data) {
-    return request.post(baseUrl + '/del', data).then(({data}) => data)
+    return request.post(`${baseUrl}/del`, data).then(({data}) => data)
 }
--- a/vue/src/api/system/supplier.js
+++ b/vue/src/api/system/supplier.js
@ -1,23 +1,23 @@
-import request from '@/config/request'
+import request from "@/config/request"

-const baseUrl = '/system/supplier'
+export const baseUrl = `/system/supplier`

 export function getLimitRegion() {
-    return request.get(baseUrl + '/getLimitRegion').then(({data}) => data.data)
+    return request.get(`${baseUrl}/getLimitRegion`).then(({data}) => data.data)
 }

 export function getSuppliers(data) {
-    return request.post(baseUrl + '/search', data).then(({data}) => data.data)
+    return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)
 }

 export function addSupplier(data) {
-    return request.post(baseUrl + '/add', data).then(({data}) => data)
+    return request.post(`${baseUrl}/add`, data).then(({data}) => data)
 }

 export function updateSupplier(data) {
-    return request.post(baseUrl + '/update', data).then(({data}) => data)
+    return request.post(`${baseUrl}/update`, data).then(({data}) => data)
 }

 export function delSupplier(data) {
-    return request.post(baseUrl + '/del', data).then(({data}) => data)
+    return request.post(`${baseUrl}/del`, data).then(({data}) => data)
 }
--- a/vue/src/api/system/user.js
+++ b/vue/src/api/system/user.js
@ -1,27 +1,27 @@
-import request from '@/config/request'
+import request from "@/config/request"

-const baseUrl = '/system/user'
+export const baseUrl = `/system/user`

 export function getUsers(data) {
-    return request.post(baseUrl + '/search', data).then(({data}) => data.data)
+    return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)
 }

 export function kick(data) {
-    return request.post(baseUrl + '/kick', data).then(({data}) => data)
+    return request.post(`${baseUrl}/kick`, data).then(({data}) => data)
 }

 export function addUser(data) {
-    return request.post(baseUrl + '/add', data).then(({data}) => data)
+    return request.post(`${baseUrl}/add`, data).then(({data}) => data)
 }

 export function updateUser(data) {
-    return request.post(baseUrl + '/update', data).then(({data}) => data)
+    return request.post(`${baseUrl}/update`, data).then(({data}) => data)
 }

 export function delUser(data) {
-    return request.post(baseUrl + '/del', data).then(({data}) => data)
+    return request.post(`${baseUrl}/del`, data).then(({data}) => data)
 }

 export function resetUserPwd(data) {
-    return request.post(baseUrl + '/resetPwd', data).then(({data}) => data)
+    return request.post(`${baseUrl}/resetPwd`, data).then(({data}) => data)
 }
--- a/vue/src/bizComponents/CategoryTree/index.vue
+++ b/vue/src/bizComponents/CategoryTree/index.vue
@ -12,7 +12,7 @@
 </template>

 <script>
-    import {getAllCategories} from "@/api/system/category"
+    import {getAll} from "@/api/system/category"

    export default {
        name: "CategoryTree",
@ -26,7 +26,7 @@
        },

        mounted() {
-            getAllCategories()
+            getAll()
                .then(data => this.$store.commit('dataCache/categories', data))
                .finally(() => this.loading = false)
        }
--- a/vue/src/config/request.js
+++ b/vue/src/config/request.js
@ -13,7 +13,7 @@ const service = axios.create({
 service.interceptors.request.use(
    config => {
        //登录状态下socket断连时，除登出外中断一切请求
-        if (store.state.user.id && !store.state.socket.online && config.url !== '/logout') {
+        if (store.state.user.id && !store.state.socket.online && config.url !== '/account/logout') {
            Message.error('请等待与服务器重新连接')
            return Promise.reject('')
        }
--- a/vue/src/layout/components/Navbar/components/HeaderSearch.vue
+++ b/vue/src/layout/components/Navbar/components/HeaderSearch.vue
@ -119,8 +119,6 @@

 <style lang="scss">
    .header-search {
-        font-size: 0 !important;
-
        .header-search-select {
            font-size: 18px;
            transition: width 0.2s;
--- a/vue/src/layout/components/Navbar/style.scss
+++ b/vue/src/layout/components/Navbar/style.scss
@ -29,7 +29,7 @@
            position: relative;
            padding: 0 8px;
            height: 100%;
-            font-size: 18px;
+            font-size: 0;
            color: #5a5e66;
            vertical-align: text-bottom;
            transition: background .3s;
@ -42,14 +42,17 @@

        .avatar-container {
            .avatar-wrapper {
-                margin-top: 5px;
-                position: relative;
+                margin-top: 2px;

                .el-avatar {
                    position: relative;
                    top: 5px;
                    margin-right: 5px;
                }
+
+                span {
+                    font-size: 18px;
+                }
            }
        }
    }
--- a/vue/src/store/modules/resource.js
+++ b/vue/src/store/modules/resource.js
@ -159,7 +159,7 @@ function sort(routes, getSortValue = defaultGetSortValue) {

 const defaultGetSortValue = item => {
    item = deepTap(item)
-    return !item || emptyOrDefault(item.sort, 10000)
+    return !item || isEmpty(item.sort) ? 10000 : item.sort
 }

 const deepTap = item => {
--- a/vue/src/store/modules/socket.js
+++ b/vue/src/store/modules/socket.js
@ -21,6 +21,7 @@ const actions = {
        defaultEventBind(socket, context)
        customEventBind(socket, context)
    },
+
    close() {
        return new Promise(resolve => {
            if (!socket) return resolve()
@ -77,7 +78,7 @@ function defaultEventBind(socket, {state, commit, dispatch}) {
 function customEventBind(socket, {state, commit, dispatch, rootState}) {
    socket.on('logout', msg => {
        if (rootState.user.prepare_logout) return
-        return MessageBox.alert(msg || '你已被强制下线，请重新登陆', {
+        MessageBox.alert(msg || '你已被强制下线，请重新登陆', {
            type: 'warning',
            beforeClose: (action, instance, done) => {
                dispatch('user/logout', null, {root: true}).finally(done)
--- a/vue/src/utils/file.js
+++ b/vue/src/utils/file.js
@ -1,4 +1,4 @@
-import request from '@/config/request'
+import request from "@/config/request"
 import {attachmentUploadUrl, attachmentPrefix, filePreviewPrefix} from '@/config'
 import {isEmpty, timeFormat} from "@/utils"
 import {isTxt} from "@/utils/validate"
--- a/vue/src/views/example/components/uploadExample.vue
+++ b/vue/src/views/example/components/uploadExample.vue
@ -12,7 +12,7 @@

 <script>
    import UploadFile from '@/components/UploadFile'
-    import request from '@/config/request'
+    import request from "@/config/request"

    export default {
        name: "uploadExample",
--- a/vue/src/views/purchase/inbound/components/EditDialog.vue
+++ b/vue/src/views/purchase/inbound/components/EditDialog.vue
@ -93,8 +93,8 @@
 <script>
    import OrderSelector from "./OrderSelector"
    import bizDocumentDialogMixin from "@/mixins/bizDocumentDialogMixin"
-    import {add, commit, getById, pass, reject, update, withdraw} from "@/api/purchase/inbound"
-    import {getSubById as getParentSubById} from "@/api/purchase/order"
+    import {add, commit, getById, pass, reject, update, withdraw} from "@/api/document/purchase/inbound"
+    import {getSubById as getParentSubById} from "@/api/document/purchase/order"
    import {isEmpty} from "@/utils"
    import {isInteger} from "@/utils/validate"
    import {elAlert} from "@/utils/message"
--- a/vue/src/views/purchase/inbound/components/OrderSelector.vue
+++ b/vue/src/views/purchase/inbound/components/OrderSelector.vue
@ -69,7 +69,7 @@
    import LinerProgress from '@/components/LinerProgress'
    import dialogMixin from "@/mixins/dialogMixin"
    import tableMixin from '@/mixins/tablePageMixin'
-    import {getSubById, search} from "@/api/purchase/order"
+    import {getSubById, search} from "@/api/document/purchase/order"
    import {elError} from "@/utils/message"

    export default {
--- a/vue/src/views/purchase/inbound/index.vue
+++ b/vue/src/views/purchase/inbound/index.vue
@ -108,7 +108,7 @@
    import SearchForm from '@/components/SearchForm'
    import SearchFormItem from "@/components/SearchForm/SearchFormItem"
    import documentTableMixin from '@/mixins/bizDocumentTableMixin'
-    import {del, getSubById, search} from "@/api/purchase/inbound"
+    import {del, getSubById, search} from "@/api/document/purchase/inbound"

    export default {
        name: "purchaseInbound",
--- a/vue/src/views/purchase/order/components/CategorySelector.vue
+++ b/vue/src/views/purchase/order/components/CategorySelector.vue
@ -10,7 +10,7 @@
 </template>

 <script>
-    import {getAllCategories} from "@/api/system/category"
+    import {getAll} from "@/api/system/category"
    import {elError} from "@/utils/message"

    export default {
@ -30,7 +30,7 @@
        methods: {
            init() {
                if (this.selectableCategories.length > 0) return
-                getAllCategories()
+                getAll()
                    .then(data => this.$store.commit('dataCache/categories', data))
            },
            change(v) {
--- a/vue/src/views/purchase/order/components/EditDialog.vue
+++ b/vue/src/views/purchase/order/components/EditDialog.vue
@ -136,7 +136,7 @@
    import SupplierSelector from './SupplierSelector'
    import CategorySelector from './CategorySelector'
    import bizDocumentDialogMixin from "@/mixins/bizDocumentDialogMixin"
-    import {add, commit, getById, pass, reject, update, withdraw} from "@/api/purchase/order"
+    import {add, commit, getById, pass, reject, update, withdraw} from "@/api/document/purchase/order"
    import {isEmpty} from "@/utils"
    import {plus, mul} from "@/utils/math"
    import {isInteger} from "@/utils/validate"
--- a/vue/src/views/purchase/order/index.vue
+++ b/vue/src/views/purchase/order/index.vue
@ -134,7 +134,7 @@
    import SearchForm from '@/components/SearchForm'
    import SearchFormItem from "@/components/SearchForm/SearchFormItem"
    import documentTableMixin from '@/mixins/bizDocumentTableMixin'
-    import {del, getSubById, search} from "@/api/purchase/order"
+    import {del, getSubById, search} from "@/api/document/purchase/order"

    export default {
        name: "purchaseOrder",
--- a/vue/src/views/sell/order/components/EditDialog.vue
+++ b/vue/src/views/sell/order/components/EditDialog.vue
@ -129,7 +129,7 @@
    import StockSelector from './StockSelector'
    import CustomerSelector from './CustomerSelector'
    import bizDocumentDialogMixin from "@/mixins/bizDocumentDialogMixin"
-    import {add, commit, getById, pass, reject, update, withdraw} from "@/api/sell/order"
+    import {add, commit, getById, pass, reject, update, withdraw} from "@/api/document/sell/order"
    import {isEmpty} from "@/utils"
    import {mul, plus} from "@/utils/math"
    import {isInteger} from "@/utils/validate"
--- a/vue/src/views/sell/order/index.vue
+++ b/vue/src/views/sell/order/index.vue
@ -140,7 +140,7 @@
    import SearchForm from '@/components/SearchForm'
    import SearchFormItem from "@/components/SearchForm/SearchFormItem"
    import documentTableMixin from '@/mixins/bizDocumentTableMixin'
-    import {del, getSubById, search} from "@/api/sell/order"
+    import {del, getSubById, search} from "@/api/document/sell/order"

    export default {
        name: "sellOrder",
--- a/vue/src/views/sell/outbound/components/EditDialog.vue
+++ b/vue/src/views/sell/outbound/components/EditDialog.vue
@ -110,8 +110,8 @@
    import StockSelector from "./StockSelector"
    import bizDocumentDialogMixin from "@/mixins/bizDocumentDialogMixin"
    import {getDetailById as getStockDetail} from "@/api/stock/current"
-    import {getSubById as getParentSubById} from "@/api/sell/order"
-    import {add, commit, getById, pass, reject, update, withdraw} from "@/api/sell/outbound"
+    import {getSubById as getParentSubById} from "@/api/document/sell/order"
+    import {add, commit, getById, pass, reject, update, withdraw} from "@/api/document/sell/outbound"
    import {isEmpty} from "@/utils"
    import {plus, sub} from "@/utils/math"
    import {isInteger} from "@/utils/validate"
--- a/vue/src/views/sell/outbound/components/OrderSelector.vue
+++ b/vue/src/views/sell/outbound/components/OrderSelector.vue
@ -69,7 +69,7 @@
    import LinerProgress from '@/components/LinerProgress'
    import dialogMixin from "@/mixins/dialogMixin"
    import tableMixin from '@/mixins/tablePageMixin'
-    import {getSubById, search} from "@/api/sell/order"
+    import {getSubById, search} from "@/api/document/sell/order"
    import {elError} from "@/utils/message"

    export default {
--- a/vue/src/views/sell/outbound/index.vue
+++ b/vue/src/views/sell/outbound/index.vue
@ -112,7 +112,7 @@
    import SearchForm from '@/components/SearchForm'
    import SearchFormItem from "@/components/SearchForm/SearchFormItem"
    import documentTableMixin from '@/mixins/bizDocumentTableMixin'
-    import {del, getSubById, search} from "@/api/sell/outbound"
+    import {del, getSubById, search} from "@/api/document/sell/outbound"

    export default {
        name: "sellOutbound",
--- a/vue/src/views/stock/current/index.vue
+++ b/vue/src/views/stock/current/index.vue
@ -72,15 +72,13 @@
    import SearchFormItem from "@/components/SearchForm/SearchFormItem"
    import CategoryTree from '@/bizComponents/CategoryTree'
    import DetailDialog from "./DetailDialog"
-    import {search} from "@/api/stock/current"
+    import {baseUrl, search} from "@/api/stock/current"
    import {isEmpty, debounce} from "@/utils"
    import {plus} from "@/utils/math"
    import {exportExcel} from "@/utils/excel"
    import {getNodeId} from "@/utils/tree"
    import tableMixin from '@/mixins/tablePageMixin'

-    const baseUrl = '/stock/current'
-
    export default {
        name: "currentStock",

@ -168,7 +166,7 @@
            },

            downloadExcel() {
-                exportExcel(baseUrl + '/export', this.mergeSearchForm(), this.excel)
+                exportExcel(`${baseUrl}/export`, this.mergeSearchForm(), this.excel)
            },

            nodeClick(obj) {
--- a/vue/src/views/system/category/components/Form.vue
+++ b/vue/src/views/system/category/components/Form.vue
@ -39,7 +39,7 @@
 <script>
    import {isEmpty, mergeObj, waitUntilSuccess} from '@/utils'
    import {elConfirm} from "@/utils/message"
-    import {addCategory, updateCategory} from "@/api/system/category"
+    import {add, update} from "@/api/system/category"

    export default {
        props: ['list'],
@ -118,7 +118,7 @@
                this.$refs.form.validate(v => {
                    if (!v) return
                    elConfirm(this.confirmMessage)
-                        .then(() => this.type === 'add' ? addCategory(this.form) : updateCategory(this.form))
+                        .then(() => this.type === 'add' ? add(this.form) : update(this.form))
                        .then(() => {
                            this.$emit('commit-success', this.type === 'add' ? '添加成功' : '修改成功')
                            this.cancel()
--- a/vue/src/views/system/category/components/List.vue
+++ b/vue/src/views/system/category/components/List.vue
@ -15,7 +15,7 @@
 <script>
    import {isEmpty, waitUntilSuccess} from '@/utils'
    import {elConfirm, elError, elSuccess} from "@/utils/message"
-    import {delCategory, getAllCategories} from "@/api/system/category"
+    import {del, getAll} from "@/api/system/category"
    import ContextMenu from "@/components/ContextMenu"
    import ContextMenuItem from "@/components/ContextMenu/ContextMenuItem"
    import CategoryTree from '@/bizComponents/CategoryTree'
@ -50,7 +50,7 @@
                this.loading = true
                this.currentCategory = null
                this.contextmenu.show = false
-                getAllCategories()
+                getAll()
                    .then(data => this.$store.commit('dataCache/categories', data))
                    .finally(() => this.loading = false)
            },
@ -77,7 +77,7 @@
                elConfirm(`确认删除【${this.currentCategory.name}】分类？`)
                    .then(() => {
                        this.loading = true
-                        return delCategory({id: this.currentCategory.id, name: this.currentCategory.name})
+                        return del({id: this.currentCategory.id, name: this.currentCategory.name})
                    })
                    .then(() => this.commitSuccess('删除成功'))
            },
--- a/vue/src/views/system/supplier/EditDialog.vue
+++ b/vue/src/views/system/supplier/EditDialog.vue
@ -13,7 +13,6 @@
            </el-form-item>
            <el-form-item label="行政区域：" prop="region_name">
                <region-selector
-                        type="tree"
                        :value="form.region_name"
                        :readonly="!canEdit"
                        @clear="clearRegion"
--- a/vue/src/views/system/supplier/index.vue
+++ b/vue/src/views/system/supplier/index.vue
@ -6,7 +6,6 @@
            </search-form-item>
            <search-form-item label="行政区域：">
                <region-selector
-                        type="tree"
                        :value="temp.region_name"
                        limit
                        :limit-api="getLimitRegion"