diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index 8370652..1d8cd8e 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -985,7 +985,6 @@
{{item.createTime}}
-
@@ -1411,7 +1410,7 @@
const lefttarget = ref(0);
const clickLeftMenu = (index : any, item : any) => {
let num = Math.ceil((index + 1))
- leftscrolltop.value = (num - 2) * 180;
+ leftscrolltop.value = (num - 2) * 178;
lefttarget.value = index;
form.cgdId = plsbuy.value[index].id
form.pageNo = 1
diff --git a/pages/Warehouse/warehome.vue b/pages/Warehouse/warehome.vue
index 660a870..b96d961 100644
--- a/pages/Warehouse/warehome.vue
+++ b/pages/Warehouse/warehome.vue
@@ -1,7 +1,7 @@
-
+
@@ -11,11 +11,11 @@
-
-
+
+
-
+
@@ -273,7 +273,7 @@
white-space: nowrap;
z-index: 70;
&:nth-child(1){
- top: 36.5vw;
+ bottom: 33.5vh;
left: 20.5vw;
}
&:nth-child(2){
@@ -331,6 +331,7 @@
top: 30vw;
right: 9.2vw;
z-index: 60;
+ overflow: auto;
image{
position: absolute;
top: 0;
diff --git a/pages/procurement/components/Inventory.vue b/pages/procurement/components/Inventory.vue
index cffb3fc..e927fe1 100644
--- a/pages/procurement/components/Inventory.vue
+++ b/pages/procurement/components/Inventory.vue
@@ -360,7 +360,7 @@
margin: 0 auto;
align-items: center;
view{
- width: 5.5vw;
+ min-width: 5.5vw;
height: 1.8vw;
border-radius: 0.9vw;
border: 1px solid #D2D2D2;
@@ -371,6 +371,15 @@
font-weight: 400;
font-size: 1vw;
color: #555555;
+ &:nth-child(1),&:nth-child(2){
+ max-width: 6vw;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ display: block;
+ line-height: 1.8vw;
+ text-align: center;
+ }
}
}
>image{
diff --git a/pages/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue
index a9070e5..8cf0a81 100644
--- a/pages/procurement/components/calculator.vue
+++ b/pages/procurement/components/calculator.vue
@@ -593,7 +593,6 @@
align-items: center;
background: url('/static/index/procurement/bt.png') no-repeat;
background-size: 100% 100%;
- border-radius: 25rpx;
font-size: 42rpx;
font-weight: 500;
margin: 12rpx 20rpx 0 20rpx;
@@ -605,6 +604,7 @@
color: #fff;
font-size: 45rpx;
font-weight: 500;
+ border-radius: 2.6vw;
}
}
diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue
index d99d361..be5e101 100644
--- a/pages/procurement/components/carditem.vue
+++ b/pages/procurement/components/carditem.vue
@@ -402,13 +402,22 @@
font-size: 1vw;
color: #555555;
padding: 0 0.25vw;
+ &:nth-child(1),&:nth-child(2){
+ max-width: 6vw;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ display: block;
+ line-height: 1.8vw;
+ text-align: center;
+ }
}
}
>image {
- width: 9vw;
- height: 8vw;
- margin: 1vw auto 0;
+ width: 8.5vw;
+ height: 7.5vw;
+ margin: 1.25vw auto 0.25vw;
}
}
}
diff --git a/pages/procurement/components/carlist.vue b/pages/procurement/components/carlist.vue
index aad40f9..d89f14e 100644
--- a/pages/procurement/components/carlist.vue
+++ b/pages/procurement/components/carlist.vue
@@ -315,11 +315,11 @@
.msitem {
width: 25vw;
height: 100%;
- padding:0.5vw 1vw 1vw;
+ padding:1vw 1vw 1vw;
display: inline-block;
>view {
- margin-top: 0.65vw;
+ margin-top: 0.25vw;
&:nth-child(5) {
width: 28vw;
@@ -328,7 +328,7 @@
justify-content: space-between;
position: relative;
left: 0;
- top: 0.3vw;
+ top: 1.3vw;
>view {
width: 25%;
height: 100%;
@@ -386,7 +386,7 @@
justify-content: space-between;
align-items: center;
height: 2vw;
-
+ margin-bottom: 1vw;
>view {
width: 19vw;
height: 2vw;
@@ -417,13 +417,13 @@
display: inline-flex;
flex-direction: column;
position: relative;
- top: -3.5vw;
+ top: -1.5vw;
.cardp {
width: 12.5vw;
height: 4vw;
display: flex;
flex-wrap: wrap;
- margin: 1vw auto 0;
+ margin: 0 auto 0;
align-items: center;
view {
@@ -439,13 +439,22 @@
font-size: 1vw;
color: #555555;
padding: 0 0.5vw;
+ &:nth-child(1),&:nth-child(2){
+ max-width: 6vw;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ display: block;
+ line-height: 1.8vw;
+ text-align: center;
+ }
}
}
>image {
width: 9vw;
height: 8vw;
- margin: 1vw auto 0;
+ margin: 0 auto 0;
border-radius: 1.1vw;
}
}
diff --git a/pages/procurement/components/details.vue b/pages/procurement/components/details.vue
index c226831..37cdcbf 100644
--- a/pages/procurement/components/details.vue
+++ b/pages/procurement/components/details.vue
@@ -372,6 +372,15 @@
font-weight: 400;
font-size: 1vw;
color: #555555;
+ &:nth-child(1),&:nth-child(2){
+ max-width: 6vw;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ display: block;
+ line-height: 1.8vw;
+ text-align: center;
+ }
}
}
>image{
diff --git a/pages/procurement/components/inboundoutbound.vue b/pages/procurement/components/inboundoutbound.vue
index 36cf047..dcfcdf1 100644
--- a/pages/procurement/components/inboundoutbound.vue
+++ b/pages/procurement/components/inboundoutbound.vue
@@ -1,20 +1,6 @@
-
出入库
@@ -95,7 +81,7 @@
.crkscroll {
width: 100%;
- height: calc(85vh - 13vw);
+ height: calc(85vh - 14vw);
.cgrk {
width: 100%;
@@ -162,11 +148,11 @@
display: flex;
flex-direction: column;
justify-content: space-between;
- padding: 1vw 1.5vw;
+ padding: 1vw 0 0 1.5vw;
>view {
display: flex;
-
+ margin-left: 1.5vw;
&:nth-child(2) {
justify-content: space-between;
diff --git a/pages/procurement/components/purorder.vue b/pages/procurement/components/purorder.vue
index 4ab346a..ada814f 100644
--- a/pages/procurement/components/purorder.vue
+++ b/pages/procurement/components/purorder.vue
@@ -471,6 +471,15 @@
font-size: 1vw;
color: #555555;
padding:0 0.5vw;
+ &:nth-child(1),&:nth-child(2){
+ max-width: 6vw;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ display: block;
+ line-height: 1.8vw;
+ text-align: center;
+ }
}
}
diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue
index 885bf98..c9182e6 100644
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@@ -7,6 +7,8 @@
@click="search(0)">
+
+
检索
@@ -760,8 +762,7 @@
width: 7.3vw;
height: 3.3vw;
border-radius: 1.6vw;
- border: 1px solid rgba(85, 85, 85, 0.5);
- background: rgba(255, 255, 255, 0.5);
+ background: rgba(255, 255, 255, 1);
border-radius: 1.65vw;
font-weight: 400;
font-size: 1.4vw;
@@ -772,6 +773,8 @@
position: absolute;
right: 0.5vw;
top: 0.2vw;
+ border: 1px solid #D9DADC;
+
image {
width: 1.5vw;
height: 1.3vw;
@@ -791,13 +794,26 @@
display: flex;
justify-content: center;
align-items: center;
- width: 7vw;
+ width: 7.3vw;
height: 3.3vw;
margin: 0 0 0 1.2vw;
background: rgba(255, 255, 255, 0.6);
border: 1px solid #D9DADC;
color: #555555;
- box-shadow: 0.5rpx 5rpx 5rpx #dadee1;
+ image {
+ width: 1.5vw;
+ height: 1.3vw;
+ margin: 0 0.5vw 0 0;
+ }
+ }
+ .shr{
+ display: none;
+ }
+ .scr:active .sh{
+ display: none;
+ }
+ .scr:active .shr{
+ display: inline-block;
}
.shx {
@@ -812,7 +828,6 @@
display: flex;
justify-content: center;
align-items: center;
- box-shadow: 0.5rpx 5rpx 5rpx #dadee1;
margin: 0 0 0 0.7vw;
color: #555555;
diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue
index 4e681d1..903a679 100644
--- a/pages/procurement/materialcar.vue
+++ b/pages/procurement/materialcar.vue
@@ -8,6 +8,7 @@
@click="search(0)">
+
检索
@@ -268,10 +269,10 @@
justify-content: flex-end;
view{
- width: 8vw;
+ width: 7.3vw;
height: 3.3vw;
border: 1px solid #D9DADC;
- background: rgba(255, 255, 255, 0.9);
+ background: rgba(255, 255, 255, 1);
border-radius: 1.65vw;
font-weight: 400;
font-size: 1.4vw;
@@ -281,9 +282,10 @@
align-items: center;
margin-left:0.6vw;
color: #555555;
+ border: 1px solid #D9DADC;
image {
- width: 2vw;
- height: 2vw;
+ width: 1.5vw;
+ height: 1.3vw;
margin: 0 0.5vw 0 0;
}
}
@@ -314,8 +316,7 @@
width: 8vw;
height: 3.3vw;
border-radius: 1.6vw;
- border: 1px solid rgba(85, 85, 85, 0.5);
- background: rgba(255, 255, 255, 0.5);
+ background: rgba(255, 255, 255, 1);
border-radius: 1.65vw;
font-weight: 400;
font-size: 1.4vw;
@@ -324,6 +325,7 @@
justify-content: center;
align-items: center;
margin-left:0.6vw;
+ border: 1px solid #D9DADC;
image {
width: 1.5vw !important;
height: 1.5vw !important;
@@ -343,19 +345,23 @@
display: flex;
justify-content: center;
align-items: center;
- width: 8vw;
+ width: 7.3vw;
height: 3.3vw;
margin: 0 0 0 1.2vw;
- background: rgba(255, 255, 255, 0.6);
+ background: rgba(255, 255, 255, 1);
border: 1px solid #D9DADC;
color: #555555;
- box-shadow: 0.5rpx 5rpx 5rpx #dadee1;
+ image {
+ width: 1.5vw;
+ height: 1.3vw;
+ margin: 0 0.5vw 0 0;
+ }
}
.shx {
- width: 8.2vw;
+ width: 7.3vw;
height: 3.3vw;
- background: rgba(255, 255, 255, 0.6);
+ background: rgba(255, 255, 255, 1);
border-radius: 1.65vw;
border: 1px solid #D9DADC;
font-weight: 400;
@@ -364,7 +370,6 @@
display: flex;
justify-content: center;
align-items: center;
- box-shadow: 0.5rpx 5rpx 5rpx #dadee1;
margin: 0 0 0 1.2vw;
color: #555555;
diff --git a/static/index/procurement/sh.png b/static/index/procurement/sh.png
new file mode 100644
index 0000000..9f35c47
Binary files /dev/null and b/static/index/procurement/sh.png differ
diff --git a/static/index/procurement/shr.png b/static/index/procurement/shr.png
new file mode 100644
index 0000000..ae57d1e
Binary files /dev/null and b/static/index/procurement/shr.png differ
diff --git a/static/index/warehouse/home/pu1.gif b/static/index/warehouse/home/pu1.gif
index e904130..0ac14fc 100644
Binary files a/static/index/warehouse/home/pu1.gif and b/static/index/warehouse/home/pu1.gif differ
diff --git a/static/index/warehouse/home/pu3.gif b/static/index/warehouse/home/pu3.gif
new file mode 100644
index 0000000..07eaa54
Binary files /dev/null and b/static/index/warehouse/home/pu3.gif differ