Skip to content

梁建民 / wmsApp

Go to a project
Commit de3ab8c6 by LJM
Options

打印快递单

parent 79b1e387
Inline Side-by-side
Showing with 193 additions and 40 deletions
pages/repairPrint/index.vue
...@@ -38,25 +38,25 @@ export default { ...@@ -38,25 +38,25 @@ export default {
index: 0, index: 0,
labelStyles: [ labelStyles: [
{ {
'id': 5, id: 5,
'name': '入库标签', name: '入库标签'
}, },
{ {
'id': 1, id: 1,
'name': '库位标签', name: '库位标签'
}, },
{ {
'id': 2, id: 2,
'name': '库区标签', name: '库区标签'
}, },
{ {
'id': 3, id: 3,
'name': '区域标签', name: '区域标签'
}, },
{ {
'id': 4, id: 4,
'name': '容器标签', name: '容器标签'
}, }
], ],
formParams: { formParams: {
sn: '', sn: '',
...@@ -80,8 +80,8 @@ export default { ...@@ -80,8 +80,8 @@ export default {
* 打印 * 打印
*/ */
latePrint() { latePrint() {
this.formParams.origin_device_ip = getLocalIpAddress() ?? ''; this.formParams.origin_device_ip = getLocalIpAddress() || '';
console.log('origin_device_ip', this.formParams.origin_device_ip) console.log('origin_device_ip', this.formParams.origin_device_ip);
this.request(API.latePrint, 'POST', this.formParams, true).then(res => { this.request(API.latePrint, 'POST', this.formParams, true).then(res => {
if (res.code === 0) { if (res.code === 0) {
...@@ -96,9 +96,7 @@ export default { ...@@ -96,9 +96,7 @@ export default {
}); });
} }
}); });
}, }
} }
}; };
</script> </script>
......
pages/stockRecheck/print.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="stockRecheck-print"> <view class="stockRecheck-print">
<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 :value="index" :range="array">
<view class="row verCenter"> <view class="row verCenter">
<view class="uni-input">{{ array[index] }}</view> <view class="uni-input">{{ array[index] }}</view>
<view class="uni-arrow"></view> <view class="uni-arrow"></view>
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
<view class="search-bar row bothSide verCenter"> <view class="search-bar row bothSide verCenter">
<view class="row verCenter"> <view class="row verCenter">
<text class="iconfont icon-juxing1"></text> <text class="iconfont icon-juxing1"></text>
<input class="uni-input" placeholder="请扫描或输入号码" placeholder-style="color:#919399" /> <input class="uni-input" placeholder="请扫描或输入号码" placeholder-style="color:#919399" v-model="searchParams.stock_out_sn" @input="handleInput" />
</view> </view>
<text class="iconfont icon-a-juxing11"></text> <text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text>
</view> </view>
</view> </view>
<view class="list" v-if="list.length > 0"> <view class="list" v-if="list.length > 0">
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
</view> </view>
<!-- 打快递单弹窗 --> <!-- 打快递单弹窗 -->
<uni-drawer ref="showRight" mode="right"> <uni-drawer ref="showRight" mode="right">
<view class="uni-drawer-picking"> <view class="uni-drawer-picking" v-if="detail">
<view class="title row rowCenter verCenter"> <view class="title row rowCenter verCenter">
<text class="iconfont icon-juxing2" @click="closeDrawer(1)"></text> <text class="iconfont icon-juxing2" @click="closeDrawer(1)"></text>
<text class="text">打快递单</text> <text class="text">打快递单</text>
...@@ -96,12 +96,8 @@ ...@@ -96,12 +96,8 @@
<text class="tt">{{ detail.stock_out_info.customer_name }}</text> <text class="tt">{{ detail.stock_out_info.customer_name }}</text>
</view> </view>
<view class="item row verCenter"> <view class="item row verCenter">
<text class="label">完成时间：</text>
<text class="tt">2023-04-01 11:28:59</text>
</view>
<view class="item row verCenter">
<text class="label">操 作 人：</text> <text class="label">操 作 人：</text>
<text class="tt">吉言</text> <text class="tt">{{ detail.stock_out_info.create_name }}</text>
</view> </view>
</view> </view>
<view class="bor"></view> <view class="bor"></view>
...@@ -118,9 +114,9 @@ ...@@ -118,9 +114,9 @@
<text class="input-title-t2">交货方式：</text> <text class="input-title-t2">交货方式：</text>
</view> </view>
<view class="select-box row"> <view class="select-box row">
<picker @change="bindPickerChange" :value="index" :range="array" style="width: 100%;"> <picker @change="bindPickerChange(1, $event)" :value="real_shipping_type_index" :range="real_shipping_type_data" :range-key="'name'" style="width: 100%;">
<view class="row verCenter bothSide wrap"> <view class="row verCenter bothSide wrap">
<view class="uni-input">{{ array[index] }}</view> <view class="uni-input">{{ real_shipping_type_data[real_shipping_type_index].name }}</view>
<view class="uni-arrow"></view> <view class="uni-arrow"></view>
</view> </view>
</picker> </picker>
...@@ -132,9 +128,9 @@ ...@@ -132,9 +128,9 @@
<text class="input-title-t2">物流公司：</text> <text class="input-title-t2">物流公司：</text>
</view> </view>
<view class="select-box row"> <view class="select-box row">
<picker @change="bindPickerChange" :value="index" :range="array" style="width: 100%;"> <picker @change="bindPickerChange(2, $event)" :value="real_shipping_id_index" :range="real_shipping_id_data" :range-key="'name'" style="width: 100%;">
<view class="row verCenter bothSide wrap"> <view class="row verCenter bothSide wrap">
<view class="uni-input">{{ array[index] }}</view> <view class="uni-input">{{ real_shipping_id_data[real_shipping_id_index].name || '请选择' }}</view>
<view class="uni-arrow"></view> <view class="uni-arrow"></view>
</view> </view>
</picker> </picker>
...@@ -146,23 +142,26 @@ ...@@ -146,23 +142,26 @@
<text class="input-title-t2">物流模式：</text> <text class="input-title-t2">物流模式：</text>
</view> </view>
<view class="select-box row"> <view class="select-box row">
<picker @change="bindPickerChange" :value="index" :range="array" style="width: 100%;"> <picker @change="bindPickerChange(3, $event)" :value="real_shipping_mode_index" :range="real_shipping_mode_data" :range-key="'name'" style="width: 100%;">
<view class="row verCenter bothSide wrap"> <view class="row verCenter bothSide wrap">
<view class="uni-input">{{ array[index] }}</view> <view class="uni-input">{{ real_shipping_mode_data[real_shipping_mode_index].name }}</view>
<view class="uni-arrow"></view> <view class="uni-arrow"></view>
</view> </view>
</picker> </picker>
</view> </view>
</view> </view>
<template v-if="formParams.real_shipping_type == 1 && formParams.real_shipping_id == 1"></template>
<template v-else>
<view class="form-input"> <view class="form-input">
<view class="input-title"> <view class="input-title">
<text class="input-title-t1">*</text> <text class="input-title-t1">*</text>
<text class="input-title-t2">物流单号：</text> <text class="input-title-t2">物流单号：</text>
</view> </view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" /></view> <view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.shipping_code" /></view>
</view> </view>
<view class="print row verCenter"> </template>
<text class="check-box-icon curr"></text> <view class="print row verCenter" @click="toggel()">
<text class="check-box-icon" :class="{ curr: flag }"></text>
<text class="tt">签回单</text> <text class="tt">签回单</text>
</view> </view>
<view class="bor"></view> <view class="bor"></view>
...@@ -186,8 +185,13 @@ ...@@ -186,8 +185,13 @@
</view> </view>
</view> </view>
<view class="btn row verCenter bothSide"> <view class="btn row verCenter bothSide">
<view class="btn2 row rowCenter verCenter" style="width: 50%;">保存</view> <template v-if="formParams.real_shipping_type == 1 && formParams.real_shipping_id == 1">
<view class="btn1 row rowCenter verCenter" style="width: 50%;">打 印</view> <view class="btn2 row rowCenter verCenter" style="width: 50%;" @click="updateDeliveryInfo(detail.stock_out_info.stock_out_id)">保存</view>
<view class="btn1 row rowCenter verCenter" style="width: 50%;" @click="printExpress(detail.stock_out_info.stock_out_id)">打 印</view>
</template>
<template v-else>
<view class="btn2 row rowCenter verCenter" style="width: 100%;" @click="updateDeliveryInfo(detail.stock_out_info.stock_out_id)">保存</view>
</template>
</view> </view>
</view> </view>
</uni-drawer> </uni-drawer>
...@@ -196,17 +200,27 @@ ...@@ -196,17 +200,27 @@
<script> <script>
import { API } from '@/util/api.js'; import { API } from '@/util/api.js';
import debounce from 'lodash/debounce';
export default { export default {
data() { data() {
return { return {
input_flag: false,
flag: false,
page: 1, page: 1,
limit: 10000, limit: 10000,
list: [], list: [],
index: 0, index: 0,
real_shipping_type_index: 0,
real_shipping_id_index: 0,
real_shipping_mode_index: 0,
array: ['出库单号'], array: ['出库单号'],
detail: {}, detail: {},
real_shipping_id_data: [], //物流公司数据 real_shipping_id_data: [], //物流公司数据
real_shipping_mode_data: ['空运', '陆运', '重货快运', '物流普运'], //物流模式数据 real_shipping_mode_data: [{ name: '空运', value: 1 }, { name: '陆运', value: 2 }, { name: '重货快运', value: 3 }, { name: '物流普运', value: 4 }], //物流模式数据
searchParams: {
stock_out_sn: ''
},
formParams: { formParams: {
real_shipping_type: '', //交货方式 real_shipping_type: '', //交货方式
real_shipping_id: '', //物流公司 real_shipping_id: '', //物流公司
...@@ -221,11 +235,64 @@ export default { ...@@ -221,11 +235,64 @@ export default {
}, },
computed: { computed: {
//交货方式数据 //交货方式数据
real_shipping_type_data() {
const company_id = Number(uni.getStorageSync('company_id'));
if (company_id == 1) {
return [{ name: '快递', value: 1 }, { name: '自送', value: 2 }, { name: '客户自取', value: 3 }, { name: '同城物流', value: 4 }];
} else if (company_id == 2) {
return [{ name: '快递', value: 1 }];
} else {
return [];
}
}
}, },
methods: { methods: {
bindPickerChange: function(e) { toggel() {
this.flag = !this.flag;
if (this.flag) {
this.formParams.is_receipt = 1;
} else {
this.formParams.is_receipt = -1;
}
},
bindPickerChange: function(type, e) {
if (type == 1) {
this.real_shipping_type_index = e.detail.value;
this.formParams.real_shipping_type = this.real_shipping_type_data[e.detail.value].value;
this.realShippChage();
} else if (type == 2) {
this.real_shipping_id_index = e.detail.value;
this.formParams.real_shipping_id = this.real_shipping_id_data[e.detail.value].value;
} else if (type == 3) {
this.real_shipping_mode_index = e.detail.value;
this.formParams.real_shipping_mode = this.real_shipping_mode_data[e.detail.value].value;
}
console.log('picker发送选择改变，携带值为', e.detail.value); console.log('picker发送选择改变，携带值为', e.detail.value);
this.index = e.detail.value; },
/**
* 根据所选的交货方式，显示对应的物流公司
* @param {Object} value
*/
realShippChage() {
const company_id = Number(uni.getStorageSync('company_id'));
let value = this.formParams.real_shipping_type;
if (company_id == 1) {
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) {
this.real_shipping_id_data = [];
} else if (value == 3) {
this.real_shipping_id_data.push({ name: '自提', value: 10 });
} else if (value == 4) {
this.real_shipping_id_data.push({ name: '顺丰同城', value: 19 }, { name: '货拉拉', value: 20 }, { name: '跨越速运', value: 21 });
}
} else if (company_id == 2) {
if (value == 1) {
this.real_shipping_id_data.push({ name: '顺丰', value: 1 }, { name: 'UPS', value: 17 }, { name: 'Fedex', value: 13 }, { name: 'TNT', value: 9 }, { name: 'DHL', value: 12 });
}
}
}, },
showDrawer(stock_out_sn) { showDrawer(stock_out_sn) {
this.$refs.showRight.open(); this.$refs.showRight.open();
...@@ -235,10 +302,31 @@ export default { ...@@ -235,10 +302,31 @@ export default {
this.$refs.showRight.close(); this.$refs.showRight.close();
}, },
/** /**
* 清空数据
*/
clearInput() {
this.input_flag = false;
this.searchParams.stock_out_sn = '';
this.getData();
},
/**
* 单号搜索
* @param {Object} event
*/
handleInput: debounce(function(event) {
var val = event.target.value;
if (val) {
this.input_flag = true;
} else {
this.input_flag = false;
}
this.getData();
}, 500),
/**
* 获取列表数据 * 获取列表数据
*/ */
getData() { getData() {
this.request(API.getToPrintList, 'POST', { page: this.page, limit: this.limit }, false).then(res => { this.request(API.getToPrintList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.list = res.data.list; this.list = res.data.list;
} else { } else {
...@@ -256,6 +344,10 @@ export default { ...@@ -256,6 +344,10 @@ export default {
this.request(API.getStockOutDetail, 'POST', { stock_out_sn: stock_out_sn }, true).then(res => { this.request(API.getStockOutDetail, 'POST', { stock_out_sn: stock_out_sn }, true).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.detail = res.data; this.detail = res.data;
this.formParams.real_shipping_type = 1; //设置默认
this.formParams.real_shipping_id = 1;
this.formParams.shipping_code = res.data.stock_out_address.shipping_code;
this.realShippChage(1);
} else { } else {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
...@@ -263,6 +355,55 @@ export default { ...@@ -263,6 +355,55 @@ export default {
}); });
} }
}); });
},
/**
* 更新交货信息
*/
updateDeliveryInfo(stock_out_id) {
this.request(
API.updateDeliveryInfo,
'POST',
{
stock_out_id: stock_out_id,
real_shipping_type: this.formParams.real_shipping_type,
real_shipping_id: this.formParams.real_shipping_id,
real_shipping_mode: this.formParams.real_shipping_mode,
shipping_code: this.formParams.shipping_code,
is_receipt: 1
},
true
).then(res => {
if (res.code === 0) {
uni.showToast({
title: '保存成功',
icon: 'success'
});
} else {
uni.showModal({
itle: '提示',
content: res.msg,
showCancel: false
});
}
});
},
/**
* 打印快递单
*/
printExpress(stock_out_id) {
this.request(API.printExpress, 'POST', { stock_out_id: stock_out_id }, true).then(res => {
if (res.code === 0) {
uni.showLoading({
title: '正在打印中，请查看打印机'
});
} else {
uni.showModal({
title: '提示',
content: res.msg,
showCancel: false
});
}
});
} }
} }
}; };
......
util/api.js
...@@ -144,6 +144,14 @@ const API = { ...@@ -144,6 +144,14 @@ const API = {
* */ * */
getStockOutDetail: API_BASE + '/api/stockOut/getStockOutDetail', getStockOutDetail: API_BASE + '/api/stockOut/getStockOutDetail',
/** /**
* 保存交货信息
* */
updateDeliveryInfo: API_BASE + '/api/stockRecheck/updateDeliveryInfo',
/**
* 打印快递单
* */
printExpress: API_BASE + '/api/stockRecheck/printExpress',
/**
* 上传文件 * 上传文件
* */ * */
upload: API_BASE_LIEXIN + '/oss/upload', upload: API_BASE_LIEXIN + '/oss/upload',
......
util/util.js
...@@ -36,6 +36,12 @@ const request = (url = '', type = 'GET', param = {}, Loading) => { ...@@ -36,6 +36,12 @@ const request = (url = '', type = 'GET', param = {}, Loading) => {
uni.hideLoading(); uni.hideLoading();
} }
let [error, res] = response; let [error, res] = response;
if (res.data.code == 101) {
uni.navigateTo({
url: '/pages/mine/login'
})
return false;
}
resolve(res.data); resolve(res.data);
}).catch(error => { }).catch(error => {
uni.showToast({ uni.showToast({
......
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