From 8c1af93579d623ca3466cf4e43da088550050b10 Mon Sep 17 00:00:00 2001
From: zhengmingliang <hongtianzai@126.com>
Date: Wed, 16 Nov 2022 10:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=81=E4=B9=A6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=AE=A1=E6=A0=B8=E6=8F=90=E4=BA=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/supCertificationAdd.vue        |  4 +++-
 src/views/purchase/supManufacturerAuditDialog.vue |  9 +++++++++
 src/views/purchase/supProductAuditDialog.vue      | 10 +++++++++-
 src/views/purchase/supProductEditDialog.vue       |  8 ++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/views/purchase/supCertificationAdd.vue b/src/views/purchase/supCertificationAdd.vue
index 16aa531..3f43a4a 100644
--- a/src/views/purchase/supCertificationAdd.vue
+++ b/src/views/purchase/supCertificationAdd.vue
@@ -484,13 +484,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/supManufacturerAuditDialog.vue b/src/views/purchase/supManufacturerAuditDialog.vue
index 9b9db92..0950aff 100644
--- a/src/views/purchase/supManufacturerAuditDialog.vue
+++ b/src/views/purchase/supManufacturerAuditDialog.vue
@@ -196,6 +196,11 @@
                     <el-table-column label="有效期" prop="vailDate"></el-table-column>
                     <el-table-column label="失效期" prop="expireDate"></el-table-column>
                     <el-table-column label="备注" prop="remark"></el-table-column>
+                    <el-table-column label="证书状态" prop="status">
+                    <template slot-scope="scope">
+                                {{ supStatus[scope.row.status] }}
+                        </template>
+                    </el-table-column>
                     <el-table-column label="审核状态" prop="auditStatus" width="120">
                         <template slot-scope="scope">
                             <el-tag :type="(scope.row.auditStatus) | statusFilterType">
@@ -403,6 +408,10 @@ export default {
                 3: "变更未审核",
                 6: "未审核",
             },
+            supStatus: {
+                0: "有效",
+                1: "失效",
+            },
             certAuditVisible: false,
             currentAudit: {},
         };
diff --git a/src/views/purchase/supProductAuditDialog.vue b/src/views/purchase/supProductAuditDialog.vue
index b9814e7..86663d0 100644
--- a/src/views/purchase/supProductAuditDialog.vue
+++ b/src/views/purchase/supProductAuditDialog.vue
@@ -211,6 +211,11 @@
         <el-table-column label="有效期" prop="vailDate"></el-table-column>
         <el-table-column label="失效期" prop="expireDate"></el-table-column>
         <el-table-column label="备注" prop="remark"></el-table-column>
+        <el-table-column label="证书状态" prop="status">
+                    <template slot-scope="scope">
+                                {{ supStatus[scope.row.status] }}
+                        </template>
+                    </el-table-column>
         <el-table-column label="审核状态" prop="auditStatus" width="120">
           <template slot-scope="scope">
             <el-tag :type="(scope.row.auditStatus) | statusFilterType">
@@ -423,7 +428,10 @@ export default {
           3: "变更未审核",
           6: "未审核",
       },
-
+      supStatus: {
+                0: "有效",
+                1: "失效",
+            },
       certAuditVisible: false,
       currentAudit: {},
     };
diff --git a/src/views/purchase/supProductEditDialog.vue b/src/views/purchase/supProductEditDialog.vue
index 11362bf..43733b2 100644
--- a/src/views/purchase/supProductEditDialog.vue
+++ b/src/views/purchase/supProductEditDialog.vue
@@ -424,6 +424,7 @@ export default {
             },
             loading: false,
             classesDisplay: false,
+            cuStatus:0,
             selectedOptions: [],
             selectedOptions2: [],
             options: regionDataPlus,
@@ -543,6 +544,7 @@ export default {
             this.pmQuery.customerId = this.inputQuery.customerId;
 
         }
+        this.cuStatus=this.inputQuery.cuStatus;
         this.manufacturerId = this.inputQuery.manufacturerIdFk
         this.productId = this.inputQuery.productId
         this.findMethod();
@@ -555,6 +557,12 @@ export default {
     },
     methods: {
         onModifySubmit(val) {
+            if(val!=0){
+                if(this.cuStatus!=1){
+                this.$message.error("生产企业未通过审核不能提交！");
+                return;
+            }
+            }
 
             this.$refs['inputQuery'].validate(valid => {
                 if (valid) {