|
|
@@ -2,7 +2,7 @@
|
|
|
<div style="margin: 20px">
|
|
|
<h1 align="center">电子面单</h1>
|
|
|
<el-row>
|
|
|
- <el-col :span="3">
|
|
|
+ <el-col :span="4">
|
|
|
<el-select v-model="logistics" placeholder="请选择快递">
|
|
|
<el-option v-for="(item,index) in logisticsList"
|
|
|
:key="index"
|
|
|
@@ -11,7 +11,7 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-col>
|
|
|
- <el-col :span="3">
|
|
|
+ <!--<el-col :span="3">
|
|
|
<el-select v-model="deviceNo" placeholder="请选择打印设备">
|
|
|
<el-option
|
|
|
v-for="(item,index) in deviceList"
|
|
|
@@ -20,8 +20,8 @@
|
|
|
:value="item.deviceNo">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- </el-col>
|
|
|
- <el-col :span="18">
|
|
|
+ </el-col>-->
|
|
|
+ <el-col :span="20">
|
|
|
<el-input id="scanInput" @change="scanMatchPrintOrder" type="text" v-model="scanOrderNo" placeholder="请扫码二维码"></el-input>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -110,7 +110,7 @@ export default {
|
|
|
printOrder:{
|
|
|
orderLogistics:{}
|
|
|
},
|
|
|
- logisticsList:[{logisticsName: "中通快递", logisticsValue: "ZTO"}, {logisticsName: "韵达速递", logisticsValue: "YUNDA"} ],
|
|
|
+ logisticsList:[{logisticsName: "中通快递", logisticsValue: "ZTO"}],
|
|
|
// logisticsList:[{logisticsName: "申通快递", logisticsValue: "STO"}],
|
|
|
logistics: "ZTO",
|
|
|
deviceList: [],
|
|
|
@@ -163,9 +163,9 @@ export default {
|
|
|
}else{
|
|
|
substr = value;
|
|
|
}
|
|
|
- if(!this.deviceNo){
|
|
|
- this.$message.error("请选择打印设备");
|
|
|
- }
|
|
|
+ // if(!this.deviceNo){
|
|
|
+ // this.$message.error("请选择打印设备");
|
|
|
+ // }
|
|
|
if(substr){
|
|
|
this.scanOrderNo = substr;
|
|
|
let dataBody = {orderNo: substr, deviceNo: this.deviceNo, logistics: this.logistics};
|
|
|
@@ -206,12 +206,12 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
handlePrintOrder(){
|
|
|
- if(this.logistics === 'YUNDA'){
|
|
|
+ if(this.logistics === 'YUNDA' || this.logistics === 'ZTO'){
|
|
|
this.printWallbill(this.printOrder.orderLogistics)
|
|
|
}else{
|
|
|
- if(!this.deviceNo){
|
|
|
- this.$message.error("请选择打印设备");
|
|
|
- }
|
|
|
+ // if(!this.deviceNo){
|
|
|
+ // this.$message.error("请选择打印设备");
|
|
|
+ // }
|
|
|
this.$http({
|
|
|
url: this.$http.adornUrl('/logistics/printOrder'),
|
|
|
method: 'POST',
|
