屏蔽情况

src/utils/operation.js

@@ -294,6 +294,16 @@ export function setRegionOption(data) {
   }
   return option;
 }
+export function setRegionOption2(data) {
+  let option = [];
+  for (let i = 0; i < data.length; i++) {
+    let obj = data[i];
+    obj.label = data[i].provinceName;
+    obj.value = data[i].provinceId;
+    option.push(obj);
+  }
+  return option;
+}
 export function getRegionOption() {
   let option = [{
     value: 1,

src/views/education/item-shield.vue

@@ -6,19 +6,31 @@
         <el-radio-button label="0">屏蔽机构</el-radio-button>
         <el-radio-button label="1">屏蔽人员</el-radio-button>
       </el-radio-group>
-      <el-button class="complete" type="primary" size="small" @click="complete">完成</el-button>
+      <!-- <el-button class="complete" type="primary" size="small" @click="complete">完成</el-button> -->
       <el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;">
         <el-form :model="formInline" ref="formInline" label-width="75px" class="form-inline">
           <el-col :span="6" v-if=" shieldType == 0">
             <el-form-item label="地区：">
-              <el-select size="small" v-model="formInline.administrativeId" placeholder="请选择地区">
+              <!-- <el-select size="small" v-model="formInline.administrativeId" placeholder="请选择地区">
                 <el-option
                   v-for="(item, index) in areaList"
                   :key="index"
                   :label="item.label"
                   :value="item.value"
                 ></el-option>
-              </el-select>
+              </el-select> -->
+              <el-cascader
+                size="small"
+                ref="cascaderRegion"
+                :options="optionsRegion"
+                :props="props"
+                v-model="formInline.region"
+                @change="handleChange"
+                filterable
+                change-on-select
+                placeholder="请选择地区"
+               
+              ></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -88,11 +100,7 @@
           :total="totalRows"
         ></el-pagination>
       </div>
-      <el-dialog
-        title="提醒"
-        :visible.sync="dialogShow"
-        width="30%"
-        center>
+      <el-dialog title="提醒" :visible.sync="dialogShow" width="30%" center>
         <p v-if="shieldType == 0 && shieldBlock == 1">屏蔽后该机构将从圈选机构范围内去除，确定继续屏蔽吗？</p>
         <p v-if="shieldType == 0 && shieldBlock == 2">取消屏蔽后该机构将恢复到圈选范围，确定要取消屏蔽吗？</p>
         <p v-if="shieldType == 1 && shieldBlock == 1">屏蔽后该人员将从圈选人员范围内去除，确定要继续屏蔽吗？</p>
@@ -110,6 +118,7 @@ import BreadCrumb from "../../components/breadcrumb.vue";
 import { mapGetters } from "vuex";
 import { openLoading, closeLoading } from "../../utils/utils";
 import * as commonUtil from "../../utils/utils";
+import * as operationData from "../../utils/operation";
 let vm = null;
 export default {
   components: {
@@ -122,7 +131,8 @@ export default {
       projectId: "",
       shieldType: 0,
       formInline: {
-        administrativeId: 0,
+        region: [],
+        administrativeId: "",
         hospitalName: "",
         doctorName: "",
         blackStatus: 0,
@@ -143,6 +153,7 @@ export default {
           value: 2
         }
       ],
+      optionsRegion: [],
       areaList: [
         {
           label: "全部地区",
@@ -152,8 +163,44 @@ export default {
       tableData: [],
       totalRows: 0,
       dialogShow: false,
-      shieldBlock: '',
+      shieldBlock: "",
       scopeRow: {},
+      administrativeValue: '',
+      props: {
+        lazy: true,
+        lazyLoad(node, resolve) {
+          const { level } = node;
+          console.log("node", node);
+          if (node.level == 1) {
+            let req = {
+              provinceId: node.data.value
+            };
+            vm.GET("basic-data/position/cities", req).then(res => {
+              let newData = vm.setMoreOption(res.data.cityList, "cities");
+              console.log("newData", newData);
+              resolve(newData);
+            });
+          } else if (node.level == 2) {
+            let req = {
+              cityId: node.data.value
+            };
+            vm.GET("basic-data/position/counties", req).then(res => {
+              let newData = vm.setMoreOption(res.data.countyList, "counties");
+              console.log("newData", newData);
+              resolve(newData);
+            });
+          } else if (node.level == 3) {
+            let req = {
+              countyId: node.data.value
+            };
+            vm.GET("basic-data/position/towns", req).then(res => {
+              let newData = vm.setMoreOption(res.data.townList, "towns");
+              console.log("newData", newData);
+              resolve(newData);
+            });
+          }
+        }
+      }
     };
   },
   computed: {
@@ -162,19 +209,8 @@ export default {
   created() {
     vm = this;
     vm.projectId = vm.getUrlSearch(window.location.href, "projectId");
-    this.search();
-    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 "关闭提示";
-      }
-    };
+    vm.getRegionOption();
+    vm.search();
   },
   // 挂载到Dom完成时
   mounted: function() {
@@ -205,6 +241,47 @@ export default {
   },
   destroyed() {},
   methods: {
+    handleChange(value) {
+      let areaId = '000';
+      for(let i=0;i<value.length;i++) {
+        areaId += '_'+value[i];
+      }
+      vm.administrativeValue = areaId;
+      console.log(value,vm.administrativeValue);
+     },
+    //获取地区
+    getRegionOption() {
+      let req = {};
+      openLoading(vm);
+      vm.GET("basic-data/position/provinces", req).then(res => {
+        closeLoading(vm);
+        if (res.code == "000000") {
+          vm.optionsRegion = operationData.setRegionOption2(
+            res.data.provinceList
+          );
+        }
+      });
+    },
+    setMoreOption(data, type) {
+      let option = [];
+      for (let i = 0; i < data.length; i++) {
+        let obj = data[i];
+        if (type == "cities") {
+          obj.label = data[i].cityName;
+          obj.value = data[i].cityId;
+        } else if (type == "counties") {
+          obj.label = data[i].countyName;
+          obj.value = data[i].countyId;
+          // obj.leaf = true;
+        } else if (type == "towns") {
+          obj.label = data[i].townName;
+          obj.value = data[i].townId;
+          obj.leaf = true;
+        }
+        option.push(obj);
+      }
+      return option;
+    },
     searchList() {
       this.formInline.pageNo = 1;
       this.search();
@@ -212,7 +289,7 @@ export default {
     search() {
       if (vm.shieldType == 0) {
         let req = {
-          administrativeId: vm.formInline.administrativeId,
+          administrativeId: vm.administrativeValue,
           blackStatus: vm.formInline.blackStatus,
           hospitalName: vm.formInline.hospitalName,
           pageNo: vm.formInline.pageNo,
@@ -222,7 +299,6 @@ export default {
         openLoading(vm);
         vm.GET("portal/black/getScopeHospitalWithBlack", req).then(res => {
           closeLoading(vm);
-          console.log(res);
           vm.tableData = res.data.list;
           vm.totalRows = res.data.count;
         });
@@ -238,7 +314,6 @@ export default {
         openLoading(vm);
         vm.GET("portal/black/getScopePeopleWithBlack", req).then(res => {
           closeLoading(vm);
-          console.log(res);
           vm.tableData = res.data.list;
           vm.totalRows = res.data.count;
         });
@@ -252,10 +327,10 @@ export default {
     // 屏蔽/取消屏蔽
     changeStatus() {
       let row = vm.scopeRow;
-      let option = '';
-      if(row.blackStatus == 2) {
+      let option = "";
+      if (row.blackStatus == 2) {
         option = 1;
-      } else if(row.blackStatus == 1) {
+      } else if (row.blackStatus == 1) {
         option = 2;
       }
       if (vm.shieldType == 0) {
@@ -269,6 +344,7 @@ export default {
         vm.GET("portal/black/setHospitalBlackStatus", req).then(res => {
           closeLoading(vm);
           vm.dialogShow = false;
+          vm.search();
         });
       } else if (vm.shieldType == 1) {
         //屏蔽人员
@@ -281,6 +357,7 @@ export default {
         vm.GET("portal/black/setPeopleBlackStatus", req).then(res => {
           closeLoading(vm);
           vm.dialogShow = false;
+          vm.search();
         });
       }
     },
@@ -298,7 +375,7 @@ export default {
       vm.formInline = Object.assign(
         {},
         {
-          administrativeId: 0,
+          administrativeId: "",
           hospitalName: "",
           doctorName: "",
           blackStatus: 0,