Skip to content

梁建民 / wmsMin

Go to a project
Commit 1fc371ba by liangjianmin
Options

css

parent 8f9e47bd
Inline Side-by-side
Showing with 135 additions and 59 deletions
assets/css/goods/addReceiving.scss
...@@ -52,6 +52,10 @@ ...@@ -52,6 +52,10 @@
} }
} }
} }
.scan-view {
font-size: 48rpx;
color: #197adb;
}
} }
.receiving-information { .receiving-information {
padding: 24rpx; padding: 24rpx;
......
assets/css/tag/print.scss
.print-index{ .print-index {
padding: 24rpx 24rpx 0 24rpx; padding: 24rpx 24rpx 0 24rpx;
.device-box{ .device-box {
height: 88rpx; height: 88rpx;
background: #FFFFFF; background: #ffffff;
border-radius: 4rpx; border-radius: 4rpx;
padding: 0 24rpx; padding: 0 24rpx;
margin-bottom: 16rpx; margin-bottom: 16rpx;
.t1{ .t1 {
font-size: 28rpx; font-size: 28rpx;
color: #1E2021; color: #1e2021;
margin-left: 20rpx ; margin-left: 20rpx;
} }
.t2{ .t2 {
font-size: 22rpx; font-size: 22rpx;
color: #6E767A; color: #6e767a;
margin-right: 14rpx ; margin-right: 14rpx;
&.active{ &.active {
color: #1E2021; color: #1e2021;
font-weight: bold; font-weight: bold;
} }
} }
.icon-juxing7{ .icon-juxing7 {
font-size: 36rpx; font-size: 36rpx;
color: #9CA8AD; color: #9ca8ad;
} }
.icon-sanjiaoxing2{ .icon-sanjiaoxing2 {
font-size: 20rpx; font-size: 20rpx;
color: #9CA8AD; color: #9ca8ad;
} }
} }
.print-form{ .print-form {
background: #FFFFFF; background: #ffffff;
border-radius: 4rpx; border-radius: 4rpx;
.box{ .box {
padding: 24rpx; padding: 24rpx;
border-bottom: 1rpx solid #E6EDF0; border-bottom: 1rpx solid #e6edf0;
&:last-child{ &:last-child {
border-bottom: none; border-bottom: none;
} }
.label{ .label {
width: 156rpx; width: 156rpx;
font-size: 24rpx; font-size: 24rpx;
color: #6E767A; color: #6e767a;
} }
.uni-input{ .uni-input {
height: 32rpx; height: 32rpx;
font-size: 24rpx; font-size: 24rpx;
color: #404547; color: #404547;
font-weight: bold; font-weight: bold;
} }
.el-select{ .el-select {
height: 32rpx; height: 32rpx;
} }
.tab{ .scan {
.tab-pane{ font-size: 52rpx;
color: #197adb;
}
.tab {
.tab-pane {
width: 100rpx; width: 100rpx;
height: 48rpx; height: 48rpx;
background: #9CA8AD; background: #9ca8ad;
border-radius: 4rpx; border-radius: 4rpx;
font-size: 24rpx; font-size: 24rpx;
color: #FFFFFF; color: #ffffff;
margin-right: 24rpx; margin-right: 24rpx;
transition: all 0.4s ease-in-out; transition: all 0.4s ease-in-out;
&.curr{ &.curr {
background: #197ADB; background: #197adb;
} }
&:last-child{ &:last-child {
margin-right: 0; margin-right: 0;
} }
} }
} }
} }
} }
.btn{ .btn {
height: 88rpx; height: 88rpx;
background: #197ADB; background: #197adb;
border-radius: 4rpx; border-radius: 4rpx;
font-size: 28rpx; font-size: 28rpx;
color: #FFFFFF; color: #ffffff;
margin-top: 44rpx; margin-top: 44rpx;
} }
} }
pages/goods/addExectionReceiving.vue
...@@ -9,7 +9,13 @@ ...@@ -9,7 +9,13 @@
</view> </view>
<view class="box row verCenter"> <view class="box row verCenter">
<text class="label">入仓号信息</text> <text class="label">入仓号信息</text>
<view class="uni-input-box row bothSide"><input type="text" class="uni-input" placeholder="请输入(选填)" placeholder-style="color:#404547;font-weight:bold;" v-model="form.erp_order_sn" /></view> <view class="uni-input-box row bothSide">
<input type="text" class="uni-input" placeholder="请输入(选填)" placeholder-style="color:#404547;font-weight:bold;" v-model="form.erp_order_sn" />
<view class="scan-view row verCenter" @click="scanChangeErp()">
<text class="iconfont icon-juxing6"></text>
<text class="tt">扫描</text>
</view>
</view>
</view> </view>
<view class="box row verCenter"> <view class="box row verCenter">
<text class="label">送货供应商</text> <text class="label">送货供应商</text>
...@@ -146,6 +152,24 @@ export default { ...@@ -146,6 +152,24 @@ export default {
deletePic(index) { deletePic(index) {
this.form.info_pic.splice(index, 1); this.form.info_pic.splice(index, 1);
}, },
scanChangeErp() {
this.form.erp_order_sn = '';
uni.scanCode({
success: res => {
console.log(res);
if (res.errMsg == 'scanCode:ok') {
this.form.erp_order_sns = res.result;
}
},
fail: function(res) {
console.log(res);
uni.showToast({
title: '扫码失败',
icon: 'error'
});
}
});
},
scanChange() { scanChange() {
this.form.logistics_number = ''; this.form.logistics_number = '';
uni.scanCode({ uni.scanCode({
......
pages/goods/addReceiving.vue
...@@ -9,7 +9,10 @@ ...@@ -9,7 +9,10 @@
</view> </view>
<view class="pp row verCenter"> <view class="pp row verCenter">
<text class="t1">入仓号</text> <text class="t1">入仓号</text>
<view class="input-wrap"><input type="text" v-model="form.erp_order_sn" class="uni-input" placeholder="请输入入仓号(必填)" placeholder-style="color:#404547;font-weight:bold;" /></view> <view class="input-wrap row verCenter bothSide" style="flex:0 0 74%;">
<input type="text" v-model="form.erp_order_sn" class="uni-input" placeholder="请输入入仓号(必填)" placeholder-style="color:#404547;font-weight:bold;" />
<view class="scan-view row verCenter" @click="scanChangeErp()"><text class="iconfont icon-juxing6"></text></view>
</view>
</view> </view>
</view> </view>
<view class="receiving-information"> <view class="receiving-information">
...@@ -125,6 +128,24 @@ export default { ...@@ -125,6 +128,24 @@ export default {
} }
}); });
}, },
scanChangeErp() {
this.form.erp_order_sn = '';
uni.scanCode({
success: res => {
console.log(res);
if (res.errMsg == 'scanCode:ok') {
this.form.erp_order_sn = res.result;
}
},
fail: function(res) {
console.log(res);
uni.showToast({
title: '扫码失败',
icon: 'error'
});
}
});
},
scanChange() { scanChange() {
this.form.logistics_number = ''; this.form.logistics_number = '';
uni.scanCode({ uni.scanCode({
......
pages/tag/print.vue
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
</view> </view>
</navigator> </navigator>
<view class="print-form"> <view class="print-form">
<view class="box row verCenter"> <!-- <view class="box row verCenter">
<view class="label">订单类型</view> <view class="label">订单类型</view>
<view class="tab row verCenter"> <view class="tab row verCenter">
<view class="tab-pane row rowCenter verCenter" v-for="(item, index) in items_erp_order_sn_pre" :key="index" :class="{ curr: index_erp_order_sn_pre == index }" @click="change(index, 'erp_order_sn_pre')">{{ item }}</view> <view class="tab-pane row rowCenter verCenter" v-for="(item, index) in items_erp_order_sn_pre" :key="index" :class="{ curr: index_erp_order_sn_pre == index }" @click="change(index, 'erp_order_sn_pre')">{{ item }}</view>
</view> </view>
</view> </view> -->
<view class="box row verCenter"> <view class="box row verCenter">
<view class="label">打印类型</view> <view class="label">打印类型</view>
<view class="tab row verCenter"> <view class="tab row verCenter">
...@@ -29,8 +29,11 @@ ...@@ -29,8 +29,11 @@
</view> </view>
</view> </view>
<view class="box row verCenter"> <view class="box row verCenter">
<view class="row verCenter" style="flex:0 0 93%">
<view class="label">入仓号</view> <view class="label">入仓号</view>
<input type="number" v-model="form.erp_order_sn_number" placeholder-style="font-size:24rpx;color:#404547;" class="uni-input" placeholder="请输入" /> <input type="text" v-model="form.erp_order_sn_number" placeholder-style="font-size:24rpx;color:#404547;" class="uni-input" placeholder="请输入" />
</view>
<text class="scan iconfont icon-juxing6" @click="scanChange()"></text>
</view> </view>
<view class="box row verCenter"> <view class="box row verCenter">
<view class="label">{{ text }}</view> <view class="label">{{ text }}</view>
...@@ -68,11 +71,9 @@ export default { ...@@ -68,11 +71,9 @@ export default {
platform: '', platform: '',
wstyptll_id: '', wstyptll_id: '',
form: { form: {
erp_order_sn_pre: '', print_type: 1, //打印类型
print_type: 1, erp_order_sn_number: '', //入仓号
erp_order_sn_number: '', label_num: '1' //总箱数
label_num: '1',
tray_remark: ''
} }
}; };
}, },
...@@ -122,17 +123,18 @@ export default { ...@@ -122,17 +123,18 @@ export default {
} }
}, },
methods: { methods: {
getTraySelectOption() { scanChange() {
this.request(API.getTraySelectOption, 'POST', {}, false).then(res => { uni.scanCode({
if (res.err_code === 0) { success: res => {
this.traySelectOption = res.data; if (res.errMsg == 'scanCode:ok') {
let token = uni.getStorageSync('token'); this.form.erp_order_sn_number = res.result;
let tray_sn_index = uni.getStorageSync('tray_sn_index');
let tray_sn_value = uni.getStorageSync('tray_sn_value');
if (token) {
this.index = tray_sn_index;
this.form.tray_remark = tray_sn_value;
} }
},
fail: function(res) {
uni.showToast({
title: '扫码失败',
icon: 'error'
});
} }
}); });
}, },
...@@ -161,13 +163,13 @@ export default { ...@@ -161,13 +163,13 @@ export default {
}); });
return false; return false;
} }
if (!this.form.erp_order_sn_pre) { /* if (!this.form.erp_order_sn_pre) {
uni.showToast({ uni.showToast({
icon: 'error', icon: 'error',
title: '请选择订单类型' title: '请选择订单类型'
}); });
return false; return false;
} } */
if (!this.form.erp_order_sn_number) { if (!this.form.erp_order_sn_number) {
uni.showToast({ uni.showToast({
icon: 'error', icon: 'error',
...@@ -237,6 +239,9 @@ export default { ...@@ -237,6 +239,9 @@ export default {
data.push('T 8 0 10 180 时间：' + this.printLabelData[this.print_number].create_time_cn + '\r\n'); data.push('T 8 0 10 180 时间：' + this.printLabelData[this.print_number].create_time_cn + '\r\n');
data.push('T 8 0 10 220 仓库代码：' + this.printLabelData[this.print_number].warehouse_code + '\r\n'); data.push('T 8 0 10 220 仓库代码：' + this.printLabelData[this.print_number].warehouse_code + '\r\n');
data.push('T 8 0 10 260 流水号：' + this.printLabelData[this.print_number].wstyptll_id_sn + '\r\n'); data.push('T 8 0 10 260 流水号：' + this.printLabelData[this.print_number].wstyptll_id_sn + '\r\n');
data.push('SETMAG 4 1');
data.push('T 8 0 350 30 #1');
data.push('SETMAG 0 0');
data.push('B QR 280 110 M 2 U 8\r\n'); data.push('B QR 280 110 M 2 U 8\r\n');
data.push('MA,' + this.printLabelData[this.print_number]['box_code'] + '|\r\n'); data.push('MA,' + this.printLabelData[this.print_number]['box_code'] + '|\r\n');
data.push('ENDQR\r\n'); data.push('ENDQR\r\n');
......
pages/tag/repairPrint.vue
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
</view> </view>
</navigator> </navigator>
<view class="print-form"> <view class="print-form">
<view class="box row verCenter"> <!-- <view class="box row verCenter">
<view class="label">订单类型</view> <view class="label">订单类型</view>
<view class="tab row verCenter"> <view class="tab row verCenter">
<view class="tab-pane row rowCenter verCenter" v-for="(item, index) in items_erp_order_sn_pre" :key="index" :class="{ curr: index_erp_order_sn_pre == index }" @click="change(index, 'erp_order_sn_pre')">{{ item }}</view> <view class="tab-pane row rowCenter verCenter" v-for="(item, index) in items_erp_order_sn_pre" :key="index" :class="{ curr: index_erp_order_sn_pre == index }" @click="change(index, 'erp_order_sn_pre')">{{ item }}</view>
</view> </view>
</view> </view> -->
<view class="box row verCenter"> <view class="box row verCenter">
<view class="label">打印类型</view> <view class="label">打印类型</view>
<view class="tab row verCenter"> <view class="tab row verCenter">
...@@ -29,8 +29,11 @@ ...@@ -29,8 +29,11 @@
</view> </view>
</view> </view>
<view class="box row verCenter"> <view class="box row verCenter">
<view class="row verCenter" style="flex:0 0 93%">
<view class="label">入仓号</view> <view class="label">入仓号</view>
<input type="number" v-model="form.erp_order_sn_number" placeholder-style="font-size:24rpx;color:#404547;" class="uni-input" placeholder="请输入" /> <input type="text" v-model="form.erp_order_sn_number" placeholder-style="font-size:24rpx;color:#404547;" class="uni-input" placeholder="请输入" />
</view>
<text class="scan iconfont icon-juxing6" @click="scanChange()"></text>
</view> </view>
<view class="box row verCenter"> <view class="box row verCenter">
<view class="label">{{ text }}</view> <view class="label">{{ text }}</view>
...@@ -102,6 +105,21 @@ export default { ...@@ -102,6 +105,21 @@ export default {
} }
}, },
methods: { methods: {
scanChange() {
uni.scanCode({
success: res => {
if (res.errMsg == 'scanCode:ok') {
this.form.erp_order_sn_number = res.result;
}
},
fail: function(res) {
uni.showToast({
title: '扫码失败',
icon: 'error'
});
}
});
},
submit() { submit() {
if (!this.device_name) { if (!this.device_name) {
uni.showModal({ uni.showModal({
......
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