diff --git a/src/api/cosmetics/index.js b/src/api/cosmetics/index.js
index 603e8de..191be76 100644
--- a/src/api/cosmetics/index.js
+++ b/src/api/cosmetics/index.js
@@ -28,4 +28,11 @@ export default {
             method: "get",
         })
     },
+    //通过批准文号查询单条药品批件信息
+    getYaoPin(e){
+        return request({
+            url: `/pharmaceuticals/vRdgYpwhGxwz/${e}`,
+            method: "get",
+        })
+    }
 }
\ No newline at end of file
diff --git a/src/api/index.js b/src/api/index.js
index a40391a..eb6370f 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,7 +1,9 @@
 // 召回
 import frimCenter from "./Myapi/frimCenter/index.js";
 import cosmetics from './cosmetics/index.js'
+import yaoPin from './yaoPin/index.js'
 export default {
   frimCenter,
   cosmetics,
+  yaoPin
 };
diff --git a/src/api/yaoPin/index.js b/src/api/yaoPin/index.js
new file mode 100644
index 0000000..65963c8
--- /dev/null
+++ b/src/api/yaoPin/index.js
@@ -0,0 +1,26 @@
+import request from "@/utils/request";
+export default {
+    //分页条件查询国家药品抽检数据-抽样信息表
+    getYPList(query) {
+        return request({
+            url: `/pharmaceuticals/gjypcjsjCyxxb`,
+            method: "get",
+            params:query
+        })
+    },
+    //通过主键查询单条国家药品抽检数据-抽样信息表
+    getSingle(id){
+        return request({
+            url: `/pharmaceuticals/gjypcjsjCyxxb/${id}`,
+            method: "get",
+        })
+    },
+    //分页条件查询国家药品抽检数据-检验项目表
+    jyList(query){
+        return request({
+            url: `/pharmaceuticals/gjypcjsjJyxmb`,
+            method: "get",
+            params:query
+        })
+    }
+}
\ No newline at end of file
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 56f5a6b..cb95d5a 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -1,113 +1,127 @@
 <template>
-  <div :class="{'hidden':hidden}" class="pagination-container">
-    <el-pagination
-      :background="background"
-      :current-page.sync="currentPage"
-      :page-size.sync="pageSize"
-      :layout="layout"
-      :page-sizes="pageSizes"
-      :pager-count="pagerCount"
-      :total="total"
-      v-bind="$attrs"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
+  <div :class="{ hidden: hidden }" class="paginBox">
+    <div class="leftBox">
+      总共{{ this.total }} 条:显示{{
+        this.currentPage == 1 ? "1" : (this.currentPage - 1) * this.pageSize
+      }}-{{
+        this.total <= this.pageSize
+          ? this.total
+          : this.currentPage * this.pageSize > this.total
+          ? this.total
+          : this.currentPage * this.pageSize
+      }}条
+    </div>
+    <div class="rightBox">
+      <el-pagination
+        :background="background"
+        :current-page.sync="currentPage"
+        :page-size.sync="pageSize"
+        :layout="layout"
+        :page-sizes="pageSizes"
+        :total="total"
+        v-bind="$attrs"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
   </div>
 </template>
 
 <script>
-import { scrollTo } from '@/utils/scroll-to'
+import { scrollTo } from "@/utils/scroll-to";
 
 export default {
-  name: 'Pagination',
+  name: "Pagination",
   props: {
     total: {
       required: true,
-      type: Number
+      type: Number,
     },
     page: {
       type: Number,
-      default: 1
+      default: 1,
     },
     limit: {
       type: Number,
-      default: 20
+      default: 20,
     },
     pageSizes: {
       type: Array,
       default() {
-        return [10, 20, 30, 50]
-      }
+        return [5,10,20];
+      },
     },
     // 移动端页码按钮的数量端默认值5
-    pagerCount: {
-      type: Number,
-      default: document.body.clientWidth < 992 ? 5 : 7
-    },
+    // pagerCount: {
+    //   type: Number,
+    //   default: document.body.clientWidth < 992 ? 5 : 7
+    // },
     layout: {
       type: String,
-      default: 'total, sizes, prev, pager, next, jumper'
+      default: " sizes, prev, pager, next, jumper",
     },
     background: {
       type: Boolean,
-      default: true
+      default: true,
     },
     autoScroll: {
       type: Boolean,
-      default: true
+      default: true,
     },
     hidden: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data() {
-    return {
-    };
+    return {};
   },
   computed: {
     currentPage: {
       get() {
-        return this.page
+        return this.page;
       },
       set(val) {
-        this.$emit('update:page', val)
-      }
+        this.$emit("update:page", val);
+      },
     },
     pageSize: {
       get() {
-        return this.limit
+        return this.limit;
       },
       set(val) {
-        this.$emit('update:limit', val)
-      }
-    }
+        this.$emit("update:limit", val);
+      },
+    },
   },
   methods: {
     handleSizeChange(val) {
       if (this.currentPage * val > this.total) {
-        this.currentPage = 1
+        this.currentPage = 1;
       }
-      this.$emit('pagination', { page: this.currentPage, limit: val })
+      this.$emit("pagination", { page: this.currentPage, limit: val });
       if (this.autoScroll) {
-        scrollTo(0, 800)
+        scrollTo(0, 800);
       }
     },
     handleCurrentChange(val) {
-      this.$emit('pagination', { page: val, limit: this.pageSize })
+      this.$emit("pagination", { page: val, limit: this.pageSize });
       if (this.autoScroll) {
-        scrollTo(0, 800)
+        scrollTo(0, 800);
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style scoped>
-.pagination-container {
-  background: #fff;
-  padding: 32px 16px;
+.paginBox {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 15px 20px;
 }
+
 .pagination-container.hidden {
   display: none;
 }
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 3e22d1c..9d451d8 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -7,10 +7,15 @@ const state = {
     hide: false
   },
   device: 'desktop',
-  size: Cookies.get('size') || 'medium'
+  size: Cookies.get('size') || 'medium',
+  //存储的传递的数据
+  urlA:'',
 }
 
 const mutations = {
+  URLChange : (state, B)  => {
+    state.urlA = B
+  },
   TOGGLE_SIDEBAR: state => {
     if (state.sidebar.hide) {
       return false;
diff --git a/src/views/firmContent/components/descriptions/index.vue b/src/views/firmContent/components/descriptions/index.vue
index 1948c93..2fa72df 100644
--- a/src/views/firmContent/components/descriptions/index.vue
+++ b/src/views/firmContent/components/descriptions/index.vue
@@ -11,7 +11,7 @@
         <template slot="label">
           {{ item.label }}
         </template>
-        {{ item.value }}
+        {{ item.value || '-' }} 
       </el-descriptions-item>
     </el-descriptions>
   </div>
diff --git a/src/views/firmContent/components/table/index.vue b/src/views/firmContent/components/table/index.vue
new file mode 100644
index 0000000..4fd5380
--- /dev/null
+++ b/src/views/firmContent/components/table/index.vue
@@ -0,0 +1,45 @@
+<template>
+  <div>
+    <el-table :data="list" style="width: 100%" v-loading="loading" border>
+      <el-table-column type="index"  label="序号" width="50">
+      </el-table-column>
+      <el-table-column
+        v-for="(item,index) in labels"
+        :key="index"
+        :prop="item.value"
+        header-align="center"
+        :width="item.width"
+        :label="item.header"
+      >
+      </el-table-column>
+    
+    </el-table>
+  </div>
+</template>
+  <script>
+export default {
+  data() {
+    return {
+    };
+  },
+  props:{
+    list:{
+        type:Array,
+        default:[]
+    },
+    labels:{
+        type:Array,
+        default:[]
+    },
+    loading:{
+        type:Boolean,
+        default:false
+    }
+  },
+  methods: {
+  },
+};
+</script>
+  <style lang="scss" scoped>
+</style>
+  
\ No newline at end of file
diff --git a/src/views/firmContent/drugInfo/PZchouyang/PZchouyang.vue b/src/views/firmContent/drugInfo/PZchouyang/PZchouyang.vue
index 6c3b1be..b5580a8 100644
--- a/src/views/firmContent/drugInfo/PZchouyang/PZchouyang.vue
+++ b/src/views/firmContent/drugInfo/PZchouyang/PZchouyang.vue
@@ -10,32 +10,27 @@
           border
         >
           <el-table-column
-            prop="id"
+            type="index"
             header-align="center"
             label="序号"
             width="80"
           >
           </el-table-column>
-          <el-table-column
-            prop="rank"
-            header-align="center"
-            label="抽样级别"
-          >
+          <el-table-column prop="cyrw" header-align="center" label="抽样级别">
+            <!-- <template slot-scope="scope">
+              {{ filterLevel(scope.row.cyjb ) }}
+            </template> -->
           </el-table-column>
-          <el-table-column
-            prop="number"
-            label="抽样编号"
-            header-align="center"
-          >
+          <el-table-column prop="cybh" label="抽样编号" header-align="center">
           </el-table-column>
           <el-table-column
-            prop="name"
+            prop="yptymc"
             label="药品通用名"
             header-align="center"
           >
           </el-table-column>
           <el-table-column
-            prop="unitName"
+            prop="bcydwmc"
             label="被抽样单位名称"
             header-align="center"
           >
@@ -52,17 +47,9 @@
             header-align="center"
           >
           </el-table-column>
-          <el-table-column
-            prop="date"
-            label="抽样日期"
-            header-align="center"
-          >
+          <el-table-column prop="cyrq" label="抽样日期" header-align="center">
           </el-table-column>
-          <el-table-column
-            label="操作"
-            header-align="center"
-            width="100"
-          >
+          <el-table-column label="操作" header-align="center" width="100">
             <template slot-scope="scope">
               <div class="button">
                 <el-button
@@ -70,158 +57,424 @@
                   class="informant-btn"
                   plain
                   type="primary"
-                  @click="handleEdit(scope.$index, scope.row)">详情
+                  @click="handleEdit(scope.$index, scope.row)"
+                  >详情
                 </el-button>
               </div>
             </template>
           </el-table-column>
         </el-table>
       </div>
-      <div class="pagination" :class="transinformation.b == '1' ? 'paginationTwo':''">
-        <!-- <span class="custom"
-          >共{{ total }}条，显示{{
-            total == 0
-              ? "0"
-              : queryCondition.current == 1
-              ? "1"
-              : queryCondition.size * (queryCondition.current - 1) + 1
-          }}-{{ numberMap() }}条</span
-        > -->
-        <span class="custom">
-          共100条，显示1-10条
-        </span>
-        <el-pagination
-          background
-          :small="transinformation.b == '1'"
-          :page-sizes="[10, 15]"
-          :total="total"
-          layout=" prev, pager, next, sizes, jumper"
-          @current-change="currentChange"
-          @size-change="sizeChange"
-          :current-page.sync="currentPage"
-          :page-size.sync="pageSize"
-        >
-        </el-pagination>
-      </div>
+      <!-- <div
+        class="pagination"
+        :class="transinformation.b == '1' ? 'paginationTwo' : ''"
+      > -->
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page="form1.current"
+        :limit="form1.size"
+        @pagination="getPagination"
+      ></pagination>
+      <!-- </div> -->
     </block-header>
     <!-- 国抽 -->
     <dialog-title title="详情" width="90%" ref="xiangqingDialog">
       <div class="dialog-tabs">
         <div class="tabs">
-          <div class="tab" @click="actionTab(1)" :class="action == 1 ? 'actionTab':''">
-            <img :class="action !== 1 ? 'actionImage' : ''" :src="action == 1 ? `${require('@/assets/images/home/icon1-1@2x.png')}`:`${require('@/assets/images/home/icon1-2@2x.png')}`" alt="">
+          <div
+            class="tab"
+            @click="actionTab(1)"
+            :class="action == 1 ? 'actionTab' : ''"
+          >
             <span>基本信息</span>
           </div>
-          <div class="tab" @click="actionTab(2)" :class="action == 2 ? 'actionTab':''">
-            <img  :src="action == 2 ? `${require('@/assets/images/home/icon2-1@2x.png')}`:`${require('@/assets/images/home/icon2-2@2x.png')}`" alt="">
-            <span>品种抽样</span>
+          <div
+            class="tab"
+            @click="actionTab(2)"
+            :class="action == 2 ? 'actionTab' : ''"
+          >
+            <span>检验项目</span>
           </div>
         </div>
       </div>
-      <component :is="currentComponent"></component>
+      <component :is="currentComponent" :descriptions="descriptions" :loading="load1"></component>
     </dialog-title>
     <!-- 省抽 -->
-    <dialog-title title="查看抽样详情" :width="transinformation.b == '1' ? '65%':'90%'" ref="chouyangDialog">
+    <dialog-title
+      title="查看抽样详情"
+      :width="transinformation.b == '1' ? '65%' : '90%'"
+      ref="chouyangDialog"
+    >
       <chouyang-info></chouyang-info>
     </dialog-title>
-    <dialog-title  title="详情" :width="transinformation.b == '1' ? '75%':'90%'" ref="medicalInfo">
+    <dialog-title
+      title="详情"
+      :width="transinformation.b == '1' ? '75%' : '90%'"
+      ref="medicalInfo"
+    >
       <medical-info></medical-info>
     </dialog-title>
-    <dialog-title  title="详情" :width="transinformation.b == '1' ? '75%':'90%'" ref="drugDetail">
+    <dialog-title
+      title="详情"
+      :width="transinformation.b == '1' ? '75%' : '90%'"
+      ref="drugDetail"
+    >
       <drug-detail></drug-detail>
     </dialog-title>
-    <dialog-title  title="详情" :width="transinformation.b == '1' ? '75%':'90%'" ref="drugProvince">
+    <dialog-title
+      title="详情"
+      :width="transinformation.b == '1' ? '75%' : '90%'"
+      ref="drugProvince"
+    >
       <drug-province></drug-province>
     </dialog-title>
-    <dialog-title  title="详情" :width="transinformation.b == '1' ? '75%':'90%'" ref="samplingDetail">
+    <dialog-title
+      title="详情"
+      :width="transinformation.b == '1' ? '75%' : '90%'"
+      ref="samplingDetail"
+    >
       <sampling-detail></sampling-detail>
     </dialog-title>
   </div>
 </template>
 <script>
-import blockHeader from "@/views/firmContent/components/blockHeader/index.vue"
-import dialogTitle from "@/views/firmContent/components/dialogTitle/index.vue"
-import basicInfo from "./basicInfo/basicInfo.vue"
-import chouYang from "./chouYang/chouYang.vue"
-import chouyangInfo from "./chouyangInfo/index.vue"
-import medicalInfo from "./medical.vue"
-import samplingDetail from "./samplingDetail.vue"
-import drugDetail from "./drugDetail.vue"
-import drugProvince from "./drugProvince.vue"
+import blockHeader from "@/views/firmContent/components/blockHeader/index";
+import dialogTitle from "@/views/firmContent/components/dialogTitle/index";
+import basicInfo from "./basicInfo/basicInfo";
+import chouYang from "./chouYang/chouYang";
+import chouyangInfo from "./chouyangInfo/index";
+import medicalInfo from "./medical";
+import samplingDetail from "./samplingDetail";
+import drugDetail from "./drugDetail";
+import drugProvince from "./drugProvince";
+import { mapState } from "vuex";
 
 export default {
   data() {
     return {
-      tableData:[
-        {
-          id:1,
-          rank:'国抽',
-          number:'YC20230619',
-          name:'布洛芬胶囊',
-          unitName:'xxxxxxx制药有限公司',
-          unitAreaName:'沈阳',
-          productionName:'xxxxxxx制药有限公司',
-          date:'2023-06-19'
-        },{
-          id:2,
-          rank:'省抽',
-          number:'YC20230619',
-          name:'布洛芬胶囊',
-          unitName:'xxxxxxx制药有限公司',
-          unitAreaName:'沈阳',
-          productionName:'xxxxxxx制药有限公司',
-          date:'2023-06-19'
-        },{
-          id:3,
-          rank:'国抽',
-          number:'YC20230619',
-          name:'布洛芬胶囊',
-          unitName:'xxxxxxx制药有限公司',
-          unitAreaName:'沈阳',
-          productionName:'xxxxxxx制药有限公司',
-          date:'2023-06-19'
-        },{
-          id:4,
-          rank:'省抽',
-          number:'YC20230619',
-          name:'布洛芬胶囊',
-          unitName:'xxxxxxx制药有限公司',
-          unitAreaName:'沈阳',
-          productionName:'xxxxxxx制药有限公司',
-          date:'2023-06-19'
-        },{
-          id:5,
-          rank:'国抽',
-          number:'YC20230619',
-          name:'布洛芬胶囊',
-          unitName:'xxxxxxx制药有限公司',
-          unitAreaName:'沈阳',
-          productionName:'xxxxxxx制药有限公司',
-          date:'2023-06-19'
-        },{
-          id:6,
-          rank:'省抽',
-          number:'YC20230619',
-          name:'布洛芬胶囊',
-          unitName:'xxxxxxx制药有限公司',
-          unitAreaName:'沈阳',
-          productionName:'xxxxxxx制药有限公司',
-          date:'2023-06-19'
-        }
-      ],
-      loading:false,
-      action:1,
-      currentComponent:'basicInfo',
+      tableData: [],
+      loading: false,
+      action: 1,
+      currentComponent: "basicInfo",
       // pzChouyangStyle:{
       //   height:''
       // }
-      currentPage:1,
-      pageSize:10,
-      total:100,
-    }
+      total: 10,
+      //药品的参数
+      form1: {
+        size: 10,
+        current: 1,
+      },
+      //主键
+      ids: "",
+      descriptions: [
+        {
+          span: 1,
+          label: "药品通用名称",
+          value: "",
+          data: "yptymc",
+        },
+        {
+          span: 1,
+          label: "药品商品名称",
+          value: "",
+          data: "ypspmc",
+        },
+        {
+          span: 1,
+          label: "药品批准文号",
+          value: "",
+          data: "yppzwh",
+        },
+        {
+          span: 1,
+          label: "药品类别",
+          value: "",
+          data: "yplb",
+        },
+        {
+          span: 1,
+          label: "药品上市许可持有人",
+          value: "",
+          data: "ypssxkcyr",
+        },
+        {
+          span: 1,
+          label: "药品上市许可持有人统一社会信用代码",
+          value: "",
+          data: "ypssxkcyrtyshxxdm",
+        },
+        {
+          span: 1,
+          label: "药品上市许可持有人地址",
+          value: "",
+          data: "ypssxkcyrdz",
+        },
+        {
+          span: 1,
+          label: "药品上市持有人所在省份",
+          value: "",
+          data: "ypssxkcyrszsf",
+        },
+        {
+          span: 1,
+          label: "剂型",
+          value: "",
+          data: "jx",
+        },
+        {
+          span: 1,
+          label: "制剂规格",
+          value: "",
+          data: "zjgg",
+        },
+        {
+          span: 1,
+          label: "包装规格",
+          value: "",
+          data: "bzgg",
+        },
+        {
+          span: 1,
+          label: "抽样编号",
+          value: "",
+          data: "cybh",
+        },
+        {
+          span: 1,
+          label: "抽样数量",
+          value: "",
+          data: "cysl",
+        },
+        {
+          span: 1,
+          label: "有效期",
+          value: "",
+          data: "xq",
+        },
+        {
+          span: 1,
+          label: "来源",
+          value: "",
+          data: "ly",
+        },
+        {
+          span: 1,
+          label: "抽样环节",
+          value: "",
+          data: "cyhj",
+        },
+        {
+          span: 1,
+          label: "批号",
+          value: "",
+          data: "ph",
+        },
+        {
+          span: 1,
+          label: "有效期截至日期",
+          value: "",
+          data: "yxqjzrq",
+        },
+        {
+          span: 1,
+          label: "被抽样单位统一社会信用代码",
+          value: "",
+          data: "bcydwshyxdm",
+        },
+        {
+          span: 1,
+          label: "被抽样单位名称",
+          value: "",
+          data: "bcydwmc",
+        },
+        {
+          span: 1,
+          label: "被抽样单位地址",
+          value: "",
+          data: "bcydwdz",
+        },
+        {
+          span: 1,
+          label: "抽样地点性质",
+          value: "",
+          data: "cyddxz",
+        },
+        {
+          span: 1,
+          label: "抽样单位名称全称",
+          value: "",
+          data: "cydwmc",
+        },
+        {
+          span: 1,
+          label: "抽样单位所在省份",
+          value: "",
+          data: "cydwszsf",
+        },
+        {
+          span: 1,
+          label: "药品单价",
+          value: "",
+          data: "ypdj",
+        },
+        {
+          span: 1,
+          label: "药品总价",
+          value: "",
+          data: "ypzj",
+        },
+        {
+          span: 1,
+          label: "生产日期",
+          value: "",
+          data: "scrq",
+        },
+        {
+          span: 1,
+          label: "样品存放现场温度",
+          value: "",
+          data: "ypcfxcwd",
+        },
+        {
+          span: 1,
+          label: "样品存放现场湿度",
+          value: "",
+          data: "ypcfxcsd",
+        },
+        {
+          span: 1,
+          label: "抽样日期",
+          value: "",
+          data: "cyrq",
+        },
+        {
+          span: 1,
+          label: "抽样级别",
+          value: "",
+          data: "cyjb",
+        },
+        {
+          span: 1,
+          label: "抽样单位经手人",
+          value: "",
+          data: "cydwjsr",
+        },
+        {
+          span: 1,
+          label: "承检机构",
+          value: "",
+          data: "cjjg",
+        },
+        {
+          span: 1,
+          label: "生产企业是否否认生产",
+          value: "",
+          data: "scqysffrsc",
+        },
+        {
+          span: 1,
+          label: "基本药物 ",
+          value: "",
+          data: "jbyw",
+        },
+        {
+          span: 1,
+          label: "抽样任务",
+          value: "",
+          data: "cyrw",
+        },
+        {
+          span: 1,
+          label: "最终检验结论",
+          value: "",
+          data: "zzjyjl",
+        },
+        {
+          span: 1,
+          label: "检验证书编号",
+          value: "",
+          data: "jybgsbh",
+        },
+        {
+          span: 1,
+          label: "报告签发日期",
+          value: "",
+          data: "bgqfrq",
+        },
+        {
+          span: 1,
+          label: "复检结论",
+          value: "",
+          data: "fjjl",
+        },
+        {
+          span: 1,
+          label: "复检检验依据",
+          value: "",
+          data: "fjjyyj",
+        },
+        {
+          span: 1,
+          label: "复检报告书编号",
+          value: "",
+          data: "fjbgsbh",
+        },
+        {
+          span: 1,
+          label: "复检报告签发日期",
+          value: "",
+          data: "fjbgqfrq",
+        },
+        {
+          span: 1,
+          label: "收样或退样日期",
+          value: "",
+          data: "syhtyrq",
+        },
+        {
+          span: 1,
+          label: "原检结论",
+          value: "",
+          data: "yjjl",
+        },
+        {
+          span: 1,
+          label: "补充检验结果",
+          value: "",
+          data: "bcjyjg",
+        },
+        {
+          span: 1,
+          label: "计划ID",
+          value: "",
+          data: "planId",
+        },
+        {
+          span: 1,
+          label: "计划名称",
+          value: "",
+          data: "planName",
+        },
+        {
+          span: 1,
+          label: "编辑时间",
+          value: "",
+          data: "bjsj",
+        },
+        {
+          span: 1,
+          label: "更新时间",
+          value: "",
+          data: "gxsj",
+        },
+      ],
+      load1: true,
+    };
   },
-  props:['transinformation'],
-  components:{ 
+  props: ["transinformation"],
+  components: {
     blockHeader,
     dialogTitle,
     basicInfo,
@@ -232,62 +485,140 @@ export default {
     drugDetail,
     drugProvince,
   },
-  methods:{
+  computed: {
+    // // ...
+    ...mapState({
+      urlA: (state) => state.app.urlA,
+    }),
+  },
+  created() {
+    this.getDAList();
+  },
+  methods: {
+    getPagination(e) {
+      console.log(e);
+      this.form1.current = e.page;
+      this.form1.size = e.limit;
+      this.chinaCosmetics();
+      this.listyp();
+    },
+    filterLevel(e) {
+      if (e === "01") {
+        return "省抽";
+      } else if (e === "02") {
+        return "地级市";
+      } else if (e === "03") {
+        return "县级";
+      } else if (e === "04") {
+        return "乡、镇";
+      } else if (e === "05") {
+        return "其他";
+      }
+    },
+    //药品数据
+    async listyp() {
+      this.loading = true;
+      let msg1 = await this.$api.yaoPin.getYPList(this.form1);
+      this.tableData = msg1.data.records;
+      this.total = msg1.data.total;
+      this.form1.size = msg1.data.size;
+      this.form1.current = msg1.data.current;
+      this.loading = false;
+    },
+    //判断是哪一个档案传递过来的数据
+    getDAList() {
+      let AA = this.$store.state.app.urlA;
+      if (AA) {
+        // 化妆品
+        if (AA.type == 1) {
+        } else if (AA.type == 2) {
+          //药品
+          this.listyp();
+        } else if (AA.type == 3) {
+        }
+      }
+    },
     // 详情弹出框的tabs切换事件
-    actionTab(id){
+    actionTab(id) {
       this.action = id;
-      if(id == 1) {
-        this.currentComponent = 'basicInfo'
+      if (id == 1) {
+        this.currentComponent = "basicInfo";
       } else {
-        this.currentComponent = 'chouYang'
+        this.currentComponent = "chouYang";
+      }
+    },
+    //药品详情
+    async idData() {
+      this.load1 = true;
+      let msg1 = await this.$api.yaoPin.getSingle(this.ids);
+      this.filter(msg1.data, this.descriptions);
+      this.load1 = false;
+    },
+    //处理数据
+    filter(A, B) {
+      for (let key in A) {
+        B.forEach((values, index) => {
+          if (values.data === key) {
+            B[index].value = A[key];
+          }
+        });
       }
     },
     // 点击详情按钮
-    handleEdit(index,row){
-      if(index == 1) {
-        this.$refs.chouyangDialog.open(row);
-      } else if(index == 2){
+    handleEdit(index, row) {
+      this.ids = row.id;
+      console.log(this.ids);
+      // 化妆品
+      if (this.urlA.type == 1) {
+      } else if (this.urlA.type == 2) {
+        //药品要判断是国抽还是省抽
+        this.idData()
         this.$refs.xiangqingDialog.open(row);
-      } else if( index == 3) {
-        this.$refs.medicalInfo.open(row)
-      } else if(index == 0) {
-        this.$refs.samplingDetail.open(row)
-      } else if(index == 4) {
-        this.$refs.drugProvince.open(row)
-      } else if(index == 5) {
-        this.$refs.drugDetail.open(row)
+      } else if (this.urlA.type == 3) {
       }
-      
+      // if (index == 1) {
+      //   this.$refs.chouyangDialog.open(row);
+      // } else if (index == 2) {
+      //   this.$refs.xiangqingDialog.open(row);
+      // } else if (index == 3) {
+      //   this.$refs.medicalInfo.open(row);
+      // } else if (index == 0) {
+      //   this.$refs.samplingDetail.open(row);
+      // } else if (index == 4) {
+      //   this.$refs.drugProvince.open(row);
+      // } else if (index == 5) {
+      //   this.$refs.drugDetail.open(row);
+      // }
     },
     // tabs某列的样式修改
     columnStyle({ row, column, rowIndex, columnIndex }) {
       if (columnIndex == 7 || columnIndex == 0) {
         return "font-family: DIN;";
-      } else if (columnIndex == 2 || columnIndex == 1 || columnIndex == 3 || columnIndex == 4) {
+      } else if (
+        columnIndex == 2 ||
+        columnIndex == 1 ||
+        columnIndex == 3 ||
+        columnIndex == 4
+      ) {
         return "font-family: Source Han Sans CN;";
-      } else if(columnIndex == 5 || columnIndex == 6 || columnIndex == 8) {
+      } else if (columnIndex == 5 || columnIndex == 6 || columnIndex == 8) {
         return "font-family: Adobe Heiti Std;font-weight: normal;";
       }
     },
-    currentChange(index){
-
-    },
-    sizeChange(index){
-
-    },
+    currentChange(index) {},
+    sizeChange(index) {},
   },
-  mounted(){
-  //   this.$nextTick(()=>{
-  //     let dom = document.getElementsByClassName('pzChouyang');
-  //     let height = dom[0].getBoundingClientRect();
-  //     let windowWidth = window.innerWidth;
-  //     let windowHeight = window.innerHeight;
-  //     let relativeHeight = windowHeight - height.top - (26 / 1920 * windowWidth)
-  //     this.pzChouyangStyle.height = relativeHeight + 'px'
-  //   })
-    console.log(this.transinformation)
-  }
-}
+  mounted() {
+    //   this.$nextTick(()=>{
+    //     let dom = document.getElementsByClassName('pzChouyang');
+    //     let height = dom[0].getBoundingClientRect();
+    //     let windowWidth = window.innerWidth;
+    //     let windowHeight = window.innerHeight;
+    //     let relativeHeight = windowHeight - height.top - (26 / 1920 * windowWidth)
+    //     this.pzChouyangStyle.height = relativeHeight + 'px'
+    //   })
+  },
+};
 </script>
 <style lang="scss" scoped>
 @import "@/assets/styles/utils.scss";
@@ -322,7 +653,7 @@ export default {
       padding: 0;
       font-size: vw(14);
       font-weight: 400;
-      color: #292F38;
+      color: #292f38;
     }
     ::v-deep .el-table th {
       height: vh(40);
@@ -379,9 +710,9 @@ export default {
   .tabs {
     width: 100%;
     display: flex;
-    border-bottom: vw(1) solid #DBE0E8;
+    border-bottom: vw(1) solid #dbe0e8;
     .tab {
-      border: vw(1) solid #DBE0E8;
+      border: vw(1) solid #dbe0e8;
       padding: vh(7) vw(22);
       display: flex;
       align-items: center;
@@ -389,7 +720,7 @@ export default {
       margin-right: vw(9);
       cursor: pointer;
 
-      &:last-child{
+      &:last-child {
         margin-right: 0;
       }
 
@@ -410,12 +741,12 @@ export default {
         font-size: vw(16);
         font-family: Source Han Sans CN;
         font-weight: 400;
-        color: #2F3742;
+        color: #2f3742;
       }
     }
     .actionTab {
-      background-color: #1E80EB;
-      
+      background-color: #1e80eb;
+
       span {
         color: #fff;
       }
diff --git a/src/views/firmContent/drugInfo/PZchouyang/basicInfo/basicInfo.vue b/src/views/firmContent/drugInfo/PZchouyang/basicInfo/basicInfo.vue
index e8e1bde..f0ffca6 100644
--- a/src/views/firmContent/drugInfo/PZchouyang/basicInfo/basicInfo.vue
+++ b/src/views/firmContent/drugInfo/PZchouyang/basicInfo/basicInfo.vue
@@ -1,152 +1,473 @@
 <template>
   <block-header title="国家药品抽检信息">
-    <my-descriptions :descriptions="descriptions" width></my-descriptions>
+    <my-descriptions
+      :descriptions="descriptions"
+      width
+      v-loading="loading"
+    ></my-descriptions>
   </block-header>
 </template>
 <script>
-import blockHeader from "@/views/firmContent/components/blockHeader/index.vue"
-import myDescriptions from "@/views/firmContent/components/descriptions/index.vue"
+import blockHeader from "@/views/firmContent/components/blockHeader/index.vue";
+import myDescriptions from "@/views/firmContent/components/descriptions/index.vue";
 export default {
   data() {
     return {
-      descriptions:[
-        {
-          id:1,
-          label:'药品通用名称',
-          value:'注射用冷冻干燥用氯化丁基橡胶塞'
-        },{
-          id:2,
-          label:'药品商品名称',
-          value:'xxxxxxxxxxxxxxx'
-        },{
-          id:3,
-          label:'药品批准文号',
-          value:'药包材登记号B20190008023'
-        },{
-          id:4,
-          label:'药品类别',
-          value:'xxxxxxxxxxxxxxx'
-        },{
-          id:5,
-          label:'药品上市许可持有人',
-          value:'重庆市沛玲三海兰陵有限责任公司'
-        },{
-          id:6,
-          label:'药品上市许可持有人统一社会信用代码',
-          value:'xxxxxxxxxxxxxxx'
-        },{
-          id:7,
-          label:'药品上市许可持有人地址',
-          value:'xxxxxxxxxxxxx'
-        },{
-          id:8,
-          label:'药品上市许可持有人所在省份',
-          value:'xxxxxxxxxxxxxxx'
-        },{
-          id:9,
-          label:'剂型',
-          value:'xxxxxxxxxxxxxxx'
-        },{
-          id:10,
-          label:'制剂规格',
-          value:'xxxxxxxxxxxxxxx'
-        },{
-          id:11,
-          label:'包装规格',
-          value:'xxxxxxxxxxxxxxxxx'
-        },{
-          id:12,
-          label:'抽样编号',
-          value:'xxxxxxxxxxxxxxx'
-        },{
-          id:13,
-          label:'抽样数量',
-          value:'xxxxxxxxxxxxxxx'
-        },{
-          id:14,
-          label:'效期',
-          value:'xxxxxxxxxxxxxxx'
-        },{
-          id:15,
-          label:'来源',
-          value:'xxxxxxxxxxxxxxxxx'
-        },{
-          id:16,
-          label:'抽样环节',
-          value:'xxxxxxxxxxxxxxx'
-        },{
-          id:17,
-          label:'批号',
-          value:'xxxxxxxxxxxxxx'
-        },{
-          id:18,
-          label:'有效期截止日期',
-          value:'xxxxxxxxxxxxxxx'
-        },{
-          id:19,
-          label:'被抽样单位统一社会信用代码',
-          value:'xxxxxxxxxxxxxx'
-        },{
-          id:20,
-          label:'被抽样单位名称',
-          value:'xxxxxxxxxxxxxxx'
-        },{
-          id:21,
-          label:'被抽样单位地址',
-          value:'xxxxxxxxxxxxxxx'
-        },{
-          id:22,
-          label:'抽样地点性质',
-          value:'xxxxxxxxxxxxxxx'
-        },{
-          id:23,
-          label:'药品单价',
-          value:'xxxxxxxxxxxxxx'
-        },{
-          id:24,
-          label:'抽样单位所在省份',
-          value:'xxxxxxxxxxxxxxx'
-        },{
-          id:25,
-          label:'生产日期',
-          value:'xxxxxxxxxxxxxxxx'
-        },{
-          id:26,
-          label:'药品总价',
-          value:'xxxxxxxxxxxxxxx'
-        },{
-          id:27,
-          label:'药品存放现场湿度',
-          value:'xxxxxxxx'
-        },{
-          id:28,
-          label:'样品存放现场温度',
-          value:'xxxxxxxxxxxxxxx'
-        },{
-          id:29,
-          label:'抽样级别',
-          value:'xxxxxxx'
-        },{
-          id:30,
-          label:'抽样日期',
-          value:'xxxxxxxxxxxx'
-        },{
-          id:31,
-          label:'承检机构',
-          value:'xxxxxxxxx'
-        },{
-          id:32,
-          label:'抽样单位经手人',
-          value:'xxxxxxxxxxxxxx'
-        },
-      ]
+      // descriptions:[
+      //   {
+      //     id:1,
+      //     label:'药品通用名称',
+      //     value:'注射用冷冻干燥用氯化丁基橡胶塞'
+      //   },{
+      //     id:2,
+      //     label:'药品商品名称',
+      //     value:'xxxxxxxxxxxxxxx'
+      //   },{
+      //     id:3,
+      //     label:'药品批准文号',
+      //     value:'药包材登记号B20190008023'
+      //   },{
+      //     id:4,
+      //     label:'药品类别',
+      //     value:'xxxxxxxxxxxxxxx'
+      //   },{
+      //     id:5,
+      //     label:'药品上市许可持有人',
+      //     value:'重庆市沛玲三海兰陵有限责任公司'
+      //   },{
+      //     id:6,
+      //     label:'药品上市许可持有人统一社会信用代码',
+      //     value:'xxxxxxxxxxxxxxx'
+      //   },{
+      //     id:7,
+      //     label:'药品上市许可持有人地址',
+      //     value:'xxxxxxxxxxxxx'
+      //   },{
+      //     id:8,
+      //     label:'药品上市许可持有人所在省份',
+      //     value:'xxxxxxxxxxxxxxx'
+      //   },{
+      //     id:9,
+      //     label:'剂型',
+      //     value:'xxxxxxxxxxxxxxx'
+      //   },{
+      //     id:10,
+      //     label:'制剂规格',
+      //     value:'xxxxxxxxxxxxxxx'
+      //   },{
+      //     id:11,
+      //     label:'包装规格',
+      //     value:'xxxxxxxxxxxxxxxxx'
+      //   },{
+      //     id:12,
+      //     label:'抽样编号',
+      //     value:'xxxxxxxxxxxxxxx'
+      //   },{
+      //     id:13,
+      //     label:'抽样数量',
+      //     value:'xxxxxxxxxxxxxxx'
+      //   },{
+      //     id:14,
+      //     label:'效期',
+      //     value:'xxxxxxxxxxxxxxx'
+      //   },{
+      //     id:15,
+      //     label:'来源',
+      //     value:'xxxxxxxxxxxxxxxxx'
+      //   },{
+      //     id:16,
+      //     label:'抽样环节',
+      //     value:'xxxxxxxxxxxxxxx'
+      //   },{
+      //     id:17,
+      //     label:'批号',
+      //     value:'xxxxxxxxxxxxxx'
+      //   },{
+      //     id:18,
+      //     label:'有效期截止日期',
+      //     value:'xxxxxxxxxxxxxxx'
+      //   },{
+      //     id:19,
+      //     label:'被抽样单位统一社会信用代码',
+      //     value:'xxxxxxxxxxxxxx'
+      //   },{
+      //     id:20,
+      //     label:'被抽样单位名称',
+      //     value:'xxxxxxxxxxxxxxx'
+      //   },{
+      //     id:21,
+      //     label:'被抽样单位地址',
+      //     value:'xxxxxxxxxxxxxxx'
+      //   },{
+      //     id:22,
+      //     label:'抽样地点性质',
+      //     value:'xxxxxxxxxxxxxxx'
+      //   },{
+      //     id:23,
+      //     label:'药品单价',
+      //     value:'xxxxxxxxxxxxxx'
+      //   },{
+      //     id:24,
+      //     label:'抽样单位所在省份',
+      //     value:'xxxxxxxxxxxxxxx'
+      //   },{
+      //     id:25,
+      //     label:'生产日期',
+      //     value:'xxxxxxxxxxxxxxxx'
+      //   },{
+      //     id:26,
+      //     label:'药品总价',
+      //     value:'xxxxxxxxxxxxxxx'
+      //   },{
+      //     id:27,
+      //     label:'药品存放现场湿度',
+      //     value:'xxxxxxxx'
+      //   },{
+      //     id:28,
+      //     label:'样品存放现场温度',
+      //     value:'xxxxxxxxxxxxxxx'
+      //   },{
+      //     id:29,
+      //     label:'抽样级别',
+      //     value:'xxxxxxx'
+      //   },{
+      //     id:30,
+      //     label:'抽样日期',
+      //     value:'xxxxxxxxxxxx'
+      //   },{
+      //     id:31,
+      //     label:'承检机构',
+      //     value:'xxxxxxxxx'
+      //   },{
+      //     id:32,
+      //     label:'抽样单位经手人',
+      //     value:'xxxxxxxxxxxxxx'
+      //   },
+      // ],
+      // descriptions: [
+      //   {
+      //     span: 1,
+      //     label: "药品通用名称",
+      //     value: "",
+      //     data: "yptymc",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "药品商品名称",
+      //     value: "",
+      //     data: "ypspmc",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "药品批准文号",
+      //     value: "",
+      //     data: "yppzwh",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "药品类别",
+      //     value: "",
+      //     data: "yplb",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "药品上市许可持有人",
+      //     value: "",
+      //     data: "ypssxkcyr",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "药品上市许可持有人统一社会信用代码",
+      //     value: "",
+      //     data: "ypssxkcyrtyshxxdm",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "药品上市许可持有人地址",
+      //     value: "",
+      //     data: "ypssxkcyrdz",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "药品上市持有人所在省份",
+      //     value: "",
+      //     data: "ypssxkcyrszsf",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "剂型",
+      //     value: "",
+      //     data: "jx",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "制剂规格",
+      //     value: "",
+      //     data: "zjgg",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "包装规格",
+      //     value: "",
+      //     data: "bzgg",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "抽样编号",
+      //     value: "",
+      //     data: "cybh",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "抽样数量",
+      //     value: "",
+      //     data: "cysl",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "有效期",
+      //     value: "",
+      //     data: "xq",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "来源",
+      //     value: "",
+      //     data: "ly",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "抽样环节",
+      //     value: "",
+      //     data: "cyhj",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "批号",
+      //     value: "",
+      //     data: "ph",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "有效期截至日期",
+      //     value: "",
+      //     data: "yxqjzrq",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "被抽样单位统一社会信用代码",
+      //     value: "",
+      //     data: "bcydwshyxdm",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "被抽样单位名称",
+      //     value: "",
+      //     data: "bcydwmc",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "被抽样单位地址",
+      //     value: "",
+      //     data: "bcydwdz",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "抽样地点性质",
+      //     value: "",
+      //     data: "cyddxz",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "抽样单位名称全称",
+      //     value: "",
+      //     data: "cydwmc",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "抽样单位所在省份",
+      //     value: "",
+      //     data: "cydwszsf",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "药品单价",
+      //     value: "",
+      //     data: "ypdj",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "药品总价",
+      //     value: "",
+      //     data: "ypzj",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "生产日期",
+      //     value: "",
+      //     data: "scrq",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "样品存放现场温度",
+      //     value: "",
+      //     data: "ypcfxcwd",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "样品存放现场湿度",
+      //     value: "",
+      //     data: "ypcfxcsd",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "抽样日期",
+      //     value: "",
+      //     data: "cyrq",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "抽样级别",
+      //     value: "",
+      //     data: "cyjb",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "抽样单位经手人",
+      //     value: "",
+      //     data: "cydwjsr",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "承检机构",
+      //     value: "",
+      //     data: "cjjg",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "生产企业是否否认生产",
+      //     value: "",
+      //     data: "scqysffrsc",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "基本药物 ",
+      //     value: "",
+      //     data: "jbyw",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "抽样任务",
+      //     value: "",
+      //     data: "cyrw",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "最终检验结论",
+      //     value: "",
+      //     data: "zzjyjl",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "检验证书编号",
+      //     value: "",
+      //     data: "jybgsbh",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "报告签发日期",
+      //     value: "",
+      //     data: "bgqfrq",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "复检结论",
+      //     value: "",
+      //     data: "fjjl",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "复检检验依据",
+      //     value: "",
+      //     data: "fjjyyj",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "复检报告书编号",
+      //     value: "",
+      //     data: "fjbgsbh",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "复检报告签发日期",
+      //     value: "",
+      //     data: "fjbgqfrq",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "收样或退样日期",
+      //     value: "",
+      //     data: "syhtyrq",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "原检结论",
+      //     value: "",
+      //     data: "yjjl",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "补充检验结果",
+      //     value: "",
+      //     data: "bcjyjg",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "计划ID",
+      //     value: "",
+      //     data: "planId",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "计划名称",
+      //     value: "",
+      //     data: "planName",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "编辑时间",
+      //     value: "",
+      //     data: "bjsj",
+      //   },
+      //   {
+      //     span: 1,
+      //     label: "更新时间",
+      //     value: "",
+      //     data: "gxsj",
+      //   },
+      // ],
+      // loading: true,
+    };
+  },
+  props: {
+    descriptions:{
+      type:Array,
+      default:[]
+    },
+    loading:{
+      type:Boolean,
+      default:true
     }
   },
-  components:{blockHeader,myDescriptions},
-  methods:{
+  components: { blockHeader, myDescriptions },
+  created() {
+  },
+  mounted(){
   },
-}
+  methods: {
+
+  },
+};
 </script>
 <style lang="scss" scoped>
-
 </style>
diff --git a/src/views/firmContent/drugInfo/PZchouyang/chouYang/chouYang.vue b/src/views/firmContent/drugInfo/PZchouyang/chouYang/chouYang.vue
index 995c7eb..44fb7a8 100644
--- a/src/views/firmContent/drugInfo/PZchouyang/chouYang/chouYang.vue
+++ b/src/views/firmContent/drugInfo/PZchouyang/chouYang/chouYang.vue
@@ -1,290 +1,121 @@
 <template>
   <block-header title="检验项目信息">
     <div class="tables">
-      <el-table
-        :data="tableData"
-        style="width: 100%"
-        v-loading="loading"
-        border
-      >
-        <el-table-column
-          prop="id"
-          header-align="center"
-          label="序号"
-          width="50"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="dalei"
-          header-align="center"
-          width="80"
-          label="检验大类"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="project"
-          width="90"
-          header-align="center"
-          label="检验项目"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="guiding"
-          header-align="center"
-          label="标准规定"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="jieguo"
-          header-align="center"
-          width="105"
-          label="检验结果"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="jielun"
-          header-align="center"
-          width="80"
-          label="检验结论"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="yiju"
-          label="检验依据"
-          header-align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="xuhao"
-          label="检验序号"
-          width="90"
-          header-align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="leibie"
-          label="报告类别"
-          width="90"
-          header-align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="bianhao"
-          label="抽样编号"
-          width="135"
-          header-align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="name"
-          label="药品通用名"
-          header-align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="editdate"
-          label="编辑时间"
-          width="90"
-          header-align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="update"
-          label="更新时间"
-          width="90"
-          header-align="center"
-        >
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="pagination">
-      <span class="custom"
-        >共{{ tableData.length }}条，显示{{
-          0
-        }}-{{ tableData.length }}条</span
-      >
-      <el-pagination
-        background
-        small
-        @current-change="currentChange"
-        @size-change="sizeChange"
-        :current-page.sync="current"
-        :page-size.sync="size"
-        :page-sizes="[10, 15]"
-        layout=" prev, pager, next, sizes, jumper"
-        :total="tableData.length"
-      >
-      </el-pagination>
+      <tables :labels="labels" :list="tableData" :loading="loading"></tables>
     </div>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page="form1.current"
+      :limit="form1.size"
+      @pagination="getPagination"
+    ></pagination>
   </block-header>
 </template>
 <script>
-import blockHeader from "@/views/firmContent/components/blockHeader/index.vue"
+import tables from "@/views/firmContent/components/table/index.vue";
+import blockHeader from "@/views/firmContent/components/blockHeader/index.vue";
 export default {
   data() {
     return {
-      tableData:[
+      tableData: [],
+      total: 1,
+      labels: [
+        {
+          header: "检验大类",
+          value: "jydl",
+          width: "",
+        },
+        {
+          header: "检验项目",
+          value: "jyxm",
+          width: "",
+        },
+        {
+          header: "标准规定",
+          value: "bzgd",
+          width: "",
+        },
         {
-          id:1,
-          dalei:'其他',
-          project:'含量测定',
-          guiding:'按无水物计算，每 1mg的效应不得少 于610红霉素单位',
-          jieguo:'655单位',
-          jielun:'符合规定',
-          yiju:'《中国药典》 2015年版二部',
-          xuhao:'14',
-          leibie:'1',
-          bianhao:'1221030412300001',
-          name:'注射用乳糖酸 红霉素',
-          editdate:'2021-04-23',
-          update:'2021-04-23'
-        },{
-          id:2,
-          dalei:'检查',
-          project:'细菌内毒素',
-          guiding:'应小于1.0EU/mg',
-          jieguo:'小于1.0EU/mg',
-          jielun:'符合规定',
-          yiju:'《中国药典》 2015年版二部',
-          xuhao:'18',
-          leibie:'1',
-          bianhao:'1221030412300001',
-          name:'注射用乳糖酸 红霉素',
-          editdate:'2021-04-23',
-          update:'2021-04-23'
-        },{
-          id:3,
-          dalei:'检查',
-          project:'细菌内毒素',
-          guiding:'应小于1.0EU/mg',
-          jieguo:'小于1.0EU/mg',
-          jielun:'符合规定',
-          yiju:'《中国药典》 2015年版二部',
-          xuhao:'16',
-          leibie:'1',
-          bianhao:'1221030412300001',
-          name:'注射用乳糖酸 红霉素',
-          editdate:'2021-04-23',
-          update:'2021-04-23'
-        },{
-          id:4,
-          dalei:'检查',
-          project:'细菌内毒素',
-          guiding:'应小于1.0EU/mg',
-          jieguo:'小于1.0EU/mg',
-          jielun:'符合规定',
-          yiju:'《中国药典》 2015年版二部',
-          xuhao:'25',
-          leibie:'1',
-          bianhao:'1221030412300001',
-          name:'注射用乳糖酸 红霉素',
-          editdate:'2021-04-23',
-          update:'2021-04-23'
-        },{
-          id:5,
-          dalei:'检查',
-          project:'细菌内毒素',
-          guiding:'应小于1.0EU/mg',
-          jieguo:'小于1.0EU/mg',
-          jielun:'符合规定',
-          yiju:'《中国药典》 2015年版二部',
-          xuhao:'55',
-          leibie:'1',
-          bianhao:'1221030412300001',
-          name:'注射用乳糖酸 红霉素',
-          editdate:'2021-04-23',
-          update:'2021-04-23'
-        },{
-          id:6,
-          dalei:'检查',
-          project:'细菌内毒素',
-          guiding:'应小于1.0EU/mg',
-          jieguo:'小于1.0EU/mg',
-          jielun:'符合规定',
-          yiju:'《中国药典》 2015年版二部',
-          xuhao:'23',
-          leibie:'1',
-          bianhao:'1221030412300001',
-          name:'注射用乳糖酸 红霉素',
-          editdate:'2021-04-23',
-          update:'2021-04-23'
-        },{
-          id:7,
-          dalei:'检查',
-          project:'细菌内毒素',
-          guiding:'应小于1.0EU/mg',
-          jieguo:'小于1.0EU/mg',
-          jielun:'符合规定',
-          yiju:'《中国药典》 2015年版二部',
-          xuhao:'11',
-          leibie:'1',
-          bianhao:'1221030412300001',
-          name:'注射用乳糖酸 红霉素',
-          editdate:'2021-04-23',
-          update:'2021-04-23'
-        },{
-          id:8,
-          dalei:'检查',
-          project:'细菌内毒素',
-          guiding:'应小于1.0EU/mg',
-          jieguo:'小于1.0EU/mg',
-          jielun:'符合规定',
-          yiju:'《中国药典》 2015年版二部',
-          xuhao:'18',
-          leibie:'1',
-          bianhao:'1221030412300001',
-          name:'注射用乳糖酸 红霉素',
-          editdate:'2021-04-23',
-          update:'2021-04-23'
-        },{
-          id:9,
-          dalei:'检查',
-          project:'细菌内毒素',
-          guiding:'应小于1.0EU/mg',
-          jieguo:'小于1.0EU/mg',
-          jielun:'符合规定',
-          yiju:'《中国药典》 2015年版二部',
-          xuhao:'12',
-          leibie:'1',
-          bianhao:'1221030412300001',
-          name:'注射用乳糖酸 红霉素',
-          editdate:'2021-04-23',
-          update:'2021-04-23'
-        },{
-          id:10,
-          dalei:'检查',
-          project:'细菌内毒素',
-          guiding:'应小于1.0EU/mg',
-          jieguo:'小于1.0EU/mg',
-          jielun:'符合规定',
-          yiju:'《中国药典》 2015年版二部',
-          xuhao:'15',
-          leibie:'1',
-          bianhao:'1221030412300001',
-          name:'注射用乳糖酸 红霉素',
-          editdate:'2021-04-23',
-          update:'2021-04-23'
+          header: "检验结果",
+          value: "jyjg",
+          width: "",
+        },
+        {
+          header: "检验结论",
+          value: "jyjl",
+          width: "",
+        },
+        {
+          header: "检验依据",
+          value: "jyyj",
+          width: "",
+        },
+        {
+          header: "检验序号",
+          value: "jyxh",
+          width: "",
+        },
+        {
+          header: "报告类别",
+          value: "bglb",
+          width: "",
+        },
+        {
+          header: "抽样编号",
+          value: "cybh",
+          width: "",
+        },
+        {
+          header: "药品通用名字",
+          value: "yptym",
+          width: "",
+        },
+        {
+          header: "编辑时间",
+          value: "bjsj",
+          width: "",
+        },
+        {
+          header: "更新时间",
+          value: "gxsj",
+          width: "",
         },
       ],
-      loading:false,
-      current:1,
-      size:10
-    }
+      loading: false,
+      form1: {
+        current: 1,
+        size: 10,
+      },
+    };
   },
-  components:{blockHeader},
-  methods:{
-    currentChange(index){
-      
+  components: { blockHeader, tables },
+  created() {
+    this.arrData();
+  },
+  methods: {
+    async arrData() {
+      this.loading = true;
+      let msg1 = await this.$api.yaoPin.jyList(this.form1);
+      this.tableData = msg1.data.records;
+      this.total = msg1.data.total;
+      this.form1.current = msg1.data.current;
+      this.form1.size = msg1.data.size;
+      this.loading = false;
     },
-    sizeChange(index){
-      
+    getPagination(e) {
+      console.log(e);
+      this.form1.current = e.page;
+      this.form1.size = e.limit;
+      this.arrData();
     },
   },
-}
+};
 </script>
 <style lang="scss" scoped>
 @import "@/assets/styles/utils.scss";
 .tables {
+  min-height: 400px;
   .button {
     display: flex;
     justify-content: center;
@@ -313,7 +144,7 @@ export default {
     font-size: vw(14);
     font-weight: 400;
     font-family: Source Han Sans CN;
-    color: #292F38;
+    color: #292f38;
   }
   ::v-deep .el-table th {
     height: vh(40);
diff --git a/src/views/firmContent/drugInfo/drugBasicInfo/drugBasicInfo.vue b/src/views/firmContent/drugInfo/drugBasicInfo/drugBasicInfo.vue
index 8121a3b..7de6f1a 100644
--- a/src/views/firmContent/drugInfo/drugBasicInfo/drugBasicInfo.vue
+++ b/src/views/firmContent/drugInfo/drugBasicInfo/drugBasicInfo.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="drugBasicInfo">
-    <block-header title="基本信息" style="min-height: 300px;">
+    <block-header title="基本信息" style="min-height: 300px">
       <div v-loading="loading">
         <my-descriptions :descriptions="list"></my-descriptions>
       </div>
@@ -20,188 +20,225 @@ export default {
         {
           id: 1,
           label: "药品通用名称",
-          value: "布洛芬胶囊",
+          value: "",
+          data:'yptymc',
         },
         {
           id: 2,
           label: "药品英文名称",
-          value: "xxxxxxxxxxxxxxxxx",
+          value: "",
+          data:'yptymcyw',
         },
         {
           id: 3,
           label: "商品名",
-          value: "-",
+          value: "",
+          data:'ypspmc'
         },
         {
           id: 4,
           label: "药品分类",
-          value: "化学药品",
+          value: "",
+          data:'ypfl',
         },
         {
           id: 5,
           label: "剂型",
-          value: "胶囊剂",
+          value: "",
+          data:'jx'
         },
         {
           id: 6,
           label: "规格",
-          value: "0.2克",
+          value: "",
+          data:'ypgg'
         },
         {
           id: 7,
           label: "包装规格",
-          value: "-",
+          value: "",
+          data:'bzgg'
         },
         {
           id: 8,
           label: "批准日期",
-          value: "2023-04-11",
+          value: "",
+          data:'pzrq'
         },
         {
           id: 9,
           label: "药品批准文号",
-          value: "国药准字号H20059811",
+          value: "",
+          data:'yppzwh'
         },
         {
           id: 10,
           label: "批准文号有限期",
-          value: "2028-04-10",
+          value: "",
+          data:'yppzwhyxq'
         },
         {
           id: 11,
           label: "原批准文号",
-          value: "国药准字号H20059811",
+          value: "",
+          data:'ypypzwh'
         },
         {
           id: 12,
           label: "原注册证号",
-          value: "-",
+          value: "",
+          data:'ypyzczh'
         },
         {
           id: 13,
           label: "上市许可持有人",
-          value: "xxxxx有限公司",
+          value: "",
+          data:'ssxkcyr'
         },
         {
           id: 14,
           label: "上市许可持有人英文",
-          value: "-",
+          value: "",
+          data:'ssxkcyryw'
         },
         {
           id: 15,
           label: "上市许可持有人地址",
-          value: "-",
+          value: "",
+          data:'ssxkcyrdz'
         },
         {
           id: 16,
           label: "上市许可持有人地址英文",
           value: "-",
+          data:'ssxkcyrdzyw'
         },
         {
           id: 17,
           label: "生产单位",
           value: "-",
+          data:'ypscqymc'
         },
         {
           id: 18,
           label: "生产地址",
-          value: "xxxxx有限公司",
+          value: "",
+          data:'scdz'
         },
         {
           id: 19,
           label: "药品编码",
           value: "-",
+          data:'ypbm'
         },
         {
           id: 20,
           label: "药品编码备注",
-          value: "86901005000050",
+          value: "",
+          data:'ypbmbz'
         },
         {
           id: 21,
           label: "生产厂商（中文）",
           value: "-",
+          data:'qymczw'
         },
         {
           id: 22,
           label: "生产厂商名称（英文）",
           value: "-",
+          data:'qymcyw'
         },
         {
           id: 23,
           label: "厂商地址（中文）",
           value: "-",
+          data:''
         },
         {
           id: 24,
           label: "厂商地址（英文）",
           value: "-",
+          data:'scdzyw'
         },
         {
           id: 25,
           label: "生产厂商所在国/地区（中文）",
           value: "-",
+          data:'dzgjhdqScc'
         },
         {
           id: 26,
           label: "生产厂商所在国/地区（英文）",
           value: "-",
+          data:'sccszgdqyw'
         },
         {
           id: 27,
           label: "公司名称（中文）",
           value: "-",
+          data:'qymcGs',
         },
         {
           id: 28,
           label: "公司名称（英文）",
           value: "-",
+          data:'gsmcyw'
         },
         {
           id: 29,
           label: "公司地址（中文）",
           value: "-",
+          data:'gsdzzw'
         },
         {
           id: 30,
           label: "公司地址（英文）",
           value: "-",
+          data:'gsdzyw'
         },
         {
           id: 31,
           label: "公司所在国/地区（中文）",
           value: "-",
+          data:'gsszgdqzw'
         },
         {
           id: 32,
           label: "公司所在国/地区（英文）",
           value: "-",
+          data:'gsszgdqyw'
         },
         {
           id: 33,
           label: "分包装批准文号",
           value: "-",
+          data:'fbzpzwh'
         },
         {
           id: 34,
           label: "分包装文号批准日期",
           value: "-",
+          data:'fbzwhpzrq'
         },
         {
           id: 35,
           label: "分包装批准文号有效期",
           value: "-",
+          data:'fbzpzwhyxq'
         },
         {
           id: 36,
           label: "分包装企业名称",
           value: "-",
+          data:'qymcFbz'
         },
         {
           id: 37,
           label: "分包装企业地址",
           value: "-",
           span: 2,
+          data:'scdzFbz'
         },
       ],
       // 国产化妆品
@@ -369,85 +406,85 @@ export default {
           id: 1,
           label: "产品名称（中文）",
           value: "",
-          data:'cpmc',
+          data: "cpmc",
         },
         {
           id: 2,
           label: "产品名称（英文）",
           value: "",
-          data:'',
+          data: "",
         },
         {
           id: 3,
           label: "产品类型",
           value: "",
-          data:'',
+          data: "",
         },
         {
           id: 4,
           label: "注册人住所地址",
           value: "",
-          data:'',
+          data: "",
         },
         {
           id: 5,
           label: "注册人所在国（地区）",
           value: "",
-          data:'sf',
+          data: "sf",
         },
         {
           id: 6,
           label: "境内责任人名称",
           value: "",
-          data:'jnzrr',
+          data: "jnzrr",
         },
         {
           id: 7,
           label: "境内责任人住所地址",
           value: "",
-          data:'',
+          data: "",
         },
         {
           id: 8,
           label: "生产信息",
           value: "",
-          data:'',
+          data: "",
         },
         {
           id: 9,
           label: "注册证号",
           value: "",
-          data:'zczh',
+          data: "zczh",
         },
         {
           id: 10,
           label: "批准日期",
           value: "",
-          data:'pzrq',
+          data: "pzrq",
         },
         {
           id: 11,
           label: "注册证有效期至",
           value: "",
-          data:'',
+          data: "",
         },
         {
           id: 12,
           label: "备注",
           value: "",
-          data:'',
+          data: "",
         },
         {
           id: 13,
           label: "产品的执行标准",
           value: "-",
-          data:'',
+          data: "",
         },
         {
           id: 14,
           label: "状态",
           value: "",
-          data:'',
+          data: "",
         },
       ],
     };
@@ -467,7 +504,9 @@ export default {
       var decodedValue = decodeURIComponent(value);
       obj[key] = decodedValue;
     });
+    this.$store.commit('app/URLChange',obj)
     console.log(obj);
+    //化妆品是1
     if (obj.type == 1) {
       if (obj.flag == 1) {
         this.chinaData(obj.data);
@@ -478,10 +517,22 @@ export default {
       } else if (obj.flag == 4) {
         this.specialImport(obj.data);
       }
+    }else if(obj.type == 2){
+      //药品是2
+      this.yaopin(obj.data)
+    }else if(obj.type == 3){
+      //医疗器械是3
     }
   },
   mounted() {},
   methods: {
+    //药品信息
+    async yaopin(e){
+      this.loading = true;
+      let msg1 = await this.$api.cosmetics.getYaoPin(e);
+      this.list = this.filter(msg1.data, this.descriptions);
+      this.loading = false;
+    },
     //国产化妆品单条数据
     async chinaData(e) {
       this.loading = true;
@@ -512,14 +563,16 @@ export default {
     },
     //处理数据
     filter(A, B) {
-      for (let key in A) {
-        B.forEach((values, index) => {
+      let arr1 = A
+      let arr2 = B
+      for (let key in arr1) {
+        arr2.forEach((values, index) => {
           if (values.data === key) {
-            B[index].value = A[key];
+            arr2[index].value = arr1[key];
           }
         });
       }
-      return B;
+      return arr2;
     },
   },
 };