diff --git a/src/views/remind/invRemindMsg.vue b/src/views/remind/invRemindMsg.vue
index c5fa61bf..17187adc 100644
--- a/src/views/remind/invRemindMsg.vue
+++ b/src/views/remind/invRemindMsg.vue
@@ -137,8 +137,8 @@
         <el-table-column label="仓库名称" prop="invName" width="200"></el-table-column>
         <el-table-column label="货位名称" prop="invSpaceName" width="200"></el-table-column>
         <el-table-column label="产品名称" prop="productName" width="300" show-overflow-tooltip></el-table-column>
-        <el-table-column label="批次号" prop="batchNo" width="300" show-overflow-tooltip></el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" width="300" show-overflow-tooltip></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column>
         <el-table-column label="消息状态" prop="status" width="100">
           <template slot-scope="scope">
             <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
@@ -149,7 +149,7 @@
             <el-tag>{{ ignoreStatusMap[scope.row.ignoreStatus] }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="预警类型" prop="productionDate" width="100">
+        <el-table-column label="预警类型" prop="productionDate" width="120">
           <template slot-scope="scope">
             <el-tag>{{ typeMap[scope.row.type] }}</el-tag>
           </template>
@@ -161,21 +161,22 @@
         <el-table-column label="库存数量" prop="productionDate" width="100"></el-table-column>
         <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
-        <el-table-column label="供应商" prop="supName" width="120"></el-table-column>
-        <el-table-column label="生产厂家" prop="manufactory" width="120"></el-table-column>
-        <el-table-column label="批准文号" prop="zczbhhzbapzbh" width="120"></el-table-column>
-        <el-table-column label="备注" prop="remark" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column label="供应商" prop="supName" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产厂家" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column label="批准文号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" width="100">
           <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>
@@ -190,6 +191,26 @@
         @pagination="getList"
       />
     </el-card>
+
+
+    <!--  忽略预警弹窗  -->
+    <el-dialog
+      v-if="ignoreVisible"
+      title="忽略预警"
+      :visible.sync="ignoreVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="30%"
+      top="5vh"
+    >
+      <el-row>
+        <el-button type="primary" size="medium" style="margin-left: 20%; margin-right: 20px;" @click="ignore(1)">
+          忽略7天
+        </el-button>
+        <el-button type="success" size="medium" style="margin-right: 20px;" @click="ignore(2)">忽略15天</el-button>
+        <el-button type="warning" size="medium" style="margin-right: 20px;" @click="ignore(3)">忽略30天</el-button>
+      </el-row>
+    </el-dialog>
   </div>
 </template>
 
@@ -241,7 +262,9 @@ export default {
       queryName: null,
       invList: [],
       spaceList: [],
-      ggxhList: []
+      ggxhList: [],
+      ignoreVisible: false,
+      currentId: null
     };
   },
   methods: {
@@ -357,10 +380,46 @@ export default {
       this.filterQuery.relId = null;
     },
     confirmMsg(row) {
-
+      this.$prompt('请输入处理方式', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+      }).then(({value}) => {
+        let params = {
+          id: row.id,
+          handleMsg: value
+        };
+        confirmMsg(params).then((res) => {
+          if (res.code === 20000) {
+            this.$message.success("已确认");
+            this.getList();
+          } else {
+            this.$message.error(res.message);
+          }
+        })
+      }).catch(() => {
+      });
     },
     ignoreMsg(row) {
-
+      this.ignoreVisible = true;
+      this.currentId = row.id;
+    },
+    ignore(type) {
+      this.ignoreVisible = false;
+      let params = {
+        id: this.currentId,
+        ignoreStatus: type
+      };
+      ignoreMsg(params).then((res) => {
+        this.currentId = null;
+        if (res.code === 20000) {
+          this.$message.success("已忽略预警");
+          this.getList();
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch(() => {
+        this.currentId = null;
+      })
     },
   },
   created() {