Merge branch 'uiUpdate0507' into knowledgeExtra_0521

src/components/knowledgeExtra/AddDiagBase.vue

@@ -128,6 +128,7 @@
                     width="18"
                     class="icon"
                     @click="delGroup(scope.row.depart_id,scope.$index)"
+                    v-show="groupL[scope.row.depart_id].id>1"
                   />
                 </el-form-item>
               </template>
@@ -552,7 +553,6 @@ export default {
     this.baseTypes = JSON.parse(localStorage.getItem('zskDiagList') || '[]');
     this.dicts = JSON.parse(localStorage.getItem('zskDiagDicts') || '{}');
     let info = param.data;
-    console.log(info)
     if (info) {
       this.id = info.id;
       this.isCopy = param.copy;
@@ -562,8 +562,7 @@ export default {
         { conceptId: info.conceptId, conceptName: info.conceptName }
       ];
       for (let i = 0; i < info.klDiagnoseTypeVO.length; i++) {
-        info.klDiagnoseTypeVO[i].depart_id = this.i;
-        this.i++;
+        info.klDiagnoseTypeVO[i].depart_id = i;
       }
       this.form = Object.assign({}, this.form, this.formatData(info));
       if (this.isCopy) {
@@ -662,6 +661,7 @@ export default {
         }
       }
     }
+    console.log(this.form);
     this.setRules();
   },
 
@@ -711,10 +711,11 @@ export default {
       return dest;
     },
     groupL() {
-      const formData = JSON.parse(JSON.stringify(this.form));
+      console.log(this.form);
       let map = {},
         dest = [];
       let arr = [];
+      var formData = JSON.parse(JSON.stringify(this.form));
       for (let i = 0; i < formData.klDiagnoseTypeVO.length; i++) {
         let ai = formData.klDiagnoseTypeVO[i];
         if (!map[ai.depart_id]) {
@@ -735,7 +736,7 @@ export default {
         }
       }
       dest.forEach((item, index) => {
-        let arr1 = {id:item.groupVO.length} 
+        let arr1 = { id: item.groupVO.length };
         arr.push(arr1);
       });
       return arr;
@@ -1475,8 +1476,10 @@ export default {
     }
     .el-input {
       height: 30px;
+      line-height: 30px;
       .el-input__inner {
         height: 30px;
+        line-height: 30px;
         font-size: 12px;
       }
     }
@@ -1486,9 +1489,6 @@ export default {
         width: 500px !important;
       }
     }
-    .el-input__suffix {
-      top: 10px;
-    }
   }
   .content-2 {
     margin-top: 10px;
@@ -1604,10 +1604,6 @@ export default {
         overflow: hidden;
         display: flex;
       }
-
-      .el-input__suffix {
-        top: 5px;
-      }
     }
 
     .tmall {