Skip to content

梁建民 / wmsApp

Go to a project
Commit c5c259cd by LJM
Options

WMS打印快递单--增加跨越物流打印

parent e4dc1690
Expand all
Inline Side-by-side
Showing with 167 additions and 20 deletions
assets/css/stockRecheck/index.scss
...@@ -40,6 +40,13 @@ ...@@ -40,6 +40,13 @@
} }
} }
} }
.filter-checkbox {
margin-top: 15rpx;
label {
margin-right: 10rpx;
font-size: 24rpx;
}
}
.list { .list {
margin-top: 15rpx; margin-top: 15rpx;
padding-bottom: 150rpx; padding-bottom: 150rpx;
......
assets/css/stockRecheck/print.scss
...@@ -150,7 +150,6 @@ ...@@ -150,7 +150,6 @@
} }
} }
.form-input { .form-input {
margin-bottom: 18rpx;
.input-title { .input-title {
margin-bottom: 10rpx; margin-bottom: 10rpx;
.input-title-t1 { .input-title-t1 {
...@@ -180,7 +179,6 @@ ...@@ -180,7 +179,6 @@
background: #ffffff; background: #ffffff;
border-radius: 10rpx; border-radius: 10rpx;
border: 1px solid #1969f9; border: 1px solid #1969f9;
margin-bottom: 18rpx;
.wrap { .wrap {
padding-left: 15rpx; padding-left: 15rpx;
padding-right: 25rpx; padding-right: 25rpx;
...@@ -223,6 +221,7 @@ ...@@ -223,6 +221,7 @@
} }
} }
.print { .print {
margin-top: 16rpx;
margin-bottom: 27rpx; margin-bottom: 27rpx;
.check-box-icon { .check-box-icon {
width: 20rpx; width: 20rpx;
...@@ -247,7 +246,7 @@ ...@@ -247,7 +246,7 @@
margin-bottom: 17rpx; margin-bottom: 17rpx;
} }
.btn { .btn {
margin: 0 auto; margin: 26rpx auto 0;
.btn1 { .btn1 {
width: 100%; width: 100%;
height: 75rpx; height: 75rpx;
......
assets/css/stockRecheck/sort.scss
...@@ -607,8 +607,34 @@ ...@@ -607,8 +607,34 @@
} }
} }
&.box-drawer { &.box-drawer {
.radio-search-box {
height: 100rpx;
}
.rePrintTag {
.input-box {
margin-bottom: 16rpx;
.tt {
font-size: 16rpx;
color: #484b59;
}
.uni-input {
width: 83%;
height: 43rpx;
background: #ffffff;
border-radius: 10rpx;
border: 1px solid #1969f9;
text-indent: 15rpx;
font-size: 16rpx;
margin-left: 2%;
}
.desc {
font-size: 16rpx;
color: #484b59;
margin-left: 5rpx;
}
}
}
.box-list { .box-list {
margin-top: 50rpx;
.box-title { .box-title {
margin-bottom: 18rpx; margin-bottom: 18rpx;
.t1 { .t1 {
......
pages/stockRecheck/index.vue
<template> <template>
<view class="stockRecheck"> <view class="stockRecheck">
<!-- 搜索 -->
<view class="search-box row bothSide verCenter"> <view class="search-box row bothSide verCenter">
<view class="sn row rowCenter verCenter"> <view class="sn row rowCenter verCenter">
<picker @change="bindPickerChange" :value="index" :range="array"> <picker @change="bindPickerChange" :value="index" :range="array">
...@@ -17,6 +18,22 @@ ...@@ -17,6 +18,22 @@
<text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text> <text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text>
</view> </view>
</view> </view>
<!-- 出库单状态筛选 -->
<checkbox-group class="row filter-checkbox" @change="checkboxChange">
<label class="row verCenter">
<checkbox value="5" checked="true" color="#1969f9" style="transform:scale(0.7)" />全部拣货
</label>
<label class="row verCenter">
<checkbox value="6" checked="true" color="#1969f9" style="transform:scale(0.7)" />部分复核
</label>
<label class="row verCenter">
<checkbox value="7" checked="true" color="#1969f9" style="transform:scale(0.7)" />全部复核
</label>
<label class="row verCenter">
<checkbox value="8" color="#1969f9" style="transform:scale(0.7)" />已完成
</label>
</checkbox-group>
<!-- 列表 -->
<view class="list row bothSide" v-if="list.length > 0"> <view class="list row bothSide" v-if="list.length > 0">
<view class="box" v-for="(item, index) in list" :key="index" :class="{ curr: filter_list[index] }"> <view class="box" v-for="(item, index) in list" :key="index" :class="{ curr: filter_list[index] }">
<view class="check-box-icon" @click="filterChange(index)"></view> <view class="check-box-icon" @click="filterChange(index)"></view>
...@@ -45,7 +62,9 @@ ...@@ -45,7 +62,9 @@
<text class="label">总 数 量：</text> <text class="label">总 数 量：</text>
<text class="tt">{{ item.total_qty }}</text> <text class="tt">{{ item.total_qty }}</text>
</view> </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 + '&warehouse_id=' + item.warehouse_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 + '&warehouse_id=' + item.warehouse_id" class="btn1 row rowCenter verCenter" hover-class="none">选择</navigator>
</view>
</view> </view>
</view> </view>
<!-- 无数据展示 --> <!-- 无数据展示 -->
...@@ -53,16 +72,18 @@ ...@@ -53,16 +72,18 @@
<text class="iconfont icon-a-juxing21"></text> <text class="iconfont icon-a-juxing21"></text>
<text class="text">查不到当前数据</text> <text class="text">查不到当前数据</text>
</view> </view>
<view class="fix-btn row verCenter"><view class="btn2 row rowCenter verCenter" style="width: 100%;" @click="makeStockOutFinish">复核确认</view></view> <view class="fix-btn row verCenter">
<view class="btn2 row rowCenter verCenter" style="width: 100%;" @click="makeStockOutFinish">复核确认</view>
</view>
</view> </view>
</template> </template>
<script> <script>
import { API } from '@/util/api.js'; import { API } from '@/util/api.js';
import { createArray } from '@/util/util.js'; import { createArray } from '@/util/util.js';
import debounce from 'lodash/debounce'; import debounce from 'lodash/debounce';
export default { export default {
data() { data() {
return { return {
input_flag: false, input_flag: false,
...@@ -74,6 +95,7 @@ export default { ...@@ -74,6 +95,7 @@ export default {
filter_list: [], //筛选已选中的列表 filter_list: [], //筛选已选中的列表
filter_id: [], //过滤处理的id filter_id: [], //过滤处理的id
searchParams: { searchParams: {
stock_out_status: '5,6,7', //出库单状态
stock_out_sn: '' //出库单号 stock_out_sn: '' //出库单号
} }
}; };
...@@ -89,6 +111,11 @@ export default { ...@@ -89,6 +111,11 @@ export default {
} }
}, },
methods: { methods: {
checkboxChange(e) {
console.log('checkbox发送选择改变，携带值为', e.detail.value);
this.searchParams.stock_out_status = e.detail.value.join(',');
this.getData();
},
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;
...@@ -197,9 +224,9 @@ export default { ...@@ -197,9 +224,9 @@ export default {
}); });
} }
} }
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@import '@/assets/css/stockRecheck/index.scss'; @import '@/assets/css/stockRecheck/index.scss';
</style> </style>
\ No newline at end of file
pages/stockRecheck/sort.vue
...@@ -575,6 +575,21 @@ ...@@ -575,6 +575,21 @@
<text class="iconfont icon-juxing2" @click="closeBox()"></text> <text class="iconfont icon-juxing2" @click="closeBox()"></text>
<text class="text">箱信息</text> <text class="text">箱信息</text>
</view> </view>
<!-- 箱类型 -->
<view class="radio-search-box row verCenter">
<radio-group @change="radioChange" class="row verCenter">
<label class="radio row verCenter">
<radio value="0" :checked="custome_box_info_index == 0" style="transform:scale(0.7)" color="#1969F9" />
<text class="tt">按复核数据</text>
</label>
<label class="radio">
<radio value="1" :checked="custome_box_info_index == 1" style="transform:scale(0.7)" color="#1969F9" />
<text class="tt">手动填写</text>
</label>
</radio-group>
</view>
<!-- 按复核数据 -->
<template v-if="custome_box_info_index == 0">
<view class="box-list"> <view class="box-list">
<view class="box-wrap" v-for="(item, i) in packList" :key="i"> <view class="box-wrap" v-for="(item, i) in packList" :key="i">
<view class="box-title row bothSide verCenter"> <view class="box-title row bothSide verCenter">
...@@ -608,6 +623,22 @@ ...@@ -608,6 +623,22 @@
<text class="text">暂无箱信息</text> <text class="text">暂无箱信息</text>
</view> </view>
</view> </view>
</template>
<!-- 手动填写 -->
<template v-else-if="custome_box_info_index == 1">
<view class="rePrintTag">
<view class="input-box row verCenter">
<text class="tt">总箱数</text>
<input class="uni-input" placeholder="请输入总箱数" placeholder-style="color:#919399" v-model="setCustomBoxInfoParams.total_box_num" />
</view>
<view class="input-box row verCenter">
<text class="tt">总重量</text>
<input class="uni-input" placeholder="请输入总箱数" placeholder-style="color:#919399" v-model="setCustomBoxInfoParams.total_weight" />
<text class="desc">kg</text>
</view>
</view>
</template>
<view class="btn row verCenter bothSide"> <view class="btn row verCenter bothSide">
<view class="btn0 row rowCenter verCenter" @click="closeBox()">取 消</view> <view class="btn0 row rowCenter verCenter" @click="closeBox()">取 消</view>
<view class="btn1 row rowCenter verCenter" style="width: 50%;" @click="updatePackInfo()">确认</view> <view class="btn1 row rowCenter verCenter" style="width: 50%;" @click="updatePackInfo()">确认</view>
...@@ -660,6 +691,7 @@ ...@@ -660,6 +691,7 @@
image_list: [], //图片列表 image_list: [], //图片列表
maxNum: 10, //最大上传图片数量 maxNum: 10, //最大上传图片数量
maxlength: 15, //输入框长度15 maxlength: 15, //输入框长度15
custome_box_info_index: 0, //箱规格设置
searchParams: { searchParams: {
stock_out_id: '', stock_out_id: '',
box_name: '001', box_name: '001',
...@@ -669,6 +701,12 @@ ...@@ -669,6 +701,12 @@
formParams: { formParams: {
recheck_qty: '' recheck_qty: ''
}, },
//手动填写参数集合
setCustomBoxInfoParams: {
stock_out_id: '',
total_box_num: '',
total_weight: ''
},
//打印货品标签参数集合 //打印货品标签参数集合
rePrintTagParams: { rePrintTagParams: {
stock_out_item_id: '', stock_out_item_id: '',
...@@ -686,6 +724,7 @@ ...@@ -686,6 +724,7 @@
}, },
onLoad(options) { onLoad(options) {
this.searchParams.stock_out_id = options.stock_out_id || ''; this.searchParams.stock_out_id = options.stock_out_id || '';
this.setCustomBoxInfoParams.stock_out_id = options.stock_out_id || '';
this.warehouse_id = options.warehouse_id || ''; this.warehouse_id = options.warehouse_id || '';
this.stock_out_sn = options.stock_out_sn || ''; this.stock_out_sn = options.stock_out_sn || '';
//深圳自营仓-默认选择旧标签 //深圳自营仓-默认选择旧标签
...@@ -701,6 +740,13 @@ ...@@ -701,6 +740,13 @@
methods: { methods: {
/** /**
* @param {Object} e * @param {Object} e
* 箱信息选择
*/
radioChange(e) {
this.custome_box_info_index = e.detail.value;
},
/**
* @param {Object} e
* @param {Object} type 1旧标签 批量扫描监听 * @param {Object} type 1旧标签 批量扫描监听
*/ */
switchChange(e, type) { switchChange(e, type) {
...@@ -959,7 +1005,15 @@ ...@@ -959,7 +1005,15 @@
getPackList() { getPackList() {
this.request(API.getPackList, 'POST', { stock_out_id: this.searchParams.stock_out_id }, false).then(res => { this.request(API.getPackList, 'POST', { stock_out_id: this.searchParams.stock_out_id }, false).then(res => {
if (res.code === 0) { if (res.code === 0) {
if (this.company_id == 1 || this.company_id == 3) {
//猎芯和华云
this.packList = res.data.list; this.packList = res.data.list;
} else if (this.company_id == 2) {
//深茂
this.custome_box_info_index = 1;
this.setCustomBoxInfoParams.total_box_num = res.data.custome_box_info.total_box_num; //更新后台总箱数
this.setCustomBoxInfoParams.total_weight = res.data.custome_box_info.total_weight; //更新后台总重量
}
} else { } else {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
...@@ -1239,6 +1293,8 @@ ...@@ -1239,6 +1293,8 @@
* 保存打包信息 * 保存打包信息
*/ */
updatePackInfo() { updatePackInfo() {
if (this.custome_box_info_index == 0) {
//按复核数据
if (this.packList.length > 0) { if (this.packList.length > 0) {
var parmas = { var parmas = {
pack_list: JSON.stringify(this.packList) pack_list: JSON.stringify(this.packList)
...@@ -1261,6 +1317,26 @@ ...@@ -1261,6 +1317,26 @@
} }
}); });
} }
} else if (this.custome_box_info_index == 1) {
//手动填写
this.request(API.setCustomBoxInfo, 'POST', this.setCustomBoxInfoParams, true).then(res => {
if (res.code === 0) {
uni.showToast({
title: '手动填写成功',
icon: 'success'
});
setTimeout(() => {
this.closeBox();
}, 2000);
} else {
uni.showModal({
itle: '提示',
content: res.msg,
showCancel: false
});
}
});
}
}, },
/** /**
* 展示箱信息 * 展示箱信息
...@@ -1269,6 +1345,13 @@ ...@@ -1269,6 +1345,13 @@
this.getPackList(); //获取箱信息 this.getPackList(); //获取箱信息
this.getBoxConfigList(); //获取箱配置 this.getBoxConfigList(); //获取箱配置
this.index = -1; this.index = -1;
if (this.company_id == 1 || this.company_id == 3) {
//猎芯和华云
this.custome_box_info_index = 0;
} else if (this.company_id == 2) {
//深茂
this.custome_box_info_index = 1;
}
this.$refs.showBoxInfo.open(); this.$refs.showBoxInfo.open();
}, },
/** /**
......
util/api.js
// const API_BASE_USER = 'http://user.liexindev.net'; //用户系统 const API_BASE_USER = 'http://user.liexindev.net'; //用户系统
// const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统 const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统
// const API_BASE = 'http://wms.liexindev.net'; //WMS系统 const API_BASE = 'http://wms.liexindev.net'; //WMS系统
// const API_BASE_OSS = 'http://image.liexindev.net'; //oss系统 const API_BASE_OSS = 'http://image.liexindev.net'; //oss系统
const API_BASE_USER = 'https://user.ichunt.net'; //用户系统 // const API_BASE_USER = 'https://user.ichunt.net'; //用户系统
const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统 // const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统
const API_BASE = 'https://wms.ichunt.net'; //WMS系统 // const API_BASE = 'https://wms.ichunt.net'; //WMS系统
const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统 // const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
const API = { const API = {
...@@ -292,6 +292,10 @@ const API = { ...@@ -292,6 +292,10 @@ const API = {
* */ * */
updatePackInfo: API_BASE + '/api/stockRecheck/updatePackInfo', updatePackInfo: API_BASE + '/api/stockRecheck/updatePackInfo',
/** /**
* 手动填写打包信息
* */
setCustomBoxInfo: API_BASE + '/api/stockRecheck/setCustomBoxInfo',
/**
* 获取产地 * 获取产地
* */ * */
getUseOption: API_BASE + '/api/stockIn/getUseOption', getUseOption: API_BASE + '/api/stockIn/getUseOption',
......
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