Merge remote-tracking branch 'origin/dev-frontend'

frontend/src/views/Photography/components/LoadingDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     v-model="visible"
-    :show-close="false"
+    :show-close="progress == 100"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     width="400px"

frontend/src/views/Photography/detail.vue

@@ -171,7 +171,7 @@
   </div>
 
 
-  <loading-dialog v-model="loadingDialogVisible" :progress="progress" :message="message"
+  <loading-dialog v-if="loadingDialogVisible" v-model="loadingDialogVisible" :progress="progress" :message="message"
     :disabled-button="disabledButton" @button-click="handleComplete">
     <template v-if="partErrList && partErrList.length > 0" #errList>
       <div v-for="(item, idx) in partErrList" :key="idx">