diff --git a/src/views/repair/stockOperate/Components/SoVoid.vue b/src/views/repair/stockOperate/Components/SoVoid.vue index 52126ef..d7505f1 100644 --- a/src/views/repair/stockOperate/Components/SoVoid.vue +++ b/src/views/repair/stockOperate/Components/SoVoid.vue @@ -121,7 +121,7 @@ export default { userId: null, userName: null, soType: this.soByType ? "01" : "02", - purchaseType: this.goodsYes ? "02" : "01", + purchaseType: null, soStatus: "06" }, showSearch: true, @@ -139,6 +139,9 @@ export default { if (this.isBack){ this.queryParams.soType = "04" } + if (this.soByType){ + this.queryParams.purchaseType = this.goodsYes ? "02" : "01" + } this.loading = true const res = await getRepairSoPage(this.queryParams) this.list = res.data.records diff --git a/src/views/repair/stockOperate/Components/WaresItem.vue b/src/views/repair/stockOperate/Components/WaresItem.vue index 5542d59..9871ece 100644 --- a/src/views/repair/stockOperate/Components/WaresItem.vue +++ b/src/views/repair/stockOperate/Components/WaresItem.vue @@ -20,7 +20,8 @@ {{ scope.$index + 1 }} - + + @@ -312,6 +313,9 @@ export default { item.isStock = this.type ? count <= item.wares.stock : true }) this.items = this.items.filter(item => this.type ? item.waresStatus === '02' : item.waresAlreadyCount) + if (!this.type){ + this.items = this.items.filter(item => item.waresAlreadyCount !== item.waresBackCount) + } }finally { this.dialogLoading = false } @@ -464,7 +468,7 @@ export default {