Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

package-lock.json

@@ -4818,7 +4818,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5233,7 +5234,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5289,6 +5291,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5332,12 +5335,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },

src/api/config.js

@@ -1,6 +1,6 @@
 export default {
   host:'http://192.168.2.241:5050',
-  imgHost:'http://192.168.2.121:82',      //富文本编辑器图片回传地址
+  imgHost:'http://192.168.2.241:82',      //富文本编辑器图片回传地址
   urls: {
     /* 登录注册相关接口 */
     'getImgVerification': '/api/user/userver/getImgVerification',
@@ -15,6 +15,8 @@ export default {
     'getSmsWithResetPassword': '/api/user/userver/getSmsWithResetPassword',
     'resetPassword': '/api/user/user/resetPassword',
     'getAccessdMenu': '/api/user/user/getUserOrgMenu',  //获取左侧菜单项
+    'getVersionInner':'api/knowledgeman/versionInfo/getVersionInfoInner',  //获取内部版本信息
+    'getVersionOuter':'api/knowledgeman/versionInfo/getVersionInfoOuter',  //获取外部版本信息
     'getUserEnumsData': '/api/user/getUserEnumsData',   //获取用户枚举数据
     'getDiagbotManEnumsData':'/api/diagbotman/getDiagbotManEnumsData',      //获取产品枚举类型
     /* 朗通后台相关接口 */
@@ -137,13 +139,14 @@ export default {
     'getConceptKnowledgeList':'/api/knowledgeman/conceptDetail/page', //  术语静态知识列表
     'getConceptKnowledge':'/api/knowledgeman/conceptDetail/getByConceptId',//术语静态知识详情
     'getConceptInfo':'/api/knowledgeman/concept/getConceptInfo', //  搜索术语
-    'versionInfo': 'api/icssman/versionInfo/getVersionInfoAlls', //版本信息
-    'addVersInfo': 'api/icssman/versionInfo/saveVersionInfoAlls', //版本信息-添加
-    'updateVersInfo': 'api/icssman/versionInfo/updateVersionInfoAlls', //版本信息-修改
-    'delVersionInfo': 'api/icssman/versionDetail/cancelVersionDetails', //版本信息-删除版本说明
-    'addVersionInfo': 'api/icssman/versionDetail/addVersionDetails', //版本信息-添加版本说明
-    'modiVersionInfo': 'api/icssman/versionDetail/updateVersionDetails', //版本信息-修改版本说明
-    'getVersionDetlInfo': 'api/icssman/versionDetail/getDetailById', //版本信息-版本说明列表获取
+    // 'versionInfo': 'api/icssman/versionInfo/getVersionInfoAlls', //版本信息
+    'versionInfo': 'api/knowledgeman/versionInfo/getVersionInfoAlls', //版本信息
+    'addVersInfo': 'api/knowledgeman/versionInfo/saveVersionInfoAlls', //版本信息-添加
+    'updateVersInfo': 'api/knowledgeman/versionInfo/updateVersionInfoAlls', //版本信息-修改
+    'delVersionInfo': 'api/knowledgeman/versionDetail/cancelVersionDetails', //版本信息-删除版本说明
+    'addVersionInfo': 'api/knowledgeman/versionDetail/addVersionDetails', //版本信息-添加版本说明
+    'modiVersionInfo': 'api/knowledgeman/versionDetail/updateVersionDetails', //版本信息-修改版本说明
+    'getVersionDetlInfo': 'api/knowledgeman/versionDetail/getDetailById', //版本信息-版本说明列表获取
     'promptServer':'/api/knowledgeman/file/uploadImage',    //静态知识富文本图片上传
     /**************医学术语维护****************/
     'getKnowledgeEnums':'api/knowledgeman/getKlmEnumsData', //术语库枚举

src/api/index.js

@@ -102,6 +102,12 @@ export default {
   getAccessdMenu() {
     return axios.post(urls.getAccessdMenu);
   },
+  getVersionInner(){
+    return axios.post(urls.getVersionInner);
+  },
+  getVersionOuter(){
+    return axios.post(urls.getVersionOuter);
+  },
   getUserEnumsData() {
     return axios.post(urls.getUserEnumsData);
   }

src/components/common/HomePage.vue

@@ -8,6 +8,13 @@
             </div>
                  <lt-menu v-if="menuWrappers&&menuWrappers.length" v-bind:role="getRole"
                  v-bind:data="menuWrappers"></lt-menu>
+            <div class="version">
+                <p>
+                    <span>版本信息：</span>
+                    <a href="javascript:void(0)" @click="showVersion">{{versionName}}</a>
+                    <i v-if="isNewV"><img src="../../images/new.png" alt=""/></i>
+                </p>
+            </div>
         </el-aside>
         <el-container>
             <el-header class="clearfix">
@@ -26,6 +33,13 @@
               <router-view v-if="ok" v-on:status-change="changeStatus"></router-view>
             </el-main>
         </el-container>
+        <el-dialog
+                title="版本信息"
+                :visible.sync="versionVisible"
+                width="50%"
+                class="version-info">
+            <div v-html="versionInfo"></div>
+        </el-dialog>
     </el-container>
 </template>
 
@@ -35,7 +49,7 @@
   import api from '@api/index.js';
   import userApi from '@api/user.js';
   import Console from '@components/user/Console.vue';
-
+  import newIcon from '../../images/new.png';
   export default {
     name: 'homepage',
     components: {
@@ -51,6 +65,11 @@
         authStatus: null,
         authStatusName:'',
         ok:false,           //是否已获取到菜单
+        versionName:'',
+        versionVisible:false,
+        versionInfo:'',
+        isNewV:false,
+        version:null,       //版本信息接口返回的数据
       }
     },
     computed: {
@@ -69,6 +88,7 @@
             }
             if(to.path=='/'){       // 退出时清空菜单
               this.menuWrappers=[];
+              this.isNewV = false;
             }
         }
     },
@@ -91,11 +111,50 @@
               const url = this.getRole=='user'?'/user/YH-KZT':'/admin/LT-KZT';
               this.$router.push({path:url});
             }
+            this.getVersionInfo();
           }
         }).catch((error) => {
           console.log(error);
         });
       },
+      isNewVersion(){           //判断是否为新版
+
+      },
+      getVersionInfo(){
+        const getInfo = this.getRole=='user'?api.getVersionOuter:api.getVersionInner;
+        getInfo().then((res)=>{
+          if (res.data.code == '0') {
+            const data = res.data.data;
+            this.fillVersionInfo(data);
+          }else{
+            this.$message(res.data.msg);
+          }
+        });
+      },
+      fillVersionInfo(data){
+        //进入时获取版本信息，如版本时间与localStorage中不一致或者一致但localStorage中未被点过，
+        // 则要显示更新图标
+        let htl = '<h3>当前版本：'+data.name+'<span>'+data.refreshTime.substr(0,10)+'</span></h3>';
+        let prags = data.detail||[];
+        this.versionName = data.name;
+        const versionTime = JSON.parse(localStorage.getItem('versionInfo-'+this.userLoginDTO.username));
+        if(!versionTime||(data.refreshTime===versionTime.date&&!versionTime.showed)){
+          this.isNewV = true;
+        }else{
+          this.isNewV = false
+        }
+        for(let i=0;i<prags.length;i++){
+            htl += '<p>'+prags[i].title+'</p><p>'+prags[i].description+'</p>';
+        }
+        this.versionInfo = htl;
+        this.version = {date:data.refreshTime};
+      },
+      showVersion(){
+        this.versionVisible = true;
+        this.version.showed = true;
+        this.isNewV = false;
+        localStorage.setItem('versionInfo-'+this.userLoginDTO.username,JSON.stringify(this.version));
+      },
       /*redirectPage(){
         const url = this.getRole=='user'?'/user':'/admin';
         this.$router.push({path:url});
@@ -143,9 +202,47 @@
     .admin .username{
         cursor: pointer;
     }
+    .version-info h3{
+        font-size: 14px;
+        margin-bottom: 20px;
+        span{
+            float: right;
+            font-weight: normal;
+        }
+    }
 </style>
 <style lang="less" scoped>
     @import '../../less/common.less';
+    .el-menu-vertical-demo.el-menu{
+        height: calc(100% - 120px);
+        overflow-y: auto;
+    }
+    .version{
+        position: fixed;
+        bottom: 0;
+        width: @aside-width;
+        min-width: 270px;
+        font-size: 12px;
+        /*text-indent: 50px;*/
+        text-align: center;
+        height:54px;
+        line-height: 54px;
+        background: #fff;
+        i{
+            display: inline-block;
+            width: 20px;
+            height: 16px;
+            img{
+                vertical-align: text-top;
+            }
+        }
+    }
+    .user .version a{
+        color: @userBase;
+    }
+    .admin .version a{
+        color: @adminBase;
+    }
     .user .logo {
         background: @userBase;
 

src/components/icss/AddConceptRelation.vue

@@ -31,7 +31,7 @@
     <div class="bottomPartLeft fl">
       <p class="assayTitle">关联标准术语</p>
       <p class="symptomPoolTitle">术语搜索</p>
-      <el-form>
+      <!-- <el-form>
         <el-form-item label="类型：">
           <el-select v-model="type" placeholder="请选择" size="small">
           <el-option 
@@ -42,7 +42,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-    </el-form>
+          </el-form> -->
 
     <div class="symptomPool">
       <el-input
@@ -127,11 +127,16 @@ export default {
       type:null,
       typeList:[],
       nodeList:[],
-      saveDisable: false  //保存按钮禁止点击
+      saveDisable: false,  //保存按钮禁止点击
+      conceptType:'',
+      searchType:''
     }
   },
         created(){
-          const { isEdit, data } = this.$route.params;
+          const { isEdit, data , filter} = this.$route.params;
+          const typeL = filter.type.toString().split('101');
+          this.conceptType = typeL[0];
+          this.searchType = typeL[1];
           if(isEdit) {
             this.titleText = '修改';
             this.isEdit = isEdit;
@@ -143,6 +148,7 @@ export default {
           let typeList = JSON.parse(localStorage.getItem("knowledgeEnumsData"));
           // this.typeList = typeList.lexiconTypeEnum;
           this.typeList = typeList.concatLexiconTypeEnum; //7-8 RGB
+          this.getTagList();//获取标签池内容
         },
         watch: {
           searchTagVal(newVal, preVal) {
@@ -167,7 +173,8 @@ export default {
           const param = {
             "name": this.searchDiagVal,
             "relationId": 17,
-            "relationPosition": 1
+            "relationPosition": 1,
+            "typeId":this.conceptType
           }
           api.getConceptInfoAssay(param).then((res)=>{
            if(res.data.code === '0') {
@@ -192,7 +199,8 @@ export default {
               "name": this.searchTagVal,
               "relationId": 17,
               "relationPosition": 2,
-              "typeId": this.type, //选中类型的id
+              // "typeId": this.type, //选中类型的id
+              "typeId": this.searchType, //选中类型的id
               "relationConceptId":this.form.conceptId,
               "excludedConceptIds":notIds
             }

src/components/icss/AddMedicalMultRelation.vue

@@ -113,7 +113,7 @@ import api from '@api/icss.js';
       ];
 
       return{
-        minTitle:'医学术语多层关联维护-添加',
+        minTitle:'分诊人体图数据维护-添加',
         list: JSON.parse(JSON.stringify(data)),
         defaultProps: {
           children: 'nodeList',
@@ -135,7 +135,7 @@ import api from '@api/icss.js';
       if(isEdit) {
           // console.log('dataa', data)
           this.isEdit = isEdit
-          this.minTitle = '医学术语多层关联维护-修改'
+          this.minTitle = '分诊人体图数据维护-修改'
           const item = JSON.parse(JSON.stringify(data))
           item.level = 0
           item.nodeList = this.IteraNodeList(item.nodeList, [], 1)
@@ -222,8 +222,9 @@ import api from '@api/icss.js';
           "excludedConceptIds": this.excludedConceptIds,
           "relationId": 17,
           "relationPosition": 1,
+          "typeId": this.addLevel === 0 ? 52 : this.addLevel === 1 ? 3 : 1
         }
-        if(this.addLevel == '1') {
+        if(this.addLevel > 0) {
           param.relationPosition = 2
           param.relationConceptId = this.relationConceptId
         }
@@ -261,7 +262,7 @@ import api from '@api/icss.js';
         this.$refs['conceptSearch'].style.display = "none";
       },
       append(data, e) {
-          this.addLevel = 1;
+          this.addLevel = data.level+1;
           this.relationConceptId = data.conceptId
           this.operaList = data;
           this.openSearch(e);

src/components/icss/AddMedicinePrompt.vue

@@ -70,10 +70,6 @@
         title:'添加',
         termTypes:[],
         terms:[],              //术语列表
-        editData:{
-          selectedTerm:'',
-          prags:[]
-        },
         form:{
           conceptId:'',             //术语id
           isTip:0,                 //是否要覆盖,0不覆盖，1覆盖
@@ -111,7 +107,7 @@
         this.isEdit = isEdit;
         this.isCopy = isCopy;
         this.title = isEdit?'编辑':(isCopy?'复制':'添加');
-        this.changeWord(data);
+        isEdit&&this.changeWord(data);
         //this.form.selectedTerm = data;
         //this.form.selectedTermName = data.libName;
         //this.form.conceptId = data.conceptId;

src/components/icss/AddVersion.vue

@@ -4,7 +4,20 @@
     <div class="contents">
       <div class="content">
         <!-- <el-form ref="form" :label-position="labelPosition" label-width="95px" class="add-admin-form" :model="form" :rules="rules"> -->
-        <el-form ref="form" :label-position="labelPosition" label-width="95px" class="add-version-form" :model="form" :rules="rules">
+        <el-form ref="form" :label-position="labelPosition" label-width="108px" class="add-version-form" :model="form" :rules="rules">
+          <el-form-item label="版本号归属：" prop="productType">
+            <el-select v-model="form.productType" 
+                      placeholder="请选择" 
+                      size="small"
+                      :disabled="id && !copy?true:false">
+              <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="name" class="version-num">
               <el-input v-model="form.name" placeholder="请输入版本号" maxlength="21"></el-input>
           </el-form-item>
@@ -71,14 +84,16 @@
         form:{
           name:'',
           refreshTime:'',
-          remark:''
+          remark:'',
+          productType:null
         },
         id:null,
         rules:{
           name:[{ required: true, validator: titleVaild, trigger: [ 'change'] },
                 { required: true, message: '请输入版本号',trigger: ['blur', 'change'] }],
           remark:{ required: false, validator: remarkVaild, trigger: [ 'change'] },
-          refreshTime:{ required: true, message: '请选择时间', trigger: ['blur', 'change'] }
+          refreshTime:{ required: true, message: '请选择时间', trigger: ['blur', 'change'] },
+          productType:{ required: true, message: '请选择版本号归属', trigger: ['blur', 'change'] },
         },
         pickerOptions1:{
           disabledDate(time) {
@@ -86,7 +101,8 @@
           },
         },
         copy:null,
-        saveDisable: false  //保存按钮禁止点击
+        saveDisable: false,  //保存按钮禁止点击
+        typeList:[]
       }
     },
     created(){
@@ -97,10 +113,13 @@
         this.form.name = info.name;
         this.form.refreshTime = info.refreshTime;
         this.form.remark = info.remark;
+        this.form.productType = info.productType && !this.copy?info.productType:null;
         this.title = this.copy?"版本信息维护-复制版本信息":"版本信息维护-修改版本信息";
         // this.getList();
         this.list = info.detail;
       }
+      let typeList = JSON.parse(localStorage.getItem("knowledgeEnumsData"));
+      this.typeList = typeList.productTypeEnum;
     },
     methods:{
       /*getList(){
@@ -173,7 +192,8 @@
                     message:"添加成功",
                     type:'success'
                   })
-                  this.$router.push({path: 'LT-YXSJWH-BBXXWH'});
+                  // this.$router.push({path: 'LT-GBBXXWH-BBXXWH'});
+                  this.$router.push({name: 'VersionInfo'});
                 }else{
                   this.$message({
                     message:res.data.msg,

src/components/icss/BloodPressTagGroup.vue

@@ -68,7 +68,7 @@
           </div>
           <p
             v-if="item.tagName"
-            class="tagName  ellipsis"
+            :class="['tagName','ellipsis',{'redWordTip':isRed(item.sexType)}]"
             :title="'[ '+item.tagName+' ]'"
           >{{item.tagName}} </p>
         </li>
@@ -99,6 +99,10 @@ export default {
       default: () => [],
       type: Array
     },
+    isEditOrCopy: {
+        default: false,
+        type: Boolean
+    },
   },
   data() {
     return {
@@ -148,14 +152,14 @@ export default {
     },
     sexType(newVal, preVal) {
       if (newVal != preVal) {
-        if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
+        this.searchTagList();
+        if (JSON.stringify(newVal) != JSON.stringify(preVal)&&!this.isEditOrCopy) {
           this.leftTagsList = [];
           this.selectLeftTagsList = [];
           this.rightTagsList = [];
           this.rightTagsList2 = [];
           this.selectRightTagsList = [];
           this.searchVal = '';
-          this.searchTagList();
         }
       }
     },
@@ -163,6 +167,17 @@ export default {
 
   },
   methods: {
+    isRed(sexType){
+      if(this.sexType == 3){
+        return false;
+      }else if(this.sexType != 3&&sexType == 3){
+        return false;
+      }else if(this.sexType != 3&&this.sexType == sexType){
+        return false;
+      }else{
+        return true;
+      }
+    },
     selectLeftTag(tag, index, e) {
 
       const hasTag = this.isHasTag(tag, this.selectLeftTagsList)
@@ -358,6 +373,9 @@ export default {
 
 <style lang="less" scoped>
 @import "../../less/common.less";
+.redWordTip {
+    color: red;
+}
 .symptomTagGroupWrapper {
   .arrowWrap {
     position: absolute;

src/components/icss/ConceptRelation.vue

@@ -11,6 +11,14 @@
                 </el-form-item>
             </el-form>
         </crumbs>
+        <div class="tab">
+          <span v-for="it in typeList" 
+                :key="it.key" 
+                :class="{'curr':it.key==filter.type}"
+                @click="toggTab(it)">
+            {{it.name}}
+          </span>
+        </div>
         <div class="contents">
             <el-table
                 :data="list"
@@ -89,14 +97,19 @@ export default {
           list: [],
           searched: false,
           filter:{
-            conceptName:''
+            conceptName:'',
+            type:'' 
           },
           currentPage: 1,
           pageSize: 10,
           total: 0,
+          typeList:[]
         }
     },
     created() {
+      let typeList = JSON.parse(localStorage.getItem("knowledgeEnumsData"));
+      this.typeList = typeList.relationModelTypeEnum;
+      this.filter.type = this.typeList[0].key;//默认展示科室，请置于第一位
       const that = this;
       //返回时避免参数未赋值就获取列表
       setTimeout(function(){
@@ -118,6 +131,11 @@ export default {
     })
   },
     methods: {
+        toggTab(item){
+          this.filter.type = item.key;
+          this.currentPage = 1;
+          this.getDataList();
+        },
         getDataList(isTurnPage) {
             const param = this.getFilterItems(isTurnPage);
             this.searched = true;
@@ -136,7 +154,7 @@ export default {
           const pam = this.searched ? {
             currentPage: this.currentPage,
             filter: this.filter
-          } : {currentPage: this.currentPage};
+          } : {currentPage: this.currentPage,filter:Object.assign(this.filter,{conceptName:''})};
           this.$router.push({name:'AddConceptRelation',params:pam})
         },
         modifyRelation(row) {
@@ -147,7 +165,7 @@ export default {
           const pam = this.searched ? {
             currentPage: this.currentPage,
             filter: this.filter
-          } : {currentPage: this.currentPage};
+          } : {currentPage: this.currentPage,filter:Object.assign(this.filter,{conceptName:''})};
             api.getConceptRelationDet(param).then((res) => {
               if(res.data.code=='0'){
                 const { data } = res.data;
@@ -174,7 +192,9 @@ export default {
             const param = {
                 current: this.currentPage,
                 size: this.pageSize,
-                name:this.filter.conceptName
+                name:this.filter.conceptName,
+                relationId:17,
+                relationModelTypeCode:this.filter.type
             };
             return param;
         },
@@ -235,6 +255,34 @@ export default {
 
 <style lang="less">
     @import "../../less/admin.less";
+    .tab{
+      background:#fff;
+      padding: 5px 0;
+      position: relative;
+      top:40px;
+      span{
+        display: inline-block;
+        // width:145px;
+        padding: 0 20px;
+        height: 45px;
+        line-height: 45px;
+        text-align: center;
+        // border: 1px solid #ccc;
+        margin-right: 5px;
+        cursor: pointer;
+      }
+      .curr{
+        color: #48C5D7;
+        &:after{
+          content: '';
+          width:50px;
+          height: 2px;
+          background:#48C5D7;
+          display: block;
+          margin: 0 auto;
+        }
+      }
+    }
     .delete{
        color: red;
     }

src/components/icss/InspactTagGroup.vue

@@ -38,7 +38,7 @@
                 :style="getStyle2(item)?styles:null"
                 @click='selectRightTag(item)'
             >   
-                <p v-if="item.tagName" class="tagName">{{item.tagName}} </p>
+                <p v-if="item.tagName" :class="['tagName',{'redWordTip':isRed(item.sexType)}]">{{item.tagName}} </p>
             </li>
         </ul>
     </div>
@@ -67,6 +67,10 @@ export default {
             default: '',
             type: String
         },
+        isEditOrCopy: {
+            default: false,
+            type: Boolean
+        },
         options: {
             default: () => [],
             type: Array
@@ -107,14 +111,14 @@ export default {
         },
         sexType(newVal, preVal) {
             if (newVal != preVal) {
-                if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
+                this.searchTagList();
+                if (JSON.stringify(newVal) != JSON.stringify(preVal)&&!this.isEditOrCopy) {
                     this.leftTagsList = [];
                     this.selectLeftTagsList = [];
                     this.rightTagsList = [];
                     this.rightTagsList2 = [];
                     this.selectRightTagsList = [];
                     this.searchVal = '';
-                     this.searchTagList();
                 }
             }
         },
@@ -122,6 +126,17 @@ export default {
         
     },
     methods: {
+        isRed(sexType){
+            if(this.sexType == 3){
+                return false;
+            }else if(this.sexType != 3&&sexType == 3){
+                return false;
+            }else if(this.sexType != 3&&this.sexType == sexType){
+                return false;
+            }else{
+                return true;
+            }
+        },
         toggleTopDownList(type){
           if(this.selectRightTagsList.length == 0 || this.rightTagsList.length == 0){
             return
@@ -263,6 +278,9 @@ export default {
 
 <style lang="less" >
 @import '../../less/common.less';
+.redWordTip {
+    color: red;
+}
 .symptomTagGroupWrapper {
   .operationPools {
     width: 100% !important;

src/components/icss/MedicalMultRelation.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <crumbs title="医学术语多层关联维护" minWidth="995px">
+        <crumbs title="分诊人体图数据维护" minWidth="995px">
             <el-form :inline="true" class="demo-form-inline">
                 <el-form-item label="标准术语名词：">
                     <el-input size="mini" v-model="filter.term" placeholder="输入术语"></el-input>
@@ -190,8 +190,10 @@
           name: this.filter.term,
           current: this.currentPage,
           size: this.pageSize,
-          type:this.filter.type,
-          isDeleted:this.isState
+          type: this.filter.type,
+          isDeleted: this.isState,
+          relationId: 17,
+          startTypeIds: [52]
         };
         return param;
       },

src/components/icss/MedicinePrompt.vue

@@ -2,9 +2,19 @@
     <div>
         <crumbs title="医学术语静态知识维护">
             <el-form :inline="true" class="demo-form-inline">
+                <el-form-item label="标准术语归属：">
+                    <el-select size="mini" v-model="filter.libType" placeholder="标准术语归属" clearable>
+                        <el-option v-for="item in typeList" :label="item.name" :value="item.key" :key="item.key"></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="标准术语：">
                     <el-input size="mini" v-model="filter.term" placeholder="标准术语" clearable></el-input>
                 </el-form-item>
+                <el-form-item label="状态：">
+                    <el-select size="mini" v-model="filter.status" placeholder="状态" clearable>
+                        <el-option v-for="item in stateList" :label="item.name" :value="item.id" :key="item.id"></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item>
                     <el-button size="mini" @click="filterDatas">确认</el-button>
                     <el-button size="mini" type="warning" style="margin:0 10px" @click="addMedicalPrompt">添加静态知识</el-button>
@@ -28,9 +38,14 @@
                         :show-overflow-tooltip="true">
                 </el-table-column>
                 <el-table-column
-                        prop="nameType"
+                        prop="libName"
                         label="标准术语">
                 </el-table-column>
+                <el-table-column
+                        prop="type"
+                        label="标准术语归属"
+                        width="120">
+                </el-table-column>
                 <el-table-column
                         prop="title"
                         label="关联标题"
@@ -89,10 +104,17 @@
         total: 0,
         linkIn:[],
         pays:[],
+        typeList:[],
+        stateList:[
+          {id:'N',name:'启用中'},
+          {id:'Y',name:'已删除'},
+        ],
         searched: false,
         filter: {
           term: '',
-          title:''
+          title:'',
+          status:'',
+          libType:'',
         }
       }
     },
@@ -102,6 +124,8 @@
       setTimeout(function(){
         that.getDataList();
       });
+      const enums = JSON.parse(localStorage.getItem('knowledgeEnumsData'));
+      this.typeList = enums.conceptDetailLexiconTypeEnum;
     },
     watch: {
       'filter': {
@@ -163,7 +187,9 @@
       clearFilter(){
         this.filter={
           term: '',
-          title:''
+          title:'',
+          status:'',
+          libType:'',
         };
       },
       getFilterItems(isTurnPage) {
@@ -175,7 +201,9 @@
           conceptName:this.filter.term,
           title:this.filter.title,
           current: this.currentPage,
-          size: this.pageSize
+          size: this.pageSize,
+          status:this.filter.status,
+          libType:this.filter.libType,
         };
         return param;
       },

src/components/icss/NoiseTemplate.vue

@@ -21,6 +21,7 @@
         :pool="dataPub.tagPool"
         :type="dataPub.region1"
         :sign="dataPub.region2"
+        :isEditOrCopy="isEditOrCopy"
         :order="dataPub.order"
         :sexType="dataPub.region7"
         :tipLis="dataPub.tipLis"
@@ -32,6 +33,7 @@
       <SymptomTagGroup 
         v-if="dataPub.region2 == 4" 
         :pool="dataPub.tagPool" 
+        :isEditOrCopy="isEditOrCopy"
         :type="dataPub.region1"
         :isSymp="dataPub.region12"
         :sexType="dataPub.region7"
@@ -42,6 +44,7 @@
       <InspactTagGroup 
         v-if="dataPub.region2 == 7" 
         :pool="dataPub.tagPool" 
+        :isEditOrCopy="isEditOrCopy"
         :type="dataPub.region1"
         :sexType="dataPub.region7"
         :options="editData.questionMapping"
@@ -51,6 +54,7 @@
       <BloodPressTagGroup 
         v-if="dataPub.region2 == 3" 
         :pool="dataPub.tagPool" 
+        :isEditOrCopy="isEditOrCopy"
         :type="dataPub.region1"
         :sexType="dataPub.region7"
         :options="editData.questionMapping"
@@ -60,6 +64,7 @@
       <SymptomPush
         v-if="dataPub.region2 == 11" 
         :pool="dataPub.tagPool" 
+        :isEditOrCopy="isEditOrCopy"
         :type="dataPub.region1"
         :sexType="dataPub.region7"
         :options="editData.questionMapping"
@@ -181,6 +186,11 @@ export default {
       this.sendIds = arr
     },
     submitForm() {       // 调用子组件的方法验证公用部分
+      if(document.querySelectorAll('.redWordTip')[0]){
+        // this.warning('当前数据有误是不可保存！')
+        this.showConfirmDialog('当前数据有误是不可保存！');
+        return
+      }
       this.$refs.submitForm.submitForm('groups');
     },
     validatePass() {      //验证成功回调，调取接口

src/components/icss/PubIndeptTag.vue

@@ -223,10 +223,10 @@
                 label="性别："
                 prop="region7"
             >
-                <span class="changeTips">改变性别后，标签明细将会恢复到默认状态</span>
+                <!-- <span class="changeTips">改变性别后，标签明细将会恢复到默认状态</span> -->
                 <el-select
                         v-model="form.region7"
-                        :disabled="isEditOrCopy || !form.region1 || form.region2 == '99'"
+                        :disabled="!form.region1 || form.region2 == '99'"
                         @change="(e)=>readyChangeSelect(e,3)"
                 >
                     <el-option

src/components/icss/PubTagGroup.vue

@@ -144,10 +144,10 @@
         label="性别："
         prop="region7"
       >
-        <span class="changeTips">改变性别后，标签明细将会恢复到默认状态</span>
+        <span class="changeTips" v-if="!isEditOrCopy">改变性别后，标签明细将会恢复到默认状态</span>
+          <!-- :disabled="isEditOrCopy || !form.region1 || form.region2 == 11 || form.region1 == 6||form.region1 == 7||form.region1 == 8||form.region1 == 9||form.region1 == 10" -->
         <el-select
           v-model="form.region7"
-          :disabled="isEditOrCopy || !form.region1 || form.region2 == 11 || form.region1 == 6||form.region1 == 7||form.region1 == 8||form.region1 == 9||form.region1 == 10"
           @change="(e)=>readyChangeSelect(e,3)"
         >
           <el-option

src/components/icss/PubTagPartDetail.vue

@@ -46,7 +46,7 @@
           @click="selectPart(0)"
           v-else
         >
-          <span class="hzx ellipsis" v-for="item in poolDetailList[0][0].questionDetailList" :title="'[ '+item.name+' ]'" v-show="choose == 'multiple'" :key="item.id">{{item.name}}</span>
+          <span :class="['hzx','ellipsis',{'redWordTip':isRed(poolDetailList[0][0].sexType)}]" v-for="item in poolDetailList[0][0].questionDetailList" :title="'[ '+item.name+' ]'" v-show="choose == 'multiple'" :key="item.id">{{item.name}}</span>
         </div>
         <div class="onlyBottom pubList">
           <ul class="clearfix">
@@ -59,20 +59,20 @@
             >
               <ul v-if="choose == 'single'">
                 <template v-for="item in poolDetailList[n]">
-                  <li class="partDetail ellipsis" v-for="part in item.questionDetailList" :title="'[ '+item.name+' ]'" :key="part.id">
+                  <li :class="['partDetail','ellipsis',{'redWordTip':isRed(item.sexType)}]" v-for="part in item.questionDetailList" :title="'[ '+item.name+' ]'" :key="part.id">
                     {{part.name}}
                   </li>
                 </template>
               </ul>
               <ul v-else>
                 <template v-if="n == 1">
-                  <li class="partDetail ellipsis" v-for="item in poolDetailList[n][0].questionDetailList" :style="getStyleR(item.id)?styleR:null" :title="'[ '+item.name+' ]'" :key="item.id">
-                    [ {{item.name}} ]
+                  <li :class="['partDetail','ellipsis',{'redWordTip':isRed(poolDetailList[n][0].sexType)}]" v-for="item in poolDetailList[n][0].questionDetailList" :style="getStyleR(item.id)?styleR:null" :title="'[ '+item.name+' ]'" :key="item.id">
+                    [ {{item.name}}{{poolDetailList[n][0].sexType}} ]
                   </li>
                 </template>
                 <template  v-if="n == 2 || n == 3 || n == 4 || n == 5">
-                  <li class="partDetail ellipsis" v-for="item in poolDetailList[n]" :style="getStyleR(item.id)?styleR:null" :title="'[ '+item.tagName+' ]'" :key="item.tagName" @click="selectTagOne($event,item.id,n)">
-                    [ {{item.tagName}} ]
+                  <li :class="['partDetail','ellipsis',{'redWordTip':isRed(item.sexType)}]" v-for="item in poolDetailList[n]" :style="getStyleR(item.id)?styleR:null" :title="'[ '+item.tagName+' ]'" :key="item.tagName" @click="selectTagOne($event,item.id,n)">
+                    [ {{item.tagName}}{{item.sexType}} ]
                   </li>
                 </template>
               </ul>
@@ -129,6 +129,10 @@ export default {
       default: 'single',      //multiple 多选 single 单选
       type: String
     },
+    isEditOrCopy: {
+        default: false,
+        type: Boolean
+    },
     options: {
         default: () => [],
         type: Array
@@ -236,7 +240,8 @@ export default {
     },
     sexType(newVal, preVal) {
       if (newVal != preVal) {
-        if (JSON.stringify(newVal) != JSON.stringify(preVal) && this.tmpNum != 1) {
+        this.searchTagList()
+        if (JSON.stringify(newVal) != JSON.stringify(preVal) && this.tmpNum != 1&&!this.isEditOrCopy) {
           this.clearData()
         }
       }
@@ -260,6 +265,17 @@ export default {
     }
   },
   methods: {
+    isRed(sexType){
+      if(this.sexType == 3){
+        return false;
+      }else if(this.sexType != 3&&sexType == 3){
+        return false;
+      }else if(this.sexType != 3&&this.sexType == sexType){
+        return false;
+      }else{
+        return true;
+      }
+    },
     clearData(){
         this.poolDetailList = [[{questionDetailList:[]}],[{questionDetailList:[]}],[],[],[],[]]
         this.poolDetailListTips = [[],[],[],[],[],[]]
@@ -518,7 +534,7 @@ export default {
             this.selectArr.map((flg,idx)=>{         //判断右侧有没有选中
               if(flg){    //有选中
                 if(idx == 0 || idx == 1){
-                  if(tmpArr.length > 1){
+                  if(tmpArr.length > 1){ //选中超过两个标签不能添加到0,1位置
                     this.$message({
                       showClose: true,
                       message: '添加的数据有误',
@@ -619,6 +635,9 @@ export default {
 </script>
 <style lang="less">
 @import "../../less/common.less";
+.redWordTip {
+    color: red;
+}
 .bottomPart {
   box-sizing: border-box;
   padding-right: 100px;

src/components/icss/SingleSelect.vue

@@ -210,11 +210,11 @@
             }
         },
         sexType(newVal, preVal) {
-            if (newVal != preVal) {
-                if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
-                    this.rows = [{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''}];
-                }
-            }
+            // if (newVal != preVal) {
+            //     if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
+            //         this.rows = [{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''}];
+            //     }
+            // }
         },
       },
       methods:{

src/components/icss/SymptomPush.vue

@@ -80,6 +80,10 @@ export default {
             default: '',
             type: String
         },
+        isEditOrCopy: {
+            default: false,
+            type: Boolean
+        },
         sexType: {
             default: '',
             type: String

src/components/icss/SymptomTagGroup.vue

@@ -46,7 +46,7 @@
                     >
                     </el-input>
                 </div>
-                <p v-if="item.tagName" class="tagName  ellipsis" :title="'[ '+item.tagName+' ]'">{{item.tagName}} </p>
+                <p v-if="item.tagName" :class="['tagName','ellipsis',{'redWordTip':isRed(item.sexType)}]" :title="'[ '+item.tagName+' ]'">{{item.tagName}} </p>
                 <div class="attributeBox" v-if="item.symptomType === 1 || item.symptomType === 2">
                     <p v-if="item.symptomType === 1" class="tagAttribute" @click.stop>跟主症状 <span @click="closeTagAttribute(item)" class="closeTagAttribute"><i class="el-icon-error"></i></span></p>
                     <p v-if="item.symptomType === 2" class="tagAttribute" @click.stop>跟伴随症状<span  @click="closeTagAttribute(item)" class="closeTagAttribute"><i class="el-icon-error"></i></span></p>
@@ -92,6 +92,10 @@ export default {
             default: '',
             type: String
         },
+        isEditOrCopy: {
+            default: false,
+            type: Boolean
+        },
         options: {
             default: () => [],
             type: Array
@@ -151,7 +155,8 @@ export default {
         },
         sexType(newVal, preVal) {
             if (newVal != preVal) {
-                if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
+                this.searchTagList()
+                if (JSON.stringify(newVal) != JSON.stringify(preVal)&&!this.isEditOrCopy) {
                     this.leftTagsList = [];
                     this.selectLeftTagsList = [];
                     this.rightTagsList = [];
@@ -166,6 +171,17 @@ export default {
         
     },
     methods: {
+        isRed(sexType){
+        if(this.sexType == 3){
+            return false;
+        }else if(this.sexType != 3&&sexType == 3){
+            return false;
+        }else if(this.sexType != 3&&this.sexType == sexType){
+            return false;
+        }else{
+            return true;
+        }
+        },
         selectLeftTag(tag, index, e) {
             const hasTag = this.isHasTag(tag, this.selectLeftTagsList)
             if (hasTag) {
@@ -377,6 +393,9 @@ export default {
 
 <style lang="less" >
 @import '../../less/common.less';
+.redWordTip {
+    color: red;
+}
 .commomSymptom {
   .tagList.operationPools {
     width: 100%;

src/components/icss/TemplateMaintenance.vue

@@ -177,7 +177,7 @@
       next(vm => {
         //const pm = to.param;
         const flt = to.params.filter;
-        vm.currentPage = to.params.currentPage;
+        vm.currentPage = to.params.currentPage||1;
         vm.deptAndDisInfo = JSON.parse(localStorage.getItem('deptDis')||null);
         if(flt){
           vm.filter.templateType = flt.templateType;

src/components/icss/VersionDesc.vue

@@ -221,7 +221,7 @@
                 description: this.form.description,
                 title: this.form.title,
               }
-              if(!this.isCopy){
+              if(!this.isCopy && this.versionId){
                 const params = {
                   versionDetail: [
                     item

src/components/icss/VersionInfo.vue

@@ -2,16 +2,26 @@
     <div>
         <crumbs title="版本信息维护">
             <el-form :inline="true" class="demo-form-inline">
-                <el-form-item label="查询版本号：">
-                    <el-input size="mini" v-model="filter.name" placeholder="输入版本号"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button size="mini" @click="filterDatas">确认</el-button>
-                    <!-- <router-link to="/admin/LT-YXSJWH-TJBBXX" style="margin:0 10px">
-                        <el-button size="mini" type="warning">添加版本信息</el-button>
-                    </router-link> -->
-                    <el-button size="mini" type="warning" style="margin:0 10px" @click="addVersion">添加版本信息</el-button>
-                </el-form-item>
+              <el-form-item label="版本号归属：">
+                <el-select v-model="filter.type" placeholder="请选择" size="mini" clearable>
+                  <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="查询版本号：">
+                  <el-input size="mini" v-model="filter.name" placeholder="输入版本号"></el-input>
+              </el-form-item>
+              <el-form-item>
+                  <el-button size="mini" @click="filterDatas">确认</el-button>
+                  <!-- <router-link to="/admin/LT-YXSJWH-TJBBXX" style="margin:0 10px">
+                      <el-button size="mini" type="warning">添加版本信息</el-button>
+                  </router-link> -->
+                  <el-button size="mini" type="warning" style="margin:0 10px" @click="addVersion">添加版本信息</el-button>
+              </el-form-item>
             </el-form>
         </crumbs>
         <div class="contents">
@@ -38,6 +48,12 @@
                         prop="refreshTime"
                         label="版本时间">
                 </el-table-column>
+                <el-table-column
+                        label="版本号归属">
+                    <template slot-scope="scope">
+                      <span>{{getProdType(scope.row)}}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column
                         prop="modifierid"
                         label="操作人">
@@ -45,9 +61,10 @@
                 <el-table-column
                         label="操作">
                     <template slot-scope="scope">
-                        <el-button type="text" size="small" :class="{forbid:scope.row.id != canModiId}" @click="scope.row.id ==canModiId?toEditVersion(scope.row,false):''">修改</el-button>
+                        <!-- <el-button type="text" size="small" :class="{forbid:scope.row.id != canModiId}" @click="scope.row.id ==canModiId?toEditVersion(scope.row,false):''">修改</el-button> -->
+                        <el-button type="text" size="small" :class="{forbid:scope.row.status != 1}" @click="scope.row.status == 1?toEditVersion(scope.row,false):''">修改</el-button>
                         <span style="margin:0 3px;">|</span>
-                        <el-button type="text" size="small" :class="{forbid:scope.row.id != canModiId}" @click="scope.row.id ==canModiId?toEditVersion(scope.row,true):''">复制</el-button>
+                        <el-button type="text" size="small" :class="{forbid:scope.row.status != 1}" @click="scope.row.status ==1?toEditVersion(scope.row,true):''">复制</el-button>
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -84,14 +101,18 @@
         total: 0,
         searched: false,
         filter: {
-          name: ''
+          name: '',
+          type:null
         },
         canModiId:null, //标识列表中的第一个可修改和复制项，区分分页和搜索
-        flag:true
+        flag:true,
+        typeList:[]
       }
     },
     created() {
       this.getDataList();
+      let typeList = JSON.parse(localStorage.getItem("knowledgeEnumsData"));
+      this.typeList = typeList.productTypeEnum;
     },
     watch: {
       'filter': {
@@ -108,6 +129,16 @@
       })
     },
     methods: {
+      getProdType(item){
+        let name = "";
+        let type = item.productType;
+        for(let i in this.typeList){
+          if(this.typeList[i].key == type){
+            name = this.typeList[i].name;
+          }
+        }
+        return name;
+      },
       addVersion(){
         // 添加版本信息
         const pam = this.searched ? {
@@ -160,11 +191,13 @@
         //翻页时筛选条件没点确定则清空
         if(isTurnPage&&!this.searched){
           this.filter.name='';
+          this.filter.type = null;
         };
         const param = {
           name: this.filter.name,
           current: this.currentPage,
-          size: this.pageSize
+          size: this.pageSize,
+          productType:this.filter.type?this.filter.type:0
         };
         return param;
       },

src/components/preTreat/AddCombinQuestion.vue

@@ -11,6 +11,7 @@
                 @changeType="changeType"
                 @validatePass="validatePass"
                 qaType="2"
+                :isCopy ='$route.params.isCopy'
                 :isEdit="$route.params.isEdit"
                 :editData="editData"
                 ref="submitForm"

src/components/preTreat/AddSimpleQuestion.vue

@@ -10,6 +10,7 @@
                 @changeVal="changeVal"
                 @validatePass="validatePass"
                 qaType="1"
+                :isCopy ='$route.params.isCopy'
                 :editData="editData"
                 ref="submitForm"
         ></PubIndeptQa>

src/components/preTreat/CombinQuestion.vue

@@ -15,6 +15,9 @@
                 <el-form-item label="填写单系统名称：">
                     <el-input size="mini" v-model="filter.tagSysName" placeholder="填写单系统名称" clearable></el-input>
                 </el-form-item>
+                <el-form-item label="填写单界面名称：">
+                    <el-input size="mini" v-model="filter.name" 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="addIndeptTag">添加组合填写单</el-button>
@@ -44,6 +47,11 @@
                         prop="tagName"
                         label="填写单系统名称">
                 </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="name"
+                        label="填写单界面名称">
+                </el-table-column>
                 <el-table-column
                         :resizable = "false"
                         prop="typeCn"
@@ -103,6 +111,7 @@
           tagType: [], //标签类型
           tagAdscription: '', //标签归属
           tagSysName: '', //标签系统名称
+          name:'',          //界面名称
         },
         currentPage: 1,
         pageSize: 10,
@@ -194,21 +203,27 @@
       getFilterItems(isTurnPage) {
         //翻页时筛选条件没点确定则清空
         if(isTurnPage&&!this.searched){
-          this.filter = {
-            tagType: [], //标签类型
-            tagAdscription: '', //标签归属
-            tagSysName: '', //标签系统名称
-          }
+          this.clearfilter();
         };
         let param = {
           tagTypeList: this.filter.tagType[0] ? this.filter.tagType: [4,6],
           current: this.currentPage,
+          callType:2,
           size: this.pageSize,
           type: this.filter.tagAdscription,
           tagName: this.filter.tagSysName,
+          name:this.filter.name,          //界面名称
         };
         return param;
       },
+      clearfilter(){
+        this.filter={
+          tagType: [], //标签类型
+          tagAdscription: '', //标签归属
+          tagSysName: '', //标签系统名称
+          name:'',          //界面名称
+        };
+      },
       indexMethod(index) {
         return ((this.currentPage - 1) * this.pageSize) + index + 1;
       },
@@ -240,11 +255,7 @@
             if(res.data.code=='0'){
               if(!this.searched){
                 //未点确认时清空搜索条件
-                this.filter={
-                  tagType: [], //标签类型
-                  tagAdscription: '', //标签归属
-                  tagSysName: '', //标签系统名称
-                };
+                this.clearfilter();
               }
               if(this.list.length==1){
                 //当前在最后一页且只有一条数据时，删除后跳到前一页

src/components/preTreat/PubIndeptQa.vue

@@ -227,7 +227,7 @@
 // 补充内容(val:52)：单选（val:1）、多选（val:2）、多列填写（val:3）、输入框（val:6）、数字输入框（val:7）、文本域（val:5）
 
   export default {
-    props:['editData','qaType','isEdit'],      //qaType:独立1/组合2填写单
+    props:['editData','qaType','isEdit','isCopy'],      //qaType:独立1/组合2填写单
     data() {
       var validatePass1 = (rule, value, callback) => {
         this.validateSystomName(value,callback,1)
@@ -372,6 +372,11 @@
       if(editData.id){
         const trans = utils.transPretreatKeys(editData,this.qaType==1);
         this.form = Object.assign({},this.form,trans);
+        if(this.isCopy){            //复制时系统名称界面名称置空
+          this.form.region3='';
+          this.form.region4='';
+          this.form.region5='';
+        }
         const imgUrl = trans.region13;
         if(imgUrl){
           this.imgList = [{name:'',url:imgUrl.replace('{imageUrlPrefix}',config.imgHost)}];

src/components/preTreat/SimpleQuestion.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <crumbs title="独立填写单维护">
+        <crumbs title="独立填写单维护" class="simpleQ-crumb">
             <el-form :inline="true" class="demo-form-inline">
                 <el-form-item label="归属：">
                     <el-select size="mini" v-model="filter.tagAdscription"  placeholder="归属" clearable>
@@ -12,6 +12,12 @@
                         <el-option v-for="item in tagTypes" :label="item.name" :value="item.val" :key="item.id"></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item label="归属组合项：">
+                    <el-input size="mini" v-model="filter.combinationName" placeholder="归属组合项" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="填写单界面名称：">
+                    <el-input size="mini" v-model="filter.name" placeholder="填写单界面名称" clearable></el-input>
+                </el-form-item>
                 <el-form-item label="填写单系统名称：">
                     <el-input size="mini" v-model="filter.tagSysName" placeholder="填写单系统名称" clearable></el-input>
                 </el-form-item>
@@ -21,7 +27,7 @@
                 </el-form-item>
             </el-form>
         </crumbs>
-        <div class="contents">
+        <div class="contents simpleQ-contents">
             <el-table
                     :data="list"
                     border
@@ -44,6 +50,11 @@
                         prop="tagName"
                         label="填写单系统名称">
                 </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="name"
+                        label="填写单界面名称">
+                </el-table-column>
                 <el-table-column
                         :resizable = "false"
                         prop="typeCn"
@@ -55,6 +66,11 @@
                         prop="tagTypeCn"
                         label="类型">
                 </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="combinationName"
+                        label="归属组合项">
+                </el-table-column>
                 <el-table-column
                         :resizable = "false"
                         prop="modifier"
@@ -104,6 +120,8 @@
           controlType: [],
           tagAdscription: '', //标签归属
           tagSysName: '', //标签系统名称
+          combinationName:'',//归属组合项
+          name:'',      //填写单界面名称
         },
         currentPage: 1,
         pageSize: 10,
@@ -214,22 +232,30 @@
         //     this.getDataList();
         // }
       },
+      clearFilter(){
+        this.filter = {
+          tagType: [], //标签类型
+          controlType: [],
+          tagAdscription: '', //标签归属
+          tagSysName: '', //标签系统名称
+          combinationName:'',//归属组合项
+          name:'',      //填写单界面名称
+        }
+      },
       getFilterItems(isTurnPage) {
         //翻页时筛选条件没点确定则清空
         if(isTurnPage&&!this.searched){
-          this.filter = {
-            tagType: [], //标签类型
-            controlType: [],
-            tagAdscription: '', //标签归属
-            tagSysName: '', //标签系统名称
-          }
+          this.clearFilter();
         };
         const param = {
           tagTypeList: [1],
+          callType:1,
           current: this.currentPage,
           size: this.pageSize,
           type: this.filter.tagAdscription,
           tagName: this.filter.tagSysName,
+          combinationName:this.filter.combinationName,
+          name:this.filter.name,
           controlTypeList: this.filter.controlType[0] ? this.filter.controlType: []
         };
         return param;
@@ -265,12 +291,7 @@
             if(res.data.code=='0'){
               if(!this.searched){
                 //未点确认时清空搜索条件
-                this.filter={
-                    tagType: [], //标签类型
-                    controlType: [],
-                    tagAdscription: '', //标签归属
-                    tagSysName: '', //标签系统名称
-                };
+                this.clearFilter();
               }
               if(this.list.length==1){
                 //当前在最后一页且只有一条数据时，删除后跳到前一页
@@ -305,4 +326,17 @@
     .el-select .el-input .el-icon-circle-close{
         float:left;
     }
+    .container.simpleQ-crumb{
+        height:90px!important;
+    }
+    .simpleQ-crumb .contents{
+        max-width: 870px;
+        text-align: right;
+    }
+    .contents.simpleQ-contents{
+        padding-top:120px;
+    }
+    .simpleQ-crumb .el-form--inline .el-form-item{
+        margin-bottom: 0;
+    }
 </style>

src/less/common.less

@@ -50,7 +50,7 @@
     color: #fff;
     height: @header-height;
     padding-top: 8px;
-    margin-bottom: 20px;
+    /*margin-bottom: 20px;*/
     box-sizing: border-box;
   }
 }
@@ -94,6 +94,19 @@
 } 
 
 /*element-ui 样式覆盖*/
+.el-dialog__header{
+  border-bottom: 1px #f0f0f0 solid;
+  padding: 10px 20px;
+  .el-dialog__headerbtn{
+    top: 14px;
+  }
+}
+.el-dialog__body{
+  padding: 20px 20px 30px;
+}
+.el-dialog__title{
+  font-size: 14px;
+}
 .demo-form-inline .el-input--mini .el-input__inner{
   width: 100px;
 }
@@ -108,7 +121,7 @@
 
 .el-form--inline .el-form-item__label {
   font-size: 12px;
-  vertical-align: text-bottom;
+  vertical-align: text-bottom;      /*chrome错位bug*/
   padding: 0;
 }
 

src/routes.js

@@ -221,7 +221,7 @@ export default [
       {path:'LT-YXSJWH-TSXXXQ',component:PromptDetail,name:'PromptDetail'},         //提示信息维护详情
       {path:'LT-YXSYKWH-YXSYJTZSWH',component:MedicinePrompt,name:'MedicinePrompt'},         //医学术语提示信息维护
       {path:'LT-YXSYKWH-TJYXSYJTZS',component:AddMedicinePrompt,name:'AddMedicinePrompt'},         //医学术语提示信息维护添加
-	    {path:'LT-YXSJWH-BBXXWH',component:VersionInfo,name:'VersionInfo'},     //版本信息
+	    {path:'LT-GBBXXWH-BBXXWH',component:VersionInfo,name:'VersionInfo'},     //版本信息
       {path:'LT-YXSJWH-BBXXXQ',component:VersionDetail,name:'VersionDetail'},     //版本信息-详情
       {path:'LT-YXSJWH-TJBBXX',component:AddVersion,name:'AddVersion'},     //版本信息-添加/修改
       {path:'LT-YXSYKWH-YXSYMMWH',component:MedicalName,name:'MedicalName'},     //医学术语--命名维护