diff --git a/src/router/views/index.js b/src/router/views/index.js index a6cb9909..4c2b15ef 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -629,6 +629,25 @@ export default [ }, ], }, + { + path: '/distribution/signfor/distributionSignforedt', + component: Layout, + redirect: '/distribution/distributionSignforedt', + children: [ + { + path: '/distribution/signfor/distributionSignforedt', + name: '签收查看', + meta: { + i18n: 'dict', + }, + props: route => ({ + name: route.query.name, + id: route.query.id + }), + component: () => import('@/views/distribution/signfor/distributionSignforedt.vue'), + }, + ], + }, // { // path: '/distribution/inventory/distributionPrints', // component: Layout, diff --git a/src/store/modules/common.js b/src/store/modules/common.js index efe7f966..52d3d2db 100644 --- a/src/store/modules/common.js +++ b/src/store/modules/common.js @@ -10,7 +10,7 @@ const common = { isSearch: false, isRefresh: true, isLock: getStore({ name: 'isLock' }), - themeName: getStore({ name: 'themeName' }) || 'theme-hey', + themeName: getStore({ name: 'themeName' }) || 'default', lockPasswd: getStore({ name: 'lockPasswd' }) || '', website: website, setting: website.setting, diff --git a/src/styles/css/beautiful.css b/src/styles/css/beautiful.css index 45cc45d5..06b882c2 100644 --- a/src/styles/css/beautiful.css +++ b/src/styles/css/beautiful.css @@ -7,7 +7,7 @@ .theme-beautiful .avue-sidebar .el-menu-item i, .theme-beautiful .avue-sidebar .el-menu-item span, .theme-beautiful .avue-sidebar .el-sub-menu__title i, .theme-beautiful .avue-sidebar .el-sub-menu__title span { color: #fff; } -.theme-beautiful .avue-sidebar .el-menu-item .is-active, .theme-beautiful .avue-sidebar .el-sub-menu__title .is-active { +.theme-beautiful .avue-sidebar .el-menu-item , .theme-beautiful .avue-sidebar .el-sub-menu__title .is-active { background: #399efd !important; } .theme-beautiful .avue-sidebar .el-menu-item:hover, .theme-beautiful .avue-sidebar .el-menu-item.is-active, .theme-beautiful .avue-sidebar .el-sub-menu__title:hover, .theme-beautiful .avue-sidebar .el-sub-menu__title.is-active { diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index e2213703..0d9a6ca8 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -6,7 +6,7 @@ position: relative; height: 100%; position: relative; - background-color: #031527; + background-color: #172e60; transition: width .2s; box-sizing: border-box; box-shadow: 2px 0 6px rgba(0, 21, 41, .35); @@ -46,10 +46,11 @@ } &:hover { - background: transparent; - + // background: transparent; + background-color: #2f4370; i, span { - color: #fff; + color: #d3832a; + } } @@ -60,14 +61,14 @@ left: 0; bottom: 0; width: 4px; - background: #172e60; + background-color: #4378eb; position: absolute; } - background-color: rgba(0, 0, 0, .8); + background-color: #2f4370; i, span { - color: #fff; + color: #d3832a; } } } diff --git a/src/styles/theme/beautiful.scss b/src/styles/theme/beautiful.scss index 3828abaa..9c7c1b79 100644 --- a/src/styles/theme/beautiful.scss +++ b/src/styles/theme/beautiful.scss @@ -8,7 +8,8 @@ .el-menu-item, .el-sub-menu__title { i, span { - color: #fff + color: #fff; + } .is-active { diff --git a/src/styles/top.scss b/src/styles/top.scss index 5481f333..c0d717be 100644 --- a/src/styles/top.scss +++ b/src/styles/top.scss @@ -12,10 +12,13 @@ .el-menu-item { i, span { font-size: 13px; + // background-color: #d3832a; } } } - +.el-menu-item>.is-active{ + background-color: #d3832a !important; +} .avue-breadcrumb { height: 100%; @@ -116,7 +119,7 @@ .avue-logo { height: $top_height; line-height: $top_height; - background-color: #031527; + background-color: #172e60; font-size: 20px; overflow: hidden; box-sizing: border-box; diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue index bf7b24b5..0dbcda7b 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryList.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue @@ -314,7 +314,7 @@ export default { mounted () { this.queryDictionary(); this.init(); - /** + /** * 初始化获取本地缓存的编辑隐藏的列表 * 固定搭配，不能更改 */ @@ -416,7 +416,7 @@ export default { this.columnList = newarr; this.$functions.setStorage(window.location.pathname+'sortlist', headarr); } - + }, selectionsc(value) { console.log("进来了>>>>>>>>>>>>>",value); diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue index 2d8d3e62..70f2111f 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue @@ -16,7 +16,7 @@ - 新 增 + 新 增 商 配
@@ -141,15 +141,15 @@ export default { // 选择行 selectionList: [], columnList: [ - // { - // prop: '', - // label: '序号', - // type: 0, - // values: '', - // width: 55, - // checkarr: [], - // fixed: true, - // }, + { + prop: '', + label: '序号', + type: 0, + values: '', + width: 55, + checkarr: [], + fixed: true, + }, { prop: 'trainNumber', label: '车次', @@ -303,7 +303,7 @@ export default { mounted () { this.queryDictionary(); this.init(); - /** + /** * 初始化获取本地缓存的编辑隐藏的列表 * 固定搭配，不能更改 */ @@ -405,7 +405,7 @@ export default { this.columnList = newarr; this.$functions.setStorage(window.location.pathname+'sortlist', headarr); } - + }, selectionsc(value) { console.log("进来了>>>>>>>>>>>>>",value); diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 34c8a405..998ac079 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -28,7 +28,8 @@ 装卸班组：{{deliverydata.loadingTeamName}} - {{deliverydata.loadingTeamType}} + + 装 作业时间 @@ -37,10 +38,10 @@ 创建时间：{{deliverydata.createTime}} - 备货时间：{{deliverydata.lead_time}} + 备货时间：{{deliverydata.loadTime}} - 装车时间：{{deliverydata.loading_time}} + 装车时间：{{deliverydata.loadingTime}} 订单列表 diff --git a/vite.config.js b/vite.config.js index d19e7956..b93c008b 100644 --- a/vite.config.js +++ b/vite.config.js @@ -12,7 +12,7 @@ export default ({ mode, command }) => { port: 2888, proxy: { '/api': { - target: 'http://192.168.2.29:13000', + target: 'http://192.168.2.11:8889', //target: 'http://test3.javablade.com', changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''),