Переглянути джерело

Merge remote-tracking branch 'origin/diagBase6.0' into test

zhouna 4 роки тому
батько
коміт
a0095da00b

+ 1 - 1
src/components/knowledgeExtra/AddDiagBase.vue

@@ -77,7 +77,7 @@
                     conceptId:[{ required: true, message: '请输入疾病名称',trigger: ['change'] }],
                     description:[{
                         validator: (rule,value,callback)=>{
-                            if(value.length>100){
+                            if(value&&value.length>100){
                                 callback(new Error('诊断依据描述不能超过100字'));
                             }else{
                                 callback();

+ 4 - 5
src/components/knowledgeExtra/DiagBaseItem.vue

@@ -29,7 +29,7 @@
                             v-for="item in baseTermTypeList"
                             :key="item.id"
                             :label="item.name"
-                            :value="item.code">
+                            :value="Number(item.code)">
                     </el-option>
                 </el-select>
             </el-form-item>
@@ -166,11 +166,10 @@
             }else if(this.groupData.eqValue){
                 this.groupData.dataType='2';
             }
-        },
-        mounted(){
             this.conceptList=[{conceptName:this.groupData.basLibName,conceptId:this.groupData.basConceptId}];
-            if(this.groupData.basLibType){
-                this.baseTermTypeList=[{name:this.groupData.basLename,code:this.groupData.basLibType}];
+            if(this.groupData.basType){
+                const obj = this.baseTypes.find((it)=>it.type===this.groupData.basType);
+                this.baseTermTypeList = obj.subMenuList;
             }
         },
         computed:{