- *最后修改日期:
+ 最后修改日期:
-
@@ -366,7 +366,8 @@
} from "@/api/system/baseForm.js"
import {
Message
- } from 'element-ui'
+ } from 'element-ui'
+ import state from '@/store/modules/user.js'
export default {
components: {
AvueMap
@@ -377,6 +378,7 @@
id: '',
type: 'add',
tableName: 'records',
+ is_number:false,
// 地图
mapparams: {
zoom: 11,
@@ -432,18 +434,23 @@
}
},
created() {
- this.getLabel()
+ this.getLabel()
+ this.is_number = state.state.is_number
+ console.log("state",state)
},
watch: {
isShow(newVal) {
if (newVal) {
if (this.type === 'editor') {
this.getDetail()
+ }else{
+ this.is_number = true
}
} else {
this.id = ''
this.type = ''
- this.mapform = []
+ this.mapform = []
+ this.is_number = false
this.$refs['dialog'].reset()
}
},
diff --git a/src/views/record/index.vue b/src/views/record/index.vue
index 0692d00..c3e5add 100644
--- a/src/views/record/index.vue
+++ b/src/views/record/index.vue
@@ -296,7 +296,8 @@
pageSize: 40,
pageIndex: 1,
keyword: "",
- jiedao: '',
+ jiedao: '',
+ idcard:'',
disabilityLevel: "",
disabilityType: "",
link_tables: [{
diff --git a/src/views/record/personinfo.vue b/src/views/record/personinfo.vue
index 595fd2b..3295e68 100644
--- a/src/views/record/personinfo.vue
+++ b/src/views/record/personinfo.vue
@@ -245,12 +245,15 @@
this.mapHeight = winHeight - 50 - 20
},
goUrl(e,table) {
- this.tableName = table
- for(var k of this.allTable){
- if(table==k.table_name){
- this.getFormDetail(e,k.id)
+ if(e){
+ this.tableName = table
+ for(var k of this.allTable){
+ if(table==k.table_name){
+ this.getFormDetail(e,k.id)
+ }
}
- }
+ }
+
},
getPerson() {
if (this.$route.query?.id) {
@@ -312,16 +315,19 @@
for(var s in this.tableShow){
if(k.guanlianbiao == s){
- workflows += `
`
- workflows += `
${k.detail.year?k.detail.year:''}/${k.guanlianbiaoming}
`
- if(Object.keys(this.tableShow[s]).length==0){
- // return
- }else{
- for(var tables in this.tableShow[s]){
- workflows += `
${this.tableShow[s][tables]}:${k.detail[tables]?k.detail[tables]:''}
`
+ if(k.detail){
+ workflows += `
`
+ workflows += `
${k.detail?(k.detail.year?k.detail.year:''):''}/${k.guanlianbiaoming}
`
+ if(Object.keys(this.tableShow[s]).length==0){
+ // return
+ }else{
+ for(var tables in this.tableShow[s]){
+ workflows += `
${this.tableShow[s][tables]}:${k.detail?(k.detail[tables]?k.detail[tables]:''):''}
`
+ }
}
}
+
}
}
workflows += "
"
@@ -347,7 +353,7 @@
for (var k of res) {
raises += `
${k.start_time?.substring(0,10)}/${k.status_text}
`
}
-
+ console.log("raises",raises)
}else{
raises += `
暂无居家托养
`
}
diff --git a/src/views/viewrecords/components/addViewRecord.vue b/src/views/viewrecords/components/addViewRecord.vue
index 8ad7f3a..cd1719e 100644
--- a/src/views/viewrecords/components/addViewRecord.vue
+++ b/src/views/viewrecords/components/addViewRecord.vue
@@ -8,6 +8,46 @@
访视信息
+