Skip to content

梁建民 / wmsMin

Go to a project
Commit 0b8dcdaa by LJM
Options

isInspOrg

parent 01408b30
Inline Side-by-side
Showing with 57 additions and 29 deletions
pages/mine/auth.vue
...@@ -66,27 +66,30 @@ export default { ...@@ -66,27 +66,30 @@ export default {
desc: '用于完善会员资料', desc: '用于完善会员资料',
success: res => { success: res => {
self.request(API.getWechatInfo, 'GET', { code: self.code }, true).then(res => { self.request(API.getWechatInfo, 'GET', { code: self.code }, true).then(res => {
if (res.err_code === 0) { uni.navigateTo({
if (res.data.token == '') { url: '/pages/mine/login'
uni.setStorageSync('openid', res.data.wechat_info.openid); });
uni.setStorageSync('session_key', res.data.wechat_info.session_key); // if (res.err_code === 0) {
uni.setStorageSync('unionid', res.data.wechat_info.unionid); // if (res.data.token == '') {
uni.navigateTo({ // uni.setStorageSync('openid', res.data.wechat_info.openid);
url: '/pages/mine/login' // uni.setStorageSync('session_key', res.data.wechat_info.session_key);
}); // uni.setStorageSync('unionid', res.data.wechat_info.unionid);
} else { // uni.navigateTo({
uni.setStorageSync('token', res.data.token); // url: '/pages/mine/login'
uni.navigateBack({ // });
delta: 2 // } else {
}); // uni.setStorageSync('token', res.data.token);
} // uni.navigateBack({
} else { // delta: 2
uni.showToast({ // });
title: res.err_msg, // }
icon: 'none', // } else {
duration: 2000 // uni.showToast({
}); // title: res.err_msg,
} // icon: 'none',
// duration: 2000
// });
// }
}); });
}, },
fail: res => { fail: res => {
......
pages/tallyGoods/confirm.vue
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<text class="arrow"></text> <text class="arrow"></text>
<input type="text" @input="onInput()" v-model="form.erp_order_sn" class="uni-input" placeholder="请输入" placeholder-style="color:#404547;font-weight:bold;" /> <input type="text" @input="onInput()" v-model="form.erp_order_sn" class="uni-input" placeholder="请输入" placeholder-style="color:#404547;font-weight:bold;" />
</view> </view>
<text class="inspection row rowCenter verCenter">商检</text> <text class="inspection row rowCenter verCenter" v-if="isInspOrg">商检</text>
</view> </view>
</view> </view>
<view class="box row verCenter bothSide"> <view class="box row verCenter bothSide">
...@@ -126,6 +126,7 @@ import { titleCase } from '@/util/util.js'; ...@@ -126,6 +126,7 @@ import { titleCase } from '@/util/util.js';
export default { export default {
data() { data() {
return { return {
isInspOrg: false, //是否商检
noexebshowFalg: true, //控制是否会触发生命周期 noexebshowFalg: true, //控制是否会触发生命周期
customs_clearance_price_options: ['无', '有'], //清关费选项 customs_clearance_price_options: ['无', '有'], //清关费选项
currentIndex: 0, currentIndex: 0,
...@@ -230,6 +231,7 @@ export default { ...@@ -230,6 +231,7 @@ export default {
getTallyGoods() { getTallyGoods() {
this.request(API.getTallyGoods, 'GET', { erp_order_sn: this.form.erp_order_sn }, true).then(res => { this.request(API.getTallyGoods, 'GET', { erp_order_sn: this.form.erp_order_sn }, true).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
this.isInspOrg = Boolean(res.data.isInspOrg);
this.list = res.data.entrys; this.list = res.data.entrys;
const length = res.data.entrys.length; const length = res.data.entrys.length;
this.goods_check_pic_list = Array.from({ length }, () => []); this.goods_check_pic_list = Array.from({ length }, () => []);
......
pages/tallyGoods/manualMerge.vue
...@@ -41,9 +41,9 @@ ...@@ -41,9 +41,9 @@
<input type="text" class="uni-input" placeholder="请输入箱号" placeholder-style="font-size:26rpx;color:#6E767A;" @input="onInput" v-model="searchParams.erp_order_sn" /> <input type="text" class="uni-input" placeholder="请输入箱号" placeholder-style="font-size:26rpx;color:#6E767A;" @input="onInput" v-model="searchParams.erp_order_sn" />
</view> </view>
<view class="data-list"> <view class="data-list">
<view class="box row bothSide verCenter" v-for="(item, index) in list" :key="index" :class="{ curr: filter_status[index] }"> <view class="box row bothSide verCenter" v-for="(item, index) in list" :key="index" :class="{ curr: filter_status[index] }" @click="filterChange(index)">
<text class="text">{{ item.name }}</text> <text class="text">{{ item.name }}</text>
<view class="check-ico" @click="filterChange(index)"></view> <view class="check-ico"></view>
</view> </view>
</view> </view>
<view class="pop-btn row rowCenter verCenter" @click="confirmChange">确 认</view> <view class="pop-btn row rowCenter verCenter" @click="confirmChange">确 认</view>
......
pages/tallyGoods/originSplit.vue
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</view> </view>
<view class="right"> <view class="right">
<text class="t1">剩余拆分：</text> <text class="t1">剩余拆分：</text>
<text class="t2">{{ goods_list[goods_index].qty }}</text> <text class="t2">{{ parseInt(goods_list[goods_index].qty) - parseInt(total) }}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<view class="uni-text" @click="open(index)">{{ detail_json[index].origin ? detail_json[index].origin : '请选择国家地区' }}</view> <view class="uni-text" @click="open(index)">{{ detail_json[index].origin ? detail_json[index].origin : '请选择国家地区' }}</view>
<text class="iconfont icon-sanjiaoxing1"></text> <text class="iconfont icon-sanjiaoxing1"></text>
</view> </view>
<view class="input-wrap"><input type="number" inputmode="numeric" placeholder="请输入拆分数量" class="uni-input" placeholder-style="color:#404547;font-weight:bold;" v-model="detail_json[index].tally_num" /></view> <view class="input-wrap"><input @input="onInputNum" type="number" inputmode="numeric" placeholder="请输入拆分数量" class="uni-input" placeholder-style="color:#404547;font-weight:bold;" v-model="detail_json[index].tally_num" /></view>
</view> </view>
</view> </view>
</view> </view>
...@@ -75,9 +75,9 @@ ...@@ -75,9 +75,9 @@
<input type="text" class="uni-input" placeholder="请输入国家或地区名称（支持中英文）" placeholder-style="font-size:26rpx;color:#6E767A;" @input="onInput" v-model="origin" style="width: 100%;" /> <input type="text" class="uni-input" placeholder="请输入国家或地区名称（支持中英文）" placeholder-style="font-size:26rpx;color:#6E767A;" @input="onInput" v-model="origin" style="width: 100%;" />
</view> </view>
<view class="data-list"> <view class="data-list">
<view class="box row bothSide verCenter" v-for="(item, index) in origin_list" :key="index" :class="{ curr: filter_status[index] }"> <view class="box row bothSide verCenter" v-for="(item, index) in origin_list" :key="index" :class="{ curr: filter_status[index] }" @click="filterChange(index)">
<text class="text">{{ item }}</text> <text class="text">{{ item }}</text>
<view class="check-ico" @click="filterChange(index)"></view> <view class="check-ico"></view>
</view> </view>
</view> </view>
<view class="pop-btn row rowCenter verCenter" @click="confirmChange">确 认</view> <view class="pop-btn row rowCenter verCenter" @click="confirmChange">确 认</view>
...@@ -104,7 +104,8 @@ export default { ...@@ -104,7 +104,8 @@ export default {
origin: '', //搜索国家携带的参数 origin: '', //搜索国家携带的参数
tally_num: 0, //拆分数量 tally_num: 0, //拆分数量
detail_json: [], //收集的数据 detail_json: [], //收集的数据
dataStates: {} // 用于记录数据状态的对象 dataStates: {}, // 用于记录数据状态的对象
total: 0
}; };
}, },
onLoad(options) { onLoad(options) {
...@@ -139,6 +140,28 @@ export default { ...@@ -139,6 +140,28 @@ export default {
}); });
return result; return result;
}, },
onInputNum() {
const total = this.detail_json.reduce((sum, item) => {
if (item.tally_num) {
return sum + item.tally_num * 1;
} else {
return sum * 1;
}
}, 0);
var num = this.goods_list[this.goods_index].qty * 1;
if (total > num) {
uni.showModal({
title: '错误提示',
content: '拆分数量总和必须等于订单数量（不可大于或者小于）',
showCancel: false
});
return false;
}
this.total = total;
},
onInput() { onInput() {
// 清除之前的定时器 // 清除之前的定时器
clearTimeout(this.timer); clearTimeout(this.timer);
......
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