|
|
@@ -1,6 +1,6 @@
|
|
|
<template>
|
|
|
<el-dialog
|
|
|
- v-model="visible"
|
|
|
+ v-model.sync="visible"
|
|
|
:show-close="!requesting"
|
|
|
:close-on-click-modal="false"
|
|
|
:close-on-press-escape="false"
|
|
|
@@ -18,8 +18,10 @@
|
|
|
:use-new-progress="useNewProgress"
|
|
|
@complete="handleButtonClick"
|
|
|
:on-open-folder="onOpenFolder"
|
|
|
+ :message="message"
|
|
|
/>
|
|
|
|
|
|
+
|
|
|
<!-- 原有的简单进度条 -->
|
|
|
<div v-else class="progress-container">
|
|
|
<div class="progress-bar">
|
|
|
@@ -38,14 +40,24 @@
|
|
|
<slot name="progressMessages"></slot>
|
|
|
|
|
|
<el-button
|
|
|
- v-if="!disabledButton && !useNewProgress"
|
|
|
- :disabled="disabledButton"
|
|
|
- type="primary"
|
|
|
- class="action-button button--primary1 mar-top-20"
|
|
|
- @click="handleButtonClick"
|
|
|
+ v-if="!disabledButton && !useNewProgress"
|
|
|
+ :disabled="disabledButton"
|
|
|
+ type="primary"
|
|
|
+ class="action-button button--primary1 mar-top-20"
|
|
|
+ @click="handleButtonClick"
|
|
|
>
|
|
|
{{ buttonText }}
|
|
|
</el-button>
|
|
|
+
|
|
|
+
|
|
|
+ <el-button
|
|
|
+ v-if="message === '全部货号生成失败'"
|
|
|
+ type="primary"
|
|
|
+ class="action-button button--primary1 mar-top-20"
|
|
|
+ @click="visible = false"
|
|
|
+ >
|
|
|
+ {{ message }}
|
|
|
+ </el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
</template>
|