From fc061952a9f413660195e24724ca6f232e8dc674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
<819653817@qq.com>
Date: Fri, 20 Sep 2024 10:26:52 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=20=E6=B5=8B=E6=B5=8B=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/portrayal/jumin/index.vue | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index fe87e602b..76ffd4525 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -554,11 +554,13 @@
v-for="(row, rowIndex) in sectionItem.children"
:key="rowIndex + sectionItem.id"
>
-
{{ row.label }}：
{{
row.value ? row.value : "--"
}}
+ {{
+ row.formName ? row.formName : "--"
+ }}
From d184189eac62b151d511cc2f1691fa019d1e64c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
<819653817@qq.com>
Date: Fri, 20 Sep 2024 10:37:46 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=A1=A5=E8=B4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/portrayal/jumin/index.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index 76ffd4525..eac9bd0df 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -555,11 +555,11 @@
:key="rowIndex + sectionItem.id"
>
{{ row.label }}：
- {{
+ {{
row.value ? row.value : "--"
}}
{{
- row.formName ? row.formName : "--"
+ row.oldSubsidy ? row.oldSubsidy : "--"
}}
@@ -1357,6 +1357,8 @@ export default {
this.menuList.push({name:'死亡信息',id:'deathDto'});
this.expandList.push({title:'死亡信息',scrollId:'deathDto',children:[{label:'死亡时间',value:this.resiDetailObj.baseInfoDto.deathDate}]})
}
+ console.log(this.menuList,"lkdsfjlskdjflks.jfklsmfdlks");
+
})
.catch((err) => {
console.log(err);
From 546648ca43782c5933787c46ee19532572595f2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
<819653817@qq.com>
Date: Fri, 20 Sep 2024 10:43:15 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E9=AB=98=E9=BE=84=E8=A1=A5=E5=8A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/portrayal/jumin/index.vue | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index fe87e602b..1e5ac6b8a 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -554,11 +554,13 @@
v-for="(row, rowIndex) in sectionItem.children"
:key="rowIndex + sectionItem.id"
>
-
{{ row.label }}：
- {{
+ {{
row.value ? row.value : "--"
}}
+ {{
+ row.oldSubsidy ? row.oldSubsidy : "--"
+ }}
@@ -1355,6 +1357,8 @@ export default {
this.menuList.push({name:'死亡信息',id:'deathDto'});
this.expandList.push({title:'死亡信息',scrollId:'deathDto',children:[{label:'死亡时间',value:this.resiDetailObj.baseInfoDto.deathDate}]})
}
+ console.log(this.expandList,"lkdsfjlskdjflks.jfklsmfdlks");
+
})
.catch((err) => {
console.log(err);
From 5f83928bb16ad13291abe65901dc908298ad7e8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
<819653817@qq.com>
Date: Fri, 20 Sep 2024 10:43:46 +0800
Subject: [PATCH 4/5] =?UTF-8?q?Revert=20"=E9=AB=98=E9=BE=84=E8=A1=A5?=
=?UTF-8?q?=E5=8A=A9"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 546648ca43782c5933787c46ee19532572595f2f.
---
src/views/modules/portrayal/jumin/index.vue | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index 1e5ac6b8a..fe87e602b 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -554,13 +554,11 @@
v-for="(row, rowIndex) in sectionItem.children"
:key="rowIndex + sectionItem.id"
>
+
{{ row.label }}：
- {{
+ {{
row.value ? row.value : "--"
}}
- {{
- row.oldSubsidy ? row.oldSubsidy : "--"
- }}
@@ -1357,8 +1355,6 @@ export default {
this.menuList.push({name:'死亡信息',id:'deathDto'});
this.expandList.push({title:'死亡信息',scrollId:'deathDto',children:[{label:'死亡时间',value:this.resiDetailObj.baseInfoDto.deathDate}]})
}
- console.log(this.expandList,"lkdsfjlskdjflks.jfklsmfdlks");
-
})
.catch((err) => {
console.log(err);
From 0f7132881f7f12cb67a0b9c2a2fc6fc7a559b75c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
<819653817@qq.com>
Date: Fri, 20 Sep 2024 10:49:02 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=B9=B4=E6=9D=A5=E4=B8=8D=E4=BD=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/portrayal/jumin/index.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index eac9bd0df..3c882700c 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -1357,7 +1357,8 @@ export default {
this.menuList.push({name:'死亡信息',id:'deathDto'});
this.expandList.push({title:'死亡信息',scrollId:'deathDto',children:[{label:'死亡时间',value:this.resiDetailObj.baseInfoDto.deathDate}]})
}
- console.log(this.menuList,"lkdsfjlskdjflks.jfklsmfdlks");
+ console.log(this.expandList,"lkdsfjlskdjflks.jfklsmfdlks");
+ console.log(this.sectionItem.children,"lkdsfjlskdjflks.jfklsmfdlks1eww34");
})
.catch((err) => {