diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index 6589429..9fc000b 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -461,4 +461,13 @@ a:hover{ #0052a3 ) !important; } - +.status-bar { + background: #2196F3; + color: white; + padding: 8px 12px; + display: flex; + justify-content: space-between; + font-size: 14px; + flex-shrink: 0; + margin-bottom: 2px; +} diff --git a/src/router/index.js b/src/router/index.js index 2a508a0..a7a7fb6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -23,6 +23,10 @@ const _import = require('./import-' + process.env.NODE_ENV) const globalRoutes = [ { path: '/404', component: _import('common/404'), name: '404', meta: { title: '404未找到' } }, { path: '/login', component: _import('common/login'), name: 'login', meta: { title: '登录' } }, + {path: "/porecv",name: "porecv", + component: resolve => require(["@/views/modules/recv/po-recv.vue"], resolve), + meta: { transition: 'instant' ,preload: true,keepAlive: true} + }, {path: "/recv",name: "recv", component: resolve => require(["@/views/modules/recv/recv.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true} diff --git a/src/views/common/login.vue b/src/views/common/login.vue index a6a5b79..60158fa 100644 --- a/src/views/common/login.vue +++ b/src/views/common/login.vue @@ -3,8 +3,9 @@
- - + + +

仓储PDA系统

@@ -199,6 +200,11 @@ export default { text-align: center; margin-bottom: 2rem; } +.logo-area svg { + width: 64px; + height: 64px; + filter: drop-shadow(0 2px 4px rgba(33, 150, 243, 0.3)); +} .logo-icon { width: 60px; diff --git a/src/views/main.vue b/src/views/main.vue index 7577565..3259c5b 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -40,11 +40,20 @@ export default { batteryLevel: 78, activeIndex: null, buttons: [ - { icon: '📦', label: '入库', color: '#4CAF50', action: 'stockIn',to:'recv' }, - { icon: '🚚', label: '出库', color: '#2196F3', action: 'stockOut',to:'recv' }, - { icon: '🔍', label: '查询', color: '#FF9800', action: 'search' ,to:'recv' }, - { icon: '📊', label: '盘点', color: '#9C27B0', action: 'inventory' ,to:'recv' }, - { icon: '🔄', label: '调拨', color: '#607D8B', action: 'transfer' ,to:'recv' }, + { icon: '📦', label: '采购入库', color: '#4CAF50', action: 'stockIn',to:'porecv' }, + { icon: '🏷️', label: '载具管理', color: '#0097A7', action: 'stockOut',to:'recv' }, + { icon: '📦', label: '生产订单发料', color: '#8BC34A', action: 'stockIn',to:'porecv' }, + { icon: '📥', label: '生产订单入库', color: '#2196F3', action: 'stockIn',to:'porecv' }, + { icon: '📤', label: '委外PO发料', color: '#8BC34A', action: 'stockIn',to:'porecv' }, + { icon: '🚚', label: '销售订单发货', color: '#2196F3', action: 'stockOut',to:'recv' }, + { icon: '↔️', label: '其他出入库', color: '#607D8B', action: 'stockIn',to:'porecv' }, + { icon: '🚚', label: 'Material Requisition发料', color: '#2196F3', action: 'stockIn',to:'porecv' }, + { icon: '📋', label: '盘点', color: '#2196F3', action: 'inventory' ,to:'recv' }, + { icon: '↩️', label: '销售退货', color: '#FF9800', action: 'transfer' ,to:'recv' }, + { icon: '🚚', label: '运输任务', color: '#3F51B5', action: 'label' ,to:'recv' }, + + + /*{ icon: '🔄', label: '调拨', color: '#607D8B', action: 'transfer' ,to:'recv' }, { icon: '📌', label: '标签', color: '#795548', action: 'label' ,to:'recv' }, { icon: '📷', label: '扫码', color: '#3F51B5', action: 'scan' ,to:'recv' }, { icon: '📁', label: '同步', color: '#00BCD4', action: 'sync' ,to:'recv' }, @@ -58,7 +67,7 @@ export default { { icon: '📁', label: '同步', color: '#00BCD4', action: 'sync' ,to:'recv' }, { icon: '⚙️', label: '设置', color: '#9E9E9E', action: 'settings' ,to:'recv' }, { icon: '👥', label: '团队', color: '#CDDC39', action: 'team' ,to:'recv' }, - { icon: '📈', label: '统计', color: '#FF5722', action: 'stats',to:'recv' }, + { icon: '📈', label: '统计', color: '#FF5722', action: 'stats',to:'recv' },*/ /* { icon: '❌', label: '退出', color: '#f1b2b2', action: 'help' ,to:'recv' }*/ ] } @@ -97,22 +106,15 @@ export default { }, // 退出 logoutHandle() { - this.$confirm('确定进行[退出]操作?', '提示', { - confirmButtonText: '确认', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - this.$http({ - url: this.$http.adornUrl('/sys/logout'), - method: 'post', - data: this.$http.adornData() - }).then(({data}) => { - if (data && data.code === 0) { - //clearLoginInfo() - this.$router.push({name: 'login'}) - } - }) - }).catch(() => { + this.$http({ + url: this.$http.adornUrl('/sys/logout'), + method: 'post', + data: this.$http.adornData() + }).then(({data}) => { + if (data && data.code === 0) { + //clearLoginInfo() + this.$router.push({name: 'login'}) + } }) }, } @@ -135,16 +137,6 @@ export default { overflow: hidden; } -.status-bar { - background: #2c3e50; - color: white; - padding: 8px 12px; - display: flex; - justify-content: space-between; - font-size: 14px; - flex-shrink: 0; -} - .button-scroll-container { flex: 1; overflow-y: auto; @@ -155,7 +147,7 @@ export default { .button-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(var(--button-size), 1fr)); - gap: 16px; + gap: 14px; padding-bottom: 20px; } @@ -208,7 +200,7 @@ export default { font-size: 30px; } .button-label { - font-size: 24px; + font-size: 18px; } } diff --git a/src/views/modules/recv/po-recv.vue b/src/views/modules/recv/po-recv.vue new file mode 100644 index 0000000..343d5e7 --- /dev/null +++ b/src/views/modules/recv/po-recv.vue @@ -0,0 +1,188 @@ + + + + + + diff --git a/src/views/modules/recv/recv.vue b/src/views/modules/recv/recv.vue index d835f89..8ab8624 100644 --- a/src/views/modules/recv/recv.vue +++ b/src/views/modules/recv/recv.vue @@ -1,11 +1,14 @@