Merge branch 'dev-liveSix-20200817' into 'release'

修复机构地区的选择问题   code reviewer  张平

修复机构地区的选择问题   code reviewer  张平

See merge request !213

src/components/yqrange/member-management/org.vue

@@ -260,13 +260,13 @@ export default {
 
       let administrativeIdItem = "";
       // 如果是外部用户（2），只能看到所在省份的数据
-      if(idType == 2){
-        let optionRegionArray = new Array();
-        optionRegionArray.push(this.optionsRegion[0].provinceId);
-        administrativeIdItem = operationData.setAdministrativeId(
-          optionRegionArray
-        );
-      }
+      // if(idType == 2){
+      //   let optionRegionArray = new Array();
+      //   optionRegionArray.push(this.optionsRegion[0].provinceId);
+      //   administrativeIdItem = operationData.setAdministrativeId(
+      //     optionRegionArray
+      //   );
+      // }
 
       // let administrativeIdItem = "";
       let req = {

src/views/education/edit-manager.vue

@@ -1934,9 +1934,9 @@ export default {
         if (this.formData.projectName != "") {
           if (
             this.formData.projectName.length < 2 ||
-            this.formData.projectName.length > 20
+            this.formData.projectName.length > 24
           ) {
-            this.$message.error("输入长度为2-20的内容");
+            this.$message.error("输入长度为2-24的内容");
             return;
           }
           let urlProjectId = vm.getUrlSearch(window.location.href, "projectId") || this.projectId;