冲突解决

src/components/knowledgeExtra/AddDiagBase.vue

@@ -263,7 +263,7 @@
                         :rules="rules.subConceptId"
                       >
                         <el-select
-                        class="searchselect"
+                          class="searchselect"
                           v-model.trim="items.basConceptId"
                           multiple
                           filterable
@@ -617,62 +617,48 @@ export default {
         item => item.ruleType === this.form.klDiagnoseTypeVO[0].conditionType
       );
       this.baseTermTypeList = this.baseTypes[index2].subMenuList;
-<<<<<<< HEAD
-      const klDiagnoseTypeVO =this.form.klDiagnoseTypeVO;
-      let groupVOi,klDiagnoseDetailj;
+      const klDiagnoseTypeVO = this.form.klDiagnoseTypeVO,
+        arr = [];
+      let groupVOi, klDiagnoseDetailj;
       for (let i = 0; i < klDiagnoseTypeVO.length; i++) {
-          groupVOi =  klDiagnoseTypeVO[i].groupVO;
+        groupVOi = klDiagnoseTypeVO[i].groupVO;
         for (let j = 0; j < groupVOi.length; j++) {
           klDiagnoseDetailj = groupVOi[j].klDiagnoseDetail;
-          for (let k = 0;k <groupVOi[j].klDiagnoseDetail.length;k++) {
-=======
-      let arr = [];
-      for (let i = 0; i < this.form.klDiagnoseTypeVO.length; i++) {
-        for (let j = 0; j < this.form.klDiagnoseTypeVO[i].groupVO.length; j++) {
-          for (
-            let k = 0;
-            k <
-            this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail.length;
-            k++
-          ) {
->>>>>>> termLink0615
+          for (let k = 0; k < groupVOi[j].klDiagnoseDetail.length; k++) {
             var index2 = this.baseTermTypeList.findIndex(
-              item =>item.type ===klDiagnoseDetailj[k].basType
+              item => item.type === klDiagnoseDetailj[k].basType
             );
-              klDiagnoseDetailj[k].basLibTypeList = this.baseTermTypeList[index2].subMenuList;
+            klDiagnoseDetailj[k].basLibTypeList = this.baseTermTypeList[
+              index2
+            ].subMenuList;
 
-            this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
-              k
-            ].conceptList = this.formatData2(this.form.klDiagnoseTypeVO[i].groupVO[
-              j
-            ].klDiagnoseDetail[k].libNameList)
-            this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
-              k
-            ].libNameList.forEach(item => {
+            klDiagnoseDetailj[k].conceptList = this.formatData2(
+              klDiagnoseDetailj[k].libNameList
+            );
+            klDiagnoseDetailj[k].libNameList.forEach(item => {
               arr.push(item.basConceptId);
             });
-            this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
-              k
-            ].basConceptId = arr;
+            klDiagnoseDetailj[k].basConceptId = arr;
             if (
-              this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[k]
-                .maxOperator ||
-              this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[k]
-                .minOperator
+              klDiagnoseDetailj[k].maxOperator ||
+              klDiagnoseDetailj[k].minOperator
             ) {
-              this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
-                k
-              ].dataType = '1';
-            } else if (
-                klDiagnoseDetailj[k].eqValue) {
-                klDiagnoseDetailj[k].dataType = '2';
+              klDiagnoseDetailj[k].dataType = '1';
+            } else if (klDiagnoseDetailj[k].eqValue) {
+              klDiagnoseDetailj[k].dataType = '2';
             }
-            if (klDiagnoseDetailj[k].basType == 3 || klDiagnoseDetailj[k].basType == 4||klDiagnoseDetailj[k].basType == 5 || klDiagnoseDetailj[k].basType == 6) {
-                klDiagnoseDetailj[k].basTypeName = klDiagnoseDetailj[k].basLibTypeList[0].name;
-                klDiagnoseDetailj[k].basNameType = true;
+            if (
+              klDiagnoseDetailj[k].basType == 3 ||
+              klDiagnoseDetailj[k].basType == 4 ||
+              klDiagnoseDetailj[k].basType == 5 ||
+              klDiagnoseDetailj[k].basType == 6
+            ) {
+              klDiagnoseDetailj[k].basTypeName =
+                klDiagnoseDetailj[k].basLibTypeList[0].name;
+              klDiagnoseDetailj[k].basNameType = true;
             } else {
-                klDiagnoseDetailj[k].basTypeName = '';
-                klDiagnoseDetailj[k].basNameType = false;
+              klDiagnoseDetailj[k].basTypeName = '';
+              klDiagnoseDetailj[k].basNameType = false;
             }
             const onlyNum = this.dicts['onlyNum'] || '&';
             const onlyTxt = this.dicts['onlyTxt'] || '&';
@@ -680,8 +666,10 @@ export default {
             const code = onlyTxt + ',';
             let type = klDiagnoseDetailj[k].basLibType;
             let a = klDiagnoseDetailj[k].basLibType;
-              klDiagnoseDetailj[k].onlyNumType = type && codes.indexOf(a + ',') > -1;
-              klDiagnoseDetailj[k].onlyTxtType = type && code.indexOf(a + ',') > -1;
+            klDiagnoseDetailj[k].onlyNumType =
+              type && codes.indexOf(a + ',') > -1;
+            klDiagnoseDetailj[k].onlyTxtType =
+              type && code.indexOf(a + ',') > -1;
           }
         }
       }
@@ -990,7 +978,7 @@ export default {
       this.form.klDiagnoseTypeVO.splice(i, 1);
     },
     //新增基础依据
-    addRule(row, index, inx,i) {
+    addRule(row, index, inx, i) {
       let temp = {
         dataType: '',
         basNameType: false,
@@ -1009,21 +997,28 @@ export default {
         maxVal: '',
         minOperator: '',
         minUnit: '',
-        minVal: '',
+        minVal: ''
       };
-      this.form.klDiagnoseTypeVO[index].groupVO[inx].klDiagnoseDetail.splice(i + 1, 0, temp);
-      this.form.klDiagnoseTypeVO = JSON.parse(JSON.stringify(this.form.klDiagnoseTypeVO))   //8525更新对象触发滚动条更新
+      this.form.klDiagnoseTypeVO[index].groupVO[inx].klDiagnoseDetail.splice(
+        i + 1,
+        0,
+        temp
+      );
+      this.form.klDiagnoseTypeVO = JSON.parse(
+        JSON.stringify(this.form.klDiagnoseTypeVO)
+      ); //8525更新对象触发滚动条更新
     },
     delRule(row, inx, index, i) {
-        const klDiagnoseDetail =  this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail;
+      const klDiagnoseDetail = this.form.klDiagnoseTypeVO[inx].groupVO[index]
+        .klDiagnoseDetail;
       if (klDiagnoseDetail.length === 1) {
         return;
       } else {
-        klDiagnoseDetail.splice(i,1);
+        klDiagnoseDetail.splice(i, 1);
         const numArr = this.numArr[inx].num[0];
-        const fitNo=this.form.klDiagnoseTypeVO[inx].groupVO[0].fitNo;
-        if(numArr[numArr.length-1].name<fitNo){
-            this.form.klDiagnoseTypeVO[inx].groupVO[0].fitNo="";
+        const fitNo = this.form.klDiagnoseTypeVO[inx].groupVO[0].fitNo;
+        if (numArr[numArr.length - 1].name < fitNo) {
+          this.form.klDiagnoseTypeVO[inx].groupVO[0].fitNo = '';
         }
       }
     },
@@ -1063,7 +1058,7 @@ export default {
       this.form.klDiagnoseTypeVO[inx].groupVO[
         index
       ].baseTermTypeList = this.baseTermTypeList;
-      if (val == 3 || val == 4||val == 5 || val == 6) {
+      if (val == 3 || val == 4 || val == 5 || val == 6) {
         this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
           i
         ].basTypeName = this.form.klDiagnoseTypeVO[inx].groupVO[
@@ -1492,9 +1487,9 @@ export default {
 <style lang="less" scoped>
 @import '../../less/admin.less';
 
-/deep/ .searchselect{
-  .el-input{
-    height: 100%!important;
+/deep/ .searchselect {
+  .el-input {
+    height: 100% !important;
   }
 }
 .contents {
@@ -1532,7 +1527,7 @@ export default {
         border-color: #c9c9c9;
       }
     }
-    /deep/ .el-select .el-input .el-icon-arrow-up{
+    /deep/ .el-select .el-input .el-icon-arrow-up {
       line-height: 25px;
     }
     .inps {
@@ -1552,8 +1547,8 @@ export default {
       }
     }
   }
-  /deep/.is-error .el-form-item__error{
-    top:30px;
+  /deep/.is-error .el-form-item__error {
+    top: 30px;
   }
   .content-2 {
     margin-top: 10px;