视图端修改

.eslintrc.js

@@ -12,6 +12,7 @@ module.exports = {
   },
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'no-useless-escape': 'off',
   }
 }

src/filters/index.js

@@ -0,0 +1,28 @@
+import Vue from 'vue'
+Vue.filter('timeFormat', function (date, fmt) {
+  if (!date) {
+    return '';
+  }
+  var dateArr = date.split(/[- : \/]/);
+  date = new Date(dateArr[0], dateArr[1] - 1, dateArr[2], dateArr[3], dateArr[4], dateArr[5]);
+  if (/(y+)/.test(fmt)) {
+    fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+  }
+  let o = {
+    'M+': date.getMonth() + 1,
+    'd+': date.getDate(),
+    'H+': date.getHours(),
+    'm+': date.getMinutes(),
+    's+': date.getSeconds()
+  };
+  for (let k in o) {
+    if (new RegExp(`(${k})`).test(fmt)) {
+      let str = o[k] + '';
+      fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
+    }
+  }
+  function padLeftZero(str) {
+    return ('00' + str).substr(str.length);
+  }
+  return fmt;
+})

src/main.js

@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import App from './App.vue'
 import router from './router'
+import './filters'
 Vue.config.productionTip = false
 
 

src/views/AppIndex.vue

@@ -36,12 +36,12 @@
         </div>
         <div class="totalNum parent" v-if="currentNavIndex == 4">
           <div>
-            <div>
+            <!-- <div>
               今日重点关注患者人数：<span>{{ totalParentNum.parentNum }}</span>
-            </div>
-            <div>
+            </div> -->
+            <!-- <div>
               今日待检查数：<span>{{ totalParentNum.speNum }}</span>
-            </div>
+            </div> -->
           </div>
           <div>
             <div>
@@ -50,6 +50,9 @@
             <div>
               今日检查总数：<span>{{ totalParentNum.gdjczsNum }}</span>
             </div>
+            <div>
+              今日待检查数：<span>{{ totalParentNum.speNum }}</span>
+            </div>
           </div>
         </div>
         <div class="totalNum currentNavIndex3" v-if="currentNavIndex == 2">
@@ -109,7 +112,10 @@
             >
               <div class="main-box-item-header">
                 <h2>{{ item.deptName }}</h2>
-                <strong>{{ item.num }}</strong>
+                <span
+                  >产生<strong>{{ item.num }}</strong
+                  >&nbsp;&nbsp;已收<strong>{{ item.receivedNum }}</strong></span
+                >
                 <strong v-if="item.userName"
                   >{{ item.userName
                   }}<span v-if="item.phone" class="ksbb_phone"
@@ -123,11 +129,11 @@
                   :class="[item.urgent > 0 ? 'red' : 'green']"
                 >
                   <h3>{{ item.urgent }}</h3>
-                  <p>急标</p>
+                  <p>待收急标</p>
                 </div>
                 <div class="main-box-item-contentBox green">
                   <h3>{{ item.noUrgent }}</h3>
-                  <p>普标</p>
+                  <p>待收普标</p>
                 </div>
               </div>
             </div>
@@ -239,7 +245,8 @@
               <div class="cot sevenCol" v-for="data in online" :key="data.id">
                 <div class="header_on">
                   <span style="font-weight: bold">
-                    {{data.name}}<span v-if="data.phone">({{ data.phone }})</span>
+                    {{ data.name
+                    }}<span v-if="data.phone">({{ data.phone }})</span>
                   </span>
                   <span :style="{ color: data.online ? 'green' : 'red' }"
                     ><button
@@ -302,21 +309,32 @@
               :key="item.id"
               @click="detailSpe(item)"
             >
-              <div class="main-box-item-header pp">
+              <div class="main-box-item-header">
                 <h2 :title="item.name">{{ item.name }}</h2>
-                <div>{{ item.gdjczs }}</div>
-                <strong
-                  >{{ item.userName ? item.userName : ""
-                  }}<span>{{ item.phone ? item.phone : "" }}</span></strong
+                <span
+                  >已陪检数<strong>{{ item.gdjczs }}</strong></span
                 >
+                <strong v-if="item.userName"
+                  >{{ item.userName
+                  }}<span v-if="item.phone" class="ksbb_phone"
+                    >({{ item.phone }})</span
+                  >
+                </strong>
               </div>
-              <div class="main-box-item-content">
-                <div
+              <div
+                class="main-box-item-content"
+                style="padding-left:16px;padding-right:16px;"
+              >
+                <!-- <div
                   class="main-box-item-contentBox green"
                   @click.stop="detailParent(item)"
                 >
                   <h3>{{ item.patientnum }}</h3>
                   <p>重点关注患者人数</p>
+                </div> -->
+                <div class="main-box-item-contentBox green">
+                  <h3>{{ item.gdjczs }}</h3>
+                  <p>检查总数</p>
                 </div>
                 <div class="main-box-item-contentBox green">
                   <h3>{{ item.jczs }}</h3>
@@ -466,16 +484,11 @@
             <div class="operateTitle">
               标本详情
               <div class="operate checkbox">
-                <label>
-                  <input type="checkbox" value="332" v-model="speState" /><span
-                    >未收取</span
-                  >
-                </label>
-                <label>
-                  <input type="checkbox" value="333" v-model="speState" /><span
-                    >已收取</span
-                  >
-                </label>
+                <select v-model="speState">
+                  <option value="0">全部</option>
+                  <option value="332">未收取</option>
+                  <option value="333">已收取</option>
+                </select>
               </div>
             </div>
           </h2>
@@ -612,45 +625,38 @@
         :class="{ detailModel: detailSpeModel }"
         class="detailModelParent"
       >
-        <div class="box" style="width: 1274px">
+        <div class="box" style="width: 1306px">
           <h2 class="title">
             <div class="operateTitle">
               患者检查详情
-              <div class="operate radio">
-                <label>
-                  <span>所有检查</span
-                  ><input
-                    type="radio"
-                    value="666"
-                    v-model="inspectState"
-                  /><i></i>
-                </label>
+              <div class="operate checkbox" style="width:420px;">
+                <select v-model="inspectState">
+                  <option value="0">所有检查</option>
+                  <option value="1">已陪检</option>
+                  <option value="2">未陪检</option>
+                </select>
                 <label>
-                  <span>待检查</span
-                  ><input
-                    type="radio"
-                    value="307"
-                    v-model="inspectState"
-                  /><i></i>
+                  <input type="checkbox" v-model="seriouslyIll" />
+                  <span>一级、特级护理危重症患者</span>
                 </label>
               </div>
             </div>
           </h2>
-          <div class="table" style="width: 1234px">
-            <div class="table-content" style="width: 1170px">
+          <div class="table" style="width: 1266px">
+            <div class="table-content" style="width: 1202px">
               <table>
                 <thead>
                   <tr>
                     <th>序号</th>
-                    <th style="width: 150px !important">患者姓名(床号)</th>
-                    <th>检查项目</th>
+                    <th>患者姓名(床号)</th>
+                    <th><div style="width:150px;">检查项目</div></th>
                     <th>预约时间</th>
                     <th>叫号信息</th>
                     <th>检查科室</th>
-                    <th style="width: 70px !important">是否建单</th>
-                    <th style="width: 70px !important">是否送达</th>
-                    <th>送达时间</th>
-                    <th style="width: 70px !important">检查状态</th>
+                    <th>是否建单</th>
+                    <th>护理等级</th>
+                    <th>病情级别</th>
+                    <th>检查状态</th>
                     <th>陪检人</th>
                   </tr>
                 </thead>
@@ -666,7 +672,6 @@
                     >
                       <td>{{ i + 1 }}</td>
                       <td
-                        style="width: 150px !important"
                         :style="{
                           color: detail.focusPatient == 1 ? 'red' : '',
                         }"
@@ -674,20 +679,34 @@
                         {{ detail.patientName || "-" }}
                         <span v-if="detail.bedNum">({{ detail.bedNum }})</span>
                       </td>
-                      <td>{{ detail.inspectName || "-" }}</td>
-                      <td>{{ detail.yyTime || "-" }}</td>
+                      <td>
+                        <div
+                          :title="detail.inspectName || '-'"
+                          style="width:150px;text-overflow:ellipsis;overflow: hidden;white-space: nowrap;"
+                        >
+                          {{ detail.inspectName || "-" }}
+                        </div>
+                      </td>
+                      <td v-if="detail.yyTime">
+                        {{ detail.yyTime | timeFormat("HH:mm:ss") }}
+                      </td>
+                      <td v-if="!detail.yyTime">-</td>
                       <td>{{ detail.reservationNumber || "-" }}</td>
                       <td>
                         {{ detail.execDept ? detail.execDept.dept : "-" }}
                       </td>
-                      <td style="width: 70px !important">
+                      <td>
                         {{ detail.gdId ? "是" : "否" }}
                       </td>
-                      <td style="width: 70px !important">
-                        {{ detail.arriveTime ? "是" : "否" }}
+                      <td>
+                        {{ detail.careLevel ? detail.careLevel.name : "" }}
                       </td>
-                      <td>{{ detail.arriveTime || "-" }}</td>
-                      <td style="width: 70px !important">
+                      <td>
+                        {{
+                          detail.illnessState ? detail.illnessState.name : ""
+                        }}
+                      </td>
+                      <td>
                         {{
                           detail.inspectState ? detail.inspectState.name : "-"
                         }}
@@ -838,13 +857,15 @@ export default {
       // 1是综合排班，2是自选排班
       workType: 0,
       //科室标本的标本详情 332是未收取 333是已收取
-      speState: [],
+      speState: 0,
       //科室标本,当前选中的科室
       currentSpecimenDept: null,
-      //病房患者的标本详情 307是待检查
-      inspectState: "",
+      //病房患者的标本详情 1是已陪检，2是未陪检
+      inspectState: 0,
       //病房患者,当前选中的科室
       currentInspectDept: null,
+      //是否一级、特级护理危重症患者
+      seriouslyIll: false,
     };
   },
   watch: {
@@ -856,6 +877,10 @@ export default {
     inspectState() {
       this.getDetailByInspect(this.currentInspectDept);
     },
+    //病房患者的检查详情-复选框
+    seriouslyIll() {
+      this.getDetailByInspect(this.currentInspectDept);
+    },
   },
   methods: {
     // 搜索分组
@@ -975,9 +1000,10 @@ export default {
       console.log(item);
       clearTimeout(this.timer);
       clearTimeout(this.timer1);
-      this.speState = ["333", "332"];
+      this.speState = 0;
       this.currentSpecimenDept = item;
       this.detailModel = true;
+      this.getDetailBySpecimen(this.currentSpecimenDept);
     },
     // 获取标本详情(标本科室视图)
     getDetailBySpecimen(item) {
@@ -986,11 +1012,8 @@ export default {
         deptId: item.deptId,
         urgent: -1,
       };
-      if (this.speState.length === 1) {
-        postData.speState = this.speState.toString();
-      } else if (this.speState.length === 0) {
-        this.detailList = [];
-        return;
+      if (this.speState != 0) {
+        postData.speState = this.speState;
       }
       this.loading3 = true;
       post("/nurse/getListSpecimenDetails", postData).then((result) => {
@@ -1034,9 +1057,8 @@ export default {
       this.currentInspectDept = item;
       this.detailSpeModel = true;
       this.getDetailByInspect(this.currentInspectDept);
-      if (this.inspectState !== "666") {
-        this.inspectState = "666";
-      }
+      this.inspectState = 0;
+      this.seriouslyIll = false;
     },
     // 获取检查详情(病房患者视图)
     getDetailByInspect(item) {
@@ -1044,13 +1066,15 @@ export default {
         hosIds: this.$route.params.hosIds,
         deptId: item.id,
       };
-      if (this.inspectState) {
-        if (this.inspectState === "307") {
-          postData.inspectState = this.inspectState+',443';
-        }
-      } else {
-        this.detailSpeList = [];
-        return;
+      if (this.inspectState === "1") {
+        //已陪检
+        postData.inspectState = "already";
+      } else if (this.inspectState === "2") {
+        //未陪检
+        postData.inspectState = "didNot";
+      }
+      if (this.seriouslyIll) {
+        postData.seriouslyIll = 1;
       }
       this.loading8 = true;
       post("/nurse/getViewData/getInspect", postData).then((result) => {
@@ -1529,11 +1553,33 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
+  select {
+    box-sizing: border-box;
+    margin: 0;
+    padding: 4px 11px;
+    font-variant: tabular-nums;
+    list-style: none;
+    font-feature-settings: "tnum";
+    position: relative;
+    display: inline-block;
+    color: rgba(0, 0, 0, 0.65);
+    font-size: 14px;
+    line-height: 1.5;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #d9d9d9;
+    border-radius: 4px;
+    transition: all 0.3s;
+    width: 120px;
+    height: 30px;
+    outline: none;
+    margin-right: 16px;
+  }
   &.detailModelParent {
     table {
       td,
       th {
-        width: 150px !important;
+        width: 110px !important;
         &:first-of-type {
           width: 60px !important;
         }
@@ -1581,6 +1627,7 @@ export default {
               align-items: center;
               span {
                 margin-left: 4px;
+                user-select: none;
               }
               // 多选框
               input[type="checkbox"] {
@@ -1921,7 +1968,7 @@ export default {
           &.main-box-item-w4 {
             width: calc((100vw - 80px) / 4);
             .main-box-item-content {
-              justify-content: space-evenly;
+              justify-content: space-between;
               .main-box-item-contentBox {
                 width: auto;
               }
@@ -1930,7 +1977,7 @@ export default {
           &.main-box-item-w4--ks {
             width: calc((100vw - 80px) / 4);
             .main-box-item-content {
-              justify-content: space-evenly;
+              justify-content: space-between;
             }
           }
           &:hover {
@@ -2060,7 +2107,7 @@ export default {
           font-size: 14px;
           display: flex;
           flex-direction: column;
-          justify-content: space-evenly;
+          justify-content: space-between;
           .header_on {
             display: flex;
             height: 26px;