Skip to content

梁建民 / wmsMin

Go to a project
Commit c3d82e72 by LJM
Options

add

parent ec0d7ff0
Inline Side-by-side
Showing with 64 additions and 66 deletions
assets/css/tally/abnormalTally.scss
...@@ -101,20 +101,20 @@ ...@@ -101,20 +101,20 @@
margin-bottom: 16rpx; margin-bottom: 16rpx;
} }
.t1 { .t1 {
font-size: 22rpx; font-size: 26rpx;
color: #404547; color: #404547;
font-weight: bold; font-weight: bold;
} }
.t2 { .t2 {
font-size: 22rpx; font-size: 26rpx;
color: #6e767a; color: #6e767a;
} }
.t3 { .t3 {
font-size: 22rpx; font-size: 26rpx;
color: #404547; color: #404547;
} }
.t4 { .t4 {
font-size: 22rpx; font-size: 26rpx;
color: #f39d18; color: #f39d18;
} }
.icon-jinggao31 { .icon-jinggao31 {
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
.filter-tab { .filter-tab {
height: 60rpx; height: 60rpx;
.t1 { .t1 {
font-size: 24rpx; font-size: 26rpx;
color: #404547; color: #404547;
} }
.t2 { .t2 {
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
text-align: right; text-align: right;
} }
.text { .text {
font-size: 24rpx; font-size: 26rpx;
color: #197adb; color: #197adb;
white-space: nowrap; white-space: nowrap;
} }
......
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: 16rpx; padding-bottom: 30rpx;
} }
.w130 { .w130 {
width: 156rpx; width: 156rpx;
...@@ -136,7 +136,6 @@ ...@@ -136,7 +136,6 @@
} }
.input-text { .input-text {
.uni-input { .uni-input {
width: 173rpx;
height: 48rpx; height: 48rpx;
background: #e6edf0; background: #e6edf0;
border-radius: 4rpx; border-radius: 4rpx;
......
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: 16rpx; padding-bottom: 30rpx;
} }
.w130 { .w130 {
width: 156rpx; width: 156rpx;
......
pages/tally/index.vue
...@@ -98,38 +98,29 @@ ...@@ -98,38 +98,29 @@
<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 verCenter bothSide"> <view class="pb16 row">
<view class="row" style="width: 50%;"> <text class="t3 w130">金额：</text>
<text class="t3 w130">单价：</text>
<text class="t4">{{item.unit_price}}</text>
</view>
<view class="row" style="width: 50%;">
<text class="t3 w130" style="text-align: right;">金额：</text>
<text class="t4">{{item.total_price}}</text> <text class="t4">{{item.total_price}}</text>
</view> </view>
</view>
<view class="pb16 row" style="border-bottom: 1px solid #E6EDF0;padding-bottom: 24rpx;">
<!-- 完全理货 --> <!-- 完全理货 -->
<template v-if="item.tally_status == 3"> <template v-if="item.tally_status == 3">
<view class="row"> <view class="pb16 row">
<text class="t3 w130">总数量：</text> <text class="t3 w130">总数量：</text>
<text class="t4">{{item.order_numbers}}</text> <text class="t4">{{item.order_numbers}}</text>
</view> </view>
</template> </template>
<!-- 1未理货2部分理货 --> <!-- 1未理货2部分理货 -->
<template v-else> <template v-else>
<view class="row" style="width: 50%;"> <view class="pb16 row">
<text class="t3 w130">待收数量：</text> <text class="t3 w130">待收数量：</text>
<text class="t4">{{item.wait_tally_num}}</text> <text class="t4">{{item.wait_tally_num}}</text>
</view> </view>
<view class="row" style="width: 50%;"> <view class="pb16 row">
<text class="t3 w130" style="text-align: right;">总数量：</text> <text class="t3 w130">总数量：</text>
<text class="t4">{{item.order_numbers}}</text> <text class="t4">{{item.order_numbers}}</text>
</view> </view>
</template> </template>
</view> <view class="pb16 row verCenter">
<view class="pb16 row verCenter bothSide" style="margin-top: 24rpx;">
<view class="row verCenter">
<!-- 完全理货 --> <!-- 完全理货 -->
<template v-if="item.tally_status == 3"> <template v-if="item.tally_status == 3">
<text class="t3 w130">已入库数量：</text> <text class="t3 w130">已入库数量：</text>
...@@ -142,8 +133,8 @@ ...@@ -142,8 +133,8 @@
<input class="uni-input" :disabled="item.tally_status == 3" type="number" inputmode="numeric" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].tally_num" /> <input class="uni-input" :disabled="item.tally_status == 3" type="number" inputmode="numeric" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].tally_num" />
</view> </view>
</view> </view>
<view class="row verCenter rowCenter"> <view class="pb16 row verCenter">
<text class="t3 w130" style="width:105rpx;">原产地：</text> <text class="t3 w130">原产地：</text>
<view class="input-text"> <view class="input-text">
<!-- 完全理货 --> <!-- 完全理货 -->
<template v-if="item.tally_status == 3"> <template v-if="item.tally_status == 3">
...@@ -155,16 +146,14 @@ ...@@ -155,16 +146,14 @@
</template> </template>
</view> </view>
</view> </view>
</view> <view class="pb16 row verCenter">
<view class="pb16 row verCenter bothSide" style="margin-top: 24rpx;">
<view class="row verCenter">
<text class="t3 w130">净重：</text> <text class="t3 w130">净重：</text>
<view class="input-text"> <view class="input-text">
<input class="uni-input" :disabled="item.tally_status == 3" type="number" inputmode="decimal" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].net_weight" /> <input class="uni-input" :disabled="item.tally_status == 3" type="number" inputmode="decimal" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].net_weight" />
</view> </view>
</view> </view>
<view class="row verCenter"> <view class="pb16 row verCenter">
<text class="t3 w130" style="width:105rpx;">备注：</text> <text class="t3 w130">备注：</text>
<view class="input-text"> <view class="input-text">
<template v-if="item.tally_status == 3"> <template v-if="item.tally_status == 3">
<input class="uni-input" :disabled="item.tally_status == 3" type="text" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].remark" maxlength="100" @click="viewChange(form[index].remark)" /> <input class="uni-input" :disabled="item.tally_status == 3" type="text" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].remark" maxlength="100" @click="viewChange(form[index].remark)" />
...@@ -174,8 +163,8 @@ ...@@ -174,8 +163,8 @@
</template> </template>
</view> </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">
...@@ -192,6 +181,8 @@ ...@@ -192,6 +181,8 @@
<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>
...@@ -214,7 +205,6 @@ ...@@ -214,7 +205,6 @@
<view class="btn-list row verCenter bothSide" v-if="!tallyData.detail"> <view class="btn-list row verCenter bothSide" v-if="!tallyData.detail">
<navigator url="/pages/tally/fixBox" class="box row rowCenter verCenter" hover-class="none">合 箱</navigator> <navigator url="/pages/tally/fixBox" class="box row rowCenter verCenter" hover-class="none">合 箱</navigator>
<navigator url="/pages/tally/unboxing" class="box row rowCenter verCenter" hover-class="none">重新开箱</navigator> <navigator url="/pages/tally/unboxing" class="box row rowCenter verCenter" hover-class="none">重新开箱</navigator>
<navigator url="/pages/tally/printBox" class="box row rowCenter verCenter" hover-class="none">打印箱号</navigator>
<navigator url="/pages/tally/abnormalTally" class="box row rowCenter verCenter" hover-class="none">理货异常处理</navigator> <navigator url="/pages/tally/abnormalTally" class="box row rowCenter verCenter" hover-class="none">理货异常处理</navigator>
</view> </view>
<!-- 选择国家 --> <!-- 选择国家 -->
...@@ -265,7 +255,7 @@ ...@@ -265,7 +255,7 @@
curr: -1, //当前打开的是哪个产地 curr: -1, //当前打开的是哪个产地
fixBoxStyle: '', fixBoxStyle: '',
noexebshowFalg: true, //控制是否会触发生命周期 noexebshowFalg: true, //控制是否会触发生命周期
index: 0, index: uni.getStorageSync('goodIndex') || 0,
item: ['型号', 'DigiKey', 'Rochester', 'TME', 'Chip1stop'], item: ['型号', 'DigiKey', 'Rochester', 'TME', 'Chip1stop'],
box_sn: '', //箱号信息 box_sn: '', //箱号信息
wsty_id: '', //箱子id wsty_id: '', //箱子id
...@@ -322,6 +312,7 @@ ...@@ -322,6 +312,7 @@
bindPickerChange: function(e) { bindPickerChange: function(e) {
console.log('picker发送选择改变，携带值为', e.detail.value); console.log('picker发送选择改变，携带值为', e.detail.value);
this.index = e.detail.value; this.index = e.detail.value;
uni.setStorageSync('goodIndex', this.index);
this.clearInput(3); this.clearInput(3);
}, },
/** /**
...@@ -640,6 +631,8 @@ ...@@ -640,6 +631,8 @@
this.box_sn = res.data.box_sn; this.box_sn = res.data.box_sn;
this.wsty_id = res.data.wsty_id; this.wsty_id = res.data.wsty_id;
this.print(); //取箱号成功则自动调用打印箱号
if (this.form.length > 0) { if (this.form.length > 0) {
// 筛选出 tally_status 等于 1 或 2 的数据 // 筛选出 tally_status 等于 1 或 2 的数据
var filteredForm = this.form.filter(item => item.tally_status === 1 || item.tally_status === 2); var filteredForm = this.form.filter(item => item.tally_status === 1 || item.tally_status === 2);
...@@ -822,6 +815,11 @@ ...@@ -822,6 +815,11 @@
icon: 'success', icon: 'success',
duration: 2000 duration: 2000
}); });
//理货提交成功后自动清空型号查询框
this.keyword = '';
this.goods_type = '';
setTimeout(() => { setTimeout(() => {
this.getTallyData(); this.getTallyData();
}, 2000); }, 2000);
...@@ -987,11 +985,10 @@ ...@@ -987,11 +985,10 @@
} }
this.request(API.addSCTallyData, 'POST', params, true).then(res => { this.request(API.addSCTallyData, 'POST', params, true).then(res => {
if (res.code === 0) { if (res.code === 0) {
uni.showModal({ uni.showToast({
title: '', title: '打印箱号成功',
content: '打印成功，请查看打印机', icon: 'success'
showCancel: false })
});
} else { } else {
uni.showToast({ uni.showToast({
title: res.err_msg, title: res.err_msg,
...@@ -1016,6 +1013,11 @@ ...@@ -1016,6 +1013,11 @@
setTimeout(() => { setTimeout(() => {
this.is_focus_2 = true; this.is_focus_2 = true;
}, 200); }, 200);
//X掉入仓号时，自动清空型号查询框
this.goods_type = '';
this.keyword = '';
this.getTallyData(); this.getTallyData();
} else if (type == 3) { } else if (type == 3) {
this.goods_type = ''; this.goods_type = '';
......
pages/tally/unboxing.vue
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
<text class="t3 w130">物料名称：</text> <text class="t3 w130">物料名称：</text>
<text class="t4">{{item.goods_title}}</text> <text class="t4">{{item.goods_title}}</text>
</view> </view>
<!-- 完全理货显示箱号 -->
<view class="row" style="width: 50%;justify-content: flex-end;" v-if="item.tally_status == 3"> <view class="row" style="width: 50%;justify-content: flex-end;" v-if="item.tally_status == 3">
<text class="t4" style="text-align: right;color: #197adb;">{{item.box_sn}}</text> <text class="t4" style="text-align: right;color: #197adb;">{{item.box_sn}}</text>
</view> </view>
...@@ -59,38 +60,29 @@ ...@@ -59,38 +60,29 @@
<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 verCenter bothSide"> <view class="pb16 row">
<view class="row" style="width: 50%;"> <text class="t3 w130">金额：</text>
<text class="t3 w130">单价：</text>
<text class="t4">{{item.unit_price}}</text>
</view>
<view class="row" style="width: 50%;">
<text class="t3 w130" style="text-align: right;">金额：</text>
<text class="t4">{{item.total_price}}</text> <text class="t4">{{item.total_price}}</text>
</view> </view>
</view>
<view class="pb16 row" style="border-bottom: 1px solid #E6EDF0;padding-bottom: 24rpx;">
<!-- 完全理货 --> <!-- 完全理货 -->
<template v-if="item.tally_status == 3"> <template v-if="item.tally_status == 3">
<view class="row"> <view class="pb16 row">
<text class="t3 w130">总数量：</text> <text class="t3 w130">总数量：</text>
<text class="t4">{{item.order_numbers}}</text> <text class="t4">{{item.order_numbers}}</text>
</view> </view>
</template> </template>
<!-- 1未理货2部分理货 --> <!-- 1未理货2部分理货 -->
<template v-else> <template v-else>
<view class="row" style="width: 50%;"> <view class="pb16 row">
<text class="t3 w130">待收数量：</text> <text class="t3 w130">待收数量：</text>
<text class="t4">{{item.wait_tally_num}}</text> <text class="t4">{{item.wait_tally_num}}</text>
</view> </view>
<view class="row" style="width: 50%;"> <view class="pb16 row">
<text class="t3 w130" style="text-align: right;">总数量：</text> <text class="t3 w130">总数量：</text>
<text class="t4">{{item.order_numbers}}</text> <text class="t4">{{item.order_numbers}}</text>
</view> </view>
</template> </template>
</view> <view class="pb16 row verCenter">
<view class="pb16 row verCenter bothSide" style="margin-top: 24rpx;">
<view class="row verCenter">
<!-- 完全理货 --> <!-- 完全理货 -->
<template v-if="item.tally_status == 3"> <template v-if="item.tally_status == 3">
<text class="t3 w130">已入库数量：</text> <text class="t3 w130">已入库数量：</text>
...@@ -103,8 +95,8 @@ ...@@ -103,8 +95,8 @@
<input class="uni-input" :disabled="item.tally_status == 3" type="number" inputmode="numeric" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].tally_num" /> <input class="uni-input" :disabled="item.tally_status == 3" type="number" inputmode="numeric" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].tally_num" />
</view> </view>
</view> </view>
<view class="row verCenter rowCenter"> <view class="pb16 row verCenter">
<text class="t3 w130" style="width:105rpx;">原产地：</text> <text class="t3 w130">原产地：</text>
<view class="input-text"> <view class="input-text">
<!-- 完全理货 --> <!-- 完全理货 -->
<template v-if="item.tally_status == 3"> <template v-if="item.tally_status == 3">
...@@ -116,16 +108,14 @@ ...@@ -116,16 +108,14 @@
</template> </template>
</view> </view>
</view> </view>
</view> <view class="pb16 row verCenter">
<view class="pb16 row verCenter bothSide" style="margin-top: 24rpx;">
<view class="row verCenter">
<text class="t3 w130">净重：</text> <text class="t3 w130">净重：</text>
<view class="input-text"> <view class="input-text">
<input class="uni-input" :disabled="item.tally_status == 3" type="number" inputmode="decimal" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].net_weight" /> <input class="uni-input" :disabled="item.tally_status == 3" type="number" inputmode="decimal" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].net_weight" />
</view> </view>
</view> </view>
<view class="row verCenter"> <view class="pb16 row verCenter">
<text class="t3 w130" style="width:105rpx;">备注：</text> <text class="t3 w130">备注：</text>
<view class="input-text"> <view class="input-text">
<template v-if="item.tally_status == 3"> <template v-if="item.tally_status == 3">
<input class="uni-input" :disabled="item.tally_status == 3" type="text" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].remark" maxlength="100" @click="viewChange(form[index].remark)" /> <input class="uni-input" :disabled="item.tally_status == 3" type="text" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].remark" maxlength="100" @click="viewChange(form[index].remark)" />
...@@ -135,8 +125,8 @@ ...@@ -135,8 +125,8 @@
</template> </template>
</view> </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">
...@@ -153,6 +143,8 @@ ...@@ -153,6 +143,8 @@
<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>
...@@ -738,6 +730,11 @@ ...@@ -738,6 +730,11 @@
icon: 'success', icon: 'success',
duration: 2000 duration: 2000
}); });
//理货提交成功后自动清空型号查询框
this.keyword = '';
this.goods_type = '';
setTimeout(() => { setTimeout(() => {
this.getTallyData(); this.getTallyData();
}, 2000); }, 2000);
......
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