From 03cb78449c6c218a41e51fc5798c3a5cbec80726 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, 21 Dec 2022 13:20:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inventory/DialogInvProduct.vue | 4 +++
src/views/purchase/purPlanEditDialog.vue | 3 ---
src/views/thrsys/thrOrderNew.vue | 26 +++----------------
src/views/warehouse/IONewOrder.vue | 1 +
src/views/warehouse/addHosOrder.vue | 5 ++--
.../warehouse/selectReceiveOrderDialog.vue | 2 +-
src/views/warehouse/stockHospOrderNew.vue | 1 +
.../warehouse/stockOrderNewSelectProduct.vue | 3 ++-
8 files changed, 15 insertions(+), 30 deletions(-)
diff --git a/src/views/inventory/DialogInvProduct.vue b/src/views/inventory/DialogInvProduct.vue
index fc16deb..6c67f98 100644
--- a/src/views/inventory/DialogInvProduct.vue
+++ b/src/views/inventory/DialogInvProduct.vue
@@ -152,6 +152,7 @@ export default {
},
methods: {
onReset() {
+
this.$router.push({
path: "",
});
@@ -165,6 +166,8 @@ export default {
supId: null,
page: 1,
limit: 10,
+ invStorageCode:this.invQueryData.locStorageCode,
+ invWarehouseCode:this.invQueryData.invWarehouseCode
};
this.getList();
},
@@ -333,6 +336,7 @@ export default {
};
},
created() {
+
this.getBusType();
let query = this.$route.query;
diff --git a/src/views/purchase/purPlanEditDialog.vue b/src/views/purchase/purPlanEditDialog.vue
index ae61822..d0e319a 100644
--- a/src/views/purchase/purPlanEditDialog.vue
+++ b/src/views/purchase/purPlanEditDialog.vue
@@ -356,9 +356,6 @@ export default {
if (this.formData.billDate == "" || this.formData.billDate == null) {
return this.$message.error("单据日期不能为空！");
}
- if(this.formData.billType=="" || this.formData.billType==null){
- return this.$message.error("采购类型不能为空！");
- }
if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){
return this.$message.error("采购分库不能为空！");
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index 4590b9c..3054d23 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -499,7 +499,9 @@ export default {
this.subInvList = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) {
this.formData.invWarehouseCode = this.subInvList[0].code;
+ this.formData.locStorageCode = this.subInvList[0].parentId;
this.getBusType();
+ this.findSubStorageMethod();
}
})
.catch(() => {
@@ -514,30 +516,11 @@ export default {
}
},
- //往来仓库
- findStorageMethod() {
- if (this.formData.locStorageCode == null)
- return;
- this.fromStorageOptions = [];
- let cQuery = {
- locInvCode: this.formData.locStorageCode,
- };
- filterAllByLoc(cQuery)
- .then((response) => {
- let temp = response.data || [];
- for (let i = 0; i < temp.length; i++) {
- if (temp[i].code != this.formData.locStorageCode) {
- this.fromStorageOptions.push(temp[i]);
- }
- }
- })
- .catch(() => {
- });
- },
//往来分库
findSubStorageMethod() {
+ debugger
let cQuery = {
code: this.formData.invWarehouseCode,
filter: 2,
@@ -918,7 +901,6 @@ export default {
}
this.formData.locStorageCode = item;
this.$forceUpdate();
- this.findStorageMethod();
this.findSubInvs();
},
@@ -960,7 +942,7 @@ export default {
this.getBusType();
this.findSubInvs();
- this.findSubStorageMethod();
+
// this.findSubInvByInv();
this.codeArray = [];
this.closeConfirmFunction(false);
diff --git a/src/views/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue
index 81abc54..26e9c1a 100644
--- a/src/views/warehouse/IONewOrder.vue
+++ b/src/views/warehouse/IONewOrder.vue
@@ -476,6 +476,7 @@ export default {
this.idQuery.corpOrderId = '';
this.idQuery.outChangeEnable = row.outChangeEnable;
if (row.id !== null && row.id !== undefined && row.id !== '') {
+
this.idQuery.id = row.id;
this.idQuery.actDate = row.actDate;
this.idQuery.corpOrderId = row.corpOrderId;
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index 292b45b..74f959a 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -1005,7 +1005,6 @@ export default {
};
filterSubByInv(cQuery)
.then((response) => {
-
this.fromSubStorageOptions = response.data || [];
if (val == 1) {
@@ -1182,7 +1181,7 @@ export default {
},
created() {
-
+ debugger
this.formData.code = '';
this.formData.actDate = new Date();
this.codeArray = [];
@@ -1221,9 +1220,9 @@ export default {
if (this.$isNotBlank(this.formData.locStorageCode)) {
this.findStorageMethod();
}
+ this.findSubStorageMethod();
}
this.findSubInvByInv();
- this.findSubStorageMethod();
this.getBusType();
//查询是否启用多级仓库，判断是否启用部门
diff --git a/src/views/warehouse/selectReceiveOrderDialog.vue b/src/views/warehouse/selectReceiveOrderDialog.vue
index 0d2459a..5755bfb 100644
--- a/src/views/warehouse/selectReceiveOrderDialog.vue
+++ b/src/views/warehouse/selectReceiveOrderDialog.vue
@@ -80,7 +80,7 @@
-
+
diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue
index fe3a0bc..10fd8ee 100644
--- a/src/views/warehouse/stockHospOrderNew.vue
+++ b/src/views/warehouse/stockHospOrderNew.vue
@@ -800,6 +800,7 @@ export default {
};
this.selectInvProductVisible = true;
} else {
+
this.selectProductVisible = true;
}
return;
diff --git a/src/views/warehouse/stockOrderNewSelectProduct.vue b/src/views/warehouse/stockOrderNewSelectProduct.vue
index d7aacaa..8876fd3 100644
--- a/src/views/warehouse/stockOrderNewSelectProduct.vue
+++ b/src/views/warehouse/stockOrderNewSelectProduct.vue
@@ -302,10 +302,11 @@ export default {
this.getList();
},
getList() {
+ debugger
this.loading = true;
this.listQuery.customerId = store.getters.customerId;
- if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined){
+ if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined && this.data.formData.noInvOut==false){
this.listQuery.companyName=this.data.formData.corpName
}
if(this.listQuery.customerId!=110 && this.data!=null && this.data!=undefined){