修复1.机构的地区下拉框接口 2.修复人员列表页的搜索pagenum 3.创建教培的创建项目的多次暂存提示项目名称重复的问题

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

@@ -72,7 +72,7 @@
 import { openLoading, closeLoading } from "@/utils/utils";
 import { doUpload, getFilePath } from "@/utils/qiniu-util";
 import * as operationData from "@/utils/operation";
-import { getCircleProvincesReq } from '@/utils/yqrange/rangeApi';
+import { getOrgProvincesReq } from '@/utils/yqrange/rangeApi';
 import { moOption, moOrgSearch, moSave, clearCacheOrg} from '@/utils/yqrange/memberApi';
 let vm = null;
 export default {
@@ -187,7 +187,7 @@ export default {
     getRegionOption() {
       openLoading(vm);
       let idType = localStorage.getItem("storageIdType");
-      getCircleProvincesReq(idType).then(res => {
+      getOrgProvincesReq(idType,this.circleId,1).then(res => {
         closeLoading(this);
         if (res.code == "000000") {
           if (idType == 1) {

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

@@ -94,7 +94,8 @@
 import { openLoading, closeLoading } from "@/utils/utils";
 import { doUpload, getFilePath } from "@/utils/qiniu-util";
 import * as operationData from "@/utils/operation";
-import { getprovinces, moRelSearch, morDeleteOrg } from '@/utils/yqrange/memberApi';
+import { moRelSearch, morDeleteOrg } from '@/utils/yqrange/memberApi';
+import { getOrgProvincesReq } from '@/utils/yqrange/rangeApi';
 import checkOrg from './checkOrg'
 let vm = null;
 export default {
@@ -206,7 +207,7 @@ export default {
     getRegionOption() {
       openLoading(vm);
       let idType = localStorage.getItem("storageIdType");
-      getprovinces(idType).then(res => {
+      getOrgProvincesReq(idType,this.circleId,1).then(res => {
         closeLoading(this);
         if (res.code == "000000" && res.data) {
           if (idType == 1) {

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

@@ -21,7 +21,7 @@
           </el-form-item>
          
           <el-form-item>
-            <el-button size="small" type="primary" @click="getList()">搜索</el-button>
+            <el-button size="small" type="primary" @click="serch()">搜索</el-button>
           </el-form-item>
           <el-form-item>
             <el-button size="small"  @click="reset()">取消搜索</el-button>
@@ -153,11 +153,11 @@ export default {
           value: 0
         },
         {
-          label: '从圈内机构人员',
+          label: '可访问本圈的机构',
           value: 1
         },
         {
-          label: '从人员白名单',
+          label: '手动添加',
           value: 2
         },
       ],
@@ -213,6 +213,10 @@ export default {
       }
       return option;
     },
+    serch() {
+       this.formOrganization.pageNum = 1;
+       this.getList()
+    },
     getList() {
       let idType = localStorage.getItem("storageIdType");
       let req = {

src/utils/yqrange/rangeApi.js

@@ -52,3 +52,12 @@ export const getMemberSelectOrgOptionReq = (data) => {
  
 
 
+export const getOrgProvincesReq = (idType,circleId,type=1) => {
+  return fetch({
+    headers,
+
+    url: getBaseUrl(`circle/memberSelect/provinces/idType/${idType}/${circleId}/${type}`),
+    method: 'get',
+    description: '根据用户ID 获取选人时省市',
+  })
+};
\ No newline at end of file

src/views/education/edit-manager.vue

@@ -1939,7 +1939,7 @@ export default {
             this.$message.error("输入长度为2-20的内容");
             return;
           }
-          let urlProjectId = vm.getUrlSearch(window.location.href, "projectId");
+          let urlProjectId = vm.getUrlSearch(window.location.href, "projectId") || this.projectId;
 
           if (urlProjectId == null) {
             let param = {
@@ -1954,6 +1954,9 @@ export default {
                 this.$message.info(res.message);
               }
             });
+          } else if (this.projectId){
+            this.formData.id = this.projectId
+            this.insertOrUpdate("storageEdit");
           } else {
             //console.log('urlProjectId'+urlProjectId);
             this.insertOrUpdate("storageEdit");