diff --git a/src/assets/css/base.less b/src/assets/css/base.less index 947e2956333275256f858d70d427942a4e890364..ac2e8c00a9b6692f5daad3e07877f7657fe86f12 100644 --- a/src/assets/css/base.less +++ b/src/assets/css/base.less @@ -34,10 +34,9 @@ body { // van组件样式调整 // 表单 .screen-form { - // input::placeholder { - // color: #999999; - // float: right; - // } + input::placeholder { + color: #999999; + } .van-cell:after { transform: scaleY(1); } diff --git a/src/resident/Resident.vue b/src/resident/Resident.vue index dc9d349987fbc4235d92fff7b96565203510d7c7..391dbcfc71984da8793a78236b1902731eb9ff51 100644 --- a/src/resident/Resident.vue +++ b/src/resident/Resident.vue @@ -20,10 +20,16 @@ export default { visible: false, themeVars: { primaryColor: '#54CCBD', + // 按键 buttonPrimaryBackground: '#54CCBD', buttonPrimaryBorderColor: '#54CCBD', buttonDefaultBorderColor: '#BFBFBF', buttonNormalFontSize: '.16rem', + pickerConfirmActionColor: '#54CCBD', + // tab + tabsBottomBarColor: '#54CCBD', + // 级联选项 + cascaderActiveColor: '#54CCBD', // 表单相关 cellVerticalPadding: '.15rem', cellTextColor: '#262626', diff --git a/src/resident/screening/first/form/BaseInfo.vue b/src/resident/screening/first/form/BaseInfo.vue index e53fc536fe61ba46bcec632f103ebb14104f6769..26d14fa00309672239645d05d8749512550abd6f 100644 --- a/src/resident/screening/first/form/BaseInfo.vue +++ b/src/resident/screening/first/form/BaseInfo.vue @@ -97,7 +97,8 @@ :rules="rules.presentCode" @click="showPresent = true" /> - <van-popup v-model:show="showPresent" :close-on-click-overlay="false" position="bottom"> + <van-popup v-model:show="showPresent" :close-on-click-overlay="false" position="bottom" + :lazy-render="false"> <DocAddress v-model:value="form.presentCode" @close="showPresent = false" :viewData="addressRecord.presentCode" @change="presentChange"/> @@ -126,7 +127,8 @@ :rules="rules.registeredCode" @click="showRegistered = true" /> - <van-popup v-model:show="showRegistered" :close-on-click-overlay="false" position="bottom"> + <van-popup v-model:show="showRegistered" :close-on-click-overlay="false" position="bottom" + :lazy-render="false"> <DocAddress v-model:value="form.registeredCode" @close="showRegistered = false" :viewData="addressRecord.registeredCode" @change="registeredChange"/> diff --git a/src/resident/screening/first/form/IdCheck.vue b/src/resident/screening/first/form/IdCheck.vue index 2a6791b64b39d8cf4076f8ef7251ce69793a7781..dbd6204ddfc8ebc8d4e9a14dc75952ad4700e030 100644 --- a/src/resident/screening/first/form/IdCheck.vue +++ b/src/resident/screening/first/form/IdCheck.vue @@ -14,8 +14,7 @@ readonly name="certificateType" label="证件类型" - placeholder="请选择" - disabled/> + placeholder="请选择" /> <van-field v-model="form.idCard" required clearable diff --git a/src/resident/screening/first/form/ScreenInfo.vue b/src/resident/screening/first/form/ScreenInfo.vue index dc651a2fd730c741144c30c35bbb3d9f0b571e10..af9ec302f3701903dea0c46dde69a398f64755f2 100644 --- a/src/resident/screening/first/form/ScreenInfo.vue +++ b/src/resident/screening/first/form/ScreenInfo.vue @@ -428,7 +428,7 @@ export default { return height && weight ? (weight / (height / 100 * height / 100)).toFixed(2) : undefined } }, - inject: ['recordForm'], + inject: ['recordForm', 'checkInfo'], created() { this.init() }, @@ -455,7 +455,8 @@ export default { const query = { ...this.form, screenDoctorId: this.recordForm.doctorId, - residentsRecord: this.recordForm.base + residentsRecord: this.recordForm.base, + idCard: this.checkInfo.idCard } // 提交表单 savefirstScreen(fetchDataHandle(query, {