kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yanran200730
2022-04-21 16:11:56 +08:00
parent a01d79fe2f 283fb8767d
commit cce3c47466
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/meta/AppResident/residentDetail.vue
View File

@@ -199,10 +199,10 @@
</ai-table>
</div>
</ai-card>
<tags-manage v-if="currentTab=='0'" v-bind="$props" :resident-id="baseInfo.id"/>
<tags-manage v-if="currentTab=='0'&&baseInfo.id" v-bind="$props" :resident-id="baseInfo.id"/>
</el-tab-pane>
<el-tab-pane label="资产信息" lazy>
<personal-assets v-if="currentTab==1" :resident-id="baseInfo.id" v-bind="$props"/>
<personal-assets v-if="currentTab==1&&baseInfo.id" :resident-id="baseInfo.id" v-bind="$props"/>
</el-tab-pane>
<el-tab-pane label="特殊人群" lazy v-if="hasSpecial">
<ai-card v-for="(item, index) in baseInfo.tsrqInfos" :key="index" :title="item.applicationName">

2
project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue
View File

@@ -40,7 +40,7 @@
<ai-select v-model="form.residentId" :selectList="residents" placeholder="请选择四邻信息"/>
</el-form-item>
<el-form-item label="日期" prop="linksageDate">
<el-date-picker v-model="form.linksageDate" clearable placeholder="日期"/>
<el-date-picker v-model="form.linksageDate" clearable placeholder="日期" value-format="yyyy-MM-dd"/>
</el-form-item>
<el-form-item label="描述" prop="description">
<el-input type="textarea" v-model="form.description" rows="5" maxlength="200" show-word-limit/>