Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_jishi
This commit is contained in:
commit
b78eead546
|
|
@ -83,6 +83,12 @@
|
|||
"navigationBarTitleText": "当前业绩"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/index/wljl",
|
||||
"style": {
|
||||
"navigationBarTitleText": "物料记录"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/index/previousYeji",
|
||||
"style": {
|
||||
|
|
|
|||
|
|
@ -158,7 +158,10 @@
|
|||
每次服务会减少物料包数量，当数量少于一定值时将做停牌处理！
|
||||
</view>
|
||||
<view class="flex align-center" style="font-size: 16px;font-weight: bold;color: #fff;margin-top: 8px; margin-left: 15rpx;">
|
||||
物料记录
|
||||
|
||||
|
||||
<view @tap="showWljlList">
|
||||
物料记录</view>
|
||||
<!-- <image src="../../static/images/index/yiwen.png" style="width: 16px;height: 17px;margin-left: 3px;"
|
||||
@tap="viewHelp"></image> -->
|
||||
|
||||
|
|
@ -861,6 +864,12 @@ export default {
|
|||
showMoreMaterialPackageList() {
|
||||
this.showMaterialPackageListStatus = true;
|
||||
},
|
||||
showWljlList(){//打开物料记录
|
||||
console.log('index---物料记录');
|
||||
uni.navigateTo({
|
||||
url:'/pages/index/wljl'
|
||||
})
|
||||
},
|
||||
viewHelp() {
|
||||
this.showViewHelp = true;
|
||||
},
|
||||
|
|
|
|||
|
|
@ -0,0 +1,146 @@
|
|||
<template>
|
||||
<view class="content">
|
||||
<view class="fenlei">
|
||||
<u-search class="flex-sub" placeholder="请输入物料名称" :focus="false" shape="square" v-model="materialName"
|
||||
:show-action="true" :animation="true" bg-color="#fff" color="#019c88" @search="onSearch()"
|
||||
action-text="搜索" @custom="onSearch()" @clear="clear">
|
||||
</u-search>
|
||||
</view>
|
||||
<!-- <mescroll-body :sticky="true" ref="mescrollRef" @up="upCallback"> -->
|
||||
<t-refresh ref="refresh" v-if="listData.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0" >
|
||||
<template slot="content" >
|
||||
<!-- 数据列表 -->
|
||||
<view class="margin-sm padding-sm bg radius " v-for="(item,index) in listData" :key='index'>
|
||||
<view class="flex">
|
||||
<view style="width: 160upx;height: 160upx;border-radius: 20rpx;">
|
||||
<image :src="item.materiaImg?item.materiaImg:'../../static/logo.png'"
|
||||
style="width: 220upx;height: 160upx;border-radius: 20rpx;"></image>
|
||||
</view>
|
||||
<view class="u-flex-1 text-white margin-left-sm">
|
||||
<view style="color: #333333;font-size: 32upx;">{{item.recordDescribe}}</view>
|
||||
<view style="font-size: 26upx;color: #999999;margin-top: 16rpx;" class="">{{item.materialName}} - {{item.createTime}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
</t-refresh>
|
||||
|
||||
<empty v-if="listData.length == 0"></empty>
|
||||
<!-- </mescroll-body> -->
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import empty from '@/components/empty.vue'
|
||||
import tRefresh from "@/components/t-refresh/t-refresh.vue"
|
||||
export default {
|
||||
components:{empty},
|
||||
data(){
|
||||
return{
|
||||
loadingType:0,
|
||||
page:1,
|
||||
limit:10,
|
||||
listData:[],
|
||||
createTime:'',
|
||||
materialName:'',
|
||||
artificerId:''
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
console.log('物料记录');
|
||||
this.artificerId = uni.getStorageSync("artificerId");
|
||||
this.getData()
|
||||
},
|
||||
onPullDownRefresh: function() {
|
||||
this.page = 1;
|
||||
this.getData();
|
||||
},
|
||||
methods:{
|
||||
getData(){
|
||||
var that=this;
|
||||
let data = {
|
||||
artificerId:that.artificerId,
|
||||
createTime:that.createTime,
|
||||
materialName:that.materialName,
|
||||
page: that.page,
|
||||
limit: that.limit,
|
||||
}
|
||||
that.$Request.getT('/app/material/selectMaterialRecord', data).then(res => {
|
||||
if (res.code == 0) {
|
||||
if (that.page == 1) that.listData = []; //如果是第一页需手动制空列表
|
||||
that.listData = [...that.listData, ...res.data.list]; //追加新数据
|
||||
} else {
|
||||
that.$queue.showToast(res.msg);
|
||||
}
|
||||
});
|
||||
},// 加载更多
|
||||
loadMore: async function() {
|
||||
this.loadingType=2
|
||||
//模拟数据请求
|
||||
setTimeout(()=>{
|
||||
console.log(1);
|
||||
this.page++;
|
||||
this.loadingType=0;
|
||||
let data = {
|
||||
artificerId:this.artificerId,
|
||||
createTime:this.createTime,
|
||||
materialName:this.materialName,
|
||||
page: this.page,
|
||||
limit: this.limit,
|
||||
}
|
||||
this.$Request.getT('/app/material/selectMaterialRecord', data).then(res => {
|
||||
if (res.code == 0) {
|
||||
if (this.page == 1) this.listData = []; //如果是第一页需手动制空列表
|
||||
if(res.data.totalPage >= this.page){
|
||||
this.listData = [...this.listData, ...res.data.list]; //追加新数据
|
||||
}else{
|
||||
this.$queue.showToast("暂无更多数据");
|
||||
this.page = res.data.totalPage
|
||||
}
|
||||
|
||||
} else {
|
||||
this.$queue.showToast(res.msg);
|
||||
}
|
||||
});
|
||||
},1000)
|
||||
},
|
||||
clear(res) {
|
||||
let that = this
|
||||
that.listData = [];
|
||||
that.page = 1;
|
||||
that.materialName = '';
|
||||
that.getData()
|
||||
},
|
||||
onSearch(e) {
|
||||
// this.artificerName = e;
|
||||
this.page = 1;
|
||||
this.getData();
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.content{
|
||||
width: 100%;
|
||||
/* height: 100vh; */
|
||||
background-color: white;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.fenlei{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-top: 10rpx;
|
||||
margin-bottom: 10rpx;
|
||||
}
|
||||
.screen-button{
|
||||
// border: 1px solid #019c88;
|
||||
color: #019c88;
|
||||
padding:5rpx 10rpx;
|
||||
margin:0 18rpx;
|
||||
border-radius:6rpx;
|
||||
}
|
||||
</style>
|
||||
Loading…
Reference in New Issue