Merge remote-tracking branch 'origin/bugfix/导入群发添加loading'

src/views/message/importSendForm.vue

@@ -21,11 +21,11 @@
           <!-- <el-button icon="el-icon-upload2" class="dash-btn">点击上传</el-button> -->
           <el-button type="text" class="ml10" @click="download">点击下载文件模板</el-button>
         </div>
-        <p style="margin-top:8px;color:#909399;font-size:12px;line-height:1;">手机号数量单次最多不超过5000条，上传文件不能大于2M</p>
+        <p style="margin-top: 8px; color: #909399; font-size: 12px; line-height: 1">手机号数量单次最多不超过5000条，上传文件不能大于2M</p>
       </el-form-item>
     </el-form>
     <p class="title mb15 mt40">短信模板设置</p>
-    <div class="dm-title__label--tips" style="margin-top:15px;margin-bottom:20px;"><i class="el-icon-warning pr8 warning-color"></i>短信运营商限制：为避免骚扰用户，营销短信只允许在8点到22点发送</div>
+    <div class="dm-title__label--tips" style="margin-top: 15px; margin-bottom: 20px"><i class="el-icon-warning pr8 warning-color"></i>短信运营商限制：为避免骚扰用户，营销短信只允许在8点到22点发送</div>
     <sms-temp pbSize="pb15" :activeId.sync="ruleForm.gicSmsTemplateId" @emitSmsItemInfo="onSmsItemInfo">
       <span slot="tips" class="fz12 gray">* 请注意若发送的短信模板中包含会员变量，但发送对象无该变量时则显示横杆“-”</span>
     </sms-temp>
@@ -82,6 +82,7 @@ export default {
       this.smsType = val.type;
     },
     submitForm: _debounce(function() {
+      console.log(this.fileId, 'id');
       if (this.loading) {
         return;
       }
@@ -97,6 +98,11 @@ export default {
         this.$tips({ type: 'warning', message: '请选择短信模板' });
         return;
       }
+      // 导入过程中不可提交
+      if (!this.fileId) {
+        this.$tips({ type: 'warning', message: '请等待导入完成' });
+        return;
+      }
       this.loading = true;
       const params = { ...this.ruleForm };
       if (params.sendType) {