Skip to content

F
frontend-h5
Commit ebc260cb authored by 芮自成's avatar 芮自成
Browse files
Options

Merge branch 'chronic-dev' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-dev

parents edca7605 eb6af79b
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 10 deletions
public/index.html
View file @ ebc260cb
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<link rel='icon' href='<%= BASE_URL %>favicon.ico'> <link rel='icon' href='<%= BASE_URL %>favicon.ico'>
<title><%= htmlWebpackPlugin.options.title %></title> <title><%= htmlWebpackPlugin.options.title %></title>
<!-- 3.3.4/vconsole.min.js --> <!-- 3.3.4/vconsole.min.js -->
<!-- <script src='https://beta-copd-img.yiboshi.com/20241106/1730860078278931285.js'></script>--> <script src='https://beta-copd-img.yiboshi.com/20241106/1730860078278931285.js'></script>
</head> </head>
<body> <body>
<noscript> <noscript>
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
</body> </body>
<script> <script>
// var vConsole =new VConsole(); var vConsole =new VConsole();
// console.log('Hello world');
</script> </script>
</html> </html>
src/doctor/diagnose/form/DiagnoseForm.vue
View file @ ebc260cb
...@@ -81,6 +81,14 @@ export default { ...@@ -81,6 +81,14 @@ export default {
return excludeType && excludeType.split(',').map(e => Number(e)) return excludeType && excludeType.split(',').map(e => Number(e))
} }
}, },
// 路由守卫
beforeRouteLeave(to, from) {
if ([2, 3].includes(this.step)) {
this.onBack()
return false
}
return true
},
created() { created() {
this.init() this.init()
}, },
...@@ -128,6 +136,7 @@ export default { ...@@ -128,6 +136,7 @@ export default {
this.store.onRefreshMark() this.store.onRefreshMark()
showSuccessToast('提交成功') showSuccessToast('提交成功')
setTimeout(() => { setTimeout(() => {
this.step++
this.$router.replace({ this.$router.replace({
path: '/doctor/workbench' path: '/doctor/workbench'
}) })
......
src/doctor/diagnose/form/FormCont.vue
View file @ ebc260cb
...@@ -368,7 +368,7 @@ export default { ...@@ -368,7 +368,7 @@ export default {
}, },
async submit() { async submit() {
try { try {
this.$refs.form.validate() await this.$refs.form.validate()
if (this.form.diseaseType === 4) { if (this.form.diseaseType === 4) {
const diagnoseResult = this.form.diagnoseResult || [] const diagnoseResult = this.form.diagnoseResult || []
if (!diagnoseResult.length && !this.form.diagnoseLevel) { if (!diagnoseResult.length && !this.form.diagnoseLevel) {
......
src/doctor/followUp/generalFU/form/GeneralFUForm.vue
View file @ ebc260cb
...@@ -144,7 +144,6 @@ ...@@ -144,7 +144,6 @@
<DocImageUpload <DocImageUpload
description='支持上传jpg、png、jpeg文件，大小请在10M以内' description='支持上传jpg、png、jpeg文件，大小请在10M以内'
lengthMessage='抱歉，最多可上传6个文件。' lengthMessage='抱歉，最多可上传6个文件。'
:imageData='[]'
@change='(ids, option) => form.uploadVisitRecord = ids' @change='(ids, option) => form.uploadVisitRecord = ids'
:maxLength='6' :maxLength='6'
class='mt-2' class='mt-2'
...@@ -156,7 +155,6 @@ ...@@ -156,7 +155,6 @@
<DocImageUpload <DocImageUpload
description='支持上传jpg、png、jpeg文件，大小请在10M以内' description='支持上传jpg、png、jpeg文件，大小请在10M以内'
lengthMessage='抱歉，最多可上传6个文件。' lengthMessage='抱歉，最多可上传6个文件。'
:imageData='[]'
@change='(ids, option) => form.sceneVisitImage = ids' @change='(ids, option) => form.sceneVisitImage = ids'
:maxLength='6' :maxLength='6'
class='mt-2' class='mt-2'
...@@ -368,6 +366,7 @@ export default { ...@@ -368,6 +366,7 @@ export default {
this.form.screenTime = dayjs(selectedValues).format('YYYY-MM-DD HH:00:00') this.form.screenTime = dayjs(selectedValues).format('YYYY-MM-DD HH:00:00')
this.startTime = dayjs(selectedValues).format('YYYY-MM-DD HH:00:00') this.startTime = dayjs(selectedValues).format('YYYY-MM-DD HH:00:00')
this.showTime1 = false this.showTime1 = false
console.log(this.form)
}, },
toShowTem(val) { toShowTem(val) {
this.citeInfo = val this.citeInfo = val
......
src/doctor/followUp/generalFU/form/GuideTextVideo.vue
View file @ ebc260cb
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</van-popup> </van-popup>
</div> </div>
<div v-if='form.contentSelectName' class='mt-2'> <div class='mt-2'>
<van-button type='primary' plain class='w-full' @click='choiceTel' size='small'>选择内容</van-button> <van-button type='primary' plain class='w-full' @click='choiceTel' size='small'>选择内容</van-button>
</div> </div>
......
src/doctor/followUp/generalFU/form/Index.vue
View file @ ebc260cb
...@@ -59,6 +59,7 @@ import { ...@@ -59,6 +59,7 @@ import {
import GeneralFUForm from '@/doctor/followUp/generalFU/form/GeneralFUForm' import GeneralFUForm from '@/doctor/followUp/generalFU/form/GeneralFUForm'
import CommonBottom from '@/doctor/followUp/generalFU/form/CommonBottom' import CommonBottom from '@/doctor/followUp/generalFU/form/CommonBottom'
import { useStore } from '@/doctor/store' import { useStore } from '@/doctor/store'
const getModeEnum = (patientInfo = {}) => { const getModeEnum = (patientInfo = {}) => {
return { return {
mode1: [ mode1: [
...@@ -166,7 +167,7 @@ export default { ...@@ -166,7 +167,7 @@ export default {
} }
} else { } else {
const res = await getChronicResidentsId(this.routerDetail.residentInfoId) const res = await getChronicResidentsId(this.routerDetail.residentInfoId)
const weixinInfo = await getResidentWX({residentInfoId: this.routerDetail.residentInfoId}) const weixinInfo = await getResidentWX({ residentInfoId: this.routerDetail.residentInfoId })
const { const {
id, id,
createDate, createDate,
......
src/doctor/patientDetail/components/screening/Visit.vue
View file @ ebc260cb
...@@ -108,7 +108,7 @@ export default { ...@@ -108,7 +108,7 @@ export default {
getHighVisitList(query, loading).then(res => { getHighVisitList(query, loading).then(res => {
if (this.pagination.pageIndex === 1) { if (this.pagination.pageIndex === 1) {
this.list = [] this.list = []
} }
this.list = this.list.concat(res.data.dataList || []) this.list = this.list.concat(res.data.dataList || [])
this.pagination.total = res.data.total || 0 this.pagination.total = res.data.total || 0
this.finished = this.list.length >= this.pagination.total this.finished = this.list.length >= this.pagination.total
......
src/doctor/screening/first/FirstForm.vue
View file @ ebc260cb
...@@ -63,6 +63,22 @@ export default { ...@@ -63,6 +63,22 @@ 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()
}, },
......
src/utils/common.js
View file @ ebc260cb
...@@ -227,7 +227,7 @@ export function callMobile(handlerInterface, parameters) { ...@@ -227,7 +227,7 @@ export function callMobile(handlerInterface, parameters) {
} }
} }
// 判断ios还是安卓 // 判断是否是ios
export function isIOSWebKit() { export function isIOSWebKit() {
const aa = window.navigator.userAgent; const aa = window.navigator.userAgent;
if (!!aa.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) {// ios端 if (!!aa.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) {// ios端
......
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