Merge branch 'dev-eduadmin-20190222' into 'release'

Dev eduadmin 20190222



See merge request !13

src/views/education/add-manager.vue

@@ -30,7 +30,7 @@
           <el-form-item label="项目名称：" prop="projectName">
             <el-col :span="13">
               <el-input
-                size="mini"
+                size="small"
                 v-model="formData.projectName"
                 placeholder="请输入项目名称"
                 style="width:83%;"
@@ -44,7 +44,7 @@
               <el-form-item prop="projectBegintime">
                 <el-date-picker
                   v-model="formData.projectBegintime"
-                  size="mini"
+                  size="small"
                   type="datetime"
                   placeholder="请选择开始时间"
                   value-format="yyyy-MM-dd HH:mm:ss"
@@ -59,7 +59,7 @@
               <el-form-item label prop="projectEndtime">
                 <el-date-picker
                   v-model="formData.projectEndtime"
-                  size="mini"
+                  size="small"
                   type="datetime"
                   placeholder="请选择结束时间"
                   value-format="yyyy-MM-dd HH:mm:ss"
@@ -74,7 +74,7 @@
           <el-form-item label="项目简介：" prop="projectIntro">
             <el-col :span="13">
               <el-input
-                size="mini"
+                size="small"
                 type="textarea"
                 :autosize="{ minRows: 5}"
                 placeholder="请输入项目简介"
@@ -114,7 +114,7 @@
           </div>
           <el-form-item label="封面类型：">
             <el-radio-group
-              size="mini"
+              size="small"
               v-model="formData.type"
               @change="changeCover"
               :disabled="peopleLevel == 'L3'"
@@ -218,7 +218,7 @@
                       <el-button
                         type="text"
                         icon="el-icon-caret-bottom"
-                        size="mini"
+                        size="small"
                         @click="() => append(data,node)"
                       ></el-button>
                     </span>
@@ -240,7 +240,7 @@
             <el-form :inline="true" :model="formOrganization" class="demo-form-inline">
               <el-form-item label>
                 <!-- <el-select
-                  size="mini"
+                  size="small"
                   v-model="formOrganization.administrativeId"
                   placeholder="全部地区"
                   v-if="idType != 2"
@@ -254,14 +254,14 @@
                 </el-select> -->
                 <el-cascader
                   v-if="idType != 2"
-                  size="mini"
+                  size="small"
                   expand-trigger="hover"
                   :options="organizationRegion"
                   v-model="formOrganization.administrativeIdList"
                 ></el-cascader>
               </el-form-item>
               <el-form-item>
-                <el-select size="mini" v-model="formOrganization.level" placeholder="全部医院级别">
+                <el-select size="small" v-model="formOrganization.level" placeholder="全部医院级别">
                   <el-option
                     v-for="(item, index) in organizationRank"
                     :key="index"
@@ -271,7 +271,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item label>
-                <el-input size="mini" v-model="formOrganization.name" placeholder="请输入机构名称"></el-input>
+                <el-input size="small" v-model="formOrganization.name" placeholder="请输入机构名称"></el-input>
               </el-form-item>
               <el-form-item>
                 <el-button size="small" type="primary" @click="searchOrganization()">搜索</el-button>
@@ -360,7 +360,7 @@
           <el-tab-pane label="设定人员" name="fourth">
             <el-form :inline="true" :model="formPerson" class="demo-form-inline">
               <el-form-item label>
-                <el-select size="mini" v-model="formPerson.hospitalId" placeholder="全部医院">
+                <el-select size="small" v-model="formPerson.hospitalId" placeholder="全部医院">
                   <el-option
                     v-for="(item, index) in hospitalList"
                     :key="index"
@@ -370,7 +370,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item>
-                <el-select size="mini" v-model="formPerson.departmentId" placeholder="全部科室">
+                <el-select size="small" v-model="formPerson.departmentId" placeholder="全部科室">
                   <el-option
                     v-for="item in departmentList"
                     :key="item.value"
@@ -380,7 +380,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item label>
-                <el-input size="mini" v-model="formPerson.name" placeholder="请输入人员名称"></el-input>
+                <el-input size="small" v-model="formPerson.name" placeholder="请输入人员名称"></el-input>
               </el-form-item>
               <el-form-item>
                 <el-button size="small" type="primary" @click="searchPeople">搜索</el-button>
@@ -1509,6 +1509,7 @@ export default {
       let tabName = tab.name;
       if (tabName == "second") {
         //设定机构
+        this.formOrganization.pageNum = 1;
         this.formOrganization.name ="";
         this.formOrganization.administrativeIdList = ['0'];
         this.formOrganization.level ="-1";
@@ -1523,6 +1524,7 @@ export default {
         // }
       } else if (tabName == "fourth") {
         //设定人员
+        this.formPerson.pageNum = 1;
         this.formPerson.name ="";
         this.formPerson.departmentId = -1;
         this.formPerson.hospitalId = 0;
@@ -1791,6 +1793,7 @@ export default {
         this.changedOrganization2
       );
       this.updatePerson();
+      this.$refs.multiplePerson.clearSelection();
     },
     //改变机构 table 的check状态
     selectionChangeDepartment(val) {
@@ -2380,6 +2383,7 @@ export default {
       });
     },
     initPeopleStatus() {
+      
       let tableStatus = this.tablePerson;
       tableStatus.forEach(row => {
         if (row.status == 1) {
@@ -2436,6 +2440,8 @@ export default {
           );
           //console.log('全部看过的：',this.lookedPerson);
           if (vm.checkTableState.multiplePerson === "") {
+            console.log('intersect',intersect);
+            // debugger;
             if (intersect.length == 0) {
               this.initPeopleStatus();
             }
@@ -2511,9 +2517,9 @@ export default {
     },
     //设定机构改变更新设定人员
     updatePerson() {
-      // this.lookedPerson = [];
-      // this.changedPerson = [];
-      // this.changedPerson2 = [];
+      this.lookedPerson = [];
+      this.changedPerson = [];
+      this.changedPerson2 = [];
     },
     //scope的不同status操作
     scopeStatus(data) {

src/views/education/item-component.vue

@@ -10,12 +10,12 @@
                 <el-form ref="serchForm" :model="searchParam" label-width="75px" style="width:100%;">
                     <el-col :span="6">
                         <el-form-item label="组件名称:">
-                            <el-input v-model="searchParam.name" size="mini" placeholder="请输入组件名称"></el-input>
+                            <el-input v-model="searchParam.name" size="small" placeholder="请输入组件名称"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="发布状态:">
-                            <el-select v-model="searchParam.status" size="mini" placeholder="请选择发布状态">
+                            <el-select v-model="searchParam.status" size="small" style="width: 100%;" placeholder="请选择发布状态">
                                 <el-option
                                 v-for="(item,index) in statuSelect"
                                 :key="index"

src/views/education/item-manager.vue

@@ -7,14 +7,14 @@
         <el-form ref="formInline" :model="formInline" label-width="75px" style="width:100%;">
           <el-col :span="5">
             <el-form-item label="项目名称：">
-              <el-input v-model="formInline.projectName" size="mini" placeholder="请输入项目名称"></el-input>
+              <el-input v-model="formInline.projectName" size="small" placeholder="请输入项目名称"></el-input>
             </el-form-item>
           </el-col>
           <!-- <el-col :span="8">
             <el-form-item label="项目时间：">
               <el-date-picker
                 v-model="formInline.duringTime"
-                size="mini"
+                size="small"
                 type="daterange"
                 start-placeholder="请选择开始时间"
                 end-placeholder="请选择结束时间"
@@ -26,7 +26,7 @@
             <el-form-item label="项目时间：">
               <el-date-picker
                 v-model="formInline.projectBegintime"
-                size="mini"
+                size="small"
                 type="datetime"
                 placeholder="请选择开始时间"
                 value-format="yyyy-MM-dd HH:mm:ss"
@@ -38,7 +38,7 @@
             <el-form-item label="~">
               <el-date-picker
                 v-model="formInline.projectEndtime"
-                size="mini"
+                size="small"
                 type="datetime"
                 placeholder="请选择结束时间"
                 value-format="yyyy-MM-dd HH:mm:ss"
@@ -57,7 +57,7 @@
         <el-col :span="5">
           <el-form ref="formInline" :model="formInline" label-width="75px" style="width:100%;">
             <el-form-item label="发布状态：">
-              <el-select size="mini" v-model="formInline.projectStatus" placeholder="请选择发布状态">
+              <el-select size="small" v-model="formInline.projectStatus" placeholder="请选择发布状态">
                 <el-option
                   v-for="item in optionStatus"
                   :key="item.value"

src/views/system/item-role.vue

@@ -7,12 +7,12 @@
         <el-form :model="formInline" ref="formInline" label-width="75px" class="form-inline">
           <el-col :span="5">
             <el-form-item label="姓名：">
-              <el-input size="mini" v-model="formInline.userName" placeholder="请输入名称"></el-input>
+              <el-input size="small" v-model="formInline.userName" placeholder="请输入名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="角色：">
-              <el-select size="mini" v-model="formInline.projeceRole" placeholder="请选择角色">
+              <el-select size="small" v-model="formInline.projeceRole" placeholder="请选择角色">
                 <el-option
                   v-for="(item, index) in roleList"
                   :key="index"
@@ -24,7 +24,7 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="所属机构：">
-              <el-select size="mini" v-model="formInline.organizationName" placeholder="请选择所属机构">
+              <el-select size="small" v-model="formInline.organizationName" placeholder="请选择所属机构">
                 <el-option
                   v-for="(item, index) in organizationList"
                   :key="index"
@@ -36,7 +36,7 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="所属科室：">
-              <el-select size="mini" v-model="formInline.departmentsName" placeholder="请选择所属科室">
+              <el-select size="small" v-model="formInline.departmentsName" placeholder="请选择所属科室">
                 <el-option
                   v-for="(item, index) in departmentsList"
                   :key="index"

src/views/system/role.vue

@@ -7,14 +7,14 @@
         <el-form ref="formInline" :model="formInline" label-width="75px" style="width:100%;">
           <el-col :span="6">
             <el-form-item label="项目名称：">
-              <el-input v-model="formInline.projectName" size="mini" placeholder="请输入项目名称"></el-input>
+              <el-input v-model="formInline.projectName" size="small" placeholder="请输入项目名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="项目时间：">
               <el-date-picker
                 v-model="formInline.projectBegintime"
-                size="mini"
+                size="small"
                 type="datetime"
                 placeholder="请选择开始时间"
                 value-format="yyyy-MM-dd HH:mm:ss"
@@ -26,7 +26,7 @@
             <el-form-item label="~">
               <el-date-picker
                 v-model="formInline.projectEndtime"
-                size="mini"
+                size="small"
                 type="datetime"
                 placeholder="请选择结束时间"
                 value-format="yyyy-MM-dd HH:mm:ss"