Commit de3ab8c6 by LJM

打印快递单

parent 79b1e387
...@@ -16,13 +16,13 @@ ...@@ -16,13 +16,13 @@
</view> </view>
<text class="iconfont icon-a-juxing11"></text> <text class="iconfont icon-a-juxing11"></text>
</view> </view>
<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" v-model="formParams.print_num" placeholder="数量" placeholder-style="color:#919399" /> <input class="uni-input" v-model="formParams.print_num" placeholder="数量" placeholder-style="color:#919399" />
</view> </view>
<text class="iconfont icon-a-juxing11"></text> <text class="iconfont icon-a-juxing11"></text>
</view> </view>
</view> </view>
<view class="fix-btn row rowCenter verCenter" @click="latePrint()">打印</view> <view class="fix-btn row rowCenter verCenter" @click="latePrint()">打印</view>
</view> </view>
...@@ -36,69 +36,67 @@ export default { ...@@ -36,69 +36,67 @@ export default {
data() { data() {
return { return {
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: '',
origin_device_ip: '', origin_device_ip: '',
print_num: '', print_num: '',
type: '' type: ''
} }
}; };
}, },
onLoad(options) { onLoad(options) {
this.formParams.type = this.labelStyles[0].id; this.formParams.type = this.labelStyles[0].id;
}, },
methods: { methods: {
bindPickerChange: function(e) { bindPickerChange: function(e) {
console.log('picker发送选择改变,携带值为', e.detail.value); console.log('picker发送选择改变,携带值为', e.detail.value);
console.log('picker发送选择改变,id为', this.labelStyles[e.detail.value].id); console.log('picker发送选择改变,id为', this.labelStyles[e.detail.value].id);
this.index = e.detail.value; this.index = e.detail.value;
this.formParams.type = this.labelStyles[e.detail.value].id; this.formParams.type = this.labelStyles[e.detail.value].id;
}, },
/** /**
* 打印 * 打印
*/ */
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) {
uni.showToast({ uni.showToast({
title: '正在补打...', title: '正在补打...',
icon: 'success' icon: 'success'
}); });
} else { } else {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
icon: 'error' icon: 'error'
}); });
} }
}); });
}, }
} }
}; };
</script> </script>
......
...@@ -144,13 +144,21 @@ const API = { ...@@ -144,13 +144,21 @@ 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',
/** /**
* 标签补打 * 标签补打
* */ * */
latePrint: API_BASE + '/api/label/latePrint', latePrint: API_BASE + '/api/label/latePrint',
} }
......
...@@ -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({
...@@ -53,17 +59,17 @@ const request = (url = '', type = 'GET', param = {}, Loading) => { ...@@ -53,17 +59,17 @@ const request = (url = '', type = 'GET', param = {}, Loading) => {
*/ */
const getLocalIpAddress = () => { const getLocalIpAddress = () => {
uni.getConnectedWifi({ uni.getConnectedWifi({
success: res => { success: res => {
console.log('获取到 WiFi 信息:', res) console.log('获取到 WiFi 信息:', res)
const ipRegex = /\d+\.\d+\.\d+\.\d+/ const ipRegex = /\d+\.\d+\.\d+\.\d+/
const ipAddress = res.ipAddress.match(ipRegex)[0] const ipAddress = res.ipAddress.match(ipRegex)[0]
console.log('当前 WiFi ip 地址:', ipAddress) console.log('当前 WiFi ip 地址:', ipAddress)
return ipAddress return ipAddress
}, },
fail: err => { fail: err => {
console.log('获取 WiFi 信息失败:', err) console.log('获取 WiFi 信息失败:', err)
return '' return ''
} }
}) })
} }
...@@ -97,5 +103,5 @@ module.exports = { ...@@ -97,5 +103,5 @@ module.exports = {
request, request,
getPlatform, getPlatform,
createArray, createArray,
getLocalIpAddress, getLocalIpAddress,
} }
\ No newline at end of file
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