From f9f3a5c59ac096a26129ce286a14a84fd727d92d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Thu, 18 Sep 2025 15:41:42 +0800 Subject: [PATCH] 1 --- package.json | 5 +- src/assets/scss/global.scss | 303 ++++++++++++++++++ src/router/index.js | 3 + src/views/main.vue | 16 + .../modules/automatedWarehouse/callOut.vue | 57 ++++ src/views/modules/automatedWarehouse/demo.vue | 57 ++++ 6 files changed, 439 insertions(+), 2 deletions(-) create mode 100644 src/views/modules/automatedWarehouse/callOut.vue create mode 100644 src/views/modules/automatedWarehouse/demo.vue diff --git a/package.json b/package.json index 76292f1..50220c2 100644 --- a/package.json +++ b/package.json @@ -27,17 +27,18 @@ "gulp-replace": "1.0.0", "gulp-shell": "0.8.0", "lodash": "4.17.5", + "moment": "^2.30.1", "node-sass": "4.14.1", "npm": "^6.9.0", "pubsub-js": "^1.9.3", "sass-loader": "6.0.6", "svg-sprite-loader": "3.7.3", + "vant": "^2.12.54", "vue": "2.5.16", "vue-cookie": "1.1.4", "vue-i18n": "^8.27.0", "vue-router": "3.0.1", - "vuex": "3.0.1", - "vant": "^2.12.54" + "vuex": "3.0.1" }, "devDependencies": { "autoprefixer": "7.1.2", diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index 140aeaf..0839fac 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -540,3 +540,306 @@ a:hover{ } } +//------------------0918 +.pda-container { + background: #f5f5f5; + min-height: 100vh; + padding-bottom: 20px; +} + +/* 头部栏 - 参考原有样式 */ +.header-bar { + display: flex; + justify-content: space-between; + align-items: center; + background: #17b3a3; + color: #fff; + padding: 12px 16px; + font-size: 16px; +} + +.header-left { + display: flex; + align-items: center; + cursor: pointer; +} + +.header-left i { + margin-right: 8px; + font-size: 18px; +} + +.header-right { + cursor: pointer; +} + +/* 搜索容器 */ +.search-container { + padding: 12px 16px; + background: white; +} + +.search-container .el-input { + font-size: 16px; +} + +/* RMA明细选择 */ +.rma-list { + padding: 0 16px; +} + +.list-title { + font-size: 16px; + font-weight: bold; + color: #17b3a3; + margin: 12px 0 8px 0; +} + +.rma-row { + margin-bottom: 8px; +} + +.rma-item { + display: flex; + justify-content: space-between; + align-items: center; + padding: 16px; + background: white; + border-radius: 6px; + cursor: pointer; + border: 1px solid #e0e0e0; + min-height: 60px; +} + +.rma-item.selected { + border-color: #17b3a3; + background: #f0f9ff; +} + +.rma-item:active { + background: #e6f7ff; +} + +.item-info { + flex: 1; + display: flex; + flex-direction: column; + align-items: flex-start; +} + +.part-no { + font-size: 16px; + font-weight: bold; + color: #333; + margin-bottom: 4px; +} + +.batch-qty { + font-size: 14px; + color: #666; +} + +.item-status { + font-size: 20px; + color: #17b3a3; +} + +/* 退货明细列表 */ +.return-list-title { + font-size: 16px; + font-weight: bold; + color: #17b3a3; + margin: 12px 16px 8px 16px; +} + +.detail-card { + margin: 0 16px 12px 16px; +} + +.detail-header { + font-weight: bold; + font-size: 15px; + color: #333; + border-left: 4px solid #17b3a3; + padding-left: 8px; +} + +/* 明细信息显示 */ +.detail-info { + margin-bottom: 12px; +} + +.info-row { + display: flex; + justify-content: space-between; + align-items: center; + padding: 6px 0; + border-bottom: 1px solid #f0f0f0; +} + +.info-row:last-child { + border-bottom: none; +} + +.info-label { + font-size: 14px; + color: #666; + font-weight: 500; +} + +.info-value { + font-size: 14px; + color: #333; + font-weight: 500; +} + +/* 包装单元区域 */ +.pack-unit-area { + margin-top: 0; + padding: 12px; + background: #f8f9fa; + border-radius: 6px; +} + +.pack-actions { + margin-bottom: 8px; +} + +.action-group { + margin-bottom: 10px; +} + +.action-group:last-child { + margin-bottom: 0; +} + +.action-title { + font-size: 13px; + color: #17b3a3; + font-weight: 500; + margin-bottom: 6px; +} + +.action-group .el-input { + height: 32px; +} + +.action-group .el-button { + height: 32px; + font-size: 12px; + padding: 8px 12px; +} + +.pack-list { + margin-top: 8px; +} + +.pack-item { + display: flex; + justify-content: space-between; + align-items: center; + padding: 8px; + margin-bottom: 6px; + background: white; + border-radius: 4px; + border: 1px solid #e0e0e0; + font-size: 13px; +} + +.status-ok { + color: #67C23A; + font-weight: bold; + font-size: 16px; +} + +.status-wait { + color: #E6A23C; + font-weight: bold; + font-size: 16px; +} + +.delete-btn { + color: #F56C6C; + padding: 0; + font-size: 12px; +} + +/* 库位区域 */ +.location-section { + margin: 16px; + padding: 16px; + background: white; + border-radius: 6px; +} + +.section-label { + font-size: 16px; + font-weight: bold; + color: #17b3a3; + margin-bottom: 12px; +} + +.location-input { + font-size: 16px; +} + +.location-input .el-input__inner { + height: 44px; + font-size: 16px; +} + +/* 提交按钮 */ +.submit-btn { + width: calc(100% - 32px); + margin: 16px 16px 12px 16px; + height: 44px; + font-size: 16px; + background: #17b3a3; + border-color: #17b3a3; + border-radius: 6px; +} + +.submit-btn:hover { + background: #15a093; + border-color: #15a093; +} + +/* PDA适配 - 增大触摸目标 */ +.el-input__inner { + height: 44px; + font-size: 16px; + padding: 0 15px; +} + +.el-button { + min-height: 40px; + padding: 10px 16px; + font-size: 14px; +} + +.el-button--primary { + background-color: #17b3a3; + border-color: #17b3a3; +} + +.el-button--primary:hover { + background-color: #15a093; + border-color: #15a093; +} + +/* 表单项间距优化 */ +.el-form-item { + margin-bottom: 12px; +} + +.el-form-item__label { + font-size: 14px; + color: #333; + font-weight: 500; +} + +/* 主内容区域 */ +.main-content { + padding-bottom: 12px; +} + diff --git a/src/router/index.js b/src/router/index.js index 511526d..ea48de5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -90,6 +90,9 @@ const globalRoutes = [ // 运输任务 {path: "/transportation",name: "transportation", component: resolve => require(["@/views/modules/transport-task/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + // 立库-Call料 + {path: "/callOut",name: "callOut", component: resolve => require(["@/views/modules/automatedWarehouse/callOut.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + ] // 主入口路由(需嵌套上左右整体布局) diff --git a/src/views/main.vue b/src/views/main.vue index 7c0ea3b..5a5f5a4 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -147,6 +147,22 @@ + +
+
+ + 立库操作 +
+
+ + +
+
diff --git a/src/views/modules/automatedWarehouse/callOut.vue b/src/views/modules/automatedWarehouse/callOut.vue new file mode 100644 index 0000000..3e851be --- /dev/null +++ b/src/views/modules/automatedWarehouse/callOut.vue @@ -0,0 +1,57 @@ + + + + + diff --git a/src/views/modules/automatedWarehouse/demo.vue b/src/views/modules/automatedWarehouse/demo.vue new file mode 100644 index 0000000..3e851be --- /dev/null +++ b/src/views/modules/automatedWarehouse/demo.vue @@ -0,0 +1,57 @@ + + + + +