+ :style="`z-index:2;border-radius: 10px;border: 1px solid #ddd;background-color:#FFF; position: absolute;top:0px;right:${LocalConfig.doctorCheck.hisItemRight}px;width:200px;height: 600px;opacity:1;`">
历次明细结果
@@ -265,6 +265,7 @@ export default {
isSelectAll: 'N', // 录入结果时，是否全选
pacsDescFontSize: "14px", //描述内容的字体大小
isSplitChooseResult: "Y", // 选结果时，是否自动加上分隔符
+ hisItemRight:0, // 历史检查明细右边边距
}
},
@@ -299,6 +300,7 @@ export default {
if (LocalConfig?.doctorCheck?.isSelectAll) this.LocalConfig.doctorCheck.isSelectAll = LocalConfig.doctorCheck.isSelectAll
if (LocalConfig?.doctorCheck?.pacsDescFontSize) this.LocalConfig.doctorCheck.pacsDescFontSize = LocalConfig.doctorCheck.pacsDescFontSize + 'px'
if (LocalConfig?.doctorCheck?.isSplitChooseResult) this.LocalConfig.doctorCheck.isSplitChooseResult = LocalConfig.doctorCheck.isSplitChooseResult
+ if (LocalConfig?.doctorCheck?.hisItemRight) this.LocalConfig.doctorCheck.hisItemRight = Number(LocalConfig.doctorCheck.hisItemRight)
},
//挂载完成
diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue
index 6deac22..6f538f6 100644
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@@ -72,7 +72,8 @@
| 项目 |
- {{ doctorCheck.preResult.checkDate || '结果' }} |
+
+ {{ doctorCheck.preResult.checkDate || '结果' }} |
参考范围 |
单位 |
diff --git a/src/components/sumDoctorCheck/SumAsbItemStatus.vue b/src/components/sumDoctorCheck/SumAsbItemStatus.vue
index 0539c3e..4f528e4 100644
--- a/src/components/sumDoctorCheck/SumAsbItemStatus.vue
+++ b/src/components/sumDoctorCheck/SumAsbItemStatus.vue
@@ -95,13 +95,13 @@ export default {
// }
// },
// 虚拟表 触发强制刷新 （sumDoctor.M 合并包含：综述、建议、对比、历史等，不包含总检诊断）
- "dataTransOpts.refresh.sumDoctor.M": {
- // immediate:true,
- handler(newVal, oldVal) {
- console.log(`watch 总检--检查状态汇总 newVal: ${newVal}, oldVal: ${oldVal} patientRegisterId: ${this.patientRegisterId}`);
- if(newVal != oldVal && this.tabChoosed == '1') this.getSumAsbItemStatus(this.patientRegisterId);
- }
- },
+ // "dataTransOpts.refresh.sumDoctor.M": {
+ // // immediate:true,
+ // handler(newVal, oldVal) {
+ // console.log(`watch 总检--检查状态汇总 newVal: ${newVal}, oldVal: ${oldVal} patientRegisterId: ${this.patientRegisterId}`);
+ // if(newVal != oldVal && this.tabChoosed == '1') this.getSumAsbItemStatus(this.patientRegisterId);
+ // }
+ // },
// 传入参数控制
"brushSummary": {
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index 9db896d..3fa4519 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -340,6 +340,7 @@ export default {
completeFlag: '2', //总检状态
historySummary: '', // 历史综述
},
+ patient_registerInit:{}, // 重置用到
LocalConfig: {
doctorCheck: { // 医生诊台
@@ -451,6 +452,7 @@ export default {
},
created() {
+ this.patient_registerInit = Object.assign({},this.patient_register)
// console.log("this.$route.query", this.$route.query)
//获取用户当前页面的权限
let userPriv = window.sessionStorage.getItem('userPriv')
@@ -1509,7 +1511,21 @@ export default {
},
btnReset() {
- location.reload()
+ // location.reload()
+ this.patient_register = Object.assign({},this.patient_registerInit)
+ this.refParamsQuery.id = ''
+ this.refParamsQuery.registerCheckId = ''
+
+ // 查询条件清空
+ this.refParamsQuery.resetTimes++
+
+ // 综述建议清空、状态
+ // this.summaryList = []
+ // this.suggestionList = []
+ this.refParamsQuery.brushCheckList++
+ this.refParamsQuery.brushItemList++
+
+
},
// 导入结果(检查、检验、迪安)
diff --git a/src/views/doctorCheck/sumDoctorCheck.vue b/src/views/doctorCheck/sumDoctorCheck.vue
index 7bec05d..e38a756 100644
--- a/src/views/doctorCheck/sumDoctorCheck.vue
+++ b/src/views/doctorCheck/sumDoctorCheck.vue
@@ -610,6 +610,7 @@ export default {
completeFlag: '2', //总检状态
historySummary: '', // 历史综述
},
+ patient_registerInit:{}, // 重置用到
// 综述建议部份
summaryList: [],
@@ -690,7 +691,9 @@ export default {
};
},
- created() {
+ created() {
+ this.patient_registerInit = Object.assign({},this.patient_register)
+
if (this.$route.query.patient_register) {
this.patient_register = Object.assign({},this.$route.query.patient_register)
} else {
@@ -1528,9 +1531,20 @@ export default {
//重置
btnReset() {
- // location.reload()
- this.patient_register.id = ''
+ // location.reload()
+ this.patient_register = Object.assign({},this.patient_registerInit)
+ this.refParamsQuery.id = ''
+
+ // 查询条件清空
this.refParamsQuery.resetTimes++
+
+ // 综述建议清空、状态
+ // this.summaryList = []
+ // this.suggestionList = []
+ this.refParamsQuery.brushSummary++
+
+ // 、明细、图文…… 清空
+ this.refParamsQuery.brushTimes++
},
@@ -1803,6 +1817,7 @@ export default {
getHaveSumData(patientRegisterId) {
this.summaryList = [];
this.suggestionList = [];
+
if (!patientRegisterId) return
// console.log('getHaveSumData', this.patient_register.completeFlag)
@@ -1885,13 +1900,12 @@ export default {
//获取历次综述
getHistorySummary(patientRegisterId, isGetExistData) {
+
// 报告不获历次综述
if (this.history_summary_years_limit == '0') return
- if (!patientRegisterId) {
- this.patient_register.historySummary = '';
- return
- }
+ this.patient_register.historySummary = '';
+ if (!patientRegisterId) return
let body = {
patientRegisterId,
@@ -2724,7 +2738,19 @@ export default {
// immediate:true,
handler(newVal, oldVal) {
console.log(`watch 总检--综述建议refParamsQuery.brushSummary newVal: ${newVal}, oldVal: ${oldVal} patientRegisterId: ${this.refParamsQuery.id}`);
- if (newVal != oldVal && this.tabChoosed == '1') this.getHaveSumData(this.refParamsQuery.id)
+ // if (newVal != oldVal && this.tabChoosed == '1')
+ if (newVal != oldVal) this.getHaveSumData(this.refParamsQuery.id)
+ }
+ },
+
+ // 重置查询条件
+ "refParams.resetTimes": {
+ // immediate:true,
+ handler(newVal, oldVal) {
+ console.log(`watch.refParams.resetTimes newVal: ${newVal} oldVal: ${oldVal}`);
+ if(newVal && newVal != oldVal){
+ this.prBase = Object.assign({},this.prBase,this.prBaseInit)
+ }
}
},