Commit c77818b1 authored by gengchunlei's avatar gengchunlei

医生端 v1.0.4 1、慢特病随访bug修复

parent 18fd1499
...@@ -66,7 +66,7 @@ export default { ...@@ -66,7 +66,7 @@ export default {
if (!token) { if (!token) {
token = sessionStorage.getItem('token') token = sessionStorage.getItem('token')
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
token = '6b4cc93f-85a0-4c0c-b47c-db0411952ddd' token = 'b66471d5-66bd-431f-a573-f9422ec43809'
} }
} }
if (token) { if (token) {
......
...@@ -146,7 +146,10 @@ export default { ...@@ -146,7 +146,10 @@ export default {
{ title: '现住址', key: 'presentCodeName' }, { title: '现住址', key: 'presentCodeName' },
{ title: '详细地址', key: 'nowAddress' }, { title: '详细地址', key: 'nowAddress' },
{ title: '户籍地址', key: 'registeredCodeName' }, { title: '户籍地址', key: 'registeredCodeName' },
{ title: '详细地址', key: 'permanentAddress' } { title: '详细地址', key: 'permanentAddress' },
{ title: '联系人姓名', key: 'contactName' },
{ title: '与居民关系', key: 'relationName' },
{ title: '联系电话', key: 'contactPhone' },
], ],
columnsOrg: [ columnsOrg: [
{ title: '随访单位', key: 'visitUnitName' }, { title: '随访单位', key: 'visitUnitName' },
......
...@@ -339,6 +339,15 @@ export default { ...@@ -339,6 +339,15 @@ export default {
await this.$refs.form.validate() await this.$refs.form.validate()
let drugName = '' let drugName = ''
let list = [] let list = []
if(this.form.isMedication == 2) {
this.form.isPurchaseMedicineAbroad = ''
this.form.waysPurchasingMedicine = ''
this.form.drugList = []
}
if (this.form.isPurchaseMedicineAbroad == 2) {
this.form.waysPurchasingMedicine = ''
this.form.drugList = []
}
if (this.form.isMedication == 1 && this.form.isPurchaseMedicineAbroad == 1) { if (this.form.isMedication == 1 && this.form.isPurchaseMedicineAbroad == 1) {
this.form.drugList.forEach(item => { this.form.drugList.forEach(item => {
list.push(item.diseaseName) list.push(item.diseaseName)
...@@ -420,7 +429,7 @@ export default { ...@@ -420,7 +429,7 @@ export default {
} }
}, },
onDel(index) { onDel(item, index) {
this.form.drugList.splice(index, 1) this.form.drugList.splice(index, 1)
}, },
......
...@@ -58,22 +58,6 @@ export default { ...@@ -58,22 +58,6 @@ export default {
return this.$route.query.idCard return this.$route.query.idCard
}, },
}, },
// 路由守卫
beforeRouteLeave(to, from) {
// showConfirmDialog({
// message: '已填写的表单不会保存,确定要离开吗?'})
// .then(() => {
// next()
// })
// .catch(() => {
// next(false)
// })
if (this.step === 2) {
this.onBack()
return false
}
return true
},
created() { created() {
this.init() this.init()
}, },
...@@ -112,15 +96,18 @@ export default { ...@@ -112,15 +96,18 @@ export default {
const query = fetchDataHandle(res, { const query = fetchDataHandle(res, {
}) })
query.residentsRecord = this.baseInfo query.residentsRecord = this.baseInfo
console.log(JSON.stringify(query))
const func = query.id ? updateSlowSpecial : addSlowSpecial const func = query.id ? updateSlowSpecial : addSlowSpecial
func(query).then(res => { func(query).then(({ code }) => {
this.$router.replace({ if (code == 'SUCCESS') {
path: '/doctor/patient-detail', this.store.onRefreshMark()
query: { this.$router.replace({
residentInfoId: this.residentInfoId path: '/doctor/patient-detail',
} query: {
}) residentInfoId: this.residentInfoId
this.store.onRefreshMark() }
})
}
}) })
}) })
} else { } else {
......
...@@ -153,7 +153,6 @@ export default { ...@@ -153,7 +153,6 @@ export default {
{ name: '新增死亡记录', value: 5, path: '/doctor/deathRecord/add' }, { name: '新增死亡记录', value: 5, path: '/doctor/deathRecord/add' },
// { name: '新增死亡记录详情', value: 6, path: '/doctor/deathRecord/detail' }, // { name: '新增死亡记录详情', value: 6, path: '/doctor/deathRecord/detail' },
{ name: '新增专病随访', value: 7, path: '/doctor/followUp/separateFU/add' }, { name: '新增专病随访', value: 7, path: '/doctor/followUp/separateFU/add' },
{ name: '新增慢特病随访', value: 8, path: '/doctor/followUp/slowSpecialFU/add' }
] ]
} }
}, },
...@@ -217,6 +216,34 @@ export default { ...@@ -217,6 +216,34 @@ export default {
} }
queryResidentInfo({ residentInfoId: this.residentInfoId }).then(res => { queryResidentInfo({ residentInfoId: this.residentInfoId }).then(res => {
this.residentInfo = res.data || {} this.residentInfo = res.data || {}
//是否办理慢特病
if (this.residentInfo.chronicDiseases == 1) {
this.addOptions = [
{ name: '新增主要慢病高危筛查', value: 1, path: '/doctor/screening/firstForm' },
{ name: '新增专病高危筛查', value: 2, path: '/doctor/screening/secondForm' },
{ name: '新增主要慢病高危随访', value: 8, path: '/doctor/screening/highVisit/firstForm' },
{ name: '新增专病高危随访', value: 9, path: '/doctor/screening/highVisit/secondForm' },
{ name: '新增慢病诊断', value: 3, path: '/doctor/diagnose/form' },
{ name: '新增通用随访', value: 4, path: '/doctor/followUp/generalFU/add' },
{ name: '新增死亡记录', value: 5, path: '/doctor/deathRecord/add' },
// { name: '新增死亡记录详情', value: 6, path: '/doctor/deathRecord/detail' },
{ name: '新增专病随访', value: 7, path: '/doctor/followUp/separateFU/add' },
{ name: '新增慢特病随访', value: 8, path: '/doctor/followUp/slowSpecialFU/add' }
]
} else {
this.addOptions = [
{ name: '新增主要慢病高危筛查', value: 1, path: '/doctor/screening/firstForm' },
{ name: '新增专病高危筛查', value: 2, path: '/doctor/screening/secondForm' },
{ name: '新增主要慢病高危随访', value: 8, path: '/doctor/screening/highVisit/firstForm' },
{ name: '新增专病高危随访', value: 9, path: '/doctor/screening/highVisit/secondForm' },
{ name: '新增慢病诊断', value: 3, path: '/doctor/diagnose/form' },
{ name: '新增通用随访', value: 4, path: '/doctor/followUp/generalFU/add' },
{ name: '新增死亡记录', value: 5, path: '/doctor/deathRecord/add' },
// { name: '新增死亡记录详情', value: 6, path: '/doctor/deathRecord/detail' },
{ name: '新增专病随访', value: 7, path: '/doctor/followUp/separateFU/add' },
]
}
if (!this.activeTabItem.value) { if (!this.activeTabItem.value) {
this.activeTab = 0 this.activeTab = 0
} }
...@@ -225,6 +252,7 @@ export default { ...@@ -225,6 +252,7 @@ export default {
} else { } else {
this.showDeath = false this.showDeath = false
} }
}) })
}, },
//获取死亡信息 //获取死亡信息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment