Merge remote-tracking branch 'origin/ChronicMag_zxc' into ChronicMag

# Conflicts:
#	src/api/config.js
#	src/api/icss.js

src/api/config.js

@@ -136,7 +136,6 @@ export default {
     'getConceptKnowledgeList':'/api/knowledgeman/libraryDetail/getLibraryDetailList', //  术语静态知识列表
     'getConceptKnowledge':'/api/knowledgeman/Knowledge/getConceptKnowledge',//术语静态知识查询
     'getConceptInfo':'/api/knowledgeman/concept/getConceptInfo', //  搜索术语
-    'getAllConcept':'/api/knowledgeman/concept/getAllConcept', //  术语列表
     'versionInfo': 'api/icssman/versionInfo/getVersionInfoAlls', //版本信息
     'addVersInfo': 'api/icssman/versionInfo/saveVersionInfoAlls', //版本信息-添加
     'updateVersInfo': 'api/icssman/versionInfo/updateVersionInfoAlls', //版本信息-修改
@@ -146,28 +145,50 @@ export default {
     'getVersionDetlInfo': 'api/icssman/versionDetail/getDetailById', //版本信息-版本说明列表获取
     'promptServer':'/api/icssman/file/uploadImage',    //静态知识
     /**************医学术语维护****************/
-	  'saveConceptInfo':'/api/knowledgeman/libraryDetail/addLibraryDetail',   //保存术语静态知识
+	'saveConceptInfo':'/api/knowledgeman/libraryDetail/addLibraryDetail',   //保存术语静态知识
     'delConceptInfo':'/api/knowledgeman/libraryDetail/removeLibraryDetail',   //删除术语静态知识
-    // 'knowledgeName': 'api/knowledgeman/medical/getAllMedicalInfo', //医学术语--命名维护
-    'knowledgeName': 'api/knowledgeman/concept/getAllInformation', //医学术语--命名维护
-    'knowledgeUpload': 'api/knowledgeman/concept/importTermExcel', //医学术语--命名维护-导入
-    'allKnowledgeType': 'api/knowledgeman/type/getAllType', //医学术语--类型列表
-    'deletMedicalName': 'api/knowledgeman/concept/removeConceptInfo', //医学术语--命名维护-删除
-    'getMedicalDetail': 'api/knowledgeman/medical/getMedicalInfo', //医学术语--命名维护-修改获取同义词
-    'knowledgeRelation': 'api/knowledgeman/relation/getAllRelation', //医学术语--关系维护
-    'delKnowledgeRelation': 'api/knowledgeman/relation/removeRelation', //医学术语--关系维护-删除
-    'getAllConcept': 'api/knowledgeman/concept/getAllConcept', //查询所有术语名称
-    'getMedicalInfoList': 'http://192.168.3.101:5050/api/knowledgeman/medical/getMedicalInfoList', //医学术语--属性维护--属性列表
-    'medicalInfoExcelIm': 'http://192.168.3.101:5050/api/knowledgeman/medical/medicalInfoExcelIm', //医学术语--属性维护-术语医学属性excel文件导入
-    'getMedicalInfoDetail': 'http://192.168.3.101:5050/api/knowledgeman/medical/getMedicalInfoDetail', //医学术语--属性维护--属性详情
-    'addMedicalInfo': 'http://192.168.3.101:5050/api/knowledgeman/medical/addMedicalInfo', //医学术语--属性维护--术语医学属性添加或者编辑
-    'removeMedicalInfo': 'http://192.168.3.101:5050/api/knowledgeman/medical/removeMedicalInfo', //医学术语--属性维护--术语医学属性删除
-    'getAllLexiconRelationship':'http://192.168.3.101:5050/api/knowledgeman/lexicon/getAllLexicon', //医学术语--获取所有关系类型
-    'getAllConcept':'http://192.168.3.101:5050/api/knowledgeman/concept/getAllConcept',   //医学术语--获取所有概念（标准术语）
-    'getAllBodypart': 'http://192.168.3.101:5050/api/knowledgeman/bodypart/getAllBodypart',  //医学术语--获取所有部位
+    'knowledgeName': 'api/knowledgeman/concept/getAllInformation', //医学术语-命名维护
+    'knowledgeUpload': 'api/knowledgeman/concept/conceptInfoExcelIm', //医学术语-命名维护-导入
+    'allKnowledgeType': 'api/knowledgeman/lexicon/getAllLexicon', //医学术语-类型列表
+    'deletMedicalName': 'api/knowledgeman/concept/removeConceptInfo', //医学术语-命名维护-删除
+    'getMedicalDetail': 'api/knowledgeman/concept/getConceptInfoDetail', //医学术语-命名维护-详情
+    'addMedicalName': 'api/knowledgeman/concept/addConceptInfo', //医学术语-命名维护-添加修改
+    'knowledgeRelation': 'api/knowledgeman/relation/getRelationInfoList', //医学术语-关系维护
+    'delKnowledgeRelation': 'api/knowledgeman/relation/removeRelationInfo', //医学术语-关系维护-删除
+    'getAllRelationType': 'api/knowledgeman/lexiconRelationship/getAllLexiconRelationship', //医学术语-关系维护-关系下拉
+    'addRelationConcept': 'api/knowledgeman/relation/addRelationInfo', //医学术语-关系维护-添加
+    'RelationUpload': 'api/knowledgeman/relation/relationInfoExcelIm', //医学术语-关系维护-导入
     'scaleContentStructure': 'api/icssman/scaleContent/list',  //量表结构维护 -- 列表
     'getAllDeptAndDisInfo': 'api/icssman/moduleInfo/getAllDeptAndDisInfo',  //模板维护-获取科室和疾病所有信息
     'queryEvaluationModulePages': 'api/icssman/evaluationModuleMapping/queryEvaluationModulePages',  //慢病管理评估维护 -- 列表
+    'getMedicalInfoList': '/api/knowledgeman/medical/getMedicalInfoList', //医学术语--属性维护--属性列表
+    'medicalInfoExcelIm': '/api/knowledgeman/medical/medicalInfoExcelIm', //医学术语--属性维护-术语医学属性excel文件导入
+    'getMedicalInfoDetail': '/api/knowledgeman/medical/getMedicalInfoDetail', //医学术语--属性维护--属性详情
+    'addMedicalInfo': '/api/knowledgeman/medical/addMedicalInfo', //医学术语--属性维护--术语医学属性添加或者编辑
+    'removeMedicalInfo': '/api/knowledgeman/medical/removeMedicalInfo', //医学术语--属性维护--术语医学属性删除
+    'getAllLexiconRelationship':'/api/knowledgeman/lexicon/getAllLexicon', //医学术语--获取所有关系类型
+    'getAllConcept':'/api/knowledgeman/concept/getAllConcept',   //医学术语--获取所有概念（标准术语）
+    'getAllBodypart': '/api/knowledgeman/bodypart/getAllBodypart',  //医学术语--获取所有部位
+    'getAllDepts': '/api/knowledgeman/medical/getAllDepts',  //医学术语--获取所有科室
+    'getLisMappingPage': '/api/icssman/lisMapping/getLisMappingPage', //医学数据-化验大小项与公表项维护-列表
+    'saveLisMapping': '/api/icssman/lisMapping/saveLisMapping',  //医学数据-化验大小项与公表项维护-新增
+    'delLisMappingById': '/api/icssman/lisMapping/delLisMappingById',  //医学数据-化验大小项与公表项维护-单个删除
+    'delLisMappingByIds': '/api/icssman/lisMapping/delLisMappingByIds', //医学数据-化验大小项与公表项维护-批量删除
+    'modifyLisMapping': '/api/icssman/lisMapping/modifyLisMapping',  //医学数据-化验大小项与公表项维护-修改
+    'hasLisMapping': '/api/icssman/lisMapping/hasLisMapping',  //医学数据-化验大小项与公表项维护-化验公表项映射是否已存在
+    'getTypeList': 'api/knowledgeman/lexicon/getLexiconList', //术语类型-列表
+    'addType': 'api/knowledgeman/lexicon/addLexicon', //术语类型-添加
+    'getAllLisConcept':'api/knowledgeman/concept/getAllLisConcept',  //医学数据-化验大小项与公表项维护-获取所有化验公表项
+    'queryIndexConfigPages':'api/icssman/indexConfig/queryIndexConfigPages',  //医学数据-慢病指标值关联维护-列表
+    'getIndexConfigLists':'api/icssman/indexConfig/getIndexConfigLists',  //医学数据-慢病指标值关联维护-获取慢病指标值关联
+    'cancelIndexConfigAlls':'api/icssman/indexConfig/cancelIndexConfigAlls',  //医学数据-慢病指标值关联维护-删除慢病指标值关联
+    'saveIndexConfigLists':'api/icssman/indexConfig/saveIndexConfigLists',  //医学数据-慢病指标值关联维护-添加关联
+    'updateIndexConfigList':'api/icssman/indexConfig/updateIndexConfigList',  //医学数据-慢病指标值关联维护-修改关联
+    'queryIndexConfigDiseaseNames':'api/icssman/indexConfig/queryIndexConfigDiseaseNames',  //医学数据-慢病指标值关联维护-慢病指标疾病标签查询
+    'getDisScaleAllInfo':'api/icssman/disScale/getDisScaleAllInfo',  //医学数据-诊断量表关联维护-列表
+    'addDisScaleInfo':'api/icssman/disScale/addDisScaleInfo',  //医学数据-诊断量表关联维护-添加和修改
+    'getDisScaleByDisId':'api/icssman/disScale/getDisScaleByDisId',  //医学数据-诊断量表关联维护-根据诊断id获取诊断量表关联信息(修改回读用)
+    'delDisScaleInfo':'api/icssman/disScale/delDisScaleInfo',  //医学数据-诊断量表关联维护-删除
     'insertOrUpdate': 'api/icssman/scaleContent/insertOrUpdate',  //量表结构维护 -- 添加或者更新
     'deleteScale': 'api/icssman/scaleContent/delete',  //量表结构维护 -- 删除
     'getModuleType': 'api/icssman/moduleInfo/getModuleType',  //模板维护 -- 类型筛选

src/api/icss.js

@@ -290,8 +290,8 @@ export default {
     getLisMappingPage(param) {  //医学数据-化验大小项与公表项维护-列表
         return axios.post(urls.getLisMappingPage, param)
     },
-    addLisMapping(param) {  //医学数据-化验大小项与公表项维护-新增
-        return axios.post(urls.addLisMapping, param)
+    saveLisMapping(param) {  //医学数据-化验大小项与公表项维护-新增
+        return axios.post(urls.saveLisMapping, param)
     },
     delLisMappingById(param) {  //医学数据-化验大小项与公表项维护-单个删除
         return axios.post(urls.delLisMappingById, param)
@@ -329,6 +329,21 @@ export default {
     updateIndexConfigList(param) {
         return axios.post(urls.updateIndexConfigList, param)    //医学数据-慢病指标值关联维护-修改关联
     },
+    queryIndexConfigDiseaseNames(param) {
+        return axios.post(urls.queryIndexConfigDiseaseNames, param)    //医学数据-慢病指标值关联维护-慢病指标疾病标签查询
+    },
+    getDisScaleAllInfo(param) {
+        return axios.post(urls.getDisScaleAllInfo, param)    //医学数据-诊断量表关联维护-列表
+    },
+    addDisScaleInfo(param) {
+        return axios.post(urls.addDisScaleInfo, param)    //医学数据-诊断量表关联维护-添加和修改
+    },
+    getDisScaleByDisId(param) {
+        return axios.post(urls.getDisScaleByDisId, param)    //医学数据-诊断量表关联维护-根据诊断id获取诊断量表关联信息(修改回读用)
+    },
+    delDisScaleInfo(param) {
+        return axios.post(urls.delDisScaleInfo, param)    //医学数据-诊断量表关联维护-删除
+    },
     insertOrUpdate(param) {
         return axios.post(urls.insertOrUpdate, param)    //量表结构--添加或更新
     },

src/components/icss/AddChemicalAndCommonMapping.vue

@@ -1,9 +1,14 @@
 <template>
     <div class="AddChemicalAndCommonMappingWrapper clearfix">
-        <div class="groupTitle"><i
+        <!-- <div class="groupTitle"><i
                 class="el-icon-back"
                 @click="back"
-        ></i>化验大小项与公表项对应维护--添加关联</div>
+        ></i> 化验大小项与公表项对应维护--添加关联</div> -->
+        <crumbs
+          title="化验大小项与公表项对应维护--添加关联"
+          class="topBack"
+          linkTo="/admin/LT-YXSJWH-HYDXXYGBXDY"
+        ></crumbs>
         <div class="AddChemicalAndCommonMappingBox clearfix">
             <div class="titleBox clearfix">
                 <h3 class="title">关联公表项</h3>
@@ -142,11 +147,12 @@ export default {
             api.searchTagList(param).then((res) => {
                 if (res.data.code === '0') {
                      if (type == 1) {
-                         this.$refs['mealNameList'].style.display='block'
                         this.mealNameList = res.data.data
+                        if(this.mealNameList.length > 0){ this.$refs['mealNameList'].style.display='block' }
                     } else if (type == 2) {
-                        this.$refs['itemNameList'].style.display='block'
+                       
                         this.itemNameList = res.data.data
+                        if(this.itemNameList.length > 0) { this.$refs['itemNameList'].style.display='block' }
                     }
                 }
             })
@@ -158,8 +164,8 @@ export default {
             }
             api.getAllLisConcept(param).then((res) => {
                 if(res.data.code === '0') {
-                    this.$refs['uniqueNameList'].style.display='block'
                     this.uniqueNameList = res.data.data
+                    if(this.uniqueNameList.length > 0){this.$refs['uniqueNameList'].style.display='block'}
                 }
             })
         },
@@ -206,8 +212,8 @@ export default {
         console.log(param);
         this.showSaveDialog(param);
       },
-      addLisMapping(param, msg, type) {
-        api.addLisMapping(param).then((res) => {
+      saveLisMapping(param, msg, type) {
+        api.saveLisMapping(param).then((res) => {
             if (res.data.code === '0') {
             this.warning(res.data.msg || msg, type);
             // this.$router.push({name: 'ChemicalAndCommonMapping'});
@@ -220,14 +226,14 @@ export default {
       showSaveDialog(param) {
         //  修改（不需要）
         //   if(this.isEdit) {
-        //       this.addLisMapping(param)
+        //       this.saveLisMapping(param)
         //   } else {
             api.hasLisMapping(param).then((res) => {
                 if (!res.data.data) {
-                    this.addLisMapping(param, '关联建立成功', 'success' )
+                    this.saveLisMapping(param, '关联建立成功', 'success' )
                 } else {
                     this.showConfirmDialog('该关联已存在是否替换旧的关系信息', () => {
-                        this.addLisMapping(param, '关联建立成功', 'success' )
+                        this.saveLisMapping(param, '关联建立成功', 'success' )
                     });
                 }
             }).catch((err) => {
@@ -263,18 +269,21 @@ export default {
 <style lang="less">
 .AddChemicalAndCommonMappingWrapper {
     min-width: 980px;
-    background: #fff;
-    .groupTitle {
-        width: calc(100% - 50px);
-        height: 40px;
-        background: #fff;
-        padding: 0 20px 0 30px;
-        margin-bottom: 20px;
-        line-height: 40px;
-        position: relative;
-        z-index: 5;
-            
+    
+    .topBack {
+        top: 0;
     }
+    // .groupTitle {
+    //     width: calc(100% - 50px);
+    //     height: 40px;
+    //     background: #fff;
+    //     padding: 0 20px 0 30px;
+    //     margin-bottom: 20px;
+    //     line-height: 40px;
+    //     position: relative;
+    //     z-index: 5;
+            
+    // }
     .titleBox {
         border-bottom: 1px solid #000;
         padding:  0 0 10px 0px;
@@ -284,7 +293,9 @@ export default {
         float: left;
     }
     .AddChemicalAndCommonMappingBox {
-        padding: 0 30px 20px 30px;
+        padding: 20px 30px 20px 30px;
+        margin: 70px 20px 0 20px;
+        background: #fff;
     }
     .leftBox , .midBox, .rightBox{
         width: 40%;
@@ -330,7 +341,7 @@ export default {
         display: none;
         background: #fff;
         width: 162px;
-        height: 80px;
+        max-height: 80px;
         border: 1px solid gray;
         left: 150px;
         top: 35px;

src/components/icss/AddChronicAndIndexRelation.vue

@@ -0,0 +1,359 @@
+<!-- 添加常见科室症状  -->
+<template>
+    <div class="AddChronicAndIndexRelationWrapper">
+        <!-- <div class="groupTitle"><i
+            class="el-icon-back"
+            @click="back"
+        ></i> 量表管理维护--{{titleText}}</div> -->
+        <crumbs
+          :title="'慢病指标值关联维护-'+titleText"
+          class="topBack"
+          linkTo="/admin/LT-YXSJWH-MBZBZGLWH"
+        ></crumbs>
+        <el-form :model="form" ref="ruleForm"  class="addDepartForm">
+            <el-form-item  class="addDepartFormItem"  v-if="!isEdit" label="选择诊断标签：" prop="department">
+                <input class="searchInput"  @focus="focuInput" type="text" v-model = "searchDiagVal"> 
+                <span class="searchName" @click="searchDiag">搜索</span>
+                <ul class="itemList diagList" ref="diagList">
+                    <li 
+                    v-for="item in diagList" 
+                    class="diagItem ellipsis"
+                    :title="item.diseaseName"
+                    @click="selectDiag(item)"
+                    :key="item.diseaseId">
+                    {{item.diseaseName}}
+                    </li>
+                </ul>
+            </el-form-item>
+             <el-form-item class="isRequired" label="已选择诊断：" prop="type">
+                {{form.diseaseName}}
+            </el-form-item>
+        </el-form>
+        <div class="symptomList">
+            <div class="screenIndex clearfix">
+                    <label class="screenIndexLabel">选择指标项内容：</label>
+                    <input class="searchInput"  @focus="focuInput" type="text" v-model = "searchIndexVal"> 
+                    <span class="searchName" @click="searchIndex">搜索</span>
+                    <ul class="itemList indexList" ref="indexList">
+                        <li 
+                        v-for="item in indexList" 
+                        class="diagItem ellipsis"
+                        :title="item.conceptName"
+                        @click="selectIndex(item)"
+                        :key="item.conceptName">
+                        {{item.conceptName}}
+                        </li>
+                    </ul>
+            </div>
+            <table class="indexTab">
+                
+                <tr>
+                    <td class="selectedContent">已选择内容</td>
+                    <td class="selectedContentGrop">已选内容分组（只可输入数字，相同数字归为一组展示）</td>
+                    <td class="selectedContentOpera">操作</td>
+                </tr>
+                <tr v-for="(item, index) in selectedIndexList" :key="item.indexUnique"> 
+                    <td class="selectedContent">{{item.indexUnique}}</td>
+                    <td class="selectedContentGrop"><input class="groupInput" type="number" v-model="item.indexDesc"></td>
+                    <td class="selectedContentOpera"><el-button type="text" size="small" class="delete" @click="delSelectedIndex(item, index)">删除</el-button></td>
+                </tr>
+            </table>
+        </div>
+        <div class="btn">
+            <el-button
+            type="primary"
+            @click="submitForm('ruleForm')"
+            >确 定</el-button>
+        </div>
+    </div>
+    
+</template>
+
+<script>
+  import api from '@api/icss.js';
+  export default {
+    name: 'AddDisAndScaleRelationWrapper',
+    data() {
+        return{
+            
+            form: {
+                diseaseId: '',  //诊断id
+                diseaseName:''  //诊断名称
+            },
+            titleText: '添加关联',
+            diagList: [],
+            indexList: [],
+            selectedIndexMap: [],   //已经选择过的指标
+            selectedIndexList: [],  //选择的指标列表
+            searchDiagVal: '',
+            searchIndexVal: '',
+            isEdit: false,
+        }
+    },
+    created(){
+        const { isEdit, data } = this.$route.params;
+        if(isEdit) {
+            if(isEdit) {
+                this.isEdit = isEdit;
+                this.titleText = '修改关联';
+                this.form.diseaseId = data.diseaseId
+                this.form.diseaseName = data.diseaseName
+                this.selectedIndexList = data.data
+                for (let i = 0; i < this.selectedIndexList.length; i++) {
+                    this.selectedIndexMap.push(this.selectedIndexList[i].indexUnique)
+                }
+            } 
+        } else {
+            
+        }
+    },
+    watch: {
+        // searchTagVal(newVal, preVal) {
+        //     if(newVal.trim() == ''){
+        //         this.getTagList()
+        //     }else if(newVal.trim() != preVal.trim()){
+        //         this.getTagList()
+        //     }
+        // }
+    },
+    methods: {
+        back(){
+            this.$router.go(-1);
+        },
+        searchDiag() {
+            const param = {
+                "diseaseName": this.searchDiagVal,
+            }
+            api.queryIndexConfigDiseaseNames(param).then((res)=>{
+               if(res.data.code === '0') {
+                   this.diagList = res.data.data
+                   if(this.diagList.length>0) {this.$refs['diagList'].style.display = 'block'}
+                }
+            })
+        },
+        selectDiag(item) {
+            this.form.diseaseId = item.diseaseId
+            this.form.diseaseName = item.diseaseName
+            this.$refs['diagList'].style.display='none'
+            this.searchDiagVal = ''
+            this.diagList=[]
+        },
+        focuInput() {
+            this.$refs['diagList'].style.display='none'
+             this.$refs['indexList'].style.display='none'
+            
+        },
+        searchIndex() {
+             const param = {
+                conceptName: this.searchIndexVal,
+                excludedConceptNames:  this.selectedIndexMap
+            }
+            
+            api.getAllLisConcept(param).then((res)=>{
+               if(res.data.code === '0') {
+                   this.indexList = res.data.data
+                    // this.indexList =[
+                    //     {conceptName : '空腹血糖'},
+                    //     {conceptName : '餐后2小时血糖'},
+                    //     {conceptName : '随机血糖'},
+                    //     {conceptName : '糖化血红蛋白'},
+                    //     {conceptName : '血常规'},
+                    // ]
+                   if(this.indexList.length > 0){this.$refs['indexList'].style.display='block'}
+                }
+            })
+        },
+        selectIndex(item) {
+            this.selectedIndexList.push({indexUnique: item.conceptName, indexDesc:''})
+            this.selectedIndexMap.push(item.conceptName)
+            this.indexList = []
+            this.$refs['indexList'].style.display='none'
+        },
+        delSelectedIndex(selectedItem, index) {
+            this.selectedIndexMap = this.selectedIndexMap.filter((item) => {return item != selectedItem.indexUnique})
+            this.selectedIndexList.splice(index, 1)
+        },
+        submitForm(formName) {
+            if(!this.form.diseaseId) {
+                this.warning('请选择诊断')
+                return
+            }
+            if(this.selectedIndexList.length === 0) {
+                this.warning('请选择指标')
+                return
+            }
+            for (let i = 0; i < this.selectedIndexList.length; i++) {
+                if(!this.selectedIndexList[i].indexDesc) {
+                    this.warning('请填写内容分组')
+                    return
+                }
+            }
+            this.showDelDialog()
+        },
+        showDelDialog() {
+            this.selectedIndexList.map((item) => {
+                item.diseaseId = this.form.diseaseId
+                return item
+            })
+            const param ={
+                "diseaseId": this.form.diseaseId,
+                "indexConfigData": this.selectedIndexList
+            }
+            this.showConfirmDialog('是否建立该关联？', () => {
+                const  url = this.isEdit ?api.updateIndexConfigList(param) : api.saveIndexConfigLists(param) 
+                url.then((res) => {
+                if (res.data.code  === '0') {
+                    this.warning(res.data.msg || '关联成功', 'success','1000')
+                    setTimeout(() => {
+                    this.$router.push({
+                        path:'/admin/LT-YXSJWH-MBZBZGLWH'
+                    })
+                    }, 1000);
+                } else {
+                    this.warning(res.data.msg)
+                }
+                }).catch((err) => {
+                    this.warning(err);
+                })
+            });
+        },
+        showConfirmDialog(msg, resolve) {
+            this.$alert(msg, '提示', {
+                confirmButtonText: '确定',
+                type: 'warning'
+            }).then(() => {
+                resolve();
+            }).catch(() => {});
+        },
+        warning(msg, type,time) {
+            this.$message({
+                showClose: true,
+                message: msg,
+                type: type || 'warning',
+                duration:time || '3000'
+            })
+        },
+    }
+  }
+</script>
+
+<style lang="less">
+    @import '../../less/common.less';
+    .AddChronicAndIndexRelationWrapper {
+        .topBack {
+            top: 0;
+        }
+        .groupTitle {
+            background-color: #fff;
+            height: 40px;
+            line-height: 40px;
+            padding-left: 20px;
+        }
+        
+        .searchInput, .searchName {
+            display: inline-block;
+            height: 30px;
+            line-height: 30px;
+            border: 1px solid gray;
+            margin: 0px 0 0 0;
+            padding: 0 5px;
+            float: left;
+            margin-top: 4px;
+        }
+        .isRequired .el-form-item__label::before {
+            content: '*';
+            color: red;
+        }
+        .searchName {
+            border-left: none;
+        }
+        .itemList {
+            position: absolute;
+            display: none;
+            background: #fff;
+            width: 162px;
+            max-height: 80px;
+            border: 1px solid gray;
+            left: 110px;
+            top: 35px;
+            z-index: 2;
+            overflow-y: auto;
+        }
+        .diagItem {
+            height: 20px;
+            line-height: 20px;
+            font-size: 14px;
+        }
+        .diagItem:hover {
+            border: 1px solid #22ccc8;
+        }
+        .addDepartForm {
+            position: relative;
+            background-color: #fff;
+            padding: 20px;
+            margin: 70px 20px 0px 20px;
+            border-bottom: 1px solid #c0c4cc;
+        }
+        .addDepartFormItem {
+            position: relative;
+        }
+        .symptomList {
+            background-color: #fff;
+             padding: 20px;
+             margin: 0px 20px 0px 20px;
+             min-height: 400px;
+        }
+        .screenIndexLabel {
+            float: left;
+            height: 40px;
+            line-height: 40px;
+        }
+        .indexTab {
+            width: 100%;
+            border-collapse: collapse;
+            tr {
+                td {
+                    height: 40px;
+                    border: 1px solid #666;
+                    text-align: center;
+                }
+            }
+            .selectedContent {
+                width: 25%;
+            }
+            .selectedContentGrop {
+                width: 55%;
+            }
+            .selectedContentOpera {
+                width: 20%;
+            }
+        }
+        .screenIndex {
+            width: 100%;
+            margin-bottom: 30px;
+            position: relative;
+        }
+        .indexList {
+            left: 128px;
+        }
+        .groupInput {
+            text-align: center;
+            height: 28px;
+        }
+        .btn {
+            position: relative;
+            background-color: #fff;
+            margin: 0px 20px;
+            height: 40px;
+            padding: 20px;
+            .el-button {
+                position: absolute;
+                right: 20px;
+            }
+        }
+        .selectDepart {
+            
+        }
+    }
+    
+</style>

src/components/icss/AddCommonSymptom.vue

@@ -1,36 +1,29 @@
-<!-- 添加常见科室症状  -->
+<!-- 添加常见科室选项  -->
 <template>
     <div class="addCommonSymptomWrapper">
-        <div class="groupTitle"><i
-            class="el-icon-back"
-            @click="back"
-        ></i> 常见症状维护系统--{{titleText}}</div>
+         <crumbs
+          :title="'常见选项维护系统-' + titleText"
+          class="topBack"
+          linkTo="/admin/LT-YXSJWH-CJXXWH"
+        ></crumbs>
         <el-form :model="form" ref="ruleForm" :rules="rules" class="addDepartForm">
-            <!-- 一期 -->
-            <el-form-item label="选择科室" prop="department">
-                <el-select :disabled="isEdit || isDetail" v-model="form.department" placeholder="请添加科室" @change="changeDept" class="selectDepart">
-                    <el-option v-for="item in departList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                </el-select>
-            </el-form-item>
+           
              <el-form-item label="选择类型" prop="type">
                 <el-select :disabled="isEdit || isDetail" v-model="form.type" placeholder="请选择类型"  @change="changeType" class="selectDepart">
-                    <!-- 一期 -->
-                    <el-option v-for="item in typeList" :key="item.type" :label="item.typeName" :value="item.type"></el-option>
-                    <!-- 二期 -->
-                    <!-- <el-option v-for="item in typeList" :key="item.key" :label="item.name" :value="item.key"></el-option> -->
+                    
+                    <el-option v-for="item in typeList" :key="item.key" :label="item.name" :value="item.key"></el-option>
                 </el-select>
             </el-form-item>
-            <!-- 二期 -->
-            <!-- <el-form-item label="选择科室" prop="department">
+            <el-form-item label="选择科室" prop="department">
                 <el-select :disabled="isEdit || isDetail || !form.type" v-model="form.department" placeholder="请添加科室" @change="changeDept" class="selectDepart">
                     <el-option v-for="item in departList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
-            </el-form-item> -->
+            </el-form-item>
         </el-form>
         <div class="symptomList">
             <div class="bottomPartLeft fl" v-if="!isDetail">
                 
-                <p class="symptomPoolTitle">症状池</p>
+                <p class="symptomPoolTitle">选项池</p>
                 <div class="symptomPool">
                     <el-input
                     placeholder="请输入搜索内容"
@@ -60,7 +53,7 @@
                 <p><span class="el-icon-arrow-left" @click="toLeftList"></span></p>
             </div>
             <div class="bottomPartRight fl">
-                <p class="symptomPoolTitle">常见症状：</p>
+                <p class="symptomPoolTitle">常见选项：</p>
                 <ul class="tagList operationPool">
                         <li class = "tagItem"
                             v-for="(item,index) in rightTagsList" 
@@ -103,13 +96,13 @@
                 department: '',
                 type:''
             },
-            titleText: '添加科室常见症状',
+            titleText: '添加科室常见选项',
             departList: [],
             typeList:[
-                 {
-                    "name": "症状",
-                    "key": 1
-                },
+                //  {
+                //     "name": "症状",
+                //     "key": 1
+                // },
             ],
             searchVal: '',
             isEdit: false,
@@ -127,23 +120,23 @@
         const { isEdit, isDetail, data } = this.$route.params;
         if(isEdit || isDetail) {
             if(isEdit) {
-                this.titleText = '修改科室常见症状'
+                this.titleText = '修改科室常见选项'
             } else {
-                this.titleText = '科室常见症状详情'
+                this.titleText = '科室常见选项详情'
             }
+            console.log('datadata', data)
             this.isEdit = isEdit
             this.isDetail = isDetail
             this.rightTagsList = data.data
             this.departList.push({name: data.name, id: data.id})
-            this.typeList.push({typeName: data.typeName, type: data.type})
+            this.typeList.push({name: data.typeName, key: data.type})
             this.form.department =data.id
             this.form.type =data.type
             this.getSymptomList()
             
         } else {
             this.getDepartmentList()
-            //二期
-            // this.getIcssEnumsData()
+            this.getIcssEnumsData()
         }
     },
     watch: {
@@ -159,22 +152,18 @@
         back(){
             this.$router.go(-1);
         },
-        // 二期
-        // getIcssEnumsData()  {
-        //     api.getIcssEnumsData().then((res) => {
-        //         if(res.data.code === '0') {
-        //            this.typeList = res.data.data.questionUsualTypeEnum
-        //         }
-        //     })
-        // },
+        getIcssEnumsData()  {
+            api.getIcssEnumsData().then((res) => {
+                if(res.data.code === '0') {
+                   this.typeList = res.data.data.questionUsualTypeEnum
+                }
+            })
+        },
         getDepartmentList() {
-            // 二期
-            // const param = {
-            //     "type": this.form.type
-            // }
-            // api.getDepartmentList(param).then((res)=>{
-            // 一期
-            api.getDepartmentList({}).then((res)=>{
+            const param = {
+                "type": this.form.type
+            }
+            api.getDepartmentList(param).then((res)=>{
                if(res.data.code === '0') {
                    this.departList = res.data.data
                 }
@@ -199,19 +188,12 @@
             })
         },
         changeDept() {
-            //一期
-            this.form.type = ''
-            this.typeList = this.departList.filter(item => this.form.department == item.id)[0].typeDTOList
-            //二期
-            // this.getSymptomList()
+            this.getSymptomList()
             this.clearData()
         },
         changeType() {
-            // 一期
-            this.getSymptomList()
-            // 二期
-            // this.form.department = ''
-            // this.getDepartmentList()
+            this.form.department = ''
+            this.getDepartmentList()
             this.clearData()
         },
         clearData() {
@@ -284,7 +266,7 @@
         submitForm(formName) {
             if(this.isDetail) {
                 this.$router.push({
-                        path:'/admin/LT-YXSJWH-CJZZWH'
+                        path:'/admin/LT-YXSJWH-CJXXWH'
                 })
                 return;
             }
@@ -322,7 +304,7 @@
                     this.warning(res.data.msg || '保存成功', 'success','1000')
                     setTimeout(() => {
                     this.$router.push({
-                        path:'/admin/LT-YXSJWH-CJZZWH'
+                        path:'/admin/LT-YXSJWH-CJXXWH'
                     })
                     }, 1000);
                 } else {
@@ -356,6 +338,9 @@
 <style lang="less">
     @import '../../less/common.less';
     .addCommonSymptomWrapper {
+        .topBack {
+            top: 0;
+        }
         .groupTitle {
             background-color: #fff;
             height: 40px;
@@ -365,12 +350,13 @@
         .addDepartForm {
             background-color: #fff;
             padding: 20px;
-            margin: 20px 20px 0px 20px;
+            margin: 70px 20px 0px 20px;
+            border-bottom: 1px solid #c0c4cc;
         }
         .symptomList {
             background-color: #fff;
              padding: 20px;
-             margin: 20px 20px 0px 20px;
+             margin: 0px 20px 0px 20px;
              height: 500px;
         }
         .bottomPartLeft {

src/components/icss/AddDisAndScaleRelation.vue

@@ -0,0 +1,452 @@
+<!-- 添加常见科室症状  -->
+<template>
+    <div class="addDisAndScaleRelationWrapper">
+        <!-- <div class="groupTitle"><i
+            class="el-icon-back"
+            @click="back"
+        ></i> 量表管理维护--{{titleText}}</div> -->
+        <crumbs
+          :title="'量表管理维护-'+titleText"
+          class="topBack"
+          linkTo="/admin/LT-YXSJWH-LBGLWH"
+        ></crumbs>
+        <el-form :model="form" ref="ruleForm"  class="addDepartForm">
+            <el-form-item  v-if="!isEdit" label="选择诊断标签：" prop="department">
+                <input class="searchInput"  @focus="focuInput" type="text" v-model = "searchDiagVal"> 
+                <span class="searchName" @click="searchDiag">搜索</span>
+                <ul class="itemList diagList" ref="diagList">
+                    <li 
+                    v-for="item in diagList" 
+                    class="diagItem ellipsis"
+                    :title="item.tagName"
+                    @click="selectDiag(item)"
+                    :key="item.id">
+                    {{item.tagName}}
+                    </li>
+                </ul>
+            </el-form-item>
+             <el-form-item class="isRequired" label="已选择诊断：" prop="type">
+                {{form.disName}}
+            </el-form-item>
+        </el-form>
+        <div class="symptomList">
+            <div class="bottomPartLeft fl">
+                
+                <p class="symptomPoolTitle">标签池</p>
+                <div class="symptomPool">
+                    <el-input
+                    placeholder="请输入搜索内容"
+                    v-model="searchTagVal"
+                    >
+                        <i
+                            slot="prefix"
+                            class="el-input__icon el-icon-search"
+                        ></i>
+                    </el-input>
+                    <ul class="tagList tagPool">
+                        <li v-for="(item, index) in leftTagsList"
+                            class = "tagItem"
+                            :key='item.id'
+                            :title="'[ '+item.tagName+' ]'"
+                            :style="getStyle(item)?styles:null"
+                            @click='selectLeftTag(item, index)'
+                        >
+                            <p class="tagName ellipsis" >{{item.tagName}} </p>
+                        </li>
+                    </ul>
+                </div>
+
+            </div>
+            <div class="bottomPartMid fl">
+                <p><span class="el-icon-arrow-right" @click="toRightList"></span></p>
+                <p><span class="el-icon-arrow-left" @click="toLeftList"></span></p>
+            </div>
+            <div class="bottomPartRight fl">
+                <p class="symptomPoolTitle">已选内容：</p>
+                <ul class="tagList operationPool">
+                        <li class = "tagItem"
+                            v-for="(item,index) in rightTagsList" 
+                            :key='item.id'
+                            :style="index === selectRightTagIndex?styles:null"
+                            @click='selectRightTag(index)'
+                        >   
+                            <p v-if="item.tagName" class="tagName  ellipsis" :title="'[ '+item.tagName+' ]'">{{item.tagName}} </p>
+                        </li>
+                    </ul>
+
+            </div>
+            <div class="bottomPartMid fl" >
+                <p><span class="el-icon-arrow-up" @click="toUp"></span></p>
+                <p><span class="el-icon-arrow-down" @click="toDown"></span></p>
+            </div>
+            
+        </div>
+        <div class="btn">
+            <el-button
+            type="primary"
+            @click="submitForm('ruleForm')"
+            >确 定</el-button>
+        </div>
+    </div>
+    
+</template>
+
+<script>
+  import api from '@api/icss.js';
+  export default {
+    name: 'AddDisAndScaleRelationWrapper',
+    data() {
+        return{
+            
+            form: {
+                disId: '',  //诊断id
+                disName:''  //诊断名称
+            },
+            titleText: '添加量表关联',
+            diagList: [],
+            searchDiagVal: '',
+            searchTagVal: '',
+            isEdit: false,
+            leftTagsList:[],
+            rightTagsList:[],
+            selectLeftTagsList: [],
+            selectRightTagIndex: -1,
+            styles:{
+                background:'#eae7e7'
+            },
+        }
+    },
+    created(){
+        const { isEdit, data } = this.$route.params;
+        if(isEdit) {
+            if(isEdit) {
+                this.titleText = '修改量表关联'
+            } 
+            data.data.map((item) => {
+                item.id = item.scaleId
+                item.tagName = item.scaleName
+                return item
+            })
+            this.isEdit = isEdit
+            this.rightTagsList = data.data
+            this.form.disId =data.disId
+            this.form.disName =data.disName
+            this.getTagList()
+            
+        } else {
+            this.getTagList()
+            
+        }
+    },
+    watch: {
+        searchTagVal(newVal, preVal) {
+            if(newVal.trim() == ''){
+                this.getTagList()
+            }else if(newVal.trim() != preVal.trim()){
+                this.getTagList()
+            }
+        }
+    },
+    methods: {
+        back(){
+            this.$router.go(-1);
+        },
+        searchDiag() {
+             const param = {
+                "tagName": this.searchDiagVal,
+                "type": '7',
+            }
+            api.searchTagList(param).then((res)=>{
+               if(res.data.code === '0') {
+                   this.diagList = res.data.data
+                   if(this.diagList.length > 0){ this.$refs['diagList'].style.display='block' }
+                }
+            })
+        },
+        selectDiag(item) {
+            this.form.disId = item.id
+            this.form.disName = item.tagName
+            this.$refs['diagList'].style.display='none'
+            this.searchDiagVal = ''
+            this.diagList=[]
+        },
+        focuInput() {
+            this.$refs['diagList'].style.display='none'
+        },
+        getTagList() {
+            const notIds = this.selectedTags()
+            const param = {
+                "tagName": this.searchTagVal,
+                "type": '21',
+                "notIds": notIds,
+                "sexType": this.sexType,
+            }
+            api.searchTagList(param).then((res)=>{
+               if(res.data.code === '0') {
+                   this.leftTagsList = res.data.data
+                }
+            })
+        },
+        selectedTags() {
+            let selectedTags = []
+            for (let i =0; i < this.rightTagsList.length; i++) {
+                selectedTags.push(this.rightTagsList[i].id)
+            }
+            return selectedTags
+        },
+        selectLeftTag(tag, index, e) {
+            const hasTag = this.isHasTag(tag, this.selectLeftTagsList)
+            if (hasTag) {
+                this.selectLeftTagsList = this.selectLeftTagsList.filter(item => item.id !== tag.id)
+            } else {
+                this.selectLeftTagsList.push(tag);
+            }
+        },
+        selectRightTag(index) {
+            this.selectRightTagIndex = this.selectRightTagIndex === index ? -1 : index
+        },
+        toRightList(){
+            this.rightTagsList.push(...this.selectLeftTagsList);
+            this.selectLeftTagsList = [];
+            this.selectRightTagIndex = -1;
+            this.getTagList()
+        },
+        toLeftList(){
+            if(this.selectRightTagIndex == -1) {
+                return
+            }
+            this.rightTagsList.splice(this.selectRightTagIndex, 1)
+            this.selectLeftTagsList = [];
+            this.selectRightTagIndex -= 1;
+            this.getTagList()
+
+        },
+        toUp(){
+            if(this.selectRightTagIndex === 0 || this.selectRightTagIndex === -1) {
+                return
+            }
+            const tempItem = this.rightTagsList[this.selectRightTagIndex]
+            this.rightTagsList.splice(this.selectRightTagIndex, 1)
+            this.rightTagsList.splice(this.selectRightTagIndex-1, 0,tempItem)
+            this.selectRightTagIndex -= 1
+        },
+        toDown(){
+             if(this.selectRightTagIndex === this.rightTagsList.length-1 || this.selectRightTagIndex === -1) {
+                return
+            }
+            const tempItem = this.rightTagsList[this.selectRightTagIndex]
+            this.rightTagsList.splice(this.selectRightTagIndex, 1)
+            this.rightTagsList.splice(this.selectRightTagIndex+1, 0,tempItem)
+            this.selectRightTagIndex += 1
+
+        },
+
+        isHasTag(item, arr) {
+            for ( let i = 0; i <arr.length; i++) {
+                if(arr[i].id === item.id) {
+                    return true;
+                }
+            }
+            return false;
+        },
+        getStyle(item){       //左侧选中状态
+            return this.isHasTag(item, this.selectLeftTagsList)
+        },
+        getStyle2(item) {
+            return this.isHasTag(item, this.selectRightTagsList)
+        },
+        submitForm(formName) {
+            if(!this.form.disId) {
+                this.warning('请选择诊断')
+                return
+            }
+            if(this.rightTagsList.length === 0) {
+                this.warning('请选择量表')
+                return
+            }
+            this.showDelDialog()
+        },
+        showDelDialog() {
+            const scaleId = this.selectedTags()
+            const param ={
+                "disId": this.form.disId,
+                "scaleId": scaleId
+            }
+            this.showConfirmDialog('是否建立该关联？', () => {
+                api.addDisScaleInfo(param).then((res) => {
+                if (res.data.code  === '0') {
+                    this.warning(res.data.msg || '关联成功', 'success','1000')
+                    setTimeout(() => {
+                    this.$router.push({
+                        path:'/admin/LT-YXSJWH-LBGLWH'
+                    })
+                    }, 1000);
+                } else {
+                    this.warning(res.data.msg)
+                }
+                }).catch((err) => {
+                    this.warning(err);
+                })
+            });
+        },
+        showConfirmDialog(msg, resolve) {
+            this.$alert(msg, '提示', {
+                confirmButtonText: '确定',
+                type: 'warning'
+            }).then(() => {
+                resolve();
+            }).catch(() => {});
+        },
+        warning(msg, type,time) {
+            this.$message({
+                showClose: true,
+                message: msg,
+                type: type || 'warning',
+                duration:time || '3000'
+            })
+        },
+    }
+  }
+</script>
+
+<style lang="less">
+    @import '../../less/common.less';
+    .addDisAndScaleRelationWrapper {
+        .topBack {
+            top: 0;
+        }
+        .groupTitle {
+            background-color: #fff;
+            height: 40px;
+            line-height: 40px;
+            padding-left: 20px;
+        }
+        .searchInput, .searchName {
+            display: inline-block;
+            height: 30px;
+            line-height: 30px;
+            border: 1px solid gray;
+            margin: 0px 0 0 0;
+            padding: 0 5px;
+        }
+        .isRequired .el-form-item__label::before {
+            content: '*';
+            color: red;
+        }
+        .searchName {
+            border-left: none;
+        }
+        .itemList {
+            position: absolute;
+            display: none;
+            background: #fff;
+            width: 162px;
+            max-height: 80px;
+            border: 1px solid gray;
+            left: 110px;
+            top: 35px;
+            z-index: 2;
+            overflow-y: auto;
+        }
+        .diagItem {
+            height: 20px;
+            line-height: 20px;
+            font-size: 14px;
+        }
+        .diagItem:hover {
+            border: 1px solid #22ccc8;
+        }
+        .addDepartForm {
+            background-color: #fff;
+            padding: 20px;
+            margin: 70px 20px 0px 20px;
+            border-bottom: 1px solid #c0c4cc;
+        }
+        .symptomList {
+            background-color: #fff;
+             padding: 20px;
+             margin: 0px 20px 0px 20px;
+             height: 500px;
+        }
+        .bottomPartLeft {
+            width: 32%;
+        }
+        .symptomPoolTitle {
+            height: 40px;
+            line-height: 40px;
+        }
+        .symptomPool {
+            width: 100%;
+        }
+        .tagList {
+            width: 100%;
+            height: 300px;
+            border: 1px solid @icssBorder;
+            box-sizing: border-box;
+        }
+        .tagList {
+            border: 1px solid @icssBorder;
+        }
+        .tagPool {
+            height: 300px;
+            overflow-y: auto;
+
+        }
+        .tagItem {
+            position: relative;
+            line-height: 30px;
+            cursor: pointer;
+            padding: 0 10px;
+        }
+        .tagName:before {
+            content: '['
+        }
+        .tagName::after {
+            content: ']'
+        }
+        .bottomPartMid {
+            width: 8%;
+            margin-top: 60px;
+            p {
+            width: 100%;
+            text-align: center;
+            span {
+                cursor: pointer;
+                display: inline-block;
+                width: 30px;
+                height: 40px;
+                line-height: 40px;
+                margin: 0 auto;
+                border: 1px solid @icssBorder;
+                margin-bottom: 15px;
+                font-size: 18px;
+            }
+            }
+        }
+        .bottomPartRight {
+            width: 32%;
+        }
+        .operationPool {
+            position: relative;
+            width: 100%;
+            height: 340px;
+            padding: 10px 0;
+            overflow-y: auto;
+        }
+        .btn {
+            position: relative;
+            background-color: #fff;
+            margin: 0px 20px;
+            padding: 20px;
+            .el-button {
+                position: absolute;
+                right: 20px;
+                top: -20px;
+            }
+        }
+        .selectDepart {
+            
+        }
+    }
+    
+</style>

src/components/icss/AddMedicalInfo.vue

@@ -1,9 +1,14 @@
 <template>
     <div class="MedicalInfoWrapper">
-        <div class="groupTitle"><i
+        <!-- <div class="groupTitle"><i
                 class="el-icon-back"
                 @click="back"
-        ></i> 医学术语属性--{{isEdit?'修改':'添加'}}</div>
+        ></i> 医学术语属性--{{isEdit?'修改':'添加'}}</div> -->
+        <crumbs
+          :title=" isEdit? '医学术语属性-修改':'医学术语属性-添加'"
+          class="topBack"
+          linkTo="/admin/LT-YXSYKWH-SYYXSXWH"
+        ></crumbs>
         <div class="info-container">
             <el-form :rules="rules"
                      :model="form"
@@ -546,6 +551,9 @@
 <style lang="less">
     @import "../../less/common.less";
     .MedicalInfoWrapper {
+      .topBack {
+        top: 0;
+      }
       .required {
         .el-form-item__label::before {
           color: red;
@@ -644,7 +652,7 @@
         .info-container{
             background: #fff;
             padding: 20px;
-            margin: 20px 20px -20px 20px;
+            margin: 70px 20px 20px 20px;
         .el-input__inner{
             width: 200px;
             height: 32px;

src/components/icss/AddMedicinePrompt.vue

@@ -1,9 +1,14 @@
 <template>
     <div class="NoiseTemplateWrapper TemplateWrapper">
-        <div class="groupTitle"><i
+        <!-- <div class="groupTitle"><i
                 class="el-icon-back"
                 @click="back"
-        ></i> 医学静态知识--{{isEdit?'修改':'添加'}}</div>
+        ></i> 医学静态知识--{{isEdit?'修改':'添加'}}</div> -->
+        <crumbs
+          :title=" isEdit? '医学静态知识-修改':'医学静态知识-添加'"
+          class="topBack"
+          linkTo="/admin/LT-YXSYKWH-YXSYJTZSWH"
+        ></crumbs>
         <div class="info-container">
             <el-form :rules="rules"
                      :model="form"
@@ -236,10 +241,13 @@
 </script>
 <style lang="less">
     @import "../../less/common.less";
+    .topBack{
+      top: 0;
+    }
     .info-container{
         background: #fff;
         padding: 20px;
-        margin: 20px 20px -20px 20px;
+        margin: 70px 20px -20px 20px;
     .el-input__inner{
         width: 200px;
     }

src/components/icss/AddPhysicalExamTemp.vue

@@ -307,9 +307,9 @@
 <style lang="less">
     @import '../../less/common.less';
     .AddPhysicalExamTempWrapper {
-      .topBack {
+        .topBack {
         top:0;
-      }
+        }
         .groupTitle {
             background-color: #fff;
             height: 40px;
@@ -319,12 +319,13 @@
         .addDepartForm {
             background-color: #fff;
             padding: 20px;
-            margin: 60px 20px 0px 20px;
+            margin: 70px 20px 0px 20px;
+            border-bottom: 1px solid #c0c4cc;
         }
         .symptomList {
             background-color: #fff;
              padding: 20px;
-             margin: 20px 20px 0px 20px;
+             margin: 0px 20px 0px 20px;
              height: 500px;
         }
         .bottomPartLeft {

src/components/icss/AddPromptInfo.vue

@@ -1,9 +1,8 @@
 <template>
+
     <div class="NoiseTemplateWrapper TemplateWrapper">
-        <div class="groupTitle"><i
-                class="el-icon-back"
-                @click="back"
-        ></i> 提示信息维护--{{isEdit?'修改':'添加'}}</div>
+        <crumbs :title="txt" class="topBack" linkTo="/admin/LT-YXSJWH-TSXXWH">
+        </crumbs>
         <div class="info-container">
             <el-form :rules="rules"
                      :model="form"
@@ -68,6 +67,7 @@
       };
       return {
         isEdit:false,
+        txt:'提示信息维护-添加',
         tagPool:[],                 //标签池数据
         len:0,
         Adscriptions:[],            //归属列表
@@ -105,6 +105,7 @@
       if(isEdit){
         this.isEdit = isEdit;
         const id = data.id;
+        this.txt='提示信息维护-修改'
         api.getPrompDetail({id}).then((res) =>{
           if(res.data.code === '0') {
             this.form = this.parseData(res.data.data);
@@ -247,7 +248,7 @@
     .info-container{
         background: #fff;
         padding: 20px;
-        margin: 20px 20px -20px 20px;
+        margin: 70px 20px -20px 20px;
         .el-input__inner{
             width: 200px;
         }

src/components/icss/ChronicAndIndexRelation.vue

@@ -46,7 +46,7 @@
                     label="操作">
                     <template slot-scope="scope">
                         <el-button  @click="modifyRelation(scope.row)" type="text" size="small">修改</el-button>
-                        <el-button @click="showDelDialog(scope.row.id)" class="delete" type="text" size="small">删除</el-button>
+                        <el-button @click="showDelDialog(scope.row)" class="delete" type="text" size="small">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -99,11 +99,8 @@ export default {
     methods: {
         getDataList() {
             const param = this.getFilterItems();
-            console.log('resss1',)
             api.queryIndexConfigPages(param).then((res) => {
-                console.log('resss22', res)
                 if(res.data.code == '0') {
-                    console.log('resss', res)
                     this.list = res.data.data.records
                     this.total = res.data.data.total;
                 }
@@ -114,12 +111,18 @@ export default {
             this.getDataList();
         },
         addRelation() {
-            this.$router.push({name:'AddChemicalAndCommonMapping'})
+            this.$router.push({name:'AddChronicAndIndexRelation'})
         },
         modifyRelation(row) {
-            console.log(row,'row')
-            const item = Object.assign({},row);
-            this.$router.push({name:'AddChemicalAndCommonMapping',params:{isEdit:true,data:item}});
+            const param = {
+                diseaseId: row.diseaseId
+            }
+            api.getIndexConfigLists(param).then((res) => {
+                if(res.data.code == '0') {
+                    const item = Object.assign({},row,{data: res.data.data});
+                    this.$router.push({name:'AddChronicAndIndexRelation',params:{isEdit:true,data:item}});
+                }
+            })
         },
         currentChange(next) {
             this.currentPage = next;
@@ -159,9 +162,12 @@ export default {
             resolve();
           }).catch(() => {});
         },
-        showDelDialog(id){
+        showDelDialog(row){
+          const param = {
+              diseaseId:row.diseaseId
+          }
           this.showConfirmDialog('是否删除该关联？',()=>{
-            api.delLisMappingById({id:id}).then((res)=>{
+            api.cancelIndexConfigAlls(param).then((res)=>{
               if(res.data.code=='0'){
                 this.getDataList();
                 this.warning(res.data.msg || '操作成功','success');

src/components/icss/CommonSymptom.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <crumbs title="icss科室症状维护">
+        <crumbs title="icss科室选项维护">
             <el-form :inline="true" class="demo-form-inline">
                 <el-form-item label="科室名称：">
                     <el-input size="mini" v-model="filter.proName" placeholder="科室名称"></el-input>
@@ -8,7 +8,7 @@
                 <el-form-item>
                     <el-button size="mini" @click="filterDatas">确认</el-button>
                     <router-link to="/admin/LT-YXSJWH-TJCJZZ" style="margin:0 10px">
-                        <el-button size="mini" type="warning">添加科室常见症状</el-button>
+                        <el-button size="mini" type="warning">添加科室常见选项</el-button>
                     </router-link>
                 </el-form-item>
             </el-form>
@@ -181,7 +181,7 @@
         }).catch(() => {});
       },
       showDelDialog(row){
-        this.showConfirmDialog('是否删除该科室常见症状？',()=>{
+        this.showConfirmDialog('是否删除该科室常见选项？',()=>{
           const param = {
             "deptId": row.id,
             "type": row.type

src/components/icss/DisAndScaleRelation.vue

@@ -0,0 +1,213 @@
+<template>
+    <div>
+        <crumbs title="量表关联维护" style="min-width: 980px">
+            <el-form :inline="true" class="demo-form-inline">
+                <el-form-item label="量表名称：">
+                    <el-input size="mini" v-model="filter.scaleName" placeholder="量表名称" clearable></el-input>
+                </el-form-item>
+                 <el-form-item label="关联标签：">
+                    <el-input size="mini" v-model="filter.disName" placeholder="关联标签" clearable></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button size="mini" @click="filterDatas">确认</el-button>
+                    <el-button size="mini" type="warning" @click="addRelation">添加关联</el-button>
+                </el-form-item>
+            </el-form>
+        </crumbs>
+        <div class="contents">
+            <el-table
+                :data="list"
+                border
+                style="width: 100%">
+                <el-table-column
+                    :resizable = "false"
+                    type="index"
+                    :index = 'indexMethod'
+                    label="编号"
+                    width="60">
+                </el-table-column>
+                <el-table-column
+                    :resizable = "false"
+                    prop="gmtModified"
+                    label="操作时间"
+                    width="180">
+                </el-table-column>
+                <el-table-column
+                    :resizable = "false"
+                    prop="disName"
+                    label="关联标签"
+                    show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column
+                    :resizable = "false"
+                    prop="scaleName"
+                    label="量表名称"
+                    show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column
+                    :resizable = "false"
+                    prop="modifier"
+                    label="操作人">
+                </el-table-column>
+                <el-table-column
+                    :resizable = "false"
+                    prop="operate"
+                    label="操作">
+                    <template slot-scope="scope">
+                        <el-button  @click="modifyRelation(scope.row)" type="text" size="small">修改</el-button>
+                        <el-button @click="showDelDialog(scope.row.id)" class="delete" type="text" size="small">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        <div class="pagination">
+            <el-pagination v-if="total>pageSize"
+                       :current-page.sync="currentPage"
+                       @current-change="currentChange"
+                       background
+                       :page-size="pageSize"
+                       layout="total,prev, pager, next, jumper"
+                       :total="total">
+            </el-pagination>
+        </div>
+        
+        </div>
+       <!--  <div class="pagination">
+           <el-pagination v-if="total>pageSize"
+                      :current-page.sync="currentPage"
+                      @current-change="currentChange"
+                      background
+                      :page-size="pageSize"
+                      layout="total,prev, pager, next, jumper"
+                      :total="total">
+           </el-pagination>
+       </div> -->
+        
+    </div>
+</template>
+
+<script>
+import api from '@api/icss.js';
+
+export default {
+    name: 'DisAndScaleRelation',   //诊断量表关联维护
+    data: function() {
+        return {
+            list: [],
+            filter: {
+                disName: '',
+                scaleName: '',
+            },
+            currentPage: 1,
+            pageSize: 10,
+            total: 0,
+        }
+    },
+    created() {
+        this.getDataList()
+        
+    },
+    methods: {
+        getDataList() {
+            const param = this.getFilterItems();
+            api.getDisScaleAllInfo(param).then((res) => {
+                if(res.data.code == '0') {
+                    this.list = res.data.data.records
+                    this.total = res.data.data.total;
+                }
+            })
+        },
+        filterDatas() {
+            this.currentPage = 1;
+            this.getDataList();
+        },
+        addRelation() {
+            this.$router.push({name:'AddDisAndScaleRelation'})
+        },
+        modifyRelation(row) {
+            console.log(row,'row')
+            const param = {
+                disId: row.disId
+            }
+            api.getDisScaleByDisId(param).then((res) => {
+                if(res.data.code=='0'){
+                    const { data } = res.data
+                    const item = Object.assign({},row, {data: data});
+                    this.$router.push({name:'AddDisAndScaleRelation',params:{isEdit:true,data:item}});
+                } else {
+                    this.warning(res.data.msg);
+                }
+            }).catch((error)=>{
+                this.warning(error)
+            })
+            
+        },
+        currentChange(next) {
+            this.currentPage = next;
+            this.getDataList();
+            // if (this.cacheData[next]) {       //如果已请求过该页数据，则使用缓存不重复请求
+            //     this.list = this.cacheData[next];
+            // } else {
+            //     this.getDataList();
+            // }
+        },
+        getFilterItems() {
+            const param = {
+                current: this.currentPage,
+                size: this.pageSize,
+                disName:this.filter.disName,
+                scaleName: this.filter.scaleName
+            };
+            return param;
+        },
+        indexMethod(index) {
+            return ((this.currentPage - 1) * this.pageSize) + index + 1;
+        },
+        getTagType(val) {
+            return val
+        },
+        warning(msg,type){
+          this.$message({
+            showClose: true,
+            message:msg,
+            type:type||'warning'
+          })
+        },
+        showConfirmDialog(msg,resolve){
+          this.$alert(msg, '提示', {
+            confirmButtonText: '确定',
+            type: 'warning'
+          }).then(() => {
+            resolve();
+          }).catch(() => {});
+        },
+        showDelDialog(id){
+          this.showConfirmDialog('是否删除该关联？',()=>{
+            api.delDisScaleInfo({id:id}).then((res)=>{
+              if(res.data.code=='0'){
+                this.getDataList();
+                this.warning(res.data.msg || '操作成功','success');
+              }else{
+                this.warning(res.data.msg);
+              }
+            }).catch((error)=>{
+              this.warning(error);
+            })
+          });
+        }
+    }
+}
+</script>
+
+
+<style lang="less">
+    @import "../../less/admin.less";
+    .delete{
+       color: red;
+    }
+    .delete:hover {
+        color: red;
+    } 
+    .pagination {
+        min-width: 1010px;
+    }
+</style>

src/components/icss/PromptDetail.vue

@@ -1,9 +1,7 @@
 <template>
     <div class="NoiseTemplateWrapper TemplateWrapper">
-        <div class="groupTitle"><i
-                class="el-icon-back"
-                @click="back"
-        ></i> 提示信息维护--详情</div>
+        <crumbs title="提示信息维护--详情" linkTo="/admin/LT-YXSJWH-TSXXWH">
+        </crumbs>
         <div class="info-container">
             <el-form label-width="130px"
                      ref="groups">

src/routes.js

@@ -73,6 +73,10 @@ import ChronicDiseaseManageAdd from '@components/icss/ChronicDiseaseManageAdd.vu
 import ChemicalAndCommonMapping from '@components/icss/ChemicalAndCommonMapping.vue'; //化验大小项与公表维护
 import AddChemicalAndCommonMapping from '@components/icss/AddChemicalAndCommonMapping.vue'  //化验大小项与公表维护--添加关联
 import ChronicAndIndexRelation from '@components/icss/ChronicAndIndexRelation.vue'  //医学数据--慢病指标值关联维护
+import AddChronicAndIndexRelation from '@components/icss/AddChronicAndIndexRelation.vue'  //医学数据--添加慢病指标值关联
+import DisAndScaleRelation from '@components/icss/DisAndScaleRelation.vue'  //医学数据--量表关联维护
+import AddDisAndScaleRelation from '@components/icss/AddDisAndScaleRelation.vue'  //医学数据--添加量表关联
+
 
 
 import MedicalType from '@components/icss/MedicalType.vue'//医学术语维护-类型维护
@@ -182,7 +186,7 @@ export default [
       {path:'LT-YXSJWH-TJDLBQ',component:AddIndeptLabel,name:'AddIndeptLabel'},     //独立标签维护--添加
       {path:'LT-YXSJWH-TSXXWH',component:PromptInfo,name:'PromptInfo'},         //提示信息维护
 	    {path:'LT-YXSJWH-BMWH',component:SimilarName,name:'SimilarName'},     //别名维护
-      {path:'LT-YXSJWH-CJZZWH',component:CommonSymptom,name:'CommonSymptom'},  //常见症状维护
+      {path:'LT-YXSJWH-CJXXWH',component:CommonSymptom,name:'CommonSymptom'},  //常见症状维护
       {path:'LT-YXSJWH-TJCJZZ',component:AddCommonSymptom,name:'AddCommonSymptom'},  //常见症状维护--添加
       {path:'LT-YXSJWH-TJBM',component:AddSimilarName,name:'AddSimilarName'},     //别名维护-添加/修改
       {path:'LT-YXSJWH-MZSMWH',component:DisclaimerInformation,name:'DisclaimerInformation'},     //免责声明
@@ -215,6 +219,9 @@ export default [
       {path:'LT-YXSJWH-TJHYDXXYGBXDY',component:AddChemicalAndCommonMapping,name:'AddChemicalAndCommonMapping'},  //化验大小项与公表维护--添加关联
       {path:'LT-YXSYKWH-YXSYLXWH',component:MedicalType,name:'MedicalType'},     //医学术语--类型维护
       {path:'LT-YXSJWH-MBZBZGLWH',component:ChronicAndIndexRelation,name:'ChronicAndIndexRelation'},     //医学数据--慢病指标值关联维护
+      {path:'LT-YXSJWH-TJMBZBZGL',component:AddChronicAndIndexRelation,name:'AddChronicAndIndexRelation'},     //医学数据--慢病指标值关联维护
+      {path:'LT-YXSJWH-LBGLWH',component:DisAndScaleRelation,name:'DisAndScaleRelation'},     //医学数据--慢病指标值关联维护
+      {path:'LT-YXSJWH-TJLBGL',component:AddDisAndScaleRelation,name:'AddDisAndScaleRelation'},     //医学数据--慢病指标值关联维护
     ]
   }
 ]