From 5b9b86b960555b54114995b519f83387a9d70c55 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Tue, 10 Dec 2024 10:36:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../new-purchase/accept/acceptDetails.vue | 17 +- src/pages/new-purchase/accept/index.vue | 225 +++++++++++------- src/pages/new-purchase/bind/index.vue | 29 ++- src/pages/new-purchase/entry/details.vue | 44 ++-- src/pages/new-purchase/entry/inEntry.vue | 44 ++-- src/pages/new-purchase/entry/index.vue | 51 ++-- 6 files changed, 232 insertions(+), 178 deletions(-) diff --git a/src/pages/new-purchase/accept/acceptDetails.vue b/src/pages/new-purchase/accept/acceptDetails.vue index c01a332..58957e3 100644 --- a/src/pages/new-purchase/accept/acceptDetails.vue +++ b/src/pages/new-purchase/accept/acceptDetails.vue @@ -1,7 +1,16 @@ @@ -143,36 +177,47 @@ onLoad((options) => { display: flex; align-items: center; box-sizing: content-box; + margin-bottom: 10rpx; } .search { - height: 70rpx; + height: 60rpx; background-color: #3784fb; text-align: center; - line-height: 70rpx; + line-height: 60rpx; color: #fff; + border-radius: 10rpx; } } -.table-list-item { - margin: 20rpx 0; - padding: 20rpx; - background-color: #fff; - min-height: 300rpx; - border-radius: 10rpx; - .title { - display: flex; - justify-content: space-between; - align-items: center; - } - .cont { - display: flex; - justify-content: flex-end; - line-height: 1.9; - } - .line { - margin: 20rpx 0; - height: 1px; - background-color: #e8e8e8; - } +.scroll-container { + .table-list-item { + margin: 20rpx 0; + padding: 20rpx; + background-color: #fff; + min-height: 300rpx; + border-radius: 10rpx; + .title { + display: flex; + justify-content: space-between; + align-items: center; + } + .cont { + display: flex; + justify-content: flex-end; + line-height: 1.9; + } + .line { + margin: 20rpx 0; + height: 1px; + background-color: #e8e8e8; + } + } +} +// 加载提示文字 +.loading-text { + text-align: center; + font-size: 28rpx; + color: #666; + padding: 20rpx 0; } diff --git a/src/pages/new-purchase/bind/index.vue b/src/pages/new-purchase/bind/index.vue index 116f0e0..d4a02d4 100644 --- a/src/pages/new-purchase/bind/index.vue +++ b/src/pages/new-purchase/bind/index.vue @@ -12,7 +12,7 @@ --> - + - - + + + + - - 搜索 + + 搜索 - +
到货时间: @@ -105,7 +102,7 @@ const queryParams = ref({ keyWord: '', // 关键字 statusList: [3, 13], // 状态 pageNum: 1, - pageSize: 3, + pageSize: 5, }) // 日期 change 事件 @@ -140,7 +137,7 @@ const getTableList = async (isTap = false) => { onShow(() => { tableList.value = [] total.value = 0 - getTableList() + getTableList(true) }) // 滚动触底事件 @@ -205,14 +202,16 @@ const maskClick = () => {} display: flex; align-items: center; box-sizing: content-box; + margin-bottom: 10rpx; } .search { - height: 65rpx; + height: 60rpx; background-color: #3784fb; text-align: center; - line-height: 65rpx; + line-height: 60rpx; color: #fff; + border-radius: 10rpx; } .scroll-container { diff --git a/src/pages/new-purchase/entry/details.vue b/src/pages/new-purchase/entry/details.vue index fba32aa..1f859cb 100644 --- a/src/pages/new-purchase/entry/details.vue +++ b/src/pages/new-purchase/entry/details.vue @@ -13,51 +13,49 @@ - + +
+ 新购入库 +
- {{ index + 1 }} - 物资名称: + + 物资名称: {{ item.maTypeName }} - {{ index + 1 }} - 规格型号: + + 规格型号: {{ item.typeName }} - {{ index + 1 }} - 到货数量: + + 采购数量: - {{ }} + {{ item.purchaseNum }} - {{ index + 1 }} - 已入库数量: + + 已入库数量: - {{ }} + {{ item.inputNum }} - {{ index + 1 }} - 待入库数量: + + 待入库数量: - {{ }} + {{ (item.purchaseNum-item.inputNum) }} - {{ index + 1 }} - 管理模式: + + 管理模式: - {{ index + 1 }} - 状态: + + 状态: - + +
+ 新购入库 +
- {{ index + 1 }} - 物资名称: + + 物资名称: {{ item.maTypeName }} - {{ index + 1 }} - 规格型号: + + 规格型号: {{ item.typeName }} - {{ index + 1 }} - 到货数量: + + 采购数量: - {{ }} + {{ item.purchaseNum }} - {{ index + 1 }} - 已入库数量: + + 已入库数量: - {{ }} + {{ item.inputNum }} - {{ index + 1 }} - 待入库数量: + + 待入库数量: - {{ }} + {{ (item.purchaseNum-item.inputNum) }} - {{ index + 1 }} - 管理模式: + + 管理模式: - {{ index + 1 }} - 状态: + + 状态:
- + + @change="onChangeDate" + placeholder="选择日期范围" + /> - - + + + + - + - - 搜索 + + 搜索 @@ -44,28 +47,28 @@
- 到货时间: -
{{ item.arrivalTime }}
+ 到货时间: +
{{ item.arrivalTime }}
- 采购单号: -
{{ item.code }}
+ 采购单号: +
{{ item.code }}
- 采购物资: -
{{ item.purchaseMaTypeName }}
+ 采购物资: +
{{ item.purchaseMaTypeName }}
- 采购数量: -
{{ item.purchaseMaNumber }}
+ 采购数量: +
{{ item.purchaseMaNumber }}
- 已入库数量: -
{{ }}
+ 已入库数量: +
{{ }}
- 待入库数量: -
{{ }}
+ 待入库数量: +
{{ }}
@@ -96,7 +99,7 @@ const queryParams = ref({ // statusList: [19], // 状态 taskStatus: 22, pageNum: 1, - pageSize: 3, + pageSize: 5, }) // 日期 change 事件 @@ -198,7 +201,7 @@ const maskClick = () => {} onShow(() => { tableList.value = [] - getTableList() + getTableList(true) }) // 滚动触底事件