Merge branch 'dev-yqLive-20200611' into 'release'

修改成员管理和提示信息，Code Review: bo.dang



See merge request !170

src/App.vue

@@ -150,7 +150,6 @@ export default {
 					vm.portrait = res.data.imageUrl
 					vm.authList = res.data.auth
           vm.getUserName(vm.userName);
-					// vm.getCircleRoleData();
 				} else {
 					vm.$message.info(res.message)
 				}
@@ -164,6 +163,9 @@ export default {
       }
     },
     getCircleRoleData() {
+      localStorage.removeItem('mainManager');
+      localStorage.removeItem('manager');
+      localStorage.removeItem('ordinary');
       getCircleRole({}).then((res) => {
         if(res.code == '000000') {
           //mainManager主管理员，manager管理员，ordinary普通人

src/components/yqrange/organzation.vue

@@ -130,7 +130,8 @@
         let circleId = this.formData.id;
         this.getRegionOption();
         this.listLevels();
-        this.getOrganization();
+        // this.getOrganization();
+        // this.searchOrganization();
         this.activeName = "second";
         this.formOrganization.pageNum = 1;
         this.formOrganization.name = "";
@@ -173,8 +174,9 @@
               vm.optionsRegion = operationData.setRegionOption3(
               res.data.provinceList
             );
+
             }
-           
+            this.getOrganization();
           } else {
             this.$message(res.message);
           }
@@ -230,7 +232,7 @@
         if (setList.length > 0) {
           let req = {
             ids: setList,
-            projectId: this.circleId,
+            circleId: this.circleId,
             type: typeStatus
           };
           openLoading(vm);
@@ -292,9 +294,23 @@
       //查询机构列表
       getOrganization() {
         let idType = localStorage.getItem("storageIdType");
+
+        let administrativeIdItem = "";
+        // 如果是外部用户（2），只能看到所在省份的数据
+        if(idType == 2){
+          let optionRegionArray = new Array();
+          optionRegionArray.push(this.optionsRegion[0].provinceId);
+          administrativeIdItem = operationData.setAdministrativeId(
+            optionRegionArray
+          );
+        }
+
+        console.log(administrativeIdItem);
+        // let administrativeIdItem = "";
+
         let req = {
           circleId: this.circleId,
-          districtIds: "",
+          districtIds: administrativeIdItem,
           orgLevel:"",
           orgName: this.formOrganization.name,
           pageNo: this.formOrganization.pageNum,
@@ -419,4 +435,4 @@
       }
     }
   }
-</script>
+</script>
\ No newline at end of file

src/views/layout/slidebar.vue

@@ -48,6 +48,7 @@
   import { setTimeout } from 'timers'
   import { isNotEmptyUtils } from '../../utils/utils'
   import { getUserTypeReq } from '@/utils/cme/cmeApi'
+  import { getCircleRole } from '@/utils/patients/patientsapi'
 
   let vm = null
   export default {
@@ -70,6 +71,16 @@
         type: Boolean,
         default: false
       },
+      roleObj: {
+        type: Object,
+        default(){
+          return {
+            mainManager: null,
+            manager: null,
+            ordinary: null,
+          }
+        }
+      }
     },
     data() {
       return {
@@ -201,7 +212,12 @@
       this.getUserType();
     },
     mounted(){
-
+      if(this.storageIdType == 1){
+        vm.setEntrySide();
+      } else if(this.storageIdType == 2) {
+        vm.setFollowSide();
+        vm.getRoleObj();
+      }
     },
     watch: {
       authList(newVal, oldVal){
@@ -215,11 +231,17 @@
           vm.items[2].subs[0].index = 'blank'
         }
       },
-      storageIdType(val,ov){
+      storageIdType(val){
         if(val == 1){
           vm.setEntrySide();
         } else if(val == 2) {
           vm.setFollowSide();
+          let mainManager = localStorage.getItem('mainManager')
+          let manager = localStorage.getItem('manager')
+          console.log('存储权限值',mainManager,manager)
+          if (mainManager == 1 || manager == 1) {
+            vm.setCircleSize();
+          }
         }
       },
     },
@@ -251,6 +273,42 @@
           this.$message.error('请求失败');
         });
       },
+      setStoreData(value) {
+        if (value){
+          return 1;
+        }else {
+          return 0;
+        }
+      },
+      getRoleObj() {
+        getCircleRole({}).then((res) => {
+          localStorage.removeItem('mainManager');
+          localStorage.removeItem('manager');
+          localStorage.removeItem('ordinary');
+          if(res.code == '000000') {
+            //mainManager主管理员，manager管理员，ordinary普通人
+            const { mainManager, manager, ordinary} = res.data;
+            localStorage.setItem('mainManager', vm.setStoreData(mainManager))
+            localStorage.setItem('manager', vm.setStoreData(manager))
+            localStorage.setItem('ordinary', vm.setStoreData(ordinary))
+            if (mainManager || manager) {
+              // vm.items.push(yqRange);
+              vm.setCircleSize();
+            }
+          } else {
+            vm.$message.info(res.message)
+          }
+        })
+      },
+      setCircleSize(){
+        console.log('设置云鹊小圈')
+        const yqRange = {
+          title: '云鹊小圈',
+          icon: 'el-icon-setting',
+          index: 'yq-range'
+        };
+        vm.items.push(yqRange);
+      },
       setFollowSide(){
         const followSider =  {
           title: '履约管理',
@@ -321,15 +379,12 @@
         vm.items.push(followSider);
         vm.items.push(patients);
         vm.items.push(message);
-        let mainManager = localStorage.getItem('mainManager')
-        let manager = localStorage.getItem('manager')
-        let ordinary = localStorage.getItem('ordinary')
-        console.log('zhu',mainManager)
-        console.log('guan',manager)
-        console.log('pu',ordinary)
-        if (mainManager == 1 || manager == 1) {
-          vm.items.push(yqRange);
-        }
+
+        // let mainManager = localStorage.getItem('mainManager')
+        // let manager = localStorage.getItem('manager')
+        // if (mainManager == 1 || manager == 1) {
+        //   vm.items.push(yqRange);
+        // }
       },
 
       setEntrySide() {

src/views/yqrange/role-manage.vue

@@ -370,15 +370,15 @@ export default {
                 });
                 // vm.search();
                 vm.searchList();
-                if (res.message != "success") {
-                  vm.$message({
-                    message: res.message,
-                    type: "warning"
-                  });
-                }
+                // if (res.message != "success") {
+                //   vm.$message({
+                //     message: res.message,
+                //     type: "warning"
+                //   });
+                // }
               } else {
                 // vm.$message.info(res.message);
-                vm.$message.info("操作失败，请重试");
+                vm.$message.error("操作失败，请重试");
               }
             })
             .catch(function(error) {

src/views/yqrange/yq-range.vue

@@ -114,9 +114,10 @@ export default {
 
     initPrivilege(){
       let idType = localStorage.getItem('storageIdType');
-      if(idType == null || idType == ""){
-        idType = 1;
-      }
+      // if(idType == null || idType == ""){
+      //   idType = 2;
+      //   localStorage.setItem('storageIdType', idType);
+      // }
       this.searchForm.userType = idType;
 
       // 内部用户:运营人员
@@ -167,10 +168,11 @@ export default {
           this.tableData = [];
         }
       }).catch((error) => {
-        this.$message({
-          message: error,
-          type: 'error'
-        });
+        // this.$message({
+        //   message: error,
+        //   type: 'error'
+        // });
+        this.$message.error("请重试");
       })
     },
 
@@ -233,20 +235,27 @@ export default {
           this.searchList();
         } else {
           if(status == "40"){
-            this.$message.success("下线失败，请重试");
+            this.$message.error("下线失败，请重试");
           } else if(status == "30") {
-            this.$message.success("上线失败，请重试");
+            this.$message.error("上线失败，请重试");
           }else if(status == "50") {
-            this.$message.success("解散失败，请重试");
+            this.$message.error("解散失败，请重试");
           }
 
 
         }
       }).catch((error) => {
-        this.$message({
-          message: error,
-          type: 'error'
-        });
+        // this.$message({
+        //   message: error,
+        //   type: 'error'
+        // });
+        if(status == "40"){
+          this.$message.error("下线失败，请重试");
+        } else if(status == "30") {
+          this.$message.error("上线失败，请重试");
+        }else if(status == "50") {
+          this.$message.error("解散失败，请重试");
+        }
       })
 
 
@@ -279,7 +288,7 @@ export default {
     },
     //解散圈子
     deleteRange(row) {
-      this.$confirm(`确定解散“${row.name}”吗？`, '解散后圈子内的动态/直播等内容将不会保存', {
+      this.$confirm(`解散后圈子内的动态/直播等内容将不会保存`, `确定解散“${row.name}”吗？`, {
         confirmButtonText: '解散',
         cancelButtonText: '取消',
         type: 'warning',