Merge branch 'master' into test-dev

src/views/system/announcement.vue

@@ -275,7 +275,8 @@ export default {
       isSystemUpdateShow: false,
       updateFormModel: {
         updateServerType: [],
-        pushSystem: []
+        pushSystem: [],
+        msgContent:'【系统维护公告】为提升系统安全性及运行效率，系统将于今日（(需填写更新时间)）进行更新升级，请您提前保存好工作数据。维护期间系统将暂停访问，给您带来不便，敬请谅解！如有疑问，请联系系统工作人员处理。'
       },
       updateFormRules: {
         msgContent: [

src/views/system/user.vue

@@ -1329,7 +1329,7 @@ export default {
     },
     rowSave(row, done, loading) { //新增保存
       console.log('保存',this.fromss.projectAndUserList);
-      if (this.fromss.projectAndUserList.length > 0) {
+
         let projectAndUserList = []
         this.fromss.projectAndUserList.forEach(val => {
           if (val.dataInfo.length > 0) {
@@ -1353,10 +1353,7 @@ export default {
         }, () => {
           loading();
         });
-      } else {
-        this.$message.warning('请完善参与项目、合同段、并确认添加用户类型')
-        loading()
-      }
+      
     },
     rowUpdate(row, index, done, loading) {//修改按钮
       // row.roleId = row.roleId.join(",");