diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue index d8f19b12..4f71cda1 100644 --- a/src/pages/deliver/coms/comScanDeliverPack.vue +++ b/src/pages/deliver/coms/comScanDeliverPack.vue @@ -375,11 +375,17 @@ createBatchInfo(data, balance, packageInfo) { let batch = { - batch: data.lot, + batch: data.lot||data.batch, qty: 0, uom: data.uom, handleQty: Number(data.qty), - Records: [] + Records: [], + detail:{ + handleQty: Number(data.qty), + packingNumber:data.packingNumber, + qty: 0, + uom:data.uom, + } } let record = this.creatRecord(data, balance, packageInfo); batch.Records.push(record); diff --git a/src/pages/deliver/job/deliverJob.vue b/src/pages/deliver/job/deliverJob.vue index 861519da..f5927528 100644 --- a/src/pages/deliver/job/deliverJob.vue +++ b/src/pages/deliver/job/deliverJob.vue @@ -138,11 +138,11 @@ }) } - filters.push({ - column: "accept_user_id", - action: "==", - value: this.$store.state.user.id - }) + // filters.push({ + // column: "accept_user_id", + // action: "==", + // value: this.$store.state.user.id + // }) filters.push({ column: "status", action: "in",