From a52efffb8aaccbc22c3fc222df8e4d4fd09dc6f7 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 10 May 2023 14:45:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81=E6=8B=BC=E7=9B=98?=
=?UTF-8?q?=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/style/layout.css | 24 +-
pages/management/semifinishedcheck.vue | 18 +-
pages/management/semifinishedchecksearch.vue | 20 +-
pages/management/semifinishedcompose.vue | 213 +++++++++++++++-
.../management/semifinishedcomposesearch.vue | 240 +++++++++++++++++-
utils/getData2.js | 4 +-
6 files changed, 479 insertions(+), 40 deletions(-)
diff --git a/common/style/layout.css b/common/style/layout.css
index d9c4d75..fe82d4e 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -28,16 +28,30 @@ uni-button:after {
.search-wrap{
display: flex;
flex-wrap: wrap;
- justify-content: space-between;
+ justify-content: flex-start;
width: 100%;
padding: 0 15px;
}
.search-item{
display: flex;
justify-content: space-between;
- width: 48%;
+ width: 32%;
margin-top: 15px;
}
+.search-item:nth-child(3n+2) {
+ margin-left: 2%;
+ margin-right: 2%;
+}
+.search-item_2 {
+ display: flex;
+ justify-content: flex-end;
+ width: 64%;
+ margin-top: 15px;
+ margin-left: 4%;
+}
+.flexend {
+ justify-content: flex-end;
+}
.search-item-btns {
justify-content: flex-end;
}
@@ -58,7 +72,7 @@ uni-button:after {
visibility: hidden;
}
.filter_input_wraper {
- width: calc(100% - 100px);
+ width: calc(100% - 85px);
height: 35px;
line-height: 35px;
}
@@ -171,13 +185,13 @@ uni-button:after {
position: -webkit-sticky;
position: sticky;
left: 0;
- z-index: 101;
+ z-index: 50;
}
.zd_wrapper .grid-table thead tr th {
position: -webkit-sticky;
position: sticky;
top: 0;
- z-index: 100;
+ z-index: 49;
}
.status-wrap {
width: 100%;
diff --git a/pages/management/semifinishedcheck.vue b/pages/management/semifinishedcheck.vue
index 6bfb70b..3051519 100644
--- a/pages/management/semifinishedcheck.vue
+++ b/pages/management/semifinishedcheck.vue
@@ -27,16 +27,12 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -180,5 +176,5 @@
\ No newline at end of file
diff --git a/pages/management/semifinishedchecksearch.vue b/pages/management/semifinishedchecksearch.vue
index f77e893..7dfa002 100644
--- a/pages/management/semifinishedchecksearch.vue
+++ b/pages/management/semifinishedchecksearch.vue
@@ -45,17 +45,13 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -148,7 +144,7 @@
options3: [{text: '对接位', value: '1'}, {text: '准备位', value: '2'}],
index3: '1',
val1: '',
- dataList: [{position_code: '1', vehicle_code: 'djlfjjljlkllkllldf', cacheline_code: 'jfjldfjl'}, {position_code: '2', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}],
+ dataList: [{position_code: '1', vehicle_code: 'djlfjjljlkllkllldf', cacheline_code: 'jfjldfjl'}, {position_code: '2', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '21', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '22', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '23', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '24', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '25', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '26', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '27', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '29', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}],
pkId: '',
disabled: false
};
@@ -259,4 +255,6 @@
\ No newline at end of file
diff --git a/pages/management/semifinishedcompose.vue b/pages/management/semifinishedcompose.vue
index 239d03a..d209ede 100644
--- a/pages/management/semifinishedcompose.vue
+++ b/pages/management/semifinishedcompose.vue
@@ -1,19 +1,220 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 选择 |
+ 仓位 |
+ 数量(个) |
+ 载具号 |
+ 单重(g) |
+
+
+
+
+ |
+
+ |
+ {{e.cacheline_code}} |
+ {{e.position_code}} |
+ {{e.vehicle_code}} |
+ |
+
+
+
+
+
+
+
+
+
+
+ | 顺序 |
+ 仓位 |
+ 数量(个) |
+ 载具号 |
+ 单重(g) |
+
+
+
+
+ |
+ {{e.cacheline_code}} |
+ {{e.position_code}} |
+ {{e.vehicle_code}} |
+ |
+
+
+
+
-
+
\ No newline at end of file
diff --git a/pages/management/semifinishedcomposesearch.vue b/pages/management/semifinishedcomposesearch.vue
index 239d03a..4acbaef 100644
--- a/pages/management/semifinishedcomposesearch.vue
+++ b/pages/management/semifinishedcomposesearch.vue
@@ -1,19 +1,247 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 选择 |
+ 序号 |
+ 单据号 |
+ 状态 |
+ 类型 |
+ 物料编号 |
+ 物料名称 |
+ 数量 |
+ 单重(g) |
+ 转出货位 |
+ 转出载具 |
+ 转入货位 |
+ 转入载具 |
+ 创建时间 |
+ 创建人 |
+
+
+
+
+ |
+
+ |
+ {{e.cacheline_code}} |
+ {{e.position_code}} |
+ {{e.vehicle_code}} |
+ |
+ {{e.cacheline_code}} |
+ {{e.position_code}} |
+ {{e.vehicle_code}} |
+ |
+ {{e.cacheline_code}} |
+ {{e.position_code}} |
+ {{e.vehicle_code}} |
+ |
+ {{e.cacheline_code}} |
+ {{e.position_code}} |
+
+
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/utils/getData2.js b/utils/getData2.js
index e4ab981..efb49e3 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -39,7 +39,9 @@ export const authority = () => {
{menu_id: '3', path: 'RF03', name: '出入库管理', sonTree: [
{menu_id: '1', name: '半成品入库', path: '/pages/management/HalfFinishedInStore'},
{menu_id: '2', name: '成品入库', path: '/pages/management/FinishedInStore'},
- {menu_id: '3', name: '发货确认', path: '/pages/management/DeliveryConfirm'}
+ {menu_id: '3', name: '发货确认', path: '/pages/management/DeliveryConfirm'},
+ {menu_id: '4', name: '半成品盘点', path: '/pages/management/semifinishedcheck'},
+ {menu_id: '5', name: '半成品拼盘', path: '/pages/management/semifinishedcompose'}
]
}
]