Skip to content

梁建民 / wmsMin

Go to a project
Commit 6b4cf547 by liangjianmin
Options

js

parent 0e8508e8
Expand all
Inline Side-by-side
Showing with 26 additions and 9 deletions
assets/css/goods/addExectionReceiving.scss
...@@ -140,6 +140,7 @@ ...@@ -140,6 +140,7 @@
padding-top: 23rpx; padding-top: 23rpx;
height: 80rpx; height: 80rpx;
textarea { textarea {
height: 100%;
font-size: 24rpx; font-size: 24rpx;
color: #6e767a; color: #6e767a;
} }
......
pages/goods/tally.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<text class="t2" v-if="index == currentIndex">({{ total }})</text> <text class="t2" v-if="index == currentIndex">({{ total }})</text>
</view> </view>
</view> </view>
<template v-if="currentIndex === 0"> <template v-if="currentIndex == 0">
<view class="list" v-if="goodsArrangeData.length > 0 || !is_complete"> <view class="list" v-if="goodsArrangeData.length > 0 || !is_complete">
<navigator class="box row bothSide verCenter" :url="'/pages/goods/tallyDetail?number=' + item.number" hover-class="none" v-for="(item, index) in goodsArrangeData" :key="index"> <navigator class="box row bothSide verCenter" :url="'/pages/goods/tallyDetail?number=' + item.number" hover-class="none" v-for="(item, index) in goodsArrangeData" :key="index">
<view class="bill-number row rowCenter verCenter" :class="numberType[index] ? 'color1' : 'color2'">{{ item.number }}</view> <view class="bill-number row rowCenter verCenter" :class="numberType[index] ? 'color1' : 'color2'">{{ item.number }}</view>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</view> </view>
</template> </template>
</template> </template>
<template v-else-if="currentIndex === 1"> <template v-else-if="currentIndex == 1">
<view class="list" v-if="unusualCheckInList.length > 0 || !is_complete"> <view class="list" v-if="unusualCheckInList.length > 0 || !is_complete">
<navigator class="box row bothSide verCenter" :url="'/pages/goods/tallyExectionDetail?number=' + item.erp_order_sn" hover-class="none" v-for="(item, index) in unusualCheckInList" :key="index"> <navigator class="box row bothSide verCenter" :url="'/pages/goods/tallyExectionDetail?number=' + item.erp_order_sn" hover-class="none" v-for="(item, index) in unusualCheckInList" :key="index">
<view class="bill-number row rowCenter verCenter" :class="numberTypeUnusua[index] ? 'color1' : 'color2'">{{ item.erp_order_sn }}</view> <view class="bill-number row rowCenter verCenter" :class="numberTypeUnusua[index] ? 'color1' : 'color2'">{{ item.erp_order_sn }}</view>
...@@ -99,13 +99,18 @@ export default { ...@@ -99,13 +99,18 @@ export default {
goodsArrangeData: [], goodsArrangeData: [],
unusualCheckInList: [], unusualCheckInList: [],
numberType: [], numberType: [],
numberTypeUnusua:[] numberTypeUnusua: []
}; };
}, },
onLoad(options) {
if (options.currentIndex != undefined) {
this.currentIndex = options.currentIndex;
}
},
onShow() { onShow() {
if (this.currentIndex === 0) { if (this.currentIndex == 0) {
this.getData(); this.getData();
} else if (this.currentIndex === 1) { } else if (this.currentIndex == 1) {
this.getUnusualSortGoodsList(); this.getUnusualSortGoodsList();
} }
}, },
...@@ -131,7 +136,7 @@ export default { ...@@ -131,7 +136,7 @@ export default {
this.is_complete = true; this.is_complete = true;
this.goodsArrangeData = res.data; this.goodsArrangeData = res.data;
this.total = res.data.length; this.total = res.data.length;
//判断A单 B单 //判断A单 B单
if (res.data.length > 0) { if (res.data.length > 0) {
for (let i = 0; i < res.data.length; i++) { for (let i = 0; i < res.data.length; i++) {
...@@ -142,7 +147,6 @@ export default { ...@@ -142,7 +147,6 @@ export default {
} }
} }
} }
} else { } else {
uni.showToast({ uni.showToast({
title: res.err_msg, title: res.err_msg,
......
pages/goods/tallyExectionDetail.vue
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
</view> </view>
</view> </view>
</view> </view>
<navigator class="btn row rowCenter verCenter" :url="'/pages/goods/tallyQuestion?number=' + customerDetail.base.erp_order_sn">重新发起理货</navigator> <navigator class="btn row rowCenter verCenter" :url="'/pages/goods/tallyDetail?number=' + customerDetail.base.erp_order_sn">重新发起理货</navigator>
</view> </view>
</template> </template>
......
pages/goods/tallyQuestion.vue
...@@ -295,7 +295,10 @@ export default { ...@@ -295,7 +295,10 @@ export default {
}, },
submit() { submit() {
this.noexebshowFalg = false; //不允许再次触发onshow这个生命周期 this.noexebshowFalg = false; //不允许再次触发onshow这个生命周期
uni.navigateTo({
url: '/pages/goods/tally?currentIndex=1'
});
return false;
//判断如有异常，是否填写实际 //判断如有异常，是否填写实际
var tempArr = []; var tempArr = [];
for (let i = 0; i < this.form.length; i++) { for (let i = 0; i < this.form.length; i++) {
...@@ -341,6 +344,15 @@ export default { ...@@ -341,6 +344,15 @@ export default {
this.request(API.addAskCustomer, 'POST', params, true).then(res => { this.request(API.addAskCustomer, 'POST', params, true).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
uni.showToast({
title: '提交成功',
icon: 'success'
});
setTimeout(() => {
uni.navigateTo({
url: '/pages/goods/tally?currentIndex=1'
});
}, 2000);
} else { } else {
uni.showToast({ uni.showToast({
title: res.err_msg, title: res.err_msg,
......
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 sign in to comment