解决fetch.js冲突

src/components/yqrange/mebman.vue

@@ -2,6 +2,7 @@
   <div class="member-management" id="screenSet">
     <el-row type="flex" justify="space-around" class="mm-nav" align="middle">
       <el-col :span="20">
+        <el-button :type="areabtn" round class="margin-l" @click="checkTab(0)" v-show='isAraeEdit' >可访问本圈的地区</el-button>
         <el-button :type="orgbtn" round class="margin-l" @click="checkTab(1)">可访问本圈的机构 ({{orgTotal}})</el-button>
         <el-button :type="plebtn" round class="margin-l" @click="checkTab(2)">可访问本圈的人员 ({{pleTotal}})</el-button>
         <span class="text inlin" @click="goBalck">黑名单</span>
@@ -11,6 +12,12 @@
       </el-col>
     </el-row>
     <div class="member-main">
+      <region
+      v-show="tab == 0"
+      :circleId='circleId'
+      :roleType='roleType'
+      @setOrgAndPeople="setOrgAndPeople"
+    ></region>
       <org
         v-show="tab == 1"
         :circleId='circleId'
@@ -26,6 +33,7 @@
         @setPleTotal="setPleTotal"
         ref='renyaun'
       ></renyaun>
+    
     </div>
   </div>
 </template>
@@ -34,6 +42,7 @@
 import * as commonUtil from "@/utils/utils";
 import org from '@/components/yqrange/member-management/org'
 import renyaun from '@/components/yqrange/member-management/renyuan'
+import region from '@/components/yqrange/member-management/region'
 import { getCircleRole } from '@/utils/yqrange/rangeApi'
 export default {
   props: {
@@ -51,20 +60,34 @@ export default {
   },
   data() {
     return {
-      tab: 1,
-      orgbtn: 'primary',
+      tab: 0,
+      areabtn: 'primary',
       plebtn: '',
+      orgbtn:'',
       orgTotal: 0,
       pleTotal: 0,
-      role: 0
+      role: 0,
+      isAraeEdit:false,//是否显示可访问本圈的地区
     }
   },
   components: {
     org,
-    renyaun
+    renyaun,
+    region
   },
   created() {
     this.getRole()
+    let idType = localStorage.getItem("storageIdType");
+    if(idType == 1){
+      //内部可以访问本圈的地区
+      this.isAraeEdit = true
+      this.tab = 0
+      this.areabtn = 'primary'
+    }else{
+      this.isAraeEdit = false
+      this.tab = 1
+      this.orgbtn = 'primary'
+    }
   },
   // 挂载到Dom完成时
   mounted: function() {
@@ -87,9 +110,15 @@ export default {
       if (v == 1) {
         this.orgbtn = 'primary'
         this.plebtn = ''
-      } else {
+        this.areabtn = ''
+      }else if (v ==2) {
         this.orgbtn = ''
         this.plebtn = 'primary'
+        this.areabtn = '' 
+      } else {
+        this.areabtn = 'primary'
+        this.orgbtn = ''
+        this.plebtn = ''
       }
     },
     setOrgTotal(n) {
@@ -98,6 +127,11 @@ export default {
     setPleTotal(n) {
       this.pleTotal = n
     },
+    //刷新机构和人员
+    setOrgAndPeople(){
+      this.$refs.org.initRange();
+      this.$refs.renyaun.initRange();
+    },
     goManger() {
       this.$router.push(`/admin-manage?circleId=${this.circleId}&circleName=${this.circleName}`)
     },

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

@@ -45,7 +45,7 @@
           <el-button size="small"  @click="resetOrgOrPerson()" :disabled="checked"huang>取消搜索</el-button>
         </el-form-item>
       </el-form>
-        <el-checkbox v-if="showSelectAll" v-model="checked" @change="handleCheckAllChange" >全部({{ totalOrganization }})</el-checkbox>
+        <!-- <el-checkbox v-if="showSelectAll" v-model="checked" @change="handleCheckAllChange" >全部({{ totalOrganization }})</el-checkbox> -->
       <el-table class="rim" ref="multipleOrganization"  :data="tableOrganization" tooltip-effect="dark" @select-all="selectAllOrganization" @select="selectOrganization" >
         <el-table-column type="selection" :selectable="selectableTableList"></el-table-column>
         <el-table-column prop="orgName" label="医院名称" align="center"></el-table-column>

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

@@ -47,13 +47,14 @@
       <el-table-column prop="cityName" label="所属城市" align="center"></el-table-column>
       <el-table-column prop="countyName" label="所属区县" align="center"></el-table-column>
       <el-table-column prop="townName" label="所属街道" align="center"></el-table-column>
+      <el-table-column prop="sourceName" label="来源" align="center"></el-table-column>
       <el-table-column
         fixed="right"
         label="操作"
         align="center"
         width="140">
         <template slot-scope="scope">
-          <el-button @click="detel(scope.row)" type="text" size="small" style="color:red">删除</el-button>
+          <el-button @click="detel(scope.row)" type="text" size="small" style="color:red" v-if="scope.row.source != 1">删除</el-button>
         </template>
       </el-table-column>
       <div slot="empty">

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

@@ -257,7 +257,7 @@ export default {
           value: 0
         },
         {
-          label: '可访问本圈的机构',
+          label: '可访问本圈的地区/机构',
           value: 1
         },
         {

src/utils/fetch.js

@@ -56,6 +56,7 @@ service.interceptors.request.use(config => {
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = '00AB2FF7626D4F5FB627399EDF23F5DC';
       config.headers['token'] = localStorage.getItem('storageToken')
+ 
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/utils/yqrange/yqrangeApi.js

@@ -276,3 +276,21 @@ export const getExamAwardList = (params) => {
   })
 };
 
+export const getCircleTree = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/region/tree/${params.circleId}`),
+    method: 'get',
+    data: params,
+    description: '根据圈子id获取树结构',
+  })
+};
+export const  postCircleTree = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl('circle/region/tree'),
+    method: 'post',
+    data: params,
+    description: '保存区域',
+  })
+};