From 588090de0aa7121e4c29697eae46580d1f10cce9 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 18 Mar 2024 22:34:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E8=AF=81=E4=B9=A6=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E7=AD=89=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 .env.production                               |  13 +-
 src/api/purchase/supCertRedmindMsg.js         |   9 +
 src/views/basic/product/productEdit.vue       |   2 +-
 src/views/index.vue                           |  22 +-
 src/views/purchase/cert/supCertAddDialog.vue  | 319 +++++-----
 .../purchase/cert/supCertificationAdd.vue     |   2 +-
 .../supManufacturerAuditDialog.vue            |   8 +
 .../supManufacturerEditDialog.vue             |  19 +-
 .../product/supProductAuditDialog.vue         |   8 +-
 .../purchase/product/supProductEditDialog.vue |  16 +-
 src/views/remind/supCertRemindMsg.vue         | 546 +++++++++---------
 .../supplier/products/supDiProductsCheck.vue  |   4 +-
 13 files changed, 507 insertions(+), 463 deletions(-)

diff --git a/.env.development b/.env.development
index 2554ec7..e29fc9f 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@ VUE_APP_TITLE = 供应商自助管理平台
 # 开发环境配置
 ENV = 'development'
 
-VUE_APP_BASE_API = 'http://192.168.0.166:9993'
+VUE_APP_BASE_API = 'http://127.0.0.1:9993'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/'
diff --git a/.env.production b/.env.production
index a6e285b..77d7d93 100644
--- a/.env.production
+++ b/.env.production
@@ -11,16 +11,11 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
 
 # 平潭
-# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
 
 # 文明懂
 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
 
-# 刘恩典
-# VUE_APP_BASE_API = 'http://192.168.0.117:9150/UDI_SPMS_SERVER/'
-# VUE_APP_BASE_API = 'http://192.168.0.117:9170/UDI_SPMS_SERVER/'
-# VUE_APP_BASE_API = 'http://192.168.0.127:9170/UDI_SPMS_SERVER/'
-
 # 漳州中医院
 # VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'
 
@@ -41,11 +36,13 @@ ENV = 'production'
 # 大田
 # VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://122.112.160.36:9160/UDI_SPMS_SERVER/
-# 云霄妇幼'
+# 云霄妇幼
 # VUE_APP_BASE_API = 'http://192.168.0.72:9150/UDI_SPMS_SERVER/'
 
 # 南靖
-VUE_APP_BASE_API = 'http://183.250.74.182:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://183.250.74.182:9150/UDI_SPMS_SERVER/'
+
+# VUE_APP_BASE_API = 'http://192.168.20.128:9150/UDI_SPMS_SERVER/'
 
 # 东山
 # VUE_APP_BASE_API = 'http://116.204.108.228:9150/UDI_SPMS_SERVER/'
diff --git a/src/api/purchase/supCertRedmindMsg.js b/src/api/purchase/supCertRedmindMsg.js
index d2c35d9..0e2c9c3 100644
--- a/src/api/purchase/supCertRedmindMsg.js
+++ b/src/api/purchase/supCertRedmindMsg.js
@@ -8,6 +8,15 @@ export function getSupCertRemindMsgList(params) {
   });
 }
 
+export function getSupCertgetCount(params) {
+  return axios({
+    url: "/sup/cert/remind/msg/getCount",
+    method: "get",
+    params: params
+  });
+}
+
+
 export function confirmMsg(params) {
   return axios({
     url: "/sup/cert/remind/msg/confirmMsg",
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index a0db19f..e0b7a20 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -391,7 +391,7 @@
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="editQuery.attributeType" style="width: 65%" placeholder="选择耗材类别" clearable>
+                <el-select v-model="editQuery.hcType" style="width: 65%" placeholder="选择耗材类别" clearable>
                   <el-option label="高值耗材" :value="1"></el-option>
                   <el-option label="普通耗材" :value="2"></el-option>
                 </el-select>
diff --git a/src/views/index.vue b/src/views/index.vue
index 26ea422..d86b596 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -37,7 +37,7 @@
               </div>
             </el-image>
           </div>
-          <div class="height-full fr center mr20">
+          <div class="height-full fr center mr20" @click="linkPage('/remind/invRemindMsg')">
               <span class="header d-block">
                 库存预警
               </span>
@@ -58,12 +58,13 @@
               </div>
             </el-image>
           </div>
-          <div class="height-full fr center mr20">
+          <div class="height-full fr center mr20" @click="linkPage('/remind/sup/certRemind')">
               <span class="header d-block">
                 资质预警
               </span>
-            <span class="d-block mt10" :style="{'font-size': '32px','font-weight': 'bolder',color:'#FF0000'}">
-                {{ invMsgCount }}
+            <span class="d-block mt10" :style="{'font-size': '32px','font-weight': 'bolder',color:'#FF0000'}"
+            >
+                {{ certMsgCount }}
               </span>
           </div>
         </el-row>
@@ -81,7 +82,7 @@
               重新加载
             </el-button>
             <el-button type="text" style="font-size: 15px;color: unset"
-                       @click.stop="linkPage('/system/msg/sysMsgTodo')">
+                       @click.stop="">
               更多
               <el-icon class="el-icon-d-arrow-right"/>
             </el-button>
@@ -216,7 +217,7 @@ import invSvg from "@/assets/svg/库存预警.svg"
 import certSvg from "@/assets/svg/资质预警.svg"
 import {getInvRemindMsgList} from "../api/system/invRemindMsg";
 import {getUdiInfos} from "../api/basic/udiRelevance";
-import {getSupCertRemindMsgList} from "../api/purchase/supCertRedmindMsg";
+import {getSupCertgetCount, getSupCertRemindMsgList} from "../api/purchase/supCertRedmindMsg";
 
 export default {
   name: "Index",
@@ -277,12 +278,13 @@ export default {
         status: 1,
         ignoreStatus: 0
       }
-      getSupCertRemindMsgList(param).then(res => {
-        this.certMsgCount = res.data?.total || 0
+      getSupCertgetCount(param).then(res => {
+        this.certMsgCount = res.data
       })
     },
     linkPage(path) {
-      this.$router.push({path})
+      console.log(path)
+      this.$router.push(path)
     },
     getSysMsgTodoList() {
       this.msgLoading = true
@@ -329,7 +331,7 @@ export default {
           this.orderList = [];
           this.orderTotal = 0;
         });
-    }
+    },
   },
 };
 </script>
diff --git a/src/views/purchase/cert/supCertAddDialog.vue b/src/views/purchase/cert/supCertAddDialog.vue
index 74d670b..5f82735 100644
--- a/src/views/purchase/cert/supCertAddDialog.vue
+++ b/src/views/purchase/cert/supCertAddDialog.vue
@@ -7,142 +7,143 @@
                      :loading="loading">提交
           </el-button>
         </el-button-group>
-<!--        <el-row>-->
-<!--          <el-col :span="3">-->
-<!--            <div class="ao-text">-->
-<!--              <span>证书名称：</span>-->
-<!--            </div>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item prop="name">-->
-<!--              <el-input v-model="formData.name" auto-complete="off" :disabled="formData.auditStatus == 1" :maxlength="30"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-<!--          <el-col :span="3">-->
-<!--            <div class="ao-text">-->
-<!--              <span>证书编号：</span>-->
-<!--            </div>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item prop="code">-->
-<!--              <el-input v-model="formData.code" auto-complete="off" :disabled="formData.auditStatus == 1"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </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="vailDate">-->
-
-<!--              <el-date-picker-->
-<!--                v-model="formData.vailDate"-->
-<!--                type="date"-->
-<!--                :disabled="formData.auditStatus == 1"-->
-<!--                value-format="yyyy-MM-dd"-->
-<!--                style="width: 100%"-->
-<!--                placeholder="请选择生效期">-->
-<!--              </el-date-picker>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-<!--          <el-col :span="3">-->
-<!--            <div class="ao-text">-->
-<!--              <span>失效期：</span>-->
-<!--            </div>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item prop="expireDate">-->
-
-<!--              <el-date-picker-->
-<!--                v-model="formData.expireDate"-->
-<!--                type="date"-->
-<!--                :disabled="formData.auditStatus == 1"-->
-<!--                value-format="yyyy-MM-dd"-->
-<!--                style="width: 100%"-->
-<!--                placeholder="请选择失效期">-->
-<!--              </el-date-picker>-->
-
-<!--            </el-form-item>-->
-<!--          </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="remark">-->
-<!--              <el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-<!--        </el-row>-->
-
-<!--        &lt;!&ndash;                <el-row :gutter="20">&ndash;&gt;-->
-<!--        &lt;!&ndash;                    <el-col :span="4">&ndash;&gt;-->
-<!--        &lt;!&ndash;                    </el-col>&ndash;&gt;-->
-<!--        &lt;!&ndash;                    <el-col :span="16">&ndash;&gt;-->
-<!--        &lt;!&ndash;                        <div style="color: red">&ndash;&gt;-->
-<!--        &lt;!&ndash;                            需要上传档案为：营业执照电子档案，经营许可证电子档案，经营备案证电子档案，开户行电子档案。&ndash;&gt;-->
-<!--        &lt;!&ndash;                        </div>&ndash;&gt;-->
-<!--        &lt;!&ndash;                    </el-col>&ndash;&gt;-->
-<!--        &lt;!&ndash;                </el-row>&ndash;&gt;-->
-
-<!--        <el-row>-->
-<!--          <el-col :span="3">-->
-<!--            <div class="ao-text">-->
-<!--              <span>文件：</span>-->
-<!--            </div>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item>-->
-<!--              <el-upload-->
-<!--                :disabled="formData.auditStatus == 1"-->
-<!--                class="upload-demo"-->
-<!--                ref="upload"-->
-<!--                :action="this.uploadUrl"-->
-<!--                :on-preview="uploadHandlePreview"-->
-<!--                :on-remove="uploadHandleRemove"-->
-<!--                :headers="headers"-->
-<!--                :on-exceed="uploadHandleExceed"-->
-<!--                accept=".jpg,.png"-->
-<!--                :on-change="uploadOnchange"-->
-<!--                :on-success="uploadHandleSuccess"-->
-<!--                :on-error="uploadHandleError"-->
-<!--                :file-list="fileList"-->
-<!--                :data="{type:'image2'}"-->
-<!--                :auto-upload="true">-->
-<!--                <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">-->
-<!--                  {{ choiceFile }}-->
-<!--                </el-button>-->
-<!--                <div>只能上传 jpg,png 文件，且不超过 3 MB</div>-->
-<!--              </el-upload>-->
-<!--              &lt;!&ndash;                            <el-button type="primary" size="mini" icon="search" @click="toViewCompanyCert"&ndash;&gt;-->
-<!--              &lt;!&ndash;                                       style="text-align:right"&ndash;&gt;-->
-<!--              &lt;!&ndash;                            >文件预览&ndash;&gt;-->
-<!--              &lt;!&ndash;                            </el-button&ndash;&gt;-->
-<!--              &lt;!&ndash;                            >&ndash;&gt;-->
-
-<!--            </el-form-item>-->
-<!--          </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="name">-->
+        <!--              <el-input v-model="formData.name" auto-complete="off" :disabled="formData.auditStatus == 1" :maxlength="30"></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+
+        <!--          <el-col :span="3">-->
+        <!--            <div class="ao-text">-->
+        <!--              <span>证书编号：</span>-->
+        <!--            </div>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item prop="code">-->
+        <!--              <el-input v-model="formData.code" auto-complete="off" :disabled="formData.auditStatus == 1"></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </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="vailDate">-->
+
+        <!--              <el-date-picker-->
+        <!--                v-model="formData.vailDate"-->
+        <!--                type="date"-->
+        <!--                :disabled="formData.auditStatus == 1"-->
+        <!--                value-format="yyyy-MM-dd"-->
+        <!--                style="width: 100%"-->
+        <!--                placeholder="请选择生效期">-->
+        <!--              </el-date-picker>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+
+        <!--          <el-col :span="3">-->
+        <!--            <div class="ao-text">-->
+        <!--              <span>失效期：</span>-->
+        <!--            </div>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item prop="expireDate">-->
+
+        <!--              <el-date-picker-->
+        <!--                v-model="formData.expireDate"-->
+        <!--                type="date"-->
+        <!--                :disabled="formData.auditStatus == 1"-->
+        <!--                value-format="yyyy-MM-dd"-->
+        <!--                style="width: 100%"-->
+        <!--                placeholder="请选择失效期">-->
+        <!--              </el-date-picker>-->
+
+        <!--            </el-form-item>-->
+        <!--          </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="remark">-->
+        <!--              <el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+
+        <!--        </el-row>-->
+
+        <!--        &lt;!&ndash;                <el-row :gutter="20">&ndash;&gt;-->
+        <!--        &lt;!&ndash;                    <el-col :span="4">&ndash;&gt;-->
+        <!--        &lt;!&ndash;                    </el-col>&ndash;&gt;-->
+        <!--        &lt;!&ndash;                    <el-col :span="16">&ndash;&gt;-->
+        <!--        &lt;!&ndash;                        <div style="color: red">&ndash;&gt;-->
+        <!--        &lt;!&ndash;                            需要上传档案为：营业执照电子档案，经营许可证电子档案，经营备案证电子档案，开户行电子档案。&ndash;&gt;-->
+        <!--        &lt;!&ndash;                        </div>&ndash;&gt;-->
+        <!--        &lt;!&ndash;                    </el-col>&ndash;&gt;-->
+        <!--        &lt;!&ndash;                </el-row>&ndash;&gt;-->
+
+        <!--        <el-row>-->
+        <!--          <el-col :span="3">-->
+        <!--            <div class="ao-text">-->
+        <!--              <span>文件：</span>-->
+        <!--            </div>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item>-->
+        <!--              <el-upload-->
+        <!--                :disabled="formData.auditStatus == 1"-->
+        <!--                class="upload-demo"-->
+        <!--                ref="upload"-->
+        <!--                :action="this.uploadUrl"-->
+        <!--                :on-preview="uploadHandlePreview"-->
+        <!--                :on-remove="uploadHandleRemove"-->
+        <!--                :headers="headers"-->
+        <!--                :on-exceed="uploadHandleExceed"-->
+        <!--                accept=".jpg,.png"-->
+        <!--                :on-change="uploadOnchange"-->
+        <!--                :on-success="uploadHandleSuccess"-->
+        <!--                :on-error="uploadHandleError"-->
+        <!--                :file-list="fileList"-->
+        <!--                :data="{type:'image2'}"-->
+        <!--                :auto-upload="true">-->
+        <!--                <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">-->
+        <!--                  {{ choiceFile }}-->
+        <!--                </el-button>-->
+        <!--                <div>只能上传 jpg,png 文件，且不超过 3 MB</div>-->
+        <!--              </el-upload>-->
+        <!--              &lt;!&ndash;                            <el-button type="primary" size="mini" icon="search" @click="toViewCompanyCert"&ndash;&gt;-->
+        <!--              &lt;!&ndash;                                       style="text-align:right"&ndash;&gt;-->
+        <!--              &lt;!&ndash;                            >文件预览&ndash;&gt;-->
+        <!--              &lt;!&ndash;                            </el-button&ndash;&gt;-->
+        <!--              &lt;!&ndash;                            >&ndash;&gt;-->
+
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
         <template v-for="(itemRow, indexRow) in fromList">
           <el-row :gutter="20" class="el-row" type="flex">
             <template v-for="(item, index) in itemRow.list">
               <el-col :span="item.width" class="el-col" type="flex">
                 <div class="text item">
-                  <el-form-item v-if="item.columnType =='input' && executeEval(row,item.expression,true)"  :rules="item.checkRulesObj" :prop="item.columnName">
+                  <el-form-item v-if="item.columnType =='input' && executeEval(row,item.expression,true)"
+                                :rules="item.checkRulesObj" :prop="item.columnName">
                             <span slot="label">
-                              {{item.columnDesc}}
+                              {{ item.columnDesc }}
                             </span>
                     <el-input
                       v-model="formData[item.columnName]"
@@ -155,9 +156,10 @@
                     ></el-input>
                   </el-form-item>
 
-                  <el-form-item v-if="item.columnType =='radio' && executeEval(row,item.expression,true)" :prop="item.columnName">
+                  <el-form-item v-if="item.columnType =='radio' && executeEval(row,item.expression,true)"
+                                :prop="item.columnName">
                             <span slot="label">
-                              {{item.columnDesc}}
+                              {{ item.columnDesc }}
                             </span>
                     <el-radio-group :style="item.style" v-model="formData[item.columnName]">
                       <el-radio
@@ -165,13 +167,15 @@
                         :key="parseInt(dict.value)"
                         :label="parseInt(dict.value)"
                         :disabled="executeEval(null,item.disabledFuc,false)"
-                      >{{dict.label}}</el-radio>
+                      >{{ dict.label }}
+                      </el-radio>
                     </el-radio-group>
                   </el-form-item>
 
-                  <el-form-item v-if="item.columnType =='select' && executeEval(row,item.expression,true)" :prop="item.columnName">
+                  <el-form-item v-if="item.columnType =='select' && executeEval(row,item.expression,true)"
+                                :prop="item.columnName">
                             <span slot="label">
-                              {{item.columnDesc}}
+                              {{ item.columnDesc }}
                             </span>
                     <el-select v-model="formData[item.columnName]"
                                :style="item.style"
@@ -185,9 +189,10 @@
                       />
                     </el-select>
                   </el-form-item>
-                  <el-form-item v-if="item.columnType =='selectCustom' && executeEval(row,item.expression,true)" :prop="item.columnName">
+                  <el-form-item v-if="item.columnType =='selectCustom' && executeEval(row,item.expression,true)"
+                                :prop="item.columnName">
                             <span slot="label">
-                              {{item.columnDesc}}
+                              {{ item.columnDesc }}
                             </span>
                     <el-radio-group v-model="formData[item.columnName]"
                                     @change="handleCheckedChange"
@@ -199,9 +204,10 @@
                       </el-radio>
                     </el-radio-group>
                   </el-form-item>
-                  <el-form-item v-if="item.columnType =='date' && executeEval(row,item.expression,true)"  :rules="item.checkRulesObj" :prop="item.columnName">
+                  <el-form-item v-if="item.columnType =='date' && executeEval(row,item.expression,true)"
+                                :rules="item.checkRulesObj" :prop="item.columnName">
                             <span slot="label">
-                              {{item.columnDesc}}
+                              {{ item.columnDesc }}
                             </span>
                     <el-date-picker
                       v-model="formData[item.columnName]"
@@ -212,9 +218,10 @@
                       :placeholder="item.columnDesc"
                     ></el-date-picker>
                   </el-form-item>
-                  <el-form-item v-if="item.columnType =='treeCustom' && executeEval(row,item.expression,true)" :prop="item.columnName">
+                  <el-form-item v-if="item.columnType =='treeCustom' && executeEval(row,item.expression,true)"
+                                :prop="item.columnName">
                             <span slot="label">
-                              {{item.columnDesc}}
+                              {{ item.columnDesc }}
                             </span>
                     <treeselect
                       v-model="formData[item.columnName]"
@@ -244,7 +251,7 @@
               :on-remove="uploadHandleRemove"
               :headers="headers"
               :on-exceed="uploadHandleExceed"
-              accept=".jpg,.png"
+              accept=".jpg,.png,.pdf,.doc"
               :on-change="uploadOnchange"
               :on-success="uploadHandleSuccess"
               :on-error="uploadHandleError"
@@ -254,7 +261,7 @@
               <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
                 {{ choiceFile }}
               </el-button>
-              <div>只能上传 jpg,png 文件，且不超过 3 MB</div>
+              <div>只能上传 jpg,png,pdf,doc 文件，且不超过 10 MB</div>
             </el-upload>
           </el-form-item>
         </el-row>
@@ -270,7 +277,7 @@ import store from "../../../store";
 import {insertCompanyCert, updateCompanyCert} from "../../../api/purchase/companyCert";
 import ElImageViewer from "element-ui/packages/image/src/image-viewer"
 import {
-  getHead,executeFuc
+  getHead, executeFuc
 } from "@/utils/customConfig";
 
 export default {
@@ -320,10 +327,10 @@ export default {
       loading: false,
       uploadUrl: "",
       fileList: [],
-      tableHeader:[],
-      queryList:[],
-      fromList:[],
-      tableObj:[],
+      tableHeader: [],
+      queryList: [],
+      fromList: [],
+      tableObj: [],
       headers: {},
       choiceFile: "选取文件",
 
@@ -437,7 +444,11 @@ export default {
       let uid = file.uid
       let pos = fileName.lastIndexOf(".");
       let lastName = fileName.substring(pos, fileName.length);
-      if (lastName.toLowerCase() !== ".jpg" && lastName.toLowerCase() !== ".png" && lastName.toLowerCase() !== ".doc") {
+      if (lastName.toLowerCase() !== ".jpg"
+        && lastName.toLowerCase() !== ".png"
+        && lastName.toLowerCase() !== ".doc" && lastName.toLowerCase() !== ".pdf"
+
+      ) {
         this.$message.error("上传文件只能是 jpg,png格式");
         for (let i = 0; i < fileList.length; i++) {//从list删除
           if (fileList[i].uid === uid) {
@@ -478,11 +489,11 @@ export default {
       this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
       window.open(this.certFileUrl + this.formData.filePath);
     },
-    executeFuc(row,type,clickFuc,value){
-      return executeFuc(this,row,type,clickFuc,value);
+    executeFuc(row, type, clickFuc, value) {
+      return executeFuc(this, row, type, clickFuc, value);
     },
-    executeEval(row,expression,defaultRet){
-      if(expression){
+    executeEval(row, expression, defaultRet) {
+      if (expression) {
         return eval(expression);
       }
       return defaultRet;
@@ -497,7 +508,7 @@ export default {
   },
   created() {
     this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
-    getHead("basicCompany","1").then((re) => {
+    getHead("basicCompany", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
       this.tableHeader = re.data.tableList;
diff --git a/src/views/purchase/cert/supCertificationAdd.vue b/src/views/purchase/cert/supCertificationAdd.vue
index ec96ace..c217010 100644
--- a/src/views/purchase/cert/supCertificationAdd.vue
+++ b/src/views/purchase/cert/supCertificationAdd.vue
@@ -576,7 +576,7 @@
         <!--            </el-button>-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <template v-for="(item, index) in tableHeader">
+        <template v-for="(item, index) in tableHeader2">
           <el-table-column
             v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
             type="index" :label="item.columnDesc"></el-table-column>
diff --git a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
index 078e009..49b0c15 100644
--- a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
@@ -567,6 +567,14 @@ export default {
     showImgViewer(row) {
       // let newWindow = window.open();
       // newWindow.document.write(row.filePath)
+
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      if (row.filePath.toLowerCase().slice(-5).includes(".pdf")) {
+        window.open(this.certFileUrl + row.filePath.replace(",", ""));
+        return
+      }
+
+
       this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
       this.imgList = [];
       previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
diff --git a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
index d628014..cc4021a 100644
--- a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
@@ -306,7 +306,7 @@
 </template>
 
 <script>
-import { getCompanyInfo, addOrModifyCompany } from '../../../api/purchase/supManufacturer'
+import {getCompanyInfo, addOrModifyCompany} from '../../../api/purchase/supManufacturer'
 import {
   provinceAndCityData,
   regionData,
@@ -315,11 +315,11 @@ import {
   CodeToText,
   TextToCode
 } from 'element-china-area-data'
-import { filterCompanyCert, deleteCompanyCert, updateCompanyCert } from '../../../api/purchase/companyCert'
+import {filterCompanyCert, deleteCompanyCert, updateCompanyCert} from '../../../api/purchase/companyCert'
 import companyAddCert from '@/views/purchase/cert/supCertAddDialog'
 import draggable from 'vuedraggable'
-import { getSupComapnys, previewImage } from '@/api/purchase/supCompany'
-import { getUUID } from '@/utils/strUtil'
+import {getSupComapnys, previewImage} from '@/api/purchase/supCompany'
+import {getUUID} from '@/utils/strUtil'
 import supCertSetSelectDialog from '@/views/purchase/cert/supCertSetSelectDialog'
 import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
 
@@ -529,7 +529,7 @@ export default {
       this.getCompanyCertList()
     },
     companyTypeChange(val) {
-      if (this.inputQuery.companyType == 1 &&  this.inputQuery.agentName!=null) {
+      if (this.inputQuery.companyType == 1 && this.inputQuery.agentName != null) {
         this.inputQuery.agentName = null
       }
     },
@@ -605,9 +605,16 @@ export default {
     showImgViewer(row) {
       // let newWindow = window.open();
       // newWindow.document.write(row.filePath)
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      if (row.filePath.toLowerCase().slice(-5).includes(".pdf")) {
+        window.open(this.certFileUrl + row.filePath.replace(",", ""));
+        return
+      }
+
+
       this.certFileUrl = this.BASE_URL + '/udiwms/image/register/file/getImage?type=image2&name='
       this.imgList = []
-      previewImage({ imageUrl: row.filePath, certFileUrl: this.certFileUrl }).then(response => {
+      previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
         if (response.code === 20000) {
           this.imgList = response.data
         }
diff --git a/src/views/purchase/product/supProductAuditDialog.vue b/src/views/purchase/product/supProductAuditDialog.vue
index 3d21831..c4bd39e 100644
--- a/src/views/purchase/product/supProductAuditDialog.vue
+++ b/src/views/purchase/product/supProductAuditDialog.vue
@@ -579,8 +579,12 @@ export default {
         'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
     },
     showImgViewer(row) {
-      // let newWindow = window.open();
-      // newWindow.document.write(row.filePath)
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      if (row.filePath.toLowerCase().slice(-5).includes(".pdf")) {
+        window.open(this.certFileUrl + row.filePath.replace(",", ""));
+        return
+      }
+
       this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
       this.imgList = [];
       previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
diff --git a/src/views/purchase/product/supProductEditDialog.vue b/src/views/purchase/product/supProductEditDialog.vue
index 05cb913..807742c 100644
--- a/src/views/purchase/product/supProductEditDialog.vue
+++ b/src/views/purchase/product/supProductEditDialog.vue
@@ -546,10 +546,10 @@ export default {
   methods: {
     onModifySubmit(val) {
       if (val != 0) {
-        if (this.cuStatus != 1) {
-          this.$message.error("生产企业未通过审核不能提交！");
-          return;
-        }
+        // if (this.cuStatus != 1) {
+        //   this.$message.error("生产企业未通过审核不能提交！");
+        //   return;
+        // }
       }
       if (val == 3) {
         this.$confirm("已审核通过，是否需要重新提交变更", {
@@ -664,10 +664,14 @@ export default {
         'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
     },
     showImgViewer(row) {
-      // let newWindow = window.open();
-      // newWindow.document.write(row.filePath)
+
       this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      if (row.filePath.toLowerCase().slice(-5).includes(".pdf")) {
+        window.open(this.certFileUrl + row.filePath.replace(",", ""));
+        return
+      }
       this.imgList = [];
+
       previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
         if (response.code === 20000) {
           this.imgList = response.data;
diff --git a/src/views/remind/supCertRemindMsg.vue b/src/views/remind/supCertRemindMsg.vue
index 29a2d39..bc15742 100644
--- a/src/views/remind/supCertRemindMsg.vue
+++ b/src/views/remind/supCertRemindMsg.vue
@@ -2,149 +2,149 @@
   <div>
     <el-card class="el-card">
       <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
-<!--        <el-row>-->
-<!--          <el-col :span="6" v-if="this.ckeck">-->
-<!--            <el-form-item class="query-form-item" label="配送企业名称:">-->
-<!--              <el-input v-model="filterQuery.name" placeholder="配送企业名称"-->
-<!--                        style="width: 90%"-->
-<!--                        clearable="true"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-<!--          <el-col :span="6">-->
-<!--            <el-form-item class="query-form-item" label="证书名称:">-->
-<!--              <el-input v-model="filterQuery.certName" placeholder="证书名称"-->
-<!--                        style="width: 90%"-->
-<!--                        clearable="true"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-<!--          <el-col :span="6">-->
-<!--            <el-form-item class="query-form-item" label="状态:">-->
-<!--              <el-select v-model="filterQuery.status"-->
-<!--                         placeholder="请选择消息状态"-->
-<!--                         clearable-->
-<!--                         style="width: 90%"-->
-<!--              >-->
-<!--                <el-option label="未确认" :value="1"></el-option>-->
-<!--                <el-option label="已确认" :value="2"></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          &lt;!&ndash;          <el-col :span="6">&ndash;&gt;-->
-<!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="忽略状态:">&ndash;&gt;-->
-<!--          &lt;!&ndash;              <el-select v-model="filterQuery.ignoreStatus"&ndash;&gt;-->
-<!--          &lt;!&ndash;                         placeholder="请选择消息忽略状态"&ndash;&gt;-->
-<!--          &lt;!&ndash;                         clearable&ndash;&gt;-->
-<!--          &lt;!&ndash;                         style="width: 90%"&ndash;&gt;-->
-<!--          &lt;!&ndash;              >&ndash;&gt;-->
-<!--          &lt;!&ndash;                <el-option label="不忽略" :value="0"></el-option>&ndash;&gt;-->
-<!--          &lt;!&ndash;                <el-option label="忽略7天" :value="1"></el-option>&ndash;&gt;-->
-<!--          &lt;!&ndash;                <el-option label="忽略15天" :value="2"></el-option>&ndash;&gt;-->
-<!--          &lt;!&ndash;                <el-option label="忽略30天" :value="3"></el-option>&ndash;&gt;-->
-<!--          &lt;!&ndash;              </el-select>&ndash;&gt;-->
-<!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
-<!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
-
-<!--          <el-col :span="6">-->
-<!--            <el-form-item class="query-form-item" label="预警类型:">-->
-<!--              <el-select v-model="filterQuery.type"-->
-<!--                         placeholder="请选择消息状态"-->
-<!--                         clearable-->
-<!--                         style="width: 90%"-->
-<!--                         @change="typeChange"-->
-<!--              >-->
-<!--                <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-row>-->
-        <el-row style=" display:flex;  flex-wrap: wrap; ">
-          <template v-for="(item, index) in queryList" >
-            <el-form-item v-if="item.columnType == 'input' && item.columnName !='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
-              <el-input
-                v-model="filterQuery[item.columnName]"
-                :placeholder="item.columnDesc"
-                :disabled="executeEval(null,item.disabledFuc,false)"
-                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
-                clearable
-              ></el-input>
+        <el-row>
+          <el-col :span="6" v-if="this.ckeck">
+            <el-form-item class="query-form-item" label="配送企业名称:">
+              <el-input v-model="filterQuery.name" placeholder="配送企业名称"
+                        style="width: 90%"
+                        clearable="true"></el-input>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
-              <el-autocomplete
-                class="inline-input"
-                style="width: 90%"
-                v-model="queryName"
-                :fetch-suggestions="queryProductName"
-                placeholder="请输入内容"
-                clearable
-                @select="handleSelect"
-                @clear="clearQueryProduct"
-              ></el-autocomplete>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="证书名称:">
+              <el-input v-model="filterQuery.certName" placeholder="证书名称"
+                        style="width: 90%"
+                        clearable="true"></el-input>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-              <el-select v-model="filterQuery[item.columnName]"
-                         :placeholder="item.columnDesc"
-                         :disabled="executeEval(null,item.disabledFuc,false)"
-                         @change="executeFuc($event,'5',item.checkRules)"
-                         clearable>
-                <el-option
-                  v-for="dict in item.lableRuleObj"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-                <span style="float: left">{{ item.name }}</span>
-                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="状态:">
+              <el-select v-model="filterQuery.status"
+                         placeholder="请选择消息状态"
+                         clearable
+                         style="width: 90%"
+              >
+                <el-option label="未确认" :value="1"></el-option>
+                <el-option label="已确认" :value="2"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-              <el-select
-                v-model="filterQuery[item.columnName]"
-                :placeholder="item.columnDesc"
-                :disabled="executeEval(null,item.disabledFuc,false)"
-                @change="executeFuc($event,'5',item.checkRules)"
-                filterable
-                remote
-                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
-                clearable>
-                <el-option
-                  v-for="item in options[item.clickFuc]"
-                  :key="item.code"
-                  :label="item.label"
-                  :value="item.code"
-                />
-                <span style="float: left">{{ item.name }}</span>
-                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+          </el-col>
+          <!--          <el-col :span="6">-->
+          <!--            <el-form-item class="query-form-item" label="忽略状态:">-->
+          <!--              <el-select v-model="filterQuery.ignoreStatus"-->
+          <!--                         placeholder="请选择消息忽略状态"-->
+          <!--                         clearable-->
+          <!--                         style="width: 90%"-->
+          <!--              >-->
+          <!--                <el-option label="不忽略" :value="0"></el-option>-->
+          <!--                <el-option label="忽略7天" :value="1"></el-option>-->
+          <!--                <el-option label="忽略15天" :value="2"></el-option>-->
+          <!--                <el-option label="忽略30天" :value="3"></el-option>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="预警类型:">
+              <el-select v-model="filterQuery.type"
+                         placeholder="请选择消息状态"
+                         clearable
+                         style="width: 90%"
+                         @change="typeChange"
+              >
+                <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-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-              <el-date-picker
-                :picker-options="pickerOptions"
-                v-model="actDateRange"
-                type="daterange"
-                format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              ></el-date-picker>
-            </el-form-item>
-            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-              <el-date-picker
-                v-model="filterQuery[item.columnName]"
-                :style="`width:${item.width+'px'}`"
-                value-format="yyyy-MM-dd"
-                :disabled="executeEval(null,item.disabledFuc,false)"
-                type="date"
-                :placeholder="item.columnDesc"
-              ></el-date-picker>
-            </el-form-item>
-          </template>
+          </el-col>
+
         </el-row>
+<!--        <el-row style=" display:flex;  flex-wrap: wrap; ">-->
+<!--          <template v-for="(item, index) in queryList" >-->
+<!--            <el-form-item v-if="item.columnType == 'input' && item.columnName !='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">-->
+<!--              <el-input-->
+<!--                v-model="filterQuery[item.columnName]"-->
+<!--                :placeholder="item.columnDesc"-->
+<!--                :disabled="executeEval(null,item.disabledFuc,false)"-->
+<!--                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
+<!--                clearable-->
+<!--              ></el-input>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">-->
+<!--              <el-autocomplete-->
+<!--                class="inline-input"-->
+<!--                style="width: 90%"-->
+<!--                v-model="queryName"-->
+<!--                :fetch-suggestions="queryProductName"-->
+<!--                placeholder="请输入内容"-->
+<!--                clearable-->
+<!--                @select="handleSelect"-->
+<!--                @clear="clearQueryProduct"-->
+<!--              ></el-autocomplete>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">-->
+<!--              <el-select v-model="filterQuery[item.columnName]"-->
+<!--                         :placeholder="item.columnDesc"-->
+<!--                         :disabled="executeEval(null,item.disabledFuc,false)"-->
+<!--                         @change="executeFuc($event,'5',item.checkRules)"-->
+<!--                         clearable>-->
+<!--                <el-option-->
+<!--                  v-for="dict in item.lableRuleObj"-->
+<!--                  :key="dict.value"-->
+<!--                  :label="dict.label"-->
+<!--                  :value="dict.value"-->
+<!--                />-->
+<!--                <span style="float: left">{{ item.name }}</span>-->
+<!--                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">-->
+<!--              <el-select-->
+<!--                v-model="filterQuery[item.columnName]"-->
+<!--                :placeholder="item.columnDesc"-->
+<!--                :disabled="executeEval(null,item.disabledFuc,false)"-->
+<!--                @change="executeFuc($event,'5',item.checkRules)"-->
+<!--                filterable-->
+<!--                remote-->
+<!--                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"-->
+<!--                clearable>-->
+<!--                <el-option-->
+<!--                  v-for="item in options[item.clickFuc]"-->
+<!--                  :key="item.code"-->
+<!--                  :label="item.label"-->
+<!--                  :value="item.code"-->
+<!--                />-->
+<!--                <span style="float: left">{{ item.name }}</span>-->
+<!--                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">-->
+<!--              <el-date-picker-->
+<!--                :picker-options="pickerOptions"-->
+<!--                v-model="actDateRange"-->
+<!--                type="daterange"-->
+<!--                format="yyyy 年 MM 月 dd 日"-->
+<!--                value-format="yyyy-MM-dd"-->
+<!--                range-separator="至"-->
+<!--                start-placeholder="开始日期"-->
+<!--                end-placeholder="结束日期"-->
+<!--              ></el-date-picker>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">-->
+<!--              <el-date-picker-->
+<!--                v-model="filterQuery[item.columnName]"-->
+<!--                :style="`width:${item.width+'px'}`"-->
+<!--                value-format="yyyy-MM-dd"-->
+<!--                :disabled="executeEval(null,item.disabledFuc,false)"-->
+<!--                type="date"-->
+<!--                :placeholder="item.columnDesc"-->
+<!--              ></el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </template>-->
+<!--        </el-row>-->
       </el-form>
 
       <div class="top-right-btn">
@@ -157,135 +157,137 @@
       <el-divider style="margin: 15px"></el-divider>
 
       <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="msgName" prop="name" width="180" show-overflow-tooltip></el-table-column>-->
-<!--        <el-table-column label="证书名称" prop="certName" width="180" show-overflow-tooltip></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="120">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-tag>{{ statusMap[scope.row.status] }}</el-tag>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        &lt;!&ndash;        <el-table-column label="忽略预警" prop="ignoreStatus" width="100">&ndash;&gt;-->
-<!--        &lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
-<!--        &lt;!&ndash;            <el-tag>{{ ignoreStatusMap[scope.row.ignoreStatus] }}</el-tag>&ndash;&gt;-->
-<!--        &lt;!&ndash;          </template>&ndash;&gt;-->
-<!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="供应商" prop="name" width="180" show-overflow-tooltip  v-if="filterQuery.type!=1"></el-table-column>
+        <el-table-column :label="msgName" prop="name" width="180" show-overflow-tooltip></el-table-column>
 
-<!--        <el-table-column label="预警次数" prop="remindCount" width="120" show-overflow-tooltip></el-table-column>-->
-<!--        <el-table-column label="预警类型" prop="type" width="120">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-tag>{{ typeMap[scope.row.type] }}</el-tag>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="预警内容" prop="msg" show-overflow-tooltip width="250"></el-table-column>-->
-<!--        <el-table-column label="处理结果" prop="handleMsg" show-overflow-tooltip width="200"></el-table-column>-->
-<!--        <el-table-column label="操作" width="100" fixed="right">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              v-if="scope.row.status === 1"-->
-<!--              @click.native="confirmMsg(scope.row)"-->
-<!--            >确认-->
-<!--            </el-button>-->
-<!--            &lt;!&ndash;            <el-button&ndash;&gt;-->
-<!--            &lt;!&ndash;              type="text"&ndash;&gt;-->
-<!--            &lt;!&ndash;              size="small"&ndash;&gt;-->
-<!--            &lt;!&ndash;              v-if="scope.row.ignoreStatus === 0"&ndash;&gt;-->
-<!--            &lt;!&ndash;              @click.native="ignoreMsg(scope.row)"&ndash;&gt;-->
-<!--            &lt;!&ndash;            >忽略&ndash;&gt;-->
-<!--            &lt;!&ndash;            </el-button>&ndash;&gt;-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-        <template v-for="(item, index) in tableHeader">
-          <el-table-column
-            v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
-            type="index" :label="item.columnDesc"></el-table-column>
-          <el-table-column
-            v-if="item.columnType == 'selection'"
-            type="selection"
-            :width="item.width"
-            :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
-          ></el-table-column>
+        <el-table-column label="证书名称" prop="certName" width="180" show-overflow-tooltip></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="120">
+          <template slot-scope="scope">
+            <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
+          </template>
+        </el-table-column>
+        <!--        <el-table-column label="忽略预警" prop="ignoreStatus" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag>{{ ignoreStatusMap[scope.row.ignoreStatus] }}</el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
 
-          <el-table-column
-            v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
-            :prop="item.columnName"
-            :label="item.columnDesc"
-            :sortable="item.sort"
-            :width="item.width"
-            :show-overflow-tooltip="item.tooltip"
-            :key="item.columnName"
-          >
-            <template  slot-scope="scope">
-              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
-            :prop="item.columnName"
-            :label="item.columnDesc"
-            :sortable="item.sort"
-            :width="item.width"
-            :show-overflow-tooltip="item.tooltip"
-            :key="item.columnName"
-          >
-            <template   slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
-            :prop="item.columnName"
-            :label="item.columnDesc"
-            :sortable="item.sort"
-            :width="item.width"
-            :show-overflow-tooltip="item.tooltip"
-            :key="item.columnName"
-          >
-            <template   slot-scope="scope">
-              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
-                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
-              </el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
-            :prop="item.columnName"
-            :label="item.columnDesc"
-            :width="item.width"
-            :key="item.columnName"
-            fixed="right"
-          >
-            <template slot-scope="scope">
-              <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
-                         :type="buttonItem.type"
-                         :size="buttonItem.size"
-                         :style="buttonItem.style"
-                         :key="buttonItem"
-                         v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
-                         :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
-                         @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
-              >{{ buttonItem.name }}
-              </el-button>
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
-            :prop="item.columnName"
-            :label="item.columnDesc"
-            :sortable="item.sort"
-            :width="item.width"
-            :show-overflow-tooltip="item.tooltip"
-            :key="item.columnName"
-          >
-            <template slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
-            </template>
-          </el-table-column>
-        </template>
+        <el-table-column label="预警次数" prop="remindCount" width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column label="预警类型" prop="type" width="120">
+          <template slot-scope="scope">
+            <el-tag>{{ typeMap[scope.row.type] }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="预警内容" prop="msg" show-overflow-tooltip width="250"></el-table-column>
+        <el-table-column label="处理结果" prop="handleMsg" show-overflow-tooltip width="200"></el-table-column>
+        <el-table-column label="操作" width="100" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.status === 1"
+              @click.native="confirmMsg(scope.row)"
+            >确认
+            </el-button>
+            <!--            <el-button-->
+            <!--              type="text"-->
+            <!--              size="small"-->
+            <!--              v-if="scope.row.ignoreStatus === 0"-->
+            <!--              @click.native="ignoreMsg(scope.row)"-->
+            <!--            >忽略-->
+            <!--            </el-button>-->
+          </template>
+        </el-table-column>
+<!--        <template v-for="(item, index) in tableHeader">-->
+<!--          <el-table-column-->
+<!--            v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"-->
+<!--            type="index" :label="item.columnDesc"></el-table-column>-->
+<!--          <el-table-column-->
+<!--            v-if="item.columnType == 'selection'"-->
+<!--            type="selection"-->
+<!--            :width="item.width"-->
+<!--            :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"-->
+<!--          ></el-table-column>-->
+
+<!--          <el-table-column-->
+<!--            v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"-->
+<!--            :prop="item.columnName"-->
+<!--            :label="item.columnDesc"-->
+<!--            :sortable="item.sort"-->
+<!--            :width="item.width"-->
+<!--            :show-overflow-tooltip="item.tooltip"-->
+<!--            :key="item.columnName"-->
+<!--          >-->
+<!--            <template  slot-scope="scope">-->
+<!--              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"-->
+<!--            :prop="item.columnName"-->
+<!--            :label="item.columnDesc"-->
+<!--            :sortable="item.sort"-->
+<!--            :width="item.width"-->
+<!--            :show-overflow-tooltip="item.tooltip"-->
+<!--            :key="item.columnName"-->
+<!--          >-->
+<!--            <template   slot-scope="scope">-->
+<!--              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"-->
+<!--            :prop="item.columnName"-->
+<!--            :label="item.columnDesc"-->
+<!--            :sortable="item.sort"-->
+<!--            :width="item.width"-->
+<!--            :show-overflow-tooltip="item.tooltip"-->
+<!--            :key="item.columnName"-->
+<!--          >-->
+<!--            <template   slot-scope="scope">-->
+<!--              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">-->
+<!--                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>-->
+<!--              </el-tag>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"-->
+<!--            :prop="item.columnName"-->
+<!--            :label="item.columnDesc"-->
+<!--            :width="item.width"-->
+<!--            :key="item.columnName"-->
+<!--            fixed="right"-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"-->
+<!--                         :type="buttonItem.type"-->
+<!--                         :size="buttonItem.size"-->
+<!--                         :style="buttonItem.style"-->
+<!--                         :key="buttonItem"-->
+<!--                         v-if="executeEval(scope.row,buttonItem.hasPermi,true)"-->
+<!--                         :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"-->
+<!--                         @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"-->
+<!--              >{{ buttonItem.name }}-->
+<!--              </el-button>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"-->
+<!--            :prop="item.columnName"-->
+<!--            :label="item.columnDesc"-->
+<!--            :sortable="item.sort"-->
+<!--            :width="item.width"-->
+<!--            :show-overflow-tooltip="item.tooltip"-->
+<!--            :key="item.columnName"-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--        </template>-->
       </el-table>
       <pagination
         v-show="total>0"
@@ -393,9 +395,9 @@ export default {
       showSearch: true,
       filterQuery: {
         name: null,
-        status: "1",
-        ignoreStatus: "0",
-        type: "1",
+        status: 1,
+        ignoreStatus: 0,
+        type: 1,
         page: 1,
         limit: 20,
         certName:null
@@ -448,7 +450,7 @@ export default {
         page: 1,
         limit: 20,
       };
-      this.typeChange(this,this.filterQuery.type);
+      this.typeChange(this.filterQuery.type);
       this.getList();
     },
     search() {
@@ -476,9 +478,9 @@ export default {
     },
 
 
-    confirmMsg(_this,row) {
-      _this.confirmVisible = true;
-      _this.confirmQuery = row;
+    confirmMsg(row) {
+      this.confirmVisible = true;
+      this.confirmQuery = row;
     },
     postConfirm() {
       confirmMsg(this.confirmQuery).then((res) => {
@@ -518,8 +520,8 @@ export default {
         this.currentId = null;
       })
     },
-    typeChange(_this,val) {
-      _this.msgName = _this.msgNameMap[val];
+    typeChange(val) {
+      this.msgName = this.msgNameMap[val];
     },
     executeFuc(row,type,clickFuc,value){
       return executeFuc(this,row,type,clickFuc,value);
diff --git a/src/views/supplier/products/supDiProductsCheck.vue b/src/views/supplier/products/supDiProductsCheck.vue
index 6d96bcb..c8e0bdc 100644
--- a/src/views/supplier/products/supDiProductsCheck.vue
+++ b/src/views/supplier/products/supDiProductsCheck.vue
@@ -494,7 +494,7 @@ export default {
         })
       } else {
         _this.thisDetail = row;
-        _this.thisDetail.isAudit = type
+        _this.thisDetail.isAudit = 1
         _this.thrProductsDetailVisible = true;
       }
     },
@@ -514,7 +514,7 @@ export default {
         })
       } else {
         _this.thisDetail = row;
-        _this.thisDetail.isAudit = type
+        _this.thisDetail.isAudit = 2
         _this.thrProductsDetailVisible = true;
       }
     },