liuyanpeng 2 лет назад
Родитель
Сommit
625e12d662
1 измененных файлов с 21 добавлено и 13 удалено
  1. 21 13
      src/customer/DataImportPanel.vue

+ 21 - 13
src/customer/DataImportPanel.vue

@@ -89,23 +89,23 @@
                 <button
                   type="button"
                   class="btn btn-primary btn-primary-1"
-                  @click="runProcessClear(selectedDataTemplateNo)"
+                  @click="testImportButton(true)"
                 >
-                  1.{{ $t("lang.DataImportPanel.emptyImport") }}
+                  1.{{ $t("lang.DataImportPanel.testImport") }}
                 </button>
                 <button
                   type="button"
                   class="btn btn-primary btn-primary-1 btn-primary-import"
-                  @click="testImportButton(true)"
+                  @click="runProcessImport(selectedDataTemplateNo)"
                 >
-                  2.{{ $t("lang.DataImportPanel.testImport") }}
+                  2.{{ $t("lang.DataImportPanel.formalImport") }}
                 </button>
                 <button
                   type="button"
                   class="btn btn-primary btn-primary-1 btn-primary-import"
-                  @click="runProcessImport(selectedDataTemplateNo)"
+                  @click="runProcessClear(selectedDataTemplateNo,false)"
                 >
-                  3.{{ $t("lang.DataImportPanel.formalImport") }}
+                  3.{{ $t("lang.DataImportPanel.emptyImport") }}
                 </button>
                 <button
                   v-if="taskId != null && taskId.length > 0"
@@ -253,6 +253,9 @@ export default {
       } else{
         this.current++;
       }
+      if(this.current == 2){
+        this.runProcessClear(this.selectedDataTemplateNo,true);
+      }
     },
     prev() {
       this.current--;
@@ -693,7 +696,7 @@ export default {
     /**
      * 运行清空流程
      */
-    runProcessClear: function (selectedDataTemplateNo) {
+    runProcessClear: function (selectedDataTemplateNo,flag) {
       var _self = this;
       var no = selectedDataTemplateNo;
       _self.loading = true;
@@ -707,12 +710,17 @@ export default {
         },
         success: function (data) {
           _self.loading = false;
-          Notify.success(
-            _self.$t('lang.DataImportPanel.describe9'),
-            data.processResult.result,
-            false,
-          );
-          return;
+          if(flag) {
+            message.success(_self.$t('lang.DataImportPanel.describe9')+'!'+ data.processResult.result);
+          } else {
+            message.success(_self.$t('lang.DataImportPanel.describe9')+'!'+ data.processResult.result,10);
+          }
+          // Notify.success(
+          //   _self.$t('lang.DataImportPanel.describe9'),
+          //   data.processResult.result,
+          //   false,
+          // );
+          // return;
         },
         error: function (XMLHttpRequest, textStatus, errorThrown) {
           _self.loading = false;