Skip to content

梁建民 / wmsApp

Go to a project
Commit c5c259cd by LJM
Options

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

parent e4dc1690
Inline Side-by-side
Showing with 226 additions and 50 deletions
assets/css/stockRecheck/index.scss
......@@ -40,6 +40,13 @@
}
}
}
.filter-checkbox {
margin-top: 15rpx;
label {
margin-right: 10rpx;
font-size: 24rpx;
}
}
.list {
margin-top: 15rpx;
padding-bottom: 150rpx;
......
assets/css/stockRecheck/print.scss
......@@ -150,7 +150,6 @@
}
}
.form-input {
margin-bottom: 18rpx;
.input-title {
margin-bottom: 10rpx;
.input-title-t1 {
......@@ -180,7 +179,6 @@
background: #ffffff;
border-radius: 10rpx;
border: 1px solid #1969f9;
margin-bottom: 18rpx;
.wrap {
padding-left: 15rpx;
padding-right: 25rpx;
......@@ -223,6 +221,7 @@
}
}
.print {
margin-top: 16rpx;
margin-bottom: 27rpx;
.check-box-icon {
width: 20rpx;
......@@ -247,7 +246,7 @@
margin-bottom: 17rpx;
}
.btn {
margin: 0 auto;
margin: 26rpx auto 0;
.btn1 {
width: 100%;
height: 75rpx;
......
assets/css/stockRecheck/sort.scss
......@@ -607,8 +607,34 @@
}
}
&.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 {
margin-top: 50rpx;
.box-title {
margin-bottom: 18rpx;
.t1 {
......
pages/stockRecheck/index.vue
<template>
<view class="stockRecheck">
<!-- 搜索 -->
<view class="search-box row bothSide verCenter">
<view class="sn row rowCenter verCenter">
<picker @change="bindPickerChange" :value="index" :range="array">
......@@ -17,6 +18,22 @@
<text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text>
</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="box" v-for="(item, index) in list" :key="index" :class="{ curr: filter_list[index] }">
<view class="check-box-icon" @click="filterChange(index)"></view>
......@@ -45,7 +62,9 @@
<text class="label">总 数 量：</text>
<text class="tt">{{ item.total_qty }}</text>
</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>
<!-- 无数据展示 -->
......@@ -53,16 +72,18 @@
<text class="iconfont icon-a-juxing21"></text>
<text class="text">查不到当前数据</text>
</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>
</template>
<script>
import { API } from '@/util/api.js';
import { createArray } from '@/util/util.js';
import debounce from 'lodash/debounce';
import { API } from '@/util/api.js';
import { createArray } from '@/util/util.js';
import debounce from 'lodash/debounce';
export default {
export default {
data() {
return {
input_flag: false,
......@@ -74,6 +95,7 @@ export default {
filter_list: [], //筛选已选中的列表
filter_id: [], //过滤处理的id
searchParams: {
stock_out_status: '5,6,7', //出库单状态
stock_out_sn: '' //出库单号
}
};
......@@ -89,6 +111,11 @@ export default {
}
},
methods: {
checkboxChange(e) {
console.log('checkbox发送选择改变，携带值为', e.detail.value);
this.searchParams.stock_out_status = e.detail.value.join(',');
this.getData();
},
bindPickerChange: function(e) {
console.log('picker发送选择改变，携带值为', e.detail.value);
this.index = e.detail.value;
......@@ -197,9 +224,9 @@ export default {
});
}
}
};
};
</script>
<style scoped lang="scss">
@import '@/assets/css/stockRecheck/index.scss';
@import '@/assets/css/stockRecheck/index.scss';
</style>
\ No newline at end of file
pages/stockRecheck/print.vue
<template>
<view class="stockRecheck-print">
<!-- 搜索 -->
<view class="search-box row bothSide verCenter">
<view class="sn row rowCenter verCenter">
<picker :value="index" :range="array">
......@@ -17,6 +18,7 @@
<text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text>
</view>
</view>
<!-- 列表 -->
<view class="list" v-if="list.length > 0">
<view class="box row" v-for="(item, index) in list" :key="index">
<view class="input-box row verCenter">
......@@ -102,14 +104,16 @@
</view>
</view>
<view class="bor"></view>
<view class="item-tit row verCenter bothSide">
<view class="item-tit row verCenter bothSide" style="margin-bottom: 0;">
<text>交货信息</text>
<view class="text">
<text class="label">包 裹 数：</text>
<text class="tt">{{ detail.stock_out_info.box_num }}</text>
</view>
</view>
<view class="form-input">
<!-- 交货信息start -->
<view class="row bothSide verCenter">
<view class="form-input" style="width: 48%;">
<view class="input-title">
<text class="input-title-t1">*</text>
<text class="input-title-t2">交货方式：</text>
......@@ -123,7 +127,7 @@
</picker>
</view>
</view>
<view class="form-input">
<view class="form-input" style="width: 48%;">
<view class="input-title">
<text class="input-title-t1" v-if="formParams.real_shipping_type != 2">*</text>
<text class="input-title-t2">物流公司：</text>
......@@ -137,7 +141,9 @@
</picker>
</view>
</view>
<view class="form-input">
</view>
<view class="row bothSide verCenter">
<view class="form-input" style="width: 48%;">
<view class="input-title"><text class="input-title-t2">物流模式：</text></view>
<view class="select-box row">
<picker @change="bindPickerChange(3, $event)" :value="real_shipping_mode_index" :range="real_shipping_mode_data" :range-key="'name'" style="width: 100%;">
......@@ -148,7 +154,7 @@
</picker>
</view>
</view>
<view class="form-input">
<view class="form-input" style="width: 48%;">
<view class="input-title"><text class="input-title-t2">物流单号：</text></view>
<view class="input-box">
<template v-if="formParams.real_shipping_type == 1 && formParams.real_shipping_id == 1 && company_id == 1">
......@@ -159,7 +165,9 @@
</template>
</view>
</view>
<view class="form-input">
</view>
<view class="row bothSide verCenter">
<view class="form-input" style="width: 48%;">
<view class="input-title"><text class="input-title-t2">物流付费：</text></view>
<view class="select-box row">
<picker @change="bindPickerChange(4, $event)" :value="shipping_payment_type_index" :range="shipping_payment_type_data" :range-key="'name'" style="width: 100%;">
......@@ -170,14 +178,18 @@
</picker>
</view>
</view>
<view class="form-input">
<view class="form-input" style="width: 48%;">
<view class="input-title"><text class="input-title-t2">客户快递账号：</text></view>
<view class="input-box"><input type="text" disabled style="background-color: #f6f6f6;border: 1px solid #eee;" class="uni-input" placeholder-style="color:#919399" placeholder="" v-model="formParams.client_express_account" /></view>
<view class="input-box">
<input type="text" disabled style="background-color: #f6f6f6;border: 1px solid #eee;" class="uni-input" placeholder-style="color:#919399" placeholder="请输入客户快递账号" v-model="formParams.client_express_account" />
</view>
</view>
</view>
<view class="print row verCenter" v-if="detail.stock_out_info">
<text class="check-box-icon" :class="{ curr: detail.stock_out_info.is_receipt == 1 }"></text>
<text class="tt">签回单</text>
</view>
<!-- 交货信息end -->
<view class="bor"></view>
<view class="item-tit">地址信息</view>
<view class="field-item row">
......@@ -186,6 +198,7 @@
<text class="tt" style="max-width: 100%;">{{ detail.stock_out_info.customer_name }}</text>
</view>
</view>
<!-- 地址信息start -->
<view class="row bothSide verCenter">
<view class="form-input" style="width: 48%;">
<view class="input-title">
......@@ -243,7 +256,10 @@
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.address" /></view>
</view>
</view>
<view class="btn row verCenter bothSide"><view class="btn1 row rowCenter verCenter" style="width: 100%;" @click="updateDeliveryInfo(detail.stock_out_info.stock_out_id)">保存</view></view>
<!-- 地址信息end -->
<view class="btn row verCenter bothSide">
<view class="btn1 row rowCenter verCenter" style="width: 100%;" @click="updateDeliveryInfo(detail.stock_out_info.stock_out_id)">保存</view>
</view>
</scroll-view>
</view>
</uni-drawer>
......@@ -251,10 +267,10 @@
</template>
<script>
import { API } from '@/util/api.js';
import debounce from 'lodash/debounce';
import { API } from '@/util/api.js';
import debounce from 'lodash/debounce';
export default {
export default {
data() {
return {
company_id: uni.getStorageSync('company_id') || 1,
......@@ -314,14 +330,10 @@ export default {
this.getData();
},
methods: {
toggel() {
this.flag = !this.flag;
if (this.flag) {
this.formParams.is_receipt = 1;
} else {
this.formParams.is_receipt = -1;
}
},
/**
* @param {Object} type 1:交货方式 2:物流公司 3:物流模式 4:物流付费
* @param {Object} e
*/
bindPickerChange: function(type, e) {
console.log('picker发送选择改变，携带值为', e.detail.value);
if (type == 1) {
......@@ -348,9 +360,9 @@ export default {
* 根据所选的交货方式，显示对应的物流公司
* @param {Object} value
*/
realShippChage() {
let value = this.formParams.real_shipping_type;
this.real_shipping_id_data = [];
realShippChage(callback) {
let value = this.formParams.real_shipping_type; //交货方式
this.real_shipping_id_data = []; //物流公司
if (value == 1) {
this.real_shipping_id_data.push({ name: '顺丰', value: 1 }, { name: '京东', value: 11 }, { name: '中通', value: 18 }, { name: '韵达', value: 5 });
} else if (value == 2) {
......@@ -360,6 +372,18 @@ export default {
} else if (value == 4) {
this.real_shipping_id_data.push({ name: '顺丰同城', value: 19 }, { name: '货拉拉', value: 20 }, { name: '跨越速运', value: 21 });
}
typeof callback == 'function' && callback();
},
/**
* 更新物流模式
*/
updateRealShippingId(real_shipping_id) {
//物流公司为跨越速运
if (real_shipping_id == 21) {
this.real_shipping_mode_data = [];
this.real_shipping_mode_data.push({ name: '当天达', value: 10 }, { name: '次日达', value: 20 }, { name: '隔日达', value: 30 }, { name: '陆运件', value: 40 }, { name: '同城次日', value: 50 }, { name: '同城即日', value: 70 }, { name: '省内次日', value: 160 }, { name: '省内即日', value: 170 }, { name: '空运', value: 210 }, { name: '专运', value: 220 });
this.$forceUpdate();
}
},
showDrawer(stock_out_sn) {
this.$refs.showRight.open();
......@@ -431,29 +455,33 @@ export default {
this.request(API.getStockOutDetail, 'POST', { stock_out_sn: stock_out_sn }, true).then(res => {
if (res.code === 0) {
this.detail = res.data;
this.formParams.client_express_account = res.data.stock_out_address.client_express_account; //客户快递账号
this.formParams.client_express_account = res.data.stock_out_address.client_express_account || ''; //客户快递账号
this.formParams.real_shipping_type = res.data.stock_out_address.real_shipping_type; //交货方式
let real_shipping_type_index = this.findIndex(this.real_shipping_type_data, this.formParams.real_shipping_type);
this.real_shipping_type_index = real_shipping_type_index[0];
this.realShippChage(); //更新物流公司
this.updateRealShippingId(res.data.stock_out_address.real_shipping_id); //更新物流模式
setTimeout(() => {
//显示对应的index的物流公司
this.formParams.real_shipping_id = res.data.stock_out_address.real_shipping_id; //物流公司
let real_shipping_id_index = this.findIndex(this.real_shipping_id_data, this.formParams.real_shipping_id);
console.log(real_shipping_id_index);
this.real_shipping_id_index = real_shipping_id_index[0];
//显示对应index的物流模式
this.formParams.real_shipping_mode = res.data.stock_out_address.real_shipping_mode; //物流模式
let real_shipping_mode_index = this.findIndex(this.real_shipping_mode_data, this.formParams.real_shipping_mode);
this.real_shipping_mode_index = real_shipping_mode_index[0];
//显示对应index的物流付费
this.formParams.shipping_payment_type = res.data.stock_out_address.shipping_payment_type; //物流付费
let shipping_payment_type_index = this.findIndex(this.shipping_payment_type_data, this.formParams.shipping_payment_type);
this.shipping_payment_type_index = shipping_payment_type_index[0];
this.formParams.shipping_code = res.data.stock_out_address.shipping_code; //物流单号
//显示对应的地址栏信息
this.formParams.country = res.data.stock_out_address.country;
this.formParams.consignee = res.data.stock_out_address.consignee;
this.formParams.mobile = res.data.stock_out_address.mobile;
......@@ -461,6 +489,7 @@ export default {
this.formParams.city = res.data.stock_out_address.city;
this.formParams.district = res.data.stock_out_address.district;
this.formParams.address = res.data.stock_out_address.address;
}, 500)
} else {
uni.showToast({
title: res.msg,
......@@ -499,8 +528,7 @@ export default {
this.request(
API.updateDeliveryInfo,
'POST',
{
'POST', {
stock_out_id: stock_out_id,
real_shipping_type: this.formParams.real_shipping_type,
real_shipping_id: this.formParams.real_shipping_id,
......@@ -559,9 +587,9 @@ export default {
this.page = 1;
}
}
};
};
</script>
<style scoped lang="scss">
@import '@/assets/css/stockRecheck/print.scss';
@import '@/assets/css/stockRecheck/print.scss';
</style>
\ No newline at end of file
pages/stockRecheck/sort.vue
......@@ -575,6 +575,21 @@
<text class="iconfont icon-juxing2" @click="closeBox()"></text>
<text class="text">箱信息</text>
</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-wrap" v-for="(item, i) in packList" :key="i">
<view class="box-title row bothSide verCenter">
......@@ -608,6 +623,22 @@
<text class="text">暂无箱信息</text>
</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="btn0 row rowCenter verCenter" @click="closeBox()">取 消</view>
<view class="btn1 row rowCenter verCenter" style="width: 50%;" @click="updatePackInfo()">确认</view>
......@@ -660,6 +691,7 @@
image_list: [], //图片列表
maxNum: 10, //最大上传图片数量
maxlength: 15, //输入框长度15
custome_box_info_index: 0, //箱规格设置
searchParams: {
stock_out_id: '',
box_name: '001',
......@@ -669,6 +701,12 @@
formParams: {
recheck_qty: ''
},
//手动填写参数集合
setCustomBoxInfoParams: {
stock_out_id: '',
total_box_num: '',
total_weight: ''
},
//打印货品标签参数集合
rePrintTagParams: {
stock_out_item_id: '',
......@@ -686,6 +724,7 @@
},
onLoad(options) {
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.stock_out_sn = options.stock_out_sn || '';
//深圳自营仓-默认选择旧标签
......@@ -701,6 +740,13 @@
methods: {
/**
* @param {Object} e
* 箱信息选择
*/
radioChange(e) {
this.custome_box_info_index = e.detail.value;
},
/**
* @param {Object} e
* @param {Object} type 1旧标签 批量扫描监听
*/
switchChange(e, type) {
......@@ -959,7 +1005,15 @@
getPackList() {
this.request(API.getPackList, 'POST', { stock_out_id: this.searchParams.stock_out_id }, false).then(res => {
if (res.code === 0) {
if (this.company_id == 1 || this.company_id == 3) {
//猎芯和华云
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 {
uni.showToast({
title: res.msg,
......@@ -1239,6 +1293,8 @@
* 保存打包信息
*/
updatePackInfo() {
if (this.custome_box_info_index == 0) {
//按复核数据
if (this.packList.length > 0) {
var parmas = {
pack_list: JSON.stringify(this.packList)
......@@ -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 @@
this.getPackList(); //获取箱信息
this.getBoxConfigList(); //获取箱配置
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();
},
/**
......
util/api.js
// const API_BASE_USER = 'http://user.liexindev.net'; //用户系统
// const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统
// const API_BASE = 'http://wms.liexindev.net'; //WMS系统
// const API_BASE_OSS = 'http://image.liexindev.net'; //oss系统
const API_BASE_USER = 'http://user.liexindev.net'; //用户系统
const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统
const API_BASE = 'http://wms.liexindev.net'; //WMS系统
const API_BASE_OSS = 'http://image.liexindev.net'; //oss系统
const API_BASE_USER = 'https://user.ichunt.net'; //用户系统
const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统
const API_BASE = 'https://wms.ichunt.net'; //WMS系统
const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
// const API_BASE_USER = 'https://user.ichunt.net'; //用户系统
// const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统
// const API_BASE = 'https://wms.ichunt.net'; //WMS系统
// const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
const API = {
......@@ -292,6 +292,10 @@ const API = {
* */
updatePackInfo: API_BASE + '/api/stockRecheck/updatePackInfo',
/**
* 手动填写打包信息
* */
setCustomBoxInfo: API_BASE + '/api/stockRecheck/setCustomBoxInfo',
/**
* 获取产地
* */
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