修改选择地区逻辑

src/views/learning/item-data-all.vue

@@ -518,6 +518,7 @@ export default {
       }
     },
     gethHspitalsCnt() {
+      if (vm.formInline.organization.length == 0) {//无机构
         let req = {
           projectId: vm.projectId,
           // regionId: vm.formInline.region[vm.formInline.region.length - 1]
@@ -526,14 +527,15 @@ export default {
         vm.GET("stats/region/hospitals/cnt", req, '', '', true).then(res => {
           if (res.code == "000000") {
             vm.hospitalCnt = res.data.hospitalCnt;
-          // vm.hospitalCnt = 1;
             if(vm.hospitalCnt == 1) {
               vm.hospitalCutList = res.data.list;
             }
-          // vm.searchType();
-          vm.getDisplay();
           }
         });
+      }else {
+        vm.hospitalCnt = 1;
+      }
+      vm.getDisplay();
     },
     getDisplay() {
       let reqInfo = {
@@ -585,10 +587,10 @@ export default {
         pageNo: vm.formTable.pageNo,
         pageSize: vm.formTable.pageSize,
       };
-      if(req.hospitalIdList.length == 0) {
-        req.hospitalIdList = [];
-        req.hospitalIdList[0] = vm.hospitalCutList[0].hospitalId;
-      }
+      // if(req.hospitalIdList.length == 0) {
+      //   req.hospitalIdList = [];
+      //   req.hospitalIdList[0] = vm.hospitalCutList[0].hospitalId;
+      // }
       vm.loadingTable = true;
       vm.POST("stats/report/generalPersonal/"+vm.tableType, req, '', '', true).then(res => {
         if (res.code == "000000") {

src/views/learning/item-list.vue

@@ -329,6 +329,8 @@ export default {
       maxDate: '',
       minDate: '',
       allRegionId: '',
+      selectRegionId: '',
+      orgId: '',
       containOfficialFlag: 1,
       showRadio: 0,
       containHospitalFlag: null, //新增判断是否当前有机构
@@ -362,9 +364,6 @@ export default {
     this.curmbThird = vm.getUrlSearch(window.location.href, "projectName");
     this.downloadId = vm.getUrlSearch(window.location.href, "downloadId");
     this.checkShowType();
-    // this.getDisplay();
-    // this.search();
-    // this.getRegionOption();
   },
   mounted: function() {
     commonUtil.resizeHeight();
@@ -449,6 +448,7 @@ export default {
       }
     },
     getDisplay(type) {
+      //获取地区
       vm.getRegionOption();
 
       /*let reqInfo = {
@@ -513,18 +513,6 @@ export default {
         vm.areaLen = 1;
         vm.organizationNotice = "选择地区筛选到区才能选择机构";
       }
-
-      //这里需要判断当前选中项的degree是否是5，如果是5那就不需要再调接口
-      if (node.data && node.data.id && node.data.degree == 5) {
-        let changeItemData = node.data.id;
-        let subIndex = changeItemData.lastIndexOf('_');
-        vm.formInline.selectRegionId = changeItemData.slice(0, subIndex);
-        vm.formInline.orgId = changeItemData.slice(subIndex + 1);
-      }else {
-        vm.formInline.selectRegionId = node.data.id;
-        vm.formInline.orgId = '';
-      }
-      vm.gethHspitalsCnt()
       //添加子节点
       if(node.data && node.data.id && node.hasChildren === true && node.loaded === false) {
         let req = {
@@ -536,6 +524,21 @@ export default {
           vm.searchNode(vm.optionsRegion, node.data.id, newData);
         });
       }
+      vm.formInline.organization = [];
+      //这里需要判断当前选中项的degree是否是5，如果是5那就不需要再调接口
+      if (node.data && node.data.id && node.data.degree == 5) {
+        let changeItemData = node.data.id;
+        let subIndex = changeItemData.lastIndexOf('_');
+        vm.formInline.selectRegionId = changeItemData.slice(0, subIndex);
+        vm.formInline.orgId = changeItemData.slice(subIndex + 1);
+        vm.formInline.organization.push(vm.formInline.orgId);
+        vm.hospitalCnt = 1;
+        vm.search();
+      }else {
+        vm.formInline.selectRegionId = node.data.id;
+        vm.formInline.orgId = '';
+        vm.gethHspitalsCnt()
+      }
     },
     //给级联插入新获取数据的操作-即添加子节点
     searchNode(val,id,data){
@@ -645,40 +648,47 @@ export default {
           vm.minDate = new Date(doctorInfoRep.minDate);
           vm.containOfficialFlag = doctorInfoRep.containOfficialFlag;
           vm.finalDateFlag = doctorInfoRep.finalDateFlag;
-          vm.setTimeFlagList();
+          vm.setTimeFlagList(); //设置选择时间
 
-          if (vm.showOriginal == 2) {
-            this.formInline.checked = true;
+          if (vm.showOriginal == 2) {//是否显示原始数据，1显示，2不显示
+            vm.formInline.checked = true;
           }
           vm.formInline.region = [];
           vm.formInline.region[0] = res.data.list[0].id;
-          vm.allRegionId = res.data.list[0].id; //存储当前所在机构id
+          vm.allRegionId = res.data.list[0].id; //存储当前所在id
           vm.optionsRegion = operationData.setRegionOptionNew(
             res.data.list
           );
-
-          //初始化判断区域id 是不是有机构id
-          let value = res.data.list[0].id;
-          let areaArr = value.split('_');
-          vm.areaLen = areaArr.length;
-          // if (areaArr.length >= 3) { //V2.1舍弃
-          //   vm.getOrganizationList();
-          //   vm.organizationNotice = "请选择机构";
-          // }
-          // vm.search(); // deleted by Anndy Yang
-
           //判断是否有机构,有的情况就需要拆分出regionId和orgId
           let firstItemData = res.data.list[0];
+          let value = res.data.list[0].id;
+          vm.formInline.organization = [];
           if (firstItemData.degree == 5) {
-            let subIndex = firstItemData.id.lastIndexOf("_");
+            let subIndex = value.lastIndexOf("_");
             vm.formInline.selectRegionId = value.slice(0, subIndex);
             vm.formInline.orgId = value.slice(subIndex + 1);
+            vm.hospitalCnt = 1;
+            vm.formInline.organization.push(vm.formInline.orgId);
+            // vm.hospitalCntList = res.data.list
+            // vm.organizationList = [];
+            vm.search();
           }else {
             vm.formInline.selectRegionId = value;
             vm.formInline.orgId = '';
-          }
             vm.gethHspitalsCnt();
           }
+          vm.selectRegionId = vm.formInline.selectRegionId; //作存储
+          vm.orgId = vm.formInline.orgId; //作存储
+          //初始化判断区域id 是不是有机构id
+          // let value = res.data.list[0].id;
+          // let areaArr = value.split('_');
+          // vm.areaLen = areaArr.length;
+          // if (areaArr.length >= 3) { //V2.1舍弃
+          //   vm.getOrganizationList();
+          //   vm.organizationNotice = "请选择机构";
+          // }
+          // vm.search(); // deleted by Anndy Yang
+        }
       });
     },
     //获取机构-老的接口-需要
@@ -691,10 +701,10 @@ export default {
       vm.GET("stats/region/hospitals/cnt", req, '', '', false).then(res => {
         if (res.code == "000000") {
           vm.hospitalCnt = res.data.hospitalCnt;
-          vm.hospitalCntList = res.data.list
+          vm.hospitalCntList = res.data.list; //当前选中区域下的机构列表
           vm.formInline.organization = [];
-          vm.organizationList = [];
-          // 只有一个机构时，所有请求中要传递机构ID added by Anndy Yang
+          vm.organizationList = [];//选择机构操作被弃用
+          // 选中区域下只有一个机构时，所有请求中要传递机构ID added by Anndy Yang
           if(vm.hospitalCntList.length == 1) {
             let obj = {
               index: 0,
@@ -703,7 +713,6 @@ export default {
             };
             vm.organizationList.push(obj);
             vm.formInline.organization.push(vm.hospitalCntList[0].hospitalId);
-            // vm.formInline.organization[0] = vm.hospitalCntList[0].hospitalId;
           }
           vm.search(); // added by Anndy Yang
         }
@@ -854,9 +863,18 @@ export default {
           during: null,
           pageNo: 1,
           pageSize: 20,
+          orgId: '',
+          selectRegionId: '',
         }
       );
       vm.formInline.region[0] = vm.allRegionId;
+      vm.formInline.selectRegionId = vm.selectRegionId;
+      if (vm.orgId) {
+        vm.formInline.organization[0] = vm.orgId;
+      }
+      if (vm.showOriginal == 2) {//是否显示原始数据，1显示，2不显示
+        vm.formInline.checked = true;
+      }
       vm.areaLen = 0;
       vm.tags = [];