xiezhiming 3 éve
szülő
commit
2f07e92f60

+ 5 - 1
src/components/knowledgeExtra/AddNewRule.vue

@@ -361,6 +361,7 @@ export default {
 	//护理开单项子组件里面的传过来的值 
 	ruleContent(data){
 		this.staicData=data
+		console.log(this.staicData)
 	},
     clearValidate(data) {
       this.$refs.ruleForm.clearValidate(data);
@@ -394,7 +395,6 @@ export default {
 		  this.formEidt=JSON.parse(JSON.stringify(this.form))
 		 return 
 	  }
-	  
 	  //加载护理非开单项的关联静态知识
 	  if(this.form.parRuleType==8){
 		  this.isStatic=true;
@@ -553,6 +553,10 @@ export default {
 			}) 
 	  }
 	  //判断是否存在klRuleByIdSub,没有就是护理开单项直接赋值
+	  if(Array.isArray(info.klRuleByIdGroup)&&info.klRuleByIdGroup.length==0){
+		  this.form = JSON.parse(JSON.stringify(info));
+		  return
+	  }
 	  if(!info.klRuleByIdGroup[0].klRuleByIdSub){
 		  this.form = JSON.parse(JSON.stringify(info));
 	  }else{

+ 23 - 20
src/components/knowledgeExtra/AddNewRuleContent.vue

@@ -29,7 +29,7 @@
 			<el-row>
 				<el-col :span='24'>
 					<el-form-item label="附加信息" prop="fjxx">
-					    <el-input type="textarea" :rows="2" v-model.trim="formData.fjxx" resize="none" :maxlength='251'></el-input>
+					    <el-input type="textarea" :rows="5" v-model.trim="formData.fjxx" resize="none" :maxlength='251'></el-input>
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -54,15 +54,9 @@
 			  default:false,
 			},
 		},
-		watch:{
-			isError:{
-				handler(val){
-					console.log(val)
-				}
-			}
-		},
 		data(){
 			return {
+				isErrors:false,
 				formData:{
 					gljtxx:[],//关联静态知识
 					fjxx:''  //附加信息			 
@@ -78,16 +72,20 @@
 			console.log('formEidtCopy',this.formEidtCopy)
 			//编辑回显
 			if(this.isContent){
-				//关联静态知识
-				this.formEidtCopy.klRuleByIdGroup[0].klRuleStaticSub.forEach((item)=>{
-					let obj={}
-					obj.id=item.conceptId;
-					obj.name=item.name;
-					this.opts_type.push(obj)
-					this.formData.gljtxx.push(obj.id)
-				})
 				//附加信息
 				this.formData.fjxx=this.formEidtCopy.parMsg
+				if(Array.isArray(this.formEidtCopy.klRuleByIdGroup)&&this.formEidtCopy.klRuleByIdGroup.length>0){
+				   //关联静态知识
+				   this.formEidtCopy.klRuleByIdGroup[0].klRuleStaticSub.forEach((item)=>{
+				   	let obj={}
+				   	obj.id=item.conceptId;
+				   	obj.name=item.name;
+				   	this.opts_type.push(obj)
+				   	this.formData.gljtxx.push(obj.id)
+				   })
+				}
+				
+				
 			}
 		},
 		mounted() {
@@ -143,10 +141,15 @@
 			 }
 		},
 		watch:{
+			isError:{
+				handler(val){
+					console.log(val)
+				}
+			},
 			formData:{
-				handler(newName, oldName) {
-					if(newName){
-						this.$emit('ruleContent',this.formData)
+				handler(newData, old) {
+					if(newData){
+						this.$emit('ruleContent',newData)
 					}
 				},      
 				immediate: true,
@@ -190,7 +193,7 @@
 			/deep/.el-select__tags-text {
 			    overflow: hidden;
 			    text-overflow: ellipsis;
-			    max-width: 90px;
+			    max-width: 82px;
 			}
 		}
 		

+ 1 - 0
src/components/knowledgeExtra/DiagCheckRule.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
     <div style="margin: 10px 0">
+	  <span >查询条件:</span>
       <span v-if="description" class="span1"
         ><i>规则名称:</i>{{ description }}</span
       >