From a5dc03c8e2269e687b8ce5834db9ecf530a50794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com> Date: Fri, 9 Aug 2024 14:00:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=B1=E6=95=8F=E6=8F=90?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- package.json | 2 +- src/api/Myapi/Shenqing/index.js | 91 ++++ src/api/Myapi/frimCenter/index.js | 7 + src/api/index.js | 4 +- src/api/yaoPin/index.js | 7 + .../components/dialogTowZhaohui/dialogTow.vue | 493 +++++++++++------- .../adverseReaction/adverseReaction.vue | 6 +- .../drugInfo/drugBasicInfo/drugBasicInfo.vue | 36 ++ src/views/firmContent/drugInfo/index.vue | 31 +- .../yaopinbiangeng/adverseReaction.vue | 303 +++++++++++ .../drugInfo/zhaohui/PZchouyang.vue | 207 +++----- 12 files changed, 865 insertions(+), 324 deletions(-) create mode 100644 src/api/Myapi/Shenqing/index.js create mode 100644 src/views/firmContent/drugInfo/yaopinbiangeng/adverseReaction.vue diff --git a/.env.development b/.env.development index 6f4fcc3..1858011 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ ENV = 'development' # 若依管理系统/开发环境 # VUE_APP_BASE_API = https://dev-mssm-liaoning.lesdev.cn/ggfw-api/ -# VUE_APP_BASE_API = http://192.168.0.107:9023/ggfw-api +# VUE_APP_BASE_API = http://192.168.0.119:9023/ggfw-api/ VUE_APP_BASE_API = https://dev-mssm-liaoning.lesdev.cn/ggfw-api # VUE_APP_BASE_API = http://172.24.21.7/api/ggfw/ggfw-api diff --git a/package.json b/package.json index 286061c..70d1b5c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "3.8.5", + "version": "3.8.6", "description": "辽宁药品", "author": "若依", "license": "MIT", diff --git a/src/api/Myapi/Shenqing/index.js b/src/api/Myapi/Shenqing/index.js new file mode 100644 index 0000000..d956f83 --- /dev/null +++ b/src/api/Myapi/Shenqing/index.js @@ -0,0 +1,91 @@ +import request from "@/utils/request"; + +export default { + // 新增药品召回信息 + recallInfo(data) { + return request({ + url: "/pharmaceuticals/recallInfo", + method: "post", + data, + }); + }, + //分页查询召回信息 + paginationZHmsg(e){ + return request({ + url: "/pharmaceuticals/recallInfo", + method:'get', + params:e, + }); + }, + //根据id查询召回基本信息 + searchMsg(id){ + return request({ + url: `/pharmaceuticals/recallInfo/findById/${id}`, + method: "get", + }); + }, + //召回完成 + finishMsg(data){ + return request({ + url: "/pharmaceuticals/recallInfo/finish", + method: "post", + data, + }); + }, + //召回评价 + appraise(data){ + return request({ + url: "/pharmaceuticals/recallInfo/appraise", + method: "post", + data, + }) + }, + //召回变更 + alter(data){ + return request({ + url: "/pharmaceuticals/recallInfo/changes", + method: "post", + data, + }) + }, + //药品召回上传 + recallFileUpload(data){ + return request({ + url: "/pharmaceuticals/recallDocuments/yaoPin", + method: "post", + data, + }) + }, + //根据分页条件查询召回事件附件 + searchAnnex(e){ + return request({ + url: `/pharmaceuticals/recallDocuments/page`, + method: "get", + params:e + }) + }, + + //根据召回信息id分页查询召回产品 + productsLogs(e){ + return request({ + url: `/pharmaceuticals/recallPlan/page`, + method: "get", + params:e + }) + }, + //根据召回信息id分页查询召回变更记录 + manyUpdateMsg(e){ + return request({ + url: `/pharmaceuticals/recallHistory/page`, + method: "get", + params:e + }) + }, + //通过主键查询单条召回事件变更记录 + paginationUpdate(e){ + return request({ + url: `/pharmaceuticals/recallHistory/${e}`, + method: "get", + }) + } +}; diff --git a/src/api/Myapi/frimCenter/index.js b/src/api/Myapi/frimCenter/index.js index 1df0331..3a0f98a 100644 --- a/src/api/Myapi/frimCenter/index.js +++ b/src/api/Myapi/frimCenter/index.js @@ -185,6 +185,13 @@ export default { params }); }, + ypnbpzxxyjjbgglts(params) { + return request({ + url: `/pharmaceuticals/ypnbpzxxyjjbgglts`, + method: "get", + params + }); + }, deasCorpTcmpFiling(id) { return request({ url: `/pharmaceuticals/deasCorpTcmpFiling/${id}`, diff --git a/src/api/index.js b/src/api/index.js index eb6370f..1480e76 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,9 +1,11 @@ // 召回 import frimCenter from "./Myapi/frimCenter/index.js"; +import Shenqing from "./Myapi/Shenqing/index.js"; import cosmetics from './cosmetics/index.js' import yaoPin from './yaoPin/index.js' export default { frimCenter, cosmetics, - yaoPin + yaoPin, + Shenqing }; diff --git a/src/api/yaoPin/index.js b/src/api/yaoPin/index.js index 109d606..0236f23 100644 --- a/src/api/yaoPin/index.js +++ b/src/api/yaoPin/index.js @@ -9,6 +9,13 @@ export default { params: query }) }, + recallInfo(query) { + return request({ + url: `/pharmaceuticals/recallInfo`, + method: "get", + params: query + }) + }, //通过主键查询单条国家药品抽检数据-抽样信息表 getSingle(id) { diff --git a/src/views/components/dialogTowZhaohui/dialogTow.vue b/src/views/components/dialogTowZhaohui/dialogTow.vue index c6df506..169e3ca 100644 --- a/src/views/components/dialogTowZhaohui/dialogTow.vue +++ b/src/views/components/dialogTowZhaohui/dialogTow.vue @@ -6,15 +6,8 @@ * @FilePath: \mudushow\src\components\dialog\index.vue --> @@ -534,8 +624,10 @@ export default { width: 100%; min-height: vh(200); } + .dialog-slot { padding: 0 vw(23); + .closeClick { position: absolute; top: vh(0); @@ -549,12 +641,14 @@ export default { background: #f8f9fa; box-shadow: 0px 1px 0px 0px #dbe0e8; cursor: pointer; + i { font-family: Source Han Bolde CN; font-weight: bold; text-align: center; padding: vh(5) 0 0 0; } + div { font-size: vb(20); font-family: Source Han Bolde CN; @@ -563,10 +657,12 @@ export default { } } } + ::v-deep .el-dialog { margin-bottom: 10vh; width: vw(812); } + ::v-deep .el-dialog__body { padding: vh(5) 0 vh(28); overflow: hidden; @@ -576,24 +672,34 @@ export default { background-color: #f8f9fa; padding: vw(20) 0 vw(20) vw(20); display: flex; + .recallbasic-item { margin-right: vw(80); .recallbasic-box { - font-size: vb(16); + font-size: vb(12); font-family: Source Han Regular CN; font-weight: 400; line-height: vh(50); display: flex; + .recallbasicname { margin-right: vw(10); text-align: right; - width: vw(100); + width: vw(150); color: #6a6c6f; + line-height: vh(45); } - span { + + .recallbasicnameTow { + width: vw(180); + } + + .isspan { color: #292f38; + width: vw(300); } + .recalitem-color { color: #1e80eb; text-decoration: underline; @@ -602,23 +708,27 @@ export default { } } } + ::v-deep .el-pagination { margin: vw(20) 0 0 0; display: flex; justify-content: flex-end; } + ::v-deep .el-pagination__jump { margin: 0; } + .button { display: flex; align-items: center; justify-content: center; } + .informant-btn { // width: vw(44); - height: vh(23); - padding: vh(3) vw(3); + height: vh(30); + padding: vh(2) vw(2); // display: inline-block !important; background: #e4effd; border: vw(1) solid #8cb9f8; @@ -627,51 +737,58 @@ export default { display: flex; justify-content: center; align-items: center; + ::v-deep span { display: inline-block; color: #1e80eb; + font-size: vb(12); + } } .zhaohuibaogao { display: flex; + .zhaohuibaogao-item { padding: 0 0 0 vw(15); - width: vw(140); + width: vw(150); height: vh(45); - background: url("../../../assets/images/Transaction/bottom-moren.png") - no-repeat; + background: url("../../../assets/images/Transaction/bottom-moren.png") no-repeat; background-size: 100% 100%; - font-size: vb(14); + font-size: vb(12); font-family: Source Han Sans CN; font-weight: 500; color: #75777a; line-height: vh(45); cursor: pointer; } + .active { - background: url("../../../assets/images/Transaction/bottom-xuanzhogn.png") - no-repeat; + background: url("../../../assets/images/Transaction/bottom-xuanzhogn.png") no-repeat; background-size: 100% 100%; font-family: Source Han Bolde CN; font-weight: bold; color: #ffffff; } } + .pingjiaContenr { padding: vw(20); + .zhaohuipingjai { - font-size: vb(16); + font-size: vb(14); font-family: Source Han Bolde CN; font-weight: bold; color: #6a6c6f; line-height: vw(50); + span { margin: 0 vw(5) 0 0; color: #000000; } } + .zhaohuipingjai-xian { margin: vh(20) 0; width: 100%; diff --git a/src/views/firmContent/drugInfo/adverseReaction/adverseReaction.vue b/src/views/firmContent/drugInfo/adverseReaction/adverseReaction.vue index 9b06a99..a92c39a 100644 --- a/src/views/firmContent/drugInfo/adverseReaction/adverseReaction.vue +++ b/src/views/firmContent/drugInfo/adverseReaction/adverseReaction.vue @@ -105,7 +105,7 @@ export default { form1: { pageSize: 10, pageNum: 1, - drugApprovalNo: "", + zczbh: "", }, options1: [ { @@ -401,7 +401,7 @@ export default { this.form1 = { pageSize: 10, pageNum: 1, - drugApprovalNo: "", + zczbh: "", } }, inquire() { } @@ -412,7 +412,7 @@ export default { }), }, mounted() { - this.form1.drugApprovalNo = this.urlA.data + this.form1.zczbh = this.urlA.data this.getlist() // this.$nextTick(() => { // let dom = document.getElementsByClassName('adverseReaction'); diff --git a/src/views/firmContent/drugInfo/drugBasicInfo/drugBasicInfo.vue b/src/views/firmContent/drugInfo/drugBasicInfo/drugBasicInfo.vue index 88f4623..0ca1f3d 100644 --- a/src/views/firmContent/drugInfo/drugBasicInfo/drugBasicInfo.vue +++ b/src/views/firmContent/drugInfo/drugBasicInfo/drugBasicInfo.vue @@ -1843,10 +1843,16 @@ export default { type: 2 }); this.loading = false; + let obj = { + entName:data.data.zcsqr, //企业名称 + recallProductName:data.data.cpmc //产品名称 + } + localStorage.setItem("zhaohui_obj",JSON.stringify(obj)) }, //药品信息 async yaopin(e) { this.loading = true; + console.log(789798,e); let msg1 = await this.$api.cosmetics.getYaoPin(e); this.$emit("getCPName", { key: "药品通用名称", value: msg1.data.yptymc, code: msg1.data.yppzwh, @@ -1856,6 +1862,11 @@ export default { this.list = this.filter(msg1.data, this.descriptions); this.listTow = this.filter(msg1.data, this.descriptionsTow); this.loading = false; + let obj = { + entName:msg1.data.ypssxkcyr, //企业名称 + recallProductName:msg1.data.scqy //产品名称 + } + localStorage.setItem("zhaohui_obj",JSON.stringify(obj)) }, //药品信息 async yuanliao(e) { @@ -1881,6 +1892,11 @@ export default { }); this.list = this.filter(msg1.data, this.descriptionsTwo); this.loading = false; + let obj = { + entName:msg1.data.qymc, //企业名称 + recallProductName:msg1.data.cpmc //产品名称 + } + localStorage.setItem("zhaohui_obj",JSON.stringify(obj)) }, //国产特殊化妆品单条数据 async specialChina(e) { @@ -1897,6 +1913,11 @@ export default { }); this.list = this.filter(msg1.data, this.descriptionsFour); this.loading = false; + let obj = { + entName:msg1.data.zcr, //企业名称 + recallProductName:msg1.data.cpmc //产品名称 + } + localStorage.setItem("zhaohui_obj",JSON.stringify(obj)) }, //进口化妆品单条数据 async importData(e) { @@ -1910,6 +1931,11 @@ export default { }); this.list = this.filter(msg1.data, this.descriptionsThree); this.loading = false; + let obj = { + entName:msg1.data.jnzrr, //企业名称 + recallProductName:msg1.data.cpmc //产品名称 + } + localStorage.setItem("zhaohui_obj",JSON.stringify(obj)) }, //进口特殊化妆品单条数据 async specialImport(e) { @@ -1925,6 +1951,11 @@ export default { }); this.list = this.filter(msg1.data, this.descriptionsFour); this.loading = false; + let obj = { + entName:msg1.data.jnzrr, //企业名称 + recallProductName:msg1.data.cpmc //产品名称 + } + localStorage.setItem("zhaohui_obj",JSON.stringify(obj)) }, //根据备案号查询受托生产企业数据 async entrustedEnter(e) { @@ -1940,6 +1971,11 @@ export default { }); this.list = this.filter(msg1.data, this.descriptionsFourmale); this.loading = false; + let obj = { + entName:msg1.data.qymc, //企业名称 + recallProductName:msg1.data.cpmc //产品名称 + } + localStorage.setItem("zhaohui_obj",JSON.stringify(obj)) }, //牙膏数据 async yagao(e) { diff --git a/src/views/firmContent/drugInfo/index.vue b/src/views/firmContent/drugInfo/index.vue index 94999fd..1e881b4 100644 --- a/src/views/firmContent/drugInfo/index.vue +++ b/src/views/firmContent/drugInfo/index.vue @@ -48,7 +48,7 @@
+ v-show="urlA.type != 4 && pruduct.type != '原料药'&& urlA.type != 'yagao'" v-if="urlA.leixing != 'ggfw'"> + v-show="urlA.type != 4 && pruduct.type != '原料药'&& urlA.type != 'yagao'" v-if="urlA.leixing != 'ggfw'"> + v-show="urlA.flag != 5 && urlA.type != 4 && pruduct.type != '原料药'&& urlA.type != 'yagao'" v-if="urlA.leixing != 'ggfw'"> + v-show="urlA.type == 4" v-if="urlA.leixing != 'ggfw'"> + v-show="urlA.type == 4&& urlA.type != 'yagao'" v-if="urlA.leixing != 'ggfw'"> 变更记录
+
+ + 年报上报变更信息 +
+ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/firmContent/drugInfo/zhaohui/PZchouyang.vue b/src/views/firmContent/drugInfo/zhaohui/PZchouyang.vue index 3b0d4a0..8f32caf 100644 --- a/src/views/firmContent/drugInfo/zhaohui/PZchouyang.vue +++ b/src/views/firmContent/drugInfo/zhaohui/PZchouyang.vue @@ -35,60 +35,47 @@ -->
- - + + - + - + + - + + + + - + + - + - + @@ -99,81 +86,48 @@ class="pagination" :class="transinformation.b == '1' ? 'paginationTwo' : ''" > --> - + +
-
+
基本信息
-
+
检验项目
- + - + - + - + - + - + + +