diff --git a/src/assets/TyLogo.png b/src/assets/TyLogo.png
new file mode 100644
index 0000000..a9a0f62
Binary files /dev/null and b/src/assets/TyLogo.png differ
diff --git a/src/views/cpcView/index.vue b/src/views/cpcView/index.vue
index ad40712..011bc60 100644
--- a/src/views/cpcView/index.vue
+++ b/src/views/cpcView/index.vue
@@ -20,9 +20,9 @@
:style="{ 'opacity': it.type == 4 ? '0' : '1' }">
{{ it.location_code }}
-
载具:LX00{{ ind }}
-
物料:包装袋
-
数量:10
+
载具:{{ it.carry_code }}
+
物料:{{ it.material_code }}
+
数量:{{ it.num }}
@@ -76,11 +76,9 @@ export default {
height: 860px;
margin: 30px;
overflow-y: scroll;
-
.box-x {
display: flex;
margin-bottom: 30px;
-
.index {
display: flex;
align-items: center;
@@ -88,7 +86,6 @@ export default {
width: 10px;
}
}
-
.item-x {
width: 50px;
height: 60px;
@@ -102,7 +99,7 @@ export default {
.lists {
line-height: 10px;
width: 100%;
- font-size: 8px;
+ font-size: 7px;
position: absolute;
top: 50%;
left: 50%;
diff --git a/src/views/index.vue b/src/views/index.vue
index 2792a1e..d836ed3 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -8,7 +8,13 @@
-
天益医疗
+

+
diff --git a/src/views/yclView/index.vue b/src/views/yclView/index.vue
index aebdf5b..f4357c1 100644
--- a/src/views/yclView/index.vue
+++ b/src/views/yclView/index.vue
@@ -12,9 +12,9 @@
-
载具:LX001
-
物料:包装袋
-
数量:10
+
载具:{{ it.carry_code }}
+
物料:{{ it.material_code }}
+
数量:{{ it.num }}
@@ -25,8 +25,8 @@
{{ it.location_code }}
载具:{{ it.carry_code }}
-
物料:包装袋
-
数量:10
+
物料:{{ it.material_code }}
+
数量:{{ it.num }}
@@ -72,9 +72,28 @@ export default {
const arr = [1]
const arrone = [3, 7, 10, 13, 14, 17]
// const obj = { type: 1, location_code: '', layer: '1' }
+
+ if (arrone.some(it => { return it == index + 1 })) {
+ for (let i = 1; i < 3; i++) {
+ item.splice(8, 0, { type: 4, location_code: '', layers: i })
+ }
+ for (let i = 1; i < 3; i++) {
+ item.splice(24, 0, { type: 4, location_code: '', layers: i })
+ }
+ if (index + 1 !== 17) {
+ for (let i = 1; i < 3; i++) {
+ item.splice(50, 0, { type: 4, location_code: '', layers: i })
+ }
+ } else {
+ for (let i = 1; i < 3; i++) {
+ item.splice(57, 0, { type: 4, location_code: '', layers: i })
+ }
+ }
+
+ }
if (arr.some(it => { return it !== index + 1 })) {
let fig = false
- if (index + 1 == 17 || index + 1 == 18) {
+ if (index + 1 == 18) {
for (let i = 1; i < 3; i++) {
item.splice(37, 0, { type: 4, location_code: '', layers: i })
}
@@ -87,18 +106,8 @@ export default {
// item.splice(36, 0, { type: 4, location_code: '', layers: i })
}
}
- if (arrone.some(it => { return it == index + 1 })) {
- for (let i = 1; i < 3; i++) {
- item.splice(8, 0, { type: 4, location_code: '', layers: i })
- }
- for (let i = 1; i < 3; i++) {
- item.splice(24, 0, { type: 4, location_code: '', layers: i })
- }
- for (let i = 1; i < 3; i++) {
- item.splice(52, 0, { type: 4, location_code: '', layers: i })
- }
- }
})
+ console.log(this.data, 99);
}).finally(e => { loading.close(); })
}
}
@@ -149,7 +158,7 @@ $sysColor: rgba(85, 110, 255, 0.9);
// text-align: center;
line-height: 10px;
width: 100%;
- font-size: 8px;
+ font-size: 7px;
// height: 100%;
// display: flex;
// justify-content: center;
@@ -171,7 +180,25 @@ $sysColor: rgba(85, 110, 255, 0.9);
border-right: 2px solid $sysColor;
// padding-bottom: 5px;
padding-left: 5px;
+
// margin-bottom: 5px;
+ // div {
+ // position: relative;
+ // }
+
+ // div:nth-child(18):before {
+ // width: 45px;
+ // height: 125px;
+ // content: "";
+ // border: solid 2px rgba(85, 110, 255, 0.9);
+ // padding: 2px;
+ // margin: 0 10px 0 0;
+ // position: absolute;
+ // top: 110%;
+ // left: 160%;
+ // transform: translate(-50%, -50%);
+ // }
+
}
.item-bo {
diff --git a/src/views/zccView/index.vue b/src/views/zccView/index.vue
index 632e469..1055a09 100644
--- a/src/views/zccView/index.vue
+++ b/src/views/zccView/index.vue
@@ -11,9 +11,9 @@
:style="{ 'opacity': it.type == 4 ? '0' : '1' }">
{{ it.location_code }}
-
载具:{{ it.carry_code }}
-
物料:包装袋
-
数量:10
+
载具:{{ it.carry_code }}
+
物料:{{ it.material_code }}
+
数量:{{ it.num }}
@@ -107,9 +107,9 @@ $sysColor: rgba(85, 110, 255, 0.9);
}
.item-x {
- width: 117px;
- height: 135px;
- margin-right: 10px;
+ width: 100px;
+ height: 115px;
+ margin-right: 25px;
// margin-bottom: 5px;
color: rgba(0, 0, 0, .5);
display: inline-grid;
@@ -119,7 +119,7 @@ $sysColor: rgba(85, 110, 255, 0.9);
.lists {
line-height: 20px;
width: 100%;
- font-size: 14px;
+ font-size: 12px;
position: absolute;
top: 50%;
left: 50%;
@@ -134,7 +134,7 @@ $sysColor: rgba(85, 110, 255, 0.9);
.item-top {
border: 2px solid $sysColor;
border-top: 0px;
- padding: 5px 5px 0 5px;
+ padding: 8px 8px 0 18px;
}
.item-top:last-child {