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

# Conflicts:
#	src/components/knowledgeExtra/AddNewRule.vue

src/components/knowledgeExtra/AddDiagBase.vue

@@ -14,7 +14,7 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="诊断依据描述：" prop="description" class="description">
+                    <el-form-item label="诊断依据描述：" class="description">
                         <el-input type="textarea" :rows="3" placeholder="请输入诊断依据描述" v-model.trim="form.description"></el-input>
                     </el-form-item>
                     <el-form-item label="诊断依据内容：" prop="remind" class="discDesc is-required">
@@ -106,13 +106,8 @@
             }
             this.setRules()
         },
-        watch:{
-        },
         components:{
             DiagBaseType
-        },
-        computed:{
-
         },
         methods:{
             formatData(data){       //转换字段名
@@ -210,11 +205,9 @@
                                             }
                                         }, trigger: 'blur'
                                     }];
-                                    that.rules[keyTxt + '.eqValue'] = [{
-                                        validator: (rule, value, callback) => {
-                                            if (value === '') {
-                                                callback(new Error('不能为空~'));
-                                            } else if (value.length > 200) {
+                                    that.rules[keyTxt + '.eqValue'] = [{required: true, message: '不能为空~',trigger: 'blur'},{
+                                        validator: (rule, value, callback) => {console.log(112,value)
+                                            if (value&&value.length > 200) {
                                                 callback(new Error('不能超过200字'));
                                             } else {
                                                 callback();
@@ -292,7 +285,7 @@
                             message:"操作成功",
                             type:'success'
                         });
-                        this.$router.push({name: 'ZskDiagBase'});
+                        this.$router.push({name: 'ZskDiagBase',params:this.$route.params});
                     }else{
                         this.$message({
                             message:res.data.msg,

src/components/knowledgeExtra/AddNewRule.vue

@@ -73,7 +73,7 @@
                                        @addGroup="addGroup"
                                        @delGroup="delGroup"></SubRulesGroup>
                     </el-form-item>
-                    <el-button class="disclButn" size="small" type="primary" @click="confirm">确定</el-button>
+                    <el-button class="disclButn" size="small" type="primary" @click="confirm">保存</el-button>
                 </el-form>
             </div>
         </div>

src/components/knowledgeExtra/DiagBaseItem.vue

@@ -114,13 +114,13 @@
                     </el-col>
                 </div>
             </el-form-item>
-            <el-form-item v-if="(!onlyNum&&!showRegx&&groupData.basType===2&&groupData.dataType==='2')||onlyTxt" label="医学内容：" :prop="ruleLine+ind+'.eqValue'" class="discDesc is-required">
+            <el-form-item v-if="showRegx" key="v11" label="正则表达式：" :prop="ruleLine+ind+'.eqValue'" class="discDesc">
+                <el-input type="textarea" rows="3" placeholder="请输入正则表达式" v-model.trim="groupData.eqValue"></el-input>
+            </el-form-item>
+            <el-form-item key="v13" v-if="(!onlyNum&&!showRegx&&groupData.basType===2&&groupData.dataType==='2')||onlyTxt" label="医学内容：" :prop="ruleLine+ind+'.eqValue'" class="discDesc">
                 <el-input placeholder="请输入医学内容" v-model.trim="groupData.eqValue"></el-input>
                 <span class="tip-text">注：可输入升高、降低、阴性、阳性等~</span>
             </el-form-item>
-            <el-form-item v-if="showRegx" label="正则表达式：" :prop="ruleLine+ind+'.eqValue'" class="discDesc is-required">
-                <el-input type="textarea" rows="3" placeholder="请输入正则表达式" v-model.trim="groupData.eqValue"></el-input>
-            </el-form-item>
         </div>
         <!--</el-form>-->
     </div>
@@ -148,14 +148,6 @@
                 conceptList:[],
             }
         },
-        watch: {
-            'groupData': {
-                handler: function (val) {
-                    this.$emit("changeVal", val, this.ind);
-                },
-                deep: true
-            },
-        },
         created(){
             this.dicts=JSON.parse(localStorage.getItem("zskDiagDicts")||'{}');
             if(this.groupData){
@@ -233,6 +225,7 @@
             },
             clearConcept(){
                 this.groupData.basConceptId='';
+                this.groupData.basLibName='';
                 this.conceptList=[];
             },
             clearNumText(){