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

src/components/knowledgeExtra/AddDiagBase.vue

@@ -49,7 +49,7 @@
             :span-method="dataSpanMethod"
             :data="form.klDiagnoseTypeVO"
             border
-            max-height="500"
+            height="500"
             :header-cell-style="{background:'#E3EAF4'}"
           >
             <el-table-column label="依据" width="100" fixed>
@@ -114,7 +114,6 @@
                 <span class="name">组</span>
               </template>
               <template slot-scope="scope">
-                {{scope.row.depart_id}}
                 <el-form-item>
                   <img
                     src="../../images/icon-add.png"
@@ -206,6 +205,7 @@
                         '.groupVO.' +
                         index +
                         '.klDiagnoseDetail.'+i+'.basType'"
+                        :rules="[{ required: true, message: '请选择基础依据类型',trigger: ['change'] }]"
                       >
                         <el-select
                           v-model="items.basType"
@@ -396,6 +396,7 @@
                         maxlength="200"
                         label="正则表达式："
                         class="discDesc"
+                        :rules="[{required:true,message:'不能为空~',trigger:'change'}]"
                       >
                         <el-input class="inp" placeholder="请输入正则表达式" v-model.trim="items.eqValue"></el-input>
                       </el-form-item>
@@ -409,6 +410,7 @@
                         v-if="(!items.onlyNumType&&!items.basNameType&&(items.basType===2 || items.basType===1)&&items.dataType==='2')||items.onlyTxtType"
                         label="医学内容："
                         class="discDesc"
+                        :rules="[{required:true,message:'不能为空~',trigger:'change'}]"
                       >
                         <el-input v-model.trim="items.eqValue" class="inp" placeholder="请输入医学内容"></el-input>
                       </el-form-item>
@@ -661,8 +663,9 @@ export default {
           }
         }
       }
+      this.i = this.form.klDiagnoseTypeVO.slice(-1).depart_id;
     }
-    console.log(this.form);
+
     this.setRules();
   },
 
@@ -846,6 +849,7 @@ export default {
       });
       this.form.klDiagnoseTypeVO.splice(i + 1, 0, temp);
       this.setRules();
+      console.log(this.form.klDiagnoseTypeVO);
     },
     //复制依据
     copyDiag(id, inx) {
@@ -1237,13 +1241,6 @@ export default {
                   x +
                   '.klDiagnoseDetail.' +
                   j;
-                that.rules[keyTxt + '.basType'] = [
-                  {
-                    required: true,
-                    message: '请选择基础依据类型',
-                    trigger: ['change']
-                  }
-                ];
                 that.rules[keyTxt + '.dataType'] = [
                   {
                     required: true,
@@ -1329,19 +1326,6 @@ export default {
                     trigger: 'blur'
                   }
                 ];
-                that.rules[keyTxt + '.eqValue'] = [
-                  { required: true, message: '不能为空~', trigger: 'blur' },
-                  {
-                    validator: (rule, value, callback) => {
-                      if (value && value.length > 200) {
-                        callback(new Error('不能超过200字'));
-                      } else {
-                        callback();
-                      }
-                    },
-                    trigger: 'blur'
-                  }
-                ];
               }
             });
           });
@@ -1433,20 +1417,16 @@ export default {
   }
 };
 </script>
-<style lang="less">
+<style lang="less" scoped>
 @import '../../less/admin.less';
 .contents {
-  height: 100%;
+  height: 780px;
   .content {
     background: #fff;
-    padding: 20px 20px 0;
-    // padding: 20px 20px 50px;
+    padding: 20px 20px;
     color: #545455;
     min-width: 980px;
     position: relative;
-    .name {
-      font-size: 14px;
-    }
     .tip-text {
       color: #f56c6c;
       margin-left: 10px;
@@ -1460,13 +1440,13 @@ export default {
         background: #ebedf1;
       }
     }
-    .el-input {
+    /deep/ .el-input {
       height: 30px;
       line-height: 30px;
       .el-input__inner {
         height: 30px;
         line-height: 30px;
-        font-size: 14px;
+        font-size: 12px;
       }
     }
     .inps {
@@ -1474,20 +1454,12 @@ export default {
       .el-input__inner {
         width: 500px !important;
       }
-      /deep/ .el-form--inline .el-form-item__label {
-        font-size: 14px;
-      }
     }
   }
   .content-2 {
     margin-top: 10px;
     padding: 20px 20px;
     max-height: 650px;
-    .el-input {
-      .el-input__inner {
-        font-size: 12px;
-      }
-    }
     .cell {
       overflow: initial;
     }
@@ -1509,7 +1481,6 @@ export default {
     .el-form-item {
       margin-bottom: 10px;
       margin-right: 0;
-      font-size: 14px;
     }
     .discDesc {
       margin-bottom: 20px;
@@ -1555,18 +1526,18 @@ export default {
       height: 50px;
       margin-bottom: 10px;
       position: relative;
-      .el-input,
+      /deep/ .el-input,
       .el-input__inner {
         width: 85px;
         font-size: 12px;
         margin-right: 15px;
       }
-      .el-form-item__content {
+      /deep/ .el-form-item__content {
         position: inherit !important;
       }
       .last-box-1 {
         display: flex;
-        .el-form-item__error {
+        /deep/ .el-form-item__error {
           top: 38px;
           left: 10px;
           white-space: nowrap;
@@ -1575,20 +1546,20 @@ export default {
       }
       .last-box-s {
         position: absolute;
-        .el-form-item__error {
+        /deep/ .el-form-item__error {
           top: 38px;
           left: 0px;
           white-space: nowrap;
           background: #fff;
         }
       }
-      .el-form-item__error {
+      /deep/ .el-form-item__error {
         top: 38px;
         left: 10px;
         white-space: nowrap;
         background: #fff;
       }
-      .inp {
+      /deep/ .inp {
         width: 600px !important;
         .el-input__inner {
           width: 600px !important;
@@ -1628,13 +1599,9 @@ export default {
       color: #ff545b;
     }
   }
-  .item .el-form-item__error {
+  .description .el-form-item__error {
     top: auto;
   }
-  .item .el-form-item__label {
-    font-size: 14px;
-  }
-
   .Butn {
     display: flex;
     justify-content: center;