diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue index 079a1ab..4b88056 100644 --- a/src/components/doctorCheck/CheckItemList.vue +++ b/src/components/doctorCheck/CheckItemList.vue @@ -1,27 +1,29 @@ + + + + + + + + + + + + +
+
+
历次明细结果
+
+ + + +
+
+ + + + + + + + +
@@ -174,6 +200,7 @@ + @@ -195,7 +222,8 @@ // 0-无参考范围，1-数字型，2-字符型，3-性激素 import { mapState } from "vuex"; import { getapi, postapi, putapi, deletapi } from "@/api/api"; -import { arrayExistObj, dddw, deepCopy } from "../../utlis/proFunc"; +import { arrayExistObj, dddw, deepCopy, getPagePriv, checkPagePriv } from "../../utlis/proFunc"; + import PacsTemplate from "./PacsTemplate.vue"; import * as echarts from "echarts"; export default { @@ -205,6 +233,10 @@ export default { props: ["isCheckPicture", "registerCheckId", "doctor_check_check_charge"], data() { return { + pagePriv: { + routeUrlorPageName: "doctorCheck", //当前页面归属路由或归属页面权限名称 + privs: [], // 页面权限 + }, activeName: "first", previousResults: false, gridData: [], @@ -272,10 +304,19 @@ export default { pacsDescFontSize: "14px", //描述内容的字体大小 } }, + + hisResultDetailDialogVisible: true, }; }, created() { + //获取用户当前页面的权限 + let userPriv = window.sessionStorage.getItem("userPriv"); + if (userPriv) + this.pagePriv.privs = deepCopy( + getPagePriv(this.pagePriv.routeUrlorPageName) + ); + this.dictInit(); let LocalConfig = JSON.parse(window.localStorage.getItem("LocalConfig") || null) @@ -373,6 +414,7 @@ export default { } }); }, + btnPacsRessulst(row) { this.curRow = row; postapi("/api/app/RegisterCheckItem/GetItemTwoHistoricalResults", { @@ -780,6 +822,19 @@ export default { rowClick(row) { this.doctorCheck.checkItem = row; this.restaurants = row.itemResultTemplates; + + //显示历史明细结果 + if (this.hisResultDetailDialogVisible) { + this.gridData = [] + postapi("/api/app/RegisterCheckItem/GetItemTwoHistoricalResults", { + registerCheckId: row.registerCheckId, + itemId: row.itemId, + }).then((res) => { + if (res.code != -1) { + this.gridData = res.data; + } + }); + } }, //检查组合项目下所包含的明细项目 @@ -990,6 +1045,54 @@ export default { }); }); }, + + // 录入结果区域 右击事件 + onContextmenu(event) { + + //菜单项 + let items = []; + // items.push({ + // label: "一级菜单", + // children: [ + // { label: "修改姓名", onClick: () => { this.fnUpBaseInfo(row, 'patientName'); } } + // ], + // onClick: () => { //菜单事件 } + // }) + + // 显示明细历次结果 + items.push({ + label: "显示明细历次结果", + onClick: () => { + this.hisResultDetailDialogVisible = true + }, + }) + + // 预览影像报告 + //if(checkPagePriv(this.pagePriv.privs, "预览影像报告")) + items.push({ + label: "预览影像报告", + onClick: () => { + this.pacsReportView(); + }, + }) + + + this.$contextmenu({ + items, + event, + x: event.clientX, + y: event.clientY, + customClass: "custom-class", + zIndex: 3, + minWidth: 80, + }); + + return false; + }, + + pacsReportView() { + this.$message.info({ showClose: true, message: this.doctorCheck.RegisterCheckId }) + }, }, //监听事件 diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index 7c7d29a..9adff64 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -2175,9 +2175,11 @@ export default { e.patientRegisterId = '' e.isCharge = 'N' e.isLock = 'N' + e.checkCompleteFlag = '0' }); // // console.log('this.patientRegister.patientRegisterAbs',this.patientRegister.patientRegisterAbs) - this.$message.info({ showClose: true, message: "操作成功，请记得点保存" }); + + this.$message.warning({ showClose: true, message: "操作成功，请记得点保存" }); }, diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue index 77a561b..a7b429f 100644 --- a/src/components/patientRegister/PatientRegisterItem.vue +++ b/src/components/patientRegister/PatientRegisterItem.vue @@ -142,11 +142,11 @@ - -