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

src/components/knowledgeExtra/DiagBaseGroup.vue

@@ -44,10 +44,6 @@
         props:['data','inx','isLast','diagTypeList','parInx'],
         data(){
             return {
-                fitNo:'',
-                //numArr:[{id:1,name:1},{id:2,name:2},{id:3,name:3},{id:4,name:4},{id:5,name:5},{id:6,name:6},{id:7,name:7},{id:8,name:8},{id:9,name:9},{id:10,name:10},],
-                /*rules:{
-                    fitNo:[{required: true, message: '请选择符合条件的数量',trigger: ['change']}]}*/
             }
         },
         computed:{
@@ -61,13 +57,12 @@
                 }
                 return arr;
             },
-            /*baseTypeList:function(){
-
-            },*/
         },
         methods:{
             handleInput(val,i){
-                this.data[i]=val;
+                if(val){
+                    this.data[i]=val;
+                }
             },
             setRules(){
                 this.$emit('setRules');
@@ -103,9 +98,9 @@
                 this.data.klDiagnoseDetail.splice(i,1,null);
                 this.$emit("setRules");
                 //符合条件数量列表同步变化
-                if(this.numArr.length){
-                    this.data.fitNo=this.numArr[this.numArr.length-1].id;
-                }
+                //if(this.numArr.length){
+                this.data.fitNo='';
+                //}
             },
             addGroup(){
                 this.$emit("addGroup",this.inx);