Merge branch 'dev_2nd_period' into 'feature_dev_20221010_extend'

# Conflicts:
#   jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue

jero-web/src/views/projectManagement/components/addModel.vue

@@ -107,10 +107,11 @@
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('StudioEngineer')">{{$t('StudioEngineer')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop="'studioEngineerName'">
+              <a-form-model-item class="itemModel-multi" :prop="'studioEngineerName'">
                 <PersonnelSelection :query="{db_field_name:'studioEngineer',db_field_txt:$t('StudioEngineer')}"
                                     :isSingleChoice="true"
                                     :personneQuery="formInline"
+                                    v-if="visible"
                                     @change="PersonnelSelectionChange"
                                     :disabled="disabled"
                                     v-model="formInline.studioEngineerName"/>
@@ -124,11 +125,11 @@
               <div class="title-text">
                 <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop="'certificationEngineerName'">
+              <a-form-model-item class="itemModel-multi" :prop="'certificationEngineerName'">
                 <PersonnelSelection
                   :query="{db_field_name:'certificationEngineer',db_field_txt:$t('certifiedEngineer')}"
                   :personneQuery="formInline"
-                  :selectDepartment="true"
+                  v-if="visible"
                   @change="PersonnelSelectionChange"
                   :disabled="disabled"
                   v-model="formInline.certificationEngineerName"/>