From c69520d5acd02727363853a0bcb029877ae03803 Mon Sep 17 00:00:00 2001 From: xiangxy Date: Tue, 14 May 2024 15:17:47 +0800 Subject: [PATCH] change --- src/config/mork00.js | 17 +++++++--- src/pages/modules/InStore.vue | 57 ++++++++++----------------------- src/pages/modules/Prod.vue | 60 ++++++++++++++++++++--------------- 3 files changed, 64 insertions(+), 70 deletions(-) diff --git a/src/config/mork00.js b/src/config/mork00.js index 52554d7..8033d16 100644 --- a/src/config/mork00.js +++ b/src/config/mork00.js @@ -24,7 +24,17 @@ export const rk = () => { let res = { 'wrk': [ { - 'supplierName': '', + 'supplierName': '四川永祥光伏科技有限公司', + 'palletSN': 'FCS20231206001', + 'qty': '122.74', + 'incomingWeight': '122.74', + 'productDescription': 'N型单晶硅粘棒182X182', + 'productName': '220100043' + } + ], + 'kn': [ + { + 'supplierName': '四川永祥光伏科技有限公司', 'palletSN': 'FCS20231206001', 'qty': '122.74', 'incomingWeight': '122.74', @@ -32,7 +42,6 @@ export const rk = () => { 'productName': '220100043' } ], - 'kn': [], 'kc': { 'pendSum': '2', 'pendWeight': '0.12', @@ -83,10 +92,10 @@ export const sc = () => { let res = { 'pt': [ { - 'supplierName': '', + 'supplierName': '四川永祥光伏科技有限公司限公司', 'number': '', 'usedTime': '215', - 'batch': '20240409', + 'batch': '20240409172647', 'state': '回温完成', 'standingTime': '', 'productDescription': '', diff --git a/src/pages/modules/InStore.vue b/src/pages/modules/InStore.vue index ad19f80..60180d1 100644 --- a/src/pages/modules/InStore.vue +++ b/src/pages/modules/InStore.vue @@ -5,7 +5,7 @@
-
+
库存情况
@@ -41,7 +41,7 @@
-
+
货位占用
@@ -80,8 +80,8 @@
-
-
+
+
库内物料
@@ -113,39 +113,6 @@
-
-
-
未入库物料
-
-
-
-
    -
  • 序号
    • -
  • 托盘号
    • -
  • 物料编码
    • -
  • 名称
    • - -
  • 重量(kg)
    • -
  • 供应商
    • -
-
- -
    -
  • -
    {{i + 1}}
    -
    {{e.palletSN}}
    -
    {{e.productName}}
    -
    {{e.productDescription}}
    - -
    {{e.incomingWeight}}
    -
    {{e.supplierName}}
    -
    • -
- -
-
-
-
@@ -342,6 +309,8 @@ export default { padding 30px 25.09px 0 overflow hidden clear both +.bottom_wrap + width 100% .sec width 100% height 50% @@ -419,6 +388,10 @@ export default { padding 0 10px .item_tip_bg_l background center center / 100% 100% url(../../images/screen1/bg_title_j.png) no-repeat +.item_tip_bg_s + background center center / 100% 100% url(../../images/screen1/bg_title_s.png) no-repeat +.item_tip_bg_m + background center center / 100% 100% url(../../images/screen1/bg_title_l.png) no-repeat .item_tip_left _wh(60%, 100%) font-family "SourceHanSansCN" @@ -464,13 +437,17 @@ export default { float left _wh(23%, 30px) _fj(center) - _font(12px, 44px, #fff,,center) + font-size: 12px; + // line-height: 44px; + color: #fff; + font-weight: normal; + text-align: center; word-wrap break-word word-break break-all - white-space nowrap + // white-space nowrap padding 0 2px // overflow hidden - scale 0.61 + scale 0.9 .lbox .list-con .li diff --git a/src/pages/modules/Prod.vue b/src/pages/modules/Prod.vue index b95f19a..0be050a 100644 --- a/src/pages/modules/Prod.vue +++ b/src/pages/modules/Prod.vue @@ -4,35 +4,35 @@
-
+
普通回温库物料
    -
  • 序号
    • +
  • 序号
  • 货号
  • 供应商
  • 型号
  • 回温批次
    • -
  • 数量(托)
    • -
  • 需回温时间(h)
    • -
  • 已回温时间(h)
    • -
  • 状态
    • +
  • 数量(托)
    • +
  • 需回温时间(h)
    • +
  • 已回温时间(h)
    • +
  • 状态
  • -
    {{i + 1}}
    +
    {{i + 1}}
    {{e.productName}}
    {{e.supplierName}}
    {{e.productDescription}}
    {{e.batch}}
    -
    {{e.number}}
    -
    {{e.standingTime}}
    -
    {{e.usedTime}}
    -
    {{e.state}}
    +
    {{e.number}}
    +
    {{e.standingTime}}
    +
    {{e.usedTime}}
    +
    {{e.state}}
 @@ -41,35 +41,35 @@
-
+
快速回温库物料
    -
  • 序号
    • +
  • 序号
  • 货号
  • 供应商
  • 型号
  • 回温批次
    • -
  • 数量(托)
    • -
  • 需回温时间(h)
    • -
  • 已回温时间(h)
    • -
  • 状态
    • +
  • 数量(托)
    • +
  • 需回温时间(h)
    • +
  • 已回温时间(h)
    • +
  • 状态
  • -
    {{i + 1}}
    +
    {{i + 1}}
    {{e.productName}}
    {{e.supplierName}}
    {{e.productDescription}}
    {{e.batch}}
    -
    {{e.number}}
    -
    {{e.standingTime}}
    -
    {{e.usedTime}}
    -
    {{e.state}}
    +
    {{e.number}}
    +
    {{e.standingTime}}
    +
    {{e.usedTime}}
    +
    {{e.state}}
 @@ -308,6 +308,10 @@ export default { padding 0 10px .item_tip_bg_l background center center / 100% 100% url(../../images/screen1/bg_title_j.png) no-repeat +.item_tip_bg_s + background center center / 100% 100% url(../../images/screen1/bg_title_s.png) no-repeat +.item_tip_bg_m + background center center / 100% 100% url(../../images/screen1/bg_title_l.png) no-repeat .item_tip_left _wh(60%, 100%) font-family "SourceHanSansCN" @@ -328,7 +332,7 @@ export default { border-bottom 1px solid rgba(8,205,248,0.3) li float left - width 11% + width 15% _font(12px,30px,#78B1DE,,center) word-wrap break-word word-break break-all @@ -350,14 +354,18 @@ export default { box-shadow inset 0px 1px 0px 0px rgba(13,89,115,0.3) .scroll-ul_2_div float left - _wh(11%, 44px) + _wh(15%, 44px) _fj(center) - _font(12px, 44px, #fff,,center) + font-size: 12px; + color: #fff; + font-weight: normal; + text-align: center; word-wrap break-word word-break break-all white-space nowrap padding 0 2px - overflow hidden + // overflow hidden + scale 0.8 .cblue div color #32C5FF !important .cgreen div