Commit 6582546f authored by gengchunlei's avatar gengchunlei

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

 Conflicts:
	src/doctor/Doctor.vue
parents c77818b1 5f5ef24d
...@@ -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 = 'b66471d5-66bd-431f-a573-f9422ec43809' token = '84bab73a-332a-4c01-bde2-723007ba0873'
} }
} }
if (token) { if (token) {
......
...@@ -772,6 +772,24 @@ export default { ...@@ -772,6 +772,24 @@ export default {
}) })
}) })
} }
},
watch: {
timeCycle(val) {
let today = new Date()
if (val === 1) {
today.setDate(today.getDate() + 7)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
} else if (val === 2) {
today.setMonth(today.getMonth() + 1)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
} else if (val === 3) {
today.setMonth(today.getMonth() + 3)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
}
}
} }
} }
</script> </script>
......
...@@ -771,6 +771,22 @@ ...@@ -771,6 +771,22 @@
/> />
<!-- 下次随访日期 --> <!-- 下次随访日期 -->
<div class="label-title mt-2" required>下次随访日期</div> <div class="label-title mt-2" required>下次随访日期</div>
<!-- 快捷选项 -->
<van-radio-group
v-model="timeCycle"
shape="dot"
direction="horizontal"
class="w-full doc-radio-group mb-2"
>
<van-radio
v-for="item in timeCycleList"
:key="item.value"
:name="item.value"
label-position="left"
>
{{ item.name }}
</van-radio>
</van-radio-group>
<van-field <van-field
v-model="form.nextVisitDate" v-model="form.nextVisitDate"
isLink isLink
...@@ -1233,7 +1249,13 @@ export default { ...@@ -1233,7 +1249,13 @@ export default {
}, },
showVisitUnit: false, showVisitUnit: false,
showVisitOffice: false, showVisitOffice: false,
showVisitDoctor: false showVisitDoctor: false,
timeCycle: undefined,
timeCycleList: [
{ value: 1, name: '一周后' },
{ value: 2, name: '一月后' },
{ value: 3, name: '三月后' }
]
} }
}, },
computed: { computed: {
...@@ -1492,6 +1514,22 @@ export default { ...@@ -1492,6 +1514,22 @@ export default {
this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight) this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight)
} }
}, },
timeCycle(val) {
let today = new Date()
if (val === 1) {
today.setDate(today.getDate() + 7)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
} else if (val === 2) {
today.setMonth(today.getMonth() + 1)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
} else if (val === 3) {
today.setMonth(today.getMonth() + 3)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
}
}
} }
} }
</script> </script>
......
...@@ -1128,6 +1128,22 @@ ...@@ -1128,6 +1128,22 @@
/> />
<!-- 下次随访日期 --> <!-- 下次随访日期 -->
<div class="label-title mt-2" required>下次随访日期</div> <div class="label-title mt-2" required>下次随访日期</div>
<!-- 快捷选项 -->
<van-radio-group
v-model="timeCycle"
shape="dot"
direction="horizontal"
class="w-full doc-radio-group mb-2"
>
<van-radio
v-for="item in timeCycleList"
:key="item.value"
:name="item.value"
label-position="left"
>
{{ item.name }}
</van-radio>
</van-radio-group>
<van-field <van-field
v-model="form.nextVisitDate" v-model="form.nextVisitDate"
isLink isLink
...@@ -1584,7 +1600,13 @@ export default { ...@@ -1584,7 +1600,13 @@ export default {
}, },
showVisitUnit: false, showVisitUnit: false,
showVisitOffice: false, showVisitOffice: false,
showVisitDoctor: false showVisitDoctor: false,
timeCycle: undefined,
timeCycleList: [
{ value: 1, name: '一周后' },
{ value: 2, name: '一月后' },
{ value: 3, name: '三月后' }
]
} }
}, },
computed: { computed: {
...@@ -1865,6 +1887,22 @@ export default { ...@@ -1865,6 +1887,22 @@ export default {
this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight) this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight)
} }
}, },
timeCycle(val) {
let today = new Date()
if (val === 1) {
today.setDate(today.getDate() + 7)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
} else if (val === 2) {
today.setMonth(today.getMonth() + 1)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
} else if (val === 3) {
today.setMonth(today.getMonth() + 3)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
}
}
} }
} }
</script> </script>
......
...@@ -775,6 +775,22 @@ ...@@ -775,6 +775,22 @@
/> />
<!-- 下次随访日期 --> <!-- 下次随访日期 -->
<div class="label-title mt-2" required>下次随访日期</div> <div class="label-title mt-2" required>下次随访日期</div>
<!-- 快捷选项 -->
<van-radio-group
v-model="timeCycle"
shape="dot"
direction="horizontal"
class="w-full doc-radio-group mb-2"
>
<van-radio
v-for="item in timeCycleList"
:key="item.value"
:name="item.value"
label-position="left"
>
{{ item.name }}
</van-radio>
</van-radio-group>
<van-field <van-field
v-model="form.nextVisitDate" v-model="form.nextVisitDate"
isLink isLink
...@@ -1235,7 +1251,13 @@ export default { ...@@ -1235,7 +1251,13 @@ export default {
}, },
showVisitUnit: false, showVisitUnit: false,
showVisitOffice: false, showVisitOffice: false,
showVisitDoctor: false showVisitDoctor: false,
timeCycle: undefined,
timeCycleList: [
{ value: 1, name: '一周后' },
{ value: 2, name: '一月后' },
{ value: 3, name: '三月后' }
]
} }
}, },
computed: { computed: {
...@@ -1493,6 +1515,22 @@ export default { ...@@ -1493,6 +1515,22 @@ export default {
this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight) this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight)
} }
}, },
timeCycle(val) {
let today = new Date()
if (val === 1) {
today.setDate(today.getDate() + 7)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
} else if (val === 2) {
today.setMonth(today.getMonth() + 1)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
} else if (val === 3) {
today.setMonth(today.getMonth() + 3)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
}
}
} }
} }
</script> </script>
......
...@@ -952,6 +952,22 @@ ...@@ -952,6 +952,22 @@
/> />
<!-- 下次随访日期 --> <!-- 下次随访日期 -->
<div class="label-title mt-2" required>下次随访日期</div> <div class="label-title mt-2" required>下次随访日期</div>
<!-- 快捷选项 -->
<van-radio-group
v-model="timeCycle"
shape="dot"
direction="horizontal"
class="w-full doc-radio-group mb-2"
>
<van-radio
v-for="item in timeCycleList"
:key="item.value"
:name="item.value"
label-position="left"
>
{{ item.name }}
</van-radio>
</van-radio-group>
<van-field <van-field
v-model="form.nextVisitDate" v-model="form.nextVisitDate"
isLink isLink
...@@ -1512,6 +1528,12 @@ export default { ...@@ -1512,6 +1528,12 @@ export default {
showVisitDoctor: false, showVisitDoctor: false,
showInsulinType: false, showInsulinType: false,
// insulinDosage: [] // insulinDosage: []
timeCycle: undefined,
timeCycleList: [
{ value: 1, name: '一周后' },
{ value: 2, name: '一月后' },
{ value: 3, name: '三月后' }
]
} }
}, },
computed: { computed: {
...@@ -1784,6 +1806,22 @@ export default { ...@@ -1784,6 +1806,22 @@ export default {
this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight) this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight)
} }
}, },
timeCycle(val) {
let today = new Date()
if (val === 1) {
today.setDate(today.getDate() + 7)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
} else if (val === 2) {
today.setMonth(today.getMonth() + 1)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
} else if (val === 3) {
today.setMonth(today.getMonth() + 3)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
}
}
} }
} }
</script> </script>
......
...@@ -774,6 +774,22 @@ ...@@ -774,6 +774,22 @@
/> />
<!-- 下次随访日期 --> <!-- 下次随访日期 -->
<div class="label-title mt-2" required>下次随访日期</div> <div class="label-title mt-2" required>下次随访日期</div>
<!-- 快捷选项 -->
<van-radio-group
v-model="timeCycle"
shape="dot"
direction="horizontal"
class="w-full doc-radio-group mb-2"
>
<van-radio
v-for="item in timeCycleList"
:key="item.value"
:name="item.value"
label-position="left"
>
{{ item.name }}
</van-radio>
</van-radio-group>
<van-field <van-field
v-model="form.nextVisitDate" v-model="form.nextVisitDate"
isLink isLink
...@@ -1233,7 +1249,13 @@ export default { ...@@ -1233,7 +1249,13 @@ export default {
}, },
showVisitUnit: false, showVisitUnit: false,
showVisitOffice: false, showVisitOffice: false,
showVisitDoctor: false showVisitDoctor: false,
timeCycle: undefined,
timeCycleList: [
{ value: 1, name: '一周后' },
{ value: 2, name: '一月后' },
{ value: 3, name: '三月后' }
]
} }
}, },
computed: { computed: {
...@@ -1489,6 +1511,22 @@ export default { ...@@ -1489,6 +1511,22 @@ export default {
this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight) this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight)
} }
}, },
timeCycle(val) {
let today = new Date()
if (val === 1) {
today.setDate(today.getDate() + 7)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
} else if (val === 2) {
today.setMonth(today.getMonth() + 1)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
} else if (val === 3) {
today.setMonth(today.getMonth() + 3)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
}
}
} }
} }
</script> </script>
......
...@@ -837,6 +837,22 @@ ...@@ -837,6 +837,22 @@
/> />
<!-- 下次随访日期 --> <!-- 下次随访日期 -->
<div class="label-title mt-2" required>下次随访日期</div> <div class="label-title mt-2" required>下次随访日期</div>
<!-- 快捷选项 -->
<van-radio-group
v-model="timeCycle"
shape="dot"
direction="horizontal"
class="w-full doc-radio-group mb-2"
>
<van-radio
v-for="item in timeCycleList"
:key="item.value"
:name="item.value"
label-position="left"
>
{{ item.name }}
</van-radio>
</van-radio-group>
<van-field <van-field
v-model="form.nextVisitDate" v-model="form.nextVisitDate"
isLink isLink
...@@ -1341,7 +1357,13 @@ export default { ...@@ -1341,7 +1357,13 @@ export default {
}, },
showVisitUnit: false, showVisitUnit: false,
showVisitOffice: false, showVisitOffice: false,
showVisitDoctor: false showVisitDoctor: false,
timeCycle: undefined,
timeCycleList: [
{ value: 1, name: '一周后' },
{ value: 2, name: '一月后' },
{ value: 3, name: '三月后' }
]
} }
}, },
computed: { computed: {
...@@ -1619,6 +1641,22 @@ export default { ...@@ -1619,6 +1641,22 @@ export default {
this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight) this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight)
} }
}, },
timeCycle(val) {
let today = new Date()
if (val === 1) {
today.setDate(today.getDate() + 7)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
} else if (val === 2) {
today.setMonth(today.getMonth() + 1)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
} else if (val === 3) {
today.setMonth(today.getMonth() + 3)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
}
}
} }
} }
</script> </script>
......
...@@ -774,6 +774,22 @@ ...@@ -774,6 +774,22 @@
/> />
<!-- 下次随访日期 --> <!-- 下次随访日期 -->
<div class="label-title mt-2" required>下次随访日期</div> <div class="label-title mt-2" required>下次随访日期</div>
<!-- 快捷选项 -->
<van-radio-group
v-model="timeCycle"
shape="dot"
direction="horizontal"
class="w-full doc-radio-group mb-2"
>
<van-radio
v-for="item in timeCycleList"
:key="item.value"
:name="item.value"
label-position="left"
>
{{ item.name }}
</van-radio>
</van-radio-group>
<van-field <van-field
v-model="form.nextVisitDate" v-model="form.nextVisitDate"
isLink isLink
...@@ -1233,7 +1249,13 @@ export default { ...@@ -1233,7 +1249,13 @@ export default {
}, },
showVisitUnit: false, showVisitUnit: false,
showVisitOffice: false, showVisitOffice: false,
showVisitDoctor: false showVisitDoctor: false,
timeCycle: undefined,
timeCycleList: [
{ value: 1, name: '一周后' },
{ value: 2, name: '一月后' },
{ value: 3, name: '三月后' }
]
} }
}, },
computed: { computed: {
...@@ -1491,6 +1513,22 @@ export default { ...@@ -1491,6 +1513,22 @@ export default {
this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight) this.form.signBmi = this.calculateBMI(this.form.signHeight, this.form.signWeight)
} }
}, },
timeCycle(val) {
let today = new Date()
if (val === 1) {
today.setDate(today.getDate() + 7)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
} else if (val === 2) {
today.setMonth(today.getMonth() + 1)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
} else if (val === 3) {
today.setMonth(today.getMonth() + 3)
this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
this.form._nextVisitDate = this.form.nextVisitDate.split('-')
}
}
} }
} }
</script> </script>
......
...@@ -35,11 +35,12 @@ ...@@ -35,11 +35,12 @@
<div v-if="item.serveType === 3 || item.serveType === 4"> <div v-if="item.serveType === 3 || item.serveType === 4">
<span class="label">评估结果</span> <span class="label">评估结果</span>
<span v-if="item.evaluationResults === 1" style="color: #D9001B">{{ item.evaluationResultsName }}</span> <span v-if="item.evaluationResults === 1" style="color: #D9001B">{{ item.evaluationResultsName }}</span>
<span v-if="item.evaluationResults === 2" style="color: #F59A23">{{ item.evaluationResultsName }}</span> <span v-else-if="item.evaluationResults === 2" style="color: #F59A23">{{ item.evaluationResultsName }}</span>
<span v-if="item.evaluationResults === 3" style="color: #70B603">{{ item.evaluationResultsName }}</span> <span v-else-if="item.evaluationResults === 3" style="color: #70B603">{{ item.evaluationResultsName }}</span>
<span v-else>-</span>
</div> </div>
<div v-if='item.bloodPressure'> <div v-if='item.bloodPressure'>
<span class='label'>血压</span> <span class='label'>{{ columnTitle }}</span>
<span>{{ item.bloodPressure || '-' }}</span> <span>{{ item.bloodPressure || '-' }}</span>
</div> </div>
<div> <div>
...@@ -149,6 +150,17 @@ export default { ...@@ -149,6 +150,17 @@ export default {
}, },
authInfo() { authInfo() {
return this.store.authInfo return this.store.authInfo
},
columnTitle() {
if (this.diseaseType === 2) {
return `空腹静脉血糖`
} else if (this.diseaseType === 5) {
return `FEV1`
} else if (this.diseaseType === 6) {
return `水肿`
} else {
return `血压`
}
} }
}, },
created() { created() {
......
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