提交

proxy.conf.json

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

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

@@ -852,27 +852,36 @@
                   </div>
                 </ng-template>
                 <div class="tab borderB" nz-row style="padding: 4px 0">
-                  <div *ngIf="coopBtns.buildOrdersForOtherTasks" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'other'}" (click)="checkTable('other')">
-                    <div class="text">其他任务建单</div>
-                  </div>
-                  <div *ngIf="coopBtns.suggestionBox" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'advice'}" (click)="checkTable('advice')">
-                    <div class="text">意见箱</div>
-                  </div>
-                  <div *ngIf="coopBtns.inquiryOfHistoricalSpecimens" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'historySpecimen'}" (click)="checkTable('historySpecimen')">
-                    <div class="text">历史标本查询</div>
-                  </div>
-                  <div *ngIf="coopBtns.historicalMedicineListInquiry" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'historyDrugsbag'}" (click)="checkTable('historyDrugsbag')">
-                    <div class="text">历史药单查询</div>
-                  </div>
-                  <div *ngIf="coopBtns.quickReportForRepair && isShowBx" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'kjbx'}" (click)="checkTable('kjbx')">
-                    <div class="text">快捷报修</div>
-                  </div>
-                  <div *ngIf="coopBtns.repairList && isShowBx" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'bxlb'}" (click)="checkTable('bxlb')">
-                    <div class="text">
-                      报修列表<strong class="red">&nbsp;({{processing}})</strong>
-                    </div>
+                  <div nz-col nzSpan="21" class="h100p">
+                    <overlay-scrollbars #osComponentRef11 nz-row class="h100p w100">
+                      <div style="height: 100%; display: flex;">
+                        <div *ngIf="coopBtns.buildOrdersForOtherTasks" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'other'}" (click)="checkTable('other')">
+                          <div class="text">其他任务建单</div>
+                        </div>
+                        <div *ngFor="let item of tabPermission" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'other'}" (click)="checkTable('other')">
+                          <div class="text">其他任务建单1</div>
+                        </div>
+                        <div *ngIf="coopBtns.suggestionBox" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'advice'}" (click)="checkTable('advice')">
+                          <div class="text">意见箱</div>
+                        </div>
+                        <div *ngIf="coopBtns.inquiryOfHistoricalSpecimens" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'historySpecimen'}" (click)="checkTable('historySpecimen')">
+                          <div class="text">历史标本查询</div>
+                        </div>
+                        <div *ngIf="coopBtns.historicalMedicineListInquiry" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'historyDrugsbag'}" (click)="checkTable('historyDrugsbag')">
+                          <div class="text">历史药单查询</div>
+                        </div>
+                        <div *ngIf="coopBtns.quickReportForRepair && isShowBx" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'kjbx'}" (click)="checkTable('kjbx')">
+                          <div class="text">快捷报修</div>
+                        </div>
+                        <div *ngIf="coopBtns.repairList && isShowBx" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'bxlb'}" (click)="checkTable('bxlb')">
+                          <div class="text">
+                            报修列表<strong class="red">&nbsp;({{processing}})</strong>
+                          </div>
+                        </div>
+                      </div>
+                    </overlay-scrollbars>
                   </div>
-                  <div nz-col nzSpan="6" style="float: right;" class="txtC h100p alignR display_flex justify-content_flex-end align-items_center">
+                  <div nz-col nzSpan="3" class="txtC h100p alignR display_flex justify-content_flex-end align-items_center">
                     <div class="btn txtC" *ngIf="mainRole && loginUser.usertype.value != 1" (click)="toMain()">
                       回到系统管理
                     </div>

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

@@ -1155,6 +1155,10 @@
               cursor: default;
               overflow: hidden;
 
+              & /deep/ .os-scrollbar-vertical{
+                display: none!important;
+              }
+
               .cur {
                 height: 100%;
                 border-radius: 4px;

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -96,6 +96,12 @@ export class HushijiandanComponent implements OnInit {
     static: false,
   })
   osComponentRef10: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef11", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef11: OverlayScrollbarsComponent;
+
   othersListOptions: any;
   sortableTimer = null;
   searchAccountSubject = new Subject(); //查工号防抖
@@ -1160,6 +1166,7 @@ export class HushijiandanComponent implements OnInit {
   patientMsgList: any = []; // 患者转运，患者陪检一键建单
   tabFlag = true; //页面初始化获取一次患者陪检的任务类型信息
   allowUrgentFlag = false; //检查列表的患者陪检类型是否允许加急
+  tabPermission:any = []; //tab自定义
   getDeptTaskType(search?, clear?) {
     let that = this;
     this.otherNum++;
@@ -1230,6 +1237,7 @@ export class HushijiandanComponent implements OnInit {
         if (data.data.allTaskTypes) {
           that.othersList = [];
           that.patientMsgList = [];
+          that.tabPermission = Object.values(data.data.tabPermission.data);
           data.data.allTaskTypes.forEach((e) => {
             if (e.associationType.value == "other") {
               that.othersList.push(e);

src/app/views/tab-custom/tab-custom.component.html

@@ -27,7 +27,7 @@
             <td>
               <div class="coop">
                 <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
-                <span *ngIf="coopBtns.del && data.taskTypeList.length" (click)="del(data)">删除</span>
+                <span *ngIf="coopBtns.del && data.tabTypeList.length" (click)="del(data)">删除</span>
               </div>
             </td>
           </tr>
@@ -65,9 +65,9 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-          <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="taskTypeList">关联任务类型</nz-form-label>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="tabTypeList">关联任务类型</nz-form-label>
           <nz-form-control nzErrorTip="请选择关联任务类型!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="taskTypeList" nzShowSearch nzAllowClear nzMode="multiple" nzPlaceHolder="请选择关联任务类型" nzServerSearch (nzOnSearch)="changeInp($event)" (nzOpenChange)="openOtherTasktype($event)">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="tabTypeList" nzShowSearch nzAllowClear nzMode="multiple" nzPlaceHolder="请选择关联任务类型" nzServerSearch (nzOnSearch)="changeInp($event)" (nzOpenChange)="openOtherTasktype($event)">
               <ng-container *ngFor="let data of otherTasktypeList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="data.taskName" [nzValue]="data.id">
                 </nz-option>

src/app/views/tab-custom/tab-custom.component.ts

@@ -97,7 +97,7 @@ export class TabCustomComponent implements OnInit {
         this.loading1 = false;
         data.list = data.list || [];
         data.list.forEach(v => {
-          v.taskNames = v.taskTypeList.map(v=>v.taskTypeDTO.taskName).toString()
+          v.taskNames = v.tabTypeList.map(v=>v.taskTypeDTO.taskName).toString()
         })
         this.listOfData = data.list;
         this.listLength = data.totalNum;
@@ -146,7 +146,7 @@ export class TabCustomComponent implements OnInit {
     this.validateForm = this.fb.group({
       title: ['', [Validators.required]],
       orders: [0, [Validators.required]],
-      taskTypeList: [null],
+      tabTypeList: [null],
     });
   }
   // 表单提交
@@ -157,11 +157,11 @@ export class TabCustomComponent implements OnInit {
     }
     if (this.validateForm.invalid) return;
     this.btnLoading = true;
-    let taskTypeList = [];
-    this.validateForm.value.taskTypeList.forEach(v => {
+    let tabTypeList = [];
+    this.validateForm.value.tabTypeList.forEach(v => {
       this.otherTasktypeList.forEach(vv => {
         if(v == vv.id){
-          taskTypeList.push({
+          tabTypeList.push({
             taskTypeId: vv.id,
             hosId: vv.hosId ? vv.hosId.id : undefined,
             typeParentHosid: vv.hosId.parent ? vv.hosId.parent.id : undefined,
@@ -174,7 +174,7 @@ export class TabCustomComponent implements OnInit {
       orders: this.validateForm.value.orders,
       hosId: this.hosId,
       deleteFlag: 0,
-      taskTypeList
+      tabTypeList
     };
     if (!this.add) {
       data = {...this.coopData, ...data};
@@ -200,7 +200,7 @@ export class TabCustomComponent implements OnInit {
   edit(data) {
     this.validateForm.controls.title.setValue(data.title);
     this.validateForm.controls.orders.setValue(data.orders);
-    this.validateForm.controls.taskTypeList.setValue(Array.isArray(data.taskTypeList) ? data.taskTypeList.map(v => +v.taskTypeId) : []);
+    this.validateForm.controls.tabTypeList.setValue(Array.isArray(data.tabTypeList) ? data.tabTypeList.map(v => +v.taskTypeId) : []);
     this.modal = true;
     this.add = false;
     this.coopId = data.id;