diff --git a/mycomponents/location/toLocation.vue b/mycomponents/location/toLocation.vue new file mode 100644 index 00000000..b2286bf3 --- /dev/null +++ b/mycomponents/location/toLocation.vue @@ -0,0 +1,55 @@ + + + + + \ No newline at end of file diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue index f79ec716..32cb1766 100644 --- a/pages/purchaseReturn/record/returnRecord.vue +++ b/pages/purchaseReturn/record/returnRecord.vue @@ -4,7 +4,18 @@ - + + + + + 采购订单:{{poNumber}} + + + + + @@ -143,11 +154,12 @@ }, getScanResult(result) { + debugger; if (this.poNumber == '') { - this.poNumber = result.label.order; + this.poNumber = result.label.poNumber; } else { - if (this.poNumber != result.label.order) { - this.showErrorMessage('扫描的采购订单号[' + result.label.order + ']与默认采购订单号[' + this.poNumber + ']不一致') + if (this.poNumber != result.label.poNumber) { + this.showErrorMessage('扫描的采购订单号[' + result.label.poNumber + ']与默认采购订单号[' + this.poNumber + ']不一致') return; } } diff --git a/pages/purchaseReturn/request/returnRequestCreate.vue b/pages/purchaseReturn/request/returnRequestCreate.vue index 986c8772..dbc33c07 100644 --- a/pages/purchaseReturn/request/returnRequestCreate.vue +++ b/pages/purchaseReturn/request/returnRequestCreate.vue @@ -137,10 +137,10 @@ getScanResult(result) { if (this.poNumber == '') { - this.poNumber = result.label.order; + this.poNumber = result.label.poNumber; } else { - if (this.poNumber != result.label.order) { - this.showErrorMessage('扫描的采购订单号[' + result.label.order + ']与默认采购订单号[' + this.poNumber + ']不一致') + if (this.poNumber != result.label.poNumber) { + this.showErrorMessage('扫描的采购订单号[' + result.label.poNumber + ']与默认采购订单号[' + this.poNumber + ']不一致') return; } }