Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

src/components/knowledgeExtra/AddDiagBase.vue

@@ -251,7 +251,7 @@
                     <div
                       v-if="v.title == '医学标准术语'"
                       class="box-2"
-                      :class="items.basType===3 || items.basType===4? 'tmall' : 'taobao'"
+                      :class="items.basType===3 || items.basType===4|| items.basType===5 || items.basType===6? 'tmall' : 'taobao'"
                     >
                       <el-form-item
                         v-if="items.basType==1 || items.basType==2 || items.basType==''"
@@ -599,87 +599,45 @@ export default {
         item => item.ruleType === this.form.klDiagnoseTypeVO[0].conditionType
       );
       this.baseTermTypeList = this.baseTypes[index2].subMenuList;
-      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++
-          ) {
+      const klDiagnoseTypeVO =this.form.klDiagnoseTypeVO;
+      let groupVOi,klDiagnoseDetailj;
+      for (let i = 0; i < klDiagnoseTypeVO.length; i++) {
+          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++) {
             var index2 = this.baseTermTypeList.findIndex(
-              item =>
-                item.type ===
-                this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[k]
-                  .basType
+              item =>item.type ===klDiagnoseDetailj[k].basType
             );
-            this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
-              k
-            ].basLibTypeList = this.baseTermTypeList[index2].subMenuList;
+              klDiagnoseDetailj[k].basLibTypeList = this.baseTermTypeList[index2].subMenuList;
 
-            this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
-              k
-            ].conceptList = [
+              klDiagnoseDetailj[k].conceptList = [
               {
-                conceptName: this.form.klDiagnoseTypeVO[i].groupVO[j]
-                  .klDiagnoseDetail[k].basLibName,
-                conceptId: this.form.klDiagnoseTypeVO[i].groupVO[j]
-                  .klDiagnoseDetail[k].basConceptId
+                conceptName: klDiagnoseDetailj[k].basLibName,
+                conceptId: klDiagnoseDetailj[k].basConceptId
               }
             ];
-            if (
-              this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[k]
-                .maxOperator ||
-              this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[k]
-                .minOperator
-            ) {
-              this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
-                k
-              ].dataType = '1';
+            if (klDiagnoseDetailj[k].maxOperator || klDiagnoseDetailj[k].minOperator) {
+                klDiagnoseDetailj[k].dataType = '1';
             } else if (
-              this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[k]
-                .eqValue
-            ) {
-              this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
-                k
-              ].dataType = '2';
+                klDiagnoseDetailj[k].eqValue) {
+                klDiagnoseDetailj[k].dataType = '2';
             }
-            if (
-              this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[k]
-                .basType == 3 ||
-              this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[k]
-                .basType == 4
-            ) {
-              this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
-                k
-              ].basTypeName = this.form.klDiagnoseTypeVO[i].groupVO[
-                j
-              ].klDiagnoseDetail[k].basLibTypeList[0].name;
-              this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
-                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 {
-              this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
-                k
-              ].basTypeName = '';
-              this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
-                k
-              ].basNameType = false;
+                klDiagnoseDetailj[k].basTypeName = '';
+                klDiagnoseDetailj[k].basNameType = false;
             }
             const onlyNum = this.dicts['onlyNum'] || '&';
             const onlyTxt = this.dicts['onlyTxt'] || '&';
             const codes = onlyNum + ',';
             const code = onlyTxt + ',';
-            let type = this.form.klDiagnoseTypeVO[i].groupVO[j]
-              .klDiagnoseDetail[k].basLibType;
-            let a = this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[k]
-              .basLibType;
-            this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
-              k
-            ].onlyNumType = type && codes.indexOf(a + ',') > -1;
-            this.form.klDiagnoseTypeVO[i].groupVO[j].klDiagnoseDetail[
-              k
-            ].onlyTxtType = type && code.indexOf(a + ',') > -1;
+            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;
           }
         }
       }
@@ -1537,14 +1495,19 @@ export default {
       height: calc(100vh - 370px);
     }
     /deep/ .el-input {
-      height: 30px;
-      line-height: 30px;
+      height: 24px;
+      line-height: 24px;
       .el-input__inner {
-        height: 30px;
-        line-height: 30px;
+        height: 24px;
+        line-height: 24px;
         font-size: 12px;
+        border-radius: 2px;
+        border-color: #c9c9c9;
       }
     }
+    /deep/ .el-select .el-input .el-icon-arrow-up{
+      line-height: 25px;
+    }
     .inps {
       width: 500px !important;
       font-size: 14px;
@@ -1585,7 +1548,7 @@ export default {
       }
     }
     .el-form-item {
-      margin-bottom: 10px;
+      margin-top: 8px;
       margin-right: 0;
     }
     .discDesc {
@@ -1699,6 +1662,7 @@ export default {
     .icon {
       padding: 0 3px;
       cursor: pointer;
+      vertical-align: middle;
     }
     .star {
       color: #ff545b;