diff --git a/src/api/purchase/companyCert.js b/src/api/purchase/companyCert.js
index 4f4b1e5..7836470 100644
--- a/src/api/purchase/companyCert.js
+++ b/src/api/purchase/companyCert.js
@@ -3,7 +3,7 @@ import axios from "@/utils/request";
export function filterCompanyCert(query) {
return axios(
{
- url: "/sup/company/cert/filter",
+ url: "/sup/company/cert/filterList",
method: "get",
params: query
}
diff --git a/src/views/purchase/company/supCompanyAduditDialog.vue b/src/views/purchase/company/supCompanyAduditDialog.vue
index 4fa00d7..ac95790 100644
--- a/src/views/purchase/company/supCompanyAduditDialog.vue
+++ b/src/views/purchase/company/supCompanyAduditDialog.vue
@@ -145,23 +145,23 @@
-
+
-
+
- {{ supStatus[scope.row.status] }}
+ {{ supStatus[scope.row.checkStatus] }}
-
+
-
- {{ checkFlag[scope.row.auditStatus] }}
+
+ {{ checkFlag[scope.row.status] }}
-
+
-
+
-
-
-
-
+
+
+
+
-
-
+
+
@@ -431,7 +431,7 @@ export default {
1: '身份证'
},
- confirmStatus: null,
+ status: null,
selectLocalVisible: false,
productQuery: {
ylqxzcrbarmc: "",
@@ -465,8 +465,8 @@ export default {
},
supStatus: {
- 0: "有效",
- 1: "失效",
+ 1: "有效",
+ 0: "失效",
},
certAuditVisible: false,
currentAudit: {},
@@ -591,7 +591,7 @@ export default {
this.certAuditVisible = true;
this.currentAudit = row;
this.isOpen = this.currentAudit.auditStatus;
- this.confirmStatus = this.currentAudit.auditStatus;
+ this.status = this.currentAudit.auditStatus;
},
passAuditCert() {
@@ -638,7 +638,7 @@ export default {
,
getRoIds() {
- let params = {companyId: this.inputQuery.customerId}
+ let params = {companyId: this.inputQuery.id}
getRoId(params).then((res) => {
this.inputQuery.roleId = res.data.roleId;
})
@@ -647,8 +647,8 @@ export default {
this.certLoading = true;
this.certQuery.customerId = this.inputQuery.customerId;
this.certQuery.type = 1;
- this.certQuery.auditStatus = 25;
-
+ // this.certQuery.auditStatus = 25;
+ this.certQuery.businessId=this.inputQuery.id;
filterCompanyCert(this.certQuery)
.then((response) => {
this.certLoading = false;
@@ -773,16 +773,16 @@ export default {
});
},
confirm() {
- if (this.confirmStatus == null) {
+ if (this.status == null) {
this.$message.error("请选择确认状态");
return;
}
- if (this.confirmStatus == 1) {
+ if (this.status == 1) {
this.passAuditCert();
- } else if (this.confirmStatus == 2) {
+ } else if (this.status == 2) {
this.rejectAuditCert();
- } else if (this.confirmStatus == 6) {
+ } else if (this.status == 6) {
this.notAuditCert();
}
},
diff --git a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
index 1955e04..f61c6d0 100644
--- a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
@@ -191,10 +191,10 @@
{{ supStatus[scope.row.status] }}
-
+
-
- {{ checkFlag[scope.row.auditStatus] }}
+
+ {{ checkFlag[scope.row.checkStatus] }}
@@ -203,7 +203,7 @@
打印
编辑
-
+
撤回
@@ -446,6 +446,7 @@ export default {
certQuery: {
customerId: null,
manufacturerIdFk: null,
+ businessId:null,
page: 1,
limit: 20
},
@@ -503,14 +504,14 @@ export default {
methods: {
onPassSubmit(val) {
- this.inputQuery.auditStatus = 1;
+ this.inputQuery.checkStatus = 1;
this.$confirm("是否审核通过?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
this.loading = true;
- this.inputQuery.auditStatus = 1;
+ this.inputQuery.checkStatus = 1;
auditManufacturer(this.inputQuery).then(response => {
this.loading = false;
if (response.code === 20000) {
@@ -531,7 +532,7 @@ export default {
cancelButtonText: '取消',
}).then(({value}) => {
this.inputQuery.auditComment = value;
- this.inputQuery.auditStatus = 2;
+ this.inputQuery.checkStatus = 2;
auditManufacturer(this.inputQuery).then(response => {
this.loading = false;
if (response.code === 20000) {
@@ -582,11 +583,14 @@ export default {
this.getCompanyCertList();
},
getCompanyCertList() {
- if (this.editType != 2 && this.editType != 0) {
- this.certQuery.auditStatus = 20;
- }
+ // if (this.editType != 2 && this.editType != 0) {
+ // this.certQuery.checkStatus = 20;
+ // }
this.certLoading = true;
- this.certQuery.type = 2;
+ // this.certQuery.type = 2;
+ this.certQuery.businessId=this.inputQuery.businessId;
+ this.$message.error(this.certQuery.businessId);
+ console.log('This is a log message');
filterCompanyCert(this.certQuery)
.then((response) => {
this.certLoading = false;
@@ -614,8 +618,8 @@ export default {
auditCert(row) {
this.certAuditVisible = true;
this.currentAudit = row;
- this.isOpen = this.currentAudit.auditStatus;
- this.confirmStatus = this.currentAudit.auditStatus;
+ this.isOpen = this.currentAudit.checkStatus;
+ this.confirmStatus = this.currentAudit.checkStatus;
},
revoke(inputQuery) {
this.$confirm("是否确定撤回证书状态至未确认?", "提示", {
@@ -624,7 +628,7 @@ export default {
type: "warning",
}).then(() => {
this.certLoading = true;
- inputQuery.auditStatus = 6
+ inputQuery.checkStatus = 6
revokeSupCert(inputQuery)
.then((response) => {
this.certLoading = false;
@@ -643,11 +647,11 @@ export default {
},
passAuditCert() {
- this.currentAudit.auditStatus = 1;
+ this.currentAudit.checkStatus = 1;
this.auditSupCert(this.currentAudit);
},
rejectAuditCert() {
- this.currentAudit.auditStatus = 2;
+ this.currentAudit.checkStatus = 2;
this.auditSupCert(this.currentAudit);
},
confirm() {