diff --git a/pages.json b/pages.json
index 1c7c2b2..d35c4de 100644
--- a/pages.json
+++ b/pages.json
@@ -254,311 +254,319 @@
"navigationStyle": "custom"
}
}
- ,{
- "path" : "pages/SecondPhase/EmptyVehicleInStore",
+ ,{
+ "path" : "pages/SecondPhase/EmptyVehicleInStore",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/EmptyBoxInStore",
- "style" :
- {
- "navigationStyle": "custom"
- }
-
- }
- ,{
- "path" : "pages/SecondPhase/DeliveryUnbind",
- "style" :
- {
- "navigationStyle": "custom"
- }
-
- }
- ,{
- "path" : "pages/SecondPhase/DeliveryUnbindConfirm",
- "style" :
- {
- "navigationStyle": "custom"
- }
-
- }
- ,{
- "path" : "pages/SecondPhase/production/SboProdProgress",
- "style" :
- {
- "navigationStyle": "custom"
- }
-
- }
- ,{
- "path" : "pages/SecondPhase/production/SboProcess",
- "style" :
- {
- "navigationStyle": "custom"
- }
-
- }
- ,{
- "path" : "pages/SecondPhase/production/BakeProcess",
- "style" :
- {
- "navigationStyle": "custom"
- }
-
- }
- ,{
- "path" : "pages/SecondPhase/production/ManmadeBake",
- "style" :
- {
- "navigationStyle": "custom"
- }
-
- }
- ,{
- "path" : "pages/SecondPhase/production/SurfaceProcess",
- "style" :
- {
- "navigationStyle": "custom"
- }
-
- }
- ,{
- "path" : "pages/SecondPhase/slitting/SlittingFeeding",
- "style" :
- {
- "navigationStyle": "custom"
- }
-
- }
- ,{
- "path" : "pages/SecondPhase/slitting/ZjCasing",
- "style" :
- {
- "navigationStyle": "custom"
- }
-
- }
- ,{
- "path" : "pages/SecondPhase/slitting/ZjDelivery",
- "style" :
- {
- "navigationStyle": "custom"
- }
-
- }
- ,{
- "path" : "pages/SecondPhase/slitting/ZjInStore",
- "style" :
- {
- "navigationStyle": "custom"
- }
-
- }
- ,{
- "path" : "pages/SecondPhase/slitting/ZjOutStore",
- "style" :
- {
- "navigationStyle": "custom"
- }
-
+
}
-
- ,{
- "path" : "pages/SecondPhase/point/PointManage",
+ ,{
+ "path" : "pages/SecondPhase/EmptyBoxInStore",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/point/ErrorOutUnlock",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/DeliveryUnbind",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/finished/ReturnToStore",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/DeliveryUnbindConfirm",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/finished/abnorToStore",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/production/SboProdProgress",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/slitting/SlittingCutting",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/production/SboProcess",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/slitting/DoInitShaft",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/production/BakeProcess",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/production/ZjCheck",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/production/ManmadeBake",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/slitting/PaperBind",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/production/SurfaceProcess",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/slitting/CacheCut",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/slitting/SlittingFeeding",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/slitting/CacheClean",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/slitting/ZjCasing",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/finished/BoxWeight",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/slitting/ZjDelivery",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/slitting/ShaftSave",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/slitting/ZjInStore",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/slitting/ZjSave",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/slitting/ZjOutStore",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/slitting/StockingArea",
+
+ }
+
+ ,{
+ "path" : "pages/SecondPhase/point/PointManage",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/slitting/AGVPass",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/point/ErrorOutUnlock",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/production/ZjContainer",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/finished/ReturnToStore",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/lvt/EmptyBox",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/finished/abnorToStore",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/point/ManPass",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/slitting/SlittingCutting",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/production/PrintTable",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/slitting/DoInitShaft",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/slitting/SubRollWeight",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/production/ZjCheck",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/slitting/UpperShaftCut",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/slitting/PaperBind",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/ProductManage/AxisApply",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/slitting/CacheCut",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/slitting/UpperShaftCut2",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/slitting/CacheClean",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/production/ZjInStore",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/finished/BoxWeight",
"style" :
{
"navigationStyle": "custom"
}
-
- }
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/slitting/ShaftSave",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/slitting/ZjSave",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/slitting/StockingArea",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/slitting/AGVPass",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/production/ZjContainer",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/production/BoxStock",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/lvt/EmptyBox",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/point/ManPass",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/production/PrintTable",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/slitting/SubRollWeight",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/slitting/UpperShaftCut",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ,{
+ "path" : "pages/ProductManage/AxisApply",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/slitting/UpperShaftCut2",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/production/ZjInStore",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
],
"globalStyle": {
// "pageOrientation": "landscape",
diff --git a/pages/SecondPhase/production/BoxStock.vue b/pages/SecondPhase/production/BoxStock.vue
new file mode 100644
index 0000000..4416c95
--- /dev/null
+++ b/pages/SecondPhase/production/BoxStock.vue
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+ 子卷号
+
+
+
+
+
+
+
+
+
+
+
+ | 木箱号 |
+ 木箱编码 |
+ 点位 |
+ 木箱规格 |
+
+
+
+
+ | {{e.box_no}} |
+ {{e.material_name}} |
+ {{e.struct_code}} |
+ {{e.material_code}} |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 2079182..34f7da0 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -199,9 +199,9 @@
position relative
opacity 1
_wh(55%, auto)
- background-color: #f3f5f8
- box-shadow 8rpx 6rpx 10rpx 0px rgba(0,0,0,0.1)
- padding 16rpx
+ background-color: #f3f5f8
+ box-shadow 8rpx 6rpx 10rpx 0px rgba(0,0,0,0.1)
+ padding 16rpx
border-radius 50%
margin 0 auto 0.2rpx
.menu-name
diff --git a/utils/getData1.js b/utils/getData1.js
index 99818c6..056fd6b 100644
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -324,3 +324,14 @@ export const abnormalOut = (bno, pcode) => request({
point_code: pcode
}
})
+
+/**
+ * 木箱库存(二期)
+ */
+// 1.1查询木箱规格点位
+export const woodenBoxPoint = (cname) => request({
+ url: 'api/twoPda/st/woodenBoxPoint',
+ data: {
+ container_name: cname
+ }
+})
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index f823165..1758417 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -74,6 +74,7 @@ export const allAuthority = () => {
{menu_id: '5', title: '人工烘烤', path: '/pages/SecondPhase/production/ManmadeBake'},
{menu_id: '6', title: '子卷质检', path: '/pages/SecondPhase/production/ZjCheck'},
{menu_id: '8', title: '子卷装箱', path: '/pages/SecondPhase/production/ZjContainer'},
+ {menu_id: '8', title: '木箱库存', path: '/pages/SecondPhase/production/BoxStock'},
{menu_id: '8', title: '子卷入库', path: '/pages/SecondPhase/production/ZjInStore'},
{menu_id: '8', title: '标签打印', path: '/pages/SecondPhase/production/PrintTable'}
]},