Merge remote-tracking branch 'origin/master'

# Conflicts: # jero-web/src/views/projectManagement/components/listOfRegulations.vue
2022-04-27 19:13:34 +08:00
parent f0f2736edf 777152933a
commit 888f5b17b0
29 changed files with 1478 additions and 624 deletions
@@ -17,7 +17,7 @@
          <a-icon type="export" :rotate="-90"/>
          {{$t('export')}}
        </div>
-        <div class="operator-text">
+        <div class="operator-text" v-if="this.$route.query.studioEngineer == this.userInfo().id">
          <ImportFile :url="url" :projectId="$route.query.id" :isTrue="true" :accept="'.xls'"
                      @getList="getPersonnelList"/>
        </div>