Commit 923a45b4 by nlp97

1、增加近30天有无离开上海

2、未出上海天数 名字改成 回上海天数
3、.发生异常时间放在核酸检测异常时间前面
4、.有无症状默认否
5、疫苗公司增加其他
6、既往史增加其他
7、增加有无CT检查
parent 5b9cc23f
......@@ -2,7 +2,7 @@
* @Author: ninglupeng
* @Date: 2022-03-19 10:27:33
* @LastEditors: ninglupeng
* @LastEditTime: 2022-03-20 11:43:03
* @LastEditTime: 2022-03-20 13:03:12
* @Description:
-->
<template>
......@@ -24,8 +24,8 @@
class="saveCanvas"
type="info"
size="mini"
@click="save()"
:disabled="isDis"
@click="save()"
>保存</van-button
>
<van-button
......@@ -64,9 +64,7 @@ export default {
data() {
return {
signaturePad: null, // 存放竖屏SignaturePad对象
isDis: false,
padBack:
"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZIAAAEwCAYAAACdVvcfAAAAAXNSR0IArs4c6QAACrdJREFUeF7t1bENAAAIwzD6/9MckdXsXSyk7BwBAgQIEAgCC1tTAgQIECBwQuIJCBAgQCAJCEniMyZAgAABIfEDBAgQIJAEhCTxGRMgQICAkPgBAgQIEEgCQpL4jAkQIEBASPwAAQIECCQBIUl8xgQIECAgJH6AAAECBJKAkCQ+YwIECBAQEj9AgAABAklASBKfMQECBAgIiR8gQIAAgSQgJInPmAABAgSExA8QIECAQBIQksRnTIAAAQJC4gcIECBAIAkISeIzJkCAAAEh8QMECBAgkASEJPEZEyBAgICQ+AECBAgQSAJCkviMCRAgQEBI/AABAgQIJAEhSXzGBAgQICAkfoAAAQIEkoCQJD5jAgQIEBASP0CAAAECSUBIEp8xAQIECAiJHyBAgACBJCAkic+YAAECBITEDxAgQIBAEhCSxGdMgAABAkLiBwgQIEAgCQhJ4jMmQIAAASHxAwQIECCQBIQk8RkTIECAgJD4AQIECBBIAkKS+IwJECBAQEj8AAECBAgkASFJfMYECBAgICR+gAABAgSSgJAkPmMCBAgQEBI/QIAAAQJJQEgSnzEBAgQICIkfIECAAIEkICSJz5gAAQIEhMQPECBAgEASEJLEZ0yAAAECQuIHCBAgQCAJCEniMyZAgAABIfEDBAgQIJAEhCTxGRMgQICAkPgBAgQIEEgCQpL4jAkQIEBASPwAAQIECCQBIUl8xgQIECAgJH6AAAECBJKAkCQ+YwIECBAQEj9AgAABAklASBKfMQECBAgIiR8gQIAAgSQgJInPmAABAgSExA8QIECAQBIQksRnTIAAAQJC4gcIECBAIAkISeIzJkCAAAEh8QMECBAgkASEJPEZEyBAgICQ+AECBAgQSAJCkviMCRAgQEBI/AABAgQIJAEhSXzGBAgQICAkfoAAAQIEkoCQJD5jAgQIEBASP0CAAAECSUBIEp8xAQIECAiJHyBAgACBJCAkic+YAAECBITEDxAgQIBAEhCSxGdMgAABAkLiBwgQIEAgCQhJ4jMmQIAAASHxAwQIECCQBIQk8RkTIECAgJD4AQIECBBIAkKS+IwJECBAQEj8AAECBAgkASFJfMYECBAgICR+gAABAgSSgJAkPmMCBAgQEBI/QIAAAQJJQEgSnzEBAgQICIkfIECAAIEkICSJz5gAAQIEhMQPECBAgEASEJLEZ0yAAAECQuIHCBAgQCAJCEniMyZAgAABIfEDBAgQIJAEhCTxGRMgQICAkPgBAgQIEEgCQpL4jAkQIEBASPwAAQIECCQBIUl8xgQIECAgJH6AAAECBJKAkCQ+YwIECBAQEj9AgAABAklASBKfMQECBAgIiR8gQIAAgSQgJInPmAABAgSExA8QIECAQBIQksRnTIAAAQJC4gcIECBAIAkISeIzJkCAAAEh8QMECBAgkASEJPEZEyBAgICQ+AECBAgQSAJCkviMCRAgQEBI/AABAgQIJAEhSXzGBAgQICAkfoAAAQIEkoCQJD5jAgQIEBASP0CAAAECSUBIEp8xAQIECAiJHyBAgACBJCAkic+YAAECBITEDxAgQIBAEhCSxGdMgAABAkLiBwgQIEAgCQhJ4jMmQIAAASHxAwQIECCQBIQk8RkTIECAgJD4AQIECBBIAkKS+IwJECBAQEj8AAECBAgkASFJfMYECBAgICR+gAABAgSSgJAkPmMCBAgQEBI/QIAAAQJJQEgSnzEBAgQICIkfIECAAIEkICSJz5gAAQIEhMQPECBAgEASEJLEZ0yAAAECQuIHCBAgQCAJCEniMyZAgAABIfEDBAgQIJAEhCTxGRMgQICAkPgBAgQIEEgCQpL4jAkQIEBASPwAAQIECCQBIUl8xgQIECAgJH6AAAECBJKAkCQ+YwIECBAQEj9AgAABAklASBKfMQECBAgIiR8gQIAAgSQgJInPmAABAgSExA8QIECAQBIQksRnTIAAAQJC4gcIECBAIAkISeIzJkCAAAEh8QMECBAgkASEJPEZEyBAgICQ+AECBAgQSAJCkviMCRAgQEBI/AABAgQIJAEhSXzGBAgQICAkfoAAAQIEkoCQJD5jAgQIEBASP0CAAAECSUBIEp8xAQIECAiJHyBAgACBJCAkic+YAAECBITEDxAgQIBAEhCSxGdMgAABAkLiBwgQIEAgCQhJ4jMmQIAAASHxAwQIECCQBIQk8RkTIECAgJD4AQIECBBIAkKS+IwJECBAQEj8AAECBAgkASFJfMYECBAgICR+gAABAgSSgJAkPmMCBAgQEBI/QIAAAQJJQEgSnzEBAgQICIkfIECAAIEkICSJz5gAAQIEhMQPECBAgEASEJLEZ0yAAAECQuIHCBAgQCAJCEniMyZAgAABIfEDBAgQIJAEhCTxGRMgQICAkPgBAgQIEEgCQpL4jAkQIEBASPwAAQIECCQBIUl8xgQIECAgJH6AAAECBJKAkCQ+YwIECBAQEj9AgAABAklASBKfMQECBAgIiR8gQIAAgSQgJInPmAABAgSExA8QIECAQBIQksRnTIAAAQJC4gcIECBAIAkISeIzJkCAAAEh8QMECBAgkASEJPEZEyBAgICQ+AECBAgQSAJCkviMCRAgQEBI/AABAgQIJAEhSXzGBAgQICAkfoAAAQIEkoCQJD5jAgQIEBASP0CAAAECSUBIEp8xAQIECAiJHyBAgACBJCAkic+YAAECBITEDxAgQIBAEhCSxGdMgAABAkLiBwgQIEAgCQhJ4jMmQIAAASHxAwQIECCQBIQk8RkTIECAgJD4AQIECBBIAkKS+IwJECBAQEj8AAECBAgkASFJfMYECBAgICR+gAABAgSSgJAkPmMCBAgQEBI/QIAAAQJJQEgSnzEBAgQICIkfIECAAIEkICSJz5gAAQIEhMQPECBAgEASEJLEZ0yAAAECQuIHCBAgQCAJCEniMyZAgAABIfEDBAgQIJAEhCTxGRMgQICAkPgBAgQIEEgCQpL4jAkQIEBASPwAAQIECCQBIUl8xgQIECAgJH6AAAECBJKAkCQ+YwIECBAQEj9AgAABAklASBKfMQECBAgIiR8gQIAAgSQgJInPmAABAgSExA8QIECAQBIQksRnTIAAAQJC4gcIECBAIAkISeIzJkCAAAEh8QMECBAgkASEJPEZEyBAgICQ+AECBAgQSAJCkviMCRAgQEBI/AABAgQIJAEhSXzGBAgQICAkfoAAAQIEkoCQJD5jAgQIEBASP0CAAAECSUBIEp8xAQIECAiJHyBAgACBJCAkic+YAAECBITEDxAgQIBAEhCSxGdMgAABAkLiBwgQIEAgCQhJ4jMmQIAAASHxAwQIECCQBIQk8RkTIECAgJD4AQIECBBIAkKS+IwJECBAQEj8AAECBAgkASFJfMYECBAgICR+gAABAgSSgJAkPmMCBAgQEBI/QIAAAQJJQEgSnzEBAgQICIkfIECAAIEkICSJz5gAAQIEhMQPECBAgEASEJLEZ0yAAAECQuIHCBAgQCAJCEniMyZAgAABIfEDBAgQIJAEhCTxGRMgQICAkPgBAgQIEEgCQpL4jAkQIEBASPwAAQIECCQBIUl8xgQIECAgJH6AAAECBJKAkCQ+YwIECBAQEj9AgAABAklASBKfMQECBAgIiR8gQIAAgSQgJInPmAABAgQe7Z8BMVu1kJAAAAAASUVORK5CYII=",
isDis: true,
};
},
mounted() {
......@@ -92,8 +90,10 @@ export default {
},
save() {
if (!this.signaturePad.isEmpty()) {
this.$emit("onCancel", this.signaturePad.toDataURL());
this.$notify({ type: "success", message: "签名保存成功" });
}
},
onCancel() {
this.$emit("onCancel");
......@@ -103,11 +103,11 @@ export default {
watch: {
signaturePad: {
handler: function() {
this.isDis =
this.signaturePad && this.signaturePad.toDataURL() != this.padBack
? false
: true;
if (this.signaturePad) {
this.isDis = this.signaturePad.isEmpty();
}
},
immediate: true,
deep: true,
},
},
......
/*
* @Author: ninglupeng
* @Date: 2022-03-20 15:10:37
* @LastEditors: ninglupeng
* @LastEditTime: 2022-03-20 15:14:06
* @Description:
*/
// thirtyDays:最近三十天
// othervaccines //其他疫苗
//otherPastHistory //其他既往史
//yesOrNoCt //有无CT
......@@ -2,7 +2,7 @@
* @Author: ninglupeng
* @Date: 2020-11-24 16:18:58
* @LastEditors: ninglupeng
* @LastEditTime: 2022-03-20 09:31:45
* @LastEditTime: 2022-03-20 17:30:58
* @Description:
-->
<template>
......@@ -156,6 +156,7 @@ export default {
"symptom", //患者症状
"covidVaccine", //接种针数
"vaccineType", //疫苗公司
"othervaccines", //其他疫苗文本
"vaccineDate", //最后一次接种日期
])
.then(() => {
......@@ -187,6 +188,7 @@ export default {
"previousHistory", //既往史
"tuberculosisDate", //既往史发生时间
"ChestCT", //有无CT
"otherPastHistory", //其他既往史
"ChestCTDate", //CT拍照时间
])
.then(() => {
......
......@@ -2,7 +2,7 @@
* @Author: ninglupeng
* @Date: 2020-11-24 16:18:58
* @LastEditors: ninglupeng
* @LastEditTime: 2022-03-20 11:49:19
* @LastEditTime: 2022-03-20 12:12:49
* @Description:
-->
<template>
......@@ -35,20 +35,27 @@
clearable
v-model="leaveSign"
name="leaveSign"
label=" 患者(或其家属、代理人)签字"
label="患者(其家属、代理人)签字"
placeholder="患者签字"
:rules="[{ required: true, message: '请患者签字' }]"
label-width="190px"
>
<template #input>
<img class="Signimg" v-show="leaveSign" :src="leaveSign" alt="" />
<img
class="Signimg"
:style="{ width: leaveSign ? '70%' : '' }"
v-show="leaveSign"
:src="leaveSign"
alt=""
/>
<van-button
size="small"
block
type="primary"
@click="showSignHandleVue = true"
native-type="button"
>{{ leaveSign ? "重新签字" : "点击签字" }}</van-button
:style="{ width: !leaveSign ? '100%' : '30%' }"
>{{ leaveSign ? "重签" : "点击签字" }}</van-button
>
</template></van-field
>
......
......@@ -2,7 +2,7 @@
* @Author: ninglupeng
* @Date: 2020-11-24 16:18:58
* @LastEditors: ninglupeng
* @LastEditTime: 2022-03-20 11:33:40
* @LastEditTime: 2022-03-20 12:15:21
* @Description:
-->
<template>
......@@ -80,6 +80,7 @@
v-show="agreementSign"
:src="agreementSign"
alt=""
:style="{ width: agreementSign ? '70%' : '' }"
/>
<van-button
size="small"
......@@ -87,7 +88,8 @@
block
type="primary"
native-type="button"
>{{ agreementSign ? "重新签字" : "点击签字" }}</van-button
:style="{ width: !agreementSign ? '50%' : '30%' }"
>{{ agreementSign ? "重签" : "点击签字" }}</van-button
>
</template>
</van-field>
......
......@@ -2,7 +2,7 @@
* @Author: ninglupeng
* @Date: 2020-11-24 16:18:58
* @LastEditors: ninglupeng
* @LastEditTime: 2022-03-20 11:12:12
* @LastEditTime: 2022-03-20 14:34:29
* @Description:
-->
<template>
......@@ -226,7 +226,7 @@ export default {
city: "", //籍贯 (市)
address: "", //地址
idCard: "", //身份证号
insurance: "", //商业保险
insurance: "", //商业保险
areaList, //地址数据选项列表
showArea: false, //控制地址弹窗
......
......@@ -2,7 +2,7 @@
* @Author: ninglupeng
* @Date: 2020-11-24 16:18:58
* @LastEditors: ninglupeng
* @LastEditTime: 2022-03-20 11:15:01
* @LastEditTime: 2022-03-20 17:27:50
* @Description:
-->
<template>
......@@ -11,7 +11,7 @@
colon
clearable
name="HasOnlineClass"
label-width="125px"
label-width="130px"
label="是否上网课"
>
<template #input>
......@@ -26,28 +26,54 @@
clearable
name="purpose"
label="来沪目的"
label-width="125px"
readonly
:value="purpose"
label-width="130px"
@click="showPurpose = true"
>
</van-field>
<van-popup v-model="showPurpose" position="bottom">
<van-picker
title="来沪目的"
show-toolbar
:columns="purposeList"
@confirm="onpurpose"
/>
</van-popup>
<!-- -->
<van-field
colon
clearable
name="thirtyDays"
label-width="130px"
label="近30天是否离开过上海"
>
<template #input>
<van-radio-group v-model="purpose">
<van-cell-group>
<van-cell :key="index" v-for="(item, index) in purposeList">
<van-radio :name="item"> {{ item }}</van-radio>
</van-cell>
</van-cell-group>
<van-radio-group v-model="thirtyDays" direction="horizontal">
<van-radio name="是"></van-radio>
<van-radio name="否"></van-radio>
</van-radio-group>
</template>
</van-field>
<van-field
v-if="thirtyDays == '是'"
colon
clearable
v-model="LeaveShangHai"
name="LeaveShangHai"
label="未出上海天数"
label-width="125px"
placeholder="多少天未出上海"
label="上海天数"
label-width="130px"
placeholder="回上海天数"
type="digit"
:rules="[{ required: true, message: '请填写多少天未出上海' }]"
:rules="[
{
required: thirtyDays == '是' ? true : false,
message: '请填写回上海天数',
},
]"
>
<template #extra></template></van-field
>
......@@ -57,23 +83,23 @@
clearable
readonly
clickable
name="unusualDate"
:value="unusualDate"
label="核酸检测异常时间"
label-width="125px"
placeholder="点击选择核酸检测异常时间"
@click="showUnusualDate = true"
:rules="[{ required: true, message: '请选择核酸检测异常时间' }]"
name="normalDate"
:value="normalDate"
label-width="130px"
label="未发生异常时间"
placeholder="点击选择未发生异常时间"
@click="showNormalDate = true"
:rules="[{ required: true, message: '请选择未发生异常时间' }]"
/>
<van-popup v-model="showUnusualDate" position="bottom">
<van-popup v-model="showNormalDate" position="bottom">
<van-datetime-picker
type="date"
v-model="unusualDate1"
:min-date="minUnusualDate"
v-model="normalDate1"
:min-date="minNormalDate"
:max-date="maxDate"
@confirm="onUnusualDate"
@cancel="showUnusualDate = false"
@confirm="onNormalDate"
@cancel="showNormalDate = false"
:formatter="formatter"
/>
</van-popup>
......@@ -83,33 +109,32 @@
clearable
readonly
clickable
name="normalDate"
:value="normalDate"
label-width="125px"
label="未发生异常时间"
placeholder="点击选择未发生异常时间"
@click="showNormalDate = true"
:rules="[{ required: true, message: '请选择未发生异常时间' }]"
name="unusualDate"
:value="unusualDate"
label="核酸检测异常时间"
label-width="130px"
placeholder="点击选择核酸检测异常时间"
@click="showUnusualDate = true"
:rules="[{ required: true, message: '请选择核酸检测异常时间' }]"
/>
<van-popup v-model="showNormalDate" position="bottom">
<van-popup v-model="showUnusualDate" position="bottom">
<van-datetime-picker
type="date"
v-model="normalDate1"
:min-date="minNormalDate"
v-model="unusualDate1"
:min-date="minUnusualDate"
:max-date="maxDate"
@confirm="onNormalDate"
@cancel="showNormalDate = false"
@confirm="onUnusualDate"
@cancel="showUnusualDate = false"
:formatter="formatter"
/>
</van-popup>
<van-field
colon
clearable
readonly
clickable
label-width="125px"
label-width="130px"
name="inHospitalDate"
:value="inHospitalDate"
label="120转运时间"
......@@ -134,7 +159,7 @@
colon
clearable
name="HasSymptom"
label-width="125px"
label-width="130px"
label="有无症状"
@click="HasSymptomChange"
>
......@@ -152,7 +177,7 @@
v-if="HasSymptom == '是'"
name="symptom"
label="症状"
label-width="125px"
label-width="130px"
:rules="[
{
required: HasSymptom == '是' ? true : false,
......@@ -178,7 +203,7 @@
colon
clearable
name="HasCOVIDVaccine"
label-width="125px"
label-width="130px"
label="是否接种过疫苗"
>
<template #input>
......@@ -196,7 +221,7 @@
name="covidVaccine"
label="接种针数"
placeholder="接种针数"
label-width="125px"
label-width="130px"
type="number"
:rules="[{ required: true, message: '请填写接种针数' }]"
></van-field>
......@@ -206,7 +231,7 @@
colon
clearable
name="vaccineType"
label-width="125px"
label-width="130px"
label="疫苗公司"
>
<template #input>
......@@ -220,6 +245,25 @@
</template>
</van-field>
<!-- -->
<van-field
colon
v-if="vaccineType == '其他'"
clearable
autosize
type="textarea"
v-model="othervaccines"
name="othervaccines"
label="其他疫苗"
placeholder="其他疫苗"
:rules="[
{
required: vaccineType == '其他' ? true : false,
message: '请填写其他疫苗',
},
]"
></van-field>
<van-field
v-if="covidVaccine > 0"
colon
......@@ -229,7 +273,7 @@
name="vaccineDate"
:value="vaccineDate"
label="最后一次接种日期"
label-width="125px"
label-width="130px"
placeholder="点击选择最后一次接种日期"
@click="showVaccineDate = true"
:rules="[
......@@ -265,16 +309,18 @@ export default {
return {
HasOnlineClass: "否", //是否上网课
purpose: "学习", // 来沪目的
LeaveShangHai: "", //多少天未出上海
thirtyDays: "是", //近三十天内无离开上海
LeaveShangHai: "", //回上海天数
unusualDate: "", //核酸检测异常时间
normalDate: "", //未发生异常时间
inHospitalDate: "", //120转运时间
HasSymptom: "", //有无症状
HasSymptom: "", //有无症状
symptom: [], //患者症状
HasCOVIDVaccine: "是",
covidVaccine: 0, //接种针数
vaccineType: "", //疫苗公司
othervaccines: "", //其他疫苗
vaccineDate: "", //最后一次接种日期
vaccineTypeList: [],
symptomList: [],
......@@ -289,6 +335,8 @@ export default {
minVaccineDate: new Date(2020, 0, 1),
maxDate: new Date(),
showPurpose: false,
/**时间弹窗默认时间 */
unusualDate1: new Date(), //核酸检测异常时间
normalDate1: new Date(), //未发生异常时间
......@@ -309,6 +357,11 @@ export default {
this.vaccineDate = formatDate(new Date(), "yyyy-MM-dd"); //最后一次接种日期
},
onpurpose(value, index) {
this.purpose = value;
this.showPurpose = false;
},
getResource() {
this.setLoading(true);
this.$http.get(`/Research/Resource`, {}).then((data) => {
......
......@@ -2,7 +2,7 @@
* @Author: ninglupeng
* @Date: 2020-11-24 16:18:58
* @LastEditors: ninglupeng
* @LastEditTime: 2022-03-20 11:15:47
* @LastEditTime: 2022-03-20 17:33:24
* @Description:
-->
<template>
......@@ -114,6 +114,24 @@
<van-field
colon
v-if="previousHistory.includes('其他')"
clearable
autosize
type="textarea"
v-model="otherPastHistory"
name="otherPastHistory"
label="其他既往史"
placeholder="其他既往史"
:rules="[
{
required: previousHistory.includes('其他') ? true : false,
message: '请填写其他既往史',
},
]"
></van-field>
<van-field
colon
clearable
readonly
clickable
......@@ -149,6 +167,22 @@
<van-field
colon
clearable
name="yesOrNoCt"
label-width="125px"
label="有无CT检查"
>
<template #input>
<van-radio-group v-model="yesOrNoCt" direction="horizontal">
<van-radio name="有"></van-radio>
<van-radio name="无"></van-radio>
</van-radio-group>
</template>
</van-field>
<van-field
v-if="yesOrNoCt == '有'"
colon
clearable
name="ChestCT"
label-width="125px"
label="有无新冠肺炎CT"
......@@ -209,7 +243,9 @@ export default {
HasPreviousHistory: "无", //有无既往史
previousHistory: [], //既往史
otherPastHistory: "", //其他既往史
tuberculosisDate: "", //既往史发生时间
yesOrNoCt: "无",
ChestCT: "无", //有无CT
ChestCTDate: "", //CT拍照时间
......
......@@ -2,7 +2,7 @@
* @Author: ninglupeng
* @Date: 2022-03-17 15:06:50
* @LastEditors: ninglupeng
* @LastEditTime: 2022-03-20 11:21:18
* @LastEditTime: 2022-03-20 15:38:30
* @Description:
*/
import http from '@/http/index'
......
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