diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue index 909dc03..a12486d 100644 --- a/pages/Warehouse/picking.vue +++ b/pages/Warehouse/picking.vue @@ -2477,7 +2477,8 @@ .contain-right { z-index: 1; height: 100vh; - width: 62vw; + width: 60vw; + margin-left: 2%; overflow: hidden; .contain-right-title { @@ -2486,6 +2487,7 @@ display: flex; justify-content: flex-end; position: relative; + .contain-right-button { width: 7.3vw; @@ -2609,7 +2611,7 @@ position: fixed; height: 102vh; background-color: #fff; - width: 62.3vw; + width: 61vw; top:-5vh; right:-1vw; } @@ -3082,7 +3084,7 @@ .left-top-tags { position: absolute; top: -25rpx; - left: 0rpx; + left: 20rpx; } .juzhong { @@ -3147,7 +3149,7 @@ top: 0%; left: 50%; transform: translate(-50%, 0%); - width: 55%; + width: 50%; height: 100%; border-radius: 40rpx; background-color: #fff; @@ -3202,7 +3204,7 @@ .photowall-other { width: 107%; - height: 67vh; + height: 64vh; display: flex; margin-top: 20rpx; diff --git a/pages/procurement/inventory.vue b/pages/procurement/inventory.vue index 5fa0048..42bc137 100644 --- a/pages/procurement/inventory.vue +++ b/pages/procurement/inventory.vue @@ -27,7 +27,7 @@ v-for="(item,index) in tagsarray" @click="changetype(index)"> {{ item }} - + @@ -60,7 +60,7 @@ {{ item.pddNo }} - + {{ item.pddType_dictText }} @@ -138,7 +138,7 @@ 确定 - ({{ alltotal }}采购单) + ({{ alltotal }}盘点单) @@ -158,6 +158,10 @@ @click="plzinfo.pddType=`2`;firstgetqueryCgdList();selectType=2"> 已完成 + + 作废 + @@ -267,7 +271,7 @@ const openselect = ref(false); const manyselect = ref(false); const addshow = ref(false) - const tagsarray = ref(["全部", "盘点中", "已完成"]) + const tagsarray = ref(["全部", "盘点中", "已完成",'作废']) const cgrlist = ref([]); const props = defineProps({ isShow: { @@ -338,6 +342,10 @@ case 2: plzinfo.pddType = `2` break + case 3: + plzinfo.pddType = `3` + + break } firstgetqueryCgdList() @@ -753,7 +761,7 @@ } .left-selecttype { - width: 450rpx; + width: 550rpx; height: 70rpx; border-radius: 40rpx; // background-color: #FFFFFF;