Merge branch 'diagBase0706' into test

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

src/components/knowledgeExtra/AddDiagBase.vue

@@ -571,7 +571,8 @@ export default {
       spanArr: [],
       list: [], //提交数据数组,
       i: 1,
-      onshow: true
+      onshow: true,
+      arr :[]
     };
   },
   created() {
@@ -610,6 +611,7 @@ export default {
         for (let j = 0; j < groupVOi.length; j++) {
           klDiagnoseDetailj = groupVOi[j].klDiagnoseDetail;
           for (let k = 0; k < groupVOi[j].klDiagnoseDetail.length; k++) {
+            this.arr = []
             var index2 = this.baseTermTypeList.findIndex(
               item => item.type === klDiagnoseDetailj[k].basType
             );
@@ -621,9 +623,9 @@ export default {
               klDiagnoseDetailj[k].libNameList
             );
             klDiagnoseDetailj[k].libNameList.forEach(item => {
-              arr.push(item.basConceptId);
+              this.arr.push(item.basConceptId);
             });
-            this.$set(klDiagnoseDetailj[k],'basConceptId',arr )
+            this.$set(klDiagnoseDetailj[k],'basConceptId',this.arr )
             // klDiagnoseDetailj[k].basConceptId = arr;
             if (
               klDiagnoseDetailj[k].maxOperator ||