diff --git a/common/style/layout.css b/common/style/layout.css
index 0fdb623..960095a 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -146,10 +146,12 @@ uni-button:after {
white-space: nowrap;
padding: 0 20rpx;
border-bottom: 10rpx solid #f5f5f5;
+ text-align: center;
}
.slide_new table td:first-child, .slide_new table th:first-child{
position: sticky;
left: 0;
+ z-index: 101;
}
.slide_new table thead tr th {
position: sticky;
@@ -159,9 +161,9 @@ uni-button:after {
line-height: 98rpx;
color: #696969;
font-weight: bold;
+ z-index: 100;
}
.slide_new table thead tr th:first-child {
- z-index: 1;
background: #d7d7d7;
}
.slide_new table tbody tr td {
@@ -181,7 +183,7 @@ uni-button:after {
bottom: 0;
left: 0;
width: 100%;
- z-index: 100;
+ z-index: 200;
background-color: #fff;
padding-top: 10rpx;
box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
diff --git a/components/NavBar.vue b/components/NavBar.vue
index b3c6174..a03af93 100644
--- a/components/NavBar.vue
+++ b/components/NavBar.vue
@@ -55,7 +55,7 @@
position fixed
_wh(100%, 72rpx)
background-color $red
- z-index 100
+ z-index 200
padding 0 20rpx
.page_name
_font(32rpx, 32rpx, #fff,700,center)
diff --git a/pages/ProductManage/EmptyPipeInStore.vue b/pages/ProductManage/EmptyPipeInStore.vue
index 5dbf869..a8e5a67 100644
--- a/pages/ProductManage/EmptyPipeInStore.vue
+++ b/pages/ProductManage/EmptyPipeInStore.vue
@@ -37,6 +37,7 @@
+ | 序号 |
点位 |
物料编码 |
物料名称 |
@@ -45,6 +46,7 @@
+ | {{Number(i) + 1}} |
{{e.point_code}} |
{{e.material_code}} |
{{e.material_name}} |
@@ -65,7 +67,7 @@
diff --git a/pages/ProductManage/ZjCasing.vue b/pages/ProductManage/ZjCasing.vue
index 349e738..9cd8cac 100644
--- a/pages/ProductManage/ZjCasing.vue
+++ b/pages/ProductManage/ZjCasing.vue
@@ -1,23 +1,168 @@
-
+
+
+
+
+
+ 点位
+
+
+
+
+
+
+
+ 气涨轴
+
+
+
+
+
+
+ 区域
+
+
+
+
+
+
+
+
+
+
+ | 序号 |
+ 选择 |
+ 订单号 |
+ 子卷号 |
+ 机台编号 |
+ 分切组 |
+ 生产顺序 |
+ 生产日期 |
+ 纸筒/FRP管 |
+ 纸筒物料编码 |
+ 纸筒物料描述 |
+ 纸筒规格 |
+ FRP管物料编码 |
+ FRP管物料描述 |
+ FRP管规格 |
+
+
+
+
+ | {{Number(i) + 1}} |
+ |
+ {{e.mfg_order_name}} |
+ {{e.container_name}} |
+ {{e.point_code}} |
+ {{e.split_group}} |
+ {{e.manufacture_sort}} |
+ {{e.manufacture_date}} |
+ {{e.paper_tube_or_FRP}} |
+ {{e.paper_tube_material}} |
+ {{e.paper_tube_description}} |
+ {{e.paper_tube_model}} |
+ {{e.FRP_material}} |
+ {{e.FRP_description}} |
+ {{e.FRP_model}} |
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/getData2.js b/utils/getData2.js
index bb105d8..c90f172 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -9,14 +9,33 @@ export const queryProductArea = () => request({
data: {}
})
// 1.2空纸管库设备物料初始化查询
-export const queryMaterialInfo = (code, mcode, area) => request({
- url:'api/pda/empty/queryMaterialInfo',
- data: {
- point_code: code,
- material_code: mcode,
- product_area: area
+// export const queryMaterialInfo1 = (code, mcode, area) => request({
+// url:'api/pda/empty/queryMaterialInfo',
+// data: {
+// point_code: code,
+// material_code: mcode,
+// product_area: area
+// }
+// })
+export const queryMaterialInfo1 = (code, area) => {
+ let res = {
+ rows: [
+ {point_code: 'fdfdfdfdffedfd1',material_code: 'dfdf2', checked: false},
+ {point_code: '1',material_code: '2', checked: false},
+ {point_code: '1',material_code: '2', checked: false},
+ {point_code: '1',material_code: '2', checked: false},
+ {point_code: '1',material_code: '2', checked: false},
+ {point_code: '1',material_code: '2', checked: false},
+ {point_code: '1',material_code: '2', checked: false},
+ {point_code: '1',material_code: '2', checked: false},
+ {point_code: '1',material_code: '2', checked: false},
+ {point_code: '1',material_code: '2', checked: false},
+ {point_code: '1',material_code: '2', checked: false},
+ {point_code: '1',material_code: '2', checked: false},
+ ]
}
-})
+ return res
+}
// 1.3入库确认
export const emptyConfirm = (jo, qty, code) => request({
url:'api/pda/empty/confirm',
@@ -25,4 +44,24 @@ export const emptyConfirm = (jo, qty, code) => request({
qty: qty,
material_code: code
}
+})
+
+/**
+ * 子卷套管
+ */
+// 1.1分切计划初始化查询
+export const queryMaterialInfo2 = (code, area) => request({
+ url:'api/pda/casing/queryMaterialInfo',
+ data: {
+ point_code: code,
+ product_area: area
+ }
+})
+// 1.2套轴确认
+export const casingConfirm = (row, qzz) => request({
+ url:'api/pda/casing/confirm',
+ data: {
+ cut_rows: row,
+ qzzno: qzz
+ }
})
\ No newline at end of file