联调设置管理员接口

src/utils/filter.js

@@ -307,24 +307,16 @@ const vueFilter = {
         }
     },
     roleAdminStatus: (value) => {
-    if(value == 1) {
+    if(value == 0) {
         return '普通成员';
-    } else if(value == 2) {
-        return '主管理员';
-    }else if(value == 3) {
-        return '高级主管理员';
-    }else if(value == 4) {
+    }else if(value == 1) {
         return '管理员';
     }
   },
   roleAdminButton: (value) => {
-    if(value == 1) {
+    if(value == 0) {
         return '升为管理员';
-    } else if(value == 2) {
-        return '';
-    }else if(value == 3) {
-        return '';
-    }else if(value == 4) {
+    } else if(value == 1) {
         return '降为普通成员';
     }
   },

src/views/yqrange/admin-manage.vue

@@ -29,19 +29,20 @@
           </el-col>
           <el-col :span="6" style="padding:0;text-align:right;padding-right:10px;">
             <el-button type="primary" size="small" @click="searchList()">搜索</el-button>
+            <el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
           </el-col>
         </el-form>
       </el-row>
       <el-table :data="tableData" style="width: 100%">
-        <el-table-column  prop="doctorName" label="人员名称" align="center"></el-table-column>
-              <el-table-column  prop="departmentName" label="所属科室" align="center"></el-table-column>
-        <el-table-column  prop="hospitalName" label="所属医院" align="center"></el-table-column>
+        <el-table-column  prop="name" label="人员名称" align="center"></el-table-column>
+              <el-table-column  prop="department" label="所属科室" align="center"></el-table-column>
+        <el-table-column  prop="hospital" label="所属医院" align="center"></el-table-column>
         <el-table-column prop="provinceName" label="所属省份" align="center"></el-table-column>
         <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 fixed="right" label="角色" align="center">
-          <template slot-scope="scope"><p>{{ scope.row.blackStatus | roleAdminStatus }}</p></template>
+          <template slot-scope="scope"><p>{{ scope.row.roleId | roleAdminStatus }}</p></template>
         </el-table-column>
         <el-table-column fixed="right" label="操作" width="150" align="center">
           <template slot-scope="scope">
@@ -49,7 +50,7 @@
               type="text"
               size="small"
               @click="openDialog(scope.row)"
-            >{{ scope.row.blackStatus | roleAdminButton }}</el-button>
+            >{{ scope.row.roleId | roleAdminButton }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -65,14 +66,6 @@
           :total="totalRows"
         ></el-pagination>
       </div>
-      <el-dialog title="提醒" :visible.sync="dialogShow" width="30%" center>
-        <p v-if="shieldType == 1 && shieldBlock == 1">屏蔽后该人员将从圈选人员范围内去除，确定要继续屏蔽吗？</p>
-        <p v-if="shieldType == 1 && shieldBlock == 2">取消屏蔽后该人员将恢复到圈选范围，确定要取消屏蔽吗？</p>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="dialogShow = false">取 消</el-button>
-          <el-button type="primary" @click="changeStatus()">确 定</el-button>
-        </span>
-      </el-dialog>
     </div>
   </div>
 </template>
@@ -91,14 +84,14 @@ export default {
     return {
       curmbFirst: "云鹊小圈",
       curmbSecond: "设置管理员",
-      projectId: "",
-      shieldType: 1,
+      circleId: "",
+ 
       formInline: {
         region: ["0"],
         administrativeId: "",
-        hospitalName: "",
-        doctorName: "",
-        blackStatus: 0,
+        orgName: "",
+        name: "",
+        roleId: -1,
         pageNo: 1,
         pageSize: 10
       },
@@ -111,29 +104,14 @@ export default {
           label: "普通成员",
           value: 1
         },
-        {
-          label: "主管理员",
-          value: 2
-        },
-        {
-          label: "高级主管理员",
-          value: 3
-        },
         {
           label: "管理员",
-          value: 4
-        }
-      ],
-      areaList: [
-        {
-          label: "全部地区",
-          value: 0
+          value: 2
         }
       ],
       tableData: [],
       totalRows: 0,
-      dialogShow: false,
-      shieldBlock: "",
+      shieldBlock: "",//当前角色id
       scopeRow: {},
       administrativeValue: "",
       props: {
@@ -178,36 +156,13 @@ export default {
   },
   created() {
     vm = this;
-    vm.projectId = 809;
+    vm.circleId = 129;
     vm.search();
   },
   // 挂载到Dom完成时
   mounted: function() {
-    // window.onbeforeunload = function(e) {
-    //   let pathname = location.href.split("/");
-    //   pathname = pathname[pathname.length - 1];
-    //   console.log(pathname);
-    //   if (pathname == "item-shield") {
-    //     e = e || window.event;
-    //     if (e) {
-    //       e.returnValue = "数据不会保存";
-    //     }
-    //     return "数据不会保存";
-    //   }
-    // };
-
     commonUtil.resizeHeight();
   },
-  // beforeRouteLeave(to, from, next) {
-  //   const answer = window.confirm(
-  //     "Do you really want to leave? you have unsaved changes!"
-  //   );
-  //   if (answer) {
-  //     next();
-  //   } else {
-  //     next(false);
-  //   }
-  // },
   methods: {
     handleChange(value) {
       let areaId = "000";
@@ -246,15 +201,15 @@ export default {
     },
     search() {
         let req = {
-          blackStatus: vm.formInline.blackStatus,
-          hospitalName: vm.formInline.hospitalName,
-          doctorName: vm.formInline.doctorName,
+          roleId: vm.formInline.blackStatus-1,
+          orgName: vm.formInline.hospitalName,
+          name: vm.formInline.doctorName,
           pageNo: vm.formInline.pageNo,
           pageSize: vm.formInline.pageSize,
-          projectId: vm.projectId
+          circleId: vm.circleId
         };
         openLoading(vm);
-        vm.GET("portal/black/getScopePeopleWithBlack", req).then(res => {
+        vm.POST("circle/circle/role/manager/search", req).then(res => {
           closeLoading(vm);
           vm.setTable(res);
           // vm.tableData = res.data.list;
@@ -265,41 +220,67 @@ export default {
       vm.tableData = [];
       vm.totalRows = 0;
       if (res.code == "000000") {
-        vm.tableData = res.data.list;
-        vm.totalRows = res.data.count;
+        vm.tableData = res.data.memberList;
+        vm.totalRows = res.data.total;
       } else {
         vm.$message(res.message);
       }
     },
     openDialog(row) {
       vm.scopeRow = row;
-      vm.shieldBlock = row.blackStatus;
-      vm.dialogShow = true;
+      vm.shieldBlock = row.roleId;
+      if (row.roleId == 0) {
+          this.$confirm(`确定要将普通成员“${row.name}”升为管理员？`, '', {
+        confirmButtonText: '确 定',
+        cancelButtonText: '取消',
+        type: 'warning',
+        customClass: 'range-make-box',
+      }).then(() => {
+        //  confirm
+       this.changeStatus()
+      }).catch(() => {
+        //  cancel
+      });
+      }
+      if (row.roleId == 1) {
+            this.$confirm(`确定要将管理员员“${row.name}”降为普通成员？`, '', {
+        confirmButtonText: '确 定',
+        cancelButtonText: '取消',
+        type: 'warning',
+        customClass: 'range-make-box',
+      }).then(() => {
+        //  confirm
+       this.changeStatus()
+      }).catch(() => {
+        //  cancel
+      });
+      }
+        
     },
-    // 屏蔽/取消屏蔽
+    // 升为管理员/降为普通成员
     changeStatus() {
       let row = vm.scopeRow;
       let option = "";
-      if (row.blackStatus == 2) {
+      if (row.roleId == 0) {
         option = 1;
-      } else if (row.blackStatus == 1) {
-        option = 2;
+      } else if (row.roleId == 1) {
+        option = 0;
       }
-if (vm.shieldType == 1) {
-        //屏蔽人员
+        //升为管理员
         let req = {
-          blackStatus: option,
-          doctorId: row.doctorId,
-          projectId: vm.projectId
+          roleId: option,
+          id: row.id,
+          circleId: vm.circleId
         };
         openLoading(vm);
-        vm.POST("portal/black/setPeopleBlackStatus", req).then(res => {
+        vm.POST("circle/circle/role/manager/update", req).then(res => {
           closeLoading(vm);
-          vm.dialogShow = false;
+          if (res.data == -1) {
+            vm.$message.error("暂不能升级，请先将该成员移除黑明单;同时不做升级操作");
+          }
           vm.$message(res.message);
           vm.search();
         });
-      }
     },
     complete() {
       console.log("完成");