diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue
index 73d169b..fd23575 100644
--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@@ -137,22 +137,8 @@
- 审核
-
-
-
- 详情
-
+ 审核
+ 详情
diff --git a/src/views/purchase/company/supCompanyAduditDialog.vue b/src/views/purchase/company/supCompanyAduditDialog.vue
index 756185f..68f75b2 100644
--- a/src/views/purchase/company/supCompanyAduditDialog.vue
+++ b/src/views/purchase/company/supCompanyAduditDialog.vue
@@ -9,33 +9,11 @@
- 审核通过
-
- 审核拒绝
-
- 打印
-
+ 审核通过
+ 审核拒绝
+ 打印
+
@@ -159,10 +137,7 @@
-
-
-
+
@@ -185,36 +160,8 @@
-
-
-
-
-
-
-
- 打印
-
- 编辑
-
-
-
-
-
-
-
-
+ 打印
+ 编辑
@@ -230,27 +177,17 @@
-
+
-
-
- 证书名称：
-
-
-
-
+
+
-
-
- 证书编号：
-
-
-
-
+
+
@@ -259,13 +196,8 @@
-
-
- 有效期：
-
-
-
-
+
+
-
-
- 失效期：
-
-
-
-
+
+
-
-
- 证书状态：
-
-
-
-
-
+
+
+
-
-
- 确认状态：
-
-
-
-
-
+
+
+
-
+
-
-
- 证书文件：
-
-
-
- 证书预览
-
+
+
+ 证书预览
+
+
-
-
- 结果说明：
-
-
-
-
+
+
+
+
@@ -514,6 +419,7 @@ export default {
productLoading: false,
uuid: null,
companyApplyUpdateVisible: false,
+ isOpen:false,
companyEditDisabled: true,
companyEditButtonStr: "编辑",
checkFlag: {
@@ -634,6 +540,7 @@ export default {
auditCert(row) {
this.certAuditVisible = true;
this.currentAudit = row;
+ this.isOpen=this.currentAudit.auditStatus;
this.confirmStatus = this.currentAudit.auditStatus;
},
@@ -821,8 +728,6 @@ export default {
this.passAuditCert();
} else if (this.confirmStatus == 2) {
this.rejectAuditCert();
- } else if (this.confirmStatus == 6) {
- this.cancel();
}
},
cancel() {
diff --git a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
index bfc2a55..1f94a17 100644
--- a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
@@ -10,31 +10,9 @@
- 审核通过
-
- 审核拒绝
-
- 打印
+ 审核通过
+ 审核拒绝
+ 打印
@@ -199,7 +177,6 @@
-
@@ -211,7 +188,7 @@
{{ supStatus[scope.row.status] }}
-
+
{{ checkFlag[scope.row.auditStatus] }}
@@ -220,37 +197,8 @@
-
- 预览
-
- 审核
-
- 打印
-
- 说明
-
+ 打印
+ 编辑
@@ -264,17 +212,96 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 证书预览
-
+
+
+
+
+
+
+
+
+
+
+
@@ -408,19 +435,21 @@ export default {
certList: [],
certTotal: 0,
certLoading: false,
+ isOpen:false,
addCertVisible: false,
fromOptions: [],
+ confirmStatus: null,
idQuery: {
id: "",
},
addType: "2", //证书类型：1:供应商；2.生产企业；3.产品品种
checkFlag: {
- 0: "草稿",
- 1: "已通过",
- 2: "已拒绝",
- 3: "变更未审核",
- 6: "未审核",
+ 0: "草稿",
+ 1: "已确认",
+ 2: "已拒绝",
+ 3: "变更未确认",
+ 6: "未确认",
},
supStatus: {
0: "有效",
@@ -541,6 +570,8 @@ export default {
auditCert(row) {
this.certAuditVisible = true;
this.currentAudit = row;
+ this.isOpen=this.currentAudit.auditStatus;
+ this.confirmStatus = this.currentAudit.auditStatus;
},
passAuditCert() {
@@ -551,8 +582,20 @@ export default {
this.currentAudit.auditStatus = 2;
this.auditSupCert(this.currentAudit);
},
-
-
+ confirm() {
+ if (this.confirmStatus == null) {
+ this.$message.error("请选择确认状态");
+ return;
+ }
+ if (this.confirmStatus == 1) {
+ this.passAuditCert();
+ } else if (this.confirmStatus == 2) {
+ this.rejectAuditCert();
+ }
+ },
+ cancel() {
+ this.certAuditVisible = false;
+ },
auditSupCert(inputQuery) {
auditSupCert(inputQuery).then(response => {
this.loading = false;
diff --git a/src/views/purchase/product/supProductAuditDialog.vue b/src/views/purchase/product/supProductAuditDialog.vue
index 5d36e49..95de5f0 100644
--- a/src/views/purchase/product/supProductAuditDialog.vue
+++ b/src/views/purchase/product/supProductAuditDialog.vue
@@ -213,7 +213,6 @@
-
@@ -225,7 +224,7 @@
{{ supStatus[scope.row.status] }}
-
+
{{ checkFlag[scope.row.auditStatus] }}
@@ -235,45 +234,8 @@
-
- 预览
-
- 打印
-
- 审核
-
- 说明
-
-
-
-
-
-
-
-
-
+ 打印
+ 编辑
@@ -286,18 +248,97 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 证书预览
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -444,16 +485,18 @@ export default {
certFileUrl: "",
addType: "3", //证书类型：1:供应商；2.生产企业；3.产品品种
checkFlag: {
- 0: "草稿",
- 1: "已通过",
- 2: "已拒绝",
- 3: "变更未审核",
- 6: "未审核",
+ 0: "草稿",
+ 1: "已确认",
+ 2: "已拒绝",
+ 3: "变更未确认",
+ 6: "未确认",
},
supStatus: {
0: "有效",
1: "失效",
},
+ confirmStatus: null,
+ isOpen:false,
certAuditVisible: false,
currentAudit: {},
};
@@ -520,9 +563,21 @@ export default {
}).catch(() => {
});
- }
- ,
-
+ },
+ confirm() {
+ if (this.confirmStatus == null) {
+ this.$message.error("请选择确认状态");
+ return;
+ }
+ if (this.confirmStatus == 1) {
+ this.passAuditCert();
+ } else if (this.confirmStatus == 2) {
+ this.rejectAuditCert();
+ }
+ },
+ cancel() {
+ this.certAuditVisible = false;
+ },
findMethod(query) {
this.fromOptions = [];
@@ -625,6 +680,8 @@ export default {
auditCert(row) {
this.certAuditVisible = true;
this.currentAudit = row;
+ this.isOpen=this.currentAudit.auditStatus;
+ this.confirmStatus = this.currentAudit.auditStatus;
},
passAuditCert() {