Merge remote-tracking branch 'origin/pet-2.0' into pet-2.0

pages/branch-information-management/branch-staff/detail-list.vue

@@ -20,16 +20,16 @@
             <text>{{ item.NAME }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>部门级别：{{ item.DEPTNAME }}</text>
+            <text>部门级别：{{ item.DEPTLEVEL }}</text>
             <text>部门：{{ item.DEPTNAME }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>岗位：{{ item.DEPTNAME }}</text>
+            <text>岗位：{{ item.POSTNAME }}</text>
-            <text>电话：{{ item.DEPTNAME }}</text>
+            <text>用户名：{{ item.username }}</text>
           </view>
           <view class="flex-between mt-10 subtitle">
-            <text>是否确认人：{{ item.DEPTNAME }}</text>
+            <text>是否确认人：{{ item.isHazardconfirmer === 0 ? '否' : '是'}}  </text>
-            <text>人员类型：{{ item.DEPTNAME }}</text>
+            <text>姓名：{{ item.name }}</text>
           </view>
           <view class="flex-end mt-10 see_btn">
             <u-button type="primary" text="查看" size="mini"