diff --git a/src/components/occDisease/OccDisease.vue b/src/components/occDisease/OccDisease.vue
index fea1c64..fecfd3c 100644
--- a/src/components/occDisease/OccDisease.vue
+++ b/src/components/occDisease/OccDisease.vue
@@ -30,8 +30,8 @@
- 测试
- 删除
+ 测试
+ 删除
确定
关闭
@@ -131,9 +131,9 @@ export default {
this.dataTransOpts.tableM.patient_past_medical_history = deepCopy(res.data['patientPastMedicalHistoryDtos'])
this.dataTransOpts.tableM.patient_occupational_medical_history = deepCopy(res.data['patientOccupationalMedicalHistoryDtos'])
this.dataTransOpts.tableM.patient_poison = deepCopy(res.data['patientPoisonDtos'])
- this.dataTransOpts.tableM.patient_poison.forEach(e => {
- e.poisonName = dddw(this.dict.poisonList,'id',e.poisonId,'displayName')
- });
+ // this.dataTransOpts.tableM.patient_poison.forEach(e => {
+ // e.poisonName = dddw(this.dict.poisonList,'id',e.poisonId,'displayName')
+ // });
this.dataTransOpts.tableM.patient_occupational_history = deepCopy(res.data['patientOccupationalHistoryDtos'])
if (Array.isArray(res.data['patientSymptomDtos']) && res.data['patientSymptomDtos'].length > 0) {
this.dataTransOpts.tableM.patient_symptom = deepCopy(res.data['patientSymptomDtos'])
diff --git a/src/components/occDisease/OccDiseaseConclusion.vue b/src/components/occDisease/OccDiseaseConclusion.vue
index 9f384c4..852956d 100644
--- a/src/components/occDisease/OccDiseaseConclusion.vue
+++ b/src/components/occDisease/OccDiseaseConclusion.vue
@@ -10,9 +10,9 @@
|
+ size="small" :autosize="{ minRows: 8, maxRows: 8 }" :disabled="!checkPagePriv(pagePriv.privs, '职业健康检查结论')">
|
+ size="small" :autosize="{ minRows: 8, maxRows: 8 }" :disabled="!checkPagePriv(pagePriv.privs, '职业健康检查结论')">
+
+
+
+
-
+
+
+
+
+
@@ -19,10 +41,16 @@
-
-
-
+
+
+
+
+
@@ -235,7 +263,7 @@
+ :filter-method="filterMethod" popper-class="diagnosisSelect" :popper-append-to-body="false">
@@ -268,7 +296,7 @@ export default {
diagnosisesFilter: [], // 可选的诊断
choosedDiagnosisIds: [], // 已选的诊断 id 集合
disabledDiagnosisIds: [], // 不可选的诊断 id 集合
- diagnosisesChoosed:[], // 已选的诊断集合
+ diagnosisesChoosed: [], // 已选的诊断集合
collapse: false, // 折叠/展开全部建议
@@ -286,6 +314,7 @@ export default {
colName: '', //
subIndex: -1,
},
+ summary_check_default_summay_modifiable: 'N',
};
},
@@ -299,11 +328,11 @@ export default {
},
//挂载完成
- mounted() {
+ async mounted() {
// this.rowDrop(); (综述取消拖拽)
this.rowDropSuggestion();
- this.dictInit()
+ await this.dictInit()
// document.addEventListener('DOMContentLoaded', function () {
// const textarea = document.querySelector('textarea');
// textarea.addEventListener('input', function () {
@@ -336,7 +365,7 @@ export default {
// });
// },
// 获取诊断数据
- dictInit() {
+ async dictInit() {
// 获取诊断 /api/app/diagnosis/getlistinsuggestion , {}
postapi('/api/app/Diagnosis/GetSimpleDiagnosisWithSuggestions').then(res => {
@@ -351,6 +380,35 @@ export default {
this.symbols = res.data
}
})
+
+ let sysParmId = "summary_check_default_summay_modifiable"
+ try {
+ let sysParm = await postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId })
+ this.summary_check_default_summay_modifiable = sysParm.data.toUpperCase()
+ // console.log('dictInit this.summary_check_default_summay_modifiable',this.summary_check_default_summay_modifiable,sysParm.data.toUpperCase())
+ } catch (error) {
+ console.log('获取参数 summary_check_default_summay_modifiable 失败', error)
+ }
+
+ },
+
+ // 增加综述
+ addSummary() {
+ let id = String(new Date().getTime())
+ let pojo = {
+ id,
+ patientRegisterId: this.dataTransOpts.tableS.patient_register.id,
+ summaryTitle: '',
+ details: [{
+ id: 'detail' + id,
+ summaryContent: '',
+ }]
+ }
+
+ this.sumDoctorCheck.summaryList.push(pojo);
+ this.$nextTick(() => {
+ this.$refs[id].focus();
+ })
},
//增加建议
@@ -424,13 +482,13 @@ export default {
this.diagnosisesChoosed = []
this.diagnosises.forEach(e => {
- if(this.disabledDiagnosisIds.indexOf(e.id) == -1){
- if(this.choosedDiagnosisIds.indexOf(e.id) == -1){
- if(this.diagnosisesFilter.length < 20) this.diagnosisesFilter.push(e)
- }else{
+ if (this.disabledDiagnosisIds.indexOf(e.id) == -1) {
+ if (this.choosedDiagnosisIds.indexOf(e.id) == -1) {
+ if (this.diagnosisesFilter.length < 20) this.diagnosisesFilter.push(e)
+ } else {
this.diagnosisesChoosed.push(e)
}
- }
+ }
});
this.diagnosisesFilter = this.diagnosisesFilter.concat(this.diagnosisesChoosed)
this.dialogDiagnosises = true
@@ -441,16 +499,16 @@ export default {
if (keyWords) {
let diagnosisesFilter = []
this.diagnosises.forEach(e => {
- if(this.disabledDiagnosisIds.indexOf(e.id) == -1){
- if(this.choosedDiagnosisIds.indexOf(e.id) == -1){
- if(e.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1 || e.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1){
- if(diagnosisesFilter.length < 20) diagnosisesFilter.push(e)
+ if (this.disabledDiagnosisIds.indexOf(e.id) == -1) {
+ if (this.choosedDiagnosisIds.indexOf(e.id) == -1) {
+ if (e.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1 || e.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1) {
+ if (diagnosisesFilter.length < 20) diagnosisesFilter.push(e)
}
}
}
})
this.diagnosisesFilter = diagnosisesFilter.concat(this.diagnosisesChoosed)
- }
+ }
},
btnOkDiagnosis() {
@@ -596,7 +654,20 @@ export default {
// '人员已锁定,不可执行此操作'
if (patientRegister.isLock && patientRegister.isLock == 'Y') return ret
- if (btnType && btnType == 'collapse') ret = false
+ // console.log('btnType', btnType, this.summary_check_default_summay_modifiable)
+
+ switch (btnType) {
+ case 'collapse':
+ return false;
+ case 'addSummary':
+ if (patientRegister.completeFlag && patientRegister.completeFlag != '3' && this.summary_check_default_summay_modifiable == 'Y') {
+ return false;
+ } else {
+ return true;
+ }
+ default:
+ break;
+ }
if (patientRegister.completeFlag && patientRegister.completeFlag != '3') ret = false
@@ -689,6 +760,19 @@ export default {
})
},
+ // 新增综述明细
+ addSum(index) {
+ let id = String(new Date().getTime())
+ this.sumDoctorCheck.summaryList[index]['details'].push({
+ id,
+ summaryContent: '',
+ })
+ this.$nextTick(() => {
+ this.$refs[id].focus();
+ })
+
+ },
+
//增加建议明细
addSug(index, contentType) {
this.suggestionCurRow = index
@@ -716,6 +800,24 @@ export default {
console.log('this.sumDoctorCheck.suggestionList', index, this.sumDoctorCheck.suggestionList)
},
+ //删除建议头及明细
+ delSumHead(index) {
+ this.$confirm("此操作将删除该记录, 是否继续?", "提示", {
+ confirmButtonText: "是",
+ cancelButtonText: "否",
+ type: "warning",
+ }).then(() => {
+ //删除建议
+ this.sumDoctorCheck.summaryList.splice(index, 1)
+ }).catch((err) => {
+ if (err == 'cancel') {
+ console.log(`已取消 ${err}`)
+ } else {
+ this.$message.error(`操作失败 ${err}`)
+ }
+ });
+ },
+
//删除建议头及明细
delSugHead(index) {
this.$confirm("此操作将删除该记录, 是否继续?", "提示", {
@@ -734,7 +836,9 @@ export default {
});
},
- //删除建议明细
+
+
+ //删除/综述建议明细
delSug(details, indexD) {
this.$confirm("此操作将删除该记录, 是否继续?", "提示", {
confirmButtonText: "是",
@@ -750,8 +854,8 @@ export default {
this.$message.error(`操作失败 ${err}`)
}
});
-
},
+
//选择组合项目
rowClick(row) {
console.log('rowClick row', row)
@@ -875,7 +979,7 @@ export default {
this.rowClickSug(row, 2)
},
- rowClickSug(row, contentType) {
+ rowClickSug(row, contentType) {
let lcontentType = 'healthGuidances'
switch (contentType) {
case 0:
@@ -897,7 +1001,7 @@ export default {
//建议明细拖拽
rowDropSugDetail(contentType, id) {
- this.$nextTick(() => {
+ this.$nextTick(() => {
const fEl = document.getElementById(`${contentType}_sug${id}`) // document.querySelector(`#${id} tbody`) querySelector为静态方法不支持动态传参;
console.log('rowDropSumDetail tbody', fEl, fEl.children) //el.childNodes,el.children
const el = this.findEl(fEl, 'TBODY')