Skip to content

梁建民 / wmsApp

Go to a project
Commit c4080a5d by LJM
Options

PC-出库单--增加筛选条件以及 移动端 -拣货操作优化

parent c7bdb871
Inline Side-by-side
Showing with 157 additions and 46 deletions
assets/css/picking/sort.scss
......@@ -489,6 +489,34 @@
.uni-input {
font-size: 17rpx;
color: #484b59;
font-weight: bold;
}
.uni-arrow {
width: 14rpx;
height: 9rpx;
background: url('https://img.ichunt.com/images/ichunt/202304/10/e4c72319ad41ce1425f71cc6ec35f111.png') no-repeat center;
background-size: contain;
margin-left: 12rpx;
}
}
}
}
.print_type {
height: 75rpx;
.t1 {
font-size: 20rpx;
color: #1969f9;
margin-right: 10rpx;
}
.print-type-box {
width: 150rpx;
height: 75rpx;
.wrap-box {
height: 75rpx;
.uni-input {
font-size: 16rpx;
color: #484b59;
font-weight: bold;
}
.uni-arrow {
width: 14rpx;
......
pages/picking/sort.vue
......@@ -146,21 +146,27 @@
<text class="iconfont icon-a-juxing21"></text>
<text class="text">查不到当前数据</text>
</view>
<!-- 底部操作bar -->
<view class="fix-btn row verCenter" v-if="is_batch_active">
<template v-if="warehouse_id == 9">
<view class="print_type row rowCenter verCenter">
<text class="t1" @click="rePrintTag()">打印货品标签</text>
<view class="print-type-box row rowCenter verCenter">
<picker @change="bindPickerChange" :value="print_style_index" :range="print_style" class="row rowCenter verCenter">
<!-- 不限制仓库，均显示【打印货品标签】按钮 -->
<view class="print_type row rowCenter verCenter">
<text class="t1" @click="rePrintTag()">打印货品标签</text>
<view class="print-type-box row rowCenter verCenter">
<!-- 深圳自营仓 -->
<template v-if="warehouse_id == 9">
<picker @change="bindPickerChange($event)" :value="print_style_index" :range="print_style" class="row rowCenter verCenter">
<view class="uni-input">{{ print_style[print_style_index] }}</view>
</picker>
</view>
</template>
<!-- 非自营仓 -->
<template v-else>
<picker @change="bindPickerChange($event,1)" :value="print_language_index" :range="print_language" class="row rowCenter verCenter">
<view class="uni-input">{{ print_language[print_language_index] }}</view>
</picker>
</template>
</view>
<view class="btn2 row rowCenter verCenter" @click="showDrawer(3)">批量拣货（{{ filter_id.length || 0 }}）</view>
</template>
<template v-else>
<view class="btn1 row rowCenter verCenter" @click="showDrawer(3)">批量拣货（{{ filter_id.length || 0 }}）</view>
</template>
</view>
<view class="btn2 row rowCenter verCenter" @click="showDrawer(3)">批量拣货（{{ filter_id.length || 0 }}）</view>
</view>
</template>
<!-- 按容器拣货列表 -->
......@@ -200,7 +206,7 @@
<uni-drawer ref="showRight" mode="right">
<view class="uni-drawer-picking" v-if="detail">
<view class="title row rowCenter verCenter">
<text class="iconfont icon-juxing2" @click="closeDrawer(1)"></text>
<text class="iconfont icon-juxing2" @click="closeDrawer()"></text>
<text class="text">{{ stock_out_sn }}</text>
</view>
<view class="field-item row" style="margin-top: 39rpx;">
......@@ -347,12 +353,24 @@
</checkbox-group>
<text class="t1">拆货打印标签</text>
<view class="print-type-box row rowCenter verCenter">
<picker @change="bindPickerChange" :value="print_style_index" :range="print_style" class="row rowCenter verCenter">
<view class="row rowCenter verCenter">
<view class="uni-input">{{ print_style[print_style_index] }}</view>
<view class="uni-arrow"></view>
</view>
</picker>
<!-- 深圳自营仓 -->
<template v-if="warehouse_id == 9">
<picker @change="bindPickerChange($event)" :value="print_style_index" :range="print_style" class="row rowCenter verCenter">
<view class="row rowCenter verCenter">
<view class="uni-input">{{ print_style[print_style_index] }}</view>
<view class="uni-arrow"></view>
</view>
</picker>
</template>
<!-- 非自营仓 -->
<template v-else>
<picker @change="bindPickerChange($event,1)" :value="print_language_index" :range="print_language" class="row rowCenter verCenter">
<view class="row rowCenter verCenter">
<view class="uni-input">{{ print_language[print_language_index] }}</view>
<view class="uni-arrow"></view>
</view>
</picker>
</template>
</view>
</view>
<view class="btn row verCenter bothSide">
......@@ -364,7 +382,7 @@
<uni-drawer ref="showRightPack" mode="right">
<view class="uni-drawer-picking">
<view class="title row rowCenter verCenter">
<text class="iconfont icon-juxing2" @click="closeDrawer(2)"></text>
<text class="iconfont icon-juxing2" @click="closeDrawer()"></text>
<text class="text">{{ stock_out_sn }}</text>
</view>
<view class="field-item row" style="margin-top: 39rpx;">
......@@ -497,7 +515,7 @@
<uni-drawer ref="showRightPackMultiPick" mode="right">
<view class="uni-drawer-picking">
<view class="title row rowCenter verCenter">
<text class="iconfont icon-juxing2" @click="closeDrawer(3)"></text>
<text class="iconfont icon-juxing2" @click="closeDrawer()"></text>
<text class="text">{{ stock_out_sn }}</text>
</view>
<view class="field-item row" style="margin-top: 39rpx;">
......@@ -505,7 +523,11 @@
<view class="label" style="width: 100%;">
您已选中
<text style="color: #1969f9;font-size: 13rpx;font-weight: bold;padding: 0 5rpx;">{{ filter_id.length || 0 }}</text>
个拣货任务
个拣货任务，其中
<text style="color: #1969f9;font-size: 13rpx;font-weight: bold;padding: 0 5rpx;">{{demolish_num}}</text>
个需拆货，共打印
<text style="color: #1969f9;font-size: 13rpx;font-weight: bold;padding: 0 5rpx;">{{goods_num}}</text>
张货品标签
</view>
</view>
</view>
......@@ -516,7 +538,7 @@
</view>
<view class="h2 row bothSide verCenter" style="margin-top: 25rpx;">
<view>
<text>拣货图片：</text>
<text>拣货照片：</text>
<text class="tt">最多只支持{{ maxNum }}张图</text>
</view>
<view class="num">
......@@ -533,8 +555,37 @@
</template>
<view class="default row rowCenter verCenter" @click="chooseImageChange()" v-if="image_list.length < maxNum"><text class="iconfont icon-a-juxing3"></text></view>
</view>
<!-- 添加打印标签 -->
<view class="print_type row verCenter">
<checkbox-group @change="onCheckboxChange">
<label>
<checkbox value="1" color="#1969f9" style="transform:scale(0.7)" checked />
</label>
</checkbox-group>
<text class="t1" @click="rePrintTag()">打印货品标签</text>
<view class="print-type-box row verCenter">
<!-- 深圳自营仓 -->
<template v-if="warehouse_id == 9">
<picker @change="bindPickerChange($event)" :value="print_style_index" :range="print_style">
<view class="row verCenter wrap-box">
<view class="uni-input">{{ print_style[print_style_index] }}</view>
<text class="uni-arrow"></text>
</view>
</picker>
</template>
<!-- 非自营仓 -->
<template v-else>
<picker @change="bindPickerChange($event,1)" :value="print_language_index" :range="print_language">
<view class="row verCenter wrap-box">
<view class="uni-input">{{ print_language[print_language_index] }}</view>
<text class="uni-arrow"></text>
</view>
</picker>
</template>
</view>
</view>
<view class="btn row verCenter bothSide">
<view class="btn0 row rowCenter verCenter" @click="closeDrawer(3)" style="width: 50%;">取消</view>
<view class="btn0 row rowCenter verCenter" @click="closeDrawer()" style="width: 50%;">取消</view>
<view class="btn1 row rowCenter verCenter" @click="makeMultiPickingFinish()" style="width: 50%;">拣 货</view>
</view>
</view>
......@@ -579,6 +630,8 @@
warehouse_id: '', //仓库id
print_style: ['基本样式', '不带D/C'],
print_style_index: 1,
print_language: ['中文标签', '英文标签'],
print_language_index: 0,
searchParams: {
stock_out_id: '',
position_name: '',
......@@ -589,12 +642,15 @@
pick_qty: '',
pick_remark: ''
},
demolish_num: 0, //计算拆货数量
goods_num: 0, //计算打印货品标签数量
//打印货品标签参数集合
rePrintTagParams: {
stock_out_item_id: '',
print_type: 1,
print_type: 1, //自营打印标签 0 基本样式,1不带D/C
recheck_num: '',
from_type: 1
print_language: '', //非自营仓打印标签 1中文，2英文
from_type: 1 //固定
}
};
},
......@@ -631,12 +687,19 @@
},
/**
* 打印货品标签样式切换监听
* @param {Object} e
* @param {Object} type
*/
bindPickerChange: function(e) {
this.print_style_index = e.detail.value;
this.rePrintTagParams.print_type = e.detail.value;
bindPickerChange: function(e, type) {
if (type == 1) {
//非自营仓
this.print_language_index = e.detail.value;
this.rePrintTagParams.print_language = Number(e.detail.value) + 1;
} else {
//深圳自营仓
this.print_style_index = e.detail.value;
this.rePrintTagParams.print_type = e.detail.value;
}
},
/**
* @param {Object} e
......@@ -820,23 +883,35 @@
this.formParams.pick_remark = '';
this.$refs.showRightPackMultiPick.open();
this.image_list = []; //清空图片列表
//先重置计数器
this.demolish_num = 0;
this.goods_num = 0;
if (this.filter_id.length > 0) {
//计算拆货数量和打印货品标签数量
this.list.forEach(item => {
if (this.filter_id.includes(item.lock_id)) {
// 判断pick_type_val的值，更新demolish_num和goods_num
if (item.pick_type_val === '整') {
this.goods_num += 1; //打印货品标签数量
} else if (item.pick_type_val === '散') {
this.demolish_num += 1; //计算拆货数量
this.goods_num += 2; //打印货品标签数量
}
}
});
}
}
},
/**
* 关闭弹窗
* 关闭弹窗 货品拣货 容器拣货 批量拣货
* @param {Object} type
*/
closeDrawer(type) {
if (type == 1) {
//按货品拣货
this.$refs.showRight.close();
} else if (type == 2) {
//按容器拣货
this.$refs.showRightPack.close();
} else if (type == 3) {
//批量拣货
this.$refs.showRightPackMultiPick.close();
}
closeDrawer() {
this.$refs.showRight.close();
this.$refs.showRightPack.close();
this.$refs.showRightPackMultiPick.close();
},
/**
* 找出false对应的下标
......@@ -1069,11 +1144,12 @@
*打印货品标签
*/
rePrintTag(type) {
//根据情景序列号不同的参数
if (type == 1) {
//单个拣货
this.rePrintTagParams.stock_out_item_id = this.detail.stock_out_item_id;
this.rePrintTagParams.recheck_num = this.formParams.pick_qty;
} else {
//底部操作栏打印货品标签 和 批量打印的打印货品标签
if (this.filter_id.length == 0) {
uni.showToast({
title: '请勾选数据',
......@@ -1135,7 +1211,7 @@
this.filter_id = [];
this.search_keyword = '';
this.searchParams.stock_in_batch_sn = '';
this.closeDrawer(1);
this.closeDrawer();
} else {
this.picked_num = Number(this.picked_num) - pick_qty_num;
}
......@@ -1177,19 +1253,26 @@
title: '拣货成功',
icon: 'success'
});
//如果勾选了打印则触发打印必须自营仓
if (this.is_print && this.warehouse_id == 9) {
this.rePrintTag();
}
// 根据 is_print 勾选的值设置 setTimeout 的延迟时间
const timeoutDuration = (this.is_print && this.warehouse_id == 9) ? 4000 : 2000;
setTimeout(() => {
if (flag) {
//清空数据
this.history_id = [];
this.filter_id = [];
this.search_keyword = '';
this.searchParams.stock_in_batch_sn = '';
this.is_batch_active = false;
this.closeDrawer(3);
this.closeDrawer();
} else {
this.closeDrawer(2);
this.closeDrawer();
}
this.getData();
}, 2000);
}, timeoutDuration);
} else {
uni.showModal({
itle: '提示',
......
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