Merge branch 'master' into test-dev

src/views/system/user.vue

@@ -758,39 +758,39 @@ export default {
                 label: "参建项目",
                 prop: "projectAndUserList",
                 span: 24,
-                addDisplay: false, // 新增时不显示
-                // rules: [{
-                //   required: true,
-                //   validator: projectAndUserListRules,
-                //   trigger: "change"
-                // }],
+                addDisplay: true, // 新增时不显示
+                rules: [{
+                  required: true,
+                  validator: projectAndUserListRules,
+                  trigger: "change"
+                }],
               },
               {
                 label: "参与项目",
                 prop: "projectId",
                 span: 16,
-                addDisplay: false, // 新增时不显示
+                addDisplay: true, // 新增时不显示
               },
               {
                 label: "合同段",
                 prop: "contractId",
                 span: 16,
-                 addDisplay: false, // 新增时不显示
+                 addDisplay: true, // 新增时不显示
               }, {
                 label: "用户类型",
                 prop: "roleIds",
                 span: 16,
-                 addDisplay: false, // 新增时不显示
+                 addDisplay: true, // 新增时不显示
               }, {
                 label: "单位名称",
                 prop: "companyName",
                 span: 16,
-                 addDisplay: false, // 新增时不显示
+                 addDisplay: true, // 新增时不显示
               }, {
                 label: "职位",
                 prop: "position",
                 span: 16,
-                 addDisplay: false, // 新增时不显示
+                 addDisplay: true, // 新增时不显示
               },
               {
                 label: "允许登录",
@@ -1353,7 +1353,7 @@ export default {
         }, () => {
           loading();
         });
-      
+
     },
     rowUpdate(row, index, done, loading) {//修改按钮
       // row.roleId = row.roleId.join(",");