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

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/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/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/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="操作人">
@@ -84,14 +100,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 +128,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 +190,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;
       },