Merge branch 'diagBase0706' into test

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

src/components/knowledgeExtra/AddDiagBase.vue

@@ -172,7 +172,7 @@
                           height="18"
                           width="18"
                           class="icon"
-                          @click="addRule(scope.row,scope.$index,index,i)"
+                          @click="addRule(scope.row,scope.$index,index)"
                         />
                         <img
                           src="../../images/icon-delete.png"
@@ -251,7 +251,7 @@
                     <div
                       v-if="v.title == '医学标准术语'"
                       class="box-2"
-                      :class="items.basType===3 || items.basType===4|| items.basType===5 || items.basType===6? 'tmall' : 'taobao'"
+                      :class="items.basType===3 || items.basType===4? 'tmall' : 'taobao'"
                     >
                       <el-form-item
                         v-if="items.basType==1 || items.basType==2 || items.basType==''"
@@ -280,21 +280,6 @@
                             :value="item.conceptId"
                           ></el-option>
                         </el-select>
-                        <!-- <el-select
-                          clearable
-                          remote
-                          filterable
-                          :remote-method="(val)=>searchConcept(val,scope.$index,index,i)"
-                          v-model.trim="items.basConceptId"
-                          @change="(val)=>conceptChange(val,scope.$index,index,i)"
-                        >
-                          <el-option
-                            v-for="item in items.conceptList"
-                            :key="item.conceptId"
-                            :label="item.conceptName"
-                            :value="item.conceptId"
-                          ></el-option>
-                        </el-select>-->
                       </el-form-item>
                     </div>
                     <div class="last-box" v-if="v.title == '依据具体内容'">
@@ -447,7 +432,7 @@
                         '.groupVO.' +
                         index +
                         '.klDiagnoseDetail.'+i+'.eqValue'"
-                          v-if="items.basType===4 || items.basType===3||items.basType===6 || items.basType===5"
+                          v-if="items.basType===4 || items.basType===3"
                           maxlength="200"
                           label="正则表达式："
                           class="discDesc"
@@ -638,7 +623,8 @@ export default {
             klDiagnoseDetailj[k].libNameList.forEach(item => {
               arr.push(item.basConceptId);
             });
-            klDiagnoseDetailj[k].basConceptId = arr;
+            this.$set(klDiagnoseDetailj[k],'basConceptId',arr )
+            // klDiagnoseDetailj[k].basConceptId = arr;
             if (
               klDiagnoseDetailj[k].maxOperator ||
               klDiagnoseDetailj[k].minOperator
@@ -797,8 +783,6 @@ export default {
           newArr = arr;
         }
       });
-      // console.log(newArr)
-      // this.$set(this, 'form.klDiagnoseTypeVO', newArr);
       this.getSpanArr(newArr);
     },
     getSpanArr(data) {
@@ -897,38 +881,6 @@ export default {
         item.depart_id = this.i;
         this.form.klDiagnoseTypeVO.splice(i + index + 1, 0, item);
       });
-      // console.log(this.form.klDiagnoseTypeVO);
-
-      // let map = {},
-      //   dest = [];
-      // for (let i = 0; i < formData.klDiagnoseTypeVO.length; i++) {
-      //   let ai = formData.klDiagnoseTypeVO[i];
-      //   if (!map[ai.depart_id]) {
-      //     dest.push({
-      //       depart_id: ai.depart_id,
-      //       conditionType: ai.conditionType,
-      //       groupVO: ai.groupVO
-      //     });
-      //     map[ai.depart_id] = ai;
-      //   } else {
-      //     for (let j = 0; j < dest.length; j++) {
-      //       var dj = dest[j];
-      //       if (dj.depart_id == ai.depart_id) {
-      //         dj.groupVO = dj.groupVO.concat(ai.groupVO);
-      //         break;
-      //       }
-      //     }
-      //   }
-      // }
-      // var index = dest.findIndex(item => {
-      //   return item.depart_id == id;
-      // });
-      // JSON.parse(JSON.stringify(dest[index])).depart_id=this.i
-      // dest.splice(index + 1, 0, JSON.parse(JSON.stringify(dest[index])));
-      // dest.forEach((item, i) => {
-      //   item.depart_id = i;
-      // });
-      // this.form.klDiagnoseTypeVO = JSON.parse(JSON.stringify(dest));
     },
     //删除依据
     delDiag(id, inx) {
@@ -1126,10 +1078,18 @@ export default {
     },
     //医学标准术语
     conceptChange(val, inx, index, i) {
-      this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
-        i
-      ].basConceptId = val;
-      console.log(val);
+      // this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
+      //   i
+      // ].basConceptId = val;
+      this.$set(
+        this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[i],
+        'basConceptId',
+        val
+      );
+      console.log(
+        this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[i]
+          .basConceptId
+      );
       // if (val) {
       //   this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
       //     i
@@ -1517,14 +1477,12 @@ export default {
       height: calc(100vh - 370px);
     }
     /deep/ .el-input {
-      height: 24px;
-      line-height: 24px;
+      height: 30px;
+      line-height: 30px;
       .el-input__inner {
-        height: 24px;
-        line-height: 24px;
+        height: 30px;
+        line-height: 30px;
         font-size: 12px;
-        border-radius: 2px;
-        border-color: #c9c9c9;
       }
     }
     /deep/ .el-select .el-input .el-icon-arrow-up {
@@ -1573,7 +1531,7 @@ export default {
       }
     }
     .el-form-item {
-      margin-top: 8px;
+      margin-bottom: 10px;
       margin-right: 0;
     }
     .discDesc {
@@ -1687,7 +1645,6 @@ export default {
     .icon {
       padding: 0 3px;
       cursor: pointer;
-      vertical-align: middle;
     }
     .star {
       color: #ff545b;