feat(equipmentMember): 用户列表拆分本人/员工/家庭成员三个分区
- 按 dataType 拆分:0=员工 1=家庭成员,relationType=1 归入本人 - 本人区块保留设备容量头部,仅支持编辑 - 员工/家庭成员区块独立显示,空列表自动隐藏 - badge 规则:本人/他人添加显示,自己添加不显示 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.7
parent
485725a486
commit
099b7613fe
@@ -36,24 +36,38 @@
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
<!-- 本人 -->
|
||||
<view class="member-item my" wx:if="{{ selfMember }}">
|
||||
<view class="member-avatar">{{ selfMember.realname[0] }}</view>
|
||||
<view class="member-info">
|
||||
<view class="member-name-row">
|
||||
<view class="member-name">{{ selfMember.realname }}</view>
|
||||
<view class="badge badge-self">本人</view>
|
||||
</view>
|
||||
<view class="member-meta">
|
||||
<text class="meta-text">{{ selfMember.sex_dictText }}</text>
|
||||
<text class="meta-divider">·</text>
|
||||
<text class="meta-text">{{ selfMember.ageDisplay }}岁</text>
|
||||
<text class="meta-divider">|</text>
|
||||
<text class="meta-text">{{ selfMember.height }}cm</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="member-actions">
|
||||
<view class="action-text" data-id="{{ selfMember.id }}" bind:tap="onTapEdit">编辑</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 用户列表 -->
|
||||
<block wx:for="{{ memberList }}" wx:key="id">
|
||||
<!-- 员工 -->
|
||||
<view class="member-card" wx:if="{{ employeeList.length }}">
|
||||
<view class="member-card-title" style="color: #10B981;">员工</view>
|
||||
<block wx:for="{{ employeeList }}" wx:key="id">
|
||||
<view class="member-item">
|
||||
<!-- 头像:取名字第一个字 -->
|
||||
<view class="member-avatar">{{ item.realname[0] }}</view>
|
||||
|
||||
<!-- 信息列 -->
|
||||
<view class="member-info">
|
||||
<view class="member-name-row">
|
||||
<view class="member-name">{{ item.realname }}</view>
|
||||
<block wx:if="{{ item.relationType == 1 }}">
|
||||
<view class="badge badge-self">本人</view>
|
||||
</block>
|
||||
<block wx:elif="{{ item.relationType == 2 }}">
|
||||
<!-- <view class="badge badge-my">自己添加</view>-->
|
||||
</block>
|
||||
<block wx:elif="{{ item.relationType == 3 }}">
|
||||
<block wx:if="{{ item.relationType == 3 }}">
|
||||
<view class="badge badge-other">他人添加</view>
|
||||
</block>
|
||||
</view>
|
||||
@@ -65,12 +79,38 @@
|
||||
<text class="meta-text">{{ item.height }}cm</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="member-actions">
|
||||
<view class="action-text" data-id="{{ item.id }}" bind:tap="onTapEdit">编辑</view>
|
||||
<block wx:if="{{ item.relationType != 1 }}">
|
||||
<view class="action-text action-text-danger" data-id="{{ item.id }}" bind:tap="onTapDelete">删除</view>
|
||||
</block>
|
||||
<view class="action-text action-text-danger" data-id="{{ item.id }}" bind:tap="onTapDelete">删除</view>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
|
||||
<!-- 家庭成员 -->
|
||||
<view class="member-card" wx:if="{{ familyList.length }}">
|
||||
<view class="member-card-title" style="color: #F59E0B;">家庭成员</view>
|
||||
<block wx:for="{{ familyList }}" wx:key="id">
|
||||
<view class="member-item">
|
||||
<view class="member-avatar">{{ item.realname[0] }}</view>
|
||||
<view class="member-info">
|
||||
<view class="member-name-row">
|
||||
<view class="member-name">{{ item.realname }}</view>
|
||||
<block wx:if="{{ item.relationType == 3 }}">
|
||||
<view class="badge badge-other">他人添加</view>
|
||||
</block>
|
||||
</view>
|
||||
<view class="member-meta">
|
||||
<text class="meta-text">{{ item.sex_dictText }}</text>
|
||||
<text class="meta-divider">·</text>
|
||||
<text class="meta-text">{{ item.ageDisplay }}岁</text>
|
||||
<text class="meta-divider">|</text>
|
||||
<text class="meta-text">{{ item.height }}cm</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="member-actions">
|
||||
<view class="action-text" data-id="{{ item.id }}" bind:tap="onTapEdit">编辑</view>
|
||||
<view class="action-text action-text-danger" data-id="{{ item.id }}" bind:tap="onTapDelete">删除</view>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
|
||||
Reference in New Issue
Block a user