Merge branch 'bugFix20190722' into ChronicMag_zxc

src/components/icss/AddIndeptLabel.vue

@@ -18,7 +18,7 @@
         <div class="main">
             <p class="title" v-if="dataPub.region2==1||dataPub.region2==2|| dataPub.region2==11">
                 <i>*</i> 标签明细：
-                <i v-if='dataPub.region2==2' style="margin-left:70px;color: #22ccc8; font-size: 12px;">所有选项必须都有或者都没有同“伴”/“无”标记</i>
+                <i v-if='dataPub.region2==2' style="margin-left:70px;color: #48C5D7; font-size: 12px;">所有选项必须都有或者都没有同“伴”/“无”标记</i>
             </p>
             <SingleSelect v-if="dataPub.region2==1 || dataPub.region2==2 || dataPub.region2==11" :ascription="dataPub.region1" :sexType="dataPub.region7" :type="dataPub.region2" @pushValues="pushValues" :isEditOrCopy="isEditOrCopy" :options="editData.questionDetailList"></SingleSelect>
             <div class="btn">
@@ -197,64 +197,6 @@
             this.warning(err);
           })
         });
-      //   const h = this.$createElement;
-      //   const {isEdit} = this.$route.params;
-      // const addMsg = h('div',{style:'padding-bottom:10px'},[
-      //       h('p',{style:'font-size:15px;margin-bottom:10px'},'是否保存该标签？')
-      //     ])
-      // const modMsg = h('div',{style:'padding-bottom:10px'},[
-      //       h('p',{style:'font-size:15px;margin-bottom:10px'},'是否保存该标签？'),
-      //       h('span',{style:'color:red;font-size:12px'},'若标签系统名称已经改变，请去别名维护中修改相关信息'),
-      //     ])
-      //   this.$msgbox({
-      //     title:'提示',
-      //     message:isEdit?modMsg:addMsg,
-      //     showCancelButton: true,
-      //     distinguishCancelAndClose:true,
-      //     confirmButtonText: '确认并前往别名维护',
-      //     cancelButtonText:'确认',
-      //     // type: 'warning',
-      //     cancelButtonClass:'toast-cancel'
-      //   }).then(()=>{
-      //     api.saveOrUpdate(param).then((res) => {
-      //       if (res.data.code === '0') {
-      //         this.warning(res.data.msg || '保存成功', 'success');
-      //         // 判断是否已有别名--有（修改），无（新增）
-      //         const item = {'questionId':param.questionWrapper.id,'questionName':param.questionWrapper.tagName};
-      //         api.similarNameDetl(item).then((res)=>{
-      //           if(res.data.code=='0'){
-      //             this.$router.push({
-      //               name:'AddSimilarName',
-      //               params: {id:param.questionWrapper.id,name:param.questionWrapper.tagName}
-      //             })
-      //           }else{
-      //             this.$router.push({
-      //               name:'AddSimilarName',
-      //               params: {}
-      //             })
-      //           }
-      //         })  
-      //       } else {
-      //         this.warning(res.data.msg)
-      //       }
-      //     }).catch((err) => {
-      //       this.warning(err);
-      //     })
-      //   }).catch((action)=>{
-      //     // action :cancel--取消,close--关闭
-      //     if(action=='cancel'){
-      //       api.saveOrUpdate(param).then((res) => {
-      //         if (res.data.code === '0') {
-      //           this.warning(res.data.msg || '保存成功', 'success');
-      //           this.$router.push("/admin/LT-YXSJWH-DLLXBQWH");
-      //         } else {
-      //           this.warning(res.data.msg)
-      //         }
-      //       }).catch((err) => {
-      //         this.warning(err);
-      //       })
-      //     }
-      //   })
       },
       showConfirmDialog(msg, resolve) {
         this.$alert(msg, '提示', {
@@ -313,9 +255,5 @@
     }
     }
     }
-    .toast-cancel{
-      color: #22ccc8 !important;
-      // background: #22ccc8;
-    }
 </style>
 

src/components/icss/AddMedicalName.vue

@@ -325,12 +325,18 @@ import pinyin from '../../js/Convert_Pinyin.js';
             if(data.data.length>0){
               const total = data.data.length;
               const average = parseInt(total/3);
+              const mod = total%3; //余数
               const firstGroup = data.data.slice(0,average);
-              this.options.push({label:1,options:firstGroup});
-              const secGroup = data.data.slice(average,average*2);
-              this.options.push({label:2,options:secGroup});
-              const thirdGroup = data.data.slice(average*2,total-1);
-              this.options.push({label:3,options:thirdGroup});
+              let secGroup = [];
+              let thirdGroup = [];
+              if(mod == 2){
+                secGroup = data.data.slice(average,average*2+1);
+                thirdGroup = data.data.slice(average*2+1,total);
+              }else{
+                secGroup = data.data.slice(average,average*2);
+                thirdGroup = data.data.slice(average*2,total);
+              }
+              this.options.push({label:1,options:firstGroup},{label:2,options:secGroup},{label:3,options:thirdGroup});
             }
           }else{
             this.$message({

src/components/icss/AddMedicinePrompt.vue

@@ -190,9 +190,12 @@
       },
       back() { this.$router.go(-1) },
       searchTerms(query){
+        if(!query.trim()){
+            return;
+        }
         //搜索术语列表
         this.showDrop = true;
-        api.getAllConcept({name:query}).then((res) =>{
+        api.getAllConcept({name:query.trim()}).then((res) =>{
           this.showDrop = false;
           if(res.data.code === '0') {
             this.terms = res.data.data;

src/components/icss/AssaySon.vue

@@ -199,6 +199,12 @@ export default {
           this.showConfirmDialog('是否删除该关联？',()=>{
             api.delAssaySon(param).then((res)=>{
               if(res.data.code=='0'){
+                if(!this.searched){
+                  //未点确认时清空搜索条件
+                  this.filter={
+                    conceptName:'',
+                  };
+                }
                 this.getDataList();
                 this.warning(res.data.msg || '操作成功','success');
               }else{

src/components/icss/ChemicalAndCommonMapping.vue

@@ -209,6 +209,18 @@ export default {
           this.showConfirmDialog('是否删除该关联？',()=>{
             api.delLisMappingById({id:id}).then((res)=>{
               if(res.data.code=='0'){
+                if(!this.searched){
+                  //未点确认时清空搜索条件
+                  this.filter={
+                    mealName:'',
+                    itemName:'',
+                    uniqueName:''
+                  };
+                }
+                if(this.list.length==1){
+                  //当前在最后一页且只有一条数据时，删除后跳到前一页
+                  this.currentPage = this.currentPage===1?1:this.currentPage-1;
+                }
                 this.getDataList();
                 this.warning(res.data.msg || '操作成功','success');
               }else{

src/components/icss/ChronicAndIndexRelation.vue

@@ -206,6 +206,12 @@ export default {
           this.showConfirmDialog(warntTxt,()=>{
             api.cancelIndexConfigAlls(param).then((res)=>{
               if(res.data.code=='0'){
+                if(!this.searched){
+                  //未点确认时清空搜索条件
+                  this.filter={
+                    diseaseName: ''
+                  };
+                }
                 this.getDataList();
                 this.warning(res.data.msg || '操作成功','success');
               }else{

src/components/icss/ChronicDiseaseStructureList.vue

@@ -230,6 +230,14 @@
         this.showConfirmDialog(waringTxt,()=>{
           api.deleteScale(param).then((res)=>{
             if(res.data.code=='0'){
+              if(!this.searched){
+                //未点确认时清空搜索条件
+                this.filter={
+                  isState:'',
+                  tagType: [], //标签类型
+                  tagSysName: '', //标签系统名称
+                };
+              }
               this.warning(res.data.msg||'操作成功','success');
               this.getDataList();
             }else{

src/components/icss/ConceptRelation.vue

@@ -202,6 +202,16 @@ export default {
             }
             api.delConceptRelation(param).then((res)=>{
               if(res.data.code=='0'){
+                if(!this.searched){
+                  //未点确认时清空搜索条件
+                  this.filter={
+                    conceptName:''
+                  };
+                }
+                if(this.list.length==1){
+                  //当前在最后一页且只有一条数据时，删除后跳到前一页
+                  this.currentPage = this.currentPage===1?1:this.currentPage-1;
+                }
                 this.getDataList();
                 this.warning(res.data.msg || '操作成功','success');
               }else{

src/components/icss/DiagnosisPubTag.vue

@@ -392,43 +392,6 @@ export default {
         this.initForm()
       }
       this.changeSex(tmpData);
-      // if(type == 3){
-      //   this.form.region7 = this.tmpSex;
-      //   this.$alert('改变性别后，标签明细将会恢复到默认状态?', '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonClass: 'cancelColor',
-      //     type: 'warning'
-      //   }).then(() => {
-      //     this.form.region7 = tmpData
-      //     this.changeSex(tmpData);
-      //   }).catch(() => {
-      //     // this.form.region7 = this.tmpSex;
-      //   });
-      // }else if(type == 2){
-      //   this.form.region2 = this.tmpType
-      //   this.$alert('改变类型后，标签明细将会恢复到默认状态?', '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonClass: 'cancelColor',
-      //     type: 'warning'
-      //   }).then(() => {
-      //     this.form.region2 = tmpData;
-      //     this.changeSex(tmpData);
-      //   }).catch(() => {
-      //     // this.form.region2 = this.tmpType;
-      //   });
-      // }else if(type == 1){
-      //   this.form.region1 = this.tmpOwn;
-      //   this.$alert('改变归属后，标签明细将会恢复到默认状态?', '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonClass: 'cancelColor',
-      //     type: 'warning'
-      //   }).then(() => {
-      //     this.form.region1 = tmpData;
-      //     this.changeSex(tmpData);
-      //   }).catch(() => {
-      //     // this.form.region1 = this.tmpOwn;
-      //   });
-      // }
     },
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
@@ -515,16 +478,6 @@ export default {
   .el-message-box__btns .el-button--default {
     color: #606266 !important;
   }
-  .cancelColor {
-    color: #22ccc8 !important;
-  }
-  .changeTips {
-    position: absolute;
-    left: 220px;
-    // min-width: 300px;
-    color: #22ccc8;
-    font-size: 12px;
-  }
 }
 }
 </style>

src/components/icss/DisclaimerInformation.vue

@@ -196,6 +196,12 @@
         this.showConfirmDialog('是否删除该免责声明？',()=>{
           api.delDiscInformation({id:item.id}).then((res)=>{
             if(res.data.code=='0'){
+              if(!this.searched){
+                //未点确认时清空搜索条件
+                this.filter={
+                  title: ''
+                };
+              }
               this.warning(res.data.msg||'操作成功','success');
               this.getDataList();
             }else{

src/components/icss/IndeptLabel.vue

@@ -275,6 +275,19 @@
         this.showConfirmDialog('是否删除该标签？',()=>{
           api.deleteTagGroup(param).then((res)=>{
             if(res.data.code=='0'){
+              if(!this.searched){
+                //未点确认时清空搜索条件
+                this.filter={
+                  tagType: [], //标签类型
+                  controlType: [],
+                  tagAdscription: '', //标签归属
+                  tagSysName: '', //标签系统名称
+                };
+              }
+              if(this.list.length==1){
+                //当前在最后一页且只有一条数据时，删除后跳到前一页
+                this.currentPage = this.currentPage===1?1:this.currentPage-1;
+              }
               this.getDataList();
               this.warning(res.data.msg || '操作成功','success');
             }else{

src/components/icss/LabelGroup.vue

@@ -119,7 +119,7 @@ export default {
             tagTypes: [],
             Adscriptions: [],   //标签归属列表
             tagTypesList: [],   //标签类型列表
-          searched: false,
+            searched: false,
             filter: {
                 tagType: [], //标签类型
                 tagAdscription: '', //标签归属
@@ -279,6 +279,18 @@ export default {
           this.showConfirmDialog('是否删除该标签组？',()=>{
             api.deleteTagGroup({ids:id,type:type}).then((res)=>{
               if(res.data.code=='0'){
+                if(!this.searched){
+                  //未点确认时清空搜索条件
+                  this.filter={
+                    tagType: [], //标签类型
+                    tagAdscription: '', //标签归属
+                    tagSysName: '', //标签系统名称
+                  };
+                }
+                if(this.list.length==1){
+                  //当前在最后一页且只有一条数据时，删除后跳到前一页
+                  this.currentPage = this.currentPage===1?1:this.currentPage-1;
+                }
                 this.getDataList();
                 this.warning(res.data.msg || '操作成功','success');
               }else{

src/components/icss/MedicalMultRelation.vue

@@ -232,6 +232,17 @@
         this.showConfirmDialog(waringTxt,()=>{
           api.removeRelationContact(param).then((res)=>{
             if(res.data.code=='0'){
+              if(!this.searched){
+                //未点确认时清空搜索条件
+                this.filter={
+                  term:'',
+                  type:''
+                };
+              }
+              if(this.list.length==1){
+                //当前在最后一页且只有一条数据时，删除后跳到前一页
+                this.currentPage = this.currentPage===1?1:this.currentPage-1;
+              }
               this.warning(res.data.msg||'操作成功','success');
               this.getDataList();
             }else{

src/components/icss/MedicalName.vue

@@ -261,6 +261,14 @@
         this.showConfirmDialog(waringTxt,()=>{
           api.deletMedicalName(param).then((res)=>{
             if(res.data.code=='0'){
+              if(!this.searched){
+                //未点确认时清空搜索条件
+                this.filter={
+                  term:'',
+                  type:'',
+                  libName:''
+                };
+              }
               this.warning(res.data.msg||'操作成功','success');
               this.getDataList();
             }else{

src/components/icss/MedicalRelation.vue

@@ -265,6 +265,15 @@
         this.showConfirmDialog(warningTxt,()=>{
           api.delKnowledgeRelation(params).then((res)=>{
             if(res.data.code=='0'){
+              if(!this.searched){
+                //未点确认时清空搜索条件
+                this.filter={
+                  isState:'',
+                  startName:'',
+                  endName:'',
+                  type:'',
+                };
+              }
               this.warning(res.data.msg||'操作成功','success');
               this.getDataList();
             }else{

src/components/icss/MedicinePrompt.vue

@@ -200,6 +200,13 @@
         this.showConfirmDialog('是否删除该静态知识？',()=>{
           api.delConceptInfo({conceptId:[row.conceptId],status:'Y'}).then((res)=>{
             if(res.data.code=='0'){
+              if(!this.searched){
+                //未点确认时清空搜索条件
+                this.filter={
+                  term: '',
+                  title:''
+                };
+              }
               this.warning(res.data.msg||'操作成功','success');
               this.getDataList();
             }else{

src/components/icss/NoiseTemplate.vue

@@ -381,7 +381,7 @@ export default {
         color: #f56c6c;
       }
       span {
-        color:#22ccc8;
+        color:@adminBase;
         font-size: 12px;
       }
     }

src/components/icss/PhysicalExamTemplate.vue

@@ -217,6 +217,16 @@
         this.showConfirmDialog('是否删除该科室查体模板？',()=>{
           api.delPhysicalExamTemp({'deptId':deptId}).then((res)=>{
             if(res.data.code=='0'){
+              if(!this.searched){
+                //未点确认时清空搜索条件
+                this.filter={
+                  deptId: ''
+                };
+              }
+              if(this.list.length==1){
+                //当前在最后一页且只有一条数据时，删除后跳到前一页
+                this.currentPage = this.currentPage===1?1:this.currentPage-1;
+              }
               this.warning(res.data.msg||'操作成功','success');
               this.getDataList();
             }else{

src/components/icss/PubIndeptTag.vue

@@ -712,16 +712,8 @@
     .el-message-box__btns .el-button--default {
         color: #606266 !important;
     }
-    .cancelColor {
-        color: #22ccc8 !important;
-    }
     .changeTips {
-        position: absolute;
-        left: 220px;
-        // min-width: 300px;
         width: 200%;
-        color: #ea7777;
-        font-size: 12px;
     }
     }
 </style>

src/components/icss/PubTagGroup.vue

@@ -565,43 +565,6 @@ export default {
         this.initForm()
       }
       this.changeSex(tmpData);
-      // if(type == 3){
-      //   this.form.region7 = this.tmpSex;
-      //   this.$alert('改变性别后，标签明细将会恢复到默认状态?', '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonClass: 'cancelColor',
-      //     type: 'warning'
-      //   }).then(() => {
-      //     this.form.region7 = tmpData
-      //     this.changeSex(tmpData);
-      //   }).catch(() => {
-      //     // this.form.region7 = this.tmpSex;
-      //   });
-      // }else if(type == 2){
-      //   this.form.region2 = this.tmpType
-      //   this.$alert('改变类型后，标签明细将会恢复到默认状态?', '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonClass: 'cancelColor',
-      //     type: 'warning'
-      //   }).then(() => {
-      //     this.form.region2 = tmpData;
-      //     this.changeSex(tmpData);
-      //   }).catch(() => {
-      //     // this.form.region2 = this.tmpType;
-      //   });
-      // }else if(type == 1){
-      //   this.form.region1 = this.tmpOwn;
-      //   this.$alert('改变归属后，标签明细将会恢复到默认状态?', '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonClass: 'cancelColor',
-      //     type: 'warning'
-      //   }).then(() => {
-      //     this.form.region1 = tmpData;
-      //     this.changeSex(tmpData);
-      //   }).catch(() => {
-      //     // this.form.region1 = this.tmpOwn;
-      //   });
-      // }
     },
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
@@ -690,14 +653,11 @@ export default {
     .el-message-box__btns .el-button--default {
       color: #606266 !important;
     }
-    .cancelColor {
-      color: #22ccc8 !important;
-    }
     .changeTips {
       position: absolute;
       left: 220px;
       // min-width: 300px;
-      color: #22ccc8;
+      color: #48C5D7;
       font-size: 12px;
     }
     .changeTipsName {

src/components/icss/PubTemplateGroup.vue

@@ -349,13 +349,13 @@ export default {
     color: #606266 !important;
   }
   .cancelColor {
-    color: #22ccc8 !important;
+    color: #48C5D7 !important;
   }
   .changeTips {
     position: absolute;
     left: 220px;
     // min-width: 300px;
-    color: #22ccc8;
+    color: #48C5D7;
     font-size: 12px;
   }
 }

src/components/icss/TemplateMaintenance.vue

@@ -308,6 +308,20 @@
         this.showConfirmDialog('是否删除该标签？',()=>{
           api.delTemplate({ids:id,type:type}).then((res)=>{
             if(res.data.code=='0'){
+              if(!this.searched){
+                //未点确认时清空搜索条件
+                this.filter={
+                  tagType: [], //标签类型
+                  templateType: '', //模板类型
+                  ownTo: '', //属于科室、慢病
+                  tagAdscription: '', //标签归属
+                  tagSysName: '', //标签系统名称
+                };
+              }
+              if(this.list.length==1){
+                //当前在最后一页且只有一条数据时，删除后跳到前一页
+                this.currentPage = this.currentPage===1?1:this.currentPage-1;
+              }
               this.getDataList();
               this.warning(res.data.msg || '操作成功','success');
             }else{

src/components/preTreat/CombinQuestion.vue

@@ -230,6 +230,18 @@
         this.showConfirmDialog('是否删除该填写单？',()=>{
           api.questionDel(param).then((res)=>{
             if(res.data.code=='0'){
+              if(!this.searched){
+                //未点确认时清空搜索条件
+                this.filter={
+                  tagType: [], //标签类型
+                  tagAdscription: '', //标签归属
+                  tagSysName: '', //标签系统名称
+                };
+              }
+              if(this.list.length==1){
+                //当前在最后一页且只有一条数据时，删除后跳到前一页
+                this.currentPage = this.currentPage===1?1:this.currentPage-1;
+              }
               this.getDataList();
               this.warning(res.data.msg || '操作成功','success');
             }else{

src/components/preTreat/PubIndeptQa.vue

@@ -570,17 +570,6 @@
     .el-message-box__btns .el-button--default {
         color: #606266 !important;
     }
-    .cancelColor {
-        color: #22ccc8 !important;
-    }
-    .changeTips {
-        position: absolute;
-        left: 220px;
-    // min-width: 300px;
-        width: 200%;
-        color: #ea7777;
-        font-size: 12px;
-    }
     }
     .el-upload-list{
         float: left;

src/components/preTreat/QuestionModules.vue

@@ -259,6 +259,19 @@
         this.showConfirmDialog('是否删除该模板？',()=>{
           api.delModule(param).then((res)=>{
             if(res.data.code=='0'){
+              if(!this.searched){
+                //未点确认时清空搜索条件
+                this.filter={
+                  name: '', //模板名称
+                  type: '', //模板归属
+                  moduleType: '', //模板类型
+                  relationId:'',  //归属科室
+                };
+              }
+              if(this.list.length==1){
+                //当前在最后一页且只有一条数据时，删除后跳到前一页
+                this.currentPage = this.currentPage===1?1:this.currentPage-1;
+              }
               this.getDataList();
               this.warning(res.data.msg || '操作成功','success');
             }else{

src/components/preTreat/SimpleQuestion.vue

@@ -254,6 +254,19 @@
         this.showConfirmDialog('是否删除该填写单？',()=>{
           api.questionDel(param).then((res)=>{
             if(res.data.code=='0'){
+              if(!this.searched){
+                //未点确认时清空搜索条件
+                this.filter={
+                    tagType: [], //标签类型
+                    controlType: [],
+                    tagAdscription: '', //标签归属
+                    tagSysName: '', //标签系统名称
+                };
+              }
+              if(this.list.length==1){
+                //当前在最后一页且只有一条数据时，删除后跳到前一页
+                this.currentPage = this.currentPage===1?1:this.currentPage-1;
+              }
               this.getDataList();
               this.warning(res.data.msg || '操作成功','success');
             }else{

src/less/common.less

@@ -16,7 +16,7 @@
 @borderWidth: 2px;
 
 /*朗通后台基本颜色*/
-@adminBase: #22ccc8;
+@adminBase: #48C5D7;
 @icssBorder: #c0c4cc;
 @icssHeight:240px;
 
@@ -115,6 +115,13 @@
 .el-button--mini, .el-button--mini.is-round {
   padding: 5px 15px 4px;
 }
+.el-button--warning.el-button--mini{
+  background: @adminBase;
+  border:1px @adminBase solid;
+}
+.el-form-item.is-success .el-input__inner, .el-form-item.is-success .el-input__inner:focus, .el-form-item.is-success .el-textarea__inner, .el-form-item.is-success .el-textarea__inner:focus{
+  border-color:@adminBase;
+}
 
 .el-table td {
   padding: 0;