Sfoglia il codice sorgente

UPS功能迁移:1.0.17 bug 修复:导入的界面 设置processResult.setSuccess(false); 提示框是绿色,改为红色

YangZhiJie 1 anno fa
parent
commit
50d4894ec3

+ 1 - 0
src/confirm/PdfPrint.vue

@@ -69,6 +69,7 @@ export default {
         if (successData.errorCode == 0) {
           _self.taskInfo = successData.data;
         }else{
+          _self.taskInfo = null;
           Notify.error(_self.$t('lang.Notify.error'), successData.errorMessage, true);
         }
         

+ 7 - 5
src/customer/DataImportPanel.vue

@@ -773,11 +773,13 @@ export default {
         },
         success: function (data) {
           _self.loading = false;
-          Notify.success(
-            _self.$t('lang.DataImportPanel.describe9'),
-            data.processResult.result,
-            false,
-          );
+          
+          if(data != null && data.processResult != null && data.processResult.success == true){
+            Notify.success(_self.$t("lang.DataImportPanel.describe9"), data.processResult.result, false);
+          } else {
+            Notify.error(_self.$t("lang.DataImportPanel.describe12"), data.processResult.result, false);
+          }
+
           if (_self.dataTemplateNo != null && _self.taskId != null) {
             _self.finishTask();
           }

+ 3 - 2
src/locales/en-US.json

@@ -821,9 +821,10 @@
           "describe6":"After the simulation import operation is completed, please check the processing result field on the interface.",
           "describe7":"The import operation is completed, and the data is abnormal. Please check the processing result field.",
           "describe8":"The simulation import operation is completed, and the data is abnormal. Please check the processing result field.",
-          "describe9": "Import succeeded",
+          "describe9": "Import succee",
           "describe10": "Please select a task first.",
-          "describe11": "Setting task completed successfully"
+          "describe11": "Setting task completed successfully",
+          "describe12": "Import error"
       }, 
       "BarCodeEdit": {
           "barcodeEditor": "Barcode Editor", 

+ 2 - 1
src/locales/zh-CN.json

@@ -831,7 +831,8 @@
       "describe8": "模拟导入操作完毕,数据存在异常,请查看处理结果字段。",
       "describe9": "导入成功",
       "describe10": "请先选择任务。",
-      "describe11": "设置任务完成成功"
+      "describe11": "设置任务完成成功",
+      "describe12": "导入失败"
     },
     "BarCodeEdit": {
       "barcodeEditor": "条码编辑器",

+ 1 - 0
src/workflow/ApproveComment.vue

@@ -837,6 +837,7 @@ export default {
      * 2. 任务属于登录人
      */
     checkIsActiveTask: function () {
+      let _self = this;
       if (this.taskInfoId == null) {
         this.isActiveTask = false;
         this.currentTaskInfo = null;