From 1d0de7a9c5de06555339dab2e9cbf25a77c896df Mon Sep 17 00:00:00 2001
From: kubbo <390378816@qq.com>
Date: Fri, 22 Apr 2022 09:57:16 +0800
Subject: [PATCH 01/11] BUG 29241

---
 project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue | 4 ++--
 project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue b/project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue
index 65ebd87b..abe8b1a3 100644
--- a/project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue
+++ b/project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue
@@ -5,7 +5,7 @@
         <ai-search-bar class="mar-t8">
           <template #left>
             <el-date-picker v-model="search.createTime" type="date" placeholder="日期" size="small" clearable
-                            @change="page.current=1,getTableData()"/>
+                            @change="page.current=1,getTableData()" class="w-300" value-format="yyyy-MM-dd"/>
           </template>
           <template #right>
             <el-input size="small" placeholder="搜索党员/四邻信息" v-model="search.name" clearable
@@ -25,7 +25,7 @@
     <ai-dialog title="联动记录审核" :visible.sync="dialog" @closed="form={}" @onConfirm="submit" width="600px">
       <el-form :model="form" size="small" ref="DialogForm" :rules="rules" label-width="120px">
         <el-form-item label="是否通过审核" prop="status">
-          <ai-select v-model="form.status" placeholder="请选择党员" :selectList="dict.getDict('yesOrNo')"/>
+          <ai-select v-model="form.status" :selectList="dict.getDict('yesOrNo')"/>
         </el-form-item>
         <el-form-item label="审批意见" prop="remark" v-if="form.status==0">
           <el-input type="textarea" v-model="form.remark" placeholder="请输入审批意见" maxlength="200" show-word-limit
diff --git a/project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue b/project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue
index ad7353fb..015b4134 100644
--- a/project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue
+++ b/project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue
@@ -10,7 +10,7 @@
             <el-button icon="iconfont iconDelete" :disabled="!search.ids" @click="handleDelete(search.ids)">删除
             </el-button>
             <el-date-picker class="w-300" v-model="search.linksageDate" type="date" placeholder="日期" size="small"
-                            clearable @change="page.current=1,getTableData()"/>
+                            clearable @change="page.current=1,getTableData()" value-format="yyyy-MM-dd"/>
           </template>
           <template #right>
             <el-input size="small" placeholder="搜索党员/四邻信息" v-model="search.residentName" clearable

From b84d3bec66a3de9f0db152cf3f3ba9c02e1f2afd Mon Sep 17 00:00:00 2001
From: kubbo <390378816@qq.com>
Date: Fri, 22 Apr 2022 10:29:21 +0800
Subject: [PATCH 02/11] BUG 29227

---
 packages/party/AppPartyScore/psList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/party/AppPartyScore/psList.vue b/packages/party/AppPartyScore/psList.vue
index f9fd2def..356b0efd 100644
--- a/packages/party/AppPartyScore/psList.vue
+++ b/packages/party/AppPartyScore/psList.vue
@@ -47,7 +47,7 @@ export default {
       return [
         {
           label: '与户主关系', prop: 'householdRelation', align: 'center', width: 165,
-          render: (h, {row}) => h('p', dict.getLabel('householdRelation', row.householdRelation || "户主"))
+          render: (h, {row}) => h('p', this.dict.getLabel('householdRelation', row.householdRelation || "户主"))
         },
         {label: '类型', prop: 'residentType', align: 'center', dict: "residentType"},
         {label: '姓名', prop: 'name', align: 'center'},

From b7104acd58fbf54903db5801962331b9a81bbb45 Mon Sep 17 00:00:00 2001
From: kubbo <390378816@qq.com>
Date: Fri, 22 Apr 2022 10:30:18 +0800
Subject: [PATCH 03/11] BUG 29242

---
 project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue b/project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue
index abe8b1a3..f68fd42e 100644
--- a/project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue
+++ b/project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue
@@ -8,7 +8,7 @@
                             @change="page.current=1,getTableData()" class="w-300" value-format="yyyy-MM-dd"/>
           </template>
           <template #right>
-            <el-input size="small" placeholder="搜索党员/四邻信息" v-model="search.name" clearable
+            <el-input size="small" placeholder="搜索党员/四邻信息" v-model="search.residentName" clearable
                       @change="page.current=1,getTableData()"/>
           </template>
         </ai-search-bar>

From d697c5213f18709ac7d7059fe2cd4e5f0471a89f Mon Sep 17 00:00:00 2001
From: kubbo <390378816@qq.com>
Date: Fri, 22 Apr 2022 10:33:49 +0800
Subject: [PATCH 04/11] BUG 29243

---
 project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue | 4 ++--
 project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue b/project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue
index f68fd42e..45746233 100644
--- a/project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue
+++ b/project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue
@@ -4,7 +4,7 @@
       <template #content>
         <ai-search-bar class="mar-t8">
           <template #left>
-            <el-date-picker v-model="search.createTime" type="date" placeholder="日期" size="small" clearable
+            <el-date-picker v-model="search.linksageDate" type="date" placeholder="日期" size="small" clearable
                             @change="page.current=1,getTableData()" class="w-300" value-format="yyyy-MM-dd"/>
           </template>
           <template #right>
@@ -61,7 +61,7 @@ export default {
   },
   data() {
     return {
-      search: {name: ""},
+      search: {residentName: ""},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       dialog: false,
diff --git a/project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue b/project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue
index 015b4134..e9f799ee 100644
--- a/project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue
+++ b/project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue
@@ -75,7 +75,7 @@ export default {
   },
   data() {
     return {
-      search: {name: "", ids: ""},
+      search: {residentName: "", ids: ""},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       dialog: false,

From 8bdc53d7cad67c52c7f2096979cbef6a25ea8b0e Mon Sep 17 00:00:00 2001
From: kubbo <390378816@qq.com>
Date: Fri, 22 Apr 2022 10:34:33 +0800
Subject: [PATCH 05/11] BUG 29244

---
 .../sanjianxi/apps/AppHelpByNeighbours/AppHelpByNeighbours.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/sanjianxi/apps/AppHelpByNeighbours/AppHelpByNeighbours.vue b/project/sanjianxi/apps/AppHelpByNeighbours/AppHelpByNeighbours.vue
index 5b78b382..2419b482 100644
--- a/project/sanjianxi/apps/AppHelpByNeighbours/AppHelpByNeighbours.vue
+++ b/project/sanjianxi/apps/AppHelpByNeighbours/AppHelpByNeighbours.vue
@@ -4,7 +4,7 @@
       <ai-title slot="title" title="四邻联动"/>
       <template #tabs>
         <el-tabs>
-          <el-tab-pane label="四联联动记录">
+          <el-tab-pane label="四邻联动记录">
             <hbn-list v-bind="$props"/>
           </el-tab-pane>
           <el-tab-pane label="联动记录审批" lazy>

From f2bcbffde484b54a74e55fffff72648cf9ce3c8e Mon Sep 17 00:00:00 2001
From: kubbo <390378816@qq.com>
Date: Fri, 22 Apr 2022 10:36:58 +0800
Subject: [PATCH 06/11] BUG 29245

---
 project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue | 2 +-
 project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue b/project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue
index 45746233..e1ae971c 100644
--- a/project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue
+++ b/project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue
@@ -9,7 +9,7 @@
           </template>
           <template #right>
             <el-input size="small" placeholder="搜索党员/四邻信息" v-model="search.residentName" clearable
-                      @change="page.current=1,getTableData()"/>
+                      @change="page.current=1,getTableData()" suffix-icon="iconfont iconSearch"/>
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
diff --git a/project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue b/project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue
index e9f799ee..0bd6f8ec 100644
--- a/project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue
+++ b/project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue
@@ -14,7 +14,7 @@
           </template>
           <template #right>
             <el-input size="small" placeholder="搜索党员/四邻信息" v-model="search.residentName" clearable
-                      @change="page.current=1,getTableData()"/>
+                      @change="page.current=1,getTableData()" suffix-icon="iconfont iconSearch"/>
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"

From 6359ceecb38e3fd318c93ccd50fc269e42428943 Mon Sep 17 00:00:00 2001
From: kubbo <390378816@qq.com>
Date: Fri, 22 Apr 2022 10:38:14 +0800
Subject: [PATCH 07/11] BUG 29247

---
 packages/party/partyMember/components/neighbourSetting.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/party/partyMember/components/neighbourSetting.vue b/packages/party/partyMember/components/neighbourSetting.vue
index d2898fd2..f4517675 100644
--- a/packages/party/partyMember/components/neighbourSetting.vue
+++ b/packages/party/partyMember/components/neighbourSetting.vue
@@ -25,7 +25,7 @@
         </ai-table>
       </template>
     </ai-list>
-    <ai-dialog title="添加户主" :visible.sync="dialog" @closed="form={residentList: []},residents=[]" @onConfirm="submit"
+    <ai-dialog title="添加户主" :visible.sync="dialog" @closed="form={residentList: []},residents=[],list.con=null" @onConfirm="submit"
                width="1200px">
       <ai-area-get v-model="form.areaId" :instance="instance" :root="user.info.areaId" @change="getResident"/>
       <el-row type="flex" class="mar-t16">

From c6a9856689c3dafd956258f87d2acdf356a108dd Mon Sep 17 00:00:00 2001
From: kubbo <390378816@qq.com>
Date: Fri, 22 Apr 2022 10:39:46 +0800
Subject: [PATCH 08/11] BUG 29247

---
 packages/party/partyMember/components/neighbourSetting.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/party/partyMember/components/neighbourSetting.vue b/packages/party/partyMember/components/neighbourSetting.vue
index f4517675..f8f391fa 100644
--- a/packages/party/partyMember/components/neighbourSetting.vue
+++ b/packages/party/partyMember/components/neighbourSetting.vue
@@ -25,7 +25,7 @@
         </ai-table>
       </template>
     </ai-list>
-    <ai-dialog title="添加户主" :visible.sync="dialog" @closed="form={residentList: []},residents=[],list.con=null" @onConfirm="submit"
+    <ai-dialog title="添加户主" :visible.sync="dialog" @closed="clearDialog" @onConfirm="submit"
                width="1200px">
       <ai-area-get v-model="form.areaId" :instance="instance" :root="user.info.areaId" @change="getResident"/>
       <el-row type="flex" class="mar-t16">
@@ -160,6 +160,11 @@ export default {
     },
     findResident(id) {
       return this.form.residentList?.findIndex(e => e.residentId == id)
+    },
+    clearDialog() {
+      this.form = {residentList: []}
+      this.residents = []
+      this.list = {current: 1, size: 10, total: 0}
     }
   },
   created() {

From f796fbc536b7d202ecb8256df8510b8b4766e677 Mon Sep 17 00:00:00 2001
From: kubbo <390378816@qq.com>
Date: Fri, 22 Apr 2022 10:48:21 +0800
Subject: [PATCH 09/11] BUG 29249

---
 packages/party/AppPartyScoreFlow/psfList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/party/AppPartyScoreFlow/psfList.vue b/packages/party/AppPartyScoreFlow/psfList.vue
index b31e767b..cbe6d98e 100644
--- a/packages/party/AppPartyScoreFlow/psfList.vue
+++ b/packages/party/AppPartyScoreFlow/psfList.vue
@@ -69,7 +69,7 @@ export default {
         {label: "调整说明", prop: "remark", align: "center"},
         {label: "事件", prop: "createTime"},
         {label: "类型", prop: "integralType", align: "center", dict: "partyIntegralType"},
-        {label: "积分", prop: "integral", align: "center"},
+        {label: "积分", prop: "residualIntegral", align: "center"},
         {slot: "options"}
       ]
     },

From 41bc5e87505696343c930e85af6efedd7f6e30d8 Mon Sep 17 00:00:00 2001
From: kubbo <390378816@qq.com>
Date: Fri, 22 Apr 2022 10:49:44 +0800
Subject: [PATCH 10/11] BUG 29253

---
 packages/party/AppPartyScoreFlow/psfList.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/party/AppPartyScoreFlow/psfList.vue b/packages/party/AppPartyScoreFlow/psfList.vue
index cbe6d98e..e63dd8cd 100644
--- a/packages/party/AppPartyScoreFlow/psfList.vue
+++ b/packages/party/AppPartyScoreFlow/psfList.vue
@@ -7,7 +7,8 @@
           <template #left>
             <el-button type="primary" icon="iconfont iconAdd" @click="dialog=true">添加</el-button>
             <el-date-picker v-model="search.createTime" type="daterange" placeholder="日期" size="small" clearable
-                            @change="handleSearchTime" start-placeholder="开始时间" end-placeholder="结束时间"/>
+                            @change="handleSearchTime" start-placeholder="开始时间" end-placeholder="结束时间"
+                            value-format="yyyy-MM-dd HH:mm:ss"/>
           </template>
           <template #right>
             <el-input size="small" placeholder="搜索党员" v-model="search.partyName" clearable

From d52d2b352d4ce3418e1b648db0386ed10e1030dc Mon Sep 17 00:00:00 2001
From: kubbo <390378816@qq.com>
Date: Fri, 22 Apr 2022 10:57:44 +0800
Subject: [PATCH 11/11] BUG 29254

---
 packages/meta/AppResident/residentDetail.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/meta/AppResident/residentDetail.vue b/packages/meta/AppResident/residentDetail.vue
index 3e7ced0c..178977a3 100644
--- a/packages/meta/AppResident/residentDetail.vue
+++ b/packages/meta/AppResident/residentDetail.vue
@@ -179,10 +179,11 @@
                 <template>
                   <ai-wrapper>
                     <ai-info-item label="是否户主" :value="dict.getLabel('householdName', baseInfo.householdName)"/>
-                    <ai-info-item label="与户主关系" :value="dict.getLabel('householdName', baseInfo.householdName)"
-                                  v-if="baseInfo.householdName==0"/>
-                    <ai-info-item label="户主身份证号" :value="dict.getLabel('householdName', baseInfo.householdName)"
-                                  v-if="baseInfo.householdName==0"/>
+                    <template v-if="baseInfo.householdName==0">
+                      <ai-info-item label="与户主关系"
+                                    :value="dict.getLabel('householdRelation', baseInfo.householdRelation)"/>
+                      <ai-info-item label="户主身份证号" :value="baseInfo.householdIdNumber"/>
+                    </template>
                     <ai-info-item label="户籍地" isLine
                                   :value="[baseInfo.householdAreaName, baseInfo.householdAddress].join('')" isLine/>
                   </ai-wrapper>