优化

proxy.conf.json

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

src/app/views/hushijiandan/hushijiandan.component.html

@@ -1640,34 +1640,32 @@
                     >
                       <thead>
                         <tr class="thead">
-                          <th nzWidth="5%">序号</th>
+                          <th nzWidth="6%">序号</th>
-                          <th nzWidth="13%">患者姓名（床号）</th>
+                          <th nzWidth="12%">患者姓名<br>住院号</th>
-                          <th nzWidth="13%">住院号</th>
+                          <th nzWidth="12%">手术时间</th>
-                          <th nzWidth="13%">手术时间</th>
+                          <th nzWidth="20%">所属科室</th>
-                          <th nzWidth="13%">所属科室</th>
+                          <th>手术名称</th>
-                          <th nzWidth="13%">手术名称</th>
+                          <th nzWidth="15%">状态</th>
-                          <th nzWidth="10%">状态</th>
+                          <th nzWidth="20%" *ngIf="currentDept.typeValue == 'surgery'">操作</th>
-                          <th nzWidth="20%">操作</th>
                         </tr>
                       </thead>
                       <tbody>
                         <tr *ngFor="let item of surgeryList;let i = index">
                           <td>{{ i + 1 }}</td>
-                          <td>{{ item.patientDTO ? item.patientDTO.patientName : '' }}({{ item.patientDTO ? item.patientDTO.bedNum : '' }})</td>
+                          <td>{{ item.patientDTO ? item.patientDTO.patientName : '' }}({{ item.patientDTO ? item.patientDTO.bedNum : '' }})<br>{{ item.patientDTO ? item.patientDTO.residenceNo : '' }}</td>
-                          <td>{{ item.patientDTO ? item.patientDTO.residenceNo : '' }}</td>
                           <td>{{ item.applyDate | date:'MM-dd HH:mm' }}</td>
                           <td>{{ item.areaDeptDTO ? (deptDisplay == 2 ? item.areaDeptDTO.deptalias : item.areaDeptDTO.dept) : '' }}</td>
                           <td>{{ item.surgeryName }}</td>
                           <td>{{ item.state?.name }}</td>
-                          <td>
+                          <td *ngIf="currentDept.typeValue == 'surgery'">
                             <!-- 手术状态是【手术安排】和【接患者中】，并且【是否开启手术即将开始通知】开启 -->
-                            <button class="mr8 mb8" (click)="surgeryBegin($event, item)" *ngIf="item.state && (item.state.value == 3 || item.state.value == 7) && surgeryConfigs.surgeryBegin == 1">即将开始</button>
+                            <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>
                             <!-- 【是否开启手术即将开始通知】开启 -->
-                            <button class="mr8 mb8" (click)="pickUpPatient($event, item)" *ngIf="item.state && item.state.value == 3">一键接患者</button>
+                            <button class="btn1 mr8 mb8 mt8" (click)="pickUpPatient($event, item)" *ngIf="item.state && item.state.value == 3">一键接患者</button>
                             <!-- 手术状态是【手术中】，并且【是否开通送回病房】开启 -->
-                            <button class="mr8 mb8" (click)="sendWard($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandClinical == 1 && item.state && item.state.value == 8">送回病房</button>
+                            <button class="btn1 mr8 mb8 mt8" (click)="sendWard($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandClinical == 1 && item.state && item.state.value == 8">送回病房</button>
                             <!-- 手术状态是【手术中】，并且【是否开通送回苏醒室】开启 -->
-                            <button class="mr8 mb8" (click)="sendAwakeningRoom($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandRecovery == 1 && item.state && item.state.value == 8">送回苏醒间</button>
+                            <button class="btn1 mr8 mb8 mt8" (click)="sendAwakeningRoom($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandRecovery == 1 && item.state && item.state.value == 8">送回苏醒间</button>
                           </td>
                         </tr>
                       </tbody>
@@ -1777,9 +1775,7 @@
                           </td>
                           <td>{{ data.sendTime || "-" }}</td>
                           <td>
-                            <button (click)="viewSpecimenHistory(data)">
+                            <button class="btn1 mr8 mb8 mt8" (click)="viewSpecimenHistory(data)">查看</button>
-                              查看
-                            </button>
                           </td>
                         </tr>
                       </tbody>
@@ -1877,9 +1873,7 @@
                             {{ data.drugsState ? data.drugsState.name : "-" }}
                           </td>
                           <td>
-                            <button (click)="viewDrugsbagHistory(data)">
+                            <button class="btn1 mr8 mb8 mt8" (click)="viewDrugsbagHistory(data)">查看过程</button>
-                              查看过程
-                            </button>
                           </td>
                         </tr>
                       </tbody>

src/app/views/hushijiandan/hushijiandan.component.less

@@ -649,6 +649,21 @@
     background: #fff;
   }
 
+  .btn1 {
+    background-image: linear-gradient(
+      90deg,
+      @bg-start 0%,
+      @bg-end 100%
+    );
+    border-radius: 4px;
+    color: #fff;
+    line-height: 28px;
+    text-align: center;
+    border-radius: 4px;
+    cursor: pointer;
+    border: none;
+  }
+
   .app-layout {
     height: 100%;