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

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/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/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>