From f02eb65909bb1de299bda8b65583df6dd0605afc Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 21 Mar 2024 11:59:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B5=84=E8=B4=A8=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF-=E5=A2=9E=E5=8A=A0=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/remind/supCertRemindMsg.vue | 91 +++++++++++++++++++++++----
 1 file changed, 78 insertions(+), 13 deletions(-)

diff --git a/src/views/remind/supCertRemindMsg.vue b/src/views/remind/supCertRemindMsg.vue
index ef31f98..e952f0b 100644
--- a/src/views/remind/supCertRemindMsg.vue
+++ b/src/views/remind/supCertRemindMsg.vue
@@ -14,7 +14,7 @@
               <!--                </el-form-item>-->
               <!--              </el-col>-->
 
-              <el-col :span="6">
+              <el-col :span="4">
                 <el-form-item class="query-form-item" label="物资名称:">
                   <el-input v-model="productQuery.name" placeholder="物资名称"
                             style="width: 90%"
@@ -22,7 +22,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="6">
+              <el-col :span="4">
                 <el-form-item class="query-form-item" label="证书名称:">
                   <el-input v-model="productQuery.certName" placeholder="证书名称"
                             style="width: 90%"
@@ -30,7 +30,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="6">
+              <el-col :span="4">
                 <el-form-item class="query-form-item" label="状态:">
                   <el-select v-model="productQuery.status"
                              placeholder="请选择消息状态"
@@ -42,6 +42,26 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="4">
+                <el-form-item class="query-form-item" label="供应商:">
+                  <el-input v-model="productQuery.supName" placeholder="供应商"
+                            style="width: 90%"
+                            clearable="true"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="4">
+                <el-form-item class="query-form-item" label="预警类型:">
+                  <el-select v-model="productQuery.warnType"
+                             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>
             </el-row>
           </el-form>
           <div class="top-right-btn">
@@ -116,7 +136,7 @@
           <el-form :model="manuQuery" class="query-form" label-width="100px"
                    v-show="showSearch">
             <el-row>
-              <el-col :span="6">
+              <el-col :span="4">
                 <el-form-item class="query-form-item" label="生产企业:">
                   <el-input v-model="manuQuery.name" placeholder="生产企业"
                             style="width: 90%"
@@ -124,7 +144,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="6">
+              <el-col :span="4">
                 <el-form-item class="query-form-item" label="证书名称:">
                   <el-input v-model="manuQuery.certName" placeholder="证书名称"
                             style="width: 90%"
@@ -132,7 +152,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="6">
+              <el-col :span="4">
                 <el-form-item class="query-form-item" label="状态:">
                   <el-select v-model="manuQuery.status"
                              placeholder="请选择消息状态"
@@ -144,6 +164,26 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="4">
+                <el-form-item class="query-form-item" label="配送企业:">
+                  <el-input v-model="manuQuery.supName" placeholder="配送企业"
+                            style="width: 90%"
+                            clearable="true"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="4">
+                <el-form-item class="query-form-item" label="预警类型:">
+                  <el-select v-model="manuQuery.warnType"
+                             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>
 
             </el-row>
           </el-form>
@@ -224,13 +264,13 @@
           <el-form :model="supQuery" 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="supQuery.name" placeholder="配送企业名称"
-                            style="width: 90%"
-                            clearable="true"></el-input>
-                </el-form-item>
-              </el-col>
+<!--              <el-col :span="6" v-if="this.ckeck">-->
+<!--                <el-form-item class="query-form-item" label="配送企业名称:">-->
+<!--                  <el-input v-model="supQuery.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="证书名称:">
@@ -252,7 +292,26 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                <el-form-item class="query-form-item" label="配送企业:">
+                  <el-input v-model="supQuery.supName" 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="supQuery.warnType"
+                             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>
             </el-row>
           </el-form>
 
@@ -429,6 +488,8 @@ export default {
       productQuery: {
         name: null,
         status: 1,
+        warnType: null,
+        supName: null,
         ignoreStatus: 0,
         type: 3,
         page: 1,
@@ -442,6 +503,8 @@ export default {
         name: null,
         status: 1,
         ignoreStatus: 0,
+        warnType: null,
+        supName: null,
         type: 2,
         page: 1,
         limit: 20,
@@ -453,6 +516,8 @@ export default {
 
       supQuery: {
         name: null,
+        warnType: null,
+        supName: null,
         status: 1,
         ignoreStatus: 0,
         type: 1,