Merge branch 'dev_third_stage'

# Conflicts: # jero-web/src/components/PersonnelSelection/index.vue
2022-07-09 11:16:08 +08:00
parent eaef749f0a 2174761154
commit da4e6c8011
31 changed files with 1489 additions and 124 deletions
@@ -634,6 +634,10 @@
      },
      roleSwitchingClick() {
        this.visibleRoleSwitching = true
+        this.$nextTick(()=>{
+          this.formInlineRoleSwitching.roleSwitchingCode = this.currentPersonRole
+          this.$refs.ruleFormRoleSwitching.clearValidate()
+        })
      },
      GetgetLoginUserType() {
        this.$refs.CollectionTabel.getLoginUserType()