diff --git a/pages.json b/pages.json
index bc1d076..de054b6 100644
--- a/pages.json
+++ b/pages.json
@@ -151,7 +151,7 @@
{
"path": "pages/payInto/index",
"style": {
- "navigationBarTitleText": "整件拣货界面",
+ "navigationBarTitleText": "其他入库",
"navigationBarBackgroundColor": "#228B22"
}
},
@@ -296,7 +296,7 @@
}, {
"path": "pages/AvgOrderPkg/index",
"style": {
- "navigationBarTitleText": "AGV拣货",
+ "navigationBarTitleText": "拣货出库",
"navigationBarBackgroundColor": "#228B22"
}
}, {
diff --git a/pages/AvgOrderPkg/index.scss b/pages/AvgOrderPkg/index.scss
index a582672..2734273 100644
--- a/pages/AvgOrderPkg/index.scss
+++ b/pages/AvgOrderPkg/index.scss
@@ -11,9 +11,9 @@
}
.sh-search {
display: flex;
- padding: 10rpx 30rpx;
- background-color: #F2F2F2;
-
+ padding: 10rpx 20rpx;
+ flex:60px;
+ // background-color: #F2F2F2;
.sh-form {
width: 100%;
}
@@ -28,21 +28,59 @@
}
}
}
-
+ .all-card{
+ display: flex;
+ flex-direction:column;
+ height: 340px;
+ flex: 340px;
+ overflow: auto;
.sh-card {
- margin-top: 30rpx;
+ // background-color: red;
+ margin-top: 16rpx;
// padding: 20rpx 0rpx;
border: 0.5px solid #797979;
border-radius: 20rpx;
line-height: 60rpx;
-
+
.sh-card-title {
display: flex;
flex-direction: column;
+ position: relative;
padding: 0 20px;
background-color: #f2f2f2;
border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx;
+ .sh-button{
+ position: absolute;
+ width: 38px;
+ height: 28px;
+ line-height: 28px;
+ border-radius: 50%;
+ top: 0;
+ right: 0;
+ }
+ .receipt-number {
+ display: flex;
+ .receipt-number-title {
+ color: #333333;
+ font-size: 24rpx;
+ }
+ .receipt-number-value {
+ color: #333333;
+ font-size: 28rpx;
+ font-weight: 600;
+ margin-left: 20rpx;
+ }
+ }
+
+ }
+ .sh-card-title-two{
+ display: flex;
+ flex-direction: column;
+ padding: 0 20px;
+ background-color: #d7d7d7;
+ border-top-left-radius: 20rpx;
+ border-top-right-radius: 20rpx;
.receipt-number {
display: flex;
.receipt-number-title {
@@ -81,7 +119,7 @@
.goods-card-content-item {
display: flex;
align-items: center;
- width: 60%;
+ width: 70%;
.goods-title {
font-size: 28rpx;
color: #555555;
@@ -103,24 +141,31 @@
padding-bottom: 16rpx;
}
- .card-content {
+ .card-content {
display: flex;
justify-content: space-between;
align-items: center;
+
.card-content-item {
- width: 50%;
+ width: 90%;
display: flex;
- align-items: center;
+ // align-items: center;
+ // position: relative;
.item-title {
- font-size: 24rpx;
+ font-size: 22rpx;
color: #555555;
+ width: 130rpx;
+ text-align: right;
+ // right: 0;
}
.item-value {
- font-size: 26rpx;
+ font-size: 24rpx;
color: #666666;
- margin-left: 20rpx;
- }
+ margin-left: 14rpx; }
}
+ .card-content-item:first-child{
+ width: 100%;
+ }
.sh-bold {
font-weight: bold;
word-break: break-all;
@@ -128,8 +173,62 @@
}
}
-
+ margin-bottom: 100px;
+ }
+ // .sh-card:first-child{
+ // margin-bottom: 50px;
+ // }
.loadmore-data{
padding-top: 30rpx;
}
-}
\ No newline at end of file
+.recommend {
+ text-align: center;
+ height: 50rpx;
+ margin-top: 10rpx;
+}
+
+.recommend-title {
+ display: table;
+ width: 100%;
+ line-height: 50rpx;
+ white-space: nowrap;
+ border-spacing: 2rem 0;
+ font-size: 30rpx;
+ color: gray
+}
+
+.recommend-title::before, .recommend-title::after {
+ display: table-cell;
+ content: "";
+ width: 50%;
+ background: linear-gradient(#eee, #eee) repeat-x center;
+ background-size: 0.1rem 0.1rem;
+}
+
+.bottom{
+ display: flex;
+ flex: 130px;
+ position:fixed;
+ height: 40px;
+ width: 100%;
+ bottom:58px;
+ button{
+ height: 100%;
+ margin-top: 20px;
+ line-height: 40px;
+ width: 60%;
+ font-size: 16px;
+
+ }
+ .foot{
+ position: fixed;
+ bottom: 15px;
+ margin-left: 1%;
+ .size {
+ transform: scale(0.5,0.5);
+ font-size: 24px;
+ }
+ }
+ }
+}
+
diff --git a/pages/AvgOrderPkg/index.vue b/pages/AvgOrderPkg/index.vue
index e0ee960..255e1c1 100644
--- a/pages/AvgOrderPkg/index.vue
+++ b/pages/AvgOrderPkg/index.vue
@@ -1,76 +1,300 @@
-
-
- 待拣订单
-
- {{dataForm.waitPickOrderNumber}}
-
- 待拣品类
-
- {{dataForm.waitPickTypeNumber}}
- 待拣数量
-
- {{dataForm.waitPickGoodsNumber}}
-
-
-
-
- 开始拣选
-
-
- 开始拣选后,系统自动呼叫AGV按顺序把需要拣货的 商品送至待拣区域,请及时处理!
-
+
+
+
+
+
+
+
+
+
+
+ 待出库物料信息
+
+
+
+
+
+
+
+
+
+
+ 物料编号:
+ {{item.ttPart}}
+
+
+
+
+ 物料信息:
+ {{item.ptName}}--{{item.ptDesc}}
+
+
+
+
+
+ 台车编号:
+ {{item.containerCode}}
+
+
+
+
+
+ 缴库数量:
+ {{item.ttQtyRct}}
+
+
+
+
+
+
+
+
+ 数量确认
+
+
+ 拣货数量:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/pages/AvgOrderPkg/index22222.scss b/pages/AvgOrderPkg/index22222.scss
new file mode 100644
index 0000000..a582672
--- /dev/null
+++ b/pages/AvgOrderPkg/index22222.scss
@@ -0,0 +1,135 @@
+.sh-content {
+ padding: 25rpx;
+ background-color: #fff;
+ display: flex;
+ flex-direction: column;
+ .u-form-item {
+ padding: 5rpx 0px;
+ }
+ .u-input__input {
+ background-color: #ffffff;
+ }
+ .sh-search {
+ display: flex;
+ padding: 10rpx 30rpx;
+ background-color: #F2F2F2;
+
+ .sh-form {
+ width: 100%;
+ }
+
+ .sh-sub-search {
+ display: flex;
+ align-items: center;
+ padding: 15rpx 0 15rpx 15rpx;
+
+ .sh-search-button {
+ height: 100%;
+ }
+ }
+ }
+
+ .sh-card {
+ margin-top: 30rpx;
+ // padding: 20rpx 0rpx;
+ border: 0.5px solid #797979;
+ border-radius: 20rpx;
+ line-height: 60rpx;
+
+ .sh-card-title {
+ display: flex;
+ flex-direction: column;
+ padding: 0 20px;
+ background-color: #f2f2f2;
+ border-top-left-radius: 20rpx;
+ border-top-right-radius: 20rpx;
+ .receipt-number {
+ display: flex;
+ .receipt-number-title {
+ color: #333333;
+ font-size: 24rpx;
+ }
+ .receipt-number-value {
+ color: #333333;
+ font-size: 28rpx;
+ font-weight: 600;
+ margin-left: 20rpx;
+ }
+ }
+ }
+ .borderBottom {
+ border-bottom-left-radius: 20rpx;
+ border-bottom-right-radius: 20rpx;
+ }
+ .sh-card-title-border {
+ border-bottom: 2px dashed #797979;
+ }
+ .sh-card-content {
+ position: relative;
+ margin: 16rpx 0;
+ padding: 0rpx 70rpx;
+
+ .detail-icon {
+ position: absolute;
+ right: 10rpx;
+ top: 90rpx;
+ }
+ .goods-card-content {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ .goods-card-content-item {
+ display: flex;
+ align-items: center;
+ width: 60%;
+ .goods-title {
+ font-size: 28rpx;
+ color: #555555;
+ }
+ .goods-value {
+ font-size: 28rpx;
+ color: #666666;
+ margin-left: 20rpx;
+ }
+
+ }
+ }
+ }
+ .goods-no{
+ font-weight: bold;
+ margin-right: 20rpx;
+ }
+ .pad-content {
+ padding-bottom: 16rpx;
+ }
+
+ .card-content {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ .card-content-item {
+ width: 50%;
+ display: flex;
+ align-items: center;
+ .item-title {
+ font-size: 24rpx;
+ color: #555555;
+ }
+ .item-value {
+ font-size: 26rpx;
+ color: #666666;
+ margin-left: 20rpx;
+ }
+ }
+ .sh-bold {
+ font-weight: bold;
+ word-break: break-all;
+ }
+ }
+
+ }
+
+ .loadmore-data{
+ padding-top: 30rpx;
+ }
+}
\ No newline at end of file
diff --git a/pages/AvgOrderPkg/index22222.vue b/pages/AvgOrderPkg/index22222.vue
new file mode 100644
index 0000000..e0ee960
--- /dev/null
+++ b/pages/AvgOrderPkg/index22222.vue
@@ -0,0 +1,76 @@
+
+
+
+
+ 待拣订单
+
+ {{dataForm.waitPickOrderNumber}}
+
+ 待拣品类
+
+ {{dataForm.waitPickTypeNumber}}
+ 待拣数量
+
+ {{dataForm.waitPickGoodsNumber}}
+
+
+
+
+ 开始拣选
+
+
+ 开始拣选后,系统自动呼叫AGV按顺序把需要拣货的 商品送至待拣区域,请及时处理!
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e54811a..4614972 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,11 +1,52 @@
-
+
+
+
+ 入库收货
-
+
+
+ 入库验收
+
+
+
+
+
+ AGV搬运
+
+
+
+ 出库分拣
+
+
+
+ 其他入库
+
+
+
+ 库存查询
+
+
+
+ 盘点计划
+
+
@@ -230,6 +271,11 @@
url: 'pages/cache/index',
type: 'navigateTo',
})
+ }else if(this.PagerJumpType === 10015){//其他入库
+ this.$u.route({
+ url: 'pages/payInto/index',
+ type: 'navigateTo',
+ })
}
},
}
diff --git a/static/icon/1.png b/static/icon/1.png
new file mode 100644
index 0000000..975db24
Binary files /dev/null and b/static/icon/1.png differ
diff --git a/static/icon/10.png b/static/icon/10.png
new file mode 100644
index 0000000..54cb0f4
Binary files /dev/null and b/static/icon/10.png differ
diff --git a/static/icon/2.png b/static/icon/2.png
new file mode 100644
index 0000000..028448f
Binary files /dev/null and b/static/icon/2.png differ
diff --git a/static/icon/3.png b/static/icon/3.png
new file mode 100644
index 0000000..e7ed511
Binary files /dev/null and b/static/icon/3.png differ
diff --git a/static/icon/4.png b/static/icon/4.png
new file mode 100644
index 0000000..d09f982
Binary files /dev/null and b/static/icon/4.png differ
diff --git a/static/icon/5.png b/static/icon/5.png
new file mode 100644
index 0000000..0738183
Binary files /dev/null and b/static/icon/5.png differ
diff --git a/static/icon/6.png b/static/icon/6.png
new file mode 100644
index 0000000..1dc609a
Binary files /dev/null and b/static/icon/6.png differ
diff --git a/static/icon/7.png b/static/icon/7.png
new file mode 100644
index 0000000..1c58226
Binary files /dev/null and b/static/icon/7.png differ
diff --git a/static/icon/8.png b/static/icon/8.png
new file mode 100644
index 0000000..85fbd05
Binary files /dev/null and b/static/icon/8.png differ
diff --git a/static/icon/9.png b/static/icon/9.png
new file mode 100644
index 0000000..50374f6
Binary files /dev/null and b/static/icon/9.png differ
diff --git a/static/icon/qita.png b/static/icon/qita.png
new file mode 100644
index 0000000..c72b49b
Binary files /dev/null and b/static/icon/qita.png differ