Commit 202248dc authored by songrui's avatar songrui

筛查基本信息修改

parent ace5aba7
...@@ -52,7 +52,7 @@ export default { ...@@ -52,7 +52,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 = '42a5a452-5b42-478f-93f8-0b5198686791' token = '83333a9a-e5f8-4463-983f-6446d8d73323'
} }
} }
if (token) { if (token) {
......
...@@ -341,6 +341,8 @@ export default { ...@@ -341,6 +341,8 @@ export default {
dataBirthConfirm({ selectedValues }) { dataBirthConfirm({ selectedValues }) {
this.form.dataBirth = selectedValues.join('-') this.form.dataBirth = selectedValues.join('-')
this.showBirth = false this.showBirth = false
const age = dayjs().diff(dayjs(this.form.dataBirth), 'years')
this.form.currentAge = age
}, },
// 民族 // 民族
nationalConfirm({ selectedValues, selectedOptions }) { nationalConfirm({ selectedValues, selectedOptions }) {
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
import { useStore } from '@/resident/store/index.js' import { useStore } from '@/resident/store/index.js'
export default { export default {
inject: ['recordForm'], inject: ['checkInfo', 'recordForm'],
setup() { setup() {
const store = useStore() const store = useStore()
return { store } return { store }
...@@ -46,9 +46,6 @@ export default { ...@@ -46,9 +46,6 @@ export default {
const highItem = this.screenInfo.highItem const highItem = this.screenInfo.highItem
return highItem && highItem.length ? return highItem && highItem.length ?
this.store.getDict('CP00113').filter(e => highItem.includes(e.value)).map(e => e.name) : [] this.store.getDict('CP00113').filter(e => highItem.includes(e.value)).map(e => e.name) : []
},
baseInfo() {
return this.recordForm.base || {}
} }
}, },
methods:{ methods:{
...@@ -56,7 +53,7 @@ export default { ...@@ -56,7 +53,7 @@ export default {
this.$router.replace({ this.$router.replace({
path: '/resident/screening/first/detail', path: '/resident/screening/first/detail',
query: { query: {
idCard: this.baseInfo.idCard idCard: this.checkInfo.idCard
} }
}) })
} }
......
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