Merge branch 'dev-liveSix-20200817' of...

Merge branch 'dev-liveSix-20200817' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-liveSix-20200817

src/components/yqrange/mebman.vue

@@ -95,12 +95,8 @@ export default {
     getRole() {
       if (localStorage.getItem("highMainManager") == 1 || localStorage.getItem("mainManager") == 1 || localStorage.getItem("storageIdType") == 1) {
         this.role = 1
-        console.log('===================显示=================');
-        console.log(this.role);
       } else {
         this.role = 0
-        console.log('===================不显示=================');
-        console.log(this.role);
       }
     },
     refreshRenYuan() {

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,18 +207,10 @@ 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) {
-            vm.optionsRegion = operationData.setRegionOption2(
-            res.data.provinceList
-          );
-          }else{
-            vm.optionsRegion = operationData.setRegionOption3(
-            res.data.provinceList
-          );
-          }
+          vm.optionsRegion = operationData.setRegionOption2(res.data.provinceList)
           vm.formOrganization.administrativeIdList.push(vm.optionsRegion[0].value);
           vm.getOrganization();
         } else {

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-custom.vue

@@ -486,7 +486,7 @@ export default {
         vm.$refs.CustomBaseinfo.save(false);
       } else if (vm.active == 2) {
         vm.sendCircleData(() => {
-          vm.$message.info("完成");
+          vm.$message.info("成功");
         });
       }
     },

src/views/education/edit-manager.vue

@@ -1718,6 +1718,9 @@ export default {
         attachmentPDFModel.push(PDFModel);
       }
       //}
+      if (option == "add" && this.projectId) {
+         projectModel.id = this.projectId
+      }
       if (option == "edit" || option == "storageEdit") {
         //编辑
         projectModel.id = this.formData.id;
@@ -1936,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 = {
@@ -1951,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");
@@ -2076,7 +2082,7 @@ export default {
           vm.formData.attachmentUrl2 != ""
         ) {
           //校验名字
-          let projectId = vm.getUrlSearch(window.location.href, "projectId");
+          let projectId = vm.getUrlSearch(window.location.href, "projectId") || this.projectId;
           if (projectId == null) {
             //新建
             let param = {
@@ -2086,7 +2092,7 @@ export default {
               if (res.code == "000000") {
                 //移动到第二页 选择范围
                 // this.operationLast();
-                this.insertOrUpdate("add");
+                this.insertOrUpdate();
                 // this.active++;
                 // this.stepData = [false, true, false];
                 //this.initRange();
@@ -2094,6 +2100,8 @@ export default {
                 this.$message.info(res.message);
               }
             });
+          } else if (this.projectId){
+            this.insertOrUpdate('add');
           } else {
             //编辑
             // this.operationLast();