diff --git a/package.json b/package.json
index 4c09651..3e692bc 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
"babel-polyfill": "6.26.0",
"dayjs": "^1.10.7",
"decimal.js": "^10.3.1",
- "element-ui": "2.8.2",
+ "element-ui": "2.15.14",
"file-saver": "^2.0.5",
"gulp": "4.0.2",
"gulp-concat": "2.6.1",
diff --git a/src/api/po/po.js b/src/api/po/po.js
index 0b0502b..6fca71e 100644
--- a/src/api/po/po.js
+++ b/src/api/po/po.js
@@ -3,3 +3,6 @@ import { createAPI } from "@/utils/httpRequest.js";
// 获取采购单信息
export const getPoList = data => createAPI(`po/getPoList`,'post',data)
+
+// 接收采购单信息
+export const receivePo = data => createAPI(`po/receivePo`,'post',data)
diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss
index 0bd5ad3..f07f287 100644
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@@ -528,3 +528,15 @@ a:hover{
margin-bottom: 10px;
}
+@media screen and (max-width: 600px) {
+ .el-message {
+ top: 40% !important;
+ left: 60% !important;
+ transform: translate(-50%, -50%) !important;
+ max-width: 200px !important; /* 弹窗最大宽度 */
+ width: 50vw !important; /* 或者用百分比宽度,适应屏幕 */
+ padding: 10px 20px; /* 适当调整内边距 */
+ box-sizing: border-box;
+ }
+}
+
diff --git a/src/router/index.js b/src/router/index.js
index 477050f..233e376 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -26,10 +26,19 @@ const globalRoutes = [
{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}},
{path: "/qualifiedStorage",name: "qualifiedStorage", component: resolve => require(["@/views/modules/recv/qualifiedStorage.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
- {path: "/inspectionResults",name: "inspectionResults", component: resolve => require(["@/views/modules/recv/inspectionResults.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
+ {path: "/inspectionResults",name: "inspectionResults",
+ component: resolve => require(["@/views/modules/recv/inspectionResults.vue"], resolve),
+ meta: { transition: 'instant' ,preload: true,keepAlive: true}},
// handlingunit
- {path: "/handlingunit",name: "handlingunit", component: resolve => require(["@/views/modules/handlingunit/handlingunit.vue"], resolve),meta: { transition: 'instant' ,preload: true,keepAlive: true}},
+ // Handling Unit 相关路由,按照上面的格式添加
+ {path: "/handlingunit",name: "handlingunit", component: resolve => require(["@/views/modules/handlingunit/handlingunit.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
+ // Handling Unit 模块下页面
+ {path: "/handlingunit/merge",name: "handlingunit", component: resolve => require(["@/views/modules/handlingunit/mergeHu.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
+ {path: "/handlingunit/pack",name: "handlingunitdetail", component: resolve => require(["@/views/modules/handlingunit/packHu.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
+ {path: "/handlingunit/print",name: "handlingunitdetail2", component: resolve => require(["@/views/modules/handlingunit/printHu.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
+ {path: "/handlingunit/split",name: "handlingunitdetail3", component: resolve => require(["@/views/modules/handlingunit/splitHu.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
+ {path: "/handlingunit/view",name: "handlingunitdetail4", component: resolve => require(["@/views/modules/handlingunit/viewHu.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
// 生产发料
{path: "/productionissue",name: "productionissue", component: resolve => require(["@/views/modules/productionissue/productionissue.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
{path: "/directissue",name: "directissue", component: resolve => require(["@/views/modules/productionissue/directissue.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
diff --git a/src/views/modules/handlingunit/handlingunit.vue b/src/views/modules/handlingunit/handlingunit.vue
index f41822c..7f6a1a6 100644
--- a/src/views/modules/handlingunit/handlingunit.vue
+++ b/src/views/modules/handlingunit/handlingunit.vue
@@ -40,11 +40,36 @@ export default {
currentTime: new Date().toTimeString().substr(0, 5),
activeIndex: null,
buttons: [
- { icon: '📦', label: '装Handling Unit', color: '#FF9800', action: 'stockIn',to:'recv' },
- { icon: '📄', label: '合并Handling Unit', color: '#2196F3', action: 'stockOut',to:'recv' },
- { icon: '✅', label: '拆Handling Unit', color: '#4CAF50', action: 'search' ,to:'recv' },
- { icon: '📦', label: '补打印Handling Unit标签', color: '#FF9800', action: 'stockIn',to:'recv' },
- { icon: '📄', label: '查看Handling Unit', color: '#2196F3', action: 'stockOut',to:'recv' },
+ {
+ icon: '📦',
+ label: '装Handling Unit',
+ color: '#FF9800',
+ to: '/handlingunit/pack'
+ },
+ {
+ icon: '📄',
+ label: '合并Handling Unit',
+ color: '#2196F3',
+ to: '/handlingunit/merge'
+ },
+ {
+ icon: '✅',
+ label: '拆Handling Unit',
+ color: '#4CAF50',
+ to: '/handlingunit/split'
+ },
+ {
+ icon: '🏷️',
+ label: '补打印Handling Unit标签',
+ color: '#FF9800',
+ to: '/handlingunit/print'
+ },
+ {
+ icon: '🔍',
+ label: '查看Handling Unit',
+ color: '#2196F3',
+ to: '/handlingunit/view'
+ }
]
}
},
diff --git a/src/views/modules/handlingunit/mergeHu.vue b/src/views/modules/handlingunit/mergeHu.vue
new file mode 100644
index 0000000..892175c
--- /dev/null
+++ b/src/views/modules/handlingunit/mergeHu.vue
@@ -0,0 +1,136 @@
+
+
+