Merge branch 'orangeUrgent' into allTestUrgent

src/HManagement/task/modules/add.vue

@@ -117,8 +117,8 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" style="width:120px" @click="dialogTableVisible = false">{{$t('取 消')}}</el-button>
-        <el-button type="primary" size="small" style="width:120px" @click="validateInput">{{$t('确 定')}}</el-button>
+        <el-button size="small" style="width:120px" @click="dialogTableVisible = false" :disabled="loading">{{$t('取 消')}}</el-button>
+        <el-button type="primary" size="small" style="width:120px" @click="validateInput" :loading="loading">{{$t('确 定')}}</el-button>
       </div>
     </el-drawer>
     <applicationData ref="applicationRef" @selectApplication="selectApplication"></applicationData>

src/components/normal-basic-layout-new/details/modules/task/addTask.vue

@@ -121,8 +121,8 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" style="width:120px" @click="onCancel">{{$t('取 消')}}</el-button>
-        <el-button type="primary" size="small" style="width:120px" @click="validateInput">{{$t('确 定')}}</el-button>
+        <el-button size="small" style="width:120px" @click="onCancel" :disabled="loading">{{$t('取 消')}}</el-button>
+        <el-button type="primary" size="small" style="width:120px" @click="validateInput" :loading="loading">{{$t('确 定')}}</el-button>
       </div>
     </el-drawer>
     <followData v-if="typeTask !== '' && typeTask !== undefined" ref="followRef" :param="followParam" @follow="follow"></followData>

src/components/normal-basic-layout/details/modules/task/addTask.vue

@@ -121,8 +121,8 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" style="width:120px" @click="onCancel">{{$t('取 消')}}</el-button>
-        <el-button type="primary" size="small" style="width:120px" @click="validateInput">{{$t('确 定')}}</el-button>
+        <el-button size="small" style="width:120px" @click="onCancel" :disabled="loading">{{$t('取 消')}}</el-button>
+        <el-button type="primary" size="small" style="width:120px" @click="validateInput" :loading="loading">{{$t('确 定')}}</el-button>
       </div>
     </el-drawer>
     <followData v-if="typeTask !== '' && typeTask !== undefined" ref="followRef" :param="followParam" @follow="follow"></followData>