Merge branch 'dev_third_stage'

# Conflicts:
#	jero-web/src/components/PersonnelSelection/index.vue

jero-web/src/components/PersonnelSelection/index.vue

@@ -5,7 +5,7 @@
                :disabled="true"
                :title="value"
                :placeholder="$t('PleaseSelect')+query.db_field_txt"/>
-      <a-button type="primary" class="button-box" @click="standardClick">
+      <a-button type="primary" class="button-box" :disabled="disabled" @click="standardClick">
         {{this.$t('PersonnelSelection')}}
       </a-button>
       <a-button type="primary" v-if='isDelete' class="button-box" @click="standardDelete">
@@ -58,7 +58,7 @@
 
   export default {
     name: 'index',
-    props: ['query', 'value', 'personneQuery', 'isSingleChoice', 'isInput', 'isClass', 'isDelete'],
+    props: ['query', 'value', 'personneQuery', 'isSingleChoice', 'isInput', 'isClass', 'isDelete', 'disabled'],
     data() {
       return {
         loading: true,