diff --git a/pages/inWarehouse/inWarehouse.vue b/pages/inWarehouse/inWarehouse.vue index a4fe608..8be97a4 100644 --- a/pages/inWarehouse/inWarehouse.vue +++ b/pages/inWarehouse/inWarehouse.vue @@ -17,7 +17,8 @@ 请扫箱码 - + + @@ -25,9 +26,11 @@ {{this.isStrict?'':'外协'}}入库清单 - 上次批次号:{{ newMaterialList[newMaterialList.length - 2].patchCode }} + + 上次批次号:{{ newMaterialList[newMaterialList.length - 2].patchCode }} 上次批次号: - + + - - + 全部重置 + 入库 + .title-box { + margin-top: 54px; + margin-bottom: 20px; + height: 60px; + font-size: 26px; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + } + + .warehoseInfo-box { + font-size: 20px; + width: 94%; + margin: 0 auto; + padding-left: 10px; + padding-right: 10px; + background-color: aliceblue; + border-radius: 10px; + display: flex; + flex-direction: column; + } + + .warehoseInfo-box .row { + display: flex; + flex-direction: row; + } + + .warehoseInfo-box .row .col { + width: 50%; + } + + .aciton-box { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + } + + .color1 { + color: brown; + } + + .color2 { + color: orange; + } + + .pda-search-box { + margin-bottom: 5px; + } + + .list-box { + width: 100%; + } + + .scroll-view-title { + font-size: 24px; + display: flex; + align-items: center; + justify-content: center; + color: #151515; + } + + .scroll-view-box { + width: 94%; + margin: 0 auto; + margin-top: 30px; + height: 400px; + padding: 10px; + background-color: rgba(179, 179, 179, 0.7); + border-radius: 5px; + } + + .scroll-view-last { + width: 100%; + height: 60px; + font-size: 20px; + color: rgba(0, 9, 0, 0.7); + display: flex; + flex-direction: column; + justify-content: center; + margin-top: 10px; + padding-left: 10px; + padding-right: 10px; + border-radius: 10px; + background-color: white; + } + + .button-box { + width: 80%; + margin: 10px auto; + display: flex; + align-items: center; + justify-content: center; + } + \ No newline at end of file diff --git a/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue b/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue index 3b3c016..f14c059 100644 --- a/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue +++ b/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue @@ -94,13 +94,13 @@ - + - + @@ -196,6 +196,8 @@ }, sectionChange(index) { this.current = index; + this.start_point = ''; + this.end_point = ''; }, // scrolltolower() { // this.loadmore(); diff --git a/pages/materialManagement/MaterialWarehousing/MaterialWarehousing.vue b/pages/materialManagement/MaterialWarehousing/MaterialWarehousing.vue new file mode 100644 index 0000000..c1f4742 --- /dev/null +++ b/pages/materialManagement/MaterialWarehousing/MaterialWarehousing.vue @@ -0,0 +1,185 @@ + + + + + \ No newline at end of file