diff --git a/src/views/productsMsg/components/productInfo.vue b/src/views/productsMsg/components/productInfo.vue
index 895f0c7..e55ccbb 100644
--- a/src/views/productsMsg/components/productInfo.vue
+++ b/src/views/productsMsg/components/productInfo.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="ifram-view" :style="iframViewStyle">
     <!-- <span>!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!</span> -->
-    <iframe src="https://dev-mssm-liaoning.imian.org.cn/ggfw/#/firmContent/drugInfo" allow="payment" frameborder="0" style="width: 100%;height: 100%;"></iframe>
+    <iframe src="https://dev-mssm-liaoning.imian.org.cn/ggfw/#/firmContent/drugInfo" frameborder="0" style="width: 100%;height: 100%;"></iframe>
   </div>
 </template>
 <script>
diff --git a/src/views/productsMsg/index.vue b/src/views/productsMsg/index.vue
index e606534..bc11d47 100644
--- a/src/views/productsMsg/index.vue
+++ b/src/views/productsMsg/index.vue
@@ -9,21 +9,25 @@
             <el-tab-pane label="查询条件" name="first">
               <div class="screen">
                 <div class="task-name">
-                  <span class="task-name-text">全文检索：</span>
+                  <span class="task-name-text">产品名称：</span>
                   <div class="task-input">
                     <el-input
-                      v-model="queryCondition.fullTextSearch"
+                      v-model="queryCondition.taskName"
                       placeholder="请输入内容"
                     ></el-input>
                   </div>
                 </div>
                 <div class="task-name">
-                  <span class="task-name-text">企业名称：</span>
+                  <span class="task-name-text">药品分类：</span>
                   <div class="task-input">
-                    <el-input
-                      v-model="queryCondition.firmName"
-                      placeholder="请输入内容"
-                    ></el-input>
+                    <el-select v-model="queryCondition.drugClassification" placeholder="请选择">
+                      <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                    </el-select>
                   </div>
                 </div>
                 <div class="task-name">
@@ -36,87 +40,25 @@
                   </div>
                 </div>
                 <div class="task-name">
-                  <span class="task-name-text">处方内容：</span>
+                  <span class="task-name-text">生产企业：</span>
                   <div class="task-input">
                     <el-input
-                      v-model="queryCondition.PrescriptionContent"
-                      placeholder="请输入内容"
-                    ></el-input>
-                  </div>
-                </div>
-                <div class="task-name">
-                  <span class="task-name-text">功能主治：</span>
-                  <div class="task-input">
-                    <el-input
-                      v-model="queryCondition.majorFunction"
+                      v-model="queryCondition.firmName"
                       placeholder="请输入内容"
                     ></el-input>
                   </div>
                 </div>
                 <div class="task-name">
-                  <span class="task-name-text">产品名称：</span>
+                  <span class="task-name-text">剂型：</span>
                   <div class="task-input">
-                    <el-input
-                      v-model="queryCondition.taskName"
-                      placeholder="请输入内容"
-                    ></el-input>
-                  </div>
-                </div>
-                <div class="time-interval">
-                  <div class="interval-text">
-                    批号有效期：
-                  </div>
-                  <div class="interval-select">
-                    <div class="star-time">
-                      <el-date-picker
-                        v-model="queryCondition.startTime"
-                        type="datetime"
-                        align="right"
-                        :clearable="false"
-                        format="yyyy-MM-dd HH:mm:ss"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择开始时间"
-                      >
-                      </el-date-picker>
-                      <!-- <i class="el-icon-date data_icon"></i> -->
-                    </div> 
-                    <!-- <i class="el-icon-sort-up"></i> -->
-                    <div class="symbol">~</div>
-                    <div class="end-time">
-                      <el-date-picker
-                        v-model="queryCondition.endTime"
-                        type="datetime"
-                        align="right"
-                        :clearable="false"
-                        format="yyyy-MM-dd HH:mm:ss"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择结束时间"
-                      >
-                      </el-date-picker>
-                      <i class="el-icon-date data_icon"></i>
-                    </div>
-                  </div>
-                </div>
-                <div class="task-name checkbox-group-name">
-                  <span class="task-name-text">产品标签：</span>
-                  <div class="task-checkbox">
-                    <el-checkbox-group v-model="queryCondition.checkList">
-                      <el-checkbox label="全部"></el-checkbox>
-                      <el-checkbox label="百年产品"></el-checkbox>
-                      <el-checkbox label="疗效显著"></el-checkbox>
-                      <el-checkbox label="无刺激"></el-checkbox>
-                    </el-checkbox-group>
-                  </div>
-                </div>
-                <div class="task-name">
-                  <span class="task-name-text">产品筛选：</span>
-                  <div class="task-checkbox">
-                    <el-checkbox-group v-model="queryCondition.checkListTwo">
-                      <el-checkbox label="全部"></el-checkbox>
-                      <el-checkbox :label="'药品' + drugnum"></el-checkbox>
-                      <el-checkbox label="医疗器械"></el-checkbox>
-                      <el-checkbox label="化妆品"></el-checkbox>
-                    </el-checkbox-group>
+                    <el-select v-model="queryCondition.dosageForm" placeholder="请选择">
+                      <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                    </el-select>
                   </div>
                 </div>
                 <div class="btn">
@@ -132,11 +74,6 @@
             style="color: #edeef0"
           >
             <el-tab-pane label="产品列表" name="first">
-              <div class="daochu">
-                <div class="btn">
-                  导出
-                </div>
-              </div>
               <div class="mytable">
                 <el-table
                   ref="multipleTable"
@@ -144,13 +81,7 @@
                   tooltip-effect="dark"
                   border
                   style="width: 100%"
-                  @selection-change="handleSelectionChange">
-                  <el-table-column
-                    type="selection"
-                    header-align="center"
-                    class-name="column-text-one"
-                    width="44">
-                  </el-table-column>
+                >
                   <el-table-column
                     label="序号"
                     width="50">
@@ -161,19 +92,24 @@
                     label="产品名称"
                     >
                   </el-table-column>
+                  <el-table-column
+                    prop="approvalNumber"
+                    label="批准文号"
+                    show-overflow-tooltip>
+                  </el-table-column>
                   <el-table-column
                     prop="type"
-                    label="产品类型"
+                    label="药品分类"
                     show-overflow-tooltip>
                   </el-table-column>
                   <el-table-column
-                    prop="approvalNumber"
-                    label="批准文号"
+                    prop="dosageForm"
+                    label="剂型"
                     show-overflow-tooltip>
                   </el-table-column>
                   <el-table-column
                     prop="firmName"
-                    label="企业名称"
+                    label="生产企业"
                     show-overflow-tooltip>
                   </el-table-column>
                   <el-table-column
@@ -189,15 +125,7 @@
                           class="xiangqing"
                           plain
                           @click="handleEdit(scope.$index, scope.row)"
-                          >详情</el-button
-                        >
-                        <el-button
-                          size="mini"
-                          type="primary"
-                          class="bianji"
-                          plain
-                          @click="handleView(scope.$index, scope.row)"
-                          >编辑</el-button
+                          >查看</el-button
                         >
                       </div>
                     </template>
@@ -247,17 +175,28 @@
         drugnum:"(20)",
         activeName: "first",
         queryCondition:{
-          fullTextSearch:"",             // 全文检索
           firmName:"",                   // 企业名称
           approvalNumber:"",             // 批准文号
           taskName:"",                   // 产品名称
-          PrescriptionContent:"",        // 处方内容
-          majorFunction:"",              // 功能主治
-          startTime:"",                  // 开始日期
-          endTime:"",                    // 结束日期
-          checkList:[],
-          checkListTwo:[],
+          dosageForm:'',                 // 剂型
+          drugClassification:'',         // 药品分类
         },
+        options: [{
+          value: '选项1',
+          label: '黄金糕'
+        }, {
+          value: '选项2',
+          label: '双皮奶'
+        }, {
+          value: '选项3',
+          label: '蚵仔煎'
+        }, {
+          value: '选项4',
+          label: '龙须面'
+        }, {
+          value: '选项5',
+          label: '北京烤鸭'
+        }],
         tableData: [{
           date: '1',
           name: '辽-xxxx',
@@ -322,7 +261,6 @@
         tabsTwoStyle:{
           height:''
         },
-        multipleSelection:[],
         total:100,
         currentPage:1,
         pageSize:10,
@@ -342,9 +280,6 @@
       })
     },
     methods: {
-      handleSelectionChange(val){
-        this.multipleSelection = val;
-      },
       currentChange(val){
 
       },
@@ -437,20 +372,23 @@
         .task-name {
           display: flex;
           align-items: center;
-          margin-right: 30px;
+          margin-right: 200px;
           .task-name-text {
             font-size: 16px;
             font-family: Source Han Sans CN;
             font-weight: 400;
             color: #6a6c6f;
             line-height: 50px;
+            display: inline-block;
+            width: 80px;
+            text-align: right;
             // margin-right: vw(10);
           }
           .task-input {
             width: 251px;
             height: 32px;
             ::v-deep .el-input {
-              width: 251px;
+              width: 351px;
               height: 32px;
             }
             ::v-deep .el-input__inner {
@@ -470,7 +408,8 @@
         }
         .btn{
           width: 100%;
-          padding-left: 600px;
+          display: flex;
+          justify-content: center;
         }
         .time-interval {
           display: flex;
@@ -484,58 +423,6 @@
             // line-height: 50px;
             // margin-right: vw(10);
           }
-          .interval-select {
-            display: flex;
-            align-items: center;
-            border: 1px solid #dbe0e8;
-            border-radius: 4px;
-            height: 32px;
-            .star-time,
-            .end-time {
-              position: relative;
-              .data_icon {
-                position: absolute;
-                top: 50%;
-                right: 17px;
-                z-index: 9;
-                color: #c0c4cc;
-                font-size: 14px;
-                transform: translateY(-50%);
-              }
-              ::v-deep .el-input__prefix {
-                display: none;
-              }
-              ::v-deep .el-input {
-                width: 243px;
-                height: 30px;
-              }
-              ::v-deep .el-input__inner {
-                width: 100%;
-                height: 100%;
-                font-size: 16px;
-                font-family: Source Han Sans CN;
-                font-weight: 400;
-                // color: #B1B6BF;
-                line-height: 30px;
-                padding-left: 15px;
-                border: none;
-                cursor: pointer;
-              }
-            }
-            .symbol {
-              background: rgba(219, 224, 232, 0.5);
-              width: 40px;
-              height: 30px;
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              font-size: 16px;
-              font-family: Source Han Sans CN;
-              font-weight: 400;
-              color: #292f38;
-              line-height: 28px;
-            }
-          }
         }
       }
       .tabsTwo {
@@ -544,28 +431,9 @@
         // padding: 10px 0;
         padding-bottom: 20px;
         background-color: #fff;
-        .daochu {
-          padding: 10px;
-          .btn {
-            display: flex;
-            justify-content: center;
-            width: 64px;
-            height: 32px;
-            background: #1E80EB;
-            border-radius: 4px 4px 4px 4px;
-            font-size: 14px;
-            font-family: MicrosoftYaHei-, MicrosoftYaHei;
-            font-weight: normal;
-            color: #FFFFFF;
-            line-height: 31px;
-          }
-        }
         .mytable {
           width: 99%;
-          margin: 0 auto;
-          ::v-deep .column-text-one {
-            text-align: center;
-          }
+          margin: 10px auto;
           ::v-deep .el-table td {
             height: 40px;
             padding: 0;
@@ -584,7 +452,7 @@
             align-items: center;
             .xiangqing {
               height: 23px;
-              padding: 3px;
+              padding: 3px 10px;
               border-radius: 4px;
               line-height: 20px;
               display: flex;