修改bug

src/styles/index.scss

@@ -63,3 +63,25 @@ div:focus {
 .app-container {
   padding: 20px;
 }
+.bottom-time-top {
+  margin-top: 30px;
+}
+.bottom-time-botom {
+  margin-bottom: 30px;
+}
+.bottom-time {
+  width: 100%;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  margin-bottom: 10px;
+  .bottom-time-bold {
+    font-weight: bold;
+  }
+  .bottom-time-list {
+    width: 50%;
+  }
+  .bottom-time-listw {
+    width: 100%;
+  }
+}

src/views/allcase/components/ShouShuRecord1.vue

@@ -55,7 +55,7 @@
             （污染手术）
           </td>
           <td class="table-value text_left pd16" colspan="4">
-           {{ data.ssqk[2].desc }}
+            {{ data.ssqk[2].desc }}
           </td>
           <td class="table-value">{{ data.ssqk[2].jk }}</td>
         </tr>
@@ -178,6 +178,28 @@
         </tr>
       </table>
     </div>
+    <div class="bottom-time bottom-time-top">
+      <div class="bottom-time-list">
+        <span class="bottom-time-bold">医生签名:</span>
+        <span>{{ data.doctor_name }}</span>
+      </div>
+    </div>
+    <div class="bottom-time bottom-time-top">
+      <div class="bottom-time-list" v-if="data.CJSJ">
+        <span class="bottom-time-bold">创建时间:</span>
+        <span>{{ data.CJSJ }}</span>
+      </div>
+      <div class="bottom-time-list" v-if="data.ZXSJ">
+        <span class="bottom-time-bold">修改时间:</span>
+        <span>{{ data.ZXSJ }}</span>
+      </div>
+    </div>
+    <div class="bottom-time bottom-time-botom" v-if="data.WCSJ">
+      <div class="bottom-time-list">
+        <span class="bottom-time-bold">完成时间:</span>
+        <span>{{ data.WCSJ }}</span>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -255,4 +277,4 @@ table {
     text-align: center;
   }
 }
-</style>
+</style>

src/views/allcase/components/ShouShuRecord2.vue

@@ -31,7 +31,7 @@
           <td class="table-label">手术方式</td>
           <td class="table-value" colspan="3">{{ data.ssfs }}</td>
         </tr>
-        
+
         <tr>
           <td class="table-label" colspan="3">麻醉实施前</td>
           <td class="table-label" colspan="3">手术开始前</td>
@@ -40,22 +40,70 @@
 
         <tr>
           <td class="table-value" colspan="3">
-            <div>患者姓名、性别、年龄正确：<span class="ml40">{{ data.mzssq.xm_sex_age }}</span></div>
-            <div>手术方式确认：<span class="ml40">{{ data.mzssq.ssfsqr }}</span></div>
-            <div>手术部位与标识正确：<span class="ml40">{{ data.mzssq.ssbwybsqr }}</span></div>
-            <div>手术知情同意：<span class="ml40">{{ data.mzssq.sszqty }}</span></div>
-            <div>麻醉知情同意：<span class="ml40">{{ data.mzssq.mzzqty }}</span></div>
-            <div>麻醉方式确认：<span class="ml40">{{ data.mzssq.mzfsqr }}</span></div>
-            <div>麻醉设备安全检查完成：<span class="ml40">{{ data.mzssq.mzsbaqjc }}</span></div>
-            <div>皮肤是否完整：<span class="ml40">{{ data.mzssq.pfsfwz }}</span></div>
-            <div>术野皮肤准备正确：<span class="ml40">{{ data.mzssq.sypfzbzq }}</span></div>
-            <div>静脉通道建立完成：<span class="ml40">{{ data.mzssq.jmtdjlwc }}</span></div>
-            <div>患者是否有过敏史：<span class="ml40">{{ data.mzssq.hzsfygms }}</span></div>
-            <div>抗菌药物皮试结果：<span class="ml40">{{ data.mzssq.kjywpsjg }}</span></div>
-            <div>术前备血：<span class="ml40">{{ data.mzssq.sqbx }}</span></div>
-            <div>假体：<span class="ml40">{{ data.mzssq.jt }}</span></div>
-            <div>体内植入物：<span class="ml40">{{ data.mzssq.tnzrw }}</span></div>
-            <div class="mb20">影像学资料：<span class="ml40">{{ data.mzssq.yxxzl }}</span></div>
+            <div>
+              患者姓名、性别、年龄正确：
+              <span class="ml40">{{ data.mzssq.xm_sex_age }}</span>
+            </div>
+            <div>
+              手术方式确认：
+              <span class="ml40">{{ data.mzssq.ssfsqr }}</span>
+            </div>
+            <div>
+              手术部位与标识正确：
+              <span class="ml40">{{ data.mzssq.ssbwybsqr }}</span>
+            </div>
+            <div>
+              手术知情同意：
+              <span class="ml40">{{ data.mzssq.sszqty }}</span>
+            </div>
+            <div>
+              麻醉知情同意：
+              <span class="ml40">{{ data.mzssq.mzzqty }}</span>
+            </div>
+            <div>
+              麻醉方式确认：
+              <span class="ml40">{{ data.mzssq.mzfsqr }}</span>
+            </div>
+            <div>
+              麻醉设备安全检查完成：
+              <span class="ml40">{{ data.mzssq.mzsbaqjc }}</span>
+            </div>
+            <div>
+              皮肤是否完整：
+              <span class="ml40">{{ data.mzssq.pfsfwz }}</span>
+            </div>
+            <div>
+              术野皮肤准备正确：
+              <span class="ml40">{{ data.mzssq.sypfzbzq }}</span>
+            </div>
+            <div>
+              静脉通道建立完成：
+              <span class="ml40">{{ data.mzssq.jmtdjlwc }}</span>
+            </div>
+            <div>
+              患者是否有过敏史：
+              <span class="ml40">{{ data.mzssq.hzsfygms }}</span>
+            </div>
+            <div>
+              抗菌药物皮试结果：
+              <span class="ml40">{{ data.mzssq.kjywpsjg }}</span>
+            </div>
+            <div>
+              术前备血：
+              <span class="ml40">{{ data.mzssq.sqbx }}</span>
+            </div>
+            <div>
+              假体：
+              <span class="ml40">{{ data.mzssq.jt }}</span>
+            </div>
+            <div>
+              体内植入物：
+              <span class="ml40">{{ data.mzssq.tnzrw }}</span>
+            </div>
+            <div class="mb20">
+              影像学资料：
+              <span class="ml40">{{ data.mzssq.yxxzl }}</span>
+            </div>
             <div></div>
             <div></div>
             <div></div>
@@ -65,49 +113,148 @@
             <div>其他：</div>
           </td>
           <td class="table-value" colspan="3">
-            <div>患者姓名、性别、年龄正确：<span class="ml40">{{ data.ssksq.xm_sex_age }}</span></div>
-            <div>手术方式确认：<span class="ml40">{{ data.ssksq.ssfsqr }}</span></div>
-            <div>手术部位与标识确认：<span class="ml40">{{ data.ssksq.ssbwybsqr }}</span></div>
+            <div>
+              患者姓名、性别、年龄正确：
+              <span class="ml40">{{ data.ssksq.xm_sex_age }}</span>
+            </div>
+            <div>
+              手术方式确认：
+              <span class="ml40">{{ data.ssksq.ssfsqr }}</span>
+            </div>
+            <div>
+              手术部位与标识确认：
+              <span class="ml40">{{ data.ssksq.ssbwybsqr }}</span>
+            </div>
             <div>手术、麻醉风险预警：</div>
             <div>手术医师陈述：</div>
-            <div class="text_indent50">预计手术时间<span class="ml40">{{ data.ssksq.ssyscs.yjsssj }}</span></div>
-            <div class="text_indent50">预计失血量<span class="ml40">{{ data.ssksq.ssyscs.yjsxy }}</span></div>
-            <div class="text_indent50">手术关注点<span class="ml40">{{ data.ssksq.ssyscs.ssgzd }}</span></div>
-            <div class="text_indent50">其它<span class="ml40">{{ data.ssksq.ssyscs.qt }}</span></div>
+            <div class="text_indent50">
+              预计手术时间
+              <span class="ml40">{{ data.ssksq.ssyscs.yjsssj }}</span>
+            </div>
+            <div class="text_indent50">
+              预计失血量
+              <span class="ml40">{{ data.ssksq.ssyscs.yjsxy }}</span>
+            </div>
+            <div class="text_indent50">
+              手术关注点
+              <span class="ml40">{{ data.ssksq.ssyscs.ssgzd }}</span>
+            </div>
+            <div class="text_indent50">
+              其它
+              <span class="ml40">{{ data.ssksq.ssyscs.qt }}</span>
+            </div>
             <div>麻醉医师陈述：</div>
-            <div class="text_indent50">麻醉关注点<span class="ml40">{{ data.ssksq.mzyscs.mzgzd }}</span></div>
-            <div class="text_indent50">其它<span class="ml40">{{ data.ssksq.mzyscs.qt }}</span></div>
+            <div class="text_indent50">
+              麻醉关注点
+              <span class="ml40">{{ data.ssksq.mzyscs.mzgzd }}</span>
+            </div>
+            <div class="text_indent50">
+              其它
+              <span class="ml40">{{ data.ssksq.mzyscs.qt }}</span>
+            </div>
             <div>手术护士陈述：</div>
-            <div class="text_indent50">物品灭菌合格<span class="ml40">{{ data.ssksq.sshscs.wpmjhg }}</span></div>
-            <div class="text_indent50">仪器设备<span class="ml40">{{ data.ssksq.sshscs.yqsb }}</span></div>
-            <div class="text_indent50">术前术中特殊用药情况<span class="ml40">{{ data.ssksq.sshscs.sqsztsyyqk }}</span></div>
-            <div class="text_indent50">其它<span class="ml40">{{ data.ssksq.sshscs.qt }}</span></div>
-            <div class="mb20">是否需要相关影像资料：<span class="ml40">{{ data.ssksq.xgyxzl }}</span></div>
+            <div class="text_indent50">
+              物品灭菌合格
+              <span class="ml40">{{ data.ssksq.sshscs.wpmjhg }}</span>
+            </div>
+            <div class="text_indent50">
+              仪器设备
+              <span class="ml40">{{ data.ssksq.sshscs.yqsb }}</span>
+            </div>
+            <div class="text_indent50">
+              术前术中特殊用药情况
+              <span class="ml40">{{ data.ssksq.sshscs.sqsztsyyqk }}</span>
+            </div>
+            <div class="text_indent50">
+              其它
+              <span class="ml40">{{ data.ssksq.sshscs.qt }}</span>
+            </div>
+            <div class="mb20">
+              是否需要相关影像资料：
+              <span class="ml40">{{ data.ssksq.xgyxzl }}</span>
+            </div>
             <div></div>
             <div></div>
-            <div>其他：<span class="ml40">{{ data.ssksq.qt }}</span></div>
+            <div>
+              其他：
+              <span class="ml40">{{ data.ssksq.qt }}</span>
+            </div>
           </td>
           <td class="table-value" colspan="3">
-            <div>患者姓名、性别、年龄正确：<span class="ml40">{{ data.hzlkssq.xm_sex_age }}</span></div>
-            <div>实际手术方式确认：<span class="ml40">{{ data.hzlkssq.sjssfsqr }}</span></div>
-            <div>手术用物清点正确：<span class="ml40">{{ data.hzlkssq.ssywqd }}</span></div>
-            <div>手术标本确认：<span class="ml40">{{ data.hzlkssq.ssbb }}</span></div>
-            <div>皮肤是否完整：<span class="ml40">{{ data.hzlkssq.pfsfwz }}</span></div>
+            <div>
+              患者姓名、性别、年龄正确：
+              <span class="ml40">{{ data.hzlkssq.xm_sex_age }}</span>
+            </div>
+            <div>
+              实际手术方式确认：
+              <span class="ml40">{{ data.hzlkssq.sjssfsqr }}</span>
+            </div>
+            <div>
+              手术用物清点正确：
+              <span class="ml40">{{ data.hzlkssq.ssywqd }}</span>
+            </div>
+            <div>
+              手术标本确认：
+              <span class="ml40">{{ data.hzlkssq.ssbb }}</span>
+            </div>
+            <div>
+              皮肤是否完整：
+              <span class="ml40">{{ data.hzlkssq.pfsfwz }}</span>
+            </div>
             <div>各种管路：</div>
-            <div class="text_indent50">中心静脉通路<span class="ml40">{{ data.hzlkssq.gzgl.zxjmtl }}</span></div>
-            <div class="text_indent50">动脉通路<span class="ml40">{{ data.hzlkssq.gzgl.dmtl }}</span></div>
-            <div class="text_indent50">气管插管<span class="ml40">{{ data.hzlkssq.gzgl.qgcg }}</span></div>
-            <div class="text_indent50">伤口引流<span class="ml40">{{ data.hzlkssq.gzgl.skyl }}</span></div>
-            <div class="text_indent50">胃管<span class="ml40">{{ data.hzlkssq.gzgl.wg }}</span></div>
-            <div class="text_indent50">尿管<span class="ml40">{{ data.hzlkssq.gzgl.ng }}</span></div>
-            <div class="text_indent50">其他<span class="ml40">{{ data.hzlkssq.gzgl.qt }}</span></div>
+            <div class="text_indent50">
+              中心静脉通路
+              <span class="ml40">{{ data.hzlkssq.gzgl.zxjmtl }}</span>
+            </div>
+            <div class="text_indent50">
+              动脉通路
+              <span class="ml40">{{ data.hzlkssq.gzgl.dmtl }}</span>
+            </div>
+            <div class="text_indent50">
+              气管插管
+              <span class="ml40">{{ data.hzlkssq.gzgl.qgcg }}</span>
+            </div>
+            <div class="text_indent50">
+              伤口引流
+              <span class="ml40">{{ data.hzlkssq.gzgl.skyl }}</span>
+            </div>
+            <div class="text_indent50">
+              胃管
+              <span class="ml40">{{ data.hzlkssq.gzgl.wg }}</span>
+            </div>
+            <div class="text_indent50">
+              尿管
+              <span class="ml40">{{ data.hzlkssq.gzgl.ng }}</span>
+            </div>
+            <div class="text_indent50">
+              其他
+              <span class="ml40">{{ data.hzlkssq.gzgl.qt }}</span>
+            </div>
             <div>患者去向：</div>
-            <div class="text_indent50">恢复室<span class="ml40">{{ data.hzlkssq.hzqx.hfs }}</span></div>
-            <div class="text_indent50">病房<span class="ml40">{{ data.hzlkssq.hzqx.bf }}</span></div>
-            <div class="text_indent50">ICU 病房<span class="ml40">{{ data.hzlkssq.hzqx.icubf }}</span></div>
-            <div class="text_indent50">急诊<span class="ml40">{{ data.hzlkssq.hzqx.jz }}</span></div>
-            <div class="text_indent50 mb20">离院<span class="ml40">{{ data.hzlkssq.hzqx.ly }}</span></div>
-            <div>其他：<span class="ml40">{{ data.hzlkssq.qt }}</span></div>
+            <div class="text_indent50">
+              恢复室
+              <span class="ml40">{{ data.hzlkssq.hzqx.hfs }}</span>
+            </div>
+            <div class="text_indent50">
+              病房
+              <span class="ml40">{{ data.hzlkssq.hzqx.bf }}</span>
+            </div>
+            <div class="text_indent50">
+              ICU 病房
+              <span class="ml40">{{ data.hzlkssq.hzqx.icubf }}</span>
+            </div>
+            <div class="text_indent50">
+              急诊
+              <span class="ml40">{{ data.hzlkssq.hzqx.jz }}</span>
+            </div>
+            <div class="text_indent50 mb20">
+              离院
+              <span class="ml40">{{ data.hzlkssq.hzqx.ly }}</span>
+            </div>
+            <div>
+              其他：
+              <span class="ml40">{{ data.hzlkssq.qt }}</span>
+            </div>
           </td>
         </tr>
         <tr>
@@ -120,6 +267,28 @@
         </tr>
       </table>
     </div>
+    <div class="bottom-time bottom-time-top">
+      <div class="bottom-time-list">
+        <span class="bottom-time-bold">医生签名:</span>
+        <span>{{ data.doctor_name }}</span>
+      </div>
+    </div>
+    <div class="bottom-time bottom-time-top">
+      <div class="bottom-time-list" v-if="data.CJSJ">
+        <span class="bottom-time-bold">创建时间:</span>
+        <span>{{ data.CJSJ }}</span>
+      </div>
+      <div class="bottom-time-list" v-if="data.ZXSJ">
+        <span class="bottom-time-bold">修改时间:</span>
+        <span>{{ data.ZXSJ }}</span>
+      </div>
+    </div>
+    <div class="bottom-time bottom-time-botom" v-if="data.WCSJ">
+      <div class="bottom-time-list">
+        <span class="bottom-time-bold">完成时间:</span>
+        <span>{{ data.WCSJ }}</span>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -207,4 +376,4 @@ table {
     }
   }
 }
-</style>
+</style>

src/views/allcase/components/ShouShuRecord4.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="box">
     <div class="title">
-      {{ data.hospital }}<br>
+      {{ data.hospital }}
+      <br />
       手术记录
     </div>
     <div class="info-header mb40">
@@ -60,7 +61,7 @@
           <td class="table-label">助手</td>
           <td class="table-value">{{ data.zs }}</td>
         </tr>
-        <tr style="min-height: 300px;">
+        <tr style="min-height: 300px">
           <td class="table-label">手术经过、术中出现的情况及处理</td>
           <td class="table-value" colspan="5">
             <div class="pd16 text_left minH200">{{ data.describe }}</div>
@@ -74,6 +75,28 @@
         </tr>
       </table>
     </div>
+    <div class="bottom-time bottom-time-top">
+      <div class="bottom-time-list">
+        <span class="bottom-time-bold">医生签名:</span>
+        <span>{{ data.doctor_name }}</span>
+      </div>
+    </div>
+    <div class="bottom-time bottom-time-top">
+      <div class="bottom-time-list" v-if="data.CJSJ">
+        <span class="bottom-time-bold">创建时间:</span>
+        <span>{{ data.CJSJ }}</span>
+      </div>
+      <div class="bottom-time-list" v-if="data.ZXSJ">
+        <span class="bottom-time-bold">修改时间:</span>
+        <span>{{ data.ZXSJ }}</span>
+      </div>
+    </div>
+    <div class="bottom-time bottom-time-botom" v-if="data.WCSJ">
+      <div class="bottom-time-list">
+        <span class="bottom-time-bold">完成时间:</span>
+        <span>{{ data.WCSJ }}</span>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -83,10 +106,10 @@ export default {
     data: {
       type: Object,
       default() {
-        return {}
-      }
-    }
-  }
+        return {};
+      },
+    },
+  },
 };
 </script>
 
@@ -121,7 +144,7 @@ export default {
     text-align: left;
   }
   .minH200 {
-    min-height: 200px;;
+    min-height: 200px;
   }
 }
 
@@ -151,4 +174,4 @@ table {
     text-align: center;
   }
 }
-</style>
+</style>

src/views/allcase/contFile/medicalTemporary.vue

@@ -1,4 +1,3 @@
-
 <template>
   <div id="MyDiv">
     <div class="cont-left">
@@ -6,26 +5,44 @@
       <div class="cont-title-item">临时医嘱单</div>
       <div></div>
       <div class="cont-title-name">
-            <div class="cont-title-item"><span class="cont-title-text">姓名:</span><span class="cont-title-normal" v-if="dataObj.info">{{dataObj.info.AAA01}}</span></div>
-            <div class="cont-title-item"><span class="cont-title-text">性别:</span><span class="cont-title-normal" v-if="dataObj.info">{{dataObj.info.AAA02C}}</span></div>
-            <div  class="cont-title-item"><span class="cont-title-text">年龄:</span><span class="cont-title-normal" v-if="dataObj.info">{{dataObj.info.AAA04}}</span></div>
-            <div  class="cont-title-item"><span class="cont-title-text cont-title-twidt">科别:</span><span class="cont-title-normal" v-if="dataObj.info">{{dataObj.info.AAB02C}}</span></div>
-            <div  class="cont-title-item"><span class="cont-title-text">床号:</span><span class="cont-title-normal"></span></div>
-            <div  class="cont-title-item"><span class="cont-title-text">住院号:</span><span class="cont-title-normal" v-if="dataObj.info">{{dataObj.info.AAA28}}</span></div>
+        <div class="cont-title-item">
+          <span class="cont-title-text">姓名:</span>
+          <span class="cont-title-normal" v-if="dataObj.info">{{ dataObj.info.AAA01 }}</span>
+        </div>
+        <div class="cont-title-item">
+          <span class="cont-title-text">性别:</span>
+          <span class="cont-title-normal" v-if="dataObj.info">{{ dataObj.info.AAA02C }}</span>
+        </div>
+        <div class="cont-title-item">
+          <span class="cont-title-text">年龄:</span>
+          <span class="cont-title-normal" v-if="dataObj.info">{{ dataObj.info.AAA04 }}</span>
+        </div>
+        <div class="cont-title-item">
+          <span class="cont-title-text cont-title-twidt">科别:</span>
+          <span class="cont-title-normal" v-if="dataObj.info">{{ dataObj.info.AAB02C }}</span>
+        </div>
+        <div class="cont-title-item">
+          <span class="cont-title-text">床号:</span>
+          <span class="cont-title-normal"></span>
         </div>
+        <div class="cont-title-item">
+          <span class="cont-title-text">住院号:</span>
+          <span class="cont-title-normal" v-if="dataObj.info">{{ dataObj.info.AAA28 }}</span>
+        </div>
+      </div>
       <div class="table">
         <table ref="tables">
-          <tr style="height:10px;">
-              <td style="height:10px;" class="table-value m-all" colspan="1"></td>
-              <td style="height:10px;" class="table-value m-all" colspan="1"></td>
-              <td style="height:10px;" class="table-value m-all" colspan="1"></td>
-              <td style="height:10px;" class="table-value m-all" colspan="1"></td>
-              <td style="height:10px;" class="table-value m-all" colspan="1"></td>
-              <td style="height:10px;" class="table-value m-all" colspan="1"></td>
-              <td style="height:10px;" class="table-value m-all" colspan="1"></td>
-              <td style="height:10px;" class="table-value m-all" colspan="1"></td>
-              <td style="height:10px;" class="table-value m-all" colspan="1"></td>
-              <td style="height:10px;" class="table-value m-all" colspan="1"></td>
+          <tr style="height: 10px">
+            <td style="height: 10px" class="table-value m-all" colspan="1"></td>
+            <td style="height: 10px" class="table-value m-all" colspan="1"></td>
+            <td style="height: 10px" class="table-value m-all" colspan="1"></td>
+            <td style="height: 10px" class="table-value m-all" colspan="1"></td>
+            <td style="height: 10px" class="table-value m-all" colspan="1"></td>
+            <td style="height: 10px" class="table-value m-all" colspan="1"></td>
+            <td style="height: 10px" class="table-value m-all" colspan="1"></td>
+            <td style="height: 10px" class="table-value m-all" colspan="1"></td>
+            <td style="height: 10px" class="table-value m-all" colspan="1"></td>
+            <td style="height: 10px" class="table-value m-all" colspan="1"></td>
           </tr>
 
           <tr>
@@ -38,15 +55,15 @@
             <td class="table-label medical-font" colspan="1">护士签名</td>
             <td class="table-label medical-font" colspan="1">执行时间</td>
           </tr>
-          <tr v-for="(item,index) in dataObj.list" :key="index">
-            <td class="table-value" colspan="1">{{item.DATE}}</td>
-            <td class="table-value" colspan="1">{{item.TIME}}</td>
-            <td class="table-value" colspan="3">{{item.YZMC}}</td>
-            <td class="table-value" colspan="1">{{item.YCJL}}</td>
-            <td class="table-value" colspan="1">{{item.SYPC}}</td>
-            <td class="table-value" colspan="1">{{item.KZYS}}</td>
-            <td class="table-value" colspan="1">{{item.XZJDGH}}</td>
-            <td class="table-value" colspan="1">{{item.XZJDSJ}}</td>
+          <tr v-for="(item, index) in dataObj.list" :key="index">
+            <td class="table-value" colspan="1">{{ item.DATE }}</td>
+            <td class="table-value" colspan="1">{{ item.TIME }}</td>
+            <td class="table-value" colspan="3">{{ item.YZMC }}</td>
+            <td class="table-value" colspan="1">{{ item.YCJL }}</td>
+            <td class="table-value" colspan="1">{{ item.SYPC }}</td>
+            <td class="table-value" colspan="1">{{ item.KZYS }}</td>
+            <td class="table-value" colspan="1">{{ item.XZJDGH }}</td>
+            <td class="table-value" colspan="1">{{ item.XZJDSJ }}</td>
           </tr>
           <tr>
             <td class="table-value" colspan="1"></td>
@@ -90,10 +107,26 @@
           </tr>
         </table>
       </div>
+      <div class="bottom-time bottom-time-top">
+        <div class="bottom-time-list" v-if="dataObj.info.HCRQ">
+          <span class="bottom-time-bold">护士分床时间:</span>
+          <span>{{ dataObj.info.HCRQ }}</span>
+        </div>
+        <div class="bottom-time-list" v-if="dataObj.info.AAC01">
+          <span class="bottom-time-bold">出院时间:</span>
+          <span>{{ dataObj.info.AAC01 }}</span>
+        </div>
+      </div>
+      <div class="bottom-time bottom-time-botom" v-if="dataObj.info.SWSJ">
+        <div class="bottom-time-list">
+          <span class="bottom-time-bold">死亡时间:</span>
+          <span>{{ dataObj.info.SWSJ }}</span>
+        </div>
+      </div>
     </div>
   </div>
 </template>
-        <script>
+<script>
 // import OtherComponent from '@/components/OtherComponent'
 export default {
   name: 'medicalTemporary',
@@ -106,9 +139,9 @@ export default {
   mixins: {},
   props: {
     dataObj: {
-        type: Object,
-        default:null
-    }
+      type: Object,
+      default: null,
+    },
   },
   data() {
     return {
@@ -156,7 +189,7 @@ export default {
   methods: {},
 };
 </script>
-        <style lang='scss' scoped>
+<style lang="scss" scoped>
 #MyDiv {
   // padding:0 15px;
   margin: 0 15px;
@@ -186,29 +219,29 @@ export default {
   background: #ffffff;
   // border: 1px solid #e2e2e2;
   padding: 10px;
-  .cont-title-name{
-      width: 100%;
-      height: 50px;
+  .cont-title-name {
+    width: 100%;
+    height: 50px;
+    display: flex;
+    // align-items: flex-end;
+    justify-content: space-between;
+    .cont-title-item {
+      flex: 1;
+      text-align: left;
       display: flex;
-      // align-items: flex-end;
-      justify-content: space-between;
-      .cont-title-item{
-        flex: 1;
-        text-align: left;
-        display: flex;
-        justify-content: left;
-      }
-      .cont-title-text{
-        font-weight: bold;
-      }
-      .cont-title-twidt{
-        width: 35px;
-      }
-      .cont-title-normal{
-        font-weight: normal;
-        margin-left: 5px;
-      }
+      justify-content: left;
+    }
+    .cont-title-text {
+      font-weight: bold;
+    }
+    .cont-title-twidt {
+      width: 35px;
     }
+    .cont-title-normal {
+      font-weight: normal;
+      margin-left: 5px;
+    }
+  }
 }
 .cont-title-description {
   margin: 20px;
@@ -255,7 +288,7 @@ table {
 .m-right {
   border-right: none;
 }
-.medical-font{
-    font-weight: bold;
-  }
+.medical-font {
+  font-weight: bold;
+}
 </style>

src/views/allcase/report/checkout.vue

@@ -4,21 +4,8 @@
     <div class="checkout-cont" v-for="(dataObj, index) in dataObjArr" :key="index">
       <div class="cont-title-description">滨州医学院烟台附属医院检验报告单</div>
       <div class="examType">{{ dataObj.ExamType }}</div>
-      <div class="checkout-cont-header">
-        <div>
-          <span class="cont-textbold">住院</span>
-        </div>
-      </div>
-      <div class="checkout-cont-mark">
-        <div class="checkout-cont-mark-mint">
-          <span class="checkout-cont-mark-title">条形码:</span>
-          <span class="checkout-cont-mark-item">{{ dataObj.TXM }}</span>
-        </div>
-        <div class="checkout-cont-mark-mint">
-          <span class="checkout-cont-mark-title">No:</span>
-          <span class="checkout-cont-mark-item">{{ dataObj.NO }}</span>
-        </div>
-      </div>
+      <div class="checkout-cont-header"></div>
+
       <div class="checkout-cont-infortop">
         <div class="checkout-cont-infor-title cont-textbold">姓名:</div>
         <div class="checkout-cont-infor-list">
@@ -26,37 +13,47 @@
         </div>
         <div class="checkout-cont-infor-title cont-textbold">性别:</div>
         <div class="checkout-cont-infor-list">
-          <span>{{ dataObj.BRXB == 1 ? '男' : '女' }}</span>
+          <span>{{ dataObj.XB }}</span>
         </div>
         <div class="checkout-cont-infor-title cont-textbold">年龄:</div>
         <div class="checkout-cont-infor-list">
-          <span>{{ dataObj.NL }}</span>
+          <span>{{ dataObj.Nl }}</span>
         </div>
-        <div class="checkout-cont-infor-title cont-textbold">床号:</div>
+        <div class="checkout-cont-infor-title cont-textbold">病区:</div>
         <div class="checkout-cont-infor-list">
-          <span>{{ dataObj.CH }}</span>
+          <span>{{ dataObj.BQ }}</span>
         </div>
-        <div class="checkout-cont-infor-title cont-textbold">样本类型:</div>
+        <div class="checkout-cont-infor-title cont-textbold">住院号:</div>
         <div class="checkout-cont-infor-list">
-          <span>{{ dataObj.YBLX }}</span>
+          <span>{{ dataObj.AAA28 }}</span>
         </div>
-        <div class="checkout-cont-infor-title cont-textbold">样本状态:</div>
+      </div>
+      <div class="checkout-cont-infortop checkout-cont-inforbotm">
+        <div class="checkout-cont-infor-title cont-textbold">采集时间:</div>
         <div class="checkout-cont-infor-list">
-          <span>{{ dataObj.YBZT }}</span>
+          <span>{{ dataObj.cjsj }}</span>
+        </div>
+        <div class="checkout-cont-infor-title cont-textbold">接收时间:</div>
+        <div class="checkout-cont-infor-list">
+          <span>{{ dataObj.jssj }}</span>
+        </div>
+        <div class="checkout-cont-infor-title cont-textbold">审查目的:</div>
+        <div class="checkout-cont-infor-list">
+          <span></span>
         </div>
       </div>
       <div class="checkout-cont-infortop checkout-cont-inforbotm">
-        <div class="checkout-cont-infor-title cont-textbold">住院号:</div>
+        <div class="checkout-cont-infor-title cont-textbold">样本类型:</div>
         <div class="checkout-cont-infor-list">
-          <span>{{ dataObj.ZYH }}</span>
+          <span>{{ dataObj.YBLX }}</span>
         </div>
-        <div class="checkout-cont-infor-title cont-textbold">病区:</div>
+        <div class="checkout-cont-infor-title cont-textbold">编号:</div>
         <div class="checkout-cont-infor-list">
-          <span>{{ dataObj.BQ }}</span>
+          <span>{{ dataObj.NO }}</span>
         </div>
-        <div class="checkout-cont-infor-title cont-textbold">临床诊断:</div>
+        <div class="checkout-cont-infor-title cont-textbold">申请人:</div>
         <div class="checkout-cont-infor-list">
-          <span>{{ dataObj.LCZD }}</span>
+          <span>{{ dataObj.sjys }}</span>
         </div>
       </div>
 
@@ -81,17 +78,19 @@
       </div>
       <div class="checkout-cont-info" v-if="dataObj.template_type == 2">
         <div class="checkout-cont-chief checkout-cont-mg20">
-          <div class="checkout-cont-chief-item checkout-cont-chief-bole">英文</div>
-          <div class="checkout-cont-chief-item checkout-cont-chief-bole">检验项目</div>
-          <div class="checkout-cont-chief-item checkout-cont-chief-bole">结果</div>
-          <div class="checkout-cont-chief-item checkout-cont-chief-bole">提示</div>
+          <div class="checkout-cont-chief-item checkout-cont-chief-bole checkout-cont-tc">序号</div>
+          <div class="checkout-cont-chief-item checkout-cont-chief-bole">中文名称</div>
+          <div class="checkout-cont-chief-item checkout-cont-chief-bole">英文名称</div>
+          <div class="checkout-cont-chief-item checkout-cont-chief-bole">检验结果</div>
+          <div class="checkout-cont-chief-item checkout-cont-chief-bole">异常结果提示</div>
           <div class="checkout-cont-chief-item checkout-cont-chief-bole">参考范围</div>
           <div class="checkout-cont-chief-item checkout-cont-chief-bole">单位</div>
         </div>
         <div class="checkout-cont-chief checkout-cont-mg20" v-for="(jitem, index) in dataObj.JCXM" :key="index">
+          <div class="checkout-cont-chief-item checkout-cont-tc">{{ index }}</div>
+          <div class="checkout-cont-chief-item">{{ jitem.JYXM }}</div>
           <div class="checkout-cont-chief-item">{{ jitem.YW }}</div>
-          <div class="checkout-cont-chief-item">{{ jitem.YMMC }}</div>
-          <div class="checkout-cont-chief-item">{{ jitem.YMJG }}</div>
+          <div class="checkout-cont-chief-item">{{ jitem.JG }}</div>
           <div class="checkout-cont-chief-item">{{ jitem.TS }}</div>
           <div class="checkout-cont-chief-item">{{ jitem.CKFW }}</div>
           <div class="checkout-cont-chief-item">{{ jitem.DW }}</div>
@@ -99,30 +98,18 @@
       </div>
 
       <div class="checkout-cont-infor-line"></div>
-      <div class="checkout-cont-sign">
-        <span class="checkout-cont-sign-bolb">送检医师：</span>
-        <span class="checkout-cont-sign-cont">{{ dataObj.SJYS }}</span>
-        <span class="checkout-cont-sign-bolb">检 验 员：</span>
-        <span class="checkout-cont-sign-cont">{{ dataObj.JYY }}</span>
-        <span class="checkout-cont-sign-bolb">审 核 员：</span>
-        <span class="checkout-cont-sign-cont">{{ dataObj.SHY }}</span>
+      <div class="checkout-cont-zd">
+        <span class="checkout-cont-zd-title">临床诊断为</span>
       </div>
       <div class="checkout-cont-sign">
-        <span class="checkout-cont-sign-bolb">采集时间：</span>
-        <span class="checkout-cont-sign-cont">{{ dataObj.CJSJ }}</span>
-        <span class="checkout-cont-sign-bolb">接收时间：</span>
-        <span class="checkout-cont-sign-cont">{{ dataObj.JSSJ }}</span>
         <span class="checkout-cont-sign-bolb">报告时间：</span>
-        <span class="checkout-cont-sign-cont">{{ dataObj.BGSJ }}</span>
-      </div>
-      <div class="checkout-cont-sign">
-        <span class="checkout-cont-sign-bolb">开单时间：</span>
-        <span class="checkout-cont-sign-cont">{{ dataObj.KDSJ }}</span>
-        <span class="checkout-cont-sign-bolb">检查科室：</span>
-        <span class="checkout-cont-sign-cont">{{ dataObj.JCKSMC }}</span>
-        <span class="checkout-cont-sign-bolb"></span>
-        <span class="checkout-cont-sign-cont"></span>
+        <span class="checkout-cont-sign-cont">{{ dataObj.BJSJ }}</span>
+        <span class="checkout-cont-sign-bolb">检 验 者：</span>
+        <span class="checkout-cont-sign-cont">{{ dataObj.JYY }}</span>
+        <span class="checkout-cont-sign-bolb">审 核 者：</span>
+        <span class="checkout-cont-sign-cont">{{ dataObj.SHY }}</span>
       </div>
+
       <div class="checkout-cont-physique">
         <div class="checkout-cont-physique-text">
           注：此报告仅对送检标本负责，供医师参考。标*项目为质评合格项目。如有疑问请在48小时内反馈至检验科。地址：烟台市牟平区金埠大街717号滨州医学院烟台附属医院门诊部3楼检验科。电话：0535-4770362。
@@ -254,6 +241,15 @@ export default {
         }
       }
     }
+    .checkout-cont-zd {
+      width: 100%;
+      margin-bottom: 20px;
+      text-align: left;
+      padding-left: 30px;
+      .checkout-cont-zd-title {
+        font-weight: bold;
+      }
+    }
     .checkout-cont-infortop {
       width: 100%;
       height: 30px;
@@ -296,6 +292,9 @@ export default {
         text-align: left;
         padding-right: 15px;
       }
+      .checkout-cont-tc {
+        text-align: center;
+      }
       .checkout-cont-chief-bole {
         font-weight: bold;
       }

src/views/allcase/reviewIndicators.vue

@@ -45,7 +45,7 @@
           <el-table :data="tableData" style="width: 100%">
             <el-table-column prop="name" label="名称" show-overflow-tooltip></el-table-column>
             <el-table-column prop="time" label="日期" width="200"></el-table-column>
-            <el-table-column prop="res" label="数据" width="200">
+            <el-table-column prop="denominator" label="数据" width="200">
               <template slot-scope="scope">
                 <span class="link" @click="toCaseIndexPage(scope.row)">{{ scope.row.numerator }}</span>
               </template>

src/views/allcase/reviewIndicatorsList.vue

@@ -239,14 +239,7 @@ export default {
     onExport() {
       const { time, type, ruleId, year } = this.$route.query;
       const { is_error, AAA28, AAC11N, order, order_sort } = this.searchData;
-      if (AAC11N == '' || AAC11N == null) {
-        messageOnce.error({
-          message: '请选择科室',
-          type: 'error',
-          duration: 5 * 1000,
-        });
-        return;
-      }
+
       const params = {
         dep_name: AAC11N,
         type: ruleId,

src/views/search/index.vue

@@ -511,6 +511,7 @@ export default {
     pageHasChanged() {
       const num = this.lock ? 1 : 0;
       this.funQuery(num);
+      console.log('点击了分页');
     },
     funBlur() {
       if (this.formData1.ageday > 356) {