diff --git a/.DS_Store b/.DS_Store index 3fa46fc..b3086b4 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.env b/.env index 9432c2d..ea1b018 100644 --- a/.env +++ b/.env @@ -1,8 +1,7 @@ NODE_ENV=production VUE_APP_PREVIEW=false # -# VUE_APP_API_BASE_URL=https://douhuo.douhuofalv.com/agent +VUE_APP_API_BASE_URL=https://api.shui.shuiganying.com/api # -# VUE_APP_API_BASE_URL=https://api.douhuotest.douhuofalv.com/agent -VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api +# VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api diff --git a/.env.development b/.env.development index 7f4af06..20fb007 100644 --- a/.env.development +++ b/.env.development @@ -1,16 +1,15 @@ ### # @Author: Aimee~ # @Date: 2023-05-11 11:17:32 - # @LastEditTime: 2023-07-28 09:49:14 - # @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git - # @FilePath: /douhuo-agent/.env.development + # @LastEditTime: 2023-12-12 15:52:34 + # @LastEditors: Aimee + # @FilePath: /water_dealer-agent/.env.development # @Description: 正式环境测试环境更改 ### NODE_ENV=development VUE_APP_PREVIEW=true # -# VUE_APP_API_BASE_URL=https://douhuo.douhuofalv.com/agent +VUE_APP_API_BASE_URL=https://api.shui.shuiganying.com/api -# -# VUE_APP_API_BASE_URL=https://api.douhuotest.douhuofalv.com/agent -VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api +# +# VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api \ No newline at end of file diff --git a/.env.preview b/.env.preview index 9c2508e..6ce5ce8 100644 --- a/.env.preview +++ b/.env.preview @@ -1,16 +1,15 @@ ### # @Author: Aimee~ # @Date: 2023-05-11 11:17:32 - # @LastEditTime: 2023-07-28 10:09:13 - # @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git - # @FilePath: /douhuo-agent/.env.preview + # @LastEditTime: 2023-12-12 15:52:50 + # @LastEditors: Aimee + # @FilePath: /water_dealer-agent/.env.preview # @Description: ### NODE_ENV=production VUE_APP_PREVIEW=true # -# VUE_APP_API_BASE_URL=https://douhuo.douhuofalv.com/agent +VUE_APP_API_BASE_URL=https://api.shui.shuiganying.com/api -# -# VUE_APP_API_BASE_URL=https://api.douhuotest.douhuofalv.com/agent -VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api \ No newline at end of file +# +# VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api \ No newline at end of file diff --git a/README.md b/README.md index 928e89d..333a412 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,13 @@ +# 组件 +ant-design-vue # 水感应 分公司 中台(数据展示及分公司数据) 线上中台 打包后文件件需要有一个 static 文件存放 '/static/vue.min.js' @@ -17,10 +19,12 @@ # node 版本 node-v14.21.3 # 水感应测试-存放路径 -/home/wwwroot/Development/Douhuo/agent + # 水感应正式-存放路径 -oss://douhuo-agent/ +OSS_ACCESS_KEY=LTAI5tHYDoN6trRhsBmRvD7h +OSS_SECRET_KEY=k3e6veUY45WM8QMMMyRKYr0KjiOXzC +oss://sgy-agent-web/ # 运行 yarn run dev # 打包 yarn build diff --git a/public/index.html b/public/index.html index c2d3bfa..271248e 100644 --- a/public/index.html +++ b/public/index.html @@ -1,3 +1,11 @@ + @@ -6,7 +14,7 @@ - 水感应经销商管理后台 WaterFeel.Vip + 水感应分公司管理 WaterFeel.Vip <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %> @@ -19,7 +27,7 @@
-

水感应经销商管理后台

+

水感应分公司管理

diff --git a/src/api/statistical.js b/src/api/statistical.js index 99c5ffb..7eaca4b 100644 --- a/src/api/statistical.js +++ b/src/api/statistical.js @@ -1,8 +1,8 @@ /* * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git * @Date: 2023-07-07 14:02:05 - * @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git - * @LastEditTime: 2023-07-31 13:58:48 + * @LastEditors: Aimee + * @LastEditTime: 2023-12-12 11:47:55 * @FilePath: /water_dealer-agent/src/api/statistical.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -10,13 +10,18 @@ import request from '@/utils/request' // 获取 首页数据看板数据 -export function getMiddlesUserDatas (item) { +export function getMiddlesUserDatas (item, value) { + const params = { + time_type: item + } + if (value !== null) { + params.start_at = value[0] + params.end_at = value[1] + } return request({ url: '/middles/user/datas', method: 'get', - params: { - time_type: item - } + params: params }) } diff --git a/src/config/defaultSettings.js b/src/config/defaultSettings.js index 9484582..fd3c634 100644 --- a/src/config/defaultSettings.js +++ b/src/config/defaultSettings.js @@ -1,9 +1,9 @@ /* * @Author: Aimee~ * @Date: 2022-06-12 15:05:53 - * @LastEditTime: 2022-06-13 09:33:54 + * @LastEditTime: 2023-12-12 16:13:22 * @LastEditors: Aimee - * @FilePath: /gl-agent/src/config/defaultSettings.js + * @FilePath: /water_dealer-agent/src/config/defaultSettings.js * @Description: 修改默认配置 */ /** @@ -31,7 +31,7 @@ var defaultValue = { menu: { locale: true }, - title: ' 水感应经销商管理后台', + title: ' 水感应分公司管理', pwa: false, production: process.env.NODE_ENV === 'production' && process.env.VUE_APP_PREVIEW !== 'true' } diff --git a/src/config/router.config.js b/src/config/router.config.js index d5f5118..af8f28b 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -1,9 +1,9 @@ /* * @Author: Aimee~ * @Date: 2023-05-11 12:02:45 - * @LastEditTime: 2023-07-05 15:03:09 + * @LastEditTime: 2023-12-12 16:13:30 * @LastEditors: Aimee - * @FilePath: /douhuo-agent/src/config/router.config.js + * @FilePath: /water_dealer-agent/src/config/router.config.js * @Description: 路由 */ import { @@ -16,7 +16,7 @@ import user from './routes/user' import coupon from './routes/coupon' import permission from './routes/permission' import sales from './routes/sales' -import cityExperienceOfficer from './routes/cityExperienceOfficer' +// import cityExperienceOfficer from './routes/cityExperienceOfficer' export const asyncRouterMap = [{ path: '/', @@ -38,7 +38,7 @@ export const asyncRouterMap = [{ } }, ...detail, - ...cityExperienceOfficer, + // ...cityExperienceOfficer, ...stock, ...sales, ...user, @@ -67,7 +67,7 @@ export const constantRouterMap = [{ name: 'Login', component: () => import('@/views/auth/Login'), meta: { - title: '登陆水感应经销商系统' + title: '登陆水感应分公司管理' } }, { diff --git a/src/config/routes/sales.js b/src/config/routes/sales.js index 433a739..d6701b9 100644 --- a/src/config/routes/sales.js +++ b/src/config/routes/sales.js @@ -1,3 +1,11 @@ +/* + * @Author: Aimee~ + * @Date: 2023-10-30 15:25:23 + * @LastEditTime: 2023-12-12 11:04:30 + * @LastEditors: Aimee + * @FilePath: /water_dealer-agent/src/config/routes/sales.js + * @Description: 零售订单 + */ import { RouteView } from '@/layouts' @@ -6,7 +14,7 @@ export default [{ path: '/sales', name: 'StockIndex', meta: { - title: '销售管理', + title: '订单管理', icon: 'bank' }, component: RouteView, @@ -15,7 +23,7 @@ export default [{ path: '/sales/online', name: 'SalesOnline', meta: { - title: '线上零售订单', + title: '零售订单', icon: 'unordered-list' }, component: () => import('@/views/sales/Online') @@ -24,7 +32,7 @@ export default [{ path: '/sales/stock', name: 'SalesStock', meta: { - title: '线上进货订单', + title: '进货订单', icon: 'unordered-list' }, component: () => import('@/views/sales/OnStock') diff --git a/src/config/routes/stock.js b/src/config/routes/stock.js index 27972bf..f835b42 100644 --- a/src/config/routes/stock.js +++ b/src/config/routes/stock.js @@ -1,3 +1,11 @@ +/* + * @Author: Aimee~ + * @Date: 2023-10-30 15:25:23 + * @LastEditTime: 2023-12-12 11:02:36 + * @LastEditors: Aimee + * @FilePath: /water_dealer-agent/src/config/routes/stock.js + * @Description: 库存管理 + */ import { RouteView } from '@/layouts' @@ -11,74 +19,72 @@ export default [{ }, component: RouteView, children: [ - { - path: '/stock/ins', - name: 'StockIns', + { + path: '/stock/dealer/in', + name: 'DealerIn', + component: () => import('@/views/stock/DealerIn'), meta: { - title: '分公司库存管理', - icon: 'control' - }, - component: RouteView, - redirect: '/stock/in', - children: [ - { - path: '/stock/in', - name: 'StockIn', - component: () => import('@/views/stock/In'), - meta: { - title: '入库管理', - icon: 'import' - } - }, - { - path: '/sales/offline', - name: 'SalesOffline', - meta: { - title: '线下出货列表', - icon: 'unordered-list' - }, - component: () => import('@/views/sales/Offline') - } - // { - // path: '/stock/out', - // name: 'StockOut', - // component: () => import('@/views/stock/Out'), - // meta: { - // title: '出库管理', - // icon: 'export' - // } - // } - ] - }, - { - path: '/stock/dealer', - name: 'StockDealer', + title: '经销商入库管理', + icon: 'import' + } + }, + { + path: '/stock/dealer/out', + name: 'DealerOut', + component: () => import('@/views/stock/DealerOut'), meta: { - title: '经销商库存管理', - icon: 'usergroup-add' - }, - component: RouteView, - redirect: '/stock/dealer/in', - children: [ - { - path: '/stock/dealer/in', - name: 'DealerIn', - component: () => import('@/views/stock/DealerIn'), - meta: { - title: '入库管理', - icon: 'import' - } - }, - { - path: '/stock/dealer/out', - name: 'DealerOut', - component: () => import('@/views/stock/DealerOut'), - meta: { - title: '出库管理', - icon: 'export' - } - } - ] - } + title: '经销商出库管理', + icon: 'export' + } + } + // { + // path: '/stock/ins', + // name: 'StockIns', + // meta: { + // title: '分公司库存管理', + // icon: 'control' + // }, + // component: RouteView, + // redirect: '/stock/in', + // children: [ + // { + // path: '/stock/in', + // name: 'StockIn', + // component: () => import('@/views/stock/In'), + // meta: { + // title: '入库管理', + // icon: 'import' + // } + // }, + // { + // path: '/sales/offline', + // name: 'SalesOffline', + // meta: { + // title: '线下出货列表', + // icon: 'unordered-list' + // }, + // component: () => import('@/views/sales/Offline') + // } + // // { + // // path: '/stock/out', + // // name: 'StockOut', + // // component: () => import('@/views/stock/Out'), + // // meta: { + // // title: '出库管理', + // // icon: 'export' + // // } + // // } + // ] + // }, + // { + // path: '/stock/dealer', + // name: 'StockDealer', + // meta: { + // title: '经销商入库管理', + // icon: 'usergroup-add' + // }, + // component: RouteView, + // redirect: '/stock/dealer/in' + // } ] }] diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index c6a1fbc..fc521cf 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -18,7 +18,7 @@ @@ -61,7 +61,7 @@ export default { menus: [], // 侧栏收起状态 collapsed: false, - title: ' 水感应代理商 ', + title: ' 水感应分公司管理 ', logo: '', settings: { // 布局类型 diff --git a/src/layouts/UserLayout.vue b/src/layouts/UserLayout.vue index d04cf84..8894d04 100644 --- a/src/layouts/UserLayout.vue +++ b/src/layouts/UserLayout.vue @@ -6,7 +6,7 @@
欢迎登录 - 欢迎使用水感应经销商端 + 欢迎使用水感应分公司管理
diff --git a/src/utils/screenLog.js b/src/utils/screenLog.js index 0497944..b86fcbf 100644 --- a/src/utils/screenLog.js +++ b/src/utils/screenLog.js @@ -1,14 +1,22 @@ +/* + * @Author: Aimee~ + * @Date: 2023-08-03 17:36:19 + * @LastEditTime: 2023-12-12 16:13:49 + * @LastEditors: Aimee + * @FilePath: /water_dealer-agent/src/utils/screenLog.js + * @Description: 关键字 + */ /* eslint-disable */ export const printANSI = () => { // console.clear() // ASCII - ANSI Shadow - let text = `水感应大数据综合管理后台 + let text = `水感应分公司管理 PUBLISHED: 1.0.0-10.0.0 EMAIL: yuzhankeji@163.com CREATED_AT: ${BUILD_DATE}` console.log(`%c${text}`, 'color: #fc4d50') console.log(`%c可以植入广告`, 'color: #fc4d50') -console.log('%c感谢使用 水感应大数据综合管理后台', 'color: #fc4d50; font-size: 14px; font-family: Hiragino Sans GB,Microsoft YaHei,\\\\5FAE\\8F6F\\96C5\\9ED1,Droid Sans Fallback,Source Sans,Wenquanyi Micro Hei,WenQuanYi Micro Hei Mono,WenQuanYi Zen Hei,Apple LiGothic Medium,SimHei,ST Heiti,WenQuanYi Zen Hei Sharp,sans-serif;') -console.log('%cThanks for DouHuo - Vip!', 'color: #fc4d50; font-size: 14px; font-weight: 300; text-shadow:#000 1px 0 0,#000 0 1px 0,#000 -1px 0 0,#000 0 -1px 0;') +console.log('%c感谢使用 水感应分公司管理', 'color: #fc4d50; font-size: 14px; font-family: Hiragino Sans GB,Microsoft YaHei,\\\\5FAE\\8F6F\\96C5\\9ED1,Droid Sans Fallback,Source Sans,Wenquanyi Micro Hei,WenQuanYi Micro Hei Mono,WenQuanYi Zen Hei,Apple LiGothic Medium,SimHei,ST Heiti,WenQuanYi Zen Hei Sharp,sans-serif;') +console.log('%cThanks for ShuiGanYing - Vip!', 'color: #fc4d50; font-size: 14px; font-weight: 300; text-shadow:#000 1px 0 0,#000 0 1px 0,#000 -1px 0 0,#000 0 -1px 0;') } diff --git a/src/views/home/Index.vue b/src/views/home/Index.vue index 91f8c83..0a4a9a7 100644 --- a/src/views/home/Index.vue +++ b/src/views/home/Index.vue @@ -1,10 +1,18 @@ +