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

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

@@ -33,7 +33,7 @@
           </view>
           <view class="flex-end mt-10 see_btn">
             <u-button type="primary" text="查看" size="mini"
-                      @click="fnNavigatorDetail(item.USER_ID)"></u-button>
+                      @click="fnNavigatorDetail(item.user_id)"></u-button>
           </view>
         </view>
       </u-list-item>
@@ -84,6 +84,7 @@ export default {
       this.getData()
     },
     fnNavigatorDetail(USER_ID) {
+		console.log(USER_ID)
       uni.$u.route({
         url: '/pages/branch-information-management/branch-staff/detail',
         params: {

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

@@ -4,7 +4,7 @@
       <u-cell-group :border="false">
         <u-cell>
           <view slot="title" class="title">角色：</view>
-          <view slot="value">{{ form.ROLE_NAME }}</view>
+          <view slot="value">{{ form.role_name }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">部门：</view>
@@ -12,19 +12,19 @@
         </u-cell>
         <u-cell>
           <view slot="title" class="title">岗位：</view>
-          <view slot="value">{{ form.POSTNAME }}</view>
+          <view slot="value">{{ form.postName }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">用户名：</view>
-          <view slot="value">{{ form.USERNAME }}</view>
+          <view slot="value">{{ form.username }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">姓名：</view>
-          <view slot="value">{{ form.NAME }}</view>
+          <view slot="value">{{ form.name }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">人员类型：</view>
-          <view slot="value">{{ form.PERSON_TYPE }}</view>
+          <view slot="value">{{ form.user_type }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">是否为隐患确认人：</view>
@@ -32,11 +32,11 @@
         </u-cell>
         <u-cell>
           <view slot="title" class="title">部门排序：</view>
-          <view slot="value">{{ form.SORT }}</view>
+          <view slot="value">{{ form.sort }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">邮箱：</view>
-          <view slot="value">{{ form.EMAIL }}</view>
+          <view slot="value">{{ form.email }}</view>
         </u-cell>
         <u-cell>
           <view slot="title" class="title">排班1：</view>
@@ -48,7 +48,7 @@
         </u-cell>
         <u-cell>
           <view slot="title" class="title">备注：</view>
-          <view slot="label" class="mt-10">{{ form.BZ }}</view>
+          <view slot="label" class="mt-10">{{ form.bz }}</view>
         </u-cell>
         <div v-if="form.IS_ONLINELEARNING == '1'">
           <u-cell>