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

src/components/knowledgeExtra/AddDiagBase.vue

@@ -31,7 +31,7 @@
           <el-form-item label="诊断依据描述：" class="item">
             <el-input
               class="inps"
-              max-length="200"
+              maxlength="200"
               placeholder="请输入诊断依据描述"
               v-model.trim="form.description"
             ></el-input>
@@ -49,7 +49,9 @@
             :span-method="dataSpanMethod"
             :data="form.klDiagnoseTypeVO"
             border
-            height="500"
+            ref="tableList"
+            style="min-height: 200px"
+            height="calc(100vh - 450px)"
             :header-cell-style="{background:'#E3EAF4'}"
           >
             <el-table-column label="依据" width="100" fixed>
@@ -128,7 +130,7 @@
                     width="18"
                     class="icon"
                     @click="delGroup(scope.row.depart_id,scope.$index)"
-                    v-show="groupL[scope.row.depart_id]&&groupL[scope.row.depart_id].id>1"
+                    v-show="isMax(scope.row.depart_id)"
                   />
                 </el-form-item>
               </template>
@@ -184,10 +186,10 @@
                     <div class="box-2" v-if="v.title == '基础依据名称'">
                       <el-form-item
                         :prop="'klDiagnoseTypeVO.' +
-                          scope.$index +
-                          '.groupVO.' +
-                          index +
-                          '.klDiagnoseDetail.'+i+'.basDescription'"
+                        scope.$index +
+                        '.groupVO.' +
+                        index +
+                        '.klDiagnoseDetail.'+i+'.basDescription'"
                         :rules="[{required:true,message:'请输入基础依据名称',trigger:'blur'}]"
                       >
                         <el-input
@@ -330,6 +332,7 @@
                           </el-form-item>
 
                           <el-form-item
+                            class="num"
                             :prop="'klDiagnoseTypeVO.' +
                               scope.$index +
                               '.groupVO.' +
@@ -372,11 +375,12 @@
                           </el-form-item>
 
                           <el-form-item
+                            class="minnum"
                             :prop="'klDiagnoseTypeVO.' +
-                              scope.$index +
-                              '.groupVO.' +
-                              index +
-                              '.klDiagnoseDetail.'+i+'.minVal'"
+                            scope.$index +
+                            '.groupVO.' +
+                            index +
+                            '.klDiagnoseDetail.'+i+'.minVal'"
                           >
                             <el-input v-model="items.minVal" placeholder="填写数值"></el-input>
                           </el-form-item>
@@ -386,6 +390,7 @@
                           </el-form-item>
                         </div>
                       </el-form-item>
+                      
                       <el-form-item
                         :prop="'klDiagnoseTypeVO.' +
                         scope.$index +
@@ -663,12 +668,12 @@ export default {
           }
         }
       }
-      this.i = this.form.klDiagnoseTypeVO.slice(-1).depart_id;
+      this.i = this.form.klDiagnoseTypeVO.slice(-1)[0].depart_id + 1;
+      console.log(this.i);
     }
 
     this.setRules();
   },
-
   computed: {
     numArr() {
       let arr = [];
@@ -713,40 +718,15 @@ export default {
         }
       }
       return dest;
-    },
-    groupL() {
-      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]) {
-          dest.push({
-            depart_id: ai.depart_id,
-            conditionType: ai.conditionType,
-            groupVO: ai.groupVO
-          });
-          map[ai.depart_id] = ai;
-        } else {
-          for (let j = 0; j < dest.length; j++) {
-            var dj = dest[j];
-            if (dj.depart_id == ai.depart_id) {
-              dj.groupVO = dj.groupVO.concat(ai.groupVO);
-              break;
-            }
-          }
-        }
-      }
-      dest.forEach((item, index) => {
-        item.depart_id = index;
-        let arr1 = { id: item.groupVO.length };
-        arr.push(arr1);
-      });
-      return arr;
     }
   },
   methods: {
+    isMax(id) {
+      const typeNum = this.form.klDiagnoseTypeVO.filter(
+        item => item.depart_id === id
+      ).length;
+      return typeNum > 1;
+    },
     getData(data) {
       let arr = data;
       let str = [];
@@ -847,9 +827,12 @@ export default {
           i = inx;
         }
       });
+      this.$nextTick(() => {
+        this.$refs.tableList.bodyWrapper.scrollLeft = 0;
+        //  this.$refs.form.clearValidate();
+      });
       this.form.klDiagnoseTypeVO.splice(i + 1, 0, temp);
       this.setRules();
-      console.log(this.form.klDiagnoseTypeVO);
     },
     //复制依据
     copyDiag(id, inx) {
@@ -934,28 +917,6 @@ export default {
       this.setRules();
     },
     delGroup(id, i) {
-      const formData = JSON.parse(JSON.stringify(this.form));
-      let map = {},
-        dest = [];
-      for (let i = 0; i < formData.klDiagnoseTypeVO.length; i++) {
-        let ai = formData.klDiagnoseTypeVO[i];
-        if (!map[ai.depart_id]) {
-          dest.push({
-            depart_id: ai.depart_id,
-            conditionType: ai.conditionType,
-            groupVO: ai.groupVO
-          });
-          map[ai.depart_id] = ai;
-        } else {
-          for (let j = 0; j < dest.length; j++) {
-            var dj = dest[j];
-            if (dj.depart_id == ai.depart_id) {
-              dj.groupVO = dj.groupVO.concat(ai.groupVO);
-              break;
-            }
-          }
-        }
-      }
       this.form.klDiagnoseTypeVO.splice(i, 1);
       this.setRules();
     },
@@ -1023,6 +984,9 @@ export default {
       this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
         i
       ].dataType = '';
+      this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
+        i
+      ].conceptList = [];
       this.clearConcept(val, inx, index, i); //清空医学标准术语
       this.clearNumText(val, inx, index, i); //清空数值、医学内容
       var index2 = this.baseTermTypeList.findIndex(item => item.type === val);
@@ -1068,6 +1032,9 @@ export default {
       // this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
       //   i
       // ].dataType = '';
+      this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
+        i
+      ].conceptList = [];
       if ((this.numTypes + ',').indexOf(val + ',') > -1) {
         this.form.klDiagnoseTypeVO[inx].groupVO[index].klDiagnoseDetail[
           i
@@ -1420,7 +1387,7 @@ export default {
 <style lang="less" scoped>
 @import '../../less/admin.less';
 .contents {
-  height: 780px;
+  height: 100%;
   .content {
     background: #fff;
     padding: 20px 20px;
@@ -1440,6 +1407,9 @@ export default {
         background: #ebedf1;
       }
     }
+    .el-table--scrollable-y .el-table__body-wrapper {
+      height: calc(100vh - 370px);
+    }
     /deep/ .el-input {
       height: 30px;
       line-height: 30px;
@@ -1459,7 +1429,7 @@ export default {
   .content-2 {
     margin-top: 10px;
     padding: 20px 20px;
-    max-height: 650px;
+    height: calc(100vh - 370px);
     .cell {
       overflow: initial;
     }
@@ -1484,10 +1454,10 @@ export default {
     }
     .discDesc {
       margin-bottom: 20px;
-      .el-form-item__error {
+      /deep/ .el-form-item__error {
         top: 38px;
+        left: 100px !important;
         white-space: nowrap;
-        background: #fff;
       }
     }
     .el-popper[x-placement^='bottom'] {
@@ -1541,7 +1511,6 @@ export default {
           top: 38px;
           left: 10px;
           white-space: nowrap;
-          background: #fff;
         }
       }
       .last-box-s {
@@ -1550,14 +1519,12 @@ export default {
           top: 38px;
           left: 0px;
           white-space: nowrap;
-          background: #fff;
         }
       }
       /deep/ .el-form-item__error {
         top: 38px;
         left: 10px;
         white-space: nowrap;
-        background: #fff;
       }
       /deep/ .inp {
         width: 600px !important;
@@ -1599,9 +1566,6 @@ export default {
       color: #ff545b;
     }
   }
-  .description .el-form-item__error {
-    top: auto;
-  }
   .Butn {
     display: flex;
     justify-content: center;
@@ -1610,5 +1574,12 @@ export default {
       margin: 15px 0;
     }
   }
+  .name {
+    font-size: 14px;
+
+    font-weight: 400;
+    color: #333333;
+    line-height: 20px;
+  }
 }
 </style>

vue.config.js

@@ -1,7 +1,7 @@
 const path = require('path');
 // const proxy_path = 'http://192.168.2.236:80';
-const proxy_path = 'http://192.168.2.241:88';
-// const proxy_path = 'http://192.168.2.236:88';
+// const proxy_path = 'http://192.168.2.241:88';
+const proxy_path = 'http://192.168.2.236:88';
 // const proxy_path = 'http://192.168.3.101:5050';
 // const proxy_path = 'http://192.168.3.117:5050';//周铁刚
 // const proxy_path = 'http://192.168.3.113:5050'; //王峰