1178232204@qq.com 3 anni fa
parent
commit
b98e0f3faa
1 ha cambiato i file con 19 aggiunte e 12 eliminazioni
  1. 19 12
      src/components/cdssManage/hospital/AddHospital.vue

+ 19 - 12
src/components/cdssManage/hospital/AddHospital.vue

@@ -46,9 +46,9 @@
                 :height="form.hospitalRelationVOList.length > 0?'calc(100vh - 360px)':'60px'"
                 class="tabs"
                 ref="tableList"
-                :header-row-style="{height:'40px',cursor: 'pointer'}"
-                :row-style="{height:'40px',cursor: 'pointer'}"
-                :header-cell-style="{height:'40px',borderColor:'#DCDFE6'}"
+                :header-row-style="{height:'40px',cursor: 'pointer',fontSize:'14px'}"
+                :row-style="{height:'40px',cursor: 'pointer',fontSize:'14px'}"
+                :header-cell-style="{height:'40px',borderColor:'#DCDFE6',fontSize:'14px'}"
               >
                 <el-table-column label="序号" type="index" width="80">
                   <template slot="header" slot-scope="scope">
@@ -278,6 +278,8 @@ export default {
               let errorCurrentList = [];
               this.getIndex(data.errorOther, errorOtherList);
               this.getIndex(data.errorCurrent, errorCurrentList);
+              console.log(errorOtherList);
+              console.log(errorCurrentList);
               errorOtherList.forEach(i => {
                 this.form.hospitalRelationVOList[i].errorOther = true;
               });
@@ -307,10 +309,19 @@ export default {
       }, 0);
     },
     getIndex(data, list) {
+      let hospitalRelationVOList = JSON.parse(
+        JSON.stringify(this.form.hospitalRelationVOList)
+      );
+      hospitalRelationVOList.forEach(it => {
+        delete it.errorOther;
+        delete it.errorCurrent;
+      });
       let arr2Map = {};
-      data.forEach((item, index) => (arr2Map[item.name] = item));
-      this.form.hospitalRelationVOList.forEach((item, index) => {
-        arr2Map[item.name] && list.push(index);
+      data.forEach((item, index) => (arr2Map[item] = item));
+      hospitalRelationVOList.forEach((item, index) => {
+        if(arr2Map[item] && item.name == arr2Map[item].name && item.code == arr2Map[item].code){
+          list.push(index)
+        }
       });
     },
     // 处理拼音转换
@@ -472,6 +483,7 @@ export default {
   /deep/.el-input__inner {
     height: 32px;
     margin-bottom: 18px;
+    font-size: 12px;
   }
   /deep/ .is-error .el-form-item__error {
     top: 34px;
@@ -482,17 +494,12 @@ export default {
   }
 }
 .add-border {
-  border: 1px #c9c9c9 dashed;
+  border: 1px #48c5d7 dashed;
   width: 96%;
   height: 30px;
   text-align: center;
   line-height: 30px;
   cursor: pointer;
-  background: url('../../../images/add-no.png') no-repeat center center;
-  background-size: 16px 16px;
-}
-.add-border:hover {
-  border-color: #48c5d7;
   background: url('../../../images/add-nob.png') no-repeat center center;
   background-size: 16px 16px;
 }