From 5ed1c9a9bf412c8b70851e9899b5e00f9eea68c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com>
Date: Tue, 8 Aug 2023 09:00:51 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=86=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |  4 +--
 src/App.vue                                   | 10 +++++-
 src/api/external/index.js                     |  1 +
 .../productsMsg/components/productInfo.vue    | 35 +++++++++++--------
 vue.config.js                                 |  2 +-
 5 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/.env.production b/.env.production
index c6adc7d..6e1379e 100644
--- a/.env.production
+++ b/.env.production
@@ -5,11 +5,11 @@ VUE_APP_TITLE = 产品档案管理系统
 ENV = 'production'
 
 # 检查员管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/ggfw-api'
 
 #外网(部署104、105服务器)
 # VUE_APP_BASE_API2 = '/api/inspector/inspector' 
-VUE_APP_BASE_API2 = :9026/inspector
+VUE_APP_BASE_API2 = '/ggfw-api'
 #调用外部接口
 VUE_APP_BASE_API3 = '/api/admin'
 #本地文件下载路径
diff --git a/src/App.vue b/src/App.vue
index e644922..62d4fc2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -24,7 +24,15 @@ export default {
     };
   },
   mounted(){
-  
+  /* 
+              sudo mv html.zip /usr/share/nginx/html/ggfw-dangan 在 MSSM-Dev 文件夹下 移动压缩包到 ggfw文件夹下
+				
+				      cd /usr/share/nginx/html/ggfw-dangan 移动到文件夹下
+				
+				      unzip html.zip -d .  解压
+				
+				      rm ./html.zip 删除当前目录下的压缩包 弹出确定删除 打 y 并回车
+  */
     
   }
 };
diff --git a/src/api/external/index.js b/src/api/external/index.js
index 6e7df23..527f619 100644
--- a/src/api/external/index.js
+++ b/src/api/external/index.js
@@ -3,6 +3,7 @@ import request from "@/utils/request";
 //获取用户信息
 export function getselfInfo() {
   return request({
+    baseURL: location.origin,
     url: "/api/admin/user/getSelfInfo",
     method: "GET",
   });
diff --git a/src/views/productsMsg/components/productInfo.vue b/src/views/productsMsg/components/productInfo.vue
index 8c767e4..1aa5fce 100644
--- a/src/views/productsMsg/components/productInfo.vue
+++ b/src/views/productsMsg/components/productInfo.vue
@@ -2,33 +2,40 @@
   <div class="ifram-view" :style="iframViewStyle">
     <!-- <span>!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!</span> -->
     <!-- <iframe src="https://dev-mssm-liaoning.imian.org.cn/ggfw/#/firmContent/drugInfo" frameborder="0" style="width: 100%;height: 100%;"></iframe> -->
-    <iframe :src="url" frameborder="0" style="width: 100%;height: 100%;"></iframe>
+    <iframe
+      :src="url"
+      frameborder="0"
+      style="width: 100%; height: 100%"
+    ></iframe>
   </div>
 </template>
 <script>
 export default {
   data() {
     return {
-      iframViewStyle:{
-        height:"",
+      iframViewStyle: {
+        height: "",
       },
-      
-      url:`https://dev-mssm-liaoning.imian.org.cn/ggfw-iframe/#/productinformation?type=${this.$route.query.type}&flag=${this.$route.query.flag}&data=${this.$route.query.data}&token=${localStorage.getItem('MSSM-LIAONING__TOKEN')}`
-    }
-  },
-  methods:{
+
+      url: `https://dev-mssm-liaoning.imian.org.cn/ggfw-iframe/#/productinformation?type=${
+        this.$route.query.type
+      }&flag=${this.$route.query.flag}&data=${
+        this.$route.query.data
+      }&token=${localStorage.getItem("MSSM-LIAONING__TOKEN")}`,
+    };
   },
+  methods: {},
   mounted() {
-    this.$nextTick(()=>{
-      let dom = document.getElementsByClassName('ifram-view');
+    this.$nextTick(() => {
+      let dom = document.getElementsByClassName("ifram-view");
       let height = dom[0].getBoundingClientRect();
       // let windowWidth = window.innerWidth;
       let windowHeight = window.innerHeight;
-      let relativeHeight = windowHeight - height.top
-      this.iframViewStyle.height = relativeHeight + 'px'
-    })
+      let relativeHeight = windowHeight - height.top;
+      this.iframViewStyle.height = relativeHeight + "px";
+    });
   },
-}
+};
 </script>
 <style lang="scss" scoped>
 .ifram-view {
diff --git a/vue.config.js b/vue.config.js
index eb7b903..aa17b39 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -26,7 +26,7 @@ module.exports = {
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
   // publicPath: process.env.NODE_ENV === "production" ? "/demo/inspector/" : "/",
-  publicPath: process.env.NODE_ENV === "production" ? "/inspector/" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "/ggfw-dangan/" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）

From b0964d407c350b96d58aae24b542a29231993260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com>
Date: Wed, 9 Aug 2023 10:17:29 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86iframe=E7=9A=84u?=
 =?UTF-8?q?rl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productsMsg/components/productInfo.vue    | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/views/productsMsg/components/productInfo.vue b/src/views/productsMsg/components/productInfo.vue
index b5c0839..96d3510 100644
--- a/src/views/productsMsg/components/productInfo.vue
+++ b/src/views/productsMsg/components/productInfo.vue
@@ -3,10 +3,10 @@
     <!-- <span>!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!</span> -->
     <!-- <iframe src="https://dev-mssm-liaoning.imian.org.cn/ggfw/#/firmContent/drugInfo" frameborder="0" style="width: 100%;height: 100%;"></iframe> -->
     <iframe
-      :src="url"
+      :src="Url"
       frameborder="0"
       style="width: 100%; height: 100%"
-      id="iframes"
+      ref="iframes"
     ></iframe>
   </div>
 </template>
@@ -17,28 +17,28 @@ export default {
       iframViewStyle: {
         height: "",
       },
-      // url: `https://dev-mssm-liaoning.imian.org.cn/ggfw-iframe/#/productinformation?type=${
-      //   this.$route.query.type
-      // }&flag=${this.$route.query.flag}&data=${
-      //   this.$route.query.data
-      // }&token=${localStorage.getItem("MSSM-LIAONING__TOKEN")}`,
-      url: `https://dev-mssm-liaoning.imian.org.cn/ggfw-iframe/#/productinformation`
+      Url: `${location.origin}/ggfw-iframe/#/productinformation?type=${
+        this.$route.query.type
+      }&flag=${this.$route.query.flag}&data=${
+        this.$route.query.data
+      }&token=${localStorage.getItem("MSSM-LIAONING__TOKEN")}`,
+
     };
   },
-  methods: {},
+  methods: {}, 
   created() {
-    this.$nextTick(() => {
-      let oFrame = this.$refs.iframes;
-      oFrame.contentWindow.postMessage(
-        {
-          type: this.$route.query.type,
-          flag: this.$route.query.flag,
-          data: this.$route.query.data,
-          token: localStorage.getItem("MSSM-LIAONING__TOKEN"),
-        },
-        "*"
-      );
-    });
+    // this.$nextTick(() => {
+    //   let oFrame = this.$refs.iframes;
+    //   oFrame.contentWindow.postMessage(
+    //     {
+    //       type: this.$route.query.type,
+    //       flag: this.$route.query.flag,
+    //       data: this.$route.query.data,
+    //       token: localStorage.getItem("MSSM-LIAONING__TOKEN"),
+    //     },
+    //     "*"
+    //   );
+    // });
   },
   methods: {},
   mounted() {

From 6feabe587b8f79bebdd8b7c5fee654e1b963acf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com>
Date: Wed, 9 Aug 2023 14:41:47 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E6=8F=90=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/external/index.js                     |   2 +-
 .../components/cosmeticsArchives.vue          | 114 +++++++++++-------
 src/views/productsMsg/components/health.vue   | 102 ++++++++++++----
 src/views/productsMsg/index.vue               | 100 +++++++++++----
 4 files changed, 227 insertions(+), 91 deletions(-)

diff --git a/src/api/external/index.js b/src/api/external/index.js
index 527f619..ba82bc3 100644
--- a/src/api/external/index.js
+++ b/src/api/external/index.js
@@ -3,7 +3,7 @@ import request from "@/utils/request";
 //获取用户信息
 export function getselfInfo() {
   return request({
-    baseURL: location.origin,
+    // baseURL: location.origin,
     url: "/api/admin/user/getSelfInfo",
     method: "GET",
   });
diff --git a/src/views/productsMsg/components/cosmeticsArchives.vue b/src/views/productsMsg/components/cosmeticsArchives.vue
index f502369..0fcba39 100644
--- a/src/views/productsMsg/components/cosmeticsArchives.vue
+++ b/src/views/productsMsg/components/cosmeticsArchives.vue
@@ -9,28 +9,28 @@
           <el-row>
             <el-col :span="7">
               <el-form-item label="产品名称">
-                <el-input v-model="form1.cpmc"></el-input>
+                <el-input v-model="form1.cpmc" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="7">
               <el-form-item label="备案编号">
-                <el-input v-model="form1.babm"></el-input>
+                <el-input v-model="form1.babm" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="7">
               <el-form-item label="生产企业">
-                <el-input v-model="form1.scqy"></el-input>
+                <el-input v-model="form1.scqy" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="7">
               <el-form-item label="注册证编号">
-                <el-input v-model="form1.name"></el-input>
+                <el-input v-model="form1.name" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="7">
-              <el-form-item label="化妆品类型">
+              <el-form-item label="化妆品类型" placeholder="请输入">
                 <el-select
                   v-model="types"
                   placeholder="请选择化妆品类型"
@@ -72,7 +72,7 @@
               height="300"
               :stripe="false"
             >
-              <el-table-column type="selection" width="55" align="center" />
+              <el-table-column type="selection" width="35" align="center" />
               <el-table-column
                 type="index"
                 label="序号"
@@ -84,12 +84,12 @@
                   {{ scope.row.mc || scope.row.cpmc }}
                 </template>
               </el-table-column>
-              <el-table-column :label="A2" align="center">
+              <el-table-column :label="A2" align="center" width="230">
                 <template slot-scope="scope">
                   {{ scope.row.bah || scope.row.pzrq }}
                 </template>
               </el-table-column>
-              <el-table-column :label="A3" align="center">
+              <el-table-column :label="A3" align="center" width="230">
                 <template slot-scope="scope">
                   {{ scope.row.qy || scope.row.sf }}
                 </template>
@@ -117,9 +117,10 @@
         <pagination
           v-show="total > 0"
           :total="total"
-          :page="form1.current"
-          :limit="form1.size"
+          :page="form.current"
+          :limit="form.size"
           @pagination="getPagination"
+          :current-page.sync="form.current"
         ></pagination>
       </div>
     </div>
@@ -137,23 +138,23 @@ export default {
       A1: "产品名称",
       A2: "备案编码",
       A3: "生产企业",
-      types: '1',
+      types: "1",
       total: 0,
       options: [
         {
-          value: '1',
+          value: "1",
           label: "国产化妆品",
         },
         {
-          value: '2',
+          value: "2",
           label: "国产特殊化妆品",
         },
         {
-          value: '3',
+          value: "3",
           label: "进口化妆品",
         },
         {
-          value: '4',
+          value: "4",
           label: "进口特殊化妆品",
         },
       ],
@@ -162,47 +163,67 @@ export default {
         cpmc: "",
         name: "",
         scqy: "",
+      },
+      form: {
         size: 10,
         current: 1,
       },
+      jieliuShow: true,
     };
   },
   mounted() {},
   created() {
-    this.changeType('1');
+    this.changeType("1");
   },
   methods: {
+    jieliuFunc() {
+      if (this.jieliuShow) {
+        this.getData(this.types);
+        this.jieliuShow = false;
+        setTimeout(() => {
+          this.jieliuShow = true;
+        }, 3000);
+      } else {
+        this.$message("点击过快");
+      }
+    },
     //去内嵌页面
     toDetail(e) {
       let data = "";
-      if (this.types == '1') {
+      if (this.types == "1") {
         data = e.bah;
-      } else if (this.types == '2') {
+      } else if (this.types == "2") {
         data = e.zczh;
-      } else if (this.types == '3') {
+      } else if (this.types == "3") {
         data = e.bah;
-      } else if (this.types == '4') {
+      } else if (this.types == "4") {
         data = e.zczh;
       }
       //利用type区分三种档案
       //利用flag区分四种化妆品详情 然后分别调用不同的详情接口
       this.$router.push({
         path: `/cosmeticsDetail`,
-        query: { type: '1', flag: this.types, data },
+        query: { type: "1", flag: this.types, data },
       });
     },
     //搜索
     searchList() {
-      this.getData(this.types);
+      this.form.current = 1;
+
+      for (let i in this.form1) {
+        this.form[i] = this.form1[i];
+      }
+      this.jieliuFunc();
     },
     getPagination(e) {
       console.log(e);
-      this.form1.current = e.page;
-      this.form1.size = e.limit;
+      this.form.current = e.page;
+      this.form.size = e.limit;
       this.chinaCosmetics();
     },
     //重置
     reset() {
+      this.types = "1";
       this.form1 = {
         babm: "",
         cpmc: "",
@@ -211,75 +232,79 @@ export default {
         size: 10,
         current: 1,
       };
+      this.form = {
+        size: 10,
+        current: 1,
+      };
+      this.jieliuFunc();
     },
     //国产化妆品
     async chinaCosmetics() {
       this.loading = true;
-      let msg1 = await this.$api.cosmetics.domesticList(this.form1);
+      let msg1 = await this.$api.cosmetics.domesticList(this.form);
       this.tableData = msg1.data.records;
       this.total = msg1.data.total;
-      this.form1.size = msg1.data.size;
-      this.form1.current = msg1.data.current;
+      this.form.size = msg1.data.size;
+      this.form.current = msg1.data.current;
       this.loading = false;
     },
     //国产特殊化妆品
     async chinaSpecialCosmetics() {
       this.loading = true;
-      let msg1 = await this.$api.cosmetics.specialList(this.form1);
+      let msg1 = await this.$api.cosmetics.specialList(this.form);
       this.tableData = msg1.data.records;
       this.total = msg1.data.total;
-      this.form1.size = msg1.data.size;
-      this.form1.current = msg1.data.current;
+      this.form.size = msg1.data.size;
+      this.form.current = msg1.data.current;
       this.loading = false;
     },
     //进口化妆品
     async importCosmetics() {
       this.loading = true;
-      let msg1 = await this.$api.cosmetics.importList(this.form1);
+      let msg1 = await this.$api.cosmetics.importList(this.form);
       this.tableData = msg1.data.records;
       this.total = msg1.data.total;
-      this.form1.size = msg1.data.size;
-      this.form1.current = msg1.data.current;
+      this.form.size = msg1.data.size;
+      this.form.current = msg1.data.current;
       this.loading = false;
     },
     //进口特殊化妆品
     async importSpecialCosmetics() {
       this.loading = true;
-      let msg1 = await this.$api.cosmetics.importSpecialList(this.form1);
+      let msg1 = await this.$api.cosmetics.importSpecialList(this.form);
       this.tableData = msg1.data.records;
       this.total = msg1.data.total;
-      this.form1.size = msg1.data.size;
-      this.form1.current = msg1.data.current;
+      this.form.size = msg1.data.size;
+      this.form.current = msg1.data.current;
       this.loading = false;
     },
     async getData(e) {
-      if (e == '1') {
+      if (e == "1") {
         this.A2 = "备案编码";
         this.A3 = "生产企业";
         this.chinaCosmetics();
-      } else if (e == '2') {
+      } else if (e == "2") {
         this.A2 = "批准日期";
         this.A3 = "省份";
         this.chinaSpecialCosmetics();
-      } else if (e == '3') {
+      } else if (e == "3") {
         this.A2 = "备案编码";
         this.A3 = "生产企业";
         this.importCosmetics();
-      } else if (e == '4') {
+      } else if (e == "4") {
         this.A2 = "批准日期";
         this.A3 = "省份";
         this.importSpecialCosmetics();
       }
     },
     async changeType(e) {
-      this.reset();
+      // this.reset();
       this.getData(e);
     },
   },
 };
 </script>
 
-
 <style lang="scss" scoped>
 ::v-deep .el-select {
   width: 100% !important;
@@ -346,4 +371,7 @@ export default {
   justify-content: space-between;
   padding: 15px 20px;
 }
-</style>
\ No newline at end of file
+::v-deep.el-table--medium .el-table__cell {
+  padding: 2.53px 0;
+}
+</style>
diff --git a/src/views/productsMsg/components/health.vue b/src/views/productsMsg/components/health.vue
index 557dd81..7c50b41 100644
--- a/src/views/productsMsg/components/health.vue
+++ b/src/views/productsMsg/components/health.vue
@@ -9,7 +9,7 @@
           <el-row>
             <el-col :span="7">
               <el-form-item label="产品名称">
-                <el-input v-model="form1.cpmc"></el-input>
+                <el-input v-model="form1.cpmc" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="7">
@@ -27,14 +27,14 @@
             </el-col>
             <el-col :span="7">
               <el-form-item label="生产企业">
-                <el-input v-model="form1.scqy"></el-input>
+                <el-input v-model="form1.scqy" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="7">
               <el-form-item label="注册证编号或备案编号">
-                <el-input v-model="form1.zczh"></el-input>
+                <el-input v-model="form1.zczh" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -57,24 +57,53 @@
         </div>
         <section class="table-box">
           <div class="table-item">
-            <el-table v-loading="loading" :data="tableData" border height="300" align="center">
-              <el-table-column type="selection" width="55" align="center" />
-              <el-table-column type="index" label="序号" align="center" width="55" />
-              <el-table-column label="产品名称" prop="cpmc" align="center"> </el-table-column>
-              <el-table-column label="产品类型" prop="cplx" align="center"></el-table-column>
-              <el-table-column label="生产企业" prop="zcsqr" align="center"></el-table-column>
+            <el-table
+              v-loading="loading"
+              :data="tableData"
+              border
+              height="300"
+              align="center"
+            >
+              <el-table-column type="selection" width="35" align="center" />
+              <el-table-column
+                type="index"
+                label="序号"
+                align="center"
+                width="50"
+              />
+              <el-table-column label="产品名称" prop="cpmc" align="center">
+              </el-table-column>
+              <el-table-column
+                label="产品类型"
+                prop="cplx"
+                align="center"
+                width="100"
+              ></el-table-column>
+              <el-table-column
+                label="生产企业"
+                prop="zcsqr"
+                align="center"
+              ></el-table-column>
               <el-table-column
                 label="产品管理类别"
                 prop="cplb"
                 align="center"
+                width="100"
               ></el-table-column>
-              <el-table-column label="注册证编号/备案编号" prop="zczh" align="center">
+              <el-table-column
+                label="注册证编号/备案编号"
+                prop="zczh"
+                align="center"
+                width="200"
+
+              >
               </el-table-column>
               <el-table-column
                 label="操作"
                 class-name="small-padding fixed-width"
-                width="140"
+                width="120"
                 align="center"
+
               >
                 <template slot-scope="scope">
                   <el-button
@@ -93,9 +122,10 @@
         <pagination
           v-show="total > 0"
           :total="total"
-          :page="form1.current"
-          :limit="form1.size"
+          :page="form.current"
+          :limit="form.size"
           @pagination="getPagination"
+          :current-page.sync="form.current"
         ></pagination>
       </div>
     </div>
@@ -129,6 +159,11 @@ export default {
         size: 10,
         current: 1,
       },
+      form: {
+        size: 10,
+        current: 1,
+      },
+      jieliuShow: true,
     };
   },
   mounted() {},
@@ -136,20 +171,36 @@ export default {
     this.chinaCosmetics();
   },
   methods: {
+    jieliuFunc() {
+      if (this.jieliuShow) {
+        this.chinaCosmetics();
+        this.jieliuShow = false;
+        setTimeout(() => {
+          this.jieliuShow = true;
+        }, 3000);
+      } else {
+        this.$message("点击过快");
+      }
+    },
     //去内嵌页面
     toDetail(e) {
       this.$router.push({
         path: `/cosmeticsDetail`,
-        query: { type: '3',  data:e.zczh },
+        query: { type: "3", data: e.zczh },
       });
     },
     //搜索
     searchList() {
-      this.chinaCosmetics();
+      this.form.current = 1;
+
+      for (let i in this.form1) {
+        this.form[i] = this.form1[i];
+      }
+      this.jieliuFunc();
     },
     getPagination(e) {
-      this.form1.current = e.page;
-      this.form1.size = e.limit;
+      this.form.current = e.page;
+      this.form.size = e.limit;
       this.chinaCosmetics();
     },
     //重置
@@ -162,21 +213,25 @@ export default {
         size: 10,
         current: 1,
       };
+      this.form = {
+        size: 10,
+        current: 1,
+      };
+      this.jieliuFunc();
     },
     async chinaCosmetics() {
       this.loading = true;
-      let msg1 = await this.$api.apparatus.apparatusList(this.form1);
+      let msg1 = await this.$api.apparatus.apparatusList(this.form);
       this.tableData = msg1.data.records;
       this.total = msg1.data.total;
-      this.form1.size = msg1.data.size;
-      this.form1.current = msg1.data.current;
+      this.form.size = msg1.data.size;
+      this.form.current = msg1.data.current;
       this.loading = false;
     },
   },
 };
 </script>
 
-
 <style lang="scss" scoped>
 ::v-deep .el-select {
   width: 100% !important;
@@ -243,4 +298,7 @@ export default {
   justify-content: space-between;
   padding: 15px 20px;
 }
-</style>
\ No newline at end of file
+::v-deep.el-table--medium .el-table__cell {
+  padding: 2.53px 0;
+}
+</style>
diff --git a/src/views/productsMsg/index.vue b/src/views/productsMsg/index.vue
index 6d44651..3e31ffb 100644
--- a/src/views/productsMsg/index.vue
+++ b/src/views/productsMsg/index.vue
@@ -9,17 +9,17 @@
           <el-row>
             <el-col :span="7">
               <el-form-item label="产品名称">
-                <el-input v-model="form1.name"></el-input>
+                <el-input v-model="form1.name" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="7">
               <el-form-item label="药品分类">
-                <el-input v-model="form1.ypfl"></el-input>
+                <el-input v-model="form1.ypfl" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="7">
               <el-form-item label="批准文号">
-                <el-input v-model="form1.name"></el-input>
+                <el-input v-model="form1.pzwh" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -27,17 +27,17 @@
         <el-row>
           <el-col :span="7">
             <el-form-item label="生产企业">
-              <el-input v-model="form1.name"></el-input>
+              <el-input v-model="form1.scqy" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="剂型">
-              <el-select v-model="form1.types" placeholder="请选择剂型">
+              <el-select v-model="form1.jx" placeholder="请选择剂型">
                 <el-option
                   v-for="item in options"
                   :key="item.value"
                   :label="item.label"
-                  :value="item.value"
+                  :value="item.label"
                 >
                 </el-option>
               </el-select> </el-form-item
@@ -71,22 +71,22 @@
                 width="50"
                 align="center"
               />
-              <el-table-column label="产品名称" align="center">
+              <el-table-column label="产品名称" align="center" width="230">
                 <template slot-scope="scope">
                   {{ scope.row.yptymc }}
                 </template>
               </el-table-column>
-              <el-table-column label="批准文号" align="center">
+              <el-table-column label="批准文号" align="center" width="170">
                 <template slot-scope="scope">
                   {{ scope.row.yppzwh }}
                 </template>
               </el-table-column>
-              <el-table-column label="药品分类" align="center" width="70">
+              <el-table-column label="药品分类" align="center" width="90">
                 <template slot-scope="scope">
                   {{ scope.row.ypfl }}
                 </template>
               </el-table-column>
-              <el-table-column label="剂型" align="center" width="70">
+              <el-table-column label="剂型" align="center" width="90">
                 <template slot-scope="scope">
                   {{ scope.row.jx }}
                 </template>
@@ -118,10 +118,10 @@
         <pagination
           v-show="total > 0"
           :total="total"
-          :page="form1.current"
-          :limit="form1.size"
+          :page="form.current"
+          :limit="form.size"
           @pagination="getPagination"
-          :current-page.sync="form1.current"
+          :current-page.sync="form.current"
         ></pagination>
       </div>
     </div>
@@ -137,14 +137,40 @@ export default {
       loading: false,
       tableData: [],
       total: 0,
-      options: [],
+      options: [
+        {
+          value: 1,
+          label: "全部",
+        },
+        {
+          value: 2,
+          label: "中药",
+        },
+        {
+          value: 3,
+          label: "辅料",
+        },
+        {
+          value: 4,
+          label: "生物制品",
+        },
+        {
+          value: 5,
+          label: "化学药品",
+        },
+      ],
       form1: {
-        types: "",
+        jx: "",
         ypfl: "",
         name: "",
+        pzwh: "",
+        scqy: "",
+      },
+      form: {
         size: 10,
         current: 1,
       },
+      jieliuShow: true,
     };
   },
   mounted() {},
@@ -152,42 +178,63 @@ export default {
     this.chinaCosmetics(1);
   },
   methods: {
+    jieliuFunc() {
+      if (this.jieliuShow) {
+        this.chinaCosmetics();
+        this.jieliuShow = false;
+        setTimeout(() => {
+          this.jieliuShow = true;
+        }, 3000);
+      } else {
+        this.$message("点击过快");
+      }
+    },
     //去内嵌页面
     toDetail(e) {
       this.$router.push({
         path: `/cosmeticsDetail`,
-        query: { type: '2', data:e.yppzwh },
+        query: { type: "2", data: e.yppzwh },
       });
     },
     //搜索
     searchList() {
-      this.form1.current = 1
-      this.chinaCosmetics();
+      this.form.current = 1;
+      for (let i in this.form1) {
+        this.form[i] = this.form1[i];
+      }
+      console.log(this.form);
+      this.jieliuFunc();
     },
     getPagination(e) {
       console.log(e);
-      this.form1.current = e.page;
-      this.form1.size = e.limit;
-      this.chinaCosmetics();
+      this.form.current = e.page;
+      this.form.size = e.limit;
+      this.chinaCosmetics(1);
     },
     //重置
     reset() {
       this.form1 = {
-        name: "",
+        jx: "",
         ypfl: "",
+        name: "",
+        pzwh: "",
+        scqy: "",
+      };
+      this.form = {
         size: 10,
         current: 1,
       };
+      this.jieliuFunc();
     },
     //国产化妆品
     async chinaCosmetics() {
       this.loading = true;
-      let msg1 = await this.$api.cosmetics.vRdgYpwhGxwz(this.form1);
+      let msg1 = await this.$api.cosmetics.vRdgYpwhGxwz(this.form);
       console.log(msg1);
       this.tableData = msg1.data.records;
       this.total = msg1.data.total;
-      this.form1.size = msg1.data.size;
-      this.form1.current = msg1.data.current;
+      this.form.size = msg1.data.size;
+      this.form.current = msg1.data.current;
       this.loading = false;
     },
   },
@@ -260,4 +307,7 @@ export default {
   justify-content: space-between;
   padding: 15px 20px;
 }
+::v-deep.el-table--medium .el-table__cell{
+  padding: 5.2px 0;
+}
 </style>

From ec79e364f25bfda182adfc886d865759df546e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com>
Date: Wed, 9 Aug 2023 16:00:00 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productsMsg/components/cosmeticsArchives.vue     |  9 ++++++---
 src/views/productsMsg/components/health.vue          |  9 +++++----
 src/views/productsMsg/index.vue                      | 12 ++++++++----
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/views/productsMsg/components/cosmeticsArchives.vue b/src/views/productsMsg/components/cosmeticsArchives.vue
index 0fcba39..ca6ce12 100644
--- a/src/views/productsMsg/components/cosmeticsArchives.vue
+++ b/src/views/productsMsg/components/cosmeticsArchives.vue
@@ -69,7 +69,7 @@
               v-loading="loading"
               :data="tableData"
               border
-              height="300"
+              height="43vh"
               :stripe="false"
             >
               <el-table-column type="selection" width="35" align="center" />
@@ -89,7 +89,7 @@
                   {{ scope.row.bah || scope.row.pzrq }}
                 </template>
               </el-table-column>
-              <el-table-column :label="A3" align="center" width="230">
+              <el-table-column :label="A3" align="center" width="240">
                 <template slot-scope="scope">
                   {{ scope.row.qy || scope.row.sf }}
                 </template>
@@ -372,6 +372,9 @@ export default {
   padding: 15px 20px;
 }
 ::v-deep.el-table--medium .el-table__cell {
-  padding: 2.53px 0;
+  padding: 5.3px 0;
+}
+::v-deep .el-table {
+  overflow: auto;
 }
 </style>
diff --git a/src/views/productsMsg/components/health.vue b/src/views/productsMsg/components/health.vue
index 7c50b41..372159a 100644
--- a/src/views/productsMsg/components/health.vue
+++ b/src/views/productsMsg/components/health.vue
@@ -61,7 +61,7 @@
               v-loading="loading"
               :data="tableData"
               border
-              height="300"
+              height="43vh"
               align="center"
             >
               <el-table-column type="selection" width="35" align="center" />
@@ -95,7 +95,6 @@
                 prop="zczh"
                 align="center"
                 width="200"
-
               >
               </el-table-column>
               <el-table-column
@@ -103,7 +102,6 @@
                 class-name="small-padding fixed-width"
                 width="120"
                 align="center"
-
               >
                 <template slot-scope="scope">
                   <el-button
@@ -299,6 +297,9 @@ export default {
   padding: 15px 20px;
 }
 ::v-deep.el-table--medium .el-table__cell {
-  padding: 2.53px 0;
+  padding: 5.3px 0;
+}
+::v-deep .el-table {
+  overflow: auto;
 }
 </style>
diff --git a/src/views/productsMsg/index.vue b/src/views/productsMsg/index.vue
index 3e31ffb..ef98476 100644
--- a/src/views/productsMsg/index.vue
+++ b/src/views/productsMsg/index.vue
@@ -62,7 +62,7 @@
               v-loading="loading"
               :data="tableData"
               border
-              height="340"
+              height="49vh"
               :stripe="false"
             >
               <el-table-column
@@ -285,7 +285,7 @@ export default {
   text-align: center;
 }
 .tabsBottom {
-  height: 70%;
+  // height: 70%;
   padding-top: 10px;
   .foot-main {
     height: 100%;
@@ -298,6 +298,7 @@ export default {
   padding: 10px 20px;
 }
 .table-box {
+  overflow-y: auto;
   padding: 0 20px;
   .table-item {
   }
@@ -307,7 +308,10 @@ export default {
   justify-content: space-between;
   padding: 15px 20px;
 }
-::v-deep.el-table--medium .el-table__cell{
-  padding: 5.2px 0;
+::v-deep.el-table--medium .el-table__cell {
+  padding: 7px 0;
+}
+::v-deep .el-table {
+  overflow: auto;
 }
 </style>