Commit 04d82291 by wangshuangqing

修改样式冲突

parent 2073e343
......@@ -2,7 +2,7 @@
* @Author: ninglupeng
* @Date: 2020-11-24 16:18:58
* @LastEditors: wsq
* @LastEditTime: 2022-04-16 15:28:22
* @LastEditTime: 2022-04-20 16:42:20
* @Description:
-->
<template>
......@@ -22,7 +22,7 @@
<!-- <leaveHospital v-show="page === 7"></leaveHospital> -->
<page7 v-show="page === 7"></page7>
<!-- {{ symptom }} -->
<div class="index_form_footer" v-if="page != 1 && page != 2 && page != 8">
<div class="index_form_footer" v-if="page != 1 && page != 2 && page !=7">
<van-button
class="index_form_footer_next"
round
......@@ -150,6 +150,9 @@ export default {
"address",
"idCard",
"typeOfMedicalInsurance", //医保类型
"HasSymptom", //是否有症状
"otherSymptom", //其他症状
"otherOccupation",//其他职业
])
.then(() => {
this.$store.dispatch("user/setpage", 5);
......@@ -172,16 +175,21 @@ export default {
// vaccineDate: "", //最后一次接种日期
this.$refs.vantform
.validate([
"LeaveShangHai", //多少天未出上海
"HasOnlineClass", //是否上网课
"purpose", // 来沪目的
"thirtyDays", //近三十天内无离开上海
"LeaveShangHai", //回上海天数
"unusualDate", //核酸检测异常时间
"normalDate", //未发生异常时间
"inHospitalDate", //120转运时间
"beforeIsolationPoint",
"otherSymptom",//其他症状
"symptom", //患者症状
// "otherSymptom", //其他症状
// "HasSymptom", //有无症状
"vaccineType",
"beforeIsolationPoint", //之前隔离点
"hasCOVIDVaccine",
"covidVaccine", //接种针数
"vaccineType", //疫苗公司
"othervaccines", //其他疫苗文本
"othervaccines", //其他疫苗
"vaccineDate", //最后一次接种日期
])
.then(() => {
......@@ -206,6 +214,9 @@ export default {
this.$refs.vantform
.validate([
"hasHistoryAllergies", //过敏史
"foodAllergy", //食物过敏
"drugAllergy", //药物过敏
"otherAllergy", //其他过敏
// "historyAllergies", //过敏原
"hasHistorySurgery", //手术史
"historySurgery", //具体内容
......@@ -241,8 +252,6 @@ export default {
"ChestCT", //有无CT
"otherPastHistory", //其他既往史
"ChestCTDate", //CT拍照时间
])
.then(() => {
this.$refs.vantform.submit();
......
<!--
* @Author: ninglupeng
* @Date: 2020-11-24 16:18:58
* @LastEditors: ninglupeng
* @LastEditTime: 2022-04-02 10:04:49
* @LastEditors: wsq
* @LastEditTime: 2022-04-20 16:16:32
* @Description:
-->
<template>
......@@ -264,6 +264,30 @@
/>
</van-popup>
<van-field
colon
v-show="occupation == '其他'"
clearable
autosize
type="textarea"
v-model="otherOccupation"
name="otherOccupation"
label="其他职业"
placeholder="其他职业"
:rules="[
{
required: occupation == '其他' ? true : false,
message: '请填写其他职业',
},
]"
@blur="setLocalStorge('otherOccupation')"
></van-field>
<van-field
colon
clearable
......@@ -285,23 +309,6 @@
:rules="[{ required: true, message: '请填写家属联系方式' }]"
></van-field>
<van-field
colon
clearable
name="workOrNotCovid"
label="日常工作是否需要接触新冠病"
>
<template #input>
<van-radio-group
@change="setLocalStorge('workOrNotCovid')"
v-model="workOrNotCovid"
direction="horizontal"
>
<van-radio name="是"></van-radio>
<van-radio name="否"></van-radio>
</van-radio-group>
</template>
</van-field>
<van-field
colon
......@@ -401,6 +408,96 @@
</van-radio-group>
</template>
</van-field>
<van-field
style="margin-left: -35px;"
colon
clearable
name="HasSymptom"
label-width="130px"
label="是否有症状"
>
<template #input>
<van-radio-group
@change="
() => {
if (HasSymptom == '否') {
symptom = [];
otherSymptom = '';
setValue('symptom','');
setValue('otherSymptom', '');
}
setLocalStorge('HasSymptom');
}
"
v-model="HasSymptom"
direction="horizontal"
>
<van-radio name="是"></van-radio>
<van-radio name="否"></van-radio>
</van-radio-group>
</template>
</van-field>
<van-field
style="margin-left: -35px;"
v-if="HasSymptom == '是'"
colon
:rules="[
{
required: HasSymptom == '是' ? true : false,
message: '请选择症状',
},
]"
clearable
name="symptom"
label="症状"
label-width="130px"
>
<template #input>
<van-checkbox-group
@change="
() => {
setLocalStorge('symptom');
}
"
v-model="symptom"
direction="horizontal"
class="symptom"
>
<template v-for="(item, index) in symptomList">
<van-checkbox :key="index" :name="item.element" shape="square">
{{ item.element }}</van-checkbox
>
</template>
</van-checkbox-group>
</template>
</van-field>
<van-field
style="margin-left: 10px;"
colon
v-if="symptom.includes('其他') && HasSymptom == '是' "
clearable
autosize
type="textarea"
v-model="otherSymptom"
name="otherSymptom"
label="其他症状"
placeholder="其他症状"
:rules="[
{
required: symptom.includes('其他') && HasSymptom == '是' ? true : false,
message: '请填写其他症状',
},
]"
@blur="setLocalStorge('otherSymptom')"
></van-field>
</div>
</template>
......@@ -427,9 +524,10 @@ export default {
isConceive: "未孕", //怀孕状况
gestationalWeeks: "", //怀孕周期
occupation: "", //职业
otherOccupation:"",//其他职业
contactInformation: "", //联系方式
FamilyMembersPhone: "", //家属联系方式
workOrNotCovid: "否",
// workOrNotCovid: "否",
Registeredresidence: "", //籍贯 (包括省市)
province: "", //籍贯 (省)
city: "", //籍贯 (市)
......@@ -438,6 +536,11 @@ export default {
typeOfMedicalInsurance: "上海医保", //医保类型
insurance: "无", //商业保险
HasSymptom: "否", //有无症状
symptom: [], //患者症状
otherSymptom: "", //其他症状
symptomList: [],//症状列表
areaList, //地址数据选项列表
showArea: false, //控制地址弹窗
......@@ -459,10 +562,16 @@ export default {
},
methods: {
setLastValue() {
if (this.getLocalStorge("symptom")) {
this.symptom = this.getLocalStorge("symptom").split(",");
}
let arr = [
"patientName", //患者姓名
"nationality", //国籍
"passportId", //护照号
"HasSymptom",//是否有症状
"otherSymptom",//其他症状
"otherOccupation",//其他职业
"age", //年龄
"gender", //性别
"height", //身高
......@@ -481,6 +590,8 @@ export default {
"idCard", //身份证号
"typeOfMedicalInsurance", //医保类型
"insurance", //商业保险
];
arr.map((item) => {
......@@ -537,6 +648,9 @@ export default {
let arr2 = data.filter((item) => {
return item.category == "职业";
});
this.symptomList = data.filter((item) => {
return item.category == "症状";
});
this.nationalityList = arr.map((item) => {
return item.element;
......@@ -682,5 +796,12 @@ export default {
<style lang="scss" scoped>
.page4 {
.symptom {
.van-checkbox--horizontal {
margin-right: 0.32rem;
min-width: 35%;
margin-bottom: 5%;
}
}
}
</style>
......@@ -2,7 +2,7 @@
* @Author: ninglupeng
* @Date: 2020-11-24 16:18:58
* @LastEditors: wsq
* @LastEditTime: 2022-04-19 14:25:11
* @LastEditTime: 2022-04-20 17:15:02
* @Description:
-->
<template>
......@@ -45,18 +45,41 @@
/>
</van-popup>
<!-- -->
<van-field
colon
clearable
name="workOrNotCovid"
label="日常工作是否需要接触新冠病"
style="margin-left: 40px;"
>
<template #input>
<van-radio-group
@change="setLocalStorge('workOrNotCovid')"
v-model="workOrNotCovid"
direction="horizontal"
>
<van-radio name="是"></van-radio>
<van-radio name="否"></van-radio>
</van-radio-group>
</template>
</van-field>
<van-field
colon
clearable
name="thirtyDays"
label-width="130px"
label="近两月是否离开过上海"
label-width="130px"
:rules="[{ required: true, message: '请选择近两月是否离开过上海' }]"
>
<template #input>
<van-radio-group
@change="setLocalStorge('thirtyDays')"
@change="
setLocalStorge('thirtyDays')
"
v-model="thirtyDays"
direction="horizontal"
>
......@@ -66,6 +89,7 @@
</template>
</van-field>
<van-field
v-if="thirtyDays == '是'"
colon
......@@ -85,7 +109,7 @@
{ validator, message: '天数不能大于三十天' },
]"
>
<template #extra></template></van-field
<template #extra v-if="thirtyDays == '是'"></template></van-field
>
<van-field
......@@ -179,95 +203,12 @@
:rules="[{ required: true, message: '请填写之前隔离点' }]"
></van-field>
<van-field
colon
clearable
name="HasSymptom"
label-width="130px"
label="是否有症状"
>
<template #input>
<van-radio-group
@change="
() => {
if (HasSymptom == '否') {
symptom = [];
otherSymptom = '';
setValue('symptom', '');
setValue('otherSymptom', '');
}
setLocalStorge('HasSymptom');
}
"
v-model="HasSymptom"
direction="horizontal"
>
<van-radio name="是"></van-radio>
<van-radio name="否"></van-radio>
</van-radio-group>
</template>
</van-field>
<van-field
v-show="HasSymptom == '是'"
v-if="hasCOVIDVaccine=='是' || hasCOVIDVaccine=='否'"
colon
:rules="[
{
required: HasSymptom == '是' ? true : false,
message: '请选择症状',
},
]"
clearable
name="symptom"
label="症状"
label-width="130px"
>
<template #input>
<van-checkbox-group
@change="
() => {
setLocalStorge('symptom');
}
"
v-model="symptom"
direction="horizontal"
class="symptom"
>
<!-- <van-cell-group> -->
<template v-for="(item, index) in symptomList">
<van-checkbox :key="index" :name="item.element" shape="square">
{{ item.element }}</van-checkbox
>
</template>
<!-- </van-cell-group> -->
</van-checkbox-group>
</template>
</van-field>
<van-field
colon
v-if="symptom.includes('其他')"
clearable
autosize
type="textarea"
v-model="otherSymptom"
name="otherSymptom"
label="其他症状"
placeholder="其他症状"
:rules="[
{
required: symptom.includes('其他') ? true : false,
message: '请填写其他症状',
},
]"
@blur="setLocalStorge('otherSymptom')"
></van-field>
<van-field
colon
clearable
name="HasCOVIDVaccine"
name="hasCOVIDVaccine"
label-width="130px"
label="是否接种过疫苗"
>
......@@ -275,9 +216,9 @@
<van-radio-group
@change="
() => {
setLocalStorge('HasCOVIDVaccine');
setLocalStorge('hasCOVIDVaccine');
if (HasCOVIDVaccine == '否') {
if (hasCOVIDVaccine == '否') {
covidVaccine = '';
vaccineType = [];
othervaccines = '';
......@@ -287,7 +228,7 @@
}
}
"
v-model="HasCOVIDVaccine"
v-model="hasCOVIDVaccine"
direction="horizontal"
>
<van-radio name="是"></van-radio>
......@@ -297,7 +238,7 @@
</van-field>
<van-field
v-if="HasCOVIDVaccine == '是'"
v-if="hasCOVIDVaccine == '是'"
colon
clearable
v-model="covidVaccine"
......@@ -309,18 +250,18 @@
@blur="setLocalStorge('covidVaccine')"
:rules="[{ required: true, message: '请填写接种针数' }]"
>
<template #extra></template></van-field
<template #extra v-if="hasCOVIDVaccine == '是'"></template></van-field
>
<van-field
v-if="HasCOVIDVaccine == '是'"
v-if="hasCOVIDVaccine == '是'"
colon
clearable
name="vaccineType"
label="疫苗公司"
:rules="[
{
required: HasCOVIDVaccine == '是' ? true : false,
required: hasCOVIDVaccine == '是' ? true : false,
message: '请选择疫苗公司',
},
]"
......@@ -365,7 +306,7 @@
></van-field>
<van-field
v-if="HasCOVIDVaccine == '是'"
v-if="hasCOVIDVaccine == '是'"
colon
clearable
readonly
......@@ -407,6 +348,7 @@ export default {
name: "page5",
data() {
return {
workOrNotCovid: "否",//是否需要接触新冠
HasOnlineClass: "否", //是否上网课
purpose: "学习", // 来沪目的
thirtyDays: "是", //近三十天内无离开上海
......@@ -416,17 +358,18 @@ export default {
beforeIsolationPoint: "", //之前隔离点
inHospitalDate: "", //120转运时间
HasSymptom: "否", //有无症状
symptom: [], //患者症状
otherSymptom: "", //其他症状
HasCOVIDVaccine: "是",
// HasSymptom: "否", //有无症状
// symptom: [], //患者症状
// otherSymptom: "", //其他症状
//symptomList: [],
hasCOVIDVaccine: "是",
covidVaccine: "", //接种针数
vaccineType: [], //疫苗公司
othervaccines: "", //其他疫苗
vaccineDate: "", //最后一次接种日期
vaccineTypeList: [],
symptomList: [],
showNormalDate: false, //未发生异常时间弹窗
showUnusualDate: false, //核酸时间弹窗
......@@ -469,10 +412,10 @@ export default {
"normalDate", //未发生异常时间
"inHospitalDate", //120转运时间
"otherSymptom", //其他症状
"vaccineType",
"beforeIsolationPoint", //之前隔离点
"HasSymptom", //有无症状
"HasCOVIDVaccine",
"hasCOVIDVaccine",//是否接种过疫苗
"covidVaccine", //接种针数
"othervaccines", //其他疫苗
"vaccineDate", //最后一次接种日期
......@@ -483,8 +426,10 @@ export default {
this[`${arr[i]}`] = this.getLocalStorge(arr[i]);
}
}
if (this.getLocalStorge("vaccineType")) {
this.symptom = this.getLocalStorge("vaccineType").split(",");
this.vaccineType = this.getLocalStorge("vaccineType").split(",");
}
},
......@@ -583,12 +528,6 @@ export default {
margin-bottom: 5%;
}
}
.symptom {
.van-checkbox--horizontal {
margin-right: 0.32rem;
min-width: 35%;
margin-bottom: 5%;
}
}
}
</style>
......@@ -2,7 +2,7 @@
* @Author: ninglupeng
* @Date: 2020-11-24 16:18:58
* @LastEditors: wsq
* @LastEditTime: 2022-04-19 14:40:04
* @LastEditTime: 2022-04-20 15:51:42
* @Description:
-->
<template>
......@@ -72,9 +72,9 @@
clearable
label-width="125px"
v-model="drugAllergy"
name="drugAllergy "
name="drugAllergy"
label="药物过敏原"
placeholder="物过敏原"
placeholder="物过敏原"
@blur="setLocalStorge('drugAllergy')"
></van-field>
<van-field
......@@ -150,8 +150,10 @@
if (HasPreviousHistory == '无') {
previousHistory = [];
otherPastHistory = '';
setValue('previousHistory');
tuberculosisDate='';
setValue('previousHistory','');
setValue('otherPastHistory', '');
setValue('tuberculosisDate', '');
}
}
"
......@@ -170,10 +172,10 @@
name="previousHistory"
label-width="125px"
label="既往史"
v-show="HasPreviousHistory != '无'"
v-show="HasPreviousHistory == '有'"
:rules="[
{
required: HasPreviousHistory != '无' ? true : false,
required: HasPreviousHistory == '有' ? true : false,
message: '请选择既往史',
},
]"
......@@ -196,7 +198,7 @@
<van-field
colon
v-if="previousHistory.includes('其他')"
v-show="previousHistory.includes('其他')"
clearable
autosize
type="textarea"
......@@ -219,11 +221,11 @@
readonly
clickable
label-width="125px"
v-if="HasPreviousHistory != '无' && previousHistory.includes('肺结核')"
v-show="HasPreviousHistory == '有' && previousHistory.includes('肺结核')"
:rules="[
{
required:
HasPreviousHistory != '无' && previousHistory.includes('肺结核')
HasPreviousHistory == '有' && previousHistory.includes('肺结核')
? true
: false,
message: '请选择既往史发生时间',
......@@ -261,7 +263,9 @@
setLocalStorge('yesOrNoCt');
if (yesOrNoCt == '无') {
ChestCT = '无';
ChestCTDate='';
setValue('ChestCT', '');
setValue('ChestCTDate', '');
}
}
"
......@@ -401,8 +405,8 @@ export default {
// }
}
});
this.tuberculosisDate = this.getLocalStorge('tuberculosisDate')
this.otherPastHistory = this.getLocalStorge('otherPastHistory')
this.foodAllergy = this.getLocalStorge('foodAllergy')
this.drugAllergy = this.getLocalStorge('drugAllergy')
this.otherAllergy = this.getLocalStorge('otherAllergy')
......@@ -426,7 +430,7 @@ export default {
},
setChestCTDate() {
this.ChestCTDate = formatDate(new Date(), "yyyy-MM-dd");
// this.ChestCTDate = formatDate(new Date(), "yyyy-MM-dd");
},
getResource() {
this.setLoading(true);
......@@ -438,13 +442,13 @@ export default {
});
},
onConfirm(date) {
this.tuberculosisDate = formatDate(date, "yyyy-MM");
this.tuberculosisDate = formatDate(date, "yyyy-MM-dd");
this.setLocalStorge("tuberculosisDate");
this.showPicker = false;
},
onChestCT(date) {
this.ChestCTDate = formatDate(date, "yyyy-MM-dd ");
this.ChestCTDate = formatDate(date, "yyyy-MM-dd");
this.setLocalStorge("ChestCTDate");
this.showCalendar = false;
},
......
......@@ -2,7 +2,7 @@
* @Author: ninglupeng
* @Date: 2022-03-17 15:06:50
* @LastEditors: wsq
* @LastEditTime: 2022-04-19 16:02:36
* @LastEditTime: 2022-04-21 10:32:19
* @Description:
*/
const path = require('path');
......@@ -66,15 +66,14 @@ module.exports = {
//target: 'http://flowtone_lgfc.suvalue.com',//方舱
// target: 'http://flowtone_rjny.suvalue.com',//方舱
//target: 'http://flowtone_syzy.sualvue.com',//方舱
//target: 'http://flowtone1.suvalue.com',//方舱
// target: 'http://flowtone1.suvalue.com',//方舱
//target: 'http://flowtone3.suvalue.com',//方舱
// target: 'http://flowtone4.suvalue.com',//方舱
//target: 'http://flowtone5.suvalue.com',//方舱
// target: 'http://flowtone7.suvalue.com',//方舱
//target: 'http://flowtone8.suvalue.com',//方舱
target: 'http://flowtone9.suvalue.com',//方舱
//target: 'http://flowtone10.suvalue.com',//方舱
//target: 'http://flowtone9.suvalue.com',//方舱
target: 'http://flowtone10.suvalue.com',//方舱
ws: true, //如果要代理 websockets,配置这个参数
// secure: false, // 如果是https接口,需要配置这个参数
......
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