Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectPercentageServiceImpl.java

@@ -229,7 +229,7 @@ public class ProjectPercentageServiceImpl extends ServiceImpl<ProjectPercentageM
                         dataString+=dataStringOne+"]";
                     }
                     if(s!=100){
-                        msg.setError("人员["+username+"]"+"分摊比例错误,不满足100%,请检查");
+                        msg.setError("人员["+username+"]"+"分摊比例不满足100%,当前比例["+s+"%],请检查");
                         return msg;
                     }
                 }

fhKeeper/formulahousekeeper/timesheet/src/views/project/finance.vue

@@ -1374,6 +1374,7 @@ import { error } from 'dingtalk-jsapi';
                         if (res.code == "ok") {
                             //换成弹出框，以免有人等了半天回来啥也没看到
                             this.importResultMsg = "成功导入"+res.data+"条分摊比例数据。"+(res.msg?res.msg:"");
+                            this.showSettingDialog();
                         } else {
                             this.importResultMsg = "导入失败："+res.msg;
                         }