瀏覽代碼

标签标红和保存提示

luolei 5 年之前
父節點
當前提交
50e9343156

+ 9 - 4
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
         }
       }
     },

+ 4 - 5
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,9 +222,8 @@ 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 > 0) {
+        if(this.addLevel == '1') {
           param.relationPosition = 2
           param.relationConceptId = this.relationConceptId
         }
@@ -262,7 +261,7 @@ import api from '@api/icss.js';
         this.$refs['conceptSearch'].style.display = "none";
       },
       append(data, e) {
-          this.addLevel = data.level+1;
+          this.addLevel = 1;
           this.relationConceptId = data.conceptId
           this.operaList = data;
           this.openSearch(e);

+ 5 - 1
src/components/icss/AddMedicinePrompt.vue

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

+ 5 - 25
src/components/icss/AddVersion.vue

@@ -4,20 +4,7 @@
     <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="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 ref="form" :label-position="labelPosition" label-width="95px" class="add-version-form" :model="form" :rules="rules">
           <el-form-item label="版本号:" prop="name" class="version-num">
               <el-input v-model="form.name" placeholder="请输入版本号" maxlength="21"></el-input>
           </el-form-item>
@@ -84,16 +71,14 @@
         form:{
           name:'',
           refreshTime:'',
-          remark:'',
-          productType:null
+          remark:''
         },
         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'] },
-          productType:{ required: true, message: '请选择版本号归属', trigger: ['blur', 'change'] },
+          refreshTime:{ required: true, message: '请选择时间', trigger: ['blur', 'change'] }
         },
         pickerOptions1:{
           disabledDate(time) {
@@ -101,8 +86,7 @@
           },
         },
         copy:null,
-        saveDisable: false,  //保存按钮禁止点击
-        typeList:[]
+        saveDisable: false  //保存按钮禁止点击
       }
     },
     created(){
@@ -113,13 +97,10 @@
         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(){
@@ -192,8 +173,7 @@
                     message:"添加成功",
                     type:'success'
                   })
-                  // this.$router.push({path: 'LT-GBBXXWH-BBXXWH'});
-                  this.$router.push({name: 'VersionInfo'});
+                  this.$router.push({path: 'LT-YXSJWH-BBXXWH'});
                 }else{
                   this.$message({
                     message:res.data.msg,

+ 21 - 3
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;

+ 2 - 5
src/components/icss/ConceptRelation.vue

@@ -89,8 +89,7 @@ export default {
           list: [],
           searched: false,
           filter:{
-            conceptName:'',
-            type:'471011' //默认展示科室
+            conceptName:''
           },
           currentPage: 1,
           pageSize: 10,
@@ -175,9 +174,7 @@ export default {
             const param = {
                 current: this.currentPage,
                 size: this.pageSize,
-                name:this.filter.conceptName,
-                relationId:17,
-                relationModelTypeCode:this.filter.type
+                name:this.filter.conceptName
             };
             return param;
         },

+ 2 - 1
src/components/icss/IndeptLabel.vue

@@ -267,7 +267,8 @@
       warning(msg,type){
         this.$message({
           showClose: true,
-          message:msg,
+          dangerouslyUseHTMLString: true,
+          message:'<p>'+msg+'</p>',
           type:type||'warning'
         })
       },

+ 21 - 3
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;

+ 8 - 7
src/components/icss/LabelGroup.vue

@@ -137,12 +137,12 @@ export default {
         
     },
   watch: {
-    'filter': {
-      handler: function () {
-        this.searched = false;
-      },
-      deep: true
-    }
+      'filter': {
+        handler: function () {
+          this.searched = false;
+        },
+        deep: true
+      }
   },
   beforeRouteEnter(to, from, next) {
     next(vm => {
@@ -267,7 +267,8 @@ export default {
         warning(msg,type){
           this.$message({
             showClose: true,
-            message:msg,
+            dangerouslyUseHTMLString: true,
+            message:'<p>'+msg+'</p>',
             type:type||'warning'
           })
         },

+ 3 - 5
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,10 +190,8 @@
           name: this.filter.term,
           current: this.currentPage,
           size: this.pageSize,
-          type: this.filter.type,
-          isDeleted: this.isState,
-          relationId: 17,
-          startTypeIds: [52]
+          type:this.filter.type,
+          isDeleted:this.isState
         };
         return param;
       },

+ 4 - 32
src/components/icss/MedicinePrompt.vue

@@ -2,19 +2,9 @@
     <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>
@@ -38,14 +28,9 @@
                         :show-overflow-tooltip="true">
                 </el-table-column>
                 <el-table-column
-                        prop="libName"
+                        prop="nameType"
                         label="标准术语">
                 </el-table-column>
-                <el-table-column
-                        prop="type"
-                        label="标准术语归属"
-                        width="120">
-                </el-table-column>
                 <el-table-column
                         prop="title"
                         label="关联标题"
@@ -104,17 +89,10 @@
         total: 0,
         linkIn:[],
         pays:[],
-        typeList:[],
-        stateList:[
-          {id:'N',name:'启用中'},
-          {id:'Y',name:'已删除'},
-        ],
         searched: false,
         filter: {
           term: '',
-          title:'',
-          status:'',
-          libType:'',
+          title:''
         }
       }
     },
@@ -124,8 +102,6 @@
       setTimeout(function(){
         that.getDataList();
       });
-      const enums = JSON.parse(localStorage.getItem('knowledgeEnumsData'));
-      this.typeList = enums.conceptDetailLexiconTypeEnum;
     },
     watch: {
       'filter': {
@@ -187,9 +163,7 @@
       clearFilter(){
         this.filter={
           term: '',
-          title:'',
-          status:'',
-          libType:'',
+          title:''
         };
       },
       getFilterItems(isTurnPage) {
@@ -201,9 +175,7 @@
           conceptName:this.filter.term,
           title:this.filter.title,
           current: this.currentPage,
-          size: this.pageSize,
-          status:this.filter.status,
-          libType:this.filter.libType,
+          size: this.pageSize
         };
         return param;
       },

+ 10 - 0
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() {      //验证成功回调,调取接口

+ 2 - 2
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="!form.region1 || form.region2 == '99'"
+                        :disabled="isEditOrCopy || !form.region1 || form.region2 == '99'"
                         @change="(e)=>readyChangeSelect(e,3)"
                 >
                     <el-option

+ 2 - 2
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

+ 27 - 8
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;

+ 5 - 5
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:{

+ 4 - 0
src/components/icss/SymptomPush.vue

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

+ 21 - 2
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%;

+ 1 - 1
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;

+ 1 - 1
src/components/icss/VersionDesc.vue

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

+ 13 - 45
src/components/icss/VersionInfo.vue

@@ -2,26 +2,16 @@
     <div>
         <crumbs title="版本信息维护">
             <el-form :inline="true" class="demo-form-inline">
-              <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-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">
@@ -48,12 +38,6 @@
                         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="操作人">
@@ -100,18 +84,14 @@
         total: 0,
         searched: false,
         filter: {
-          name: '',
-          type:null
+          name: ''
         },
         canModiId:null, //标识列表中的第一个可修改和复制项,区分分页和搜索
-        flag:true,
-        typeList:[]
+        flag:true
       }
     },
     created() {
       this.getDataList();
-      let typeList = JSON.parse(localStorage.getItem("knowledgeEnumsData"));
-      this.typeList = typeList.productTypeEnum;
     },
     watch: {
       'filter': {
@@ -128,16 +108,6 @@
       })
     },
     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 ? {
@@ -190,13 +160,11 @@
         //翻页时筛选条件没点确定则清空
         if(isTurnPage&&!this.searched){
           this.filter.name='';
-          this.filter.type = null;
         };
         const param = {
           name: this.filter.name,
           current: this.currentPage,
-          size: this.pageSize,
-          productType:this.filter.type?this.filter.type:0
+          size: this.pageSize
         };
         return param;
       },