Преглед на файлове

fixbug: 7768 7767 7759 7758 7751 7753 7748 7746 7745 7737 7735 7734

reaper преди 4 години
родител
ревизия
1eb41f407d
променени са 3 файла, в които са добавени 49 реда и са изтрити 31 реда
  1. 23 13
      src/components/knowledgeExtra/AddNewRule.vue
  2. 12 4
      src/components/knowledgeExtra/AddNewRuleTable.vue
  3. 14 14
      src/components/knowledgeExtra/rules.js

+ 23 - 13
src/components/knowledgeExtra/AddNewRule.vue

@@ -25,7 +25,8 @@
   }
   .form_btn {
     width: 100%;
-    margin: 20px 0;
+    background: #fff;
+    padding: 20px 0;
     text-align: center;
   }
 }
@@ -38,14 +39,15 @@
       linkTo="ZskRuleManager"
     ></crumbs>
     <div class="AddRuleContent">
-      <el-form size="mini" :model="form" :rules="rules" ref="ruleForm">
+      <el-form size="mini" :model="form"  ref="ruleForm">
         <!-- <div class="table_form"> -->
         <el-row class="table_form">
-          <el-col :span="8">
+          <el-col :span="6">
             <!-- 规则名称 -->
             <el-form-item
               label-width="130px"
               label="规则名称:"
+              :rules="rules.parDescription"
               prop="parDescription"
             >
               <el-input
@@ -55,11 +57,12 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <!-- 规则类型 -->
             <el-form-item
               label-width="130px"
               label="规则类型:"
+              :rules="rules.parRuleType"
               prop="parRuleType"
             >
               <el-select
@@ -80,11 +83,12 @@
               </div>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <!-- 规则术语类型: -->
             <el-form-item
               label-width="130px"
               label="规则术语类型:"
+              :rules="rules.parLenCode"
               prop="parLenCode"
             >
               <el-select
@@ -105,10 +109,12 @@
               </div>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item
               label-width="130px"
               label="医学标准术语:"
+              style="margin-bottom:50px"
+              :rules="rules.parConceptId"
               prop="parConceptId"
             >
               <el-select
@@ -129,11 +135,12 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item
               label-width="130px"
               v-if="showHasSub"
               label="有无子条件:"
+              :rules="rules.parHasSub"
               prop="parHasSub"
             >
               <el-select
@@ -146,17 +153,18 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item
               style="flex: 1; minwidth: 500px"
               label-width="130px"
               v-if="showMsg"
               label="附加信息:"
+              :rules="rules.parMsg"
               prop="parMsg"
             >
               <el-input
                 type="textarea"
-                :rows="3"
+                :rows="1"
                 placeholder="请输入附加信息"
                 v-model.trim="form.parMsg"
               ></el-input>
@@ -405,7 +413,7 @@ export default {
       });
     },
     // 初始化表格
-    setInitGroupData() {
+    setInitGroupData(init) {
       const date = new Date().valueOf();
       this.$set(this.form, "klRuleByIdSub", [
         {
@@ -429,13 +437,15 @@ export default {
           dataType: ""
         }
       ]);
-      this.form.parConceptId = ""; //医学标准术语清空
-      this.conceptList = []; //下拉列表清空
+      if (!init) {
+        this.form.parConceptId = ""; //医学标准术语清空
+        this.conceptList = []; //下拉列表清空
+      }
     },
     // 有无子条件切换
     hasSubChange(val) {
       if (val) {
-        this.setInitGroupData();
+        this.setInitGroupData(true);
       } else {
         this.form.klRuleByIdSub = [];
       }

+ 12 - 4
src/components/knowledgeExtra/AddNewRuleTable.vue

@@ -45,7 +45,7 @@
     display: flex;
     .type_content_item1 {
       /deep/ .el-form-item__content {
-        padding-bottom: 0px;
+        padding-bottom: 8px;
       }
       .row_box {
         .el-col {
@@ -86,6 +86,12 @@
   .table_cell_cls {
     vertical-align: top;
   }
+  /deep/ .el-table__body .el-table__row.hover-row td {
+    background-color: transparent;
+  }
+  /deep/ .el-form-item__label{
+    font-size: 12px;
+  }
 }
 </style>
 
@@ -97,13 +103,14 @@
       border
       :data="klRuleByIdSub"
       size="mini"
-      height="tableHeigth"
+      style="min-height:200px"
+      height="calc(100vh - 480px)"
       :row-style="rowStyle"
       :header-row-style="{ background: '#E3EAF4' }"
       :cell-style="cellStyle"
       :span-method="ObjectSpanMethod"
     >
-      <el-table-column width="80px" label="组" prop="groupType">
+      <el-table-column width="80px" label="组" prop="groupType" fixed="left">
         <template slot-scope="scope">
           <div class="btn_box">
             <div class="btn_div">
@@ -126,6 +133,7 @@
       <el-table-column
         width="80px"
         v-if="maxNum && maxNum > 1"
+        fixed="left"
         label="基础规则"
         prop="groupType"
       >
@@ -292,7 +300,7 @@
                         validator: (rule, value, callback) => {
                           subMaxOperator(scope, rule, value, callback);
                         },
-                        trigger: 'blur'
+                        trigger: 'change'
                       }
                     ]"
                   >

+ 14 - 14
src/components/knowledgeExtra/rules.js

@@ -1,4 +1,4 @@
-export const formRules =  {
+export const formRules = {
   parDescription: [
     { required: true, message: "请输入规则名称", trigger: ["blur"] },
     {
@@ -9,23 +9,23 @@ export const formRules =  {
           callback();
         }
       },
-      trigger: "blur"
+      trigger: ["change"]
     }
   ],
   parRuleType: [
-    { required: true, message: "请选择规则类型", trigger: ["blur"] }
+    { required: true, message: "请选择规则类型", trigger: ["change"] }
   ],
   parLenCode: [
-    { required: true, message: "请选择规则术语类型", trigger: ["blur"] }
+    { required: true, message: "请选择规则术语类型", trigger: ["change"] }
   ],
   parConceptId: [
-    { required: true, message: "请输入医学标准术语", trigger: ["blur"] }
+    { required: true, message: "请输入医学标准术语", trigger: ["change"] }
   ],
   parHasSub: [
-    { required: true, message: "请选择有无子条件", trigger: ["blur"] }
+    { required: true, message: "请选择有无子条件", trigger: ["change"] }
   ],
   parMsg: [
-    { required: true, message: "请输入附加信息", trigger: ["blur"] },
+    { required: true, message: "请输入附加信息", trigger: ["change"] },
     {
       validator: (rule, value, callback) => {
         if (value.length > 100) {
@@ -34,7 +34,7 @@ export const formRules =  {
           callback();
         }
       },
-      trigger: "blur"
+      trigger: "change"
     }
   ],
 
@@ -42,7 +42,7 @@ export const formRules =  {
 
 export const tableRules = {
   subDescription: [
-    { required: true, message: "请输入基础规则名称", trigger: ["blur"] },
+    { required: true, message: "请输入基础规则名称", trigger: ["change","blur"] },
     {
       validator: (rule, value, callback) => {
         if (value && value.length > 100) {
@@ -51,11 +51,11 @@ export const tableRules = {
           callback();
         }
       },
-      trigger: "blur"
+      trigger: ["change","blur"]
     }
   ],
   subType: [
-    { required: true, message: "请选择基础规则类型", trigger: ["blur"] }
+    { required: true, message: "请选择基础规则类型", trigger: ["change"] }
   ],
   subLenCode: [
     {
@@ -68,10 +68,10 @@ export const tableRules = {
     { required: true, message: "请输入医学标准术语", trigger: ["blur"] }
   ],
   dataType: [
-    { required: true, message: "请选择类型", trigger: ["blur"] }
+    { required: true, message: "请选择类型", trigger: ["change"] }
   ],
-  
-  
+
+
   subEqValue: [
     {
       validator: (rule, value, callback) => {