Merge branch 'master' of http://182.44.34.170:8081/jiankun/q-baqd

src/layout/components/Navbar.vue

@@ -59,6 +59,7 @@ export default {
 .hospital {
   line-height: 50px;
   color: #909399;
+  float: left;
 }
 .navbar {
   // width: 1200px;

src/views/data/query/details.vue

@@ -11,28 +11,21 @@
     <div class="cont_container">
       <div class="cont-left">
         <div class="contLeft-title-top">
-          <div class="title-top-f">
-            <div class="refachInput">
-              <span ref="ZA03" class="homeTitle-i-t">医疗机构名称:</span>
-              <span v-if="!ifFile" class="homeTitle-i-x">{{ data.ZA03 }}</span>
-              <!-- data.ZA03 -->
-              <el-input v-else class="width200" v-model="data.ZA03" placeholder="请输入内容"></el-input>
-            </div>
-          </div>
-          <div class="title-top-f">
-            <div class="refachInput">
-              <span ref="TYSHXYDM" class="homeTitle-i-t">统一社会信用代码:</span>
-              <span v-if="!ifFile" class="homeTitle-i-x">{{ data.TYSHXYDM }}</span>
-              <el-input v-else v-model="data.TYSHXYDM" class="width150" placeholder="请输入内容"></el-input>
+          <span class="contLeft-title-fj">附件1</span>
+
+          <div class="contLeft-title-rbox">
+            <div class="title-rbox-f">
+              <div class="refachInput">
+                <span ref="ZA03" class="homeTitle-i-t">医疗机构名称</span>
+                <span v-if="!ifFile" class="homeTitle-i-x">{{ data.ZA03 }}</span>
+                <!-- data.ZA03 -->
+                <el-input v-else class="width200" v-model="data.ZA03" placeholder="请输入内容"></el-input>
+              </div>
             </div>
-          </div>
-          <div class="title-top-r">
             <div class="refachInput" style="display: flex">
               <span ref="UNT_ID" v-if="!ifFile" class="homeTitle-i-t">
-                ( 组织机构代码：
-                <span class="homeTitle-i-x">
-                  <span>{{ data.UNT_ID}}</span>
-                </span>
+                ( 组织机构代码：<span class="homeTitle-i-x"><span>{{ data.UNT_ID}}</span>
+              </span>
                 {{ data.UNT_ID?'':'-'}})
               </span>
               <!-- data.AAA27 -->
@@ -41,41 +34,41 @@
               </div>
             </div>
           </div>
+ 
         </div>
         <div class="cont-title-description">住院病案首页</div>
         <!--  -->
-        <!--  -->
-        <div class="cont-title contLeft-title-top">
-          <div class="title-top-300">
-            <div class="refachInput">
-              <span ref="AAA26C" class="homeTitle-i-t">医疗付费方式:</span>
-              <span v-if="!ifFile" class="homeTitle-i-x">{{ data.AAA26C }}</span>
-              <el-input v-else v-model="data.AAA26C" class="width150" placeholder="请输入内容"></el-input>
-            </div>
+        <div class="contLeft-title-top">
+          <div class="refachInput">
+            <span ref="AAA26C" class="homeTitle-i-t">医疗付费方式</span>
+            <span v-if="!ifFile" class="homeTitle-i-x">{{ data.AAA26C }}</span>
+            <el-input v-else v-model="data.AAA26C" class="width150" placeholder="请输入内容"></el-input>
           </div>
-          <div class="title-top-300">
-            <div class="refachInput">
-              <span ref="JKKH" class="homeTitle-i-t">健康卡号:</span>
-              <span v-if="!ifFile" class="homeTitle-i-x">{{ data.JKKH ? data.JKKH : ' —  ' }}</span>
-              <!-- data.AAA27 -->
-              <el-input v-else class="width170" v-model="data.JKKH" placeholder="请输入内容"></el-input>
-            </div>
+          <!-- <div class="refachInput" style="margin-left: 12px;">
+            <span ref="TYSHXYDM" class="homeTitle-i-t">统一社会信用代码:</span>
+            <span v-if="!ifFile" class="homeTitle-i-x">{{ data.TYSHXYDM }}</span>
+            <el-input v-else v-model="data.TYSHXYDM" class="width150" placeholder="请输入内容"></el-input>
+          </div> -->
+        </div>
+        <!--  -->
+        <div class="cont-title contLeft-title-top" style="margin-top: 10px;">
+          
+          <div class="refachInput">
+            <span ref="JKKH" class="homeTitle-i-t" style="padding-right: 28px;">健康卡号</span>
+            <span v-if="!ifFile" class="homeTitle-i-x">{{ data.JKKH ? data.JKKH : ' —  ' }}</span>
+            <!-- data.AAA27 -->
+            <el-input v-else class="width170" v-model="data.JKKH" placeholder="请输入内容"></el-input>
           </div>
-          <div class="title-top-f">
-            <div class="refachInput">
-              <span class="homeTitle-i-t">第</span>
-              <span v-if="!ifFile" class="homeTitle-i-x">{{ data.AAA29 }}</span>
-              <el-input v-else v-model="data.AAA29" class="width100" style="width: 80px" placeholder="请输入内容"></el-input>
-              <span class="homeTitle-i-t">次住院</span>
-            </div>
+          <div class="refachInput">
+            <span class="homeTitle-i-t">第</span>
+            <span v-if="!ifFile" class="homeTitle-i-x">{{ data.AAA29 }}</span>
+            <el-input v-else v-model="data.AAA29" class="width100" style="width: 80px" placeholder="请输入内容"></el-input>
+            <span class="homeTitle-i-t">次住院</span>
           </div>
-          <div class="title-top-f">
-            <div class="refachInput">
-              <span ref="AAA28" class="homeTitle-i-t">病案号:</span>
-              <span v-if="!ifFile" class="homeTitle-i-x">{{ data.AAA28 }}</span>
-              <el-input v-else v-model="data.AAA28" class="width170" placeholder="请输入内容"></el-input>
-            </div>
-            
+          <div class="refachInput">
+            <span ref="AAA28" class="homeTitle-i-t">病案号</span>
+            <span v-if="!ifFile" class="homeTitle-i-x">{{ data.AAA28 }}</span>
+            <el-input v-else v-model="data.AAA28" class="width170" placeholder="请输入内容"></el-input>
           </div>
         </div>
 
@@ -1372,7 +1365,7 @@ export default {
     this.valData = this.storageGet('getData');
     console.log(this.storageGet('getData'));
     if(this.valData){
-      this.funQuery();
+      this.funQuery(this.setColor);
     }
 
     // 生命周期钩子：模板编译、挂载之后(此时不保证已在 document 中)
@@ -1418,7 +1411,7 @@ export default {
         console.log(res);
         setTimeout(() =>{
           this.$message('修改成功');
-          this.funQuery();
+          this.funQuery(this.setColor);
           this.ifFile = false;
         }, 500)
       });
@@ -1455,8 +1448,14 @@ export default {
         this.$refs[item.error_field].scrollIntoView({ block: 'start', behavior: 'smooth' });
       }
     },
-
-    funQuery() {
+    // 加载数据后渲染颜色
+    setColor(e){
+      let errorList = e;
+      for(var i = 0;i<errorList.length;i++){
+        this.$refs[errorList[i].error_field].style.color = ( errorList[i].category<=1 ? 'red':'#e26e01' );
+      }
+    },
+    funQuery(f) {
       let pramse = {
         id: this.valData,
       };
@@ -1467,7 +1466,6 @@ export default {
         this.data = res.data;
         this.score = res.data.score;
         this.errorList = res.data.error;
-        console.log(this.errorList, ' this.errorList');
 
         if (this.data.diagnosis.length < 22) {
           for (let i = 0; i < 22 - this.data.diagnosis.length; i++) {
@@ -1503,7 +1501,7 @@ export default {
           }
         }
         console.log(this.data.operation);
-
+        return f(this.errorList);
        
       });
     },
@@ -1575,7 +1573,7 @@ export default {
   }
 }
 .cont-edit-dev {
-  margin: 20px;
+  margin: 10px;
   font-weight: bold;
   color: #2c3240;
   display: flex;
@@ -1609,7 +1607,7 @@ table {
   .table-label {
     width: 150px;
     height: 40px;
-    color: #666666 !important;
+    color: #666666;
     background-color: #f9f9f9;
   }
   .table-value {
@@ -1844,6 +1842,12 @@ table {
   background: yellow;
   border: 2px solid #e26e01;
 }
+.choose-cool{
+  color: red;
+}
+.choose-cool-1{
+  color: #e26e01 ;
+}
 .table-value-look{
   padding-left: 12px;
   color: #ff0000;
@@ -1855,19 +1859,42 @@ table {
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
+  padding: 0 10px;
 }
-.contLeft-title-top>div.title-top-f{
+.contLeft-title-fj{
+  width: auto;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  align-items: center;
+}
+.contLeft-title-rbox{
   flex: 1;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  justify-content: flex-end;
+}
+.title-top-f{
+  flex: 1;
+}
+.contLeft-title-top .title-rbox-f{
+  flex: 1;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  justify-content: flex-end;
+  margin-right: 16px;
 }
-.contLeft-title-top>div.title-top-r{
+.title-top-200{
   width: 200px;
 }
-.contLeft-title-top>div.title-top-300{
+.contLeft-title-top .title-top-300{
   width: 300px;
 }
 .refachInput span{
   height: auto;
-  line-height: 1;
+  line-height: 30px;
   padding: 0;
 }
 
@@ -1880,8 +1907,9 @@ table {
   font-weight: bold;
 }
 .refachInput  .homeTitle-i-x{
-  border-bottom: 1px solid #333;
+  border-bottom: 1px solid #dbdbdb;
   padding-right: 12px;
   margin-left: 2px;
+  min-width: 70px;
 }
 </style>

src/views/search/components/ProfessionSearch.vue

@@ -73,7 +73,7 @@
           </el-form-item>
         </el-form>
         <el-collapse-transition>
-          <div v-show="showMore" style="width: 1120px; margin: 0 auto;">
+          <div v-show="showMore" style="width: 1124px; margin: 0 auto;">
             <el-form :inline="true" :model="formInline2" class="demo-form-inline2" label-width="68px">
               <el-form-item label="姓名">
                 <el-input v-model="formInline2.AAA01" clearable placeholder="请输入"></el-input>
@@ -357,7 +357,7 @@ export default {
   .info-search {
     margin-top: 20px;
     .demo-form-inline {
-      width: 1120px;
+      width: 1124px;
       margin: 0 auto;
       position: relative;
       .more-btn {

src/views/search/index.vue

@@ -264,7 +264,7 @@
             <div v-if="item.patient_info">
               <el-descriptions title="患者信息">
                 <el-descriptions-item label="住院号码" v-if="item.patient_info.AAA28">
-                  <span v-html="item.patient_info.AAA28" @click="funGoto(item.patient_info.MED_REC_ID ? item.patient_info.MED_REC_ID : item.patient_info.ZYH)" style="cursor: pointer;"></span>
+                  <span v-html="item.patient_info.AAA28" @click="funGoto(item.patient_info.MED_REC_ID ? item.patient_info.MED_REC_ID : item.patient_info.ZYH)" class="yeleou"></span>
                 </el-descriptions-item>
                 <el-descriptions-item label="出院科室" v-if="item.patient_info.AAC11N">
                   <span v-html="item.patient_info.AAC11N"></span>
@@ -1073,6 +1073,7 @@ export default {
   font-size: 16px;
   color: rgb(233, 157, 66);
   cursor: pointer;
+  font-weight: 600;
 }
 .conter-num {
   font-size: 15px;