Skip to content

梁建民 / wmsApp

Go to a project
Commit 836a004d by LJM
Options

bug

parent b949ae81
Inline Side-by-side
Showing with 20 additions and 99 deletions
assets/css/stockRecheck/sort.scss
...@@ -500,7 +500,7 @@ ...@@ -500,7 +500,7 @@
font-weight: bold; font-weight: bold;
} }
.uni-input-show { .uni-input-show {
font-size: 20rpx; font-size: 16rpx;
color: #292b33; color: #292b33;
font-weight: bold; font-weight: bold;
} }
...@@ -515,14 +515,14 @@ ...@@ -515,14 +515,14 @@
.box-row { .box-row {
margin-bottom: 10rpx; margin-bottom: 10rpx;
text { text {
color: #484b59; color: #5f5f5f;
font-size: 22rpx; font-size: 16rpx;
} }
.text { .text {
flex: 0 0 20%; flex: 0 0 20%;
text { text {
color: #484b59; color: #484b59;
font-size: 22rpx; font-size: 16rpx;
} }
} }
} }
......
pages/putaway/record.vue
...@@ -256,7 +256,7 @@ export default { ...@@ -256,7 +256,7 @@ export default {
return { return {
input_flag: false, input_flag: false,
page: 1, page: 1,
limit: 30, limit: 50,
index: 0, index: 0,
array: ['入库单号', '入库批次号', '销售员', '入仓号', '理货容器'], array: ['入库单号', '入库批次号', '销售员', '入仓号', '理货容器'],
list: [], list: [],
...@@ -495,12 +495,12 @@ export default { ...@@ -495,12 +495,12 @@ export default {
}, 2000); }, 2000);
} else if (res.code == 2) { } else if (res.code == 2) {
uni.showModal({ uni.showModal({
title: '提示',
content: res.msg, content: res.msg,
showCancel: false,
success: data => { success: data => {
if (data.confirm) { if (data.confirm) {
this.request(API.submitOnShelf, 'POST', { stock_shelf_ids: stock_shelf_ids, is_support_part_shelf: 1 }, true).then(res => { this.request(API.submitOnShelf, 'POST', { stock_shelf_ids: stock_shelf_ids, is_support_part_shelf: 1 }, true).then(json => {
if (res.code === 0) { if (json.code === 0) {
uni.showToast({ uni.showToast({
title: '提交成功', title: '提交成功',
icon: 'success' icon: 'success'
...@@ -516,7 +516,7 @@ export default { ...@@ -516,7 +516,7 @@ export default {
} else { } else {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: res.msg, content: json.msg,
showCancel: false showCancel: false
}); });
} }
......
pages/stockRecheck/index.vue
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<text class="label">上游备注：</text> <text class="label">上游备注：</text>
<text class="tt">{{ item.upstream_remark }}</text> <text class="tt">{{ item.upstream_remark }}</text>
</view> </view>
<view class="btn-box row"><navigator :url="'/pages/stockRecheck/sort?stock_out_id=' + item.stock_out_id" class="btn1 row rowCenter verCenter" hover-class="none">选择</navigator></view> <view class="btn-box row"><navigator :url="'/pages/stockRecheck/sort?stock_out_id=' + item.stock_out_id + '&stock_out_sn=' + item.stock_out_sn" class="btn1 row rowCenter verCenter" hover-class="none">选择</navigator></view>
</view> </view>
</view> </view>
<!-- 无数据展示 --> <!-- 无数据展示 -->
......
pages/stockRecheck/sort.vue
...@@ -418,35 +418,11 @@ ...@@ -418,35 +418,11 @@
</view> </view>
</view> </view>
<view class="row avarage verCenter box-row"> <view class="row avarage verCenter box-row">
<template v-if="company_id == 1"> <text style="flex: 0 0 20%;">长cm</text>
<text style="flex: 0 0 20%;">长cm</text> <text style="flex: 0 0 20%;">宽cm</text>
<text style="flex: 0 0 20%;">宽cm</text> <text style="flex: 0 0 20%;">高cm</text>
<text style="flex: 0 0 20%;">高cm</text> <text style="flex: 0 0 20%;">净重kg</text>
<text style="flex: 0 0 20%;">净重kg</text> <text style="flex: 0 0 20%;">毛量kg</text>
<text style="flex: 0 0 20%;">毛量kg</text>
</template>
<template v-else>
<view class="text">
<text style="color:red">*</text>
<text>长cm</text>
</view>
<view class="text">
<text style="color:red">*</text>
<text>宽cm</text>
</view>
<view class="text">
<text style="color:red">*</text>
<text>高cm</text>
</view>
<view class="text">
<text style="color:red">*</text>
<text>净重kg</text>
</view>
<view class="text">
<text style="color:red">*</text>
<text>毛量kg</text>
</view>
</template>
</view> </view>
<view class="row avarage verCenter"> <view class="row avarage verCenter">
<input type="text" placeholder="长cm" placeholder-style="color:#919399" class="uni-input" v-model="packList[i].length" /> <input type="text" placeholder="长cm" placeholder-style="color:#919399" class="uni-input" v-model="packList[i].length" />
...@@ -513,17 +489,16 @@ export default { ...@@ -513,17 +489,16 @@ export default {
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index == 0) { if (e.index == 0) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/stockRecheck/record' url: '/pages/stockRecheck/record?stock_out_sn=' + this.stock_out_sn
}); });
} }
}, },
onLoad(options) { onLoad(options) {
this.searchParams.stock_out_id = options.stock_out_id || ''; this.searchParams.stock_out_id = options.stock_out_id || '';
this.stock_out_sn = options.stock_out_sn || '';
}, },
onShow() { onShow() {
this.getData(); this.getData();
this.getPackList();
this.getBoxConfigList();
}, },
methods: { methods: {
bindPickerBoxChange: function(e, index) { bindPickerBoxChange: function(e, index) {
...@@ -764,63 +739,6 @@ export default { ...@@ -764,63 +739,6 @@ export default {
var parmas = { var parmas = {
pack_list: JSON.stringify(this.packList) pack_list: JSON.stringify(this.packList)
}; };
if (this.company_id == 2) {
var hasEmptyWidth = this.packList.some(function(item) {
return item.width === '';
});
var hasEmptyLength = this.packList.some(function(item) {
return item.length === '';
});
var hasEmptyHight = this.packList.some(function(item) {
return item.hight === '';
});
var hasEmptynetWeight = this.packList.some(function(item) {
return item.net_weight === '';
});
var hasEmptygrossWeight = this.packList.some(function(item) {
return item.gross_weight === '';
});
if (hasEmptyLength) {
uni.showModal({
itle: '提示',
content: '请输入宽',
showCancel: false
});
return false;
}
if (hasEmptyWidth) {
uni.showModal({
itle: '提示',
content: '请输入长',
showCancel: false
});
return false;
}
if (hasEmptyHight) {
uni.showModal({
itle: '提示',
content: '请输入高',
showCancel: false
});
return false;
}
if (hasEmptynetWeight) {
uni.showModal({
itle: '提示',
content: '请输入净重',
showCancel: false
});
return false;
}
if (hasEmptygrossWeight) {
uni.showModal({
itle: '提示',
content: '请输入毛重',
showCancel: false
});
return false;
}
}
this.request(API.updatePackInfo, 'POST', parmas, true).then(res => { this.request(API.updatePackInfo, 'POST', parmas, true).then(res => {
if (res.code === 0) { if (res.code === 0) {
uni.showToast({ uni.showToast({
...@@ -844,6 +762,9 @@ export default { ...@@ -844,6 +762,9 @@ export default {
* 展示箱信息 * 展示箱信息
*/ */
showBox() { showBox() {
this.getPackList(); //获取箱信息
this.getBoxConfigList(); //获取箱配置
this.index = -1;
this.$refs.showBoxInfo.open(); this.$refs.showBoxInfo.open();
}, },
closeBox() { closeBox() {
......
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