diff --git a/src/views/purchase/supCertAddDialog.vue b/src/views/purchase/supCertAddDialog.vue index 769e52b..e85f22d 100644 --- a/src/views/purchase/supCertAddDialog.vue +++ b/src/views/purchase/supCertAddDialog.vue @@ -271,6 +271,9 @@ export default { onSubmit() { this.loading = true; this.formData.customerId = this.inputQuery.customerId; + if(this.formData.customerId==null){ + this.formData.customerId=store.getters.customerId + } this.formData.type = this.addType; //证书类型:1:供应商;2.生产企业;3.产品品种 if (this.addType == 2) { diff --git a/src/views/purchase/supCertAudit.vue b/src/views/purchase/supCertAudit.vue index 971f427..cfbf5f3 100644 --- a/src/views/purchase/supCertAudit.vue +++ b/src/views/purchase/supCertAudit.vue @@ -87,6 +87,7 @@ { this.manufacturerLoading = false; this.manufacturerList = response.data.list || []; - this.total = response.data.total || 0; + this.manufacturerTotal = response.data.total || 0; }) .catch(() => { this.manufacturerLoading = false; @@ -575,10 +578,14 @@ export default { this.addInfoVisible = true; }, closeManufacturerDialog(type) { + if(type==true){ this.addInfoVisible = false; this.enterpriseId = null; this.manufacturerList = []; this.getManufacturerList(); + }else{ + this.getManufacturerList(); + } }, handleManuChange(val) { @@ -639,6 +646,7 @@ export default { .then((response) => { this.registrationLoading = false; this.registrationList = response.data.list || []; + this.certTotal= response.data.total }) .catch(() => { this.registrationLoading = false; @@ -647,7 +655,7 @@ export default { }, certHandleCurrentChange(val) { this.registrationQuery.page = val; - this.registrationList(); + this.getRegistrationList(); } }, diff --git a/src/views/purchase/supCertificationAdd.vue b/src/views/purchase/supCertificationAdd.vue index e0ea789..fe5af6c 100644 --- a/src/views/purchase/supCertificationAdd.vue +++ b/src/views/purchase/supCertificationAdd.vue @@ -22,6 +22,7 @@ + @@ -93,6 +94,7 @@ { this.registrationLoading = false; this.registrationList = response.data.list || []; + this.certTotal = response.data.total; }) .catch(() => { this.registrationLoading = false; @@ -550,7 +556,7 @@ export default { }, certHandleCurrentChange(val) { this.registrationQuery.page = val; - this.registrationList(); + this.getRegistrationList(); } }, diff --git a/src/views/purchase/supCompanyAduditDialog.vue b/src/views/purchase/supCompanyAduditDialog.vue index 9e7d54e..f276f19 100644 --- a/src/views/purchase/supCompanyAduditDialog.vue +++ b/src/views/purchase/supCompanyAduditDialog.vue @@ -505,13 +505,13 @@ export default { this.certLoading = true; this.certQuery.customerId = this.inputQuery.customerId; this.certQuery.type = 1; - if(this.editType==2){ - this.certQuery.auditStatus=25; - } + this.certQuery.auditStatus=25; + filterCompanyCert(this.certQuery) .then((response) => { this.certLoading = false; this.certList = response.data.list || []; + this.certTotal=response.data.total }) .catch(() => { this.certLoading = false; diff --git a/src/views/purchase/supCompanyEditDialog.vue b/src/views/purchase/supCompanyEditDialog.vue index 6700eee..a957836 100644 --- a/src/views/purchase/supCompanyEditDialog.vue +++ b/src/views/purchase/supCompanyEditDialog.vue @@ -610,6 +610,7 @@ export default { .then((response) => { this.certLoading = false; this.certList = response.data.list || []; + this.certTotal=response.data.total; }) .catch(() => { this.certLoading = false; diff --git a/src/views/purchase/supManufacturerAuditDialog.vue b/src/views/purchase/supManufacturerAuditDialog.vue index 014b6e5..d48542a 100644 --- a/src/views/purchase/supManufacturerAuditDialog.vue +++ b/src/views/purchase/supManufacturerAuditDialog.vue @@ -427,7 +427,9 @@ export default { this.selectedOptions = this.inputQuery.placeAreaCode.split(","); + if(this.inputQuery.productionAreaCode!=null){ this.selectedOptions2 = this.inputQuery.productionAreaCode.split(","); + } this.getCompanyCertList(); this.findMethod(); @@ -460,6 +462,7 @@ export default { } }); }).catch(() => { + this.addCloseDialog(false); }); }, @@ -502,6 +505,7 @@ export default { .then((response) => { this.certLoading = false; this.certList = response.data.list || []; + this.certTotal=response.data.total; }) .catch(() => { this.certLoading = false; diff --git a/src/views/purchase/supManufacturerEditDialog.vue b/src/views/purchase/supManufacturerEditDialog.vue index 8785c28..eb3e968 100644 --- a/src/views/purchase/supManufacturerEditDialog.vue +++ b/src/views/purchase/supManufacturerEditDialog.vue @@ -561,6 +561,7 @@ export default { .then((response) => { this.certLoading = false; this.certList = response.data.list || []; + this.certTotal=response.data.total }) .catch(() => { this.certLoading = false; diff --git a/src/views/purchase/supProductAuditDialog.vue b/src/views/purchase/supProductAuditDialog.vue index 99be0fe..b7e49f2 100644 --- a/src/views/purchase/supProductAuditDialog.vue +++ b/src/views/purchase/supProductAuditDialog.vue @@ -589,6 +589,7 @@ export default { .then((response) => { this.certLoading = false; this.certList = response.data.list || []; + this.certTotal=response.data.total; }) .catch(() => { this.certLoading = false; diff --git a/src/views/purchase/supProductEditDialog.vue b/src/views/purchase/supProductEditDialog.vue index e88a5ea..31fac08 100644 --- a/src/views/purchase/supProductEditDialog.vue +++ b/src/views/purchase/supProductEditDialog.vue @@ -710,6 +710,10 @@ export default { }).catch(() => { }); }, + certHandleCurrentChange(val) { + this.certQuery.page = val; + this.getCompanyCertList(); + }, getCompanyCertList() { this.certLoading = true; this.certQuery.customerId = this.inputQuery.customerId; @@ -719,6 +723,7 @@ export default { .then((response) => { this.certLoading = false; this.certList = response.data.list || []; + this.certTotal=response.data.total }) .catch(() => { this.certLoading = false;