From 10d8361f6f0d56bf39902a5893427ebfc9a681d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 14 Dec 2022 17:37:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A51.0=E7=89=88=E6=9C=ACbug?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/BussinessTypeLoclModify.vue | 4 ++--
src/views/basic/UdiRlDetailDialog.vue | 3 +++
src/views/business/stockOrderNewDistribution.vue | 7 ++++---
src/views/business/stockOrderNewSelectProduct.vue | 4 +++-
src/views/business/stockOrderSearch.vue | 1 +
src/views/inout/IOAddOrder.vue | 13 ++++---------
src/views/inventory/InvPreInProductsDetail.vue | 11 +++++------
src/views/inventory/invPreInProducts.vue | 4 +++-
8 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue
index c1a09aa..de00395 100644
--- a/src/views/basic/BussinessTypeLoclModify.vue
+++ b/src/views/basic/BussinessTypeLoclModify.vue
@@ -452,6 +452,7 @@ export default {
this.editQuery = JSON.parse(JSON.stringify(row));
this.editChangeTypeVisible = true;
this.getBusTypes();
+ this.findDefaultSubInv();
}
,
hideForm() {
@@ -540,8 +541,7 @@ export default {
});
},
invChange() {
- if (this.$isNotBlank(this.inputQuery.defaultSubInv))
- this.inputQuery.defaultSubInv = null;
+ this.editQuery.defaultSubInv = null;
this.findDefaultSubInv();
},
},
diff --git a/src/views/basic/UdiRlDetailDialog.vue b/src/views/basic/UdiRlDetailDialog.vue
index 9b38d7e..e934744 100644
--- a/src/views/basic/UdiRlDetailDialog.vue
+++ b/src/views/basic/UdiRlDetailDialog.vue
@@ -421,6 +421,9 @@ export default {
},
created() {
+ if(this.editQuery.isUseDy==1){
+ this.checked=true
+ }
let ttquery = {
uuid: this.editQuery.uuid,
page: 1,
diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue
index 3c3bd32..d507c41 100644
--- a/src/views/business/stockOrderNewDistribution.vue
+++ b/src/views/business/stockOrderNewDistribution.vue
@@ -1124,9 +1124,9 @@ export default {
// },
getBusType() {
- if( this.formData.id==null){
- this.formData.billType=null;
- }
+ if(this.$isBlank(this.idQuery.id)){
+ this.formData.billType=null;
+ }
let query = {
code: this.formData.invWarehouseCode,
enabled: true,
@@ -1293,6 +1293,7 @@ export default {
if(this.formData.invWarehouseCode!=null){
this.getBusType();
}
+
this.findSubInvs();
this.findSubStorageMethod();
this.codeArray = [];
diff --git a/src/views/business/stockOrderNewSelectProduct.vue b/src/views/business/stockOrderNewSelectProduct.vue
index 6669919..39093a9 100644
--- a/src/views/business/stockOrderNewSelectProduct.vue
+++ b/src/views/business/stockOrderNewSelectProduct.vue
@@ -307,7 +307,9 @@ export default {
getList() {
this.loading = true;
this.listQuery.customerId = store.getters.customerId;
- this.listQuery.companyName=this.data.formData.corpName
+ if( this.data.companyName!=undefined && this.data.companyName!=null ){
+ this.listQuery.companyName = this.data.companyName;
+ }
if (this.filterType != null && this.filterType === 2) {
filterAllProduct(this.listQuery)
diff --git a/src/views/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue
index a535667..6e27f07 100644
--- a/src/views/business/stockOrderSearch.vue
+++ b/src/views/business/stockOrderSearch.vue
@@ -1069,6 +1069,7 @@ export default {
rollbackOrder(param).then((res) => {
if (res.code === 20000) {
this.$message.success("回退成功");
+ this.getList();
}
})
}).catch(() => {
diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue
index da2ac20..7a572d1 100644
--- a/src/views/inout/IOAddOrder.vue
+++ b/src/views/inout/IOAddOrder.vue
@@ -786,14 +786,10 @@ export default {
customClass: 'messageIndex'
});
} else {
- this.$alert(response.message, '提示', {
- confirmButtonText: '确定',
- type: 'warning',
- closeOnClickModal: true,
- callback: action => {
- this.$refs.inputRef.focus();
- this.$refs.inputRef.select();
- }
+ this.$message({
+ type: 'error',
+ message: "提交失败！" + this.editTitle,
+ customClass: 'messageIndex'
});
}
}
@@ -946,7 +942,6 @@ export default {
getBasicUnitMaintains(cQuery)
.then((response) => {
- debugger
this.loading = false;
this.fromOptions = response.data.page.list || [];
if (this.curAction.corpType == 3) {
diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue
index 707241a..b3cad5c 100644
--- a/src/views/inventory/InvPreInProductsDetail.vue
+++ b/src/views/inventory/InvPreInProductsDetail.vue
@@ -185,12 +185,11 @@ export default {
getCodeList() {
this.loading = true;
this.query.orderIdFk = this.idQuery.orderIdFk;
- debugger
- let query = {
- orderIdFk: this.idQuery.orderIdFk,
- code:this.query.code
- }
- filterDetailProducts(query) //查找该单号下的所有条码
+ // let query = {
+ // orderIdFk: this.idQuery.orderIdFk,
+ // code:this.query.code
+ // }
+ filterDetailProducts(this.query) //查找该单号下的所有条码
.then((response) => {
this.loading = false;
this.codeArry = response.data.list || [];
diff --git a/src/views/inventory/invPreInProducts.vue b/src/views/inventory/invPreInProducts.vue
index a9bbe73..3a594e3 100644
--- a/src/views/inventory/invPreInProducts.vue
+++ b/src/views/inventory/invPreInProducts.vue
@@ -34,7 +34,9 @@
-
+
+
+