From 63c8cf5d2f1a3853b02d1f436372b85b996af3e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com>
Date: Mon, 29 Apr 2024 13:24:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   | 17 +------
 src/utils/request.js                          |  4 +-
 .../drugInfo/PZchouyang/PZchouyang.vue        | 46 +++++++++++--------
 3 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 1cc59fb..4808c54 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -117,14 +117,7 @@ export default {
 <style lang="scss">
 @import "@/assets/styles/utils.scss";
 
-::-webkit-scrollbar {
-  width: 0 !important;
-}
 
-::-webkit-scrollbar {
-  width: 0 !important;
-  height: 0;
-}
 
 .el-table__empty-text {
   font-size: vb(16);
@@ -165,15 +158,9 @@ export default {
   color: #000 !important;
 }
 
-.el-table--scrollable-y .el-table__body-wrapper {
-  overflow-y: auto;
-}
-
-.el-table {
-  &::-webkit-scrollbar {
-    width: 4px !important;
+.el-table__body-wrapper::-webkit-scrollbar {
+    width: 25px !important;
     height: 4px !important;
     border-radius: 4px !important;
   }
-}
 </style>
diff --git a/src/utils/request.js b/src/utils/request.js
index 752bfbd..ca72300 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -18,10 +18,10 @@ axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   // !本地使用
-  baseURL: process.env.VUE_APP_BASE_API,
+  // baseURL: process.env.VUE_APP_BASE_API,
 
   // !外地使用
-  // baseURL: location.origin + process.env.VUE_APP_URL,
+  baseURL: location.origin + process.env.VUE_APP_URL,
   // 超时
   timeout: 60000,
 });
diff --git a/src/views/firmContent/drugInfo/PZchouyang/PZchouyang.vue b/src/views/firmContent/drugInfo/PZchouyang/PZchouyang.vue
index 084f85e..40b468c 100644
--- a/src/views/firmContent/drugInfo/PZchouyang/PZchouyang.vue
+++ b/src/views/firmContent/drugInfo/PZchouyang/PZchouyang.vue
@@ -31,7 +31,7 @@
     </div> -->
     <block-header title="查询结果">
       <div class="tables">
-        <el-table :data="tableData"  height="430" :cell-style="columnStyle" v-loading="loading" border >
+        <el-table :data="tableData" height="380" :cell-style="columnStyle" v-loading="loading" border>
           <el-table-column type="index" header-align="center" label="序号" width="80">
           </el-table-column>
           <el-table-column prop="sampleType" header-align="center" label="抽样级别">
@@ -66,8 +66,9 @@
         class="pagination"
         :class="transinformation.b == '1' ? 'paginationTwo' : ''"
       > -->
-      <!-- <pagination v-show="total > 0" :total="total" :page="form1.current" :limit="form1.size" @pagination="getPagination">
-      </pagination> -->
+      <pagination v-show="total > 0" :total="total" :page="form1.pageNum" :limit="form1.pageSize"
+        @pagination="getPagination">
+      </pagination>
       <!-- </div> -->
     </block-header>
     <!-- 国抽 -->
@@ -142,7 +143,7 @@ export default {
           label: "合格",
         },
       ],
-      tableData: [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
+      tableData: [],
       loading: false,
       action: 1,
       currentComponent: "basicInfo",
@@ -152,8 +153,8 @@ export default {
       total: 0,
       //药品的参数
       form1: {
-        // size: 10,
-        // current: 1,
+        pageSize: 20,
+        pageNum: 1,
         //抽样编号
         // cybh: "",
         // //批准文号
@@ -489,7 +490,7 @@ export default {
     }),
   },
   created() {
-     this.getDAList();
+    this.getDAList();
   },
   methods: {
     inquire() {
@@ -511,22 +512,26 @@ export default {
     },
     reset() {
       this.form1 = {
-        size: 10,
-        current: 1,
+        pageSize: 20,
+        pageNum: 1,
         //抽样编号
-        cybh: "",
-        //批准文号
-        yppzwh: '',
-        zzjyjl: ""
+        // cybh: "",
+        // //批准文号
+        // yppzwh: '',
+        // zzjyjl:"",
+        // 调用冒陈的
+        approvalNumber: "",//批准文号
+        type: "" // 类型
       }
       this.name = "";
       this.value = "";
       this.listyp();
     },
     getPagination(e) {
-      this.form1.current = e.page;
-      this.form1.size = e.limit;
-      this.listyp();
+      console.log(e);
+      this.form1.pageNum = e.page;
+      this.form1.pageSize = e.limit;
+      this.getDAList();
     },
     filterLevel(e) {
       if (e == "1") {
@@ -548,10 +553,10 @@ export default {
       if (this.urlA.type == 1) this.form1.type = 2
       this.loading = true;
       let msg1 = await this.$api.frimCenter.productFileInspect(this.form1);
-      this.tableData = msg1.result;
-      // this.total = msg1.result.total;
-      // this.form1.size = msg1.result.size;
-      // this.form1.current = msg1.result.current;
+      this.tableData = msg1.result.list;
+      this.total = msg1.result.total - 0;
+      this.form1.pageNum = msg1.result.pageNum;
+      this.form1.pageSize = msg1.result.pageSize;
       this.loading = false;
     },
     //判断是哪一个档案传递过来的数据
@@ -915,4 +920,5 @@ export default {
 }
 
 
+
 </style>