Skip to content

梁建民 / wmsMin

Go to a project
Commit a0153fd8 by LJM
Options

add

parent ab59cf8c
Inline Side-by-side
Showing with 123 additions and 126 deletions
assets/css/tally/index.scss
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
border: 1px solid #bbdcfd; border: 1px solid #bbdcfd;
} }
.pb16 { .pb16 {
padding-bottom: 30rpx; padding-bottom: 16rpx;
} }
.w130 { .w130 {
width: 156rpx; width: 156rpx;
......
assets/css/tally/unboxing.scss
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
border: 1px solid #bbdcfd; border: 1px solid #bbdcfd;
} }
.pb16 { .pb16 {
padding-bottom: 30rpx; padding-bottom: 16rpx;
} }
.w130 { .w130 {
width: 156rpx; width: 156rpx;
......
pages/goods/barCode.vue
...@@ -42,118 +42,118 @@ ...@@ -42,118 +42,118 @@
</template> </template>
<script> <script>
import { API } from '@/util/api.js'; import { API } from '@/util/api.js';
export default { export default {
data() { data() {
return { return {
erpOrderSnCodeManage: [], erpOrderSnCodeManage: [],
erp_order_sn: '', erp_order_sn: '',
total: 1, total: 1,
page: 1, page: 1,
limit: 10, limit: 10,
is_loading: false, is_loading: false,
loading: false loading: false
}; };
}, },
onReachBottom() { onReachBottom() {
if (this.is_loading) return; if (this.is_loading) return;
this.page++; this.page++;
this.loading = true; this.loading = true;
this.getData(); this.getData();
}, },
onShow() { onShow() {
this.total = 0;
this.page = 1;
this.erpOrderSnCodeManage = [];
this.getData();
},
methods: {
inputChange() {
this.total = 0; this.total = 0;
this.page = 1; this.page = 1;
this.erpOrderSnCodeManage = []; this.erpOrderSnCodeManage = [];
this.getData(); this.getData();
}, },
scanChange() { methods: {
uni.scanCode({ inputChange() {
success: res => { this.total = 0;
if (res.errMsg == 'scanCode:ok') { this.page = 1;
this.erp_order_sn = res.result; this.erpOrderSnCodeManage = [];
this.getData();
},
scanChange() {
uni.scanCode({
success: res => {
if (res.errMsg == 'scanCode:ok') {
this.erp_order_sn = res.result;
}
},
fail: function(res) {
uni.showToast({
title: '扫码失败',
icon: 'error'
});
} }
}, });
fail: function(res) { },
uni.showToast({ delErpOrderSnCodeManage(erp_order_sn) {
title: '扫码失败', uni.showModal({
icon: 'error' title: '提示',
}); content: '您确定作废嘛？',
} success: res => {
}); if (res.confirm) {
}, this.request(API.delErpOrderSnCodeManage, 'POST', { erp_order_sn: erp_order_sn }, true).then(res => {
delErpOrderSnCodeManage(erp_order_sn) { if (res.err_code === 0) {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '您确定作废嘛？', content: '作废操作成功',
success: res => { cancelText: '重新打印',
if (res.confirm) { confirmText: '关闭',
this.request(API.delErpOrderSnCodeManage, 'POST', { erp_order_sn: erp_order_sn }, true).then(res => { showCancel: true,
if (res.err_code === 0) { success: res => {
uni.showModal({ if (res.confirm) {
title: '提示', this.total = 0;
content: '作废操作成功', this.page = 1;
cancelText: '重新打印', this.erpOrderSnCodeManage = [];
confirmText: '关闭', this.getData();
showCancel: true, } else if (res.cancel) {
success: res => { console.log('用户点击取消');
if (res.confirm) { uni.navigateTo({
this.total = 0; url: '/pages/tag/printNew?number=' + erp_order_sn
this.page = 1; });
this.erpOrderSnCodeManage = []; }
this.getData();
} else if (res.cancel) {
console.log('用户点击取消');
uni.navigateTo({
url: '/pages/tag/print?number=' + erp_order_sn
});
} }
} });
}); } else {
} else { uni.showModal({
uni.showModal({ title: '提示',
title: '提示', content: res.err_msg,
content: res.err_msg, showCancel: false
showCancel: false });
}); }
} });
}); } else if (res.cancel) {
} else if (res.cancel) { console.log('用户点击取消');
console.log('用户点击取消'); }
} }
} });
}); },
}, getData() {
getData() { this.request(API.erpOrderSnCodeManage, 'POST', { page: this.page, limit: this.limit, erp_order_sn: this.erp_order_sn }, this.loading).then(res => {
this.request(API.erpOrderSnCodeManage, 'POST', { page: this.page, limit: this.limit, erp_order_sn: this.erp_order_sn }, this.loading).then(res => { if (res.err_code === 0) {
if (res.err_code === 0) { if (res.data.data.length > 0) {
if (res.data.data.length > 0) { this.is_loading = false;
this.is_loading = false; this.erpOrderSnCodeManage = this.erpOrderSnCodeManage.concat(res.data.data);
this.erpOrderSnCodeManage = this.erpOrderSnCodeManage.concat(res.data.data); this.total = res.data.total;
this.total = res.data.total; } else {
this.is_loading = true;
}
} else { } else {
this.is_loading = true; uni.showToast({
title: res.err_msg,
icon: 'error'
});
} }
} else { });
uni.showToast({ }
title: res.err_msg,
icon: 'error'
});
}
});
} }
} };
};
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@import '../../assets/css/goods/barCode.scss'; @import '../../assets/css/goods/barCode.scss';
</style> </style>
\ No newline at end of file
pages/tally/index.vue
...@@ -98,10 +98,6 @@ ...@@ -98,10 +98,6 @@
<text class="t3 w130">品牌：</text> <text class="t3 w130">品牌：</text>
<text class="t4">{{item.brand}}</text> <text class="t4">{{item.brand}}</text>
</view> </view>
<view class="pb16 row">
<text class="t3 w130">金额：</text>
<text class="t4">{{item.total_price}}</text>
</view>
<!-- 完全理货 --> <!-- 完全理货 -->
<template v-if="item.tally_status == 3"> <template v-if="item.tally_status == 3">
<view class="pb16 row"> <view class="pb16 row">
...@@ -111,13 +107,16 @@ ...@@ -111,13 +107,16 @@
</template> </template>
<!-- 1未理货2部分理货 --> <!-- 1未理货2部分理货 -->
<template v-else> <template v-else>
<view class="pb16 row"> <view class="pb16 row verCenter">
<text class="t3 w130">待收数量：</text> <view class="row" style="width: 50%;">
<text class="t4">{{item.wait_tally_num}}</text> <text class="t3 w130">待收数量：</text>
</view> <text class="t4">{{item.wait_tally_num}}</text>
<view class="pb16 row"> </view>
<text class="t3 w130">总数量：</text> <view class="row" style="width: 50%;">
<text class="t4">{{item.order_numbers}}</text> <text class="t3 w130">总数量：</text>
<text class="t4">{{item.order_numbers}}</text>
</view>
</view> </view>
</template> </template>
<view class="pb16 row verCenter"> <view class="pb16 row verCenter">
...@@ -163,8 +162,7 @@ ...@@ -163,8 +162,7 @@
</template> </template>
</view> </view>
</view> </view>
<view class="pb16 row verCenter"> <view class="row bothSide verCenter">
<text class="t3 w130">理货照片：</text>
<view class="upload-list row verCenter"> <view class="upload-list row verCenter">
<template v-if="image_list.length > 0"> <template v-if="image_list.length > 0">
<view class="pic-box" v-for="(v, i) in image_list[index]" :key="i"> <view class="pic-box" v-for="(v, i) in image_list[index]" :key="i">
...@@ -181,8 +179,6 @@ ...@@ -181,8 +179,6 @@
<view class="default row rowCenter verCenter" @click="chooseImageChange(index)" v-if="image_list[index].length < 4"><text class="iconfont icon-xingzhuangjiehe"></text></view> <view class="default row rowCenter verCenter" @click="chooseImageChange(index)" v-if="image_list[index].length < 4"><text class="iconfont icon-xingzhuangjiehe"></text></view>
</template> </template>
</view> </view>
</view>
<view class="row" style="justify-content: flex-end;">
<!-- 完全理货 --> <!-- 完全理货 -->
<template v-if="item.tally_status == 3"> <template v-if="item.tally_status == 3">
<view class="btn row rowCenter verCenter disabled" @click="cancelTallyDetail(index)">取消理货</view> <view class="btn row rowCenter verCenter disabled" @click="cancelTallyDetail(index)">取消理货</view>
......
pages/tallyGoods/confirm.vue
...@@ -572,7 +572,7 @@ ...@@ -572,7 +572,7 @@
if (type == 1) { if (type == 1) {
//点击【确认提交并打印】跳转至【打印标签】页面 //点击【确认提交并打印】跳转至【打印标签】页面
uni.navigateTo({ uni.navigateTo({
url: '/pages/tag/print?board_num=' + this.form.board_num + '&box_num=' + this.form.box_num + '&erp_order_sn=' + this.form.erp_order_sn + '&from=tallyGoods' url: '/pages/tag/printNew?board_num=' + this.form.board_num + '&box_num=' + this.form.box_num + '&erp_order_sn=' + this.form.erp_order_sn + '&from=tallyGoods'
}) })
} else { } else {
setTimeout(() => { setTimeout(() => {
......
util/api.js
// const API_BASE = 'https://api.ichunt.com'; const API_BASE = 'https://api.ichunt.com';
// const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统 const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
// const API_BASE_OSS_HK = 'http://hk.image.semour.com'; //oss系统 HK const API_BASE_OSS_HK = 'http://hk.image.semour.com'; //oss系统 HK
// const API_BASE_WMS = 'https://wms.ichunt.net'; //WMS系统 const API_BASE_WMS = 'https://wms.ichunt.net'; //WMS系统
const API_BASE = 'http://api.liexin.com'; // const API_BASE = 'http://api.liexin.com';
const API_BASE_OSS = 'http://image.liexindev.net'; // const API_BASE_OSS = 'http://image.liexindev.net';
const API_BASE_OSS_HK = 'http://image.liexindev.net'; //oss系统 HK // const API_BASE_OSS_HK = 'http://image.liexindev.net'; //oss系统 HK
const API_BASE_WMS = 'http://wms.liexindev.net'; //WMS系统 // const API_BASE_WMS = 'http://wms.liexindev.net'; //WMS系统
const API = { const API = {
......
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