From 62328a31232da2966fc841e98c8eb8aff8274402 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Sat, 25 May 2024 14:26:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1--1.=20=E5=86=8D=E6=89=AB=E6=8F=8F=E6=97=B6=E6=9C=80?=
=?UTF-8?q?=E5=A5=BD=E5=8F=AF=E4=BB=A5=E5=85=BC=E5=AE=B9=E6=89=AB=E6=8F=8F?=
=?UTF-8?q?ASN=E7=BC=96=E5=8F=B7=E5=92=8C=E7=AE=B1=E6=A0=87=E7=AD=BE?=
=?UTF-8?q?=EF=BC=8C=E6=89=AB=E6=8F=8F=E4=BB=BB=E5=8A=A1=E7=BC=96=E5=8F=B7?=
=?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE=E9=9A=90=E8=97=8F=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mycomponents/job/jobFilter.vue | 6 +-
src/mycomponents/jobList/jobList.vue | 7 +-
.../productPutaway/job/productPutawayJob.vue | 22 ++--
.../productReceipt/job/productReceiptJob.vue | 19 ++--
.../purchaseReceipt/job/purchaseReceipt.vue | 2 +-
src/pages/purchaseReceipt/job/receiptJob.vue | 100 +++++++++++-------
src/pages/putaway/job/putawayJob.vue | 13 ++-
7 files changed, 107 insertions(+), 62 deletions(-)
diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index 59a4c92a..2254de73 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -37,7 +37,7 @@
-
+
@@ -80,6 +80,10 @@
type: Boolean,
default: false
},
+ isShowJob:{
+ type: Boolean,
+ default: true
+ },
isShowFromLocationCode:{
type: Boolean,
default: false
diff --git a/src/mycomponents/jobList/jobList.vue b/src/mycomponents/jobList/jobList.vue
index da9c9711..1d966802 100644
--- a/src/mycomponents/jobList/jobList.vue
+++ b/src/mycomponents/jobList/jobList.vue
@@ -37,11 +37,8 @@ import { onShow } from '@dcloudio/uni-app';
},
methods:{
openList(list){
- list.forEach(item=>{
- if(!this.list.find(subItem=>subItem.title==item.title)){
- this.list.push(item)
- }
- })
+ this.list = list
+
this.$refs.listPopup.open('center')
},
selectItem(item,index){
diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue
index 0d7aa4ec..8c93cf49 100644
--- a/src/pages/productPutaway/job/productPutawayJob.vue
+++ b/src/pages/productPutaway/job/productPutawayJob.vue
@@ -353,14 +353,20 @@
filters: filters,
pageNo: 1,
pageSize: 100,
- }).then(res => {
- var list = res.data.list;
- list.forEach(item => {
- item.title = item.number;
- item.selected = false
- })
- console.log('list', list)
- if (list.length > 0) {
+ }).then(res => {
+ let resultList = res.data.list;
+ if (resultList.length > 0) {
+ resultList.forEach(item => {
+ item.title = item.number;
+ item.selected = false
+ })
+ let list = []
+ resultList.forEach(item=>{
+ if(!list.find(subItem=>subItem.title==item.title)){
+ list.push(item)
+ }
+ })
+ console.log('list', list)
if (list.length > 1) {
this.$refs.jobList.openList(list)
} else {
diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index 646302d5..466afdf1 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -380,13 +380,18 @@
pageNo: 1,
pageSize: 100,
}).then(res => {
- var list = res.data.list;
- list.forEach(item => {
- item.title = item.number;
- item.selected = false
- })
- console.log('list', list.length)
- if (list.length > 0) {
+ let resultList = res.data.list;
+ if (resultList.length > 0) {
+ resultList.forEach(item => {
+ item.title = item.number;
+ item.selected = false
+ })
+ let list = []
+ resultList.forEach(item=>{
+ if(!list.find(subItem=>subItem.title==item.title)){
+ list.push(item)
+ }
+ })
if (list.length > 1) {
this.$refs.jobList.openList(list)
} else {
diff --git a/src/pages/purchaseReceipt/job/purchaseReceipt.vue b/src/pages/purchaseReceipt/job/purchaseReceipt.vue
index 854e0fd1..5bbfe8cc 100644
--- a/src/pages/purchaseReceipt/job/purchaseReceipt.vue
+++ b/src/pages/purchaseReceipt/job/purchaseReceipt.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index 82047983..1c788bb7 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -1,7 +1,7 @@
-
@@ -82,7 +82,15 @@
},
props: {
- operation: "receipt" //reject 收货 拒绝
+ operation: "receipt" ,//reject 收货 拒绝
+ isShowAsn:{
+ type: Boolean,
+ default: true
+ },
+ isShowJob:{
+ type: Boolean,
+ default: true
+ },
},
// onShow() {
@@ -330,46 +338,66 @@
this.$refs.scanPopup.closeScanPopup();
this.openJobDetail(item, item.packingNumber);
},
- getScanResult(result) {
+ getScanResult(result) {
+
try {
- var filters = [{
- column: "packingNumber",
- action: "==",
- value: result.label.packingNumber
- },
- {
- column: "batch",
- action: "==",
- value: result.label.batch
- },
- // {
- // column: "qty",
- // action: "==",
- // value: result.label.qty
- // },
- {
- column: "itemCode",
- action: "==",
- value: result.label.itemCode
- },
- // {
- // column: "fromLocationCode",
- // action: "==",
- // value: result.label.fromLocationCode
- // }
- ]
+ let filters = []
+ if(result.label.barType=="BarCode"){
+ // ASN单号
+ filters = [{
+ column: "asn_number",
+ action: "==",
+ value: result.label.code
+ }]
+ }else{
+ filters = [{
+ column: "packingNumber",
+ action: "==",
+ value: result.label.packingNumber
+ },
+ {
+ column: "batch",
+ action: "==",
+ value: result.label.batch
+ },
+ // {
+ // column: "qty",
+ // action: "==",
+ // value: result.label.qty
+ // },
+ {
+ column: "itemCode",
+ action: "==",
+ value: result.label.itemCode
+ },
+ // {
+ // column: "fromLocationCode",
+ // action: "==",
+ // value: result.label.fromLocationCode
+ // }
+ ]
+ }
+
+
getPurchaseReceiptJobList({
filters: filters,
pageNo: 1,
pageSize: 100,
}).then(res => {
- var list = res.data.list;
- list.forEach(item => {
- item.title = item.number;
- item.selected = false
- })
- console.log('list', list)
- if (list.length > 0) {
+ let resultList = res.data.list;
+ if (resultList.length > 0) {
+ resultList.forEach(item => {
+ item.title = item.number;
+ item.selected = false
+ })
+ let list = []
+ resultList.forEach(item=>{
+ if(!list.find(subItem=>subItem.title==item.title)){
+ list.push(item)
+ }
+ })
+
+ console.log('list', list)
if (list.length > 1) {
this.$refs.jobList.openList(list)
} else {
diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue
index 16c11d51..35531f76 100644
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@@ -335,13 +335,18 @@
pageSize: 100,
}).then(res => {
console.log('getPutawayJobList', getPutawayJobList)
- var list = res.data.list;
- if (list.length > 0) {
- list.forEach(item => {
+ let resultList = res.data.list;
+ if (resultList.length > 0) {
+ resultList.forEach(item => {
item.title = item.number;
item.selected = false
})
- console.log('list', list)
+ let list = []
+ resultList.forEach(item=>{
+ if(!list.find(subItem=>subItem.title==item.title)){
+ list.push(item)
+ }
+ })
if (list.length > 1) {
this.$refs.jobList.openList(list)
} else {