diff --git a/src/config/mork2.js b/src/config/mork2.js index 87c0341..ed577b8 100644 --- a/src/config/mork2.js +++ b/src/config/mork2.js @@ -270,7 +270,7 @@ export const pickingInfo = () => { "update_time": null, "stor_code": null, "task_type": "PK20240909006", - "material_name": "测试物料", + "material_name": "测试物料33fdfdff测试物料33", "material_code": null, "material_spec": "test_zz", "assign_qty": 7, diff --git a/src/images/icon_1.png b/src/images/icon_1.png new file mode 100644 index 0000000..916ed27 Binary files /dev/null and b/src/images/icon_1.png differ diff --git a/src/images/icon_2.png b/src/images/icon_2.png new file mode 100644 index 0000000..5dfcc32 Binary files /dev/null and b/src/images/icon_2.png differ diff --git a/src/pages/modules/index1.vue b/src/pages/modules/index1.vue index 0340a7a..93a9525 100644 --- a/src/pages/modules/index1.vue +++ b/src/pages/modules/index1.vue @@ -21,67 +21,76 @@

当前任务 - {{ itemData[0].task_code }}

-
+
-
库内料箱
-
{{ itemData[0].vehicle_code }}
+
库内料箱:
+
{{ itemData[0].vehicle_code }}
-
物料名称
-
{{ itemData[0].material_name }}
+
物料名称:
+
{{ itemData[0].material_name }}
-
规格
-
{{ itemData[0].material_spec }}
+
物料规格:
+
{{ itemData[0].material_spec }}
-
数量
-
{{ itemData[0].qty }}个
+
物料数量:
+
{{ itemData[0].qty }}个
-
需出数量
-
{{ itemData[0].assign_qty }}个
+
箱内剩余数量:
+
{{ itemData[0].remaining_qty }}个
-
单重
-
{{ itemData[0].single_weight }}g
+
拣选称重:
+
{{ itemData[0].actual_weight }}g
-
-
-
拣选称重
-
{{ itemData[0].actual_weight }}g
+
+
+
+
拣选数量
+
{{ itemData[0].assign_qty }}个
+
+
-
-
-
理论数量
-
{{ itemData[0].theory_qty }}个
-
-
-
-
-
箱内剩余
-
{{ itemData[0].remaining_qty }}个
+
+
+
+
理论数量
+
{{ itemData[0].theory_qty }}个
+
+
-
+
+
+
+
单重:
+ +
g
+
+
+
料箱{{ itemData[0].vehicle_code }}
{{itemData[0].assign_qty === itemData[0].theory_qty ? '拣选成功！' : '称重错误！'}}
+
@@ -98,38 +107,38 @@
-
料箱号
-
{{ itemData[1].vehicle_code }}
+
料箱号
+
{{ itemData[1].vehicle_code }}
-
物料名称
-
{{ itemData[1].material_name }}
+
物料名称
+
{{ itemData[1].material_name }}
-
规格
-
{{ itemData[1].material_spec }}
+
物料规格
+
{{ itemData[1].material_spec }}
-
数量
-
{{ itemData[1].qty }}个
+
物料数量
+
{{ itemData[1].qty }}个
-
需出数量
-
{{ itemData[1].assign_qty }}个
+
拣选数量
+
{{ itemData[1].assign_qty }}个
-
单重
-
{{ itemData[1].single_weight }}g
+
单重
+
{{ itemData[1].single_weight }}g
diff --git a/src/pages/modules/index1的副本.vue b/src/pages/modules/index1的副本.vue new file mode 100644 index 0000000..f2153e0 --- /dev/null +++ b/src/pages/modules/index1的副本.vue @@ -0,0 +1,207 @@ + + + + + diff --git a/src/pages/modules/style.stylus b/src/pages/modules/style.stylus index cbb1381..ee660bb 100644 --- a/src/pages/modules/style.stylus +++ b/src/pages/modules/style.stylus @@ -35,34 +35,72 @@ left 2% .content_wraper height calc(100% - 26px) - padding 0 2% + padding 13px 2% .item_wraper padding-right 3% .info_item - height 66px - padding 3px - border 1px solid #168abd - border-radius 4px - &:nth-child(3n+1), &:nth-child(3n+3) - width 30% + width 32% + height 50px + // padding 3px + border-left 2px solid #00fcff + // border-radius 4px &:nth-child(3n+2) - width 36% margin-left 2% margin-right 2% &:nth-child(4), &:nth-child(5), &:nth-child(6), &:nth-child(7), &:nth-child(8), &:nth-child(9) - margin-top 6px + margin-top 12px .info_item_i - border-radius 2px - box-shadow inset 0px 0px 5px 3px #1198bf + // border-radius 2px + box-shadow inset 3px 0px 3px 0px rgba(17, 152, 191, 70%) + padding 5px 10px + background linear-gradient(45deg, rgba(22, 138, 189, 1), transparent) +.info_item_1 + width 48.5% + height 84px + // padding 3px + border 1px solid #168abd + // border-radius 4px + margin-top 14px +.info_item_1_i + height 100% + box-shadow inset 0px 0px 1px 1px rgba(17, 152, 191, 70%) + padding 0 16px + background linear-gradient(to top, rgba(22, 138, 189, 1), transparent) +.item_label_1 + height 28px + font-size 18px + line-height 28px + color #f2a045 + font-style italic + // text-shadow: 0 0 1px #f6ba77, + // 0 0 1px #f6ba77, + // 0 0 1px #f6ba77, + // 0 0 1px #f6ba77; +.item_value_1 + display flex + align-items center + height calc(100% - 24px) + font-size 34px + line-height 32px + color #fefb2d + font-weight 700 + .item_unit + font-size 16px .item_label + width 85px font-size 13px line-height 13px - color #fff - text-align right + color #d2eff8 + text-align left + text-shadow: 0 0 1px #5bd0f5, + 0 0 1px #5bd0f5, + 0 0 1px #5bd0f5, + 0 0 1px #5bd0f5; .item_value - font-size 14px - line-height 14px - color #5bd0f5 + width calc(100% - 85px) + font-size 15px + line-height 15px + color #fff font-weight 700 text-align center .item_unit @@ -70,15 +108,32 @@ color #fff font-weight 400 padding-left 5px +.item_value_input + width calc(100% - 85px) + font-size 14px + line-height 30px + color #fff + font-weight 700 + background-color transparent + border-bottom 1px solid #fff + text-align center +.info_icon + width 70px + height 70px + background center / 100% auto url('../../images/icon_1.png') no-repeat +.info_icon_2 + background-image url('../../images/icon_2.png') +.info_item_2 + width 100% .tip_wraper - height 100% - padding 3% 2% 0 2% + height calc(100% - 50px) + padding-top 16px .tip_wraper_bg1 - background center 90% / 100% auto url('../../images/bg_tip.png') no-repeat + background center bottom / auto 76% url('../../images/bg_tip.png') no-repeat .tip_txt color #00c8ed .tip_wraper_bg2 - background center 90% / 100% auto url('../../images/bg_tip_1.png') no-repeat + background center bottom / auto 76% url('../../images/bg_tip_1.png') no-repeat .tip_txt color #9d5a00 .tip_txt diff --git a/src/style/reset.css b/src/style/reset.css index d874c52..e3f9e71 100644 --- a/src/style/reset.css +++ b/src/style/reset.css @@ -236,6 +236,10 @@ div, p { width: 4.16667% } +.height-100 { + height: 100%; +} + .pointer { cursor: pointer; }