From ba8ce4451b48b5902a307df075442bf016b5e4ae Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Mon, 11 Jan 2021 17:06:21 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master
---
hive-app/pages/workbench/stockSearch.vue | 108 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 94 insertions(+), 14 deletions(-)
diff --git a/hive-app/pages/workbench/stockSearch.vue b/hive-app/pages/workbench/stockSearch.vue
index 19b6bfa..2f993fd 100644
--- a/hive-app/pages/workbench/stockSearch.vue
+++ b/hive-app/pages/workbench/stockSearch.vue
@@ -1,31 +1,92 @@
<template>
<!-- 库存查询 -->
<view>
- <search-bar placeholder="商品名称、编号、拼音" class="ml-10 mr-10"></search-bar>
+ <search-bar @confirm="search" placeholder="商品名称、编号、拼音" class="ml-10 mr-10"></search-bar>
<view class="content">
- <navigator url="./storeRecord" hover-class="none" class="content-row flex align-center justify-between" v-for="item in 5">
+ <navigator :url="'./storeRecord?goodsCode='+item.goodsCode" hover-class="none" class="content-row" v-for="item in list">
<view class="flex align-center">
- <image class="product-img" src="../../static/images/product.jpg"></image>
- <view class="font-14 ml-10">
- <text>肽妍氨基酸平衡基础洁面乳</text>
- <view class="mt-10">
- <text>在库数量: 5</text>
- <text class="content-warning ml-20">低于警戒值</text>
+ <image class="product-img" :src="item.img?item.img:'../../static/images/no-img.png'"></image>
+ <view>
+ <text class="title">{{item.goodsName}}</text>
+ <view class="gray">
+ <text>在库数量: {{item.storeTotal}}</text>
+ <!-- <text class="iconfont iconjinggao warn-icon" v-if="item.storeTotal <= item.alarmNum"></text> -->
+ <text class="warn-txt" v-if="item.storeTotal <= item.alarmNum">低于警戒值</text>
</view>
</view>
</view>
- <text class="iconfont iconarrow-backimg gray"></text>
+ <text class="iconfont iconarrow-backimg light-gray"></text>
</navigator>
+ <view v-if="list.length">
+ <uni-load-more :status="loadStatus" color="#a5abaf"></uni-load-more>
+ </view>
</view>
</view>
</template>
<script>
import searchBar from '../../components/searchBar/index.vue';
+ import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
export default {
components:{
+ uniLoadMore,
searchBar
},
+ data(){
+ return{
+ queryKey: '',
+ list: [],
+ loadStatus: 'more',
+ pageNum: 1
+ }
+ },
+ onLoad() {
+ this.loadList()
+ },
+ onPullDownRefresh(){
+ this.reloadData();
+ let timer = setTimeout(function () {
+ uni.startPullDownRefresh();
+ clearTimeout(timer);
+ timer = null;
+ }, 800);
+ },
+ onReachBottom(){
+ this.loadList()
+ },
+ methods:{
+ reloadData(){
+ this.list = [];
+ this.pageNum = 1;
+ this.loadStatus = 'more';
+ this.loadList();
+ },
+ search(val){
+ this.queryKey = val;
+ this.reloadData();
+ },
+ loadList(){
+ if(this.loadStatus!=='more'){
+ return;
+ }
+ this.$httpUtils.request('/api/store/findStoreList', {
+ pageNum: this.pageNum,
+ pageSize: 10,
+ queryKey: this.queryKey
+ }, 'POST').then((res) => {
+ if(res.status == 200){
+ let result = res.rows;
+ if(result.length < 10){
+ this.loadStatus = 'noMore';
+ } else {
+ this.pageNum ++ ;
+ this.loadStatus = 'more';
+ }
+ this.list = this.list.concat(result);
+ }
+ })
+ }
+ }
}
</script>
@@ -34,18 +95,37 @@
padding: 0 10px;
}
.content-row{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
border-bottom: 1px solid #EDEAF4;
- padding: 10px 0;
+ padding: 12px 0;
+ font-size: 13px;
}
.product-img{
width: 48px;
height: 48px;
border-radius: 4px;
+ margin-right: 10px;
}
- .content-warning{
- border: 1px solid #DE5A5A;
+ .content-row .title{
+ display: block;
+ margin-bottom: 8px;
+ font-size: 14px;
+ color: #333333;
+ }
+ .content-row .warn-icon{
+ margin-left: 10px;
+ color: #FF3232;
+ font-size: 18px;
+ }
+ .content-row .warn-txt{
+ padding: 2px 8px;
+ margin-left: 10px;
+ border: 1px solid #FF3232;
+ color: #FF3232;
+ font-size: 10px;
border-radius: 20px;
- font-size: 8px;
- padding: 5px;
+
}
</style>
--
Gitblit v1.9.1