From 587e009dc282d4fab4a38ab2afd98e62d0ac2e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 28 Mar 2023 15:12:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E8=AF=81=E4=B9=A6=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/purchase/companyCert.js               |    9 +
 src/views/purchase/cert/supCertAddDialog.vue  |   17 +-
 src/views/purchase/cert/supCertAudit.vue      | 1321 ++++++-------
 src/views/purchase/company/supCompanyAdd.vue  |    4 +-
 .../company/supCompanyAduditDialog.vue        | 1429 +++++++-------
 .../purchase/company/supCompanyEditDialog.vue |   45 +-
 .../supManufacturerAuditDialog.vue            | 1636 +++++++++--------
 .../supManufacturerEditDialog.vue             |    2 +-
 .../product/supProductAuditDialog.vue         | 1582 ++++++++--------
 .../purchase/product/supProductEditDialog.vue |   99 +-
 src/views/remind/supCertRemindMsg.vue         |    2 +-
 11 files changed, 3321 insertions(+), 2825 deletions(-)

diff --git a/src/api/purchase/companyCert.js b/src/api/purchase/companyCert.js
index 52e74a39..4f4b1e5c 100644
--- a/src/api/purchase/companyCert.js
+++ b/src/api/purchase/companyCert.js
@@ -53,6 +53,15 @@ export function deleteCompanyCert(query) {
 }
 
 
+export function revokeSupCert(query) {
+  return axios(
+    {
+      url: "/sale/sup/cert/revoke",
+      method: "post",
+      data: query
+    }
+  );
+}
 
 
 
diff --git a/src/views/purchase/cert/supCertAddDialog.vue b/src/views/purchase/cert/supCertAddDialog.vue
index 197ec766..e7eb4503 100644
--- a/src/views/purchase/cert/supCertAddDialog.vue
+++ b/src/views/purchase/cert/supCertAddDialog.vue
@@ -32,7 +32,7 @@
                 <el-row>
                     <el-col :span="3">
                         <div class="ao-text">
-                            <span>有效期：</span>
+                            <span>生效期：</span>
                         </div>
                     </el-col>
                     <el-col :span="8">
@@ -70,21 +70,6 @@
                     </el-col>
                 </el-row>
                 <el-row>
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>状态：</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item prop="need">
-                            <el-select v-model="formData.status" style="width: 100%">
-                                <el-option label="失效" :value=1></el-option>
-                                <el-option label="有效" :value=0></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-
-
                     <el-col :span="3">
                         <div class="ao-text">
                             <span>备注：</span>
diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue
index e4c778cf..f9548602 100644
--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@@ -1,288 +1,335 @@
 <template>
-    <div>
-
-        <!--        配送企业资质       -->
-        <el-card>
-            <el-form  :model="filterQuery" class="query-form" size="mini" label-width="120px" v-show="showSearch">
-              <el-row>
-                <el-col :span="6">
-                    <el-form-item label="配送企业名称:">
-                        <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入配送企业名称"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="统一社会信用号:">
-                        <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入统一社会信用号"></el-input>
-                    </el-form-item>
-                </el-col>
-                </el-row>
-            </el-form>
-
-          <div class="top-right-btn">
-            <el-button-group style="display:flex;">
-              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-              <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
-            </el-button-group>
-          </div>
-
-          <el-divider style="margin: 15px"></el-divider>
-
-            <el-table v-loading="loading" :data="list" style="width: 100%"  border highlight-current-row @row-click="supCompanyClick">
-                <el-table-column type="index" label="序号" width="50"></el-table-column>
-                <el-table-column label="配送企业名称" prop="companyName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="统一社会信用号" prop="creditNum"></el-table-column>
-                <el-table-column label="所属地区" prop="area"></el-table-column>
-                <el-table-column label="详细地址" prop="detailAddr" :show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="审核状态" prop="auditStatus" width="120">
-                    <template slot-scope="scope">
-                        <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-                            {{ checkFlag[scope.row.auditStatus] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-
-                <el-table-column label="操作"  width="120">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"
-                            @click.native.stop="editCompany(scope.row)"
-                        >审核
-                        </el-button>
-
-                        <el-button
-                            type="text"
-                            v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"
-                            @click.native.stop="editCompany(scope.row)"
-                        >详情
-                        </el-button>
-
-                    </template>
-                </el-table-column>
-            </el-table>
-
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="filterQuery.page"
-            :limit.sync="filterQuery.limit"
-            @pagination="handleCurrentChange"
-          ></pagination>
-        </el-card>
-
-        <el-dialog
-            :title="formMap[formName]"
-            :visible.sync="supCompanyVisible"
-            width="80%"
-            v-if="supCompanyVisible"
-            @close='closeDialog'
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-        >
-            <supCompanyEditAdudit
-                :closeDialog="closeDialog"
-                :inputQuery="inputQuery"
-                :editType="editType"
-            ></supCompanyEditAdudit>
-        </el-dialog>
-
-
-        <!--        生产企业资质       -->
-        <el-card class="el-card">
-            <el-form :model="filterManufacturerQuery" class="query-form"  label-width="120px" v-show="showSearch2">
-              <el-row>
-                <el-col :span="6">
-                    <el-form-item label="生产企业名称">
-                        <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%" placeholder="请输入生产企业名称"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="统一社会信用号">
-                        <el-input v-model="filterManufacturerQuery.creditCode" style="width: 90%" placeholder="请输入统一社会信用号"></el-input>
-                    </el-form-item>
-                </el-col>
-                </el-row>
-            </el-form>
-
-          <div class="top-right-btn">
-            <el-button-group style="display:flex;">
-              <el-button icon="el-icon-view" type="primary" @click="hideSearch2">显示/隐藏搜索栏</el-button>
-              <el-button type="primary" icon="el-icon-refresh" @click="onManufacturerReset">重置</el-button>
-              <el-button type="primary" icon="el-icon-search" @click="onManufacturerSubmit">查询</el-button>
-            </el-button-group>
-          </div>
-
-          <el-divider style="margin: 15px"></el-divider>
-            <el-table v-loading="loadManufacturerLoading" :data="manufacturerList" style="width: 100%"  ref="table" highlight-current-row border @row-click="supManufacturerClick">
-                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="生产企业名称" prop="companyName" width="200" show-overflow-tooltip></el-table-column>
-                <el-table-column label="社会信用号" prop="creditCode"></el-table-column>
-                <el-table-column label="企业类型" prop="bussinessStatus" width="120">
-                    <template slot-scope="scope">
-                        <span>{{ companyTypeMap[scope.row.companyType] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="所在地区" prop="placeArea"></el-table-column>
-                <el-table-column label="所在地址" prop="placeAddress" :show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="所属供应商" prop="supName" :show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="审核状态" prop="auditStatus" width="120">
-                    <template slot-scope="scope">
-                        <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-                            {{ checkFlag[scope.row.auditStatus] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-
-                <el-table-column label="操作"  width="120">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"
-                            @click.native.stop="addInfoDialog(scope.row)"
-                        >审核
-                        </el-button>
-
-
-                        <el-button
-                            type="text"
-                            size="small"
-                            v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"
-                            @click.native.stop="addInfoDialog(scope.row)"
-                        >详情
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-          <pagination
-            v-show="manufacturerTotal>0"
-            :total="manufacturerTotal"
-            :page.sync="filterManufacturerQuery.page"
-            :limit.sync="filterManufacturerQuery.limit"
-            @pagination="handleManuChange"
-
-          ></pagination>
-
-
-        </el-card>
-        <el-dialog
-            :title="formManufacturerMap[formManufacturerName]"
-            :visible.sync="addInfoVisible"
-            width="80%"
-            :before-close="headClose"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            v-if="addInfoVisible"
-            @close='closeDialog'
-        >
-            <supManufacturerAuditDialog
-                :addCloseDialog="closeManufacturerDialog"
-                :enterpriseId="enterpriseId"
-                :inputQuery="inputManufacturerQuery"
-                :editType="editManufacturerType"
-            ></supManufacturerAuditDialog>
-        </el-dialog>
-
-
-        <!--        配送产品资质       -->
-        <el-card class="el-card">
-            <el-form  :model="registrationQuery" class="query-form" label-width="120px"  v-show="showSearch3">
-              <el-row>
-                <el-col :span="6">
-                    <el-form-item label="产品名称:">
-                        <el-input v-model="registrationQuery.recordProductName" style="width: 90%;" clearable="true" placeholder="请输入产品名称"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="注册备案号:">
-                        <el-input v-model="registrationQuery.recordCode" style="width: 90%;" clearable="true" placeholder="请输入注册备案号"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                   <el-form-item label="注册备案人:">
-                     <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%;" clearable="true" placeholder="请输入注册备案人"></el-input>
-                   </el-form-item>
-                </el-col>
-                </el-row>
-            </el-form>
-
-
-          <div class="top-right-btn">
-            <el-button-group style="display:flex;">
-              <el-button icon="el-icon-view" type="primary" @click="hideSearch3">显示/隐藏搜索栏</el-button>
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset2">重置</el-button>
-              <el-button type="primary" icon="el-icon-search" @click="onSubmit2">查询</el-button>
-            </el-button-group>
-          </div>
-          <el-divider style="margin: 15px"></el-divider>
-
-            <el-table v-loading="registrationLoading" :data="registrationList" border highlight-current-row style="width: 100%">
-                <el-table-column type="index" label="序号" width="50"></el-table-column>
-                <el-table-column label="产品名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
-                <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="审核状态" prop="auditStatus" width="120">
-                    <template slot-scope="scope">
-                        <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-                            {{ checkFlag[scope.row.auditStatus] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-
-
-                <el-table-column label="操作" width="120">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"
-                            @click.native.stop="registrationDialog(scope.row)"
-                        >审核
-                        </el-button>
-
-
-                        <el-button
-                            type="text"
-                            size="small"
-                            v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"
-                            @click.native.stop="registrationDialog(scope.row)"
-                        >详情
-                        </el-button>
-
-                    </template>
-                </el-table-column>
-            </el-table>
-
-          <pagination
-            v-show="certTotal>0"
-            :total="certTotal"
-            :page.sync="registrationQuery.page"
-            :limit.sync="registrationQuery.limit"
-            @pagination="certHandleCurrentChange"
-
-          ></pagination>
-        </el-card>
-        <el-dialog
-            :title="formProductMap[formProductName]"
-            :visible.sync="registrationVisible"
-            width="80%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            v-if="registrationVisible"
-            @close='closeProductDialog'
-        >
-            <suppliersRegistrationBasic
-                :closeRegistrationDialog="closeProductDialog"
-                :inputQuery="inputProudtQuery"
-                :editType="editProductType"
-            ></suppliersRegistrationBasic>
-        </el-dialog>
-
-    </div>
+  <div>
+
+    <!--        配送企业资质       -->
+    <el-card>
+      <el-form :model="filterQuery" class="query-form" size="mini" label-width="120px" v-show="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="配送企业名称:">
+              <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入配送企业名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="统一社会信用号:">
+              <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入统一社会信用号"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
+                @row-click="supCompanyClick">
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="配送企业名称" prop="companyName" width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column label="统一社会信用号" prop="creditNum" width="160"></el-table-column>
+        <el-table-column label="所属地区" prop="area" width="180"></el-table-column>
+        <el-table-column label="详细地址" prop="detailAddr" :show-overflow-tooltip="true" width="180"></el-table-column>
+        <el-table-column label="生产企业证书" prop="auditStatus" width="120">
+          <template slot-scope="scope">
+
+            <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
+              未添加证书
+            </el-tag>
+            <el-tag type="warning" v-if="scope.row.failCout>0">
+              未全部审核
+            </el-tag>
+            <el-tag type="success" v-if="scope.row.failCout==0 && scope.row.passCout>0">
+              已全部审核
+            </el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="配送产品证书" prop="auditStatus" width="120">
+          <template slot-scope="scope">
+            <el-tag type="danger" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout==0">
+              未添加证书
+            </el-tag>
+            <el-tag type="warning" v-if="scope.row.productFailCout>0">
+              未全部审核
+            </el-tag>
+            <el-tag type="success" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout>0">
+              已全部审核
+            </el-tag>
+
+
+          </template>
+        </el-table-column>
+
+        <el-table-column label="审核状态" prop="auditStatus" width="120">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
+              {{ checkFlag[scope.row.auditStatus] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" width="120">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"
+              @click.native.stop="editCompany(scope.row)"
+            >审核
+            </el-button>
+
+            <el-button
+              type="text"
+              v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"
+              @click.native.stop="editCompany(scope.row)"
+            >详情
+            </el-button>
+
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="handleCurrentChange"
+      ></pagination>
+    </el-card>
+
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="supCompanyVisible"
+      :before-close="close"
+      width="80%"
+      v-if="supCompanyVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <supCompanyEditAdudit
+        :closeDialog="closeDialog"
+        :inputQuery="inputQuery"
+        :editType="editType"
+      ></supCompanyEditAdudit>
+    </el-dialog>
+
+
+    <!--        生产企业资质       -->
+    <el-card class="el-card">
+      <el-form :model="filterManufacturerQuery" class="query-form" label-width="120px" v-show="showSearch2">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="生产企业名称">
+              <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%"
+                        placeholder="请输入生产企业名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="统一社会信用号">
+              <el-input v-model="filterManufacturerQuery.creditCode" style="width: 90%"
+                        placeholder="请输入统一社会信用号"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch2">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onManufacturerReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onManufacturerSubmit">查询</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loadManufacturerLoading" :data="manufacturerList" style="width: 100%" ref="table"
+                highlight-current-row border @row-click="supManufacturerClick">
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="生产企业名称" prop="companyName" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column label="社会信用号" prop="creditCode"></el-table-column>
+        <el-table-column label="企业类型" prop="bussinessStatus" width="120">
+          <template slot-scope="scope">
+            <span>{{ companyTypeMap[scope.row.companyType] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="所在地区" prop="placeArea"></el-table-column>
+        <el-table-column label="所在地址" prop="placeAddress" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="所属供应商" prop="supName" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="配送产品证书" prop="auditStatus" width="120">
+          <template slot-scope="scope">
+
+            <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
+              未添加证书
+            </el-tag>
+            <el-tag type="warning" v-if="scope.row.failCout>0">
+              未全部审核
+            </el-tag>
+            <el-tag type="success" v-if="scope.row.failCout==0 && scope.row.passCout>0">
+              已全部审核
+            </el-tag>
+
+          </template>
+        </el-table-column>
+        <el-table-column label="审核状态" prop="auditStatus" width="120">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
+              {{ checkFlag[scope.row.auditStatus] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" width="120">
+          <template slot-scope="scope">
+            <el-button type="text" size="small"
+                       v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"
+                       @click.native.stop="addInfoDialog(scope.row)">审核
+            </el-button>
+            <el-button type="text" size="small"
+                       v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"
+                       @click.native.stop="addInfoDialog(scope.row)">详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="manufacturerTotal>0"
+        :total="manufacturerTotal"
+        :page.sync="filterManufacturerQuery.page"
+        :limit.sync="filterManufacturerQuery.limit"
+        @pagination="handleManuChange"
+
+      ></pagination>
+
+
+    </el-card>
+    <el-dialog
+      :title="formManufacturerMap[formManufacturerName]"
+      :visible.sync="addInfoVisible"
+      width="80%"
+      :before-close="headClose"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="addInfoVisible"
+      @close='closeDialog'
+    >
+      <supManufacturerAuditDialog
+        :addCloseDialog="closeManufacturerDialog"
+        :enterpriseId="enterpriseId"
+        :inputQuery="inputManufacturerQuery"
+        :editType="editManufacturerType"
+      ></supManufacturerAuditDialog>
+    </el-dialog>
+
+
+    <!--        配送产品资质       -->
+    <el-card class="el-card">
+      <el-form :model="registrationQuery" class="query-form" label-width="120px" v-show="showSearch3">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="产品名称:">
+              <el-input v-model="registrationQuery.recordProductName" style="width: 90%;" clearable="true"
+                        placeholder="请输入产品名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="注册备案号:">
+              <el-input v-model="registrationQuery.recordCode" style="width: 90%;" clearable="true"
+                        placeholder="请输入注册备案号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="注册备案人:">
+              <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%;" clearable="true"
+                        placeholder="请输入注册备案人"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch3">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset2">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit2">查询</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+
+      <el-table v-loading="registrationLoading" :data="registrationList" border highlight-current-row
+                style="width: 100%">
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="产品名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="审核状态" prop="auditStatus" width="120">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
+              {{ checkFlag[scope.row.auditStatus] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+
+
+        <el-table-column label="操作" width="120">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"
+              @click.native.stop="registrationDialog(scope.row)"
+            >审核
+            </el-button>
+
+
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"
+              @click.native.stop="registrationDialog(scope.row)"
+            >详情
+            </el-button>
+
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="certTotal>0"
+        :total="certTotal"
+        :page.sync="registrationQuery.page"
+        :limit.sync="registrationQuery.limit"
+        @pagination="certHandleCurrentChange"
+
+      ></pagination>
+    </el-card>
+    <el-dialog
+      :title="formProductMap[formProductName]"
+      :visible.sync="registrationVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="registrationVisible"
+      @close='closeProductDialog'
+    >
+      <suppliersRegistrationBasic
+        :closeRegistrationDialog="closeProductDialog"
+        :inputQuery="inputProudtQuery"
+        :editType="editProductType"
+      ></suppliersRegistrationBasic>
+    </el-dialog>
+
+  </div>
 </template>
 
 <script>
@@ -294,359 +341,377 @@ import suppliersRegistrationBasic from "@/views/purchase/product/supProductAudit
 import {deleteRegistration, getRegistrationList} from "@/api/purchase/suppliersRegistrationBasic";
 
 export default {
-    data() {
-        return {
-            /**-----------------配送企业资质----------------------------*/
-            showSearch: true,
-            filterQuery: {
-                companyName: "",
-                checkType: "",
-                creditNum: "",
-                auditStatus: "21",
-                page: 1,
-                limit: 20,
-            },
-            loading: false,
-            list: [],
-            total: 0,
-            formName: 1,
-            formMap: {
-                1: "配送企业资质详情",
-                2: "配送企业资质审核",
-            },
-            checkFlag: {
-                0: "草稿",
-                1: "已通过",
-                2: "已拒绝",
-                3: "变更未审核",
-                6: "未审核",
-            },
-            supCompanyVisible: false,
-            inputQuery: {},
-            editType: 0,            //0:新增，1：编辑
-
-            /**-----------------生产企业资质----------------------------*/
-            showSearch2: true,
-            filterManufacturerQuery: {
-                customerId: null,
-                companyName: "",
-                creditCode: "",
-                placeArea: "",
-                auditStatus: "21",
-                page: 1,
-                limit: 10,
-            },
-            manufacturerTotal: 0,
-            companyTypeMap: {
-                1: "境内企业",
-                2: "境外企业"
-            },
-            productManageTypeMap: {
-                1: "Ⅰ类",
-                2: "Ⅱ类",
-                3: "Ⅲ类",
-            },
-            formManufacturerName: 1,
-            formManufacturerMap: {
-                1: "生产企业资质详情",
-                2: "生产企业资质审核",
-            },
-
-          manufacturerLoading: false,
-            manufacturerList: [],
-            fromOptions: [],
-            addInfoVisible: false,
-            enterpriseId: "",
-            inputManufacturerQuery: {},
-            editManufacturerType: 1,
-            loadManufacturerLoading: false,
-
-
-            /**----------------------------配送产品资质--------------------------------*/
-            showSearch3: true,
-            productLoading: false,
-            value: "",
-            registrationVisible: false,
-            registrationQuery: {
-                customerId: null,
-                manufacturerIdFk: null,
-                auditStatus: "21",
-                recordProductName: "",
-                recordCode: "",
-                recordPeopleName: "",
-                page: 1,
-                limit: 20
-            },
-            registrationList: [],
-            registrationLoading: false,
-
-            pmQuery: {
-                customerId: null,
-                companyName: null,
-                page: 1,
-                limit: 10,
-            },
-            formProductName: 1,
-            formProductMap: {
-                1: "配送产品资质详情",
-                2: "配送产品资质审核",
-            },
-
-            inputProudtQuery: {},
-            editProductType: 0,
-            certTotal: 0,
-
-        };
+  data() {
+    return {
+      /**-----------------配送企业资质----------------------------*/
+      showSearch: true,
+      filterQuery: {
+        companyName: "",
+        checkType: "",
+        creditNum: "",
+        auditStatus: "21",
+        page: 1,
+        limit: 20,
+      },
+      loading: false,
+      list: [],
+      total: 0,
+      formName: 1,
+      formMap: {
+        1: "配送企业资质详情",
+        2: "配送企业资质审核",
+      },
+      checkFlag: {
+        0: "草稿",
+        1: "已通过",
+        2: "已拒绝",
+        3: "变更未审核",
+        6: "未审核",
+      },
+      supCompanyVisible: false,
+      inputQuery: {},
+      editType: 0,            //0:新增，1：编辑
+
+      /**-----------------生产企业资质----------------------------*/
+      showSearch2: true,
+      filterManufacturerQuery: {
+        customerId: null,
+        companyName: "",
+        creditCode: "",
+        placeArea: "",
+        auditStatus: "21",
+        page: 1,
+        limit: 10,
+      },
+      manufacturerTotal: 0,
+      companyTypeMap: {
+        1: "境内企业",
+        2: "境外企业"
+      },
+      productManageTypeMap: {
+        1: "Ⅰ类",
+        2: "Ⅱ类",
+        3: "Ⅲ类",
+      },
+      formManufacturerName: 1,
+      formManufacturerMap: {
+        1: "生产企业资质详情",
+        2: "生产企业资质审核",
+      },
+
+      manufacturerLoading: false,
+      manufacturerList: [],
+      fromOptions: [],
+      addInfoVisible: false,
+      enterpriseId: "",
+      inputManufacturerQuery: {},
+      editManufacturerType: 1,
+      loadManufacturerLoading: false,
+
+
+      /**----------------------------配送产品资质--------------------------------*/
+      showSearch3: true,
+      productLoading: false,
+      value: "",
+      registrationVisible: false,
+      registrationQuery: {
+        customerId: null,
+        manufacturerIdFk: null,
+        auditStatus: "21",
+        recordProductName: "",
+        recordCode: "",
+        recordPeopleName: "",
+        page: 1,
+        limit: 20
+      },
+      registrationList: [],
+      registrationLoading: false,
+
+      pmQuery: {
+        customerId: null,
+        companyName: null,
+        page: 1,
+        limit: 10,
+      },
+      formProductName: 1,
+      formProductMap: {
+        1: "配送产品资质详情",
+        2: "配送产品资质审核",
+      },
+
+      inputProudtQuery: {},
+      editProductType: 0,
+      certTotal: 0,
+
+    };
+  },
+  filters: {
+
+
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "success",
+        2: "danger",
+        6: "warning",
+        3: "warning",
+      };
+      return statusMap[status];
     },
-    filters: {
-
-
-        statusFilterType(status) {
-            const statusMap = {
-                0: "warning",
-                1: "success",
-                2: "danger",
-                6: "warning",
-                3: "warning",
-            };
-            return statusMap[status];
-        },
-        statusFilterName(status) {
-            const statusMap = {
-                0: "禁用",
-                1: "正常",
-                2: "未验证",
-            };
-            return statusMap[status];
-        },
+    manufacturerStatusType(passCount,failCout) {
+      const statusMap = {
+        0: "warning",
+        1: "success",
+        2: "danger",
+        6: "warning",
+        3: "warning",
+      };
+      return statusMap[status];
     },
 
-    methods: {
-        /**-------------------------配送企业资质--------------------------*/
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                companyName: "",
-                creditNum: "",
-                auditStatus: "21",
-                page: 1,
-                limit: 20,
-            };
-            this.getList();
-            this.productList = [];
-            this.salesmanList = [];
-        },
-      hideSearch() {
-        this.showSearch = !this.showSearch;
-      },
-        getList() {
-            this.loading = true;
-            getSupComapnys(this.filterQuery)
-                .then((response) => {
-                    console.log(response)
-                    this.loading = false;
-                    this.list = response.data.list || [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        onSubmit() {
-            this.getList();
-        },
-        editCompany(row) {
-            if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
-                this.formName = 2;
-                this.editType = 2;
-            } else {
-                this.editType = 1;
-                this.formName = 1;
-            }
-            this.supCompanyVisible = true;
-            this.inputQuery = row;
-        },
-
-        handleCurrentChange(val) {
-            this.filterQuery.page = val.page;
+    statusFilterName(status) {
+      const statusMap = {
+        0: "禁用",
+        1: "正常",
+        2: "未验证",
+      };
+      return statusMap[status];
+    },
+  },
+
+  methods: {
+    /**-------------------------配送企业资质--------------------------*/
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        companyName: "",
+        creditNum: "",
+        auditStatus: "21",
+        page: 1,
+        limit: 20,
+      };
+      this.getList();
+      this.productList = [];
+      this.salesmanList = [];
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getList() {
+      this.loading = true;
+      this.filterQuery.manufacturerStatus=1;
+      getSupComapnys(this.filterQuery)
+        .then((response) => {
+          console.log(response)
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    onSubmit() {
+      this.getList();
+    },
+    editCompany(row) {
+      if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
+        this.formName = 2;
+        this.editType = 2;
+      } else {
+        this.editType = 1;
+        this.formName = 1;
+      }
+      this.supCompanyVisible = true;
+      this.inputQuery = row;
+    },
+
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    deleteDialog(row) {
+      this.$confirm("删除后将清空该供应商以及所有关联信息?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let tQuery = {
+            id: row.customerId,
+          };
+          delSupComapnys(tQuery).then(() => {
             this.getList();
-        },
-        deleteDialog(row) {
-            this.$confirm("删除后将清空该供应商以及所有关联信息?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    let tQuery = {
-                        id: row.customerId,
-                    };
-                    delSupComapnys(tQuery).then(() => {
-                        this.getList();
-                    });
-                })
-                .catch(() => {
-                });
-        },
-        closeDialog() {
-            this.supCompanyVisible = false;
-        },
-
-        supCompanyClick(row) {
-            this.filterManufacturerQuery.customerId = row.customerId;
-            this.onManufacturerReset();
-        },
-
-
-        /**-------------------------生产企业资质--------------------------*/
-        onManufacturerReset() {
-            let customerId = this.filterManufacturerQuery.customerId;
-            this.filterManufacturerQuery = {
-                customerId: customerId,
-                companyName: "",
-                creditCode: "",
-                placeArea: "",
-                page: 1,
-                auditStatus: "21",
-                limit: 10,
-            };
-            this.manufacturerList = [];
-            this.getManufacturerList();
-        },
-      headClose(){
+          });
+        })
+        .catch(() => {
+        });
+    },
+    closeDialog() {
+      this.supCompanyVisible = false;
+    },
+
+    supCompanyClick(row) {
+      this.filterManufacturerQuery.customerId = row.customerId;
+      this.onManufacturerReset();
+    },
+
+
+    /**-------------------------生产企业资质--------------------------*/
+    onManufacturerReset() {
+      let customerId = this.filterManufacturerQuery.customerId;
+      this.filterManufacturerQuery = {
+        customerId: customerId,
+        companyName: "",
+        creditCode: "",
+        placeArea: "",
+        page: 1,
+        auditStatus: "21",
+        limit: 10,
+      };
+      this.manufacturerList = [];
+      this.getManufacturerList();
+    },
+    close() {
+      this.getList();
+      this.supCompanyVisible = false;
+    },
+    headClose() {
+      this.addInfoVisible = false;
+      this.getManufacturerList();
+    },
+    onManufacturerSubmit() {
+      //this.onManufacturerReset();
+      this.getManufacturerList();
+      this.addInfoVisible = false;
+    },
+    hideSearch2() {
+      this.showSearch2 = !this.showSearch2;
+    },
+    getManufacturerList() {
+      this.manufacturerLoading = true;
+      this.filterManufacturerQuery.productStatus=1;
+      getCompanyList(this.filterManufacturerQuery)
+        .then((response) => {
+          this.manufacturerLoading = false;
+          this.manufacturerList = response.data.list || [];
+          this.manufacturerTotal = response.data.total || 0;
+        })
+        .catch(() => {
+          this.manufacturerLoading = false;
+          this.manufacturerList = [];
+          this.total = 0;
+        });
+    },
+    addInfoDialog(row) {
+
+      if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
+        this.editManufacturerType = 2;
+        this.formManufacturerName = 2;
+      } else {
+        this.editManufacturerType = 1;
+        this.formManufacturerName = 1;
+      }
+      this.enterpriseId = row.id;
+      this.inputManufacturerQuery = row;
+      this.addInfoVisible = true;
+    },
+    closeManufacturerDialog(type) {
+      if (type == true) {
         this.addInfoVisible = false;
+        this.enterpriseId = null;
+        this.manufacturerList = [];
         this.getManufacturerList();
-      },
-        onManufacturerSubmit() {
-            this.manufacturerList = [];
-            this.getManufacturerList();
-        },
-        hideSearch2() {
-           this.showSearch2 = !this.showSearch2;
-         },
-        getManufacturerList() {
-            this.manufacturerLoading = true;
-            getCompanyList(this.filterManufacturerQuery)
-                .then((response) => {
-                    this.manufacturerLoading = false;
-                    this.manufacturerList = response.data.list || [];
-                    this.manufacturerTotal = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.manufacturerLoading = false;
-                    this.manufacturerList = [];
-                    this.total = 0;
-                });
-        },
-        addInfoDialog(row) {
-
-            if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
-                this.editManufacturerType = 2;
-                this.formManufacturerName = 2;
-            } else {
-                this.editManufacturerType = 1;
-                this.formManufacturerName = 1;
-            }
-            this.enterpriseId = row.id;
-            this.inputManufacturerQuery = row;
-            this.addInfoVisible = true;
-        },
-        closeManufacturerDialog(type) {
-            if(type==true){
-            this.addInfoVisible = false;
-            this.enterpriseId = null;
-            this.manufacturerList = [];
-            this.getManufacturerList();
-           }else{
-            this.getManufacturerList();
-           }
-
-        },
-        handleManuChange(val) {
-            this.filterManufacturerQuery.page = val.page;
-            this.getManufacturerList();
-        },
-
-        supManufacturerClick(row) {
-            this.registrationQuery.customerId = row.customerId;
-            this.registrationQuery.manufacturerIdFk = row.manufacturerId;
-            this.onReset2();
-        },
-
-
-        /**-------------------------配送产品资质--------------------------*/
-        onReset2() {
-
-            let customerId = this.registrationQuery.customerId;
-            let manufacturerIdFk = this.registrationQuery.manufacturerIdFk;
-
-            this.registrationQuery = {
-                customerId: customerId,
-                manufacturerIdFk: manufacturerIdFk,
-                recordProductName: "",
-                recordCode: "",
-                recordPeopleName: "",
-                auditStatus: "21",
-                page: 1,
-                limit: 10
-            };
-            this.getRegistrationList();
-        },
-        onSubmit2() {
-            this.getRegistrationList();
-        },
-        hideSearch3() {
-          this.showSearch3 = !this.showSearch3;
-        },
-        registrationDialog(row) {
-            if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
-                this.formProductName = 2;
-                this.editProductType = 2;
-            } else {
-                this.editProductType = 1;
-                this.formProductName = 1;
-            }
-            this.registrationId = row.id;
-            this.inputProudtQuery = row;
-            this.registrationVisible = true;
-        },
-        closeProductDialog() {
-            this.registrationVisible = false;
-            this.enterpriseId = null;
-            this.registrationId = null;
-            this.registrationList = [];
-            this.getRegistrationList();
-        },
-        getRegistrationList() {
-            this.registrationLoading = true;
-            getRegistrationList(this.registrationQuery)
-                .then((response) => {
-                    this.registrationLoading = false;
-                    this.registrationList = response.data.list || [];
-                    this.certTotal= response.data.total
-                })
-                .catch(() => {
-                    this.registrationLoading = false;
-                    this.registrationList = [];
-                });
-        },
-        certHandleCurrentChange(val) {
-            this.registrationQuery.page = val.page;
-            this.getRegistrationList();
-        }
+      } else {
+        this.getManufacturerList();
+      }
 
     },
-    components: {
-        supCompanyEditAdudit, supManufacturerAuditDialog, suppliersRegistrationBasic
-    }
-    ,
+    handleManuChange(val) {
+      this.filterManufacturerQuery.page = val.page;
+      this.getManufacturerList();
+    },
+
+    supManufacturerClick(row) {
+      this.registrationQuery.customerId = row.customerId;
+      this.registrationQuery.manufacturerIdFk = row.manufacturerId;
+      this.onReset2();
+    },
+
 
-    created() {
-        this.getList();
+    /**-------------------------配送产品资质--------------------------*/
+    onReset2() {
+
+      let customerId = this.registrationQuery.customerId;
+      let manufacturerIdFk = this.registrationQuery.manufacturerIdFk;
+
+      this.registrationQuery = {
+        customerId: customerId,
+        manufacturerIdFk: manufacturerIdFk,
+        recordProductName: "",
+        recordCode: "",
+        recordPeopleName: "",
+        auditStatus: "21",
+        page: 1,
+        limit: 10
+      };
+      this.getRegistrationList();
+    },
+    onSubmit2() {
+      this.getRegistrationList();
     },
+    hideSearch3() {
+      this.showSearch3 = !this.showSearch3;
+    },
+    registrationDialog(row) {
+      if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
+        this.formProductName = 2;
+        this.editProductType = 2;
+      } else {
+        this.editProductType = 1;
+        this.formProductName = 1;
+      }
+      this.registrationId = row.id;
+      this.inputProudtQuery = row;
+      this.registrationVisible = true;
+    },
+    closeProductDialog() {
+      this.registrationVisible = false;
+      this.enterpriseId = null;
+      this.registrationId = null;
+      this.registrationList = [];
+      this.getRegistrationList();
+    },
+    getRegistrationList() {
+      this.registrationLoading = true;
+      getRegistrationList(this.registrationQuery)
+        .then((response) => {
+          this.registrationLoading = false;
+          this.registrationList = response.data.list || [];
+          this.certTotal = response.data.total
+        })
+        .catch(() => {
+          this.registrationLoading = false;
+          this.registrationList = [];
+        });
+    },
+    certHandleCurrentChange(val) {
+      this.registrationQuery.page = val.page;
+      this.getRegistrationList();
+    }
+
+  },
+  components: {
+    supCompanyEditAdudit, supManufacturerAuditDialog, suppliersRegistrationBasic
+  }
+  ,
+
+  created() {
+    this.getList();
+  },
 };
 </script>
diff --git a/src/views/purchase/company/supCompanyAdd.vue b/src/views/purchase/company/supCompanyAdd.vue
index 248f4348..31116e10 100644
--- a/src/views/purchase/company/supCompanyAdd.vue
+++ b/src/views/purchase/company/supCompanyAdd.vue
@@ -31,8 +31,8 @@
           <el-table v-loading="loading" :data="list" style="width: 100%"  border highlight-current-row>
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
                 <el-table-column label="企业名称" prop="companyName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="社会信用号" prop="creditNum"></el-table-column>
-                <el-table-column label="企业法人" prop="contacts"></el-table-column>
+                <el-table-column label="统一社会信用号" prop="creditNum"></el-table-column>
+                <el-table-column label="联系人" prop="contacts"></el-table-column>
                 <el-table-column label="所属地区" prop="area"></el-table-column>
                 <el-table-column label="详细地址" prop="detailAddr" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="审核状态" prop="auditStatus" width="120">
diff --git a/src/views/purchase/company/supCompanyAduditDialog.vue b/src/views/purchase/company/supCompanyAduditDialog.vue
index 3adef101..63706695 100644
--- a/src/views/purchase/company/supCompanyAduditDialog.vue
+++ b/src/views/purchase/company/supCompanyAduditDialog.vue
@@ -1,686 +1,851 @@
 <template>
-    <div>
-        <el-form
-            :model="inputQuery"
-            :rules="rules"
-            ref="inputQuery"
-            label-width="100px"
-        >
-            <el-card class="el-card" style="margin-top: -25px">
-
-                <div style="display: flex;" >
-                    <el-button
-                        v-if="editType==2"
-                        type="primary"
-                        size="mini"
-                        icon="search"
-                        @click="onPassSubmit"
-                    >审核通过
-                    </el-button
-                    >
-                    <el-button
-                        v-if="editType==2"
-                        type="primary"
-                        size="mini"
-                        icon="search"
-                        @click="onRejectSubmit"
-                    >审核拒绝
-                    </el-button
-                    >
-                    <el-button
-                        v-if="editType==1"
-                        type="primary"
-                        size="mini"
-                        icon="search"
-                        @click="printSupCertAll"
-                    >打印
-                    </el-button>
-                </div>
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 20px">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="企业名称:" label-width="150px" prop="companyName">
-                            <el-input
-                                size="small"
-                                splaceholder="请输入内容"
-                                disabled
-                                v-model="inputQuery.companyName"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="统一社会信用代码:" label-width="150px" prop="creditNum">
-                            <el-input
-                                size="small"
-                                splaceholder="请输入内容" disabled
-                                v-model="inputQuery.creditNum"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="企业类别:" label-width="150px" prop="classes">
-                            <el-select
-                                size="small"
-                                v-model="inputQuery.classes" disabled
-                                placeholder="企业类别"
-                                style="width: 100%;"
-                            >
-                                <el-option v-if="classesDisplay" label="医院" value="1"></el-option>
-                                <el-option label="经营企业" value="2"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="所属地区:" label-width="150px" prop="area">
-                            <el-cascader
-                                size="small"
-                                :options="options"
-                                v-model="selectedOptions" disabled
-                                placeholder="请选择所属地区"
-                                style="width: 100%"
-                                @change="handleChange"
-                            >
-                            </el-cascader>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="联系人:" label-width="150px" prop="contacts">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容" disabled
-                                v-model="inputQuery.contacts"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="详细地址:" label-width="150px" prop="detailAddr">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容" disabled
-                                v-model="inputQuery.detailAddr"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="联系电话:" label-width="150px" prop="mobile">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容" disabled
-                                v-model="inputQuery.mobile"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="邮箱:" label-width="150px" prop="email">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容" disabled
-                                v-model="inputQuery.email"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-card>
-            <el-card>
-
-                <div style=" float: right;
+  <div>
+    <el-form
+      :model="inputQuery"
+      :rules="rules"
+      ref="inputQuery"
+      label-width="100px"
+    >
+      <el-card class="el-card" style="margin-top: -25px">
+
+        <div style="display: flex;">
+          <el-button v-if="editType==2" type="primary" size="mini" icon="search" @click="onPassSubmit">审核通过</el-button>
+          <el-button v-if="editType==2" type="primary" size="mini" @click="onRejectSubmit">审核拒绝</el-button>
+          <el-button v-if="editType==1" type="primary" size="mini" icon="search" @click="printSupCertAll">打印</el-button>
+        </div>
+
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 20px">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="企业名称:" label-width="150px" prop="companyName">
+              <el-input
+                size="small"
+                splaceholder="请输入内容"
+                disabled
+                v-model="inputQuery.companyName"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="统一社会信用代码:" label-width="150px" prop="creditNum">
+              <el-input
+                size="small"
+                splaceholder="请输入内容" disabled
+                v-model="inputQuery.creditNum"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="企业类别:" label-width="150px" prop="classes">
+              <el-select
+                size="small"
+                v-model="inputQuery.classes" disabled
+                placeholder="企业类别"
+                style="width: 100%;"
+              >
+                <el-option v-if="classesDisplay" label="医院" value="1"></el-option>
+                <el-option label="经营企业" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="所属地区:" label-width="150px" prop="area">
+              <el-cascader
+                size="small"
+                :options="options"
+                v-model="selectedOptions" disabled
+                placeholder="请选择所属地区"
+                style="width: 100%"
+                @change="handleChange"
+              >
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="联系人:" label-width="150px" prop="contacts">
+              <el-input
+                size="small"
+                placeholder="请输入内容" disabled
+                v-model="inputQuery.contacts"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="详细地址:" label-width="150px" prop="detailAddr">
+              <el-input
+                size="small"
+                placeholder="请输入内容" disabled
+                v-model="inputQuery.detailAddr"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="联系电话:" label-width="150px" prop="mobile">
+              <el-input
+                size="small"
+                placeholder="请输入内容" disabled
+                v-model="inputQuery.mobile"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="邮箱:" label-width="150px" prop="email">
+              <el-input
+                size="small"
+                placeholder="请输入内容" disabled
+                v-model="inputQuery.email"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-card>
+      <el-card>
+
+        <div style=" float: right;
                         text-align: right;
                         margin-bottom: 8px;"
-                >
-                    <!--                    <el-button type="primary" size="mini" icon="search" @click="addCert"-->
-                    <!--                               style="text-align:right"-->
-                    <!--                    >添加电子档-->
-                    <!--                    </el-button-->
-                    <!--                    >-->
-
-                </div>
-
-                <el-table v-loading="certLoading" :data="certList" ref="certTable" style="width: 100%" border highlight-current-row>
-                    <el-table-column type="selection" width="55">
-                    </el-table-column>
-                    <el-table-column type="index" label="序号" width="50"></el-table-column>
-                    <el-table-column label="证书名称" prop="name"></el-table-column>
-                    <el-table-column label="证书编号" prop="code"></el-table-column>
-                    <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">
-                                {{ checkFlag[scope.row.auditStatus] }}
-                            </el-tag>
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column label="操作" >
-                        <template slot-scope="scope">
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.native="toViewCompanyCert(scope.row)"
-                            >预览
-                            </el-button
-                            >
-                            <el-button
-                                v-if="editType==1"
-                                type="text"
-                                size="small"
-                                @click.native="printSupCert(scope.row)"
-                            >打印
-                            </el-button
-                            >
-                            <el-button
-                                type="text"
-                                size="small"
-                                v-if="editType==2"
-                                @click.native="auditCert(scope.row)"
-                            >审核
-                            </el-button
-                            >
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.native="rejectInfo(scope.row)"
-                            >说明
-                            </el-button
-                            >
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <el-pagination
-                    :page-size="certQuery.limit"
-                    @current-change="certHandleCurrentChange"
-                    layout="prev, pager, next"
-                    :total="certTotal"
-                >
-                </el-pagination>
-            </el-card>
-        </el-form>
-
-
-        <el-dialog width="30%" :visible.sync="certAuditVisible" append-to-body>
-            <el-form :model="currentAudit">
-                <label></label>
-                <el-form-item label="审核备注：" :label-width="120">
-                    <el-input type="textarea" v-model="currentAudit.auditComment" autocomplete="off"
-                              autosize></el-input>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="rejectAuditCert">审核拒绝</el-button>
-                <el-button type="primary" @click="passAuditCert">审核通过</el-button>
-            </div>
-        </el-dialog>
-
-    </div>
+        >
+          <!--                    <el-button type="primary" size="mini" icon="search" @click="addCert"-->
+          <!--                               style="text-align:right"-->
+          <!--                    >添加电子档-->
+          <!--                    </el-button-->
+          <!--                    >-->
+
+        </div>
+
+        <el-table v-loading="certLoading" :data="certList" ref="certTable" style="width: 100%" border
+                  highlight-current-row>
+          <el-table-column type="selection" width="55"></el-table-column>
+          <el-table-column type="index" label="序号" width="50"></el-table-column>
+          <el-table-column label="证书名称" prop="name"></el-table-column>
+          <el-table-column label="证书编号" prop="code"></el-table-column>
+          <el-table-column label="生效期" prop="vailDate"></el-table-column>
+          <el-table-column label="失效期" prop="expireDate"></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">
+                {{ checkFlag[scope.row.auditStatus] }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" prop="remark"></el-table-column>
+          <el-table-column label="确认说明" prop="auditComment" show-overflow-tooltip></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button v-if="editType==1" type="text" size="small" @click.native="printSupCert(scope.row)">打印
+              </el-button>
+              <el-button type="text" size="small" v-if="editType==2" @click.native="auditCert(scope.row)">编辑</el-button>
+              <el-button type="text" size="small" v-if="scope.row.auditStatus==1" @click.native="revoke(scope.row)">
+                撤回
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          :page-size="certQuery.limit"
+          @current-change="certHandleCurrentChange"
+          layout="prev, pager, next"
+          :total="certTotal"
+        >
+        </el-pagination>
+      </el-card>
+    </el-form>
+
+
+    <el-dialog width="60%" :visible.sync="certAuditVisible" append-to-body title="配送企业资质证书确认">
+      <el-form :model="currentAudit" label-width="120px">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="证书名称：" prop="name">
+              <el-input v-model="currentAudit.name" auto-complete="off"
+                        disabled></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="11">
+            <el-form-item label="证书编号：" prop="code">
+              <el-input v-model="currentAudit.code" auto-complete="off"
+                        disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="生效期：" prop="vailDate">
+
+              <el-date-picker
+                v-model="currentAudit.vailDate"
+                type="date"
+                disabled
+                value-format="yyyy-MM-dd"
+                style="width: 100%"
+                placeholder="请选择生效期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="11">
+            <el-form-item label="失效期：" prop="expireDate">
+
+              <el-date-picker
+                v-model="currentAudit.expireDate"
+                type="date"
+                disabled
+                value-format="yyyy-MM-dd"
+                style="width: 100%"
+                placeholder="请选择失效期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="证书状态：" prop="status">
+              <el-select v-model="currentAudit.status" :disabled="isOpen!=1" style="width: 100%">
+                <el-option label="失效" :value=1></el-option>
+                <el-option label="有效" :value=0></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="11">
+            <el-form-item label="确认状态：" prop="confirmStatus">
+              <el-select v-model="confirmStatus" :disabled="isOpen==1" style="width: 100%">
+                <el-option label="符合" :value="1"></el-option>
+                <el-option label="不符合" :value="2"></el-option>
+                <el-option label="未确认" :value="6"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="证书文件：">
+              <el-button type="primary" size="mini" @click.native="showImgViewer(currentAudit)">证书预览</el-button>
+              <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer"
+                               :url-list="imgList"/>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row style="margin-top: 12px">
+          <el-col :span="22">
+            <el-form-item label="结果说明：">
+              <el-input type="textarea" :disabled="isOpen==1" v-model="currentAudit.auditComment" autocomplete="off"
+                        autosize></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button type="primary" @click="cancel">取消</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
 </template>
 
 <script>
-import {modifyCompany, auditCompany,printSupCert, verifyTemplateFile} from "../../../api/purchase/supCompany";
 import {
-    provinceAndCityData,
-    regionData,
-    provinceAndCityDataPlus,
-    regionDataPlus,
-    CodeToText,
-    TextToCode,
+  modifyCompany,
+  auditCompany,
+  printSupCert,
+  verifyTemplateFile,
+  getRoId,
+  previewImage
+} from '../../../api/purchase/supCompany'
+import {
+  provinceAndCityData,
+  regionData,
+  provinceAndCityDataPlus,
+  regionDataPlus,
+  CodeToText,
+  TextToCode,
 } from "element-china-area-data";
-import {filterCompanyCert, deleteCompanyCert, auditSupCert} from "../../../api/purchase/companyCert";
+import {filterCompanyCert, deleteCompanyCert, auditSupCert, revokeSupCert} from "../../../api/purchase/companyCert";
 import draggable from "vuedraggable";
+import {customerlist} from '@/api/system/role'
+import store from '@/store'
+import ElImageViewer from "element-ui/packages/image/src/image-viewer"
 
 
 export default {
 
-    name: "supCompanyEdit",
-    props: {
-        closeDialog: {
-            type: Function,
+  name: "supCompanyEdit",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+    editType: {//1：查询页面，2:审核页面，
+      type: Object,
+      required: true,
+    }
+  },
+
+
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      headers: {},
+      imgViewerVisible: false,
+      imgList: [],
+      classesDisplay: false,
+      selectedOptions: [],
+      options: regionDataPlus,
+      rules: {
+        companyName: [
+          {
             required: true,
-        },
-        inputQuery: {
-            type: Object,
+            message: "请输入企业名称",
+            trigger: "blur"
+          }
+        ],
+        creditNum: [
+          {
             required: true,
-        },
-        editType: {//1：查询页面，2:审核页面，
-            type: Object,
+            message: "请输入统一社会信用代码",
+            trigger: "blur"
+          }
+        ],
+        classes: [
+          {
             required: true,
-        }
+            message: "请选择企业类别",
+            trigger: "change"
+          }
+        ],
+        area: [
+          {
+            required: true,
+            message: "请选择所属地区",
+            trigger: "change"
+          }
+        ],
+        detailAddr: [
+          {
+            required: true,
+            message: "请输入详细地址",
+            trigger: "change"
+          }
+        ],
+        contacts: [
+          {
+            required: true,
+            message: "请输入联系人",
+            trigger: "change"
+          }
+        ],
+        mobile: [
+          {
+            required: true,
+            message: "请输入联系电话",
+            trigger: "change"
+          }
+        ],
+        email: [
+          {
+            required: true,
+            message: "请输入邮箱",
+            trigger: "change"
+          }
+        ],
+        updateCause: [
+          {
+            required: true,
+            message: "请输入变更原因",
+            trigger: "change"
+          }
+        ],
+      },
+      uploadUrl: "",
+      fileUrl: "",
+      certFileUrl: "",
+      url: 'http://127.0.0.1:9996/udiwms/image/register/file/getImage?type=image1&name=t11111.jpg',
+      certQuery: {
+        page: 1,
+        limit: 20
+      },
+      certList: [],
+      roleList: [],
+      certTotal: 0,
+      certLoading: false,
+      addCertVisible: false,
+      salesmanQuery: {
+        name: "",
+        page: 1,
+        limit: 20
+      },
+      salesmanList: [],
+      salesmanTotal: 0,
+      salesmanLoading: false,
+      addSalesmanVisible: false,
+      certTypeMap: {
+        1: '身份证'
+      },
+
+      confirmStatus: null,
+      selectLocalVisible: false,
+      productQuery: {
+        ylqxzcrbarmc: "",
+        cpmctymc: "",
+        ggxh: "",
+        page: 1,
+        limit: 20
+      },
+      productList: [],
+      productTotal: 0,
+      productLoading: false,
+      uuid: null,
+      companyApplyUpdateVisible: false,
+      isOpen: false,
+      companyEditDisabled: true,
+      companyEditButtonStr: "编辑",
+      checkFlag: {
+        0: "草稿",
+        1: "已确认",
+        2: "已拒绝",
+        3: "变更未确认",
+        6: "未确认",
+      },
+
+      checkSupFlage: {
+        0: "草稿",
+        1: "已审核",
+        2: "已拒绝",
+        3: "变更未审核",
+        6: "未审核",
+      },
+
+      supStatus: {
+        0: "有效",
+        1: "失效",
+      },
+      certAuditVisible: false,
+      currentAudit: {},
+    };
+  },
+  created() {
+    this.getCompanyCertList();
+    this.customerlist();
+    this.selectedOptions = this.inputQuery.areaCode.split(",");
+  },
+  components: {
+    draggable,
+    ElImageViewer
+  },
+  methods: {
+
+    onPassSubmit(val) {
+      this.inputQuery.auditStatus = 1;
+      this.$confirm("是否审核通过?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.loading = true;
+        auditCompany(this.inputQuery).then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("提交成功");
+            this.closeDialog();
+          } else {
+            this.$message.error(response.message);
+          }
+        });
+      }).catch(() => {
+      });
     },
+    onRejectSubmit() {
+      this.$prompt('请输入结果说明', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+      }).then(({value}) => {
+        this.inputQuery.auditComment = value;
+        this.inputQuery.auditStatus = 2;
+        auditCompany(this.inputQuery).then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("提交成功");
+            this.closeDialog();
+          } else {
+            this.$message.error(response.message);
+          }
+        });
+
+
+      }).catch(() => {
+      });
+    }
+    ,
+    isAssetTypeAnImage(ext) {
+      return [
+        'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
+    },
+    showImgViewer(row) {
+      var varindex = row.filePath.lastIndexOf(".");
+      var varext = row.filePath.substring(varindex + 1);
+      var isImage = this.isAssetTypeAnImage(varext);
+      if (isImage == true) {
+        this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+        this.imgList = [];
+        previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
+          if (response.code === 20000) {
+            this.imgList.push(response.data);
+          }
+        });
+        this.imgViewerVisible = true;
+        const m = (e) => {
+          e.preventDefault()
+        };
+        document.body.style.overflow = 'hidden';
+        document.addEventListener("touchmove", m, false); // 禁止页面滑动
+      } else {
+        this.toViewCompanyCert(row);
+      }
 
 
-    data() {
-        return {
-            BASE_URL: process.env.VUE_APP_BASE_API,
-            headers: {},
-            classesDisplay: false,
-            selectedOptions: [],
-            options: regionDataPlus,
-            rules: {
-                companyName: [
-                    {
-                        required: true,
-                        message: "请输入企业名称",
-                        trigger: "blur"
-                    }
-                ],
-                creditNum: [
-                    {
-                        required: true,
-                        message: "请输入统一社会信用代码",
-                        trigger: "blur"
-                    }
-                ],
-                classes: [
-                    {
-                        required: true,
-                        message: "请选择企业类别",
-                        trigger: "change"
-                    }
-                ],
-                area: [
-                    {
-                        required: true,
-                        message: "请选择所属地区",
-                        trigger: "change"
-                    }
-                ],
-                detailAddr: [
-                    {
-                        required: true,
-                        message: "请输入详细地址",
-                        trigger: "change"
-                    }
-                ],
-                contacts: [
-                    {
-                        required: true,
-                        message: "请输入联系人",
-                        trigger: "change"
-                    }
-                ],
-                mobile: [
-                    {
-                        required: true,
-                        message: "请输入联系电话",
-                        trigger: "change"
-                    }
-                ],
-                email: [
-                    {
-                        required: true,
-                        message: "请输入邮箱",
-                        trigger: "change"
-                    }
-                ],
-                updateCause: [
-                    {
-                        required: true,
-                        message: "请输入变更原因",
-                        trigger: "change"
-                    }
-                ],
-            },
-            uploadUrl: "",
-            fileUrl: "",
-            certFileUrl: "",
-            url: 'http://127.0.0.1:9996/udiwms/image/register/file/getImage?type=image1&name=t11111.jpg',
-            certQuery: {
-                page: 1,
-                limit: 20
-            },
-            certList: [],
-            certTotal: 0,
-            certLoading: false,
-            addCertVisible: false,
-            salesmanQuery: {
-                name: "",
-                page: 1,
-                limit: 20
-            },
-            salesmanList: [],
-            salesmanTotal: 0,
-            salesmanLoading: false,
-            addSalesmanVisible: false,
-            certTypeMap: {
-                1: '身份证'
-            },
-            selectLocalVisible: false,
-            productQuery: {
-                ylqxzcrbarmc: "",
-                cpmctymc: "",
-                ggxh: "",
-                page: 1,
-                limit: 20
-            },
-            productList: [],
-            productTotal: 0,
-            productLoading: false,
-            uuid: null,
-            companyApplyUpdateVisible: false,
-            companyEditDisabled: true,
-            companyEditButtonStr: "编辑",
-            checkFlag: {
-                0: "草稿",
-                1: "已通过",
-                2: "已拒绝",
-                3: "变更未审核",
-                6: "未审核",
-            },
-            supStatus: {
-                0: "有效",
-                1: "失效",
-            },
-            certAuditVisible: false,
-            currentAudit: {},
-        };
     },
-    created() {
-        this.getCompanyCertList();
-        this.selectedOptions = this.inputQuery.areaCode.split(",");
+    closeImgViewer() {
+      this.imgViewerVisible = false;
+      const m = (e) => {
+        e.preventDefault()
+      };
+      document.body.style.overflow = 'auto';
+      document.removeEventListener("touchmove", m, true);
+    },
+    cancelDialog() {
+      this.closeDialog();
+    }
+    ,
+
+    closeLocalDialog() {
+      this.addCertVisible = false;
+      this.getCompanyCertList();
+    }
+    ,
+
+    handleChange(value) {
+      this.inputQuery.area =
+        CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]];
+      this.inputQuery.areaCode = value.toString();
+    }
+    ,
+
+    addCert(index, row) {
+      this.inputQuery.id = '';
+      if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
+        this.inputQuery.id = row.id;
+        this.inputQuery.formData = row;
+      }
+      this.addCertVisible = true;
+    }
+    ,
+
+    toViewCompanyCert(row) {
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      window.open(this.certFileUrl + row.filePath);
+    },
+
+
+    auditCert(row) {
+      this.certAuditVisible = true;
+      this.currentAudit = row;
+      this.isOpen = this.currentAudit.auditStatus;
+      this.confirmStatus = this.currentAudit.auditStatus;
+    },
 
+    passAuditCert() {
+      this.currentAudit.auditStatus = 1;
+      this.auditSupCert(this.currentAudit);
     },
-    components: {
-        draggable
+    rejectAuditCert() {
+      this.currentAudit.auditStatus = 2;
+      this.auditSupCert(this.currentAudit);
+    },
+    notAuditCert() {
+      this.currentAudit.auditStatus = 6;
+      this.auditSupCert(this.currentAudit);
     },
-    methods: {
-
-        onPassSubmit(val) {
-            this.inputQuery.auditStatus = 1;
-            this.$confirm("是否审核通过?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.loading = true;
-                auditCompany(this.inputQuery).then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.$message.success("提交成功");
-                        this.closeDialog();
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                });
-            }).catch(() => {
-            });
-        },
-
-        onRejectSubmit() {
-            this.$prompt('请输入驳回意见', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-            }).then(({value}) => {
-                this.inputQuery.auditComment = value;
-                this.inputQuery.auditStatus = 2;
-                auditCompany(this.inputQuery).then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.$message.success("提交成功");
-                        this.closeDialog();
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                });
-
-
-            }).catch(() => {
-            });
-        }
-        ,
 
 
-        cancelDialog() {
-            this.closeDialog();
+    auditSupCert(inputQuery) {
+      auditSupCert(inputQuery).then(response => {
+        this.loading = false;
+        if (response.code === 20000) {
+          this.getCompanyCertList();
+          this.certAuditVisible = false;
+        } else {
+          this.$message.error(response.message);
         }
-        ,
+      });
+    },
 
-        closeLocalDialog() {
-            this.addCertVisible = false;
-            this.getCompanyCertList();
-        }
-        ,
+    rejectInfo(row) {
+      this.$confirm(row.auditComment, "审核备注", {
+        confirmButtonText: "确定",
+        type: "warning",
+        showCancelButton: false,
+      })
+        .then(() => {
+        });
 
-        handleChange(value) {
-            this.inputQuery.area =
-                CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]];
-            this.inputQuery.areaCode = value.toString();
-        }
-        ,
+    },
 
-        addCert(index, row) {
-            this.inputQuery.id = '';
-            if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
-                this.inputQuery.id = row.id;
-                this.inputQuery.formData = row;
-            }
-            this.addCertVisible = true;
-        }
-        ,
-
-        toViewCompanyCert(row) {
-            this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-            window.open(this.certFileUrl + row.filePath);
-        },
-
-
-        auditCert(row) {
-            this.certAuditVisible = true;
-            this.currentAudit = row;
-        },
-
-        passAuditCert() {
-            this.currentAudit.auditStatus = 1;
-            this.auditSupCert(this.currentAudit);
-        },
-        rejectAuditCert() {
-            this.currentAudit.auditStatus = 2;
-            this.auditSupCert(this.currentAudit);
-        },
-
-
-        auditSupCert(inputQuery) {
-            auditSupCert(inputQuery).then(response => {
-                this.loading = false;
-                if (response.code === 20000) {
-                    this.getCompanyCertList();
-                    this.certAuditVisible = false;
-                } else {
-                    this.$message.error(response.message);
-                }
-            });
-        },
-
-        rejectInfo(row) {
-            this.$confirm(row.auditComment, "审核备注", {
-                confirmButtonText: "确定",
-                type: "warning",
-                showCancelButton: false,
-            })
-                .then(() => {
-                });
-
-        },
-
-        certHandleCurrentChange(val) {
-            this.certQuery.page = val;
-            this.getCompanyCertList();
+    certHandleCurrentChange(val) {
+      this.certQuery.page = val;
+      this.getCompanyCertList();
+    }
+    ,
+
+    getRoIds() {
+      let params = {companyId: this.inputQuery.customerId}
+      getRoId(params).then((res) => {
+        this.inputQuery.roleId = parseInt(res.data.roleId);
+      })
+    },
+    getCompanyCertList() {
+      this.certLoading = true;
+      this.certQuery.customerId = this.inputQuery.customerId;
+      this.certQuery.type = 1;
+      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;
+          this.certList = [];
+        });
+    }
+    ,
+    printSupCert(row) {
+      var selectIds = [row.id];
+      let query = {moduleId: 8};
+      this.loading = true;
+      verifyTemplateFile(query).then((res) => {
+        if (res.code === 20000) {
+          let printParams = {
+            templateId: res.data,
+            ids: selectIds,
+            customerId: row.customerId
+          };
+          printSupCert(printParams).then((response) => {
+            //将pdf文件转换为url。
+            const binaryData = [];
+            binaryData.push(response);
+            //获取blob链接。
+            let url = window.URL.createObjectURL(
+              new Blob(binaryData, {type: "application/pdf"})
+            );
+            this.loading = false;
+            window.open(url);//打开新标签页，预览pdf。
+          })
+        } else {
+          this.loading = false;
+          this.$message.error(res.message);
         }
-        ,
-
-        getCompanyCertList() {
-            this.certLoading = true;
-            this.certQuery.customerId = this.inputQuery.customerId;
-            this.certQuery.type = 1;
-            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;
-                    this.certList = [];
-                });
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+      })
+    },
+    printSupCertAll() {
+      var certLists = this.$refs.certTable.selection;
+      var selectIds = [];
+      certLists.forEach(item => {
+        selectIds.push(item.id);
+      })
+      if (selectIds.length == 0) {
+        this.$message.error("请先选择打印的证书！");
+        return
+      }
+      let query = {moduleId: 8};
+      this.loading = true;
+      verifyTemplateFile(query).then((res) => {
+        if (res.code === 20000) {
+          let printParams = {
+            templateId: res.data,
+            ids: selectIds,
+            customerId: this.inputQuery.customerId
+          };
+          printSupCert(printParams).then((response) => {
+            //将pdf文件转换为url。
+            const binaryData = [];
+            binaryData.push(response);
+            //获取blob链接。
+            let url = window.URL.createObjectURL(
+              new Blob(binaryData, {type: "application/pdf"})
+            );
+            this.loading = false;
+            window.open(url);//打开新标签页，预览pdf。
+          })
+        } else {
+          this.loading = false;
+          this.$message.error(res.message);
         }
-        ,
-        printSupCert(row) {
-            var selectIds=[row.id];
-            let query = {moduleId: 8};
-            this.loading = true;
-            verifyTemplateFile(query).then((res) => {
-                if (res.code === 20000) {
-                    let printParams = {
-                        templateId: res.data,
-                        ids: selectIds,
-                        customerId: row.customerId
-                    };
-                    printSupCert(printParams).then((response) => {
-                        //将pdf文件转换为url。
-                        const binaryData = [];
-                        binaryData.push(response);
-                        //获取blob链接。
-                        let url = window.URL.createObjectURL(
-                            new Blob(binaryData, {type: "application/pdf"})
-                        );
-                        this.loading = false;
-                        window.open(url);//打开新标签页，预览pdf。
-                    })
-                } else {
-                    this.loading = false;
-                    this.$message.error(res.message);
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.$message.error(error.message);
-            })
-        },
-        printSupCertAll() {
-            var certLists=this.$refs.certTable.selection;
-            var  selectIds=[];
-            certLists.forEach(item => {
-                selectIds.push(item.id);
-            })
-            if(selectIds.length==0){
-                this.$message.error("请先选择打印的证书！");
-                return
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+      })
+    },
+    deleteCompanyCert(row) {
+      this.$confirm("是否删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.certLoading = true;
+        let tquery = {
+          id: row.id,
+          filePath: row.filePath,
+        };
+        deleteCompanyCert(tquery)
+          .then((response) => {
+            this.certLoading = false;
+            if (response.code === 20000) {
+              this.getCompanyCertList();
+              this.$message({
+                type: "success",
+                message: "删除成功！",
+              });
+            } else {
+              this.$message.error(response.message);
             }
-            let query = {moduleId: 8};
-            this.loading = true;
-            verifyTemplateFile(query).then((res) => {
-                if (res.code === 20000) {
-                    let printParams = {
-                        templateId: res.data,
-                        ids: selectIds,
-                        customerId: this.inputQuery.customerId
-                    };
-                    printSupCert(printParams).then((response) => {
-                        //将pdf文件转换为url。
-                        const binaryData = [];
-                        binaryData.push(response);
-                        //获取blob链接。
-                        let url = window.URL.createObjectURL(
-                            new Blob(binaryData, {type: "application/pdf"})
-                        );
-                        this.loading = false;
-                        window.open(url);//打开新标签页，预览pdf。
-                    })
-                } else {
-                    this.loading = false;
-                    this.$message.error(res.message);
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.$message.error(error.message);
-            })
-        },
-        deleteCompanyCert(row) {
-            this.$confirm("是否删除?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.certLoading = true;
-                let tquery = {
-                    id: row.id,
-                    filePath: row.filePath,
-                };
-                deleteCompanyCert(tquery)
-                    .then((response) => {
-                        this.certLoading = false;
-                        if (response.code === 20000) {
-                            this.getCompanyCertList();
-                            this.$message({
-                                type: "success",
-                                message: "删除成功！",
-                            });
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
-                        this.certLoading = false;
-                    });
-            }).catch(() => {
-            });
+          })
+          .catch(() => {
+            this.certLoading = false;
+          });
+      }).catch(() => {
+      });
+    }
+    ,
+    customerlist() {
+      customerlist().then((response) => {
+        if (response.code === 20000) {
+          this.roleList = response.data;
         }
-        ,
+      })
+        .catch(() => {
+          this.roleList = null;
+        });
+    },
+    confirm() {
+      debugger
+      if (this.confirmStatus == null) {
+        this.$message.error("请选择确认状态");
+        return;
+      }
+
+      if (this.confirmStatus == 1) {
+        this.passAuditCert();
+      } else if (this.confirmStatus == 2) {
+        this.rejectAuditCert();
+      } else if (this.confirmStatus == 6) {
+        this.notAuditCert();
+      }
+    },
+
+    revoke(inputQuery) {
+
+      this.$confirm("是否确定撤回证书状态至未确认?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.certLoading = true;
+        inputQuery.auditStatus = 6
+        revokeSupCert(inputQuery)
+          .then((response) => {
+            this.certLoading = false;
+            if (response.code === 20000) {
+              this.getCompanyCertList();
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.certLoading = false;
+          });
+      }).catch(() => {
+      });
+
+
+    },
+
 
+    cancel() {
+      this.certAuditVisible = false;
     },
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                0: "warning",
-                1: "success",
-                2: "danger",
-                6: "warning",
-            };
-            return statusMap[status];
-        },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "success",
+        2: "danger",
+        6: "warning",
+      };
+      return statusMap[status];
     },
+  },
 }
 </script>
 <style>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 120px;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 120px;
 }
 
 .text {
-    width: 100%;
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .el-card {
-    margin-right: 20px;
-    margin-top: 15px;
-    /*transition: all .5s;*/
+  margin-right: 20px;
+  margin-top: 15px;
+  /*transition: all .5s;*/
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
 </style>
diff --git a/src/views/purchase/company/supCompanyEditDialog.vue b/src/views/purchase/company/supCompanyEditDialog.vue
index 6a132c28..20c05f8b 100644
--- a/src/views/purchase/company/supCompanyEditDialog.vue
+++ b/src/views/purchase/company/supCompanyEditDialog.vue
@@ -124,22 +124,24 @@
                     <el-table-column type="index" label="序号" width="50"></el-table-column>
                     <el-table-column label="证书名称" prop="name"></el-table-column>
                     <el-table-column label="证书编号" prop="code"></el-table-column>
-                    <el-table-column label="有效期" prop="vailDate"></el-table-column>
+                    <el-table-column label="生效期" prop="vailDate"></el-table-column>
                     <el-table-column label="失效期" prop="expireDate"></el-table-column>
-                    <el-table-column label="证书状态" >
-                      <template slot-scope="scope">
-                        <span>{{ expire[scope.row.status] }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="审核状态" prop="auditStatus" width="120">
+                    <el-table-column label="确认状态" prop="auditStatus" width="120">
                         <template slot-scope="scope">
                             <el-tag :type="(scope.row.auditStatus) | statusFilterType">
                                 {{ checkFlag[scope.row.auditStatus] }}
                             </el-tag>
                         </template>
                     </el-table-column>
-                    <el-table-column label="备注" prop="remark"></el-table-column>
-
+                    <el-table-column label="确认说明" prop="auditComment"></el-table-column>
+                  <el-table-column label="状态" prop="status" width="120">
+                    <template slot-scope="scope">
+                      <el-tag :type="(scope.row.status) | statusType">
+                        {{ statusFlag[scope.row.status] }}
+                      </el-tag>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="备注" prop="remark"></el-table-column>
                     <el-table-column label="操作" width="180">
                         <template slot-scope="scope">
                             <el-button
@@ -364,10 +366,10 @@ export default {
                 page: 1,
                 limit: 20
             },
-          expire:{
-            0:"有效",
-            1:"失效"
-         },
+          statusFlag: {
+            0: "有效",
+            1: "失效",
+          },
             certList: [],
             certTotal: 0,
             certLoading: false,
@@ -401,11 +403,11 @@ export default {
             companyEditButtonStr: "编辑",
             addType: "1", //证书类型：1:供应商；2.生产企业；3.产品品种
             checkFlag: {
-                0: "草稿",
-                1: "已通过",
-                2: "已拒绝",
-                3: "变更未审核",
-                6: "未审核",
+              0: "未认证",
+              1: "已确认",
+              2: "已拒绝",
+              3: "变更未确认",
+              6: "未确认",
             },
             editTye: 1,
 
@@ -661,6 +663,13 @@ export default {
             return statusMap[status];
         }
         ,
+      statusType(status) {
+        const statusMap = {
+          0: "success",
+          1: "danger",
+        };
+        return statusMap[status];
+      },
     }
     ,
 }
diff --git a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
index 5c555bdb..34395860 100644
--- a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
@@ -1,808 +1,922 @@
 <template>
-    <div>
-        <el-form
-            :model="inputQuery"
-            :rules="rules"
-            ref="inputQuery"
-            label-width="100px"
-            style="margin-top: -30px"
-        >
-            <el-card class="el-card">
-
-                <div style="display: flex;">
-                    <el-button
-                        v-if="editType==2"
-                        type="primary"
-                        size="mini"
-                        icon="search"
-                        @click="onPassSubmit"
-                    >审核通过
-                    </el-button
-                    >
-                    <el-button
-                        v-if="editType==2"
-                        type="primary"
-                        size="mini"
-                        icon="search"
-                        @click="onRejectSubmit"
-                    >审核拒绝
-                    </el-button
-                    >
-                    <el-button
-                        v-if="editType==1"
-                        type="primary"
-                        size="mini"
-                        icon="search"
-                        @click="printSupCertAll"
-                    >打印
-                    </el-button>
-                </div>
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 20px">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="所属供应商:" label-width="150px" prop="customerId">
-                            <el-select
-                                v-model="inputQuery.customerId"
-                                filterable
-                                remote
-                                clearable="true"
-                                disabled
-                                reserve-keyword
-                                placeholder="请输入供应商名称"
-                                :remote-method="findMethod"
-                                :loading="loading"
-                                style="width: 100%;"
-                                @change="unitChange"
-                            >
-                                <el-option
-                                    v-for="item in fromOptions"
-                                    :key="item.customerId"
-                                    :label="item.companyName"
-                                    :value="item.customerId"
-                                >
-                                    <span style="float: left">{{ item.companyName }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="企业名称:" label-width="150px" prop="companyName">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容" disabled
-                                v-model="inputQuery.companyName"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="统一社会信用代码:" label-width="150px" prop="creditCode">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.creditCode"
-                                @input="change()" disabled
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="企业类型:" label-width="150px" prop="companyType">
-                            <el-select
-                                size="small"
-                                v-model="inputQuery.companyType"
-                                placeholder="企业类型" disabled
-                                style="width: 100%;"
-                            >
-                                <el-option label="境内企业" value="1"></el-option>
-                                <el-option label="境外企业" value="2"></el-option>
-
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="登记状态:" label-width="150px" prop="registerStatus">
-                            <el-select
-                                size="small"
-                                v-model="inputQuery.registerStatus" disabled
-                                placeholder="登记状态"
-                                style="width: 100%;"
-                            >
-                                <el-option label="续存（在营，开业，在册）" value="1"></el-option>
-                                <el-option label="吊销" value="2"></el-option>
-                                <el-option label="注销" value="3"></el-option>
-                                <el-option label="迁出" value="4"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="所在地区:" label-width="150px" prop="placeArea">
-                            <el-cascader
-                                size="small" disabled
-                                :options="options"
-                                v-model="selectedOptions"
-                                placeholder="请选择所在地区"
-                                style="width: 100%"
-                                @change="handleChange"
-                            >
-                            </el-cascader>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="生产地区:" label-width="150px" prop="productionArea">
-                            <el-cascader
-                                size="small"
-                                :options="options" disabled
-                                v-model="selectedOptions2"
-                                placeholder="请选择生产地区"
-                                style="width: 100%"
-                                @change="handleChange2"
-                            >
-                            </el-cascader>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="所在地址:" label-width="150px" prop="placeAddress">
-                            <el-input
-                                size="small" disabled
-                                placeholder="请输入内容"
-                                v-model="inputQuery.placeAddress"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="生产地址:" label-width="150px" prop="productionAddress">
-                            <el-input
-                                size="small" disabled
-                                placeholder="请输入内容"
-                                v-model="inputQuery.productionAddress"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="20" class="el-col">
-                        <el-form-item label="备注:" label-width="150px" prop="remark">
-                            <el-input
-                                type="textarea"
-                                size="small" disabled
-                                placeholder="请输入内容"
-                                v-model="inputQuery.remark"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-card>
-
-            <el-card class="el-card">
-                <div style="display: flex">
-                    <!--                    <el-button-->
-                    <!--                        type="primary"-->
-                    <!--                        size="small"-->
-                    <!--                        icon="search"-->
-                    <!--                        style="margin: 0 100px 20px auto; width: 100px"-->
-                    <!--                        @click="addCert()"-->
-                    <!--                    >添加电子档-->
-                    <!--                    </el-button-->
-                    <!--                    >-->
-                </div>
-                <el-table v-loading="certLoading" :data="certList" ref="certTable" style="width: 100%" border highlight-current-row>
-                    <el-table-column type="selection" width="55"></el-table-column>
-                    <el-table-column type="index" label="序号" width="50"></el-table-column>
-                    <el-table-column label="证书名称" prop="name"></el-table-column>
-                    <el-table-column label="证书编号" prop="code"></el-table-column>
-                    <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">
-                                {{ checkFlag[scope.row.auditStatus] }}
-                            </el-tag>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作"  width="250">
-                        <template slot-scope="scope">
-
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.native="toViewCompanyCert(scope.row)"
-                            >预览
-                            </el-button
-                            >
-                            <el-button
-                                type="text"
-                                size="small"
-                                v-if="editType==2"
-                                @click.native="auditCert(scope.row)"
-                            >审核
-                            </el-button
-                            >
-                            <el-button
-                                v-if="editType==1"
-                                type="text"
-                                size="small"
-                                @click.native="printSupCert(scope.row)"
-                            >打印
-                            </el-button
-                            >
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.native="rejectInfo(scope.row)"
-                            >说明
-                            </el-button
-                            >
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <el-pagination
-                    :page-size="certQuery.limit"
-                    @current-change="certHandleCurrentChange"
-                    layout="prev, pager, next"
-                    :total="certTotal"
+  <div>
+    <el-form
+      :model="inputQuery"
+      :rules="rules"
+      ref="inputQuery"
+      label-width="100px"
+      style="margin-top: -30px"
+    >
+      <el-card class="el-card">
+
+        <div style="display: flex;">
+          <el-button v-if="editType==2" type="primary" size="mini" icon="search" @click="onPassSubmit">审核通过</el-button>
+          <el-button v-if="editType==2" type="primary" size="mini" icon="search" @click="onRejectSubmit">审核拒绝
+          </el-button>
+          <el-button v-if="editType==1" type="primary" size="mini" icon="search" @click="printSupCertAll">打印
+          </el-button>
+        </div>
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 20px">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="所属供应商:" label-width="150px" prop="customerId">
+              <el-select
+                v-model="inputQuery.customerId"
+                filterable
+                remote
+                clearable="true"
+                disabled
+                reserve-keyword
+                placeholder="请输入供应商名称"
+                :remote-method="findMethod"
+                :loading="loading"
+                style="width: 100%;"
+                @change="unitChange"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.customerId"
+                  :label="item.companyName"
+                  :value="item.customerId"
                 >
-                </el-pagination>
-            </el-card>
-
-
-            <el-dialog width="30%" :visible.sync="certAuditVisible" append-to-body>
-                <el-form :model="currentAudit">
-                    <label></label>
-                    <el-form-item label="审核备注：" :label-width="120">
-                        <el-input type="textarea" v-model="currentAudit.auditComment" autocomplete="off"
-                                  autosize></el-input>
-                    </el-form-item>
-                </el-form>
-                <div slot="footer" class="dialog-footer">
-                    <el-button type="primary" @click="rejectAuditCert">审核拒绝</el-button>
-                    <el-button type="primary" @click="passAuditCert">审核通过</el-button>
-                </div>
-            </el-dialog>
-
+                  <span style="float: left">{{ item.companyName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="企业名称:" label-width="150px" prop="companyName">
+              <el-input
+                size="small"
+                placeholder="请输入内容" disabled
+                v-model="inputQuery.companyName"
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="统一社会信用代码:" label-width="150px" prop="creditCode">
+              <el-input
+                size="small"
+                placeholder="请输入内容"
+                v-model="inputQuery.creditCode"
+                @input="change()" disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="企业类型:" label-width="150px" prop="companyType">
+              <el-select
+                size="small"
+                v-model="inputQuery.companyType"
+                placeholder="企业类型" disabled
+                style="width: 100%;"
+              >
+                <el-option label="境内企业" value="1"></el-option>
+                <el-option label="境外企业" value="2"></el-option>
+
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="登记状态:" label-width="150px" prop="registerStatus">
+              <el-select
+                size="small"
+                v-model="inputQuery.registerStatus" disabled
+                placeholder="登记状态"
+                style="width: 100%;"
+              >
+                <el-option label="续存（在营，开业，在册）" value="1"></el-option>
+                <el-option label="吊销" value="2"></el-option>
+                <el-option label="注销" value="3"></el-option>
+                <el-option label="迁出" value="4"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="所在地区:" label-width="150px" prop="placeArea">
+              <el-cascader
+                size="small" disabled
+                :options="options"
+                v-model="selectedOptions"
+                placeholder="请选择所在地区"
+                style="width: 100%"
+                @change="handleChange"
+              >
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="生产地区:" label-width="150px" prop="productionArea">
+              <el-cascader
+                size="small"
+                :options="options" disabled
+                v-model="selectedOptions2"
+                placeholder="请选择生产地区"
+                style="width: 100%"
+                @change="handleChange2"
+              >
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="所在地址:" label-width="150px" prop="placeAddress">
+              <el-input
+                size="small" disabled
+                placeholder="请输入内容"
+                v-model="inputQuery.placeAddress"
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="生产地址:" label-width="150px" prop="productionAddress">
+              <el-input
+                size="small" disabled
+                placeholder="请输入内容"
+                v-model="inputQuery.productionAddress"
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="20" class="el-col">
+            <el-form-item label="备注:" label-width="150px" prop="remark">
+              <el-input
+                type="textarea"
+                size="small" disabled
+                placeholder="请输入内容"
+                v-model="inputQuery.remark"
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+
+      <el-card class="el-card">
+        <div style="display: flex">
+          <!--                    <el-button-->
+          <!--                        type="primary"-->
+          <!--                        size="small"-->
+          <!--                        icon="search"-->
+          <!--                        style="margin: 0 100px 20px auto; width: 100px"-->
+          <!--                        @click="addCert()"-->
+          <!--                    >添加电子档-->
+          <!--                    </el-button-->
+          <!--                    >-->
+        </div>
+        <el-table v-loading="certLoading" :data="certList" ref="certTable" style="width: 100%" border
+                  highlight-current-row>
+          <el-table-column type="index" label="序号" width="50"></el-table-column>
+          <el-table-column label="证书名称" prop="name"></el-table-column>
+          <el-table-column label="证书编号" prop="code"></el-table-column>
+          <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">
+                {{ checkFlag[scope.row.auditStatus] }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="250">
+            <template slot-scope="scope">
+              <el-button v-if="editType==1" type="text" size="small" @click.native="printSupCert(scope.row)">打印
+              </el-button>
+              <el-button type="text" size="small" v-if="editType==2" @click.native="auditCert(scope.row)">编辑</el-button>
+              <el-button type="text" size="small" v-if="scope.row.auditStatus==1" @click.native="revoke(scope.row)">
+                撤回
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          :page-size="certQuery.limit"
+          @current-change="certHandleCurrentChange"
+          layout="prev, pager, next"
+          :total="certTotal"
+        >
+        </el-pagination>
+      </el-card>
+
+
+      <el-dialog width="60%" title="生产企业资质证书确认" :visible.sync="certAuditVisible" append-to-body>
+        <el-form :model="currentAudit" label-width="120px">
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="证书名称：" prop="name">
+                <el-input v-model="currentAudit.name" auto-complete="off"
+                          disabled></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11">
+              <el-form-item label="证书编号：" prop="code">
+                <el-input v-model="currentAudit.code" auto-complete="off"
+                          disabled
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="生效期：" prop="vailDate">
+
+                <el-date-picker
+                  v-model="currentAudit.vailDate"
+                  type="date"
+                  disabled
+                  value-format="yyyy-MM-dd"
+                  style="width: 100%"
+                  placeholder="请选择生效期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11">
+              <el-form-item label="失效期：" prop="expireDate">
+
+                <el-date-picker
+                  v-model="currentAudit.expireDate"
+                  type="date"
+                  disabled
+                  value-format="yyyy-MM-dd"
+                  style="width: 100%"
+                  placeholder="请选择失效期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="证书状态：" prop="status">
+                <el-select v-model="currentAudit.status" :disabled="isOpen!=1" style="width: 100%">
+                  <el-option label="失效" :value=1></el-option>
+                  <el-option label="有效" :value=0></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11">
+              <el-form-item label="确认状态：" prop="confirmStatus">
+                <el-select v-model="confirmStatus" :disabled="isOpen==1" style="width: 100%">
+                  <el-option label="符合" :value="1"></el-option>
+                  <el-option label="不符合" :value="2"></el-option>
+                  <el-option label="未确认" :value="6"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="证书文件：">
+                <el-button type="primary" size="mini" @click.native="showImgViewer(currentAudit)">证书预览</el-button>
+                <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer"
+                                 :url-list="imgList"/>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+          <el-row style="margin-top: 12px">
+            <el-col :span="22">
+              <el-form-item label="结果说明：">
+                <el-input type="textarea" :disabled="isOpen==1" v-model="currentAudit.auditComment" autocomplete="off"
+                          autosize></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
-    </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="confirm">确定</el-button>
+          <el-button type="primary" @click="cancel">取消</el-button>
+        </div>
+      </el-dialog>
+
+    </el-form>
+  </div>
 </template>
 
 <script>
 import {auditManufacturer, addOrModifyCompany} from "../../../api/purchase/supManufacturer";
 import {regionDataPlus, CodeToText} from "element-china-area-data";
-import {filterCompanyCert, deleteCompanyCert, auditSupCert} from "../../../api/purchase/companyCert";
+import {filterCompanyCert, deleteCompanyCert, auditSupCert, revokeSupCert} from "../../../api/purchase/companyCert";
 import companyAddCert from "@/views/purchase/cert/supCertAddDialog";
 import draggable from "vuedraggable";
 import {
-    getSupComapnys,
-    printSupCertManufacturer,
-    verifyTemplateFile
-} from "@/api/purchase/supCompany";
+  getSupComapnys, previewImage,
+  printSupCertManufacturer,
+  verifyTemplateFile
+} from '@/api/purchase/supCompany'
 import {getUUID} from "@/utils/strUtil";
+import ElImageViewer from "element-ui/packages/image/src/image-viewer"
 
 export default {
-    name: "supManufacturerAuditDialog",
-    props: {
-        addCloseDialog: {
-            type: Function,
+  name: "supManufacturerAuditDialog",
+  props: {
+    addCloseDialog: {
+      type: Function,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+    enterpriseId: "",
+    editType: {
+      type: Object,
+      required: true,
+    }
+  },
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      loading: false,
+      classesDisplay: false,
+      selectedOptions: [],
+      selectedOptions2: [],
+      imgViewerVisible: false,
+      imgList: [],
+      options: regionDataPlus,
+      rules: {
+
+        customerId: [
+          {
             required: true,
-        },
-        inputQuery: {
-            type: Object,
+            message: "请选择所属供应商",
+            trigger: "blur"
+          }
+        ],
+
+        companyName: [
+          {
             required: true,
-        },
-        enterpriseId: "",
-        editType: {
-            type: Object,
+            message: "请输入企业名称",
+            trigger: "blur"
+          }
+        ],
+        creditCode: [
+          {
             required: true,
-        }
+            message: "请输入统一社会信用代码",
+            trigger: "blur"
+          }
+        ],
+        companyType: [
+          {
+            required: true,
+            message: "请选择企业类型",
+            trigger: "change"
+          }
+        ],
+        registerStatus: [
+          {
+            required: true,
+            message: "请选择登记状态",
+            trigger: "change"
+          }
+        ],
+        placeArea: [
+          {
+            required: true,
+            message: "请选择所在地区",
+            trigger: "change"
+          }
+        ],
+        placeAddress: [
+          {
+            required: true,
+            message: "请输入所在地址",
+            trigger: "change"
+          }
+        ],
+        legalPersonName: [
+          {
+            required: true,
+            message: "请输入法人姓名",
+            trigger: "change"
+          }
+        ],
+        legalPersonPapersType: [
+          {
+            required: true,
+            message: "请选择法人证件类型",
+            trigger: "change"
+          }
+        ],
+        legalPersonPapersCode: [
+          {
+            required: true,
+            message: "请输入法人证件号码",
+            trigger: "change"
+          }
+        ],
+      },
+      uploadUrl: "",
+      fileList: [],
+      fileUrl: "",
+      certFileUrl: "",
+      url: 'http://127.0.0.1:9996/udiwms/image/register/file/getImage?type=image1&name=t11111.jpg',
+      certQuery: {
+        customerId: null,
+        manufacturerIdFk: null,
+        page: 1,
+        limit: 20
+      },
+      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: "未确认",
+      },
+      supStatus: {
+        0: "有效",
+        1: "失效",
+      },
+      certAuditVisible: false,
+      currentAudit: {},
+    };
+  },
+  created() {
+    if (this.editType == 0) {
+      this.enterpriseId = getUUID("");
+      this.inputQuery.manufacturerId = this.enterpriseId;
+    } else
+      this.certQuery.customerId = this.inputQuery.customerId;
+    this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerId;
+
+
+    this.selectedOptions = this.inputQuery.placeAreaCode.split(",");
+    if (this.inputQuery.productionAreaCode != null) {
+      this.selectedOptions2 = this.inputQuery.productionAreaCode.split(",");
+    }
+
+    this.getCompanyCertList();
+    this.findMethod();
+    this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
+    this.fileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+    this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+  },
+  components: {
+    draggable,
+    companyAddCert, ElImageViewer
+  },
+  methods: {
+
+    onPassSubmit(val) {
+      this.inputQuery.auditStatus = 1;
+      this.$confirm("是否审核通过?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.loading = true;
+        this.inputQuery.auditStatus = 1;
+        auditManufacturer(this.inputQuery).then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.addCloseDialog(true);
+            this.$message.success("保存成功");
+          } else {
+            this.$message.error(response.message);
+          }
+        });
+      }).catch(() => {
+        this.addCloseDialog(false);
+      });
     },
-    data() {
-        return {
-            BASE_URL: process.env.VUE_APP_BASE_API,
-            loading: false,
-            classesDisplay: false,
-            selectedOptions: [],
-            selectedOptions2: [],
-            options: regionDataPlus,
-            rules: {
-
-                customerId: [
-                    {
-                        required: true,
-                        message: "请选择所属供应商",
-                        trigger: "blur"
-                    }
-                ],
-
-                companyName: [
-                    {
-                        required: true,
-                        message: "请输入企业名称",
-                        trigger: "blur"
-                    }
-                ],
-                creditCode: [
-                    {
-                        required: true,
-                        message: "请输入统一社会信用代码",
-                        trigger: "blur"
-                    }
-                ],
-                companyType: [
-                    {
-                        required: true,
-                        message: "请选择企业类型",
-                        trigger: "change"
-                    }
-                ],
-                registerStatus: [
-                    {
-                        required: true,
-                        message: "请选择登记状态",
-                        trigger: "change"
-                    }
-                ],
-                placeArea: [
-                    {
-                        required: true,
-                        message: "请选择所在地区",
-                        trigger: "change"
-                    }
-                ],
-                placeAddress: [
-                    {
-                        required: true,
-                        message: "请输入所在地址",
-                        trigger: "change"
-                    }
-                ],
-                legalPersonName: [
-                    {
-                        required: true,
-                        message: "请输入法人姓名",
-                        trigger: "change"
-                    }
-                ],
-                legalPersonPapersType: [
-                    {
-                        required: true,
-                        message: "请选择法人证件类型",
-                        trigger: "change"
-                    }
-                ],
-                legalPersonPapersCode: [
-                    {
-                        required: true,
-                        message: "请输入法人证件号码",
-                        trigger: "change"
-                    }
-                ],
-            },
-            uploadUrl: "",
-            fileList: [],
-            fileUrl: "",
-            certFileUrl: "",
-            url: 'http://127.0.0.1:9996/udiwms/image/register/file/getImage?type=image1&name=t11111.jpg',
-            certQuery: {
-                customerId: null,
-                manufacturerIdFk: null,
-                page: 1,
-                limit: 20
-            },
-            certList: [],
-            certTotal: 0,
-            certLoading: false,
-            addCertVisible: false,
-            fromOptions: [],
-            idQuery: {
-                id: "",
-            },
-            addType: "2", //证书类型：1:供应商；2.生产企业；3.产品品种
-
-            checkFlag: {
-                0: "草稿",
-                1: "已通过",
-                2: "已拒绝",
-                3: "变更未审核",
-                6: "未审核",
-            },
-            supStatus: {
-                0: "有效",
-                1: "失效",
-            },
-            certAuditVisible: false,
-            currentAudit: {},
-        };
+
+    onRejectSubmit() {
+      this.$prompt('请输入结果说明', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+      }).then(({value}) => {
+        this.inputQuery.auditComment = value;
+        this.inputQuery.auditStatus = 2;
+        auditManufacturer(this.inputQuery).then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.addCloseDialog(true);
+            this.$message.success("保存成功");
+          } else {
+            this.$message.error(response.message);
+          }
+        });
+      }).catch(() => {
+      });
+    }
+    ,
+    isAssetTypeAnImage(ext) {
+      return [
+        'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
     },
-    created() {
-        if (this.editType == 0) {
-            this.enterpriseId = getUUID("");
-            this.inputQuery.manufacturerId = this.enterpriseId;
-        } else
-            this.certQuery.customerId = this.inputQuery.customerId;
-        this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerId;
+    showImgViewer(row) {
+      var varindex = row.filePath.lastIndexOf(".");
+      var varext = row.filePath.substring(varindex + 1);
+      var isImage = this.isAssetTypeAnImage(varext);
+      if (isImage == true) {
+        this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+        this.imgList = [];
+        previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
+          if (response.code === 20000) {
+            this.imgList.push(response.data);
+          }
+        });
+        this.imgViewerVisible = true;
+        const m = (e) => {
+          e.preventDefault()
+        };
+        document.body.style.overflow = 'hidden';
+        document.addEventListener("touchmove", m, false); // 禁止页面滑动
+      } else {
+        this.toViewCompanyCert(row);
+      }
 
 
-        this.selectedOptions = this.inputQuery.placeAreaCode.split(",");
-        if (this.inputQuery.productionAreaCode != null) {
-            this.selectedOptions2 = this.inputQuery.productionAreaCode.split(",");
-        }
+    },
+    closeImgViewer() {
+      this.imgViewerVisible = false;
+      const m = (e) => {
+        e.preventDefault()
+      };
+      document.body.style.overflow = 'auto';
+      document.removeEventListener("touchmove", m, true);
+    },
 
-        this.getCompanyCertList();
-        this.findMethod();
-        this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
-        this.fileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-        this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+    openFile() {
+      window.open(this.fileUrl + this.inputQuery.filePath);
     },
-    components: {
-        draggable,
-        companyAddCert,
-    },
-    methods: {
-
-        onPassSubmit(val) {
-            this.inputQuery.auditStatus = 1;
-            this.$confirm("是否审核通过?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.loading = true;
-                this.inputQuery.auditStatus = 1;
-                auditManufacturer(this.inputQuery).then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.addCloseDialog(true);
-                        this.$message.success("保存成功");
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                });
-            }).catch(() => {
-                this.addCloseDialog(false);
-            });
-        },
-
-        onRejectSubmit() {
-            this.$prompt('请输入驳回意见', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-            }).then(({value}) => {
-                this.inputQuery.auditComment = value;
-                this.inputQuery.auditStatus = 2;
-                auditManufacturer(this.inputQuery).then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.addCloseDialog(true);
-                        this.$message.success("保存成功");
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                });
-            }).catch(() => {
-            });
-        }
-        ,
-
-
-        openFile() {
-            window.open(this.fileUrl + this.inputQuery.filePath);
-        },
-        certHandleCurrentChange(val) {
-            this.certQuery.page = val;
-            this.getCompanyCertList();
-        },
-        getCompanyCertList() {
-            if (this.editType != 2 && this.editType != 0) {
-                this.certQuery.auditStatus = 20;
-            }
-            this.certLoading = true;
-            this.certQuery.type = 2;
-            filterCompanyCert(this.certQuery)
-                .then((response) => {
-                    this.certLoading = false;
-                    this.certList = response.data.list || [];
-                    this.certTotal = response.data.total;
-                })
-                .catch(() => {
-                    this.certLoading = false;
-                    this.certList = [];
-                });
-        },
-        addCert(index, row) {
-            this.idQuery.id = '';
-            if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
+    certHandleCurrentChange(val) {
+      this.certQuery.page = val;
+      this.getCompanyCertList();
+    },
+    getCompanyCertList() {
+      if (this.editType != 2 && this.editType != 0) {
+        this.certQuery.auditStatus = 20;
+      }
+      this.certLoading = true;
+      this.certQuery.type = 2;
+      filterCompanyCert(this.certQuery)
+        .then((response) => {
+          this.certLoading = false;
+          this.certList = response.data.list || [];
+          this.certTotal = response.data.total;
+        })
+        .catch(() => {
+          this.certLoading = false;
+          this.certList = [];
+        });
+    },
+    addCert(index, row) {
+      this.idQuery.id = '';
+      if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
+        this.idQuery.id = row.id;
+        this.idQuery.formData = row;
+      }
+      this.addCertVisible = true;
+    },
+    toViewCompanyCert(row) {
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      window.open(this.certFileUrl + row.filePath);
+    },
+
+    auditCert(row) {
+      this.certAuditVisible = true;
+      this.currentAudit = row;
+      this.isOpen = this.currentAudit.auditStatus;
+      this.confirmStatus = this.currentAudit.auditStatus;
+    },
+    revoke(inputQuery) {
+      this.$confirm("是否确定撤回证书状态至未确认?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.certLoading = true;
+        inputQuery.auditStatus = 6
+        revokeSupCert(inputQuery)
+          .then((response) => {
+            this.certLoading = false;
+            if (response.code === 20000) {
+              this.getCompanyCertList();
+            } else {
+              this.$message.error(response.message);
             }
-            this.addCertVisible = true;
-        },
-        toViewCompanyCert(row) {
-            this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-            window.open(this.certFileUrl + row.filePath);
-        },
-
-        auditCert(row) {
-            this.certAuditVisible = true;
-            this.currentAudit = row;
-        },
-
-        passAuditCert() {
-            this.currentAudit.auditStatus = 1;
-            this.auditSupCert(this.currentAudit);
-        },
-        rejectAuditCert() {
-            this.currentAudit.auditStatus = 2;
-            this.auditSupCert(this.currentAudit);
-        },
-
-
-        auditSupCert(inputQuery) {
-            auditSupCert(inputQuery).then(response => {
-                this.loading = false;
-                if (response.code === 20000) {
-                    this.getCompanyCertList();
-                    this.certAuditVisible = false;
-                } else {
-                    this.$message.error(response.message);
-                }
-            });
-        },
-
-        rejectInfo(row) {
-            this.$confirm(row.auditComment, "审核备注", {
-                confirmButtonText: "确定",
-                type: "warning",
-                showCancelButton: false,
-            })
-                .then(() => {
-                });
-
-        },
-
-
-        deleteCompanyCert(row) {
-            this.$confirm("是否删除?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.certLoading = true;
-                let tquery = {
-                    id: row.id,
-                    filePath: row.filePath,
-                };
-                deleteCompanyCert(tquery)
-                    .then((response) => {
-                        this.certLoading = false;
-                        if (response.code === 20000) {
-                            this.getCompanyCertList();
-                            this.$message({
-                                type: "success",
-                                message: "删除成功！",
-                            });
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
-                        this.certLoading = false;
-                    });
-            }).catch(() => {
-            });
-        },
-
-        closeLocalDialog() {
-            this.addCertVisible = false;
-            this.getCompanyCertList();
-        },
-
-
-        findMethod(query) {
-            this.fromOptions = [];
-            let cQuery = {
-                companyName: query,
-            };
-            getSupComapnys(cQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.fromOptions = response.data.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                });
+          })
+          .catch(() => {
+            this.certLoading = false;
+          });
+      }).catch(() => {
+      });
+
+
+    },
+    passAuditCert() {
+      this.currentAudit.auditStatus = 1;
+      this.auditSupCert(this.currentAudit);
+    },
+    rejectAuditCert() {
+      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;
+        if (response.code === 20000) {
+          this.getCompanyCertList();
+          this.certAuditVisible = false;
+        } else {
+          this.$message.error(response.message);
         }
-        ,
-        unitChange(val) {
-            this.certQuery.customerId = val;
-        },
-
-        handleChange(value) {
-            this.inputQuery.placeArea =
-                CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]];
-            console.log(this.inputQuery.placeArea)
-            this.inputQuery.placeAreaCode = value.toString();
-        },
-        handleChange2(value) {
-            this.inputQuery.productionArea =
-                CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]];
-            this.inputQuery.productionAreaCode = value.toString();
-        },
-        uploadHandleRemove(file, fileList) {
-            console.log(file, fileList);
-        },
-        uploadHandlePreview(file) {
-            console.log(file);
-            console.log(this.fileList);
-        },
-        uploadHandleExceed(files, fileList) {
-            this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
-        },
-        uploadOnchange(file, fileList) {
-            let fileName = file.name;
-            let uid = file.uid
-            let pos = fileName.lastIndexOf(".");
-            let lastName = fileName.substring(pos, fileName.length);
-            if (lastName.toLowerCase() !== ".jpg" && lastName.toLowerCase() !== ".png") {
-                this.$message.error("上传文件只能是 .jpg,.png 格式");
-                for (let i = 0; i < fileList.length; i++) {//从list删除
-                    if (fileList[i].uid === uid) {
-                        fileList.splice(i, 1)
-                    }
-                }
-                return;
-            }
-            // 限制上传文件的大小
-            const isLt = file.size / 1024 / 1024 / 2 <= 1;
-            if (!isLt) {
-                this.$message.error("上传文件大小不能超过 2MB");
-                for (let i = 0; i < fileList.length; i++) {
-                    if (fileList[i].uid === uid) {
-                        fileList.splice(i, 1)
-                    }
-                }
-            }
-            return isLt;
-        },
-        uploadHandleSuccess(response, file, fileList) {
-            console.log(response)
+      });
+    },
+
+    rejectInfo(row) {
+      this.$confirm(row.auditComment, "审核备注", {
+        confirmButtonText: "确定",
+        type: "warning",
+        showCancelButton: false,
+      })
+        .then(() => {
+        });
+
+    },
+
+
+    deleteCompanyCert(row) {
+      this.$confirm("是否删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.certLoading = true;
+        let tquery = {
+          id: row.id,
+          filePath: row.filePath,
+        };
+        deleteCompanyCert(tquery)
+          .then((response) => {
+            this.certLoading = false;
             if (response.code === 20000) {
-                this.inputQuery.newFilePath = response.data.name;
-                this.onModifySubmit('inputQuery');
+              this.getCompanyCertList();
+              this.$message({
+                type: "success",
+                message: "删除成功！",
+              });
             } else {
-                this.$message.error("文件上传失败：" + response.message);
+              this.$message.error(response.message);
             }
-        },
-        uploadHandleError() {
-
-        },
-        printSupCert(row) {
-            var selectIds=[row.id];
-            let query = {moduleId: 9};
-            this.loading = true;
-            verifyTemplateFile(query).then((res) => {
-                if (res.code === 20000) {
-                    let printParams = {
-                        templateId: res.data,
-                        ids: selectIds,
-                        customerId: row.customerId
-                    };
-                    printSupCertManufacturer(printParams).then((response) => {
-                        //将pdf文件转换为url。
-                        const binaryData = [];
-                        binaryData.push(response);
-                        //获取blob链接。
-                        let url = window.URL.createObjectURL(
-                            new Blob(binaryData, {type: "application/pdf"})
-                        );
-                        this.loading = false;
-                        window.open(url);//打开新标签页，预览pdf。
-                    })
-                } else {
-                    this.loading = false;
-                    this.$message.error(res.message);
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.$message.error(error.message);
-            })
-        },
-        printSupCertAll() {
-            var certLists=this.$refs.certTable.selection;
-            var  selectIds=[];
-            certLists.forEach(item => {
-                selectIds.push(item.id);
-            })
-            if(selectIds.length==0){
-                this.$message.error("请先选择打印的证书！");
-                return
-            }
-            let query = {moduleId: 9};
-            this.loading = true;
-            verifyTemplateFile(query).then((res) => {
-                if (res.code === 20000) {
-                    let printParams = {
-                        templateId: res.data,
-                        ids: selectIds,
-                        customerId: this.inputQuery.customerId
-                    };
-                    printSupCertManufacturer(printParams).then((response) => {
-                        //将pdf文件转换为url。
-                        const binaryData = [];
-                        binaryData.push(response);
-                        //获取blob链接。
-                        let url = window.URL.createObjectURL(
-                            new Blob(binaryData, {type: "application/pdf"})
-                        );
-                        this.loading = false;
-                        window.open(url);//打开新标签页，预览pdf。
-                    })
-                } else {
-                    this.loading = false;
-                    this.$message.error(res.message);
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.$message.error(error.message);
-            })
-        },
-    },
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                0: "warning",
-                1: "success",
-                2: "danger",
-                6: "warning",
-            };
-            return statusMap[status];
-        },
+          })
+          .catch(() => {
+            this.certLoading = false;
+          });
+      }).catch(() => {
+      });
+    },
+
+    closeLocalDialog() {
+      this.addCertVisible = false;
+      this.getCompanyCertList();
+    },
+
+
+    findMethod(query) {
+      this.fromOptions = [];
+      let cQuery = {
+        companyName: query,
+      };
+      getSupComapnys(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.fromOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    }
+    ,
+    unitChange(val) {
+      this.certQuery.customerId = val;
+    },
+
+    handleChange(value) {
+      this.inputQuery.placeArea =
+        CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]];
+      console.log(this.inputQuery.placeArea)
+      this.inputQuery.placeAreaCode = value.toString();
+    },
+    handleChange2(value) {
+      this.inputQuery.productionArea =
+        CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]];
+      this.inputQuery.productionAreaCode = value.toString();
+    },
+    uploadHandleRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    uploadHandlePreview(file) {
+      console.log(file);
+      console.log(this.fileList);
+    },
+    uploadHandleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+    },
+    uploadOnchange(file, fileList) {
+      let fileName = file.name;
+      let uid = file.uid
+      let pos = fileName.lastIndexOf(".");
+      let lastName = fileName.substring(pos, fileName.length);
+      if (lastName.toLowerCase() !== ".jpg" && lastName.toLowerCase() !== ".png") {
+        this.$message.error("上传文件只能是 .jpg,.png 格式");
+        for (let i = 0; i < fileList.length; i++) {//从list删除
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+        return;
+      }
+      // 限制上传文件的大小
+      const isLt = file.size / 1024 / 1024 / 10 <= 1;
+      if (!isLt) {
+        this.$message.error("上传文件大小不能超过 10MB");
+        for (let i = 0; i < fileList.length; i++) {
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+      }
+      return isLt;
+    },
+    uploadHandleSuccess(response, file, fileList) {
+      console.log(response)
+      if (response.code === 20000) {
+        this.inputQuery.newFilePath = response.data.name;
+        this.onModifySubmit('inputQuery');
+      } else {
+        this.$message.error("文件上传失败：" + response.message);
+      }
+    },
+    uploadHandleError() {
+
+    },
+    printSupCert(row) {
+      var selectIds = [row.id];
+      let query = {moduleId: 9};
+      this.loading = true;
+      verifyTemplateFile(query).then((res) => {
+        if (res.code === 20000) {
+          let printParams = {
+            templateId: res.data,
+            ids: selectIds,
+            customerId: row.customerId
+          };
+          printSupCertManufacturer(printParams).then((response) => {
+            //将pdf文件转换为url。
+            const binaryData = [];
+            binaryData.push(response);
+            //获取blob链接。
+            let url = window.URL.createObjectURL(
+              new Blob(binaryData, {type: "application/pdf"})
+            );
+            this.loading = false;
+            window.open(url);//打开新标签页，预览pdf。
+          })
+        } else {
+          this.loading = false;
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+      })
+    },
+    printSupCertAll() {
+      var certLists = this.$refs.certTable.selection;
+      var selectIds = [];
+      certLists.forEach(item => {
+        selectIds.push(item.id);
+      })
+      if (selectIds.length == 0) {
+        this.$message.error("请先选择打印的证书！");
+        return
+      }
+      let query = {moduleId: 9};
+      this.loading = true;
+      verifyTemplateFile(query).then((res) => {
+        if (res.code === 20000) {
+          let printParams = {
+            templateId: res.data,
+            ids: selectIds,
+            customerId: this.inputQuery.customerId
+          };
+          printSupCertManufacturer(printParams).then((response) => {
+            //将pdf文件转换为url。
+            const binaryData = [];
+            binaryData.push(response);
+            //获取blob链接。
+            let url = window.URL.createObjectURL(
+              new Blob(binaryData, {type: "application/pdf"})
+            );
+            this.loading = false;
+            window.open(url);//打开新标签页，预览pdf。
+          })
+        } else {
+          this.loading = false;
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+      })
+    },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "success",
+        2: "danger",
+        6: "warning",
+      };
+      return statusMap[status];
     },
+  },
 };
 </script>
 <style>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 120px;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 120px;
 }
 
 .text {
-    width: 100%;
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .el-card {
-    margin-right: 20px;
-    margin-top: 15px;
-    /*transition: all .5s;*/
+  margin-right: 20px;
+  margin-top: 15px;
+  /*transition: all .5s;*/
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
 </style>
diff --git a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
index d2509725..63add753 100644
--- a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
@@ -208,7 +208,7 @@
                     <el-table-column type="index" label="序号" width="50"></el-table-column>
                     <el-table-column label="证书名称" prop="name"></el-table-column>
                     <el-table-column label="证书编号" prop="name"></el-table-column>
-                    <el-table-column label="有效期" prop="vailDate"></el-table-column>
+                    <el-table-column label="生效期" prop="vailDate"></el-table-column>
                     <el-table-column label="失效期" prop="expireDate"></el-table-column>
                     <el-table-column label="审核状态" prop="auditStatus" width="120">
                         <template slot-scope="scope">
diff --git a/src/views/purchase/product/supProductAuditDialog.vue b/src/views/purchase/product/supProductAuditDialog.vue
index 53f3a1ae..e5fa83e5 100644
--- a/src/views/purchase/product/supProductAuditDialog.vue
+++ b/src/views/purchase/product/supProductAuditDialog.vue
@@ -1,776 +1,898 @@
 <template>
-    <div>
-        <el-form
-            :model="inputQuery"
-            :rules="rules"
-            ref="inputQuery"
-            label-width="100px"
-            style="margin-top: -20px"
-        >
-            <el-card class="el-card">
-
-
-                <div style="display: flex;">
-                    <el-button
-                        v-if="editType==2"
-                        type="primary"
-                        size="mini"
-                        icon="search"
-                        @click="onPassSubmit"
-                    >审核通过
-                    </el-button
-                    >
-                    <el-button
-                        v-if="editType==2"
-                        type="primary"
-                        size="mini"
-                        icon="search"
-                        @click="onRejectSubmit"
-                    >审核拒绝
-                    </el-button
-                    >
-                    <el-button
-                        v-if="editType==1"
-                        type="primary"
-                        size="mini"
-                        icon="search"
-                        @click="printSupCertAll"
-                    >打印
-                    </el-button>
-                </div>
-
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 20px">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="所属供应商:" label-width="150px" prop="customerId">
-                            <el-select
-                                v-model="inputQuery.customerId"
-                                filterable
-                                remote
-                                clearable="true"
-                                reserve-keyword
-                                placeholder="请选择供应商"
-                                :remote-method="findMethod" disabled
-                                :loading="loading"
-                                style="width: 100%;"
-                                @change="supChange"
-                            >
-                                <el-option
-                                    v-for="item in fromOptions"
-                                    :key="item.customerId"
-                                    :label="item.companyName"
-                                    :value="item.customerId"
-                                >
-                                    <span style="float: left">{{ item.companyName }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="所属生产企业:" label-width="150px" prop="manufacturerIdFk">
-                            <el-select
-                                v-model="inputQuery.manufacturerIdFk"
-                                filterable
-                                remote
-                                clearable="true"
-                                disabled
-                                reserve-keyword
-                                placeholder="请选择生产企业"
-                                :remote-method="findPMMethod"
-                                :loading="loading"
-                                style="width: 100%;"
-                            >
-                                <el-option
-                                    v-for="item in fromPMOptions"
-                                    :key="item.manufacturerId"
-                                    :label="item.companyName"
-                                    :value="item.manufacturerId"
-                                >
-                                    <span style="float: left">{{ item.companyName }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="注册/备案号:" label-width="150px" prop="recordCode">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.recordCode" disabled
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="注册/备案产品名称:" label-width="150px" prop="recordProductName">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.recordProductName" disabled
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="注册/备案人名称:" label-width="150px" prop="recordPeopleName">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容" disabled
-                                v-model="inputQuery.recordPeopleName"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="代理人名称:" label-width="150px" prop="agentName">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.agentName" disabled
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="医疗器械管理类别:" label-width="150px" prop="productManageType">
-                            <el-select
-                                size="small"
-                                v-model="inputQuery.productManageType" disabled
-                                placeholder="医疗器械管理类别"
-                                style="width: 100%;"
-                            >
-                                <el-option label="Ⅰ类" value="1"></el-option>
-                                <el-option label="Ⅱ类" value="2"></el-option>
-                                <el-option label="Ⅲ类" value="3"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="器械类别:" label-width="150px" prop="productType">
-                            <el-select
-                                size="small"
-                                v-model="inputQuery.productType" disabled
-                                placeholder="医疗器械管理类别"
-                                style="width: 100%;"
-                            >
-                                <el-option label="器械" value="1"></el-option>
-                                <el-option label="诊断试剂" value="2"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="器械目录分类编码:" label-width="150px" prop="productDirectoryCode">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.productDirectoryCode" disabled
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="20" class="el-col">
-                        <el-form-item label="规格型号:" label-width="150px" prop="specification">
-                            <el-input
-                                type="textarea"
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.specification" disabled
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="20" class="el-col">
-                        <el-form-item label="备注:" label-width="150px" prop="remark">
-                            <el-input
-                                type="textarea"
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.remark" disabled
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-card>
-
-        </el-form>
-        <el-card class="el-card">
-            <el-table v-loading="certLoading" :data="certList" ref="certTable" style="width: 100%" border highlight-current-row>
-                <el-table-column type="selection" width="55"></el-table-column>
-                <el-table-column type="index" label="序号" width="50"></el-table-column>
-                <el-table-column label="证书名称" prop="name"></el-table-column>
-                <el-table-column label="证书编号" prop="code"></el-table-column>
-                <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">
-                            {{ checkFlag[scope.row.auditStatus] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-
-                <el-table-column label="操作" width="250">
-                    <template slot-scope="scope">
-
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native="toViewCompanyCert(scope.row)"
-                        >预览
-                        </el-button
-                        >
-                        <el-button
-                            v-if="editType==1"
-                            type="text"
-                            size="small"
-                            @click.native="printSupCert(scope.row)"
-                        >打印
-                        </el-button
-                        >
-                        <el-button
-                            type="text"
-                            size="small"
-                            v-if="editType==2"
-                            @click.native="auditCert(scope.row)"
-                        >审核
-                        </el-button
-                        >
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native="rejectInfo(scope.row)"
-                        >说明
-                        </el-button
-                        >
-
-                        <!--                        <el-button-->
-                        <!--                            type="text"-->
-                        <!--                            size="small"-->
-                        <!--                            @click.native="deleteCompanyCert(scope.row)"-->
-                        <!--                        >删除-->
-                        <!--                        </el-button-->
-                        <!--                        >-->
-                    </template>
-                </el-table-column>
-            </el-table>
-            <el-pagination
-                :page-size="certQuery.limit"
-                @current-change="certHandleCurrentChange"
-                layout="prev, pager, next"
-                :total="certTotal"
-            >
-            </el-pagination>
-        </el-card>
-
-        <el-dialog width="30%" :visible.sync="certAuditVisible" append-to-body>
-            <el-form :model="currentAudit">
-                <label></label>
-                <el-form-item label="审核备注：" :label-width="120">
-                    <el-input type="textarea" v-model="currentAudit.auditComment" autocomplete="off"
-                              autosize></el-input>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="rejectAuditCert">审核拒绝</el-button>
-                <el-button type="primary" @click="passAuditCert">审核通过</el-button>
-            </div>
-        </el-dialog>
-    </div>
+  <div>
+    <el-form
+      :model="inputQuery"
+      :rules="rules"
+      ref="inputQuery"
+      label-width="100px"
+      style="margin-top: -20px"
+    >
+      <el-card class="el-card">
+
+
+        <div style="display: flex;">
+          <el-button
+            v-if="editType==2"
+            type="primary"
+            size="mini"
+            icon="search"
+            @click="onPassSubmit"
+          >审核通过
+          </el-button
+          >
+          <el-button
+            v-if="editType==2"
+            type="primary"
+            size="mini"
+            icon="search"
+            @click="onRejectSubmit"
+          >审核拒绝
+          </el-button
+          >
+          <el-button
+            v-if="editType==1"
+            type="primary"
+            size="mini"
+            icon="search"
+            @click="printSupCertAll"
+          >打印
+          </el-button>
+        </div>
+
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 20px">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="所属供应商:" label-width="150px" prop="customerId">
+              <el-select
+                v-model="inputQuery.customerId"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择供应商"
+                :remote-method="findMethod" disabled
+                :loading="loading"
+                style="width: 100%;"
+                @change="supChange"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.customerId"
+                  :label="item.companyName"
+                  :value="item.customerId"
+                >
+                  <span style="float: left">{{ item.companyName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="所属生产企业:" label-width="150px" prop="manufacturerIdFk">
+              <el-select
+                v-model="inputQuery.manufacturerIdFk"
+                filterable
+                remote
+                clearable="true"
+                disabled
+                reserve-keyword
+                placeholder="请选择生产企业"
+                :remote-method="findPMMethod"
+                :loading="loading"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in fromPMOptions"
+                  :key="item.manufacturerId"
+                  :label="item.companyName"
+                  :value="item.manufacturerId"
+                >
+                  <span style="float: left">{{ item.companyName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="注册/备案号:" label-width="150px" prop="recordCode">
+              <el-input
+                size="small"
+                placeholder="请输入内容"
+                v-model="inputQuery.recordCode" disabled
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="注册/备案产品名称:" label-width="150px" prop="recordProductName">
+              <el-input
+                size="small"
+                placeholder="请输入内容"
+                v-model="inputQuery.recordProductName" disabled
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="注册/备案人名称:" label-width="150px" prop="recordPeopleName">
+              <el-input
+                size="small"
+                placeholder="请输入内容" disabled
+                v-model="inputQuery.recordPeopleName"
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="代理人名称:" label-width="150px" prop="agentName">
+              <el-input
+                size="small"
+                placeholder="请输入内容"
+                v-model="inputQuery.agentName" disabled
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="医疗器械管理类别:" label-width="150px" prop="productManageType">
+              <el-select
+                size="small"
+                v-model="inputQuery.productManageType" disabled
+                placeholder="医疗器械管理类别"
+                style="width: 100%;"
+              >
+                <el-option label="Ⅰ类" value="1"></el-option>
+                <el-option label="Ⅱ类" value="2"></el-option>
+                <el-option label="Ⅲ类" value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="器械类别:" label-width="150px" prop="productType">
+              <el-select
+                size="small"
+                v-model="inputQuery.productType" disabled
+                placeholder="医疗器械管理类别"
+                style="width: 100%;"
+              >
+                <el-option label="器械" value="1"></el-option>
+                <el-option label="诊断试剂" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="器械目录分类编码:" label-width="150px" prop="productDirectoryCode">
+              <el-input
+                size="small"
+                placeholder="请输入内容"
+                v-model="inputQuery.productDirectoryCode" disabled
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="20" class="el-col">
+            <el-form-item label="规格型号:" label-width="150px" prop="specification">
+              <el-input
+                type="textarea"
+                size="small"
+                placeholder="请输入内容"
+                v-model="inputQuery.specification" disabled
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="20" class="el-col">
+            <el-form-item label="备注:" label-width="150px" prop="remark">
+              <el-input
+                type="textarea"
+                size="small"
+                placeholder="请输入内容"
+                v-model="inputQuery.remark" disabled
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+
+    </el-form>
+    <el-card class="el-card">
+      <el-table v-loading="certLoading" :data="certList" ref="certTable" style="width: 100%" border highlight-current-row>
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="证书名称" prop="name"></el-table-column>
+        <el-table-column label="证书编号" prop="code"></el-table-column>
+        <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">
+              {{ checkFlag[scope.row.auditStatus] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" width="250">
+          <template slot-scope="scope">
+            <el-button v-if="editType==1" type="text" size="small" @click.native="printSupCert(scope.row)">打印</el-button>
+            <el-button type="text" size="small" v-if="editType==2" @click.native="auditCert(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus==1" @click.native="revoke(scope.row)">
+              撤回
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :page-size="certQuery.limit"
+        @current-change="certHandleCurrentChange"
+        layout="prev, pager, next"
+        :total="certTotal"
+      >
+      </el-pagination>
+    </el-card>
+
+    <el-dialog width="60%" title="配送产品资质证书确认" :visible.sync="certAuditVisible" append-to-body>
+      <el-form :model="currentAudit" label-width="120px">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="证书名称：" prop="name">
+              <el-input v-model="currentAudit.name" auto-complete="off"
+                        disabled></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="11">
+            <el-form-item label="证书编号：" prop="code">
+              <el-input v-model="currentAudit.code" auto-complete="off"
+                        disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="生效期：" prop="vailDate">
+
+              <el-date-picker
+                v-model="currentAudit.vailDate"
+                type="date"
+                disabled
+                value-format="yyyy-MM-dd"
+                style="width: 100%"
+                placeholder="请选择生效期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="11">
+            <el-form-item label="失效期：" prop="expireDate">
+
+              <el-date-picker
+                v-model="currentAudit.expireDate"
+                type="date"
+                disabled
+                value-format="yyyy-MM-dd"
+                style="width: 100%"
+                placeholder="请选择失效期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="证书状态：" prop="status">
+              <el-select v-model="currentAudit.status" :disabled="isOpen!=1" style="width: 100%">
+                <el-option label="失效" :value=1></el-option>
+                <el-option label="有效" :value=0></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="11">
+            <el-form-item label="确认状态：" prop="confirmStatus">
+              <el-select v-model="confirmStatus" :disabled="isOpen==1" style="width: 100%">
+                <el-option label="符合" :value="1"></el-option>
+                <el-option label="不符合" :value="2"></el-option>
+                <el-option label="未确认" :value="6"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="证书文件：">
+              <el-button type="primary" size="mini" @click.native="showImgViewer(currentAudit)">证书预览</el-button>
+              <el-image-viewer  v-if="imgViewerVisible"    style="z-index:9999"  :on-close="closeImgViewer" :url-list="imgList" />
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row style="margin-top: 12px">
+          <el-col :span="22">
+            <el-form-item  label="结果说明：">
+              <el-input type="textarea":disabled="isOpen==1" v-model="currentAudit.auditComment" autocomplete="off" autosize></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button type="primary" @click="cancel">取消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import {auditSupProduct} from "../../../api/purchase/suppliersRegistrationBasic";
 import {
-    provinceAndCityData,
-    regionData,
-    provinceAndCityDataPlus,
-    regionDataPlus,
-    CodeToText,
-    TextToCode,
+  provinceAndCityData,
+  regionData,
+  provinceAndCityDataPlus,
+  regionDataPlus,
+  CodeToText,
+  TextToCode,
 } from "element-china-area-data";
 import draggable from "vuedraggable";
 import {
-    getSupComapnys,
-    printSupCertProduction,
-    verifyTemplateFile
-} from "@/api/purchase/supCompany";
+  getSupComapnys, previewImage,
+  printSupCertProduction,
+  verifyTemplateFile
+} from '@/api/purchase/supCompany'
 import {addOrModifyCompany, getCompanyList} from "@/api/purchase/supManufacturer";
-import {auditSupCert, deleteCompanyCert, filterCompanyCert} from "@/api/purchase/companyCert";
+import {auditSupCert, deleteCompanyCert, filterCompanyCert, revokeSupCert} from "@/api/purchase/companyCert";
 import companyAddCert from "@/views/purchase/cert/supCertAddDialog";
 import {getUUID} from "@/utils/strUtil";
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
 
 
 export default {
-    name: "supProductEditDialog",
-    props: {
-        closeRegistrationDialog: {
-            type: Function,
+  name: "supProductEditDialog",
+  props: {
+    closeRegistrationDialog: {
+      type: Function,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+    editType: {
+      type: Object,
+      required: true,
+    }
+  },
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      fromOptions: [],
+      fromPMOptions: [],
+      imgViewerVisible:false,
+      imgList:[],
+      pmQuery: {
+        customerId: null,
+        companyName: null,
+        page: 1,
+        limit: 10,
+      },
+      loading: false,
+      classesDisplay: false,
+      selectedOptions: [],
+      selectedOptions2: [],
+      options: regionDataPlus,
+      rules: {
+
+        customerId: [
+          {
             required: true,
-        },
-        inputQuery: {
-            type: Object,
+            message: "请选择供应商",
+            trigger: "change"
+          }
+        ],
+
+
+        manufacturerIdFk: [
+          {
             required: true,
-        },
-        editType: {
-            type: Object,
+            message: "请选择生产企业",
+            trigger: "change"
+          }
+        ],
+
+        recordCode: [
+          {
             required: true,
-        }
+            message: "请输入注册/备案号",
+            trigger: "blur"
+          }
+        ],
+        recordProductName: [
+          {
+            required: true,
+            message: "请输入注册/备案产品名称",
+            trigger: "blur"
+          }
+        ],
+        productManageType: [
+          {
+            required: true,
+            message: "请选择医疗器械管理类别",
+            trigger: "change"
+          }
+        ],
+        productType: [
+          {
+            required: true,
+            message: "请选择器械类别",
+            trigger: "change"
+          }
+        ],
+        recordPeopleName: [
+          {
+            required: true,
+            message: "请输入注册/备案人名称",
+            trigger: "change"
+          }
+        ],
+        productDirectoryCode: [
+          {
+            required: true,
+            message: "请输入器械目录分类编码",
+            trigger: "change"
+          }
+        ],
+        specification: [
+          {
+            required: true,
+            message: "请输入规格型号",
+            trigger: "change"
+          }
+        ],
+      },
+      fileList: [],
+      fileList2: [],
+      idQuery: {
+        id: "",
+      },
+
+      certQuery: {
+        customerId: null,
+        manufacturerIdFk: null,
+        page: 1,
+        limit: 20
+      },
+      certList: [],
+      certTotal: 0,
+      certLoading: false,
+      addCertVisible: false,
+      certFileUrl: "",
+      addType: "3", //证书类型：1:供应商；2.生产企业；3.产品品种
+      checkFlag: {
+        0: "草稿",
+        1: "已确认",
+        2: "已拒绝",
+        3: "变更未确认",
+        6: "未确认",
+      },
+      supStatus: {
+        0: "有效",
+        1: "失效",
+      },
+      confirmStatus: null,
+      isOpen:false,
+      certAuditVisible: false,
+      currentAudit: {},
+    };
+  },
+  created() {
+    if (this.editType == 0) {
+      this.inputQuery.productId = getUUID("");
+    } else {
+      if(this.editType!=2 && this.editType!=0){
+        this.certQuery.auditStatus = 20;
+      }
+      debugger
+      this.getCompanyCertList();
+      this.pmQuery.customerId = this.inputQuery.customerId;
+      this.findPMMethod();
+    }
+
+    this.findMethod();
+    this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+
+  },
+  components: {
+    draggable, companyAddCert,ElImageViewer
+  },
+  methods: {
+
+    onPassSubmit() {
+      this.$confirm("是否审核通过?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.loading = true;
+        this.inputQuery.auditStatus = 1;
+        auditSupProduct(this.inputQuery).then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.closeRegistrationDialog(true);
+            this.$message.success("保存成功");
+          } else {
+            this.$message.error(response.message);
+          }
+        });
+      }).catch(() => {
+      });
     },
-    data() {
-        return {
-            BASE_URL: process.env.VUE_APP_BASE_API,
-            fromOptions: [],
-            fromPMOptions: [],
-            pmQuery: {
-                customerId: null,
-                companyName: null,
-                page: 1,
-                limit: 10,
-            },
-            loading: false,
-            classesDisplay: false,
-            selectedOptions: [],
-            selectedOptions2: [],
-            options: regionDataPlus,
-            rules: {
-
-                customerId: [
-                    {
-                        required: true,
-                        message: "请选择供应商",
-                        trigger: "change"
-                    }
-                ],
-
-
-                manufacturerIdFk: [
-                    {
-                        required: true,
-                        message: "请选择生产企业",
-                        trigger: "change"
-                    }
-                ],
-
-                recordCode: [
-                    {
-                        required: true,
-                        message: "请输入注册/备案号",
-                        trigger: "blur"
-                    }
-                ],
-                recordProductName: [
-                    {
-                        required: true,
-                        message: "请输入注册/备案产品名称",
-                        trigger: "blur"
-                    }
-                ],
-                productManageType: [
-                    {
-                        required: true,
-                        message: "请选择医疗器械管理类别",
-                        trigger: "change"
-                    }
-                ],
-                productType: [
-                    {
-                        required: true,
-                        message: "请选择器械类别",
-                        trigger: "change"
-                    }
-                ],
-                recordPeopleName: [
-                    {
-                        required: true,
-                        message: "请输入注册/备案人名称",
-                        trigger: "change"
-                    }
-                ],
-                productDirectoryCode: [
-                    {
-                        required: true,
-                        message: "请输入器械目录分类编码",
-                        trigger: "change"
-                    }
-                ],
-                specification: [
-                    {
-                        required: true,
-                        message: "请输入规格型号",
-                        trigger: "change"
-                    }
-                ],
-            },
-            fileList: [],
-            fileList2: [],
-            idQuery: {
-                id: "",
-            },
-
-            certQuery: {
-                customerId: null,
-                manufacturerIdFk: null,
-                page: 1,
-                limit: 20
-            },
-            certList: [],
-            certTotal: 0,
-            certLoading: false,
-            addCertVisible: false,
-            certFileUrl: "",
-            addType: "3", //证书类型：1:供应商；2.生产企业；3.产品品种
-            checkFlag: {
-                0: "草稿",
-                1: "已通过",
-                2: "已拒绝",
-                3: "变更未审核",
-                6: "未审核",
-            },
-            supStatus: {
-                0: "有效",
-                1: "失效",
-            },
-            certAuditVisible: false,
-            currentAudit: {},
-        };
+    isAssetTypeAnImage(ext) {
+      return [
+        'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].
+      indexOf(ext.toLowerCase()) !== -1;
     },
-    created() {
-        if (this.editType == 0) {
-            this.inputQuery.productId = getUUID("");
-        } else {
-            if(this.editType!=2 && this.editType!=0){
-              this.certQuery.auditStatus = 20;
-           }
-            this.getCompanyCertList();
-            this.pmQuery.customerId = this.inputQuery.customerId;
-            this.findPMMethod();
-        }
-
-        this.findMethod();
+    showImgViewer(row){
+      var varindex= row.filePath.lastIndexOf(".");
+      var varext = row.filePath.substring(varindex+1);
+      var isImage=this.isAssetTypeAnImage(varext);
+      if(isImage==true){
         this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+        this.imgList=[];
+        previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => {
+          if (response.code === 20000) {
+            this.imgList.push(response.data);
+          }
+        });
+        this.imgViewerVisible = true;
+        const m = (e) => { e.preventDefault() };
+        document.body.style.overflow = 'hidden';
+        document.addEventListener("touchmove", m, false); // 禁止页面滑动
+      }else{
+        this.toViewCompanyCert(row);
+      }
+
 
     },
-    components: {
-        draggable, companyAddCert
+    closeImgViewer(){
+      this.imgViewerVisible = false;
+      const m = (e) => { e.preventDefault() };
+      document.body.style.overflow = 'auto';
+      document.removeEventListener("touchmove", m, true);
     },
-    methods: {
-
-        onPassSubmit() {
-            this.$confirm("是否审核通过?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.loading = true;
-                this.inputQuery.auditStatus = 1;
-                auditSupProduct(this.inputQuery).then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.closeRegistrationDialog(true);
-                        this.$message.success("保存成功");
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                });
-            }).catch(() => {
-            });
-        },
-
-        onRejectSubmit() {
-            this.$prompt('请输入驳回意见', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-            }).then(({value}) => {
-                this.inputQuery.auditComment = value;
-                this.inputQuery.auditStatus = 2;
-                auditSupProduct(this.inputQuery).then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.closeRegistrationDialog(true);
-                        this.$message.success("保存成功");
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                });
-
-
-            }).catch(() => {
-            });
-        }
-        ,
-
-
-        findMethod(query) {
-            this.fromOptions = [];
-            let cQuery = {
-                companyName: query,
-            };
-            getSupComapnys(cQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.fromOptions = response.data.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                });
-        },
-        supChange(val) {
-            this.pmQuery.customerId = val;
-            this.findPMMethod();
-        },
-        findPMMethod(key) {
-            this.fromPMOptions = [];
-            this.pmQuery.companyName = key;
-            getCompanyList(this.pmQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.fromPMOptions = response.data.list || [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.fromPMOptions = [];
-                    this.total = 0;
-                });
-        },
-        closeLocalDialog() {
-            this.addCertVisible = false;
-            this.getCompanyCertList();
-        },
-
-        addCert(index, row) {
-            this.idQuery.id = '';
-            if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
+    onRejectSubmit() {
+      this.$prompt('请输入结果说明', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+      }).then(({value}) => {
+        this.inputQuery.auditComment = value;
+        this.inputQuery.auditStatus = 2;
+        auditSupProduct(this.inputQuery).then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.closeRegistrationDialog(true);
+            this.$message.success("保存成功");
+          } else {
+            this.$message.error(response.message);
+          }
+        });
+
+
+      }).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 = [];
+      let cQuery = {
+        companyName: query,
+      };
+      getSupComapnys(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.fromOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    supChange(val) {
+      this.pmQuery.customerId = val;
+      this.findPMMethod();
+    },
+    findPMMethod(key) {
+      this.fromPMOptions = [];
+      this.pmQuery.companyName = key;
+      getCompanyList(this.pmQuery)
+        .then((response) => {
+          this.loading = false;
+          this.fromPMOptions = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.fromPMOptions = [];
+          this.total = 0;
+        });
+    },
+    closeLocalDialog() {
+      this.addCertVisible = false;
+      this.getCompanyCertList();
+    },
+
+    addCert(index, row) {
+      this.idQuery.id = '';
+      if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
+        this.idQuery.id = row.id;
+        this.idQuery.formData = row;
+      }
+      this.addCertVisible = true;
+    },
+
+    deleteCompanyCert(row) {
+      this.$confirm("是否删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.certLoading = true;
+        let tquery = {
+          id: row.id,
+          filePath: row.filePath,
+        };
+        deleteCompanyCert(tquery)
+          .then((response) => {
+            this.certLoading = false;
+            if (response.code === 20000) {
+              this.getCompanyCertList();
+              this.$message({
+                type: "success",
+                message: "删除成功！",
+              });
+            } else {
+              this.$message.error(response.message);
             }
-            this.addCertVisible = true;
-        },
-
-        deleteCompanyCert(row) {
-            this.$confirm("是否删除?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.certLoading = true;
-                let tquery = {
-                    id: row.id,
-                    filePath: row.filePath,
-                };
-                deleteCompanyCert(tquery)
-                    .then((response) => {
-                        this.certLoading = false;
-                        if (response.code === 20000) {
-                            this.getCompanyCertList();
-                            this.$message({
-                                type: "success",
-                                message: "删除成功！",
-                            });
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
-                        this.certLoading = false;
-                    });
-            }).catch(() => {
-            });
-        },
-        getCompanyCertList() {
-            this.certLoading = true;
-            this.certQuery.customerId = this.inputQuery.customerId;
-            this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerIdFk;
-            this.certQuery.productIdFk = this.inputQuery.productId;
-            this.certQuery.type = 3;
-            filterCompanyCert(this.certQuery)
-                .then((response) => {
-                    this.certLoading = false;
-                    this.certList = response.data.list || [];
-                    this.certTotal=response.data.total;
-                })
-                .catch(() => {
-                    this.certLoading = false;
-                    this.certList = [];
-                });
-        },
-        toViewCompanyCert(row) {
-            window.open(this.certFileUrl + row.filePath);
-        },
-
-        auditCert(row) {
-            this.certAuditVisible = true;
-            this.currentAudit = row;
-        },
-
-        passAuditCert() {
-            this.currentAudit.auditStatus = 1;
-            this.auditSupCert(this.currentAudit);
-        },
-        rejectAuditCert() {
-            this.currentAudit.auditStatus = 2;
-            this.auditSupCert(this.currentAudit);
-        },
-
-
-        rejectInfo(row) {
-            this.$confirm(row.auditComment, "审核备注", {
-                confirmButtonText: "确定",
-                type: "warning",
-                showCancelButton: false,
-            })
-                .then(() => {
-                });
-
-        },
-
-
-        auditSupCert(inputQuery) {
-            auditSupCert(inputQuery).then(response => {
-                this.loading = false;
-                if (response.code === 20000) {
-                    this.getCompanyCertList();
-                    this.certAuditVisible = false;
-                } else {
-                    this.$message.error(response.message);
-                }
-            });
-        },
-        printSupCert(row) {
-            var selectIds=[row.id];
-            let query = {moduleId: 10};
-            this.loading = true;
-            verifyTemplateFile(query).then((res) => {
-                if (res.code === 20000) {
-                    let printParams = {
-                        templateId: res.data,
-                        ids: selectIds,
-                        id: this.inputQuery.id
-                    };
-                    printSupCertProduction(printParams).then((response) => {
-                        //将pdf文件转换为url。
-                        const binaryData = [];
-                        binaryData.push(response);
-                        //获取blob链接。
-                        let url = window.URL.createObjectURL(
-                            new Blob(binaryData, {type: "application/pdf"})
-                        );
-                        this.loading = false;
-                        window.open(url);//打开新标签页，预览pdf。
-                    })
-                } else {
-                    this.loading = false;
-                    this.$message.error(res.message);
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.$message.error(error.message);
-            })
-        },
-        printSupCertAll() {
-            var certLists=this.$refs.certTable.selection;
-            var  selectIds=[];
-            certLists.forEach(item => {
-                selectIds.push(item.id);
-            })
-            if(selectIds.length==0){
-                this.$message.error("请先选择打印的证书！");
-                return
+          })
+          .catch(() => {
+            this.certLoading = false;
+          });
+      }).catch(() => {
+      });
+    },
+    getCompanyCertList() {
+      this.certLoading = true;
+      this.certQuery.customerId = this.inputQuery.customerId;
+      this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerIdFk;
+      this.certQuery.productIdFk = this.inputQuery.productId;
+      this.certQuery.type = 3;
+      filterCompanyCert(this.certQuery)
+        .then((response) => {
+          this.certLoading = false;
+          this.certList = response.data.list || [];
+          this.certTotal=response.data.total;
+        })
+        .catch(() => {
+          this.certLoading = false;
+          this.certList = [];
+        });
+    },
+    toViewCompanyCert(row) {
+      window.open(this.certFileUrl + row.filePath);
+    },
+
+    auditCert(row) {
+      this.certAuditVisible = true;
+      this.currentAudit = row;
+      this.isOpen=this.currentAudit.auditStatus;
+      this.confirmStatus = this.currentAudit.auditStatus;
+    },
+    revoke(inputQuery) {
+      this.$confirm("是否确定撤回证书状态至未确认?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.certLoading = true;
+        inputQuery.auditStatus = 6
+        revokeSupCert(inputQuery)
+          .then((response) => {
+            this.certLoading = false;
+            if (response.code === 20000) {
+              this.getCompanyCertList();
+            } else {
+              this.$message.error(response.message);
             }
-            let query = {moduleId: 10};
-            this.loading = true;
-            verifyTemplateFile(query).then((res) => {
-                if (res.code === 20000) {
-                    let printParams = {
-                        templateId: res.data,
-                        ids: selectIds,
-                        id: this.inputQuery.id
-                    };
-                    printSupCertProduction(printParams).then((response) => {
-                        //将pdf文件转换为url。
-                        const binaryData = [];
-                        binaryData.push(response);
-                        //获取blob链接。
-                        let url = window.URL.createObjectURL(
-                            new Blob(binaryData, {type: "application/pdf"})
-                        );
-                        this.loading = false;
-                        window.open(url);//打开新标签页，预览pdf。
-                    })
-                } else {
-                    this.loading = false;
-                    this.$message.error(res.message);
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.$message.error(error.message);
-            })
-        },
+          })
+          .catch(() => {
+            this.certLoading = false;
+          });
+      }).catch(() => {
+      });
+
+
+    },
+
+    passAuditCert() {
+      this.currentAudit.auditStatus = 1;
+      this.auditSupCert(this.currentAudit);
+    },
+    rejectAuditCert() {
+      this.currentAudit.auditStatus = 2;
+      this.auditSupCert(this.currentAudit);
+    },
+
+
+    rejectInfo(row) {
+      this.$confirm(row.auditComment, "审核备注", {
+        confirmButtonText: "确定",
+        type: "warning",
+        showCancelButton: false,
+      })
+        .then(() => {
+        });
+
+    },
+
+
+    auditSupCert(inputQuery) {
+      auditSupCert(inputQuery).then(response => {
+        this.loading = false;
+        if (response.code === 20000) {
+          this.getCompanyCertList();
+          this.certAuditVisible = false;
+        } else {
+          this.$message.error(response.message);
+        }
+      });
+    },
+    printSupCert(row) {
+      var selectIds=[row.id];
+      let query = {moduleId: 10};
+      this.loading = true;
+      verifyTemplateFile(query).then((res) => {
+        if (res.code === 20000) {
+          let printParams = {
+            templateId: res.data,
+            ids: selectIds,
+            id: this.inputQuery.id
+          };
+          printSupCertProduction(printParams).then((response) => {
+            //将pdf文件转换为url。
+            const binaryData = [];
+            binaryData.push(response);
+            //获取blob链接。
+            let url = window.URL.createObjectURL(
+              new Blob(binaryData, {type: "application/pdf"})
+            );
+            this.loading = false;
+            window.open(url);//打开新标签页，预览pdf。
+          })
+        } else {
+          this.loading = false;
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+      })
+    },
+    printSupCertAll() {
+      var certLists=this.$refs.certTable.selection;
+      var  selectIds=[];
+      certLists.forEach(item => {
+        selectIds.push(item.id);
+      })
+      if(selectIds.length==0){
+        this.$message.error("请先选择打印的证书！");
+        return
+      }
+      let query = {moduleId: 10};
+      this.loading = true;
+      verifyTemplateFile(query).then((res) => {
+        if (res.code === 20000) {
+          let printParams = {
+            templateId: res.data,
+            ids: selectIds,
+            id: this.inputQuery.id
+          };
+          printSupCertProduction(printParams).then((response) => {
+            //将pdf文件转换为url。
+            const binaryData = [];
+            binaryData.push(response);
+            //获取blob链接。
+            let url = window.URL.createObjectURL(
+              new Blob(binaryData, {type: "application/pdf"})
+            );
+            this.loading = false;
+            window.open(url);//打开新标签页，预览pdf。
+          })
+        } else {
+          this.loading = false;
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+      })
     },
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                0: "warning",
-                1: "success",
-                2: "danger",
-                6: "warning",
-            };
-            return statusMap[status];
-        },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "success",
+        2: "danger",
+        6: "warning",
+      };
+      return statusMap[status];
     },
+  },
 };
 </script>
 <style>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 120px;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 120px;
 }
 
 .text {
-    width: 100%;
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .el-card {
-    margin-right: 20px;
-    margin-top: 15px;
-    /*transition: all .5s;*/
+  margin-right: 20px;
+  margin-top: 15px;
+  /*transition: all .5s;*/
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
 </style>
diff --git a/src/views/purchase/product/supProductEditDialog.vue b/src/views/purchase/product/supProductEditDialog.vue
index e27a8c89..af2fe79a 100644
--- a/src/views/purchase/product/supProductEditDialog.vue
+++ b/src/views/purchase/product/supProductEditDialog.vue
@@ -180,43 +180,70 @@
                             ></el-input>
                         </el-form-item>
                     </el-col>
-                    <!--                    <el-col :span="10" class="el-col">-->
-                    <!--                        <el-form-item label="代理人名称:" label-width="150px" prop="agentName">-->
-                    <!--                            <el-input-->
-                    <!--                                size="small"-->
-                    <!--                                placeholder="请输入内容"-->
-                    <!--                                v-model="inputQuery.agentName"-->
-                    <!--                                @input="change()"-->
-                    <!--                            ></el-input>-->
-                    <!--                        </el-form-item>-->
-                    <!--                    </el-col>-->
                 </el-row>
 
-
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="产品描述:" label-width="150px" prop="cpms">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.cpms"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="规格型号:" label-width="150px" prop="specification" >
-                            <el-input
-                                size="small"
-                                type="textarea"
-                                autosize
-                                placeholder="请输入内容"
-                                v-model="inputQuery.specification"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+              <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="10" class="el-col">
+                  <el-form-item label="允许无批次号" label-width="150px">
+                    <el-select v-model="inputQuery.allowNoBatch"  style="width: 100%" size="small">
+                      <el-option label="是" :value="true"></el-option>
+                      <el-option label="否" :value="false"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="10" class="el-col">
+                  <el-form-item label="允许无失效日期" label-width="150px">
+                    <el-select v-model="inputQuery.allowNoExpire"   style="width: 100%" size="small">
+                      <el-option label="是" :value="true"></el-option>
+                      <el-option label="否" :value="false"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="10" class="el-col">
+                  <el-form-item label="允许无生产日期" label-width="150px">
+                    <el-select v-model="inputQuery.allowNoProduct" style="width: 100%" size="small">
+                      <el-option label="是" :value="true"></el-option>
+                      <el-option label="否" :value="false"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="10" class="el-col">
+                  <el-form-item label="允许无序列号" label-width="150px">
+                    <el-select v-model="inputQuery.allowNoSerial"  style="width: 100%" size="small">
+                      <el-option label="是" :value="true"></el-option>
+                      <el-option label="否" :value="false"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+
+              <!--                <el-row :gutter="20" class="el-row" type="flex">-->
+<!--                    <el-col :span="10" class="el-col">-->
+<!--                        <el-form-item label="产品描述:" label-width="150px" prop="cpms">-->
+<!--                            <el-input-->
+<!--                                size="small"-->
+<!--                                placeholder="请输入内容"-->
+<!--                                v-model="inputQuery.cpms"-->
+<!--                                @input="change()"-->
+<!--                            ></el-input>-->
+<!--                        </el-form-item>-->
+<!--                    </el-col>-->
+<!--                    <el-col :span="10" class="el-col">-->
+<!--                        <el-form-item label="规格型号:" label-width="150px" prop="specification" >-->
+<!--                            <el-input-->
+<!--                                size="small"-->
+<!--                                type="textarea"-->
+<!--                                autosize-->
+<!--                                placeholder="请输入内容"-->
+<!--                                v-model="inputQuery.specification"-->
+<!--                                @input="change()"-->
+<!--                            ></el-input>-->
+<!--                        </el-form-item>-->
+<!--                    </el-col>-->
+<!--                </el-row>-->
 
 
                 <el-row :gutter="20" class="el-row" type="flex">
@@ -254,7 +281,7 @@
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
                 <el-table-column label="证书名称" prop="name"></el-table-column>
                 <el-table-column label="证书编号" prop="name"></el-table-column>
-                <el-table-column label="有效期" prop="vailDate"></el-table-column>
+                <el-table-column label="生效期" prop="vailDate"></el-table-column>
                 <el-table-column label="失效期" prop="expireDate"></el-table-column>
                 <el-table-column label="审核状态" prop="auditStatus" width="120">
                     <template slot-scope="scope">
diff --git a/src/views/remind/supCertRemindMsg.vue b/src/views/remind/supCertRemindMsg.vue
index bb0d7238..58bf9147 100644
--- a/src/views/remind/supCertRemindMsg.vue
+++ b/src/views/remind/supCertRemindMsg.vue
@@ -70,7 +70,7 @@
         <el-table-column type="index" label="序号" width="50"></el-table-column>
         <el-table-column :label="msgName" prop="name" width="160" show-overflow-tooltip></el-table-column>
         <el-table-column label="证书名称" prop="certName" width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column label="有效期" prop="vailDate" width="120"></el-table-column>
+        <el-table-column label="生效期" prop="vailDate" width="120"></el-table-column>
         <el-table-column label="失效期" prop="expireDate" width="120" show-overflow-tooltip></el-table-column>
         <el-table-column label="消息状态" prop="status" width="100">
           <template slot-scope="scope">