From 803033cc4e734ac9eb3062f215b654b4ae9d02c4 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 24 一月 2025 18:16:14 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
h5/pages/inventory/index.vue | 100 +++++++++++++++++++++++++++----------------------
1 files changed, 55 insertions(+), 45 deletions(-)
diff --git a/h5/pages/inventory/index.vue b/h5/pages/inventory/index.vue
index 9181d91..56dd855 100644
--- a/h5/pages/inventory/index.vue
+++ b/h5/pages/inventory/index.vue
@@ -8,36 +8,39 @@
</view>
</view>
<!-- -->
- <view class="list">
- <view class="item" @click="itemClick(item)" v-for="item in list">
- <image v-if="item.status == 0 || item.status == 1" class="img" src="@/static/side/ic_pandian@2x.png" mode="">
- </image>
- <image v-else class="img" src="@/static/side/ic_pandian_grey@2x.png" mode=""></image>
- <view class="content">
- <view class="head">
- <view class="title">{{item.name}}</view>
- <view class="status" v-if="item.status == 0">鏈紑濮�</view>
- <view class="status green" v-if="item.status == 1">鐩樼偣涓�</view>
- <view class="status gray" v-if="item.status == 2">宸插畬鎴�</view>
- <view class="status gray" v-if="item.status == 3">宸插彇娑�</view>
- </view>
- <view class="line">鐩樼偣鏃ユ湡锛歿{item.planDate}}</view>
- <view class="line">鐩樼偣浠撳簱锛歿{item.warehouseName}}</view>
- <view class="line">
- <view class="">鐩樼偣浜哄憳锛歿{item.userName}}</view>
- <view class="btn" v-if="item.status == 0" @click="startHandle(item)">寮�濮嬬洏鐐�</view>
+ <scroll-view scroll-y="true" class="scroll_Y" @scrolltolower="scrolltolower">
+ <view class="list">
+ <view class="item" @click="itemClick(item)" v-for="item in list">
+ <image v-if="item.status == 0 || item.status == 1" class="img" src="@/static/side/ic_pandian@2x.png" mode="">
+ </image>
+ <image v-else class="img" src="@/static/side/ic_pandian_grey@2x.png" mode=""></image>
+ <view class="content">
+ <view class="head">
+ <view class="title">{{item.name}}</view>
+ <view class="status" v-if="item.status == 0">鏈紑濮�</view>
+ <view class="status green" v-if="item.status == 1">鐩樼偣涓�</view>
+ <view class="status gray" v-if="item.status == 2">宸插畬鎴�</view>
+ <view class="status gray" v-if="item.status == 3">宸插彇娑�</view>
+ </view>
+ <view class="line">鐩樼偣鏃ユ湡锛歿{item.planDate}}</view>
+ <view class="line">鐩樼偣浠撳簱锛歿{item.warehouseName}}</view>
+ <view class="line">
+ <view class="">鐩樼偣浜哄憳锛歿{item.userName}}</view>
+ <view class="btn" v-if="item.status == 0 && item.timeFlag" @click="startHandle(item)">寮�濮嬬洏鐐�</view>
+ </view>
</view>
</view>
</view>
- </view>
+ </scroll-view>
</view>
</template>
<script>
import {
- getYwStocktaking,
+ getYwStocktaking,
ywStocktakingBegin
- } from '@/api'
+ } from '@/api'
+ import dayjs from 'dayjs';
export default {
data() {
return {
@@ -63,29 +66,33 @@
...param
}
}).then(res => {
- this.list = [...this.list, ...res.data.records]
+ this.list = [...this.list, ...res.data.records]
+ let date = dayjs().format('YYYY-MM-DD')
+ this.list.forEach(item => {
+ item.timeFlag = new Date(item.planDate).getTime() <= new Date(date+' 23:59:59').getTime()
+ })
this.total = res.data.total
})
- },
- itemClick(item) {
- if(item.status == 1){
- uni.navigateTo({
- url: '/pages/inventory/detail?id=' + item.id
- })
- }
+ },
+ itemClick(item) {
+ if (item.status != 0) {
+ uni.navigateTo({
+ url: '/pages/inventory/detail?id=' + item.id
+ })
+ }
},
startHandle(item) {
uni.showModal({
content: '鐩樼偣鏈熼棿涓嶅彲杩涜鍑哄叆搴撴搷浣�',
success: (res) => {
- if (res.confirm) {
- ywStocktakingBegin(item.id).then(() => {
- uni.navigateTo({
- url: '/pages/inventory/detail?id=' + item.id
- })
+ if (res.confirm) {
+ ywStocktakingBegin(item.id).then(() => {
+ uni.navigateTo({
+ url: '/pages/inventory/detail?id=' + item.id
+ })
})
-
- }
+
+ }
}
})
},
@@ -112,15 +119,14 @@
<style lang="scss">
.main_app {
- padding: 10rpx 30rpx 0;
+ padding: 0rpx 30rpx 0;
font-size: 28rpx;
}
.head_wrap {
display: flex;
align-items: center;
- margin-bottom: 40rpx;
-
+ height: 110rpx;
.search_wrap {
display: flex;
align-items: center;
@@ -141,15 +147,16 @@
}
}
-
+ .scroll_Y{
+ height: calc(100vh - 126rpx);
+ }
.list {
- height: calc(100vh - 136rpx);
-
.item {
display: flex;
border-bottom: 1rpx solid #E5E5E5;
padding-bottom: 28rpx;
margin-bottom: 20rpx;
+
.img {
width: 80rpx;
height: 80rpx;
@@ -163,18 +170,21 @@
.head {
display: flex;
- align-items: center;
+ // align-items: center;
justify-content: space-between;
margin-bottom: 12rpx;
.title {
font-weight: 600;
font-size: 34rpx;
- color: #222222;
+ color: #222222;
+ flex: 1;
}
.status {
- color: $primaryColor;
+ color: $primaryColor;
+ width: 96rpx;
+ padding-top: 3rpx;
}
.green {
--
Gitblit v1.9.3