diff --git a/src/views/purchase/supCertAddDialog.vue b/src/views/purchase/supCertAddDialog.vue index 109891b..9a4a3d8 100644 --- a/src/views/purchase/supCertAddDialog.vue +++ b/src/views/purchase/supCertAddDialog.vue @@ -228,8 +228,6 @@ export default { this.$refs["dataForm"].validate(valid => { if (valid) { - - if (this.formData.auditStatus == 1) { this.$confirm("该证书已审核通过,是否重新提交审核?", "提示", { confirmButtonText: "确定", @@ -250,6 +248,7 @@ export default { }, onConfirmSubmit(val) { + this.formData.repeatUpload = val; if (this.$isNotBlank(this.formData.filePath)) { if (this.$refs.upload.uploadFiles.length > 0) { @@ -269,8 +268,12 @@ 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 031e605..c9c012d 100644 --- a/src/views/purchase/supCertAudit.vue +++ b/src/views/purchase/supCertAudit.vue @@ -86,6 +86,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; @@ -574,10 +577,15 @@ 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) { @@ -638,6 +646,8 @@ export default { .then((response) => { this.registrationLoading = false; this.registrationList = response.data.list || []; + this.certTotal= response.data.total + }) .catch(() => { this.registrationLoading = false; @@ -646,7 +656,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 9cc2a37..491031a 100644 --- a/src/views/purchase/supCertificationAdd.vue +++ b/src/views/purchase/supCertificationAdd.vue @@ -22,6 +22,7 @@ + @@ -92,6 +93,7 @@ { this.loading = false; @@ -479,6 +484,7 @@ export default { this.$message.error("请先选中生产企业!"); return } + this.registrationQuery.page=1; this.getRegistrationList(); }, registrationDialog(row) { @@ -548,6 +554,7 @@ export default { .then((response) => { this.registrationLoading = false; this.registrationList = response.data.list || []; + this.certTotal = response.data.total; }) .catch(() => { this.registrationLoading = false; @@ -560,7 +567,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 1441820..c469adf 100644 --- a/src/views/purchase/supCompanyAduditDialog.vue +++ b/src/views/purchase/supCompanyAduditDialog.vue @@ -502,18 +502,18 @@ export default { , getCompanyCertList() { - + 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 f59c682..f08ef2e 100644 --- a/src/views/purchase/supCompanyEditDialog.vue +++ b/src/views/purchase/supCompanyEditDialog.vue @@ -543,6 +543,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 7d633b4..03f07ac 100644 --- a/src/views/purchase/supManufacturerAuditDialog.vue +++ b/src/views/purchase/supManufacturerAuditDialog.vue @@ -426,7 +426,9 @@ export default { this.selectedOptions = this.inputQuery.placeAreaCode.split(","); + if(this.inputQuery.productionAreaCode!=null){ this.selectedOptions2 = this.inputQuery.productionAreaCode.split(","); + } this.getCompanyCertList(); this.findMethod(); @@ -459,6 +461,7 @@ export default { } }); }).catch(() => { + this.addCloseDialog(false); }); }, @@ -501,6 +504,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 41659cb..5a4045e 100644 --- a/src/views/purchase/supManufacturerEditDialog.vue +++ b/src/views/purchase/supManufacturerEditDialog.vue @@ -559,8 +559,10 @@ export default { this.certLoading = true; 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/supProductAuditDialog.vue b/src/views/purchase/supProductAuditDialog.vue index d93d8d2..3cc4e4f 100644 --- a/src/views/purchase/supProductAuditDialog.vue +++ b/src/views/purchase/supProductAuditDialog.vue @@ -590,6 +590,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 43733b2..683261a 100644 --- a/src/views/purchase/supProductEditDialog.vue +++ b/src/views/purchase/supProductEditDialog.vue @@ -710,6 +710,11 @@ export default { }).catch(() => { }); }, + certHandleCurrentChange(val) { + this.certQuery.page = val; + this.getCompanyCertList(); + }, + getCompanyCertList() { this.certLoading = true; this.certQuery.customerId = this.inputQuery.customerId; @@ -719,6 +724,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/userManage/customerApplyUpdateManage.vue b/src/views/userManage/customerApplyUpdateManage.vue index 7e40602..5f90c5d 100644 --- a/src/views/userManage/customerApplyUpdateManage.vue +++ b/src/views/userManage/customerApplyUpdateManage.vue @@ -235,8 +235,8 @@ center >
- 允许变更 - 拒绝变更 + 允许变更 + 拒绝变更 取消
@@ -974,6 +974,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/userManage/customerAuditedManage.vue b/src/views/userManage/customerAuditedManage.vue index 53e5919..8a2c4c6 100644 --- a/src/views/userManage/customerAuditedManage.vue +++ b/src/views/userManage/customerAuditedManage.vue @@ -1061,6 +1061,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/userManage/customerFileManage.vue b/src/views/userManage/customerFileManage.vue index f660eb8..c8747d7 100644 --- a/src/views/userManage/customerFileManage.vue +++ b/src/views/userManage/customerFileManage.vue @@ -287,8 +287,8 @@ center >
- 通过 - 不通过 + 通过 + 不通过 取消
@@ -1087,6 +1087,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/userManage/suppliersEnterpriseBasicAdd.vue b/src/views/userManage/suppliersEnterpriseBasicAdd.vue index 3572c98..be80209 100644 --- a/src/views/userManage/suppliersEnterpriseBasicAdd.vue +++ b/src/views/userManage/suppliersEnterpriseBasicAdd.vue @@ -516,6 +516,7 @@ export default { .then((response) => { this.certLoading = false; this.certList = response.data.list || []; + this.certTotal=response.data.total; }) .catch(() => { this.certLoading = false;