From 2f926c41671818f1e1c51c716335d965a1f733bb Mon Sep 17 00:00:00 2001 From: zhengmingliang Date: Wed, 16 Nov 2022 18:10:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=8F=8A?= =?UTF-8?q?=E5=8A=9F=E8=83=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/basicCompany.vue | 1 + src/views/basic/invWarehouse.vue | 8 ++++-- .../inventory/InvPreInProductsDetail.vue | 1 - src/views/purchase/purApply.vue | 2 +- src/views/purchase/purApplyEditDiaolog.vue | 12 +++++++++ src/views/purchase/purPlan.vue | 1 - src/views/purchase/purPlanAudit.vue | 1 - src/views/purchase/purPlanDetailDialog.vue | 4 +-- src/views/purchase/purPlanEditDialog.vue | 13 +++++++++ src/views/purchase/purPlanSearch.vue | 2 +- src/views/purchase/pureApplyAudit.vue | 1 - src/views/purchase/pureApplyDetailDialog.vue | 4 +-- src/views/purchase/supCertSet.vue | 27 ++++++++++++++----- .../purchase/supManufacturerEditDialog.vue | 1 + .../warehouse/stockOrderNewSelectProduct.vue | 22 +++++---------- 15 files changed, 67 insertions(+), 33 deletions(-) diff --git a/src/views/basic/basicCompany.vue b/src/views/basic/basicCompany.vue index b31c819..47b0de7 100644 --- a/src/views/basic/basicCompany.vue +++ b/src/views/basic/basicCompany.vue @@ -600,6 +600,7 @@ export default { this.editTye = 2; } else { this.formName = 1; + this.inputQuery.formData={}; this.editTye = 1; } this.addCertVisible = true; diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 72cdfa3..09fb9f6 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -1557,9 +1557,13 @@ export default { this.getBussinessType(1,action); }, selsectBussinessType(row){ - + + // if(row==null || row==undefined){ + // this.$message.info("请先选择分库！"); + // return; + // } var busQuery = { - code: this.currentCode, + code: row.code, page: 1, limit: 10000 } diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue index 63b97fe..6c208d8 100644 --- a/src/views/inventory/InvPreInProductsDetail.vue +++ b/src/views/inventory/InvPreInProductsDetail.vue @@ -187,7 +187,6 @@ export default { getCodeList() { this.loading = true; this.query.orderIdFk = this.idQuery.orderIdFk; - let query = { orderIdFk: this.idQuery.orderIdFk } diff --git a/src/views/purchase/purApply.vue b/src/views/purchase/purApply.vue index 1740a12..b9035f0 100644 --- a/src/views/purchase/purApply.vue +++ b/src/views/purchase/purApply.vue @@ -245,7 +245,7 @@ export default { listApplyDetail(query) //查找该单号下的所有条码 .then((response) => { this.detailList = response.data.list || []; - this.total = response.data.total || 0; + this.loading = false; }) .catch(() => { diff --git a/src/views/purchase/purApplyEditDiaolog.vue b/src/views/purchase/purApplyEditDiaolog.vue index 6a4d209..a19194f 100644 --- a/src/views/purchase/purApplyEditDiaolog.vue +++ b/src/views/purchase/purApplyEditDiaolog.vue @@ -287,6 +287,17 @@ export default { return; } if (status === '2') { + if(this.formData.billDate==""){ + return this.$message.error("单据日期不能为空！"); + } + if(this.formData.locStorageCode=="" || this.formData.locStorageCode==null){ + return this.$message.error("仓库不能为空！"); + } + if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){ + return this.$message.error("分库不能为空！"); + } + + for (let i = 0; i < this.codeArray.length; i++) { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { return this.$message.error('单据数量不能为0'); @@ -337,6 +348,7 @@ export default { this.thisData.stockOrderLists = this.codeArray; }, closeDialogC2(rData) { + debugger this.selectProductVisible = false; this.thisData = {}; if (this.$isNotBlank(rData)) { diff --git a/src/views/purchase/purPlan.vue b/src/views/purchase/purPlan.vue index 2ce032d..80464a1 100644 --- a/src/views/purchase/purPlan.vue +++ b/src/views/purchase/purPlan.vue @@ -245,7 +245,6 @@ export default { listApplyDetail(query) //查找该单号下的所有条码 .then((response) => { this.detailList = response.data.list || []; - this.total = response.data.total || 0; this.loading = false; }) .catch(() => { diff --git a/src/views/purchase/purPlanAudit.vue b/src/views/purchase/purPlanAudit.vue index 4ae5dba..90e6ee4 100644 --- a/src/views/purchase/purPlanAudit.vue +++ b/src/views/purchase/purPlanAudit.vue @@ -242,7 +242,6 @@ export default { listApplyDetail(query) //查找该单号下的所有条码 .then((response) => { this.detailList = response.data.list || []; - this.total = response.data.total || 0; this.loading = false; }) .catch(() => { diff --git a/src/views/purchase/purPlanDetailDialog.vue b/src/views/purchase/purPlanDetailDialog.vue index 90ba2c9..ffcad09 100644 --- a/src/views/purchase/purPlanDetailDialog.vue +++ b/src/views/purchase/purPlanDetailDialog.vue @@ -162,7 +162,7 @@ - + diff --git a/src/views/purchase/purPlanEditDialog.vue b/src/views/purchase/purPlanEditDialog.vue index f2c648d..19a2f3b 100644 --- a/src/views/purchase/purPlanEditDialog.vue +++ b/src/views/purchase/purPlanEditDialog.vue @@ -311,6 +311,19 @@ export default { return; } if (status === '2') { + + if(this.formData.billDate==""){ + return this.$message.error("单据日期不能为空！"); + } + if(this.formData.billType=="" || this.formData.billType==null){ + return this.$message.error("采购类型不能为空！"); + } + if(this.formData.locStorageCode=="" || this.formData.locStorageCode==null){ + return this.$message.error("采购仓库不能为空！"); + } + if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){ + return this.$message.error("采购分库不能为空！"); + } for (let i = 0; i < this.codeArray.length; i++) { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { return this.$message.error('单据数量不能为0'); diff --git a/src/views/purchase/purPlanSearch.vue b/src/views/purchase/purPlanSearch.vue index c67827b..9c3b90b 100644 --- a/src/views/purchase/purPlanSearch.vue +++ b/src/views/purchase/purPlanSearch.vue @@ -242,7 +242,7 @@ export default { listApplyDetail(query) //查找该单号下的所有条码 .then((response) => { this.detailList = response.data.list || []; - this.total = response.data.total || 0; + this.loading = false; }) .catch(() => { diff --git a/src/views/purchase/pureApplyAudit.vue b/src/views/purchase/pureApplyAudit.vue index 473a86d..86f1e55 100644 --- a/src/views/purchase/pureApplyAudit.vue +++ b/src/views/purchase/pureApplyAudit.vue @@ -252,7 +252,6 @@ export default { listApplyDetail(query) //查找该单号下的所有条码 .then((response) => { this.detailList = response.data.list || []; - this.total = response.data.total || 0; this.loading = false; }) .catch(() => { diff --git a/src/views/purchase/pureApplyDetailDialog.vue b/src/views/purchase/pureApplyDetailDialog.vue index 976d74d..bbc406c 100644 --- a/src/views/purchase/pureApplyDetailDialog.vue +++ b/src/views/purchase/pureApplyDetailDialog.vue @@ -194,7 +194,7 @@ - + diff --git a/src/views/purchase/supCertSet.vue b/src/views/purchase/supCertSet.vue index 1cdef60..a02225d 100644 --- a/src/views/purchase/supCertSet.vue +++ b/src/views/purchase/supCertSet.vue @@ -536,9 +536,7 @@ export default { name: [ {required: true, message: "证书名称", trigger: "blur"} ], - foreign: [ - {required: true, message: "请选择产地", trigger: "blur"} - ], + }, /**--------产品资质设置--------------*/ @@ -617,7 +615,12 @@ export default { this.currentSup.type = 1; addSupCertSet(this.currentSup) .then((response) => { - this.getList(); + if(response.code==20000){ + this.getList(); + }else{ + this.$message.error(response.message); + } + }) .catch(() => { }); @@ -627,6 +630,7 @@ export default { this.getList(); this.$message.success("保存成功！"); } else { + this.getList(); this.$message.error(res.message); } }) @@ -689,7 +693,12 @@ export default { this.currentManufacturer.type = 2; addSupCertSet(this.currentManufacturer) .then((response) => { - this.getManufacturerList(); + if(response.code==20000){ + this.getManufacturerList(); + }else{ + this.$message.error(response.message); + } + }) .catch(() => { }); @@ -699,6 +708,7 @@ export default { this.getManufacturerList(); this.$message.success("保存成功！"); } else { + this.getManufacturerList(); this.$message.error(res.message); } }) @@ -756,7 +766,11 @@ export default { this.currentProduct.type = 3; addSupCertSet(this.currentProduct) .then((response) => { - this.getProductList(); + if(response.code==20000){ + this.getProductList(); + }else{ + this.$message.error(response.message); + } }) .catch(() => { }); @@ -766,6 +780,7 @@ export default { this.getProductList(); this.$message.success("保存成功！"); } else { + this.getProductList(); this.$message.error(res.message); } }) diff --git a/src/views/purchase/supManufacturerEditDialog.vue b/src/views/purchase/supManufacturerEditDialog.vue index aa3d2c4..641b090 100644 --- a/src/views/purchase/supManufacturerEditDialog.vue +++ b/src/views/purchase/supManufacturerEditDialog.vue @@ -573,6 +573,7 @@ export default { this.editTye = 2; } else { this.formName = 1; + this.inputQuery.formData = {}; this.editTye = 1; } this.addCertVisible = true; diff --git a/src/views/warehouse/stockOrderNewSelectProduct.vue b/src/views/warehouse/stockOrderNewSelectProduct.vue index 01107d2..bc869c4 100644 --- a/src/views/warehouse/stockOrderNewSelectProduct.vue +++ b/src/views/warehouse/stockOrderNewSelectProduct.vue @@ -76,7 +76,7 @@ show-overflow-tooltip > @@ -244,20 +244,12 @@ export default { this.$router.push({ path: "", }); - this.listQuery = { - unionCode: null, - udiCode: null, - ylqxzcrbarmc: "", - cpmctymc: "", - thrPiId: null, - nameCode: "", - ggxh: null, - page: 1, - limit: 20, - addType: 1, - billType: this.data.formData.billType, - corpId: this.data.formData.corpId, - }; + this.listQuery.udiCode=null + this.listQuery.unionCode=null + this.listQuery.cpmctymc=null + this.listQuery.ggxh=null + this.listQuery.ylqxzcrbarmc=null + this.listQuery.thrPiId=null this.getList(); }, tableRowClassName({row}) {