展示形式中增加护工信息隐藏

proxy.conf.json

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

src/app/views/fuwutai/fuwutai.component.html

@@ -1,6 +1,6 @@
 <div class="fuwutai">
 
-  <div class="top">
+  <div class="top" id="top" *ngIf="hurseInfoHiding==1">
     <!-- 头部Tab -->
     <div class="tabBox">
       <div class="tab" #tabs>
@@ -67,7 +67,7 @@
     </div>
   </div>
   <!-- 状态工单 -->
-  <div class="lists_box" [ngStyle]="{'height':listHeight+'px'}">
+  <div class="lists_box">
     <!-- 未分派 -->
     <div class="lists">
       <div class="head">
@@ -700,6 +700,19 @@
         <div class="conditions">
           <div nz-row>
             <div nz-col nzSpan="6">
+              护工信息隐藏：
+            </div>
+            <div nz-col nzSpan="18">
+              <div nz-row>
+                <nz-radio-group [(ngModel)]="hurseInfoHiding">
+                  <label nz-radio nzValue="1">是</label>
+                  <label nz-radio nzValue="0">否</label>
+                </nz-radio-group>
+              </div>
+            </div>
+          </div>
+          <div nz-row>
+            <div nz-col nzSpan="6">
               护工信息：
             </div>
             <div nz-col nzSpan="18">

src/app/views/fuwutai/fuwutai.component.less

@@ -2,16 +2,20 @@
 
 :host {
   width: 100%;
-  height: unset;
   background: #f9fafb;
-  padding: 17px 16px;
+  padding: 16px;
+  display: flex;
+  flex-direction: column;
 }
 ::ng-deep .ant-form-item-label {
   line-height: 24px !important;
 }
 
 .fuwutai {
+  display: flex;
+  flex-direction: column;
   width: 100%;
+  height: 100%;
   position: relative;
   background: #f9fafb;
   .transport-1_round_solid,
@@ -281,6 +285,7 @@
   /* 工单总数 */
   .lists_box {
     width: 100%;
+    height: 100%;
     margin-top: 24px;
     padding-bottom: 20px;
     min-height: 539px;

src/app/views/fuwutai/fuwutai.component.ts

@@ -553,6 +553,7 @@ export class FuwutaiComponent implements OnInit {
   workerMessage: any = []; //顶部全部工单
   // 展示形式
   patientCareCol: number = 6; //顶部工单列数(4列-8人，7列-14人，6列-单排 ）
+  hurseInfoHiding; //护工信息隐藏
   txtLabelCol: number = 1; //文本标签列数
   workerInfoTime: number = 30; //支助人员刷新时间
   orderInfoTime: number = 30; //工单刷新时间
@@ -991,16 +992,12 @@ export class FuwutaiComponent implements OnInit {
       });
   }
 
-  topListHeight = 185; //顶部表格height
-  listHeight; //表格height
   // 页面resize
   windowResize() {
     let fixedMenu = document.getElementById("fixedMenu");
     if (!fixedMenu) return;
-    let top = document.querySelector(".top");
+    let top = document.querySelector("#top");
     window.addEventListener("resize", () => {
-      this.topListHeight = top.clientHeight;
-      this.listHeight = document.body.clientHeight - this.topListHeight - 44;
       let wh = window.innerHeight;
       let _y = parseFloat(fixedMenu.style.top);
       if (!_y) return;
@@ -1019,26 +1016,16 @@ export class FuwutaiComponent implements OnInit {
     that.maxNum = Math.ceil(that.workerMessage.length / that.patientCareCol);
     that.showRowNum = that.patientCareCol == 6 ? 4 : 2;
     console.log(that.maxNum, that.showRowNum);
-    // if(that.maxNum<=that.showRowNum){
-    //   that.cotHeight=undefined;
-    // }else{
     that.cotHeight = 140;
-    // }
-    that.topListHeight = 185;
-    that.listHeight = document.body.clientHeight - that.topListHeight - 44;
   }
 
   // 展开顶部列表
   unfold() {
     if (this.showRowNum < this.maxNum && this.patientCareCol != 6) {
       this.cotHeight += 70;
-      this.topListHeight += 70;
-      this.listHeight = document.body.clientHeight - this.topListHeight - 44;
       this.showRowNum++;
     } else if (this.showRowNum < this.maxNum && this.patientCareCol == 6) {
       this.cotHeight += 35;
-      this.topListHeight += 35;
-      this.listHeight = document.body.clientHeight - this.topListHeight - 44;
       this.showRowNum++;
     } else {
       return;
@@ -1049,8 +1036,6 @@ export class FuwutaiComponent implements OnInit {
   retract() {
     this.showRowNum = this.patientCareCol == 6 ? 4 : 2;
     this.cotHeight = 140;
-    this.topListHeight = 185;
-    this.listHeight = document.body.clientHeight - this.topListHeight - 44;
   }
 
   // 查看工单详情
@@ -2347,7 +2332,7 @@ export class FuwutaiComponent implements OnInit {
     let postData = {
       controlView: { userId: that.user.user.id, hosId: this.checkedHos },
       idx: 0,
-      sum: 1000,
+      sum: 1,
     };
     that.mainService
       .coopTypeConfig("fetchDataList", "controlView", postData)
@@ -2365,6 +2350,7 @@ export class FuwutaiComponent implements OnInit {
             that.patientCareCol = 4;
             break;
         }
+        this.hurseInfoHiding = data.list[0].hurseInfoHiding ? "1" : "0";
         that.txtLabelCol = data.list[0].labelNum;
         that.orderRefreshTime = that.orderInfoTime = data.list[0].orderInfoTime;
         that.workerRefreshTime = that.workerInfoTime =
@@ -2399,6 +2385,7 @@ export class FuwutaiComponent implements OnInit {
         workerInfoTime: that.workerInfoTime,
         orderInfoTime: that.orderInfoTime,
         unsendOrderVoice: that.audioNotDispatched,
+        hurseInfoHiding: that.hurseInfoHiding === "1",
       },
     };
     if (that.controlView["id"]) {