dianliang/lanan-repair-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:78bb5006abd6796b29fc25b84aa1acd2ce68cccc
Branches Tags
dianliang:master
..
compare: dianliang:070df2478b2fadf0e6171aa447d867ce25c8ad04
Branches Tags
dianliang:master

No commits in common. "78bb5006abd6796b29fc25b84aa1acd2ce68cccc" and "070df2478b2fadf0e6171aa447d867ce25c8ad04" have entirely different histories.
78bb5006ab ... 070df2478b

2 changed files with 63 additions and 125 deletions
Show Stats Expand all files Collapse all files

39
pages-warehouse/home/home.vue
View File

@ -69,15 +69,15 @@
</view>
<view class="order-footer">
<template v-if="!queryParams.isBack && typeof queryParams.isBack === 'boolean'">
<template v-if="!queryParams.isBack && isShow">
<view @click="inOutWareHouse(item,true)" class="order-btn yes">通知领料</view>
<!-- <view class="order-btn yes">采购</view>-->
</template>
<template v-else-if="!queryParams.isBack && typeof queryParams.isBack === 'undefined'">
<template v-else-if="!queryParams.isBack && !isShow">
<view @click="inOutWareHouse(item,true)" class="order-btn yes">查看申请</view>
<!-- <view class="order-btn yes">采购</view>-->
</template>
<template v-else-if="queryParams.isBack">
<template v-else-if="queryParams.isBack && isShow">
<view @click="inOutWareHouse(item,false)" class="order-btn yes">通知退料</view>
</template>
</view>
@ -160,8 +160,6 @@ export default {
noReadNum: 0,
//通知公告数量
noticeNum: 0,
//是否首次打开页面
ifFirstLogin: true,
}
},
onLoad() {
@ -205,33 +203,19 @@ export default {
*/
activeTab(index) {
this.active = index
if (index === 0) {
this.queryParams.isBack = false
this.queryParams.isToBeReviewed = undefined
this.isShow = true
} else if (index === 1) {
if (index == 1) {
this.queryParams.isBack = true
this.queryParams.isToBeReviewed = undefined
this.isShow = true
} else if (index === 2) {
} else if (index == 2) {
this.isShow = false
this.queryParams.isToBeReviewed = true
this.queryParams.isBack = undefined
} else {
this.isShow = true
this.queryParams.isBack = undefined
this.queryParams.isToBeReviewed = undefined
}
// this.active = index
// if (index == 1) {
// this.queryParams.isBack = false
// this.queryParams.isToBeReviewed = undefined
// this.isShow = true
// } else if (index == 2) {
// this.isShow = true
// this.queryParams.isToBeReviewed = true
// this.queryParams.isBack = undefined
// } else {
// this.isShow = true
// this.queryParams.isBack = undefined
// this.queryParams.isToBeReviewed = undefined
// }
this.onRefresherrefresh()
},
@ -393,11 +377,6 @@ export default {
if (res.code == 200) {
this.noReadNum = res.data > 99 ? 99 : res.data
}
if (this.ifFirstLogin && this.noReadNum > 0) {
console.log("播放")
this.$refs.tarBar.dianyidain()
this.ifFirstLogin = false
}
})
},
/**

71
pages-warehouse/inOutWarehouse/inOutWarehouse.vue
View File

@ -94,12 +94,10 @@ export default {
method: 'get',
params: params
}).then((res)=>{
this.wares = res.data
if (this.isToBeReviewed){
this.wares = this.wares.filter(item => item.waresStatus === '1')
this.wares = this.wares.filter(item => this.isReceive ? (item.waresCount > item.waresAlreadyCount) : (item.waresAlreadyCount > 0))
res.data.map((item)=>{
if(!item.waresAlreadyCount){
item.waresAlreadyCount = 0
}
this.wares.forEach(item => {
if(!item.wares.stock){
item.wares.stock=0
}
@ -116,27 +114,7 @@ export default {
item.thisNum = 0
}
})
// res.data.map((item)=>{
// if(!item.waresAlreadyCount){
// item.waresAlreadyCount = 0
// }
// if(!item.wares.stock){
// item.wares.stock=0
// }
// if(this.isReceive){
// //领料，最大可领取数量为申请数量-已领取数量，同时不能大于库存数量，默认数量就是最大可领取数量
// item.maxNum = parseInt(item.waresCount) - parseInt(item.waresAlreadyCount)
// if(item.maxNum >item.wares.stock){
// item.maxNum = item.wares.stock
// }
// item.thisNum = item.maxNum
// }else{
// //退料，最大数量为已领取数量，最小数量为0,默认数量为0
// item.maxNum = item.waresAlreadyCount
// item.thisNum = 0
// }
// })
// this.wares = res.data;
this.wares = res.data;
})
},
/**
@ -151,16 +129,13 @@ export default {
return
}
this.$set(repair, 'thisNum', repair.thisNum + 1)
const findIndex = this.wares.findIndex(f => f.id === repair.id);
if (findIndex !== -1) {
this.$set(this.wares, findIndex, repair);
const find = this.wares.find(f => f.id == repair.id)
if (find) {
find.thisNum = repair.thisNum
} else {
this.wares.push(JSON.parse(JSON.stringify(repair)))
}
// const find = this.wares.find(f => f.id == repair.id)
// if (find) {
// find.thisNum = repair.thisNum
// } else {
// this.wares.push(JSON.parse(JSON.stringify(repair)))
// }
console.log('repair', repair)
},
/**
* 减
@ -171,16 +146,12 @@ export default {
return
}
this.$set(repair, 'thisNum', repair.thisNum - 1)
const findIndex = this.wares.findIndex(f => f.id === repair.id);
if (findIndex !== -1) {
this.$set(this.wares, findIndex, repair);
const find = this.wares.find(f => f.id == repair.id)
if (find) {
find.thisNum = repair.thisNum
} else {
this.wares.push(JSON.parse(JSON.stringify(repair)))
}
// const find = this.wares.find(f => f.id == repair.id)
// if (find) {
// find.thisNum = repair.thisNum
// } else {
// this.wares.push(JSON.parse(JSON.stringify(repair)))
// }
},
/**
* 出库
@ -193,16 +164,6 @@ export default {
userName:this.formData.repairName,
soStatus:this.isReceive?'04':'07'
}
// 过滤一下，thisNum不等0才行
const flag = this.wares.filter(item => item.thisNum > 0)
if (!flag || flag.length === 0){
uni.showToast({
title: '请设置配件数量！',
icon: 'none'
})
return
}
this.wares = flag
this.formData.repairSois = [...this.wares.map(item =>{
return {
soiType: this.isReceive ? '02' : "04",
@ -322,11 +283,9 @@ export default {
.listItem {
padding: 30rpx 0;
border-bottom: 2rpx solid #DDDDDD;
&:last-child {
border-bottom: none;
}
.repairName {
font-size: 32rpx;
color: #333333;