From 1908c57b8aeecd1aada57b4a24453472acc6e51c Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 20 Mar 2024 17:37:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/itextpdf/orderPrint.js           |   1 -
 src/api/purchase/supCertRedmindMsg.js    |   9 +
 src/views/purchase/cert/supCertAudit.vue | 604 +++++++++++++----------
 src/views/remind/supCertRemindMsg.vue    | 187 +++++--
 4 files changed, 496 insertions(+), 305 deletions(-)

diff --git a/src/api/itextpdf/orderPrint.js b/src/api/itextpdf/orderPrint.js
index 7c120be..91f8759 100644
--- a/src/api/itextpdf/orderPrint.js
+++ b/src/api/itextpdf/orderPrint.js
@@ -1,4 +1,3 @@
-
 import axios from "@/utils/request";
 
 
diff --git a/src/api/purchase/supCertRedmindMsg.js b/src/api/purchase/supCertRedmindMsg.js
index 0e2c9c3..4e050dc 100644
--- a/src/api/purchase/supCertRedmindMsg.js
+++ b/src/api/purchase/supCertRedmindMsg.js
@@ -32,3 +32,12 @@ export function ignoreMsg(params) {
     params: params
   });
 }
+
+export function deleteMsg(data) {
+  return axios({
+    url: '/sup/cert/remind/msg/delete',
+    method: 'post',
+    data: data
+  })
+}
+
diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue
index 79b8bf5..54d6a8f 100644
--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@@ -3,7 +3,8 @@
 
     <!--        配送企业资质       -->
     <el-card>
-      <el-form if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="120px" v-show="showSearch">
+      <el-form if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini"
+               label-width="120px" v-show="showSearch">
         <!--        <el-row>-->
         <!--          <el-col :span="6">-->
         <!--            <el-form-item label="配送企业名称:">-->
@@ -19,8 +20,10 @@
         <!--          </el-col>-->
         <!--        </el-row>-->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
-          <template v-for="(item, index) in queryList" >
-            <el-form-item  :style="item.style?item.style:item.width?'width:'+(item.width)+'px':''" v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+          <template v-for="(item, index) in queryList">
+            <el-form-item :style="item.style?item.style:item.width?'width:'+(item.width)+'px':''"
+                          v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -29,7 +32,8 @@
                 clearable
               ></el-input>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <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)"
@@ -42,7 +46,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <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"
@@ -59,7 +64,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 v-model="dateRange"
                 :style="`width:${item.width+'px'}`"
@@ -72,7 +78,8 @@
                 :default-time="['00:00:00', '23:59:59']"
               ></el-date-picker>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <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'}`"
@@ -182,7 +189,7 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template  slot-scope="scope">
+            <template slot-scope="scope">
               <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
             </template>
           </el-table-column>
@@ -195,8 +202,10 @@
             :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 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
@@ -208,9 +217,12 @@
             :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>
+            <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>
@@ -245,11 +257,14 @@
             :key="item.columnName"
           >
             <template slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                  scope.row[item.columnName]
+                }}</span>
             </template>
           </el-table-column>
 
-          <el-table-column v-if="item.columnName == 'failCout'"  :label="item.columnDesc" prop="auditStatus"  :width="item.width">
+          <el-table-column v-if="item.columnName == 'failCout'" :label="item.columnDesc" prop="auditStatus"
+                           :width="item.width">
             <template slot-scope="scope">
 
               <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
@@ -264,7 +279,8 @@
             </template>
           </el-table-column>
 
-          <el-table-column v-if="item.columnName == 'productFailCout'"  :label="item.columnDesc" prop="auditStatus"  :width="item.width">
+          <el-table-column v-if="item.columnName == 'productFailCout'" :label="item.columnDesc" prop="auditStatus"
+                           :width="item.width">
             <template slot-scope="scope">
               <el-tag type="danger" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout==0">
                 未添加证书
@@ -311,7 +327,8 @@
 
     <!--        生产企业资质       -->
     <el-card class="el-card">
-      <el-form v-if="queryList2 && queryList2.length > 0" :model="filterManufacturerQuery" class="query-form" label-width="120px" v-show="showSearch2">
+      <el-form v-if="queryList2 && queryList2.length > 0" :model="filterManufacturerQuery" class="query-form"
+               label-width="120px" v-show="showSearch2">
         <!--        <el-row>-->
         <!--          <el-col :span="6">-->
         <!--            <el-form-item label="生产企业名称">-->
@@ -327,8 +344,9 @@
         <!--          </el-col>-->
         <!--        </el-row>-->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
-          <template v-for="(item, index) in queryList2" >
-            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+          <template v-for="(item, index) in queryList2">
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterManufacturerQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -336,60 +354,64 @@
                 @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
                 clearable
               ></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="filterManufacturerQuery[item.columnName]"
-                                 :placeholder="item.columnDesc"
-                                 :disabled="executeEval(null,item.disabledFuc,false)"
-                                 clearable>
-                        <el-option
-                          v-for="dict in item.lableRuleObj"
-                          :key="dict.value"
-                          :label="dict.label"
-                          :value="dict.value"
-                        />
-                      </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="filterManufacturerQuery[item.columnName]"
-                        :placeholder="item.columnDesc"
-                        :disabled="executeEval(null,item.disabledFuc,false)"
-                        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"
-                        />
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-                      <el-date-picker
-                        v-model="dateRange"
-                        :style="`width:${item.width+'px'}`"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        :disabled="executeEval(null,item.disabledFuc,false)"
-                        type="daterange"
-                        range-separator="-"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        :default-time="['00:00:00', '23:59:59']"
-                      ></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="filterManufacturerQuery[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>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
+              <el-select v-model="filterManufacturerQuery[item.columnName]"
+                         :placeholder="item.columnDesc"
+                         :disabled="executeEval(null,item.disabledFuc,false)"
+                         clearable>
+                <el-option
+                  v-for="dict in item.lableRuleObj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </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="filterManufacturerQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                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"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="dateRange"
+                :style="`width:${item.width+'px'}`"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :default-time="['00:00:00', '23:59:59']"
+              ></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="filterManufacturerQuery[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>
@@ -404,165 +426,173 @@
 
       <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="(row) => executeFuc(row,'0',tableObj2.handleChangeFuc)">
-      <!--        <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>-->
-          <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>
-            <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>
-
-            <el-table-column v-if="item.columnName == 'failCout'" :label="item.columnDesc" prop="auditStatus" :width="item.width">
-              <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>
-          </template>
-          </el-table>
+                highlight-current-row border @row-click="(row) => executeFuc(row,'0',tableObj2.handleChangeFuc)">
+        <!--        <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>-->
 
-          <pagination
-            v-show="manufacturerTotal>0"
-            :total="manufacturerTotal"
-            :page.sync="filterManufacturerQuery.page"
-            :limit.sync="filterManufacturerQuery.limit"
-            @pagination="handleManuChange"
+        <!--          </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>-->
 
-          ></pagination>
+        <!--        <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>-->
+        <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>
+          <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>
+
+          <el-table-column v-if="item.columnName == 'failCout'" :label="item.columnDesc" prop="auditStatus"
+                           :width="item.width">
+            <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>
+        </template>
+      </el-table>
+
+      <pagination
+        v-show="manufacturerTotal>0"
+        :total="manufacturerTotal"
+        :page.sync="filterManufacturerQuery.page"
+        :limit.sync="filterManufacturerQuery.limit"
+        @pagination="handleManuChange"
+
+      ></pagination>
 
 
     </el-card>
@@ -588,7 +618,8 @@
 
     <!--        配送产品资质       -->
     <el-card class="el-card">
-      <el-form v-if="queryList3 && queryList3.length > 0" :model="registrationQuery" class="query-form" label-width="120px" v-show="showSearch3">
+      <el-form v-if="queryList3 && queryList3.length > 0" :model="registrationQuery" class="query-form"
+               label-width="120px" v-show="showSearch3">
         <!--        <el-row>-->
         <!--          <el-col :span="6">-->
         <!--            <el-form-item label="物资名称:">-->
@@ -610,8 +641,9 @@
         <!--          </el-col>-->
         <!--        </el-row>-->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
-          <template v-for="(item, index) in queryList3" >
-            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+          <template v-for="(item, index) in queryList3">
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="registrationQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -620,7 +652,8 @@
                 clearable
               ></el-input>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select v-model="registrationQuery[item.columnName]"
                          :placeholder="item.columnDesc"
                          :disabled="executeEval(null,item.disabledFuc,false)"
@@ -633,7 +666,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select
                 v-model="registrationQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -650,7 +684,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 v-model="dateRange"
                 :style="`width:${item.width+'px'}`"
@@ -663,7 +698,8 @@
                 :default-time="['00:00:00', '23:59:59']"
               ></el-date-picker>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 v-model="registrationQuery[item.columnName]"
                 :style="`width:${item.width+'px'}`"
@@ -744,7 +780,7 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template  slot-scope="scope">
+            <template slot-scope="scope">
               <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
             </template>
           </el-table-column>
@@ -757,8 +793,10 @@
             :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 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
@@ -770,9 +808,12 @@
             :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>
+            <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>
@@ -807,7 +848,9 @@
             :key="item.columnName"
           >
             <template slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                  scope.row[item.columnName]
+                }}</span>
             </template>
           </el-table-column>
         </template>
@@ -850,7 +893,7 @@ import {deleteCompany, getCompanyList} from "@/api/purchase/supManufacturer";
 import suppliersRegistrationBasic from "@/views/purchase/product/supProductAuditDialog";
 import {deleteRegistration, getRegistrationList} from "@/api/purchase/suppliersRegistrationBasic";
 import {
-  getHead,executeFuc
+  getHead, executeFuc
 } from "@/utils/customConfig";
 
 
@@ -871,17 +914,16 @@ export default {
       loading: false,
       list: [],
       total: 0,
-      tableHeader:[],
-      queryList:[],
-      fromList:[],
-      tableHeader2:[],
-      queryList2:[],
-      fromList2:[],
-      tableHeader3:[],
-      queryList3:[],
-      fromList3:[],
-      options:{
-      },
+      tableHeader: [],
+      queryList: [],
+      fromList: [],
+      tableHeader2: [],
+      queryList2: [],
+      fromList2: [],
+      tableHeader3: [],
+      queryList3: [],
+      fromList3: [],
+      options: {},
       formName: 1,
       formMap: {
         1: "配送企业资质详情",
@@ -1044,10 +1086,10 @@ export default {
         });
     },
     onSubmit() {
-      this.filterQuery.page=1;
+      this.filterQuery.page = 1;
       this.getList();
     },
-    editCompany(_this,row) {
+    editCompany(_this, row) {
       if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
         _this.formName = 2;
         _this.editType = 2;
@@ -1084,7 +1126,7 @@ export default {
       this.supCompanyVisible = false;
     },
 
-    supCompanyClick(_this,row) {
+    supCompanyClick(_this, row) {
       _this.filterManufacturerQuery.customerId = row.customerId;
       _this.registrationList = [];
       _this.onManufacturerReset();
@@ -1116,7 +1158,7 @@ export default {
       this.getManufacturerList();
     },
     onManufacturerSubmit() {
-      this.filterManufacturerQuery.page=1;
+      this.filterManufacturerQuery.page = 1;
       //this.onManufacturerReset();
       this.getManufacturerList();
       this.addInfoVisible = false;
@@ -1139,7 +1181,7 @@ export default {
           this.total = 0;
         });
     },
-    addInfoDialog(_this,row) {
+    addInfoDialog(_this, row) {
 
       if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
         _this.editManufacturerType = 2;
@@ -1168,7 +1210,7 @@ export default {
       this.getManufacturerList();
     },
 
-    supManufacturerClick(_this,row) {
+    supManufacturerClick(_this, row) {
       _this.registrationQuery.customerId = row.customerId;
       _this.registrationQuery.manufacturerIdFk = row.manufacturerId;
       _this.onReset2();
@@ -1194,13 +1236,13 @@ export default {
       this.getRegistrationList();
     },
     onSubmit2() {
-      this.registrationQuery.page=1;
+      this.registrationQuery.page = 1;
       this.getRegistrationList();
     },
     hideSearch3() {
       this.showSearch3 = !this.showSearch3;
     },
-    registrationDialog(_this,row) {
+    registrationDialog(_this, row) {
       if (row.auditStatus == 2) {
         _this.editProductType = 2;
         _this.formProductName = 1;
@@ -1239,11 +1281,11 @@ export default {
       this.registrationQuery.page = val.page;
       this.getRegistrationList();
     },
-    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;
@@ -1256,7 +1298,14 @@ export default {
   ,
 
   created() {
-    getHead("supCertAudit-1","1").then((re) => {
+    let unitIdFk = this.$route.query.unitIdFk;
+    let manuIdFk = this.$route.query.manuIdFk;
+    let productIdFk = this.$route.query.productIdFk;
+    if (unitIdFk != null) {
+      this.filterQuery.customerId = unitIdFk;
+      this.filterManufacturerQuery.customerId = unitIdFk;
+    }
+    getHead("supCertAudit-1", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
       this.tableHeader = re.data.tableList;
@@ -1264,20 +1313,31 @@ export default {
       this.fromList = re.data.fromList;
       this.getList();
     });
-    getHead("supCertAudit-2","1").then((re) => {
+    getHead("supCertAudit-2", "1").then((re) => {
       // 处理返回的数据
       this.tableObj2 = re.data;
       this.tableHeader2 = re.data.tableList;
       this.queryList2 = re.data.queryList;
       this.fromList2 = re.data.fromList;
     });
-    getHead("supCertAudit-3","1").then((re) => {
+    getHead("supCertAudit-3", "1").then((re) => {
       // 处理返回的数据
-      this.tableObj3= re.data;
+      this.tableObj3 = re.data;
       this.tableHeader3 = re.data.tableList;
       this.queryList3 = re.data.queryList;
       this.fromList3 = re.data.fromList;
     });
+
+
+    if (manuIdFk != null) {
+      this.filterManufacturerQuery.manufacturerId = manuIdFk;
+      this.registrationQuery.manufacturerIdFk = manuIdFk;
+      this.getManufacturerList();
+    }
+    if (productIdFk != null) {
+      this.registrationQuery.productId = productIdFk;
+      this.getRegistrationList();
+    }
   },
 };
 </script>
diff --git a/src/views/remind/supCertRemindMsg.vue b/src/views/remind/supCertRemindMsg.vue
index a0c1737..ef31f98 100644
--- a/src/views/remind/supCertRemindMsg.vue
+++ b/src/views/remind/supCertRemindMsg.vue
@@ -58,27 +58,48 @@
             <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">
+            <!--            <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="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="warnType" width="120">
               <template slot-scope="scope">
-                <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
-              </template>
-            </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>
+                <el-tag :type="statusFilterType(scope.row.warnType)">{{ warnTypeMap[scope.row.warnType] }}</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="处理结果" 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.status === 1"
-                  @click.native="confirmMsg(scope.row)"
-                >确认
+                  @click.native="linkPage(scope.row,3)"
+                >处理
+                </el-button>
+                <el-button
+                  type="text"
+                  size="small"
+                  v-if="scope.row.status === 1"
+                  @click.native="delMsg(scope.row)"
+                >删除
                 </el-button>
               </template>
             </el-table-column>
@@ -141,28 +162,50 @@
             <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="status" width="120">-->
+            <!--              <template slot-scope="scope">-->
+            <!--                <el-tag>{{ statusMap[scope.row.status] }}</el-tag>-->
+            <!--              </template>-->
+            <!--            </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">
+            <!--            <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="warnType" width="120">
               <template slot-scope="scope">
-                <el-tag>{{ typeMap[scope.row.type] }}</el-tag>
+                <el-tag :type="statusFilterType(scope.row.warnType)">{{ warnTypeMap[scope.row.warnType] }}</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="处理结果" 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.status === 1"
+                  @click.native="linkPage(scope.row,2)"
+                >处理
+                </el-button>
+
                 <el-button
                   type="text"
                   size="small"
                   v-if="scope.row.status === 1"
-                  @click.native="confirmMsg(scope.row)"
-                >确认
+                  @click.native="delMsg(scope.row)"
+                >删除
                 </el-button>
               </template>
             </el-table-column>
@@ -227,28 +270,48 @@
             <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="status" width="120">-->
+            <!--              <template slot-scope="scope">-->
+            <!--                <el-tag>{{ statusMap[scope.row.status] }}</el-tag>-->
+            <!--              </template>-->
+            <!--            </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">
+            <!--            <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="warnType" width="120">
               <template slot-scope="scope">
-                <el-tag>{{ typeMap[scope.row.type] }}</el-tag>
+                <el-tag :type="statusFilterType(scope.row.warnType)">{{ warnTypeMap[scope.row.warnType] }}</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="处理结果" 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.status === 1"
-                  @click.native="confirmMsg(scope.row)"
-                >确认
+                  @click.native="linkPage(scope.row,1)"
+                >处理
+                </el-button>
+                <el-button
+                  type="text"
+                  size="small"
+                  v-if="scope.row.status === 1"
+                  @click.native="delMsg(scope.row)"
+                >删除
                 </el-button>
               </template>
             </el-table-column>
@@ -352,7 +415,7 @@
 </template>
 
 <script>
-import {getSupCertRemindMsgList, confirmMsg, ignoreMsg} from "@/api/purchase/supCertRedmindMsg";
+import {getSupCertRemindMsgList, confirmMsg, ignoreMsg, deleteMsg} from "@/api/purchase/supCertRedmindMsg";
 import {
   getHead, executeFuc
 } from "@/utils/customConfig";
@@ -413,6 +476,10 @@ export default {
         2: "生产企业资质预警",
         3: "产品资质预警"
       },
+      warnTypeMap: {
+        1: "过期预警",
+        2: "近效期预警",
+      },
       ignoreStatusMap: {
         0: "不忽略",
         1: "忽略7天",
@@ -522,10 +589,37 @@ export default {
     },
 
 
+    // confirmMsg(row) {
+    //   this.confirmVisible = true;
+    //   this.confirmQuery = row;
+    // },
+
     confirmMsg(row) {
       this.confirmVisible = true;
       this.confirmQuery = row;
     },
+
+
+    linkPage(row, type) {
+      if (type == 1) {
+        this.$router.push("/purchase/purchase/cert/supCertAudit?unitIdFk=" + row.idFk);
+      } else if (type == 2) {
+        this.$router.push("/purchase/purchase/cert/supCertAudit?manuIdFk=" + row.idFk + "&unitIdFk=" + row.supId);
+      } else if (type == 3) {
+        this.$router.push("/purchase/purchase/cert/supCertAudit?productIdFk=" + row.idFk + "&unitIdFk=" + row.supId + "&manuIdFk=" + row.manufacturerIdFk);
+      }
+
+    },
+
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "danger",
+        2: "warning",
+        3: "success",
+      };
+      return statusMap[status];
+    },
     postConfirm() {
       confirmMsg(this.confirmQuery).then((res) => {
         if (res.code === 20000) {
@@ -542,6 +636,35 @@ export default {
       this.confirmVisible = false;
     },
 
+    delMsg(row) {
+
+      this.$confirm("是否确定删除该预警信息？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let params = {
+          id: row.id,
+        };
+        deleteMsg(params).then((res) => {
+          if (res.code === 20000) {
+            if (row.type == 1)
+              this.getSupList();
+            else if (row.type == 2)
+              this.getManuList();
+            else
+              this.getProductList();
+          } else {
+          }
+        }).catch(() => {
+        })
+      }).catch(() => {
+        this.loading = false;
+      });
+
+
+    },
+
     ignoreMsg(row) {
       this.ignoreVisible = true;
       this.currentId = row.id;