Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/index.vue

@@ -39,7 +39,7 @@
                 <van-picker show-toolbar :columns="inchargerUserList" value-key="name" @confirm="choseIncharger" @cancel="showPickerIncharger = false" />
             </van-popup>
             <!-- 研究中心 -->
-            <van-popup v-model="cliklss" position="bottom">
+            <van-popup v-model="cliklss" position="bottom" v-if="user.timeType.customDegreeActive == 1">
                 <div style="minHeight:300px;">
                 <van-checkbox class="userCheckbox" v-for="(item) in ause" :key="item.id" v-model="item.isChecked" >{{item.name}}</van-checkbox>
                 <van-button style="width:100%;" @click="refreshParticipatess();cliklss=false">确定</van-button>
@@ -156,6 +156,7 @@
                         }
                     }
                 }
+                this.ause = this.ause
                 console.log(this.ause)
             },
             // 返回