Merge branch 'develop-fengjiansheng' into 'develop'

fix(@gms/gms-plugin-billexpand): 保存和暂存按钮报错信息

See merge request GFP/RBC/rbc-frontend!39

develop/@gms/gms-plugin-billexpand/src/actions/saveAction.js

@@ -119,6 +119,13 @@ export default {
           });
         }
       })
-      .catch((error) => {});
+      .catch((error) => {
+        console.log(error)
+        bill.setControlsSate(param["_control_name_"], "enable", true);
+        GMS.vbus.$Message.error({
+          content: errorMessageUtil.saveAction.getCommonMessage(),
+          duration: 3
+        });
+      });
   },
-}
\ No newline at end of file
+}

develop/@gms/gms-plugin-billexpand/src/actions/tempSave.js

@@ -107,7 +107,13 @@ export default {
                     duration: 3
                 });
             }
-        }).catch(() => {
+        }).catch((error) => {
+            console.log(error)
+            bill.setControlsSate(param["_control_name_"], "enable", true);
+            GMS.vbus.$Message.error({
+                content: errorMessageUtil.tempSaveAction.getCommonMessage(),
+                duration: 3
+            });
         });
     },
 }

develop/@gms/gms-plugin-billexpand/src/actions/util/errorMessageUtil.js

@@ -35,6 +35,9 @@ export default {
                 }
             }
             return errorPreMessage === "" ? this.commonMessage : errorPreMessage + this.getErrorBaseDataName(a);
+        },
+        getCommonMessage(){
+            return this.commonMessage;
         }
     },
     tempSaveAction: {
@@ -51,6 +54,9 @@ export default {
                 }
             }
             return errorPreMessage === "" ? this.commonMessage : errorPreMessage + this.saveAction.getErrorBaseDataName(a);
+        },
+        getCommonMessage(){
+            return this.commonMessage;
         }
     },
     submitAction: {