Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

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)"
+                    <template v-if="baseInfo.householdName==0">
-                                  v-if="baseInfo.householdName==0"/>
+                      <ai-info-item label="与户主关系"
-                    <ai-info-item label="户主身份证号" :value="dict.getLabel('householdName', baseInfo.householdName)"
+                                    :value="dict.getLabel('householdRelation', baseInfo.householdRelation)"/>
-                                  v-if="baseInfo.householdName==0"/>
+                      <ai-info-item label="户主身份证号" :value="baseInfo.householdIdNumber"/>
+                    </template>
                     <ai-info-item label="户籍地" isLine
                                   :value="[baseInfo.householdAreaName, baseInfo.householdAddress].join('')" isLine/>
                   </ai-wrapper>

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'},

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
@@ -69,7 +70,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"}
       ]
     },

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="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() {

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>

project/sanjianxi/apps/AppHelpByNeighbours/hbnAuditList.vue

@@ -4,12 +4,12 @@
       <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()"/>
+                            @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()"/>
+                      @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"
@@ -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
@@ -61,7 +61,7 @@ export default {
   },
   data() {
     return {
-      search: {name: ""},
+      search: {residentName: ""},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       dialog: false,

project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue

@@ -10,11 +10,11 @@
             <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
-                      @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"
@@ -75,7 +75,7 @@ export default {
   },
   data() {
     return {
-      search: {name: "", ids: ""},
+      search: {residentName: "", ids: ""},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       dialog: false,