seimin 1 år sedan
förälder
incheckning
f37040cb80

+ 1 - 1
proxy.conf.json

@@ -1,6 +1,6 @@
1 1
 {
2 2
   "/service": {
3
-    "target": "http://192.168.4.240",
3
+    "target": "http://192.168.3.108",
4 4
     "logLevel": "debug",
5 5
     "changeOrigin": true,
6 6
     "pathRewrite": {

+ 15 - 21
src/app/views/hushijiandan/hushijiandan.component.html

@@ -1640,34 +1640,32 @@
1640 1640
                     >
1641 1641
                       <thead>
1642 1642
                         <tr class="thead">
1643
-                          <th nzWidth="5%">序号</th>
1644
-                          <th nzWidth="13%">患者姓名(床号)</th>
1645
-                          <th nzWidth="13%">住院号</th>
1646
-                          <th nzWidth="13%">手术时间</th>
1647
-                          <th nzWidth="13%">所属科室</th>
1648
-                          <th nzWidth="13%">手术名称</th>
1649
-                          <th nzWidth="10%">状态</th>
1650
-                          <th nzWidth="20%">操作</th>
1643
+                          <th nzWidth="6%">序号</th>
1644
+                          <th nzWidth="12%">患者姓名<br>住院号</th>
1645
+                          <th nzWidth="12%">手术时间</th>
1646
+                          <th nzWidth="20%">所属科室</th>
1647
+                          <th>手术名称</th>
1648
+                          <th nzWidth="15%">状态</th>
1649
+                          <th nzWidth="20%" *ngIf="currentDept.typeValue == 'surgery'">操作</th>
1651 1650
                         </tr>
1652 1651
                       </thead>
1653 1652
                       <tbody>
1654 1653
                         <tr *ngFor="let item of surgeryList;let i = index">
1655 1654
                           <td>{{ i + 1 }}</td>
1656
-                          <td>{{ item.patientDTO ? item.patientDTO.patientName : '' }}({{ item.patientDTO ? item.patientDTO.bedNum : '' }})</td>
1657
-                          <td>{{ item.patientDTO ? item.patientDTO.residenceNo : '' }}</td>
1655
+                          <td>{{ item.patientDTO ? item.patientDTO.patientName : '' }}({{ item.patientDTO ? item.patientDTO.bedNum : '' }})<br>{{ item.patientDTO ? item.patientDTO.residenceNo : '' }}</td>
1658 1656
                           <td>{{ item.applyDate | date:'MM-dd HH:mm' }}</td>
1659 1657
                           <td>{{ item.areaDeptDTO ? (deptDisplay == 2 ? item.areaDeptDTO.deptalias : item.areaDeptDTO.dept) : '' }}</td>
1660 1658
                           <td>{{ item.surgeryName }}</td>
1661 1659
                           <td>{{ item.state?.name }}</td>
1662
-                          <td>
1660
+                          <td *ngIf="currentDept.typeValue == 'surgery'">
1663 1661
                             <!-- 手术状态是【手术安排】和【接患者中】,并且【是否开启手术即将开始通知】开启 -->
1664
-                            <button class="mr8 mb8" (click)="surgeryBegin($event, item)" *ngIf="item.state && (item.state.value == 3 || item.state.value == 7) && surgeryConfigs.surgeryBegin == 1">即将开始</button>
1662
+                            <button class="btn1 mr8 mb8 mt8" (click)="surgeryBegin($event, item)" *ngIf="item.state && (item.state.value == 3 || item.state.value == 7) && surgeryConfigs.surgeryBegin == 1">即将开始</button>
1665 1663
                             <!-- 【是否开启手术即将开始通知】开启 -->
1666
-                            <button class="mr8 mb8" (click)="pickUpPatient($event, item)" *ngIf="item.state && item.state.value == 3">一键接患者</button>
1664
+                            <button class="btn1 mr8 mb8 mt8" (click)="pickUpPatient($event, item)" *ngIf="item.state && item.state.value == 3">一键接患者</button>
1667 1665
                             <!-- 手术状态是【手术中】,并且【是否开通送回病房】开启 -->
1668
-                            <button class="mr8 mb8" (click)="sendWard($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandClinical == 1 && item.state && item.state.value == 8">送回病房</button>
1666
+                            <button class="btn1 mr8 mb8 mt8" (click)="sendWard($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandClinical == 1 && item.state && item.state.value == 8">送回病房</button>
1669 1667
                             <!-- 手术状态是【手术中】,并且【是否开通送回苏醒室】开启 -->
1670
-                            <button class="mr8 mb8" (click)="sendAwakeningRoom($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandRecovery == 1 && item.state && item.state.value == 8">送回苏醒间</button>
1668
+                            <button class="btn1 mr8 mb8 mt8" (click)="sendAwakeningRoom($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandRecovery == 1 && item.state && item.state.value == 8">送回苏醒间</button>
1671 1669
                           </td>
1672 1670
                         </tr>
1673 1671
                       </tbody>
@@ -1777,9 +1775,7 @@
1777 1775
                           </td>
1778 1776
                           <td>{{ data.sendTime || "-" }}</td>
1779 1777
                           <td>
1780
-                            <button (click)="viewSpecimenHistory(data)">
1781
-                              查看
1782
-                            </button>
1778
+                            <button class="btn1 mr8 mb8 mt8" (click)="viewSpecimenHistory(data)">查看</button>
1783 1779
                           </td>
1784 1780
                         </tr>
1785 1781
                       </tbody>
@@ -1877,9 +1873,7 @@
1877 1873
                             {{ data.drugsState ? data.drugsState.name : "-" }}
1878 1874
                           </td>
1879 1875
                           <td>
1880
-                            <button (click)="viewDrugsbagHistory(data)">
1881
-                              查看过程
1882
-                            </button>
1876
+                            <button class="btn1 mr8 mb8 mt8" (click)="viewDrugsbagHistory(data)">查看过程</button>
1883 1877
                           </td>
1884 1878
                         </tr>
1885 1879
                       </tbody>

+ 15 - 0
src/app/views/hushijiandan/hushijiandan.component.less

@@ -649,6 +649,21 @@
649 649
     background: #fff;
650 650
   }
651 651
 
652
+  .btn1 {
653
+    background-image: linear-gradient(
654
+      90deg,
655
+      @bg-start 0%,
656
+      @bg-end 100%
657
+    );
658
+    border-radius: 4px;
659
+    color: #fff;
660
+    line-height: 28px;
661
+    text-align: center;
662
+    border-radius: 4px;
663
+    cursor: pointer;
664
+    border: none;
665
+  }
666
+
652 667
   .app-layout {
653 668
     height: 100%;
654 669