pengjun 2 years ago
parent
commit
b02607ce5b
  1. 8
      src/components/doctorCheck/CheckItemList.vue
  2. 10
      src/components/doctorCheck/CheckSumSug.vue
  3. 15
      src/components/doctorCheck/PatientRegisterBase.vue
  4. 25
      src/components/doctorCheck/PatientRegisterList.vue
  5. 6
      src/components/doctorCheck/RegisterCheckEdit.vue
  6. 22
      src/components/doctorCheck/RegisterCheckList.vue

8
src/components/doctorCheck/CheckItemList.vue

@ -233,7 +233,7 @@ export default {
`/api/app/registercheckitem/getlistinregistercheckid?RegisterCheckId=${RegisterCheckId}`
);
getapi(
`/api/app/registercheckitem/getlistinregistercheckid?RegisterCheckId=${RegisterCheckId}`
`/api/app/registercheckitem/getlistinregistercheckid?RegisterCheckId=${RegisterCheckId}&PatientRegisterId=${this.dataTransOpts.tableS.patient_register.id}`
)
.then((res) => {
// console.log("checkItemList", res.data);
@ -334,11 +334,11 @@ export default {
// },
//
"dataTransOpts.refresh.register_check_item.S":{
"dataTransOpts.refresh.register_check_item.M":{
immediate:true,
handler(newVal, oldVal) {
console.log(`watch dataTransOpts.refresh.register_check_item.S newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.registerCheckId}`);
this.checkItemList(this.registerCheckId);
console.log(`watch 检查明细 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.register_check.id}`);
this.checkItemList(this.dataTransOpts.tableS.register_check.id);
}
},
},

10
src/components/doctorCheck/CheckSumSug.vue

@ -4,6 +4,7 @@
<el-table id="tableSummary" row-key="id" :data="doctorCheck.checkSummaryList" size="samll"
:height="sumHeight"
width="100%" border @row-click="rowClick">
<el-table-column type="index" width="25" align="center"/>
<el-table-column prop="summary" label="小结">
<template slot="header">
<div style="display: flex;justify-content:space-between;">
@ -44,6 +45,7 @@
<el-table id="tableSuggestion" row-key="id" :data="doctorCheck.checkSuggestionList" size="samll"
:height="sumHeight"
width="100%" border @row-click="rowClick">
<el-table-column type="index" width="25" align="center"/>
<el-table-column prop="suggestion" label="建议" >
<template slot-scope="scope">
<div style="display: flex;">
@ -221,12 +223,12 @@ export default {
// this.checkSuggestionList(newVal)
// },
//
"dataTransOpts.refresh.register_check_item.S":{
"dataTransOpts.refresh.register_check.S":{
immediate:true,
handler(newVal, oldVal) {
console.log(`watch 小结 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.registerCheckId}`);
this.checkSummaryList(this.registerCheckId)
this.checkSuggestionList(this.registerCheckId)
console.log(`watch 小结 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.register_check.id}`);
this.checkSummaryList(this.dataTransOpts.tableS.register_check.id)
this.checkSuggestionList(this.dataTransOpts.tableS.register_check.id)
}
},

15
src/components/doctorCheck/PatientRegisterBase.vue

@ -267,9 +267,9 @@ export default {
// debugger
// console.log('rd,this.doctorCheck.prBase',rd.id,this.doctorCheck.prBase.id)
objCopy(rd,this.prBase)
this.dataTransOpts.tableS.patient_register.id = rd.id
this.doctorCheck.prBase = Object.assign({},this.doctorCheck.prBase,rd)
this.dataTransOpts.refresh.register_check.S++
this.dataTransOpts.refresh.register_check.M++
// objCopy(rd,this.doctorCheck.prBase)
// this.sumPREditInit()
@ -286,7 +286,8 @@ export default {
let val = this.prBase[queryType]
this.doctorCheckPrBaseInit()
this.dataTransOpts.refresh.register_check.S++
this.dataTransOpts.tableS.patient_register.id = ''
this.dataTransOpts.refresh.register_check.M++
this.sumPREditInit()
@ -446,6 +447,14 @@ export default {
}
},
//
"dataTransOpts.refresh.patient_register.S":{
immediate:true,
handler(newVal, oldVal) {
console.log(`watch 组合项目列表 newVal: ${newVal} oldVal: ${oldVal} patient_register.id: ${this.dataTransOpts.tableS.patient_register.id}`);
this.dataTransOpts.refresh.register_check.M++
}
},
},
};
</script>

25
src/components/doctorCheck/PatientRegisterList.vue

@ -211,12 +211,28 @@ export default {
//
mounted() { },
computed: {
...mapState(["window", "dict", "patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck","report"]),
...mapState(["window","dataTransOpts", "dict", "patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck","report"]),
},
methods: {
...mapMutations(['doctorCheckPrBaseInit', 'sumPREditInit']),
dictInit(){
//
let today = moment(new Date()).format('yyyy-MM-DD');
this.report.dataCusOrgOCX = [{
id: Date.now(),
customerOrgId: "",
customerOrgName: "",
customerOrgRegister: {},
customerOrgRegisterList: [],
dateType: "medicalStartDate",
startDate: today,
endDate: today,
customerOrgGroupIds: [],
customerOrgGroupList: []
}]
this.patientRegister.query.cusOrgOCX = `(体检${today}~${today})`
//
postapi('/api/app/asbitem/getasbitemlist',{isFilterActive:'Y'}).then(res =>{
if(res.code != -1){
@ -269,6 +285,11 @@ export default {
//
rowClick(row) {
this.dataTransOpts.tableS.patient_register.id = row.id
setTimeout(() => {
this.dataTransOpts.refresh.patient_register.S++ //
}, 10);
this.doctorCheckPrBaseInit()
this.doctorCheck.prBase.patientRegisterNo = row.patientRegisterNo
objCopy(row, this.doctorCheck.prBase) //
@ -300,7 +321,7 @@ export default {
//
query() {
let body = {},customerOrgs=[]
console.log('this.report.dataCusOrgOCX',this.report.dataCusOrgOCX)
if (this.report.dataCusOrgOCX.length > 0) {
this.report.dataCusOrgOCX.forEach(e => {
let rd = {

6
src/components/doctorCheck/RegisterCheckEdit.vue

@ -82,11 +82,11 @@ export default {
// },
//
"dataTransOpts.refresh.register_check_item.S":{
"dataTransOpts.refresh.register_check.S":{
immediate:true,
handler(newVal, oldVal) {
console.log(`watch dataTransOpts.refresh.register_check_item newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.registerCheckId}`);
this.getRegisterCheck(this.registerCheckId);
console.log(`watch 检查医生信息 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.register_check.id}`);
this.getRegisterCheck(this.dataTransOpts.tableS.register_check.id);
}
},
},

22
src/components/doctorCheck/RegisterCheckList.vue

@ -63,8 +63,9 @@ export default {
this.doctorCheck.RegisterCheckId = row.id
this.dataTransOpts.tableS.register_check.id = row.id
setTimeout(() => { //
this.dataTransOpts.refresh.register_check_item.S++
}, 100);
this.dataTransOpts.refresh.register_check.S++
this.dataTransOpts.refresh.register_check_item.M++
}, 10);
// this.doctorCheck.RegisterCheckEdit = row
},
@ -86,14 +87,18 @@ export default {
if(res.data.length > 0) {
this.doctorCheck.RegisterCheckId = res.data[0].id
this.dataTransOpts.tableS.register_check.id = res.data[0].id
setTimeout(() => { //
this.dataTransOpts.refresh.register_check_item.S++
}, 100);
// this.doctorCheck.RegisterCheckEdit = res.data[0]
this.$refs['doctorCheck_RegisterCheckList'].setCurrentRow(res.data[0])
}else{
this.dataTransOpts.tableS.register_check.id = ''
}
setTimeout(() => { //
this.dataTransOpts.refresh.register_check.S++ //
this.dataTransOpts.refresh.register_check_item.M++ //
}, 10);
}
})
.catch((err) => {
@ -105,15 +110,14 @@ export default {
},
//
watch: {
//
"dataTransOpts.refresh.register_check.S":{
"dataTransOpts.refresh.register_check.M":{
immediate:true,
handler(newVal, oldVal) {
console.log("watch doctorCheck.prBase.id newVal:", newVal, " oldVal:", oldVal);
this.registerCheckList(this.doctorCheck.prBase.id)
console.log(`watch 组合项目列表 newVal: ${newVal} oldVal: ${oldVal} patient_register.id: ${this.dataTransOpts.tableS.patient_register.id}`);
this.registerCheckList(this.dataTransOpts.tableS.patient_register.id)
}
},
}

Loading…
Cancel
Save