Commit 63902080 authored by Facius's avatar Facius

第三轮bug修复

parent 5d58647f
...@@ -73,6 +73,11 @@ ...@@ -73,6 +73,11 @@
noPartsImage() { noPartsImage() {
return process.uniEnv.qn_base_url + 'no_parts.png' return process.uniEnv.qn_base_url + 'no_parts.png'
}, },
selectedParts() {
return this.lists.filter((item) => {
return item.quantity > 0
})
}
}, },
mounted() { mounted() {
this.getWorkOrderParts() this.getWorkOrderParts()
...@@ -84,7 +89,7 @@ ...@@ -84,7 +89,7 @@
}, },
partsChange(val, index) { partsChange(val, index) {
this.$set(this.lists[index], 'quantity', val) this.$set(this.lists[index], 'quantity', val)
this.valueChange(JSON.stringify(this.lists)) this.valueChange(JSON.stringify(this.selectedParts))
}, },
valChange(val) { valChange(val) {
val.forEach(v => { val.forEach(v => {
...@@ -95,7 +100,7 @@ ...@@ -95,7 +100,7 @@
this.$set(this.lists, index, v) this.$set(this.lists, index, v)
} }
}) })
this.valueChange(JSON.stringify(this.lists)) this.valueChange(JSON.stringify(this.selectedParts))
}, },
toParts() { toParts() {
uni.navigateTo({ uni.navigateTo({
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<view class="loading-view" v-if="!loaded"> <view class="loading-view" v-if="!loaded">
<u-loading mode="flower"></u-loading> <u-loading mode="flower"></u-loading>
</view> </view>
<NoOrder v-else-if="noParts" imageName="wupeijianxinxi.png" text="当前暂无配件信息" <NoOrder v-else-if="noParts" imageName="wupeijianxinxi.png" text="当前暂无备件信息"
:customStyle="noPartsCustomStyle" /> :customStyle="noPartsCustomStyle" />
<template v-else> <template v-else>
<view v-for="(item, index) in partsList" :key="item.id"> <view v-for="(item, index) in partsList" :key="item.id">
...@@ -133,8 +133,8 @@ ...@@ -133,8 +133,8 @@
onShow() { onShow() {
let pages = getCurrentPages() let pages = getCurrentPages()
let page = pages[pages.length - 1] let page = pages[pages.length - 1]
if (page.needApplyList) { if (page.needRefresh) {
page.needApplyList = null page.needRefresh = null
this.currentIndex = 0 this.currentIndex = 0
this.reloadPartsList() this.reloadPartsList()
} }
......
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
var pages = getCurrentPages(); var pages = getCurrentPages();
if (pages.length >= 2) { if (pages.length >= 2) {
var page = pages[pages.length - 2]; var page = pages[pages.length - 2];
page.needApplyList = true page.needRefresh = true
uni.navigateBack() uni.navigateBack()
} }
} }
......
...@@ -76,8 +76,8 @@ ...@@ -76,8 +76,8 @@
onShow() { onShow() {
let pages = getCurrentPages() let pages = getCurrentPages()
let page = pages[pages.length - 1] let page = pages[pages.length - 1]
if (page.needApplyList) { if (page.needRefresh) {
page.needApplyList = null page.needRefresh = null
this.getPartsList() this.getPartsList()
} }
}, },
......
...@@ -127,7 +127,16 @@ ...@@ -127,7 +127,16 @@
getApp().trackPage('备件库页') getApp().trackPage('备件库页')
this.getReserveList() this.getReserveList()
}, },
onShow() {}, onShow() {
let pages = getCurrentPages();
let page = pages[pages.length - 1];
let needRefresh = page.needRefresh;
if (needRefresh) {
page.needRefresh = false
this.showBounce = false
this.getReserveList()
}
},
methods: { methods: {
getReserveList() { // 备件列表 getReserveList() { // 备件列表
this.loaded = false this.loaded = false
......
...@@ -352,8 +352,8 @@ ...@@ -352,8 +352,8 @@
this.loadOrderDetail() this.loadOrderDetail()
this.loadOrderRecord() this.loadOrderRecord()
} }
if (page.needApplyList) { if (page.needRefresh) {
page.needApplyList = null page.needRefresh = null
this.getApplyList() this.getApplyList()
} }
}, },
......
...@@ -76,36 +76,19 @@ ...@@ -76,36 +76,19 @@
return process.uniEnv.qn_base_url + src return process.uniEnv.qn_base_url + src
}, },
goBack() { goBack() {
if(this.isParts){
var pages = getCurrentPages(); var pages = getCurrentPages();
if(pages.length >= 2) { if(pages.length >= 2) {
var prevPage = pages[pages.length - 2]; var prevPage = pages[pages.length - 2];
prevPage.needApplyList = true prevPage.needRefresh = true
} }
if(this.isParts){ // 添加备件
this.$u.route({type:'back'}) this.$u.route({type:'back'})
} }
if(this.isReturn){ if(this.isReturn){ // 退件
// uni.switchTab({
// url: '/pages/index/mine',
// complete: () => {
// this.$nextTick(()=>{
// uni.navigateTo({
// url: 'pages/mine/warehouse/return'
// });
// })
// }
// });
uni.redirectTo({ uni.redirectTo({
url: 'pages/mine/warehouse/return' url: 'pages/mine/warehouse/return'
}); });
// var pages = getCurrentPages();
// if(pages.length >= 4) {
// var prevPage = pages[pages.length - 4];
// this.$u.route({type:'back', delta: 3})
// prevPage.$vm.$u.route({url: 'pages/mine/warehouse/return'})
// } else {
// this.$u.route({type:'back'})
// }
} }
}, },
copyText(e) { copyText(e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment