小生接口联调

src/utils/qiniu-util.js

@@ -455,7 +455,7 @@ export const doUpload = (self,file, filePath, previewId,progressId, fileType) =>
                     //     obj.css('max-width', '100%');
                     // }
 
-                },2000);
+                },500);
 
             };
 

src/views/education/add-manager.vue

@@ -173,11 +173,11 @@
           <el-form-item label="">
             <el-radio-group
               size="small"
-              v-model="formData.range"
-              :disabled="peopleLevel == 'L3'"
+              v-model="formData.scopeType"
+              :disabled="peopleLevel == 'L3' || projectStatus != 1"
             >
-              <el-radio :label="1">使用地区范围</el-radio>
-              <el-radio :label="2">使用小生态范围</el-radio>
+              <el-radio :label="0">使用地区范围</el-radio>
+              <el-radio :label="1">使用小生态范围</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="添加下载文件：">
@@ -204,7 +204,7 @@
         </el-form>
       </div>
       <div class="second-step" v-else-if="active === 1">
-        <div v-if='formData.range !=2'>
+        <div v-if='formData.scopeType != 1'>
           <el-tabs v-model="activeName" @tab-click="handleClickTabs">
             <el-tab-pane v-if="idType != 2" label="设定行政范围" name="first">
               <el-row :gutter="20">
@@ -474,7 +474,7 @@
                 </el-select>
               </el-form-item>
               <span class="span_ecology">{{ checkedEcology }}</span>
-              <el-form-item style="float:right;">
+              <!-- <el-form-item style="float:right;">
                 <el-button-group>
                   <el-button
                     size="small"
@@ -487,21 +487,23 @@
                     @click="checkAllEcology(false)"
                   >全部不选</el-button>
                 </el-button-group>
-              </el-form-item>
+              </el-form-item> -->
             </el-form>
+          <!-- 
+            @selection-change="selectionChangeEcology"
+            :row-key="getRowKeysEcology"
+          -->
           <el-table
             class="rim"
             ref="multipleEcology"
             :data="tableEcology"
             tooltip-effect="dark"
             style="width: 100%"
-            @selection-change="selectionChangeEcology"
-            :row-key="getRowKeysEcology"
           >
             <el-table-column
               type="selection"
               width="55"
-              :selectable="selectableTableList"
+              :selectable="selectableTableEcology"
               :reserve-selection="true"
             ></el-table-column>
             <el-table-column prop="name" label="医院名称" min-width="100" align="center"></el-table-column>
@@ -666,7 +668,7 @@ export default {
         attachmentUrl3: "",
         attachmentMore1: {},
         attachmentMore2: {},
-        range: 1,
+        scopeType: 0,
       },
       pickerOptions0: {
         disabledDate: time => {
@@ -946,7 +948,7 @@ export default {
           attachmentExt: editData.attachmentData[1].attachmentExt,
           attachmentSize: editData.attachmentData[1].attachmentSize
         },
-        range: 2
+        scopeType: editData.projectData.scopeType,
       };
       if (editData.attachmentData.length > 2) {
         for (let i = 2; i < editData.attachmentData.length; i++) {
@@ -1008,7 +1010,8 @@ export default {
         projectName: this.formData.projectName,
         projectBegintime: this.formData.projectBegintime,
         projectEndtime: this.formData.projectEndtime,
-        projectIntro: this.formData.projectIntro
+        projectIntro: this.formData.projectIntro,
+        scopeType: this.formData.scopeType,
       };
       let attachmentModel = [
         {
@@ -1078,9 +1081,9 @@ export default {
           if (option != "storage" && option != "storageEdit") {
             this.active++;
             this.stepData = [false, true, false];
-            if(this.formData.range == 2) {
+            if(this.formData.scopeType == 1) {
               this.getEcologySelect();
-              this.getEcology();
+              //this.getEcology();
               return;
             }
             // this.projectId = res.data.id;
@@ -1322,6 +1325,29 @@ export default {
         }
       } else if (this.active == 1) {
         //进入第三步
+        if(this.formData.scopeType == 1) {
+          //设定小生态范围
+          if(this.formEcology.ecology == '') {
+            vm.$message({
+              type: "info",
+              message: "请选择小生态范围",
+            });
+            return;
+          }
+          let req = {};
+          req.ecology = [];
+          req.ecology[0] = this.formEcology.ecology;
+          vm.POST("portal/scope/v1/"+this.projectId+"/organization", req).then(
+            res => {
+              console.log('设定小生态范围',res);
+              if (res.code == "000000") {
+                this.active++;
+                this.stepData = [false, false, true];
+              }
+            }
+          );
+          return;
+        }
         if (this.idType == 1) {
           //内部管理员
           if (this.tagsRegion.length > 0 || this.idTypeProject == 2) {
@@ -1884,6 +1910,9 @@ export default {
       }
       return true;
     },
+    selectableTableEcology(row, index) {
+      return false;
+    },
     //改变 设定机构选项
     selectionChangeOrganization(rows) {
       this.changedOrganization = [];
@@ -1961,14 +1990,6 @@ export default {
         this.changedEcology2
       );
     },
-    selectChangeEcology(value) {
-      // console.log('select',value);
-      for(let i=0;i<this.ecologySelect.length;i++) {
-        if(this.ecologySelect[i].value == value) {
-          this.checkedEcology = this.ecologySelect[i].label;
-        }
-      }
-    },
     //设定机构table全选
     checkAll(flag, name) {
       if (name == "multipleOrganization") {
@@ -2665,25 +2686,95 @@ export default {
       }
       return list;
     },
+    //选择小生态
+    selectChangeEcology(value) {
+      //console.log('select',value);
+      for(let i=0;i<this.ecologySelect.length;i++) {
+        if(this.ecologySelect[i].value == value) {
+          this.checkedEcology = this.ecologySelect[i].label;
+        }
+      }
+      this.formEcology.ecology = value;
+      this.getEcology();
+    },
     getEcologySelect() {
       let req = {};
       vm.GET("portal/scope/v1/"+this.projectId+"/ecology", req).then(
         res => {
           console.log('查询小生态列表',res);
           this.ecologySelect = operationData.getEcologySelect(res.data.list);
+          this.formEcology.ecology = res.data.chooseIdList[0];
+          this.getEcology();
         }
       );
     },
+    initEcology() {
+      let tableStatus = this.tableEcology;
+      if(typeof tableStatus === 'undefined') {
+        return;
+      }
+      tableStatus.forEach(row => {
+        let idList = [];
+        idList[0] = row.id;
+        let intersect = operationData.getIntersect(idList,this.changedEcology);
+        let intersect2 = operationData.getIntersect(idList,this.changedEcology2);
+        // debugger;
+        if(intersect.length > 0) {
+          //选中
+        } else if (intersect2.length > 0) {
+          //不选
+        } else {
+          if (row.status == 1) {
+            this.$nextTick(function() {
+              this.$refs.multipleEcology.toggleRowSelection(row);
+            });
+          }
+        }
+      });
+    },
     //获取小生态数据
     getEcology() {
       let req = {};
       req = this.formEcology;
+      openLoading(vm);
       vm.GET("portal/scope/v1/"+this.projectId+"/organization", req).then(
         res => {
+          closeLoading(vm);
           console.log('根基小生态查询机构列表信息',res);
+          this.tableEcology = res.data.organizationList;
+          this.totalEcology = res.data.total;
+
+          let tableStatus = this.tableEcology;
+          tableStatus.forEach(row => {
+            this.$refs.multipleEcology.toggleRowSelection(row);
+          });
+
+          // let idList = operationData.getIdList(this.tableEcology);
+          // let intersect = operationData.getIntersect(
+          //   idList,
+          //   this.changedEcology
+          // );
+          // this.lookedEcology = operationData.getUnion(
+          //   this.lookedEcology,
+          //   idList
+          // );
+          // let difference = operationData.getDifference(
+          //   idList,
+          //   this.changedEcology2
+          // );
+          // if (vm.checkTableEcology === "") {
+          //   this.initEcology();
+          // } else if (vm.checkTableEcology === true) {
+          //   let intersect2 = operationData.getIntersect(
+          //     idList,
+          //     this.changedEcology
+          //   );
+          //   if (intersect2.length == 0) {
+          //     this.$refs.multipleEcology.toggleAllSelection();
+          //   }
+          // }
         }
       );
-      this.tableEcology = operationData.getEcologyList();
     },
     //
     //机构table修改