diff --git a/common/style/layout.styl b/common/style/layout.styl
index 2222e82..db7c483 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -511,6 +511,7 @@ uni-button[disabled]:not([type]) {
font-weight: 700;
color: #ff6a00;
margin-top: 30rpx;
+ word-break: break-all;
}
.msg_modal {
position: fixed;
diff --git a/common/style/reset.css b/common/style/reset.css
index 0fed431..39d2c45 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -131,8 +131,8 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
width: 4.16667%
}
.letter-30 {
- letter-spacing: 30rpx;
- text-indent: 30rpx;
+ /* letter-spacing: 30rpx;
+ text-indent: 30rpx; */
}
.h-50 {
height: 50% !important;
diff --git a/manifest.json b/manifest.json
index 3b86c0e..4c4d9d0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "海亮铜箔",
"appid" : "__UNI__3A002CD",
"description" : "海亮铜箔二期手持系统",
- "versionName" : "1.1.6",
- "versionCode" : 116,
+ "versionName" : "1.1.7",
+ "versionCode" : 117,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index 1d30b63..285549e 100644
--- a/pages.json
+++ b/pages.json
@@ -599,6 +599,14 @@
}
}
+ ,{
+ "path" : "pages/SecondPhase/EmptyBoxOutStore",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
],
"globalStyle": {
// "pageOrientation": "landscape",
diff --git a/pages/SecondPhase/EmptyBoxOutStore.vue b/pages/SecondPhase/EmptyBoxOutStore.vue
new file mode 100644
index 0000000..fb97f24
--- /dev/null
+++ b/pages/SecondPhase/EmptyBoxOutStore.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
+ 木箱号
+
+
+
+
+
+ 已扫木箱号:{{editValue.toString()}}
+
+
+ 已选木箱数
+
+ {{selectedNum}}
+
+
+
+ 可选木箱数
+
+ {{selectedNum !== null ? (10 - selectedNum) : null}}
+
+
+
+
+
+
+
+
+
+ | 选择 |
+ 木箱号 |
+ 木箱料号 |
+ 木箱描述 |
+ 最大子卷数 |
+ 木箱长度 |
+ 木箱宽度 |
+ 木箱高度 |
+ 载具类型 |
+ 木箱重量 |
+ 仓位 |
+
+
+
+
+ | |
+ {{e.box_no}} |
+ {{e.material_code}} |
+ {{e.material_name}} |
+ {{e.num}} |
+ {{e.box_length}} |
+ {{e.box_width}} |
+ {{e.box_high}} |
+ {{e.vehicle_type}} |
+ {{e.box_weight}} |
+ {{e.struct_code}} |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/image/menu/RF11.png b/static/image/menu/RF11.png
index 450da60..6417a79 100644
Binary files a/static/image/menu/RF11.png and b/static/image/menu/RF11.png differ
diff --git a/static/image/menu/RF14.png b/static/image/menu/RF14.png
new file mode 100644
index 0000000..7e9ddd2
Binary files /dev/null and b/static/image/menu/RF14.png differ
diff --git a/utils/getData3.js b/utils/getData3.js
index 9590bd8..7d7bbd4 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -404,4 +404,19 @@ export const cutUpShaft = (area, device, point, lk, rk) => request({
left_spec: lk,
right_spec: rk
}
-})
\ No newline at end of file
+})
+/**
+ * 空木箱出库(二期空木箱出库)
+ */
+export const twoQueryBoxIvt = (no) => request({
+ url:'api/twoPda/st/queryBoxIvt',
+ data: {
+ box_no: no
+ }
+})
+export const twoBoxOut = (data) => request({
+ url:'api/twoPda/st/boxOut',
+ data: {
+ data: data
+ }
+})
diff --git a/utils/mork2.js b/utils/mork2.js
index 42d4a3b..42d1262 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -113,47 +113,15 @@ export const allAuthority = () => {
]},
{menu_id: '8', path: 'RF13', title: '立库库存', sonTree: [
{menu_id: '1', title: '空木箱库存', path: '/pages/SecondPhase/lvt/EmptyBox'}
+ ]},
+ {menu_id: '9', path: 'RF14', title: '空木箱出库', sonTree: [
+ {menu_id: '1', title: '空木箱出库', path: '/pages/SecondPhase/EmptyBoxOutStore'}
]}
]
}
}}
return res
}
-export const authority = () => {
- let res = {
- code: '1',
- result: {
- rf_menu0: {
- sonTree: [
- {title: '生产管理',sonTree: [{title: '生箔生产进度'},{title: '生箔工序'},{title: '烘烤工序'},{title: '人工烘烤'}]},
- {title: '半成品管理',sonTree: [{title: '半成品入库'},{title: '半成品出库'}]},
- {title: '分切管理',sonTree: [{title: '分切上料'},{title: '空轴套管'},{title: '空轴配送'},{title: '空轴进站'},{title: '子卷出站'}]},
- {title: '点位管理',sonTree: [{title: '点位管理'},{title: '异常出库解锁'}]},
- {title: '纸管/FRP管管理', sonTree: [{title: '空管入库'},{title: '空管出库'}]},
- {title: '成品管理',sonTree: [{title: '生产入库'},{title: '退货入库'},{title: '报废入库'},{title: '拆分入库'},{title: '生产区发货'},{title: '虚拟区发货'},{title: '贴标捆扎'}]},
- {title: '在库管理', sonTree: [{title: '盘点管理'}]},
- {title: '载具管理', sonTree: [{title: '空载具入库'},{title: '空载具出库'}]},
- {title: '打印管理', sonTree: [{title: '客户标签打印'}]},
- {title: '调度管理', sonTree: [{title: '任务管理'},{title: 'RGV状态查询'}]}
- ]
- },
- rf_menu1: {
- sonTree: [
- {title: '载具入库',sonTree: [{title: '空载具入库'}]},
- {title: '空木箱入库',sonTree: [{title: '空木箱入库'}]},
- {title: '发货区',sonTree: [{title: '发货区解绑'}]},
- {title: '生产管理',sonTree: [{title: '生箔生产进度'},{title: '生箔工序'},{title: '烘烤工序'},{title: '表处工序'},{title: '人工烘烤'},{title: '子卷质检'}, {title: '子卷装箱'}, {title: '标签打印'}]},
- {title: '分切管理', sonTree: [{title: '分切上料'},{title: '分切下料'},{title: '空轴套管'},{title: '空轴配送'},{title: '空轴进站'},{title: '子卷出站'},{title: '穿拔轴初始化'},{title: '纸管绑定'},{title: '分切暂存下料'},{title: '分切暂存清除'},{title: '气胀轴库维护'}, {title: '分切子卷维护'}, {title: '备货区管理'}, {title: 'AGV放行'}, {title: '子卷重量维护'}, {title: '分切上轴'}]},
- {title: '点位管理', sonTree: [{title: '点位管理'},{title: '异常出库解锁'},{title: '人工放行'}]},
- {title: '成品入库', sonTree: [{title: '退货口入库'},{title: '异常口入库'},{title: '木箱称重'}]},
- {title: '立库库存', sonTree: [{title: '空木箱库存'}]}
- ]
- }
- }
- }
- return res
-}
-
export const twoPdaIvtQuery = (no, code) => {
let res = {
data: [{bill_code: '1', bill_status: 'ljdjldj'}, {bill_code: '2'}, {bill_code: '3', bill_status: 'ljdjldj'}, {bill_code: '4'}, {bill_code: '5', bill_status: 'ljdjldj'}, {bill_code: '6'}, {bill_code: '7', bill_status: 'ljdjldj'}, {bill_code: '8'}, {bill_code: '9', bill_status: 'ljdjldj'}, {bill_code: '12', confirm_time: '2020-10-20'}]
@@ -287,4 +255,11 @@ export const paperQueryPaperMaterial = () => {
}]
}
return res
+}
+export const twoQueryBoxIvt = (code) => {
+ let res = {
+ msg: 'ok',
+ data: [{box_no: '100010000a' + code}]
+ }
+ return res
}
\ No newline at end of file