From 0e91e27c59469e340403108ccdd812334420a1a5 Mon Sep 17 00:00:00 2001 From: zhengmingliang Date: Mon, 21 Nov 2022 14:36:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=87=AA=E5=8A=A9=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/stockOrderNewDistribution.vue | 3 + .../business/stockOrderNewSelectProduct.vue | 62 +++++++++++-------- src/views/inout/IOAddOrder.vue | 3 + src/views/purchase/purApplyEditDiaolog.vue | 12 ++++ src/views/purchase/purPlan.vue | 1 - src/views/purchase/purPlanDetailDialog.vue | 8 +-- src/views/purchase/purPlanEditDialog.vue | 12 ++++ src/views/purchase/purPlanSearch.vue | 1 - src/views/purchase/pureApplyAudit.vue | 1 - src/views/purchase/pureApplyDetailDialog.vue | 4 +- src/views/purchase/pureApplySearch.vue | 1 - src/views/purchase/supCertAddDialog.vue | 7 ++- src/views/purchase/supCertSet.vue | 55 +++++++++++----- src/views/purchase/supCertSetSelectDialog.vue | 2 +- src/views/purchase/supCertificationAdd.vue | 4 +- src/views/purchase/supCompanyAduditDialog.vue | 3 + .../purchase/supManufacturerAuditDialog.vue | 12 ++++ .../purchase/supManufacturerEditDialog.vue | 2 +- src/views/purchase/supProductAuditDialog.vue | 13 +++- src/views/purchase/supProductEditDialog.vue | 9 ++- 20 files changed, 157 insertions(+), 58 deletions(-) diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue index 1ee646a..302eaf1 100644 --- a/src/views/business/stockOrderNewDistribution.vue +++ b/src/views/business/stockOrderNewDistribution.vue @@ -1214,6 +1214,7 @@ export default { // }); // }, getBusType() { + this.formData.billType=null; let query = { code: this.formData.invWarehouseCode, enabled: true, @@ -1376,7 +1377,9 @@ export default { // this.generateBillNo(); } this.findMethod(); + if(this.formData.invWarehouseCode!=null){ this.getBusType(); + } this.getStorage(); this.findSubInvByInv(); this.findSubStorageMethod(); diff --git a/src/views/business/stockOrderNewSelectProduct.vue b/src/views/business/stockOrderNewSelectProduct.vue index 9a28e91..0104b77 100644 --- a/src/views/business/stockOrderNewSelectProduct.vue +++ b/src/views/business/stockOrderNewSelectProduct.vue @@ -76,7 +76,7 @@ show-overflow-tooltip > @@ -188,6 +188,7 @@ export default { erpName: "", keys: [], }, + ids:[], radioCheck: null, dataList: [], pageTotal: 1, @@ -243,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}) { @@ -347,6 +340,15 @@ export default { this.$message.error('未选择产品'); return; } + + if(this.ids.length>0){ + for(var i=0;i0){ + for(var i=0;i { 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 8deb7e4..4903f91 100644 --- a/src/views/purchase/purPlanDetailDialog.vue +++ b/src/views/purchase/purPlanDetailDialog.vue @@ -114,7 +114,7 @@ - + - + diff --git a/src/views/purchase/purPlanEditDialog.vue b/src/views/purchase/purPlanEditDialog.vue index e40729d..1864308 100644 --- a/src/views/purchase/purPlanEditDialog.vue +++ b/src/views/purchase/purPlanEditDialog.vue @@ -310,6 +310,18 @@ export default { return; } if (status === '2') { + 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.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..3f0c9d9 100644 --- a/src/views/purchase/purPlanSearch.vue +++ b/src/views/purchase/purPlanSearch.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/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 e58f9ca..a51ba04 100644 --- a/src/views/purchase/pureApplyDetailDialog.vue +++ b/src/views/purchase/pureApplyDetailDialog.vue @@ -194,7 +194,7 @@ - + diff --git a/src/views/purchase/pureApplySearch.vue b/src/views/purchase/pureApplySearch.vue index a4e3b7b..9a96a53 100644 --- a/src/views/purchase/pureApplySearch.vue +++ b/src/views/purchase/pureApplySearch.vue @@ -251,7 +251,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/supCertAddDialog.vue b/src/views/purchase/supCertAddDialog.vue index dfd178a..769e52b 100644 --- a/src/views/purchase/supCertAddDialog.vue +++ b/src/views/purchase/supCertAddDialog.vue @@ -32,7 +32,7 @@ - + @@ -206,7 +206,10 @@ export default { }, formRules: { name: [ - {required: true, message: "电子档名称", trigger: "blur"} + {required: true, message: "请输入证书名称", trigger: "blur"} + ], + code: [ + {required: true, message: "请输入证书编号", trigger: "blur"} ], }, loading: false, diff --git a/src/views/purchase/supCertSet.vue b/src/views/purchase/supCertSet.vue index 75b55a1..5be277c 100644 --- a/src/views/purchase/supCertSet.vue +++ b/src/views/purchase/supCertSet.vue @@ -160,10 +160,10 @@

产品资质设置

-
@@ -305,10 +305,10 @@ @@ -354,7 +354,7 @@
- 产品类型： + 器械类别：
@@ -501,7 +501,7 @@ export default { {required: true, message: "证书名称", trigger: "blur"} ], need: [ - {required: true, message: "请选择是否禁用", trigger: "blur"} + {required: true, message: "请选择产地", trigger: "blur"} ], }, @@ -537,9 +537,7 @@ export default { name: [ {required: true, message: "请输入证书名称", trigger: "blur"} ], - need: [ - {required: true, message: "请选择是否必传", trigger: "blur"} - ], + }, /**--------产品资质设置--------------*/ @@ -618,7 +616,11 @@ 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(() => { }); @@ -628,6 +630,7 @@ export default { this.getList(); this.$message.success("保存成功！"); } else { + this.getList(); this.$message.error(res.message); } }) @@ -638,6 +641,9 @@ export default { }, cancelDialog() { + this.getList(); + this.getManufacturerList(); + this.getProductList(); this.addDialogVisible = false; this.addManufacturerDialogVisible = false; this.addProductDialogVisible = false; @@ -645,6 +651,10 @@ export default { /**--------生产企业资质设置--------------*/ + handleManufacturerChange(val) { + this.manufacturerQuery.page = val; + this.getManufacturerList(); + }, getManufacturerList() { this.manufacturerLoading = true; filterCertSet(this.manufacturerQuery) @@ -690,7 +700,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(() => { }); @@ -700,6 +715,7 @@ export default { this.getManufacturerList(); this.$message.success("保存成功！"); } else { + this.getManufacturerList(); this.$message.error(res.message); } }) @@ -711,6 +727,10 @@ export default { /**--------产品资质设置--------------*/ + handleProductChange(val) { + this.productQuery.page = val; + this.getProductList(); + }, getProductList() { this.productLoading = true; filterCertSet(this.productQuery) @@ -757,7 +777,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(() => { }); @@ -767,6 +791,7 @@ export default { this.getProductList(); this.$message.success("保存成功！"); } else { + this.getProductList(); this.$message.error(res.message); } }) diff --git a/src/views/purchase/supCertSetSelectDialog.vue b/src/views/purchase/supCertSetSelectDialog.vue index 5494100..1f1252f 100644 --- a/src/views/purchase/supCertSetSelectDialog.vue +++ b/src/views/purchase/supCertSetSelectDialog.vue @@ -33,7 +33,7 @@ - + diff --git a/src/views/purchase/supCertificationAdd.vue b/src/views/purchase/supCertificationAdd.vue index 166cfac..e0ea789 100644 --- a/src/views/purchase/supCertificationAdd.vue +++ b/src/views/purchase/supCertificationAdd.vue @@ -481,13 +481,15 @@ export default { if (this.$isNotBlank(row)) { this.registrationId = row.id; this.curProductQuery = row; + this.curProductQuery.cuStatus=this.currentManufacturer.auditStatus; this.formName = "update"; this.editProductType = 1; } else { this.editProductType = 0; this.formName = "add"; this.curProductQuery = { - auditStatus: 0 + auditStatus: 0, + cuStatus:this.currentManufacturer.auditStatus }; } this.registrationVisible = true; diff --git a/src/views/purchase/supCompanyAduditDialog.vue b/src/views/purchase/supCompanyAduditDialog.vue index d3c6ac0..9e7d54e 100644 --- a/src/views/purchase/supCompanyAduditDialog.vue +++ b/src/views/purchase/supCompanyAduditDialog.vue @@ -505,6 +505,9 @@ export default { this.certLoading = true; this.certQuery.customerId = this.inputQuery.customerId; this.certQuery.type = 1; + if(this.editType==2){ + this.certQuery.auditStatus=25; + } filterCompanyCert(this.certQuery) .then((response) => { this.certLoading = false; diff --git a/src/views/purchase/supManufacturerAuditDialog.vue b/src/views/purchase/supManufacturerAuditDialog.vue index b944684..014b6e5 100644 --- a/src/views/purchase/supManufacturerAuditDialog.vue +++ b/src/views/purchase/supManufacturerAuditDialog.vue @@ -197,6 +197,11 @@ + + +