update 教培2.3

src/views/education/edit-manager.vue

@@ -203,6 +203,26 @@
               <el-radio :label="1">使用小生态范围</el-radio>
             </el-radio-group>
           </el-form-item>
+          <el-form-item label="项目范围外可见">
+            <el-radio-group
+              size="small"
+              v-model="formData.canSee"
+              :disabled="showNoticeType()"
+            >
+              <el-radio :label="1">允许项目范围外人员可见</el-radio>
+              <el-radio :label="2">不允许项目范围外人员可见</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="formData.canSee != 2" label="项目范围外可学">
+            <el-radio-group
+              size="small"
+              v-model="formData.canLearn"
+              :disabled="showNoticeType()"
+            >
+              <el-radio :label="1">允许项目范围外人员可学(不发证)</el-radio>
+              <el-radio :label="2">不允许项目范围外人员可学</el-radio>
+            </el-radio-group>
+          </el-form-item>
           <el-form-item label="项目上线通知">
             <el-radio-group
               size="small"
@@ -703,6 +723,7 @@
         >
           <el-form-item label="选择组件：" prop="component">
             <el-col :span="10">
+              <!-- :disabled="projectStatus == 3 || projectStatus == 4 || projectStatus == 5  || projectStatus == 6" -->
               <el-select
                 v-model="formComponent.component"
                 multiple
@@ -710,22 +731,23 @@
                 style="width: 350px"
                 placeholder="请选择组件"
                 @change="changeValue"
-                :disabled="projectStatus == 3 || projectStatus == 4 || projectStatus == 5  || projectStatus == 6"
               >
                 <el-option
                   v-for="item in optionsComponent"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
+                  :disabled="item.disabled"
                 ></el-option>
               </el-select>
             </el-col>
           </el-form-item>
           <el-form-item label="已选择：" class="check-component">
-            <el-col :span="20">
+            <el-col :span="20" class="tags-list">
               <el-tag
                 class = "tags-component"
                 v-for="tag in tagsComponent"
+                v-bind:class="{'tags-component-online': tag.disabled === true }"
                 :key="tag.value"
                 closable
                 :type="tag.type"
@@ -860,7 +882,7 @@ export default {
       curmbSecond: "新建项目",
       //页面展示位置
       stepData: [true, false, false],
-      active: 0,
+      active: 2,
       activeName: "first",
       //基层信息 数据
       uploadImgMessage: false,
@@ -883,6 +905,8 @@ export default {
         organizationName: '',
         sendOption: 1,
         receiveOption: 1,
+        canSee: 1,
+        canLearn: 2,
       },
       pickerOptions0: {
         disabledDate: time => {
@@ -1294,10 +1318,11 @@ export default {
             closeLoading(vm);
             if (res.code == "000000" && res.data.projectData != null) {
               let editData = res.data;
+              this.status4Flag = res.data.projectData.status4Flag;
               this.setEditData(editData);
               this.idTypeProject = res.data.projectData.idType;
               this.projectStatus = res.data.projectData.projectStatus;
-              this.status4Flag = res.data.projectData.status4Flag;
+              // this.status4Flag = res.data.projectData.status4Flag;
               if (this.projectStatus == 1) {
                 this.showStorage = true;
               }
@@ -1525,7 +1550,9 @@ export default {
         this.getDepartment();
       } else if (active == 2) {
         this.stepData = [false, false, true];
-        this.tagDrop();
+        setTimeout(function(){
+          vm.tagDrop();
+        },800);
       }
     },
     //点击暂存
@@ -2517,12 +2544,9 @@ export default {
     //机构搜索
     getOrganizationChoose() {
       // console.log('formOrganization',this.formOrganization);
-      // let lastNum = this.formOrganization.administrativeIdList.length - 1
-      // let administrativeIdItem = this.formOrganization.administrativeIdList[lastNum];
       let administrativeIdItem = operationData.setAdministrativeId(this.formOrganization.administrativeIdList);
       let req = {
         projectId: this.projectId,
-        // setKind: this.getKind("administrative"),
         administrativeId: administrativeIdItem,
         hospitalLevel: this.formOrganization.level,
         hospitalName: this.formOrganization.name,
@@ -2530,9 +2554,6 @@ export default {
         pageSize: this.formOrganization.pageSize,
         scope: this.getScope("administrative"),
       };
-      // if (req.setKind == 3) {
-      //   req.scope = this.getScope("administrative");
-      // }
       openLoading(vm);
       // vm.POST("portal/scope/v1/organization/choose", req).then(res => {
       vm.POST("portal/new/scope/org/v1/organization/search", req).then(res => {
@@ -2543,28 +2564,6 @@ export default {
           this.totalOrganization = res.data.total;
 
           vm.initOrganizationStatus();
-          // 教培v2.2.0二期不需要前端记录状态
-          // let idList = operationData.getIdList(this.tableOrganization);
-          // let intersect = operationData.getIntersect(
-          //   idList,
-          //   this.changedOrganization
-          // );
-          // this.lookedOrganization = operationData.getUnion(
-          //   this.lookedOrganization,
-          //   idList
-          // );
-          // //console.log('全部看过的：',this.lookedOrganization);
-          // if (vm.checkTableState.multipleOrganization === "") {
-          //   this.initOrganizationChoose();
-          // } else if (vm.checkTableState.multipleOrganization === true) {
-          //   let intersect2 = operationData.getIntersect(
-          //     idList,
-          //     this.changedOrganization
-          //   );
-          //   if (intersect2.length == 0) {
-          //     this.$refs.multipleOrganization.toggleAllSelection();
-          //   }
-          // }
         } else {
           vm.$message(res.message);
         }
@@ -2577,14 +2576,10 @@ export default {
         administrativeId: '',
         hospitalLevel: '',
         hospitalLevel: '',
-        // setKind: this.getKind("administrative"),
         scope: this.getScope("administrative"),
         pageNum: this.formOrganization.pageNum,
         pageSize: this.formOrganization.pageSize
       };
-      // if (req.setKind == 3) {
-      //   req.scope = this.getScope("administrative");
-      // }
       openLoading(vm);
       // vm.POST("portal/scope/v1/organization", req).then(res => {
       vm.POST("portal/new/scope/org/v1/organization", req).then(res => {
@@ -2594,32 +2589,6 @@ export default {
           this.totalOrganization = res.data.total;
 
           vm.initOrganizationStatus();
-
-          // let idList = operationData.getIdList(this.tableOrganization);
-          // let intersect = operationData.getIntersect(
-          //   idList,
-          //   this.changedOrganization
-          // );
-          // this.lookedOrganization = operationData.getUnion(
-          //   this.lookedOrganization,
-          //   idList
-          // );
-          // let difference = operationData.getDifference(
-          //   idList,
-          //   this.changedOrganization2
-          // );
-          // if (vm.checkTableState.multipleOrganization === "") {
-          //   this.initOrganizationChoose();
-          // } else if (vm.checkTableState.multipleOrganization === true) {
-          //   let intersect2 = operationData.getIntersect(
-          //     idList,
-          //     this.changedOrganization
-          //   );
-          //   if (intersect2.length == 0) {
-          //     this.$refs.multipleOrganization.toggleAllSelection();
-          //   }
-          // }
-
         } else {
           vm.$message(res.message)
         }
@@ -2728,12 +2697,6 @@ export default {
           req.setKindOfOrganization
         );
       }
-      // vm.POST("portal/scope/v1/hospital", req).then(res => {
-      //   if (res.code == "000000") {
-      //     console.log(res);
-      //     this.hospitalList = operationData.getHospitalList(res.data.organizationList);
-      //   }
-      // })
     },
     //选择搜索机构方式
     searchPeople() {
@@ -2781,9 +2744,6 @@ export default {
       // console.log('formOrganization',this.formOrganization);
       let req = {
         projectId: this.projectId,
-        // setKindOfAdministrative: this.getKind("administrative"),
-        // setKindOfOrganization: this.getKind("organization"),
-        // setKindOfDepartment: this.getKind("department"),
         pageNum: this.formPerson.pageNum,
         pageSize: this.formPerson.pageSize,
         doctorName: this.formPerson.doctorName,
@@ -2791,17 +2751,6 @@ export default {
         scopeOfAdministrative: this.getScope("administrative"),
         scopeOfDepartment: this.getScopeDepartment(),
       };
-      // if (req.setKindOfAdministrative == 3) {
-      //   req.scopeOfAdministrative = this.getScope("administrative");
-      // }
-      // if (req.setKindOfOrganization == 2 || req.setKindOfOrganization == 3) {
-      //   req.scopeOfOrganization = this.getScopeOrganization(
-      //     req.setKindOfOrganization
-      //   );
-      // }
-      // if (req.setKindOfDepartment == 3) {
-      //   req.scopeOfDepartment = this.getScopeDepartment();
-      // }
       openLoading(vm);
       // vm.POST("portal/scope/v1/people/choose", req).then(res => {
       vm.POST("portal/new/scope/doctor/v1/doctor/search", req).then(res => {
@@ -2810,27 +2759,6 @@ export default {
           this.tablePerson = res.data.people;
           this.totalPerson = res.data.total;
           vm.initPeopleStatus();
-
-          // let idList = operationData.getIdList(this.tablePerson);
-          // let intersect = operationData.getIntersect(
-          //   idList,
-          //   this.changedPerson
-          // );
-          // this.lookedPerson = operationData.getUnion(
-          //   this.lookedPerson,
-          //   idList
-          // );
-          // if (vm.checkTableState.multiplePerson === "") {
-          //   this.initPeopleChoose();
-          // } else if (vm.checkTableState.multiplePerson === true) {
-          //   let intersect2 = operationData.getIntersect(
-          //     idList,
-          //     this.changedPerson
-          //   );
-          //   if (intersect2.length == 0) {
-          //     this.$refs.multiplePerson.toggleAllSelection();
-          //   }
-          // }
         } else {
           vm.$message(res.message)
         }
@@ -2857,17 +2785,6 @@ export default {
         pageNum: this.formPerson.pageNum,
         pageSize: this.formPerson.pageSize
       };
-      // if (req.setKindOfAdministrative == 3) {
-      //   req.scopeOfAdministrative = this.getScope("administrative");
-      // }
-      // if (req.setKindOfOrganization == 2 || req.setKindOfOrganization == 3) {
-      //   req.scopeOfOrganization = this.getScopeOrganization(
-      //     req.setKindOfOrganization
-      //   );
-      // }
-      // if (req.setKindOfDepartment == 3) {
-      //   req.scopeOfDepartment = this.getScopeDepartment();
-      // }
       openLoading(vm);
       // vm.POST("portal/scope/v1/people", req).then(res => {
       vm.POST("portal/new/scope/doctor/v1/doctor", req).then(res => {
@@ -2877,31 +2794,6 @@ export default {
           this.tablePerson = res.data.people;
           this.totalPerson = res.data.total;
           vm.initPeopleStatus();
-
-          // let idList = operationData.getIdList(this.tablePerson);
-          // let intersect = operationData.getIntersect(
-          //   idList,
-          //   this.changedPerson
-          // );
-          // this.lookedPerson = operationData.getUnion(
-          //   this.lookedPerson,
-          //   idList
-          // );
-          // let difference = operationData.getDifference(
-          //   idList,
-          //   this.changedPerson2
-          // );
-          // if (vm.checkTableState.multiplePerson === "") {
-          //   this.initPeopleChoose();
-          // } else if (vm.checkTableState.multiplePerson === true) {
-          //   let intersect2 = operationData.getIntersect(
-          //     idList,
-          //     this.changedPerson
-          //   );
-          //   if (intersect2.length == 0) {
-          //     this.$refs.multiplePerson.toggleAllSelection();
-          //   }
-          // }
         } else {
           vm.$message(res.message)
         }
@@ -3008,31 +2900,6 @@ export default {
           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();
-          //   }
-          // }
         }
       );
     },
@@ -3085,9 +2952,6 @@ export default {
       this.lookedOrganization = [];
       this.changedOrganization = [];
       this.changedOrganization2 = [];
-      // this.lookedPerson = [];
-      // this.changedPerson = [];
-      // this.changedPerson2 = [];
     },
     //设定机构改变更新设定人员
     updatePerson() {
@@ -3130,6 +2994,7 @@ export default {
         for (let j = 0; j < this.optionsComponent.length; j++) {
           if (value[i] == this.optionsComponent[j].value) {
             this.tagsComponent[len] = {};
+            this.tagsComponent[len] = this.optionsComponent[j];
             this.tagsComponent[len].value = this.optionsComponent[j].value;
             this.tagsComponent[len].name = this.optionsComponent[j].label;
             len++;
@@ -3149,24 +3014,28 @@ export default {
             this.tagsComponent[len] = {};
             this.tagsComponent[len].value = this.optionsComponent[j].value;
             this.tagsComponent[len].name = this.optionsComponent[j].label;
+            if(vm.status4Flag == 1) {
+              this.optionsComponent[j].disabled = true;
+              this.tagsComponent[len].disabled = true;
+            }
             len++;
           }
         }
       }
-      //console.log('this.tagsComponent',this.tagsComponent);
-      // if(vm.tagsComponent.length > 0) {
-      //   vm.tagDrop();
-      // }
+      console.log('this.optionsComponent值：',this.optionsComponent);
     },
     //选择组件数据绑定
     handleCloseComponent(tag) {
-      if (this.projectStatus == 1 || this.projectStatus == 2) {
+      if(tag.disabled == true) {
+        return;
+      }
+      // if (this.projectStatus == 1 || this.projectStatus == 2) {
       this.tagsComponent.splice(this.tagsComponent.indexOf(tag), 1);
       this.formComponent.component = [];
       for (let j = 0; j < this.tagsComponent.length; j++) {
         this.formComponent.component[j] = this.tagsComponent[j].value;
       }
-      }
+      // }
     },
     addCertificate() {
       let obj = {
@@ -3952,6 +3821,26 @@ export default {
   .third-step {
     margin: 30px 0 0px 30px;
     padding-bottom: 30px;
+    ::-webkit-scrollbar
+    {
+        width: 4px;
+        height: 20px;
+        background-color: #D8D8D8;
+    }
+    ::-webkit-scrollbar-thumb {
+        background-color: #D8D8D8;
+    }
+    .tags-list {
+      border: 1px #E8E8E8 solid;
+      height: 350px;
+      min-width: 280px;
+      overflow-y: scroll;
+    }
+    .tags-component-online {
+      color: #9ACEFF;
+      background-color: #F3F8FE;
+      border-color: #D5EAFE;
+    }
     .achievement {
       margin-top: 60px;
     }