From 40980bf85b1f6fecc353d7d85cb849969838d9bc Mon Sep 17 00:00:00 2001 From: pengjun <1332099529@qq.com> Date: Tue, 19 Nov 2024 18:39:15 +0800 Subject: [PATCH] pic --- src/components/common/LocalConfig.vue | 14 ++- src/components/doctorCheck/CheckItemList.vue | 96 ++++++++++--------- src/components/doctorCheck/CheckPicture.vue | 34 +++++-- src/components/doctorCheck/PacsTemplate.vue | 4 +- .../doctorCheck/RegisterCheckEdit.vue | 12 ++- src/views/doctorCheck/doctorCheck.vue | 6 +- 6 files changed, 103 insertions(+), 63 deletions(-) diff --git a/src/components/common/LocalConfig.vue b/src/components/common/LocalConfig.vue index edef333..0bb5170 100644 --- a/src/components/common/LocalConfig.vue +++ b/src/components/common/LocalConfig.vue @@ -83,12 +83,21 @@ - + - + + + + + + + + + @@ -168,6 +177,7 @@ export default { }, doctorCheck: { // 医生诊台 isCheckPicture: false, // 是否显示检查图片 + pictureFileType:'0', pacsType:'image', isQueue: 'N', //启用分诊排队 queueRoom: '', //默认分诊房间 diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue index e0b4d22..67e6f94 100644 --- a/src/components/doctorCheck/CheckItemList.vue +++ b/src/components/doctorCheck/CheckItemList.vue @@ -275,34 +275,34 @@ /> - - - - - - - - - -
- - - + + + + + + + + + +
+ + + @@ -321,7 +321,7 @@ export default { data() { return { activeName: "first", - previousResults:false, + previousResults: false, gridData: [], resultStatus: [], //结果状态提示数据 tipsNormal: { @@ -363,7 +363,11 @@ export default { }, symbols: [], //特殊符号 splitSymbols: ["；", "、"], // 分隔符 - userId: "", + userInfo: { + operatorType: "0", + userId: "", + user: "", + }, // pacs 结果录入 pacsParams: { @@ -374,7 +378,7 @@ export default { result: "", summary: "", }, - curRow:{} + curRow: {}, }; }, @@ -385,8 +389,9 @@ export default { //挂载完成 mounted() { this.checkItemList(this.dataTransOpts.tableS.register_check.id); - - this.userId = window.sessionStorage.getItem("userId"); + this.userInfo.operatorType = window.sessionStorage.getItem("operatorType") || '0'; + this.userInfo.userId = window.sessionStorage.getItem("userId")||null; + this.userInfo.user = window.sessionStorage.getItem("user")||null; }, computed: { @@ -477,21 +482,21 @@ export default { itemId: row.itemId, }).then((res) => { if (res.code != -1) { - this.previousResults=true + this.previousResults = true; this.gridData = res.data; - this.$nextTick(()=>{ + this.$nextTick(() => { this.initEcharts(); - }) + }); } }); }, initEcharts() { let yAxisData = []; let xAxisData = []; - for(let i=0;i
-
- +
+ + +
+ +
+
+ + + +
@@ -229,6 +239,7 @@ export default { // 裁图 dialogWinCutPic: false, cutPicParam: {}, + pictureFileType:'0' }; }, @@ -238,6 +249,8 @@ export default { if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName)) this.sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig')) // console.log('this.sysConfig checkPictures', this.sysConfig) + let LocalConfig = JSON.parse(window.localStorage.getItem("LocalConfig") || null) + if (LocalConfig && LocalConfig.doctorCheck && LocalConfig.doctorCheck.pictureFileType) this.pictureFileType = LocalConfig.doctorCheck.pictureFileType }, //挂载完成 @@ -355,15 +368,14 @@ export default { this.$peisAPI.imageAcquisition(JSON.stringify(toOutShell)) .then(async (res) => { let lres = JSON.parse(res) - console.log('this.$peisAPI.imageAcquisition', lres) + console.log('this.$peisAPI.imageAcquisition', lres) if (lres.code > -1) { for (let i = 0; i < lres.data.length; i++) { let item = lres.data[i]; // FilePath: // Image - // ImageFormat - + // ImageFormat let baseHead = 'data:image/jpeg;base64,' switch (item.ImageFormat) { case 'png': @@ -383,8 +395,9 @@ export default { pictureBaseStrs: [{ fileName, localPathName: item.FilePath, - pictureBaseStr: baseHead + item.Image - }] + pictureBaseStr: baseHead + item.Image + }], + pictureFileType:this.pictureFileType } try { //await postapi('/api/app/RegisterCheckPicture/InstrumentMapping', body) @@ -658,13 +671,14 @@ export default { let item = { registerCheckId: e.registerCheckId, pictureFilename: e.pictureFilename, + pictureFileType: e.pictureFileType }; if (e.id) item.registerCheckPictureId = e.id; if (e.isPrintTrans) { item.isPrint = "Y"; } else { item.isPrint = "N"; - } + } body.push(item); }); diff --git a/src/components/doctorCheck/PacsTemplate.vue b/src/components/doctorCheck/PacsTemplate.vue index b21eef3..72fe1ba 100644 --- a/src/components/doctorCheck/PacsTemplate.vue +++ b/src/components/doctorCheck/PacsTemplate.vue @@ -211,7 +211,7 @@ export default { //挂载组件完成 mounted() { //获取体检单位列表树信息 - this.getPacsTemplateTree(); + this.init(); }, @@ -225,6 +225,8 @@ export default { this.tabPosition = this.doctorCheck.checkItemList.length > 5 ? "left" : "top"; console.log("init"); + + this.getPacsTemplateTree(); }, // 显示tab标签名称，过长处理 diff --git a/src/components/doctorCheck/RegisterCheckEdit.vue b/src/components/doctorCheck/RegisterCheckEdit.vue index 3096d07..05af3f8 100644 --- a/src/components/doctorCheck/RegisterCheckEdit.vue +++ b/src/components/doctorCheck/RegisterCheckEdit.vue @@ -14,12 +14,12 @@
操作者 - +
操作日期
@@ -55,9 +55,7 @@ export default { computed: { ...mapState(["window", "dataTransOpts", "dict", "doctorCheck", "patientRegister", "customerOrg"]), - lmoment(date, forMat) { - return moment(new Date(date)).format(forMat); - }, + }, methods: { // 初始化字典数据 @@ -71,6 +69,10 @@ export default { }) }, + lmoment(date, forMat) { + return moment(new Date(date)).format(forMat); + }, + // 放在 明细中获取，否则要获取两次 // getRegisterCheck(id){ // if(id){ diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue index c10da8b..1178259 100644 --- a/src/views/doctorCheck/doctorCheck.vue +++ b/src/views/doctorCheck/doctorCheck.vue @@ -598,8 +598,12 @@ export default { // ] // } let checkDate = this.doctorCheck.RegisterCheckEdit.checkDate || new Date(); - checkDate = moment(new Date(checkDate)).format('yyyy-MM-DD HH:mm:ss'); //yyyy-MM-DD HH:mm:ss + checkDate = moment(new Date(checkDate)).format('yyyy-MM-DD HH:mm:ss'); //yyyy-MM-DD HH:mm:ss let checkDoctorId = this.doctorCheck.RegisterCheckEdit.checkDoctorId || null; + if(!checkDoctorId){ + this.$message.warning({ showClose: true, message: '检查医生不能为空，请选择检查医生！' }) + return + } let registerCheckId = this.doctorCheck.RegisterCheckEdit.id // 明细 let registerCheckItems = []