bugfix

src/app/components/incidentManagement/incident-create/incident-create.component.html

@@ -2,7 +2,7 @@
  * @Author: seimin
  * @Date: 2024-10-24 13:47:40
  * @LastEditors: seimin
- * @LastEditTime: 2024-12-09 11:11:15
+ * @LastEditTime: 2024-12-09 15:32:35
  * @Description: 创建
 -->
 <!-- 新建工单 -->
@@ -53,7 +53,7 @@
         </div>
         <div class="newTopItem">
           <span class="grayFont">
-            <nz-radio-group [(ngModel)]="incidentModel.repairIncidentType" (ngModelChange)="changeRepairIncidentType($event)">
+            <nz-radio-group [nzDisabled]="buildType === '编辑事件'" [(ngModel)]="incidentModel.repairIncidentType" (ngModelChange)="changeRepairIncidentType($event)">
               <label nz-radio [nzValue]="item.value" *ngFor="let item of repairIncidentTypeList">{{item.name}}</label>
             </nz-radio-group>
           </span>

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

@@ -1019,7 +1019,7 @@
           </div>
           <div class="newTopItem">
             <span class="grayFont">
-              <nz-radio-group [(ngModel)]="incidentModel.repairIncidentType" (ngModelChange)="changeRepairIncidentType($event)">
+              <nz-radio-group [nzDisabled]="buildType === '编辑事件'" [(ngModel)]="incidentModel.repairIncidentType" (ngModelChange)="changeRepairIncidentType($event)">
                 <label nz-radio [nzValue]="item.value" *ngFor="let item of repairIncidentTypeList">{{item.name}}</label>
               </nz-radio-group>
             </span>

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

@@ -1474,11 +1474,18 @@ export class FuwutaiComponent implements OnInit {
         if (result.state == 200) {
           console.log(result);
           if (result.data.length > 0) {
+            let deptDTO;
+            if(result.type === 'qrCode'){
+              deptDTO = result.data[0].deptDTO;
+              deptDTO.address = result.data[0].name;
+            }else if(result.type === 'dept'){
+              deptDTO = result.data[0];
+            }
             //绑定了科室
             // if (!this.newOrderShow && !this.newOrderShowOpen) {
               let incidentModel:any = Object.assign({}, this.incidentModel);
               let incidentMsg:any = Object.assign({}, this.incidentMsg);
-              incidentModel.department = result.data[0];
+              incidentModel.department = deptDTO;
               incidentModel.department && incidentModel.department.hospital && (incidentModel.hosId = incidentModel.department.hospital.parent ? incidentModel.department.hospital.parent.id : incidentModel.department.hospital.id);
               incidentModel.department && incidentModel.department.building && (incidentModel.area = incidentModel.department.building.id);
               incidentModel.department && incidentModel.department.floor && (incidentModel.place = incidentModel.department.floor.id);
@@ -1491,7 +1498,7 @@ export class FuwutaiComponent implements OnInit {
               this.incidentModel = incidentModel;
               this.incidentMsg = incidentMsg;
               this.searchApplicationRequester();
-              this.applyDeptMiddle = result.data[0];
+              this.applyDeptMiddle = deptDTO;
               this.showNewOrder("yes", this.incidentModel.incomingPhone, true, '来电弹屏');
             // }
           } else {
@@ -5308,7 +5315,14 @@ export class FuwutaiComponent implements OnInit {
               source && (incidentModel.source = source.id);
               if (result.data.length > 0) {
                 //绑定了科室
-                incidentModel.department = result.data[0];
+                let deptDTO;
+                if(result.type === 'qrCode'){
+                  deptDTO = result.data[0].deptDTO;
+                  deptDTO.address = result.data[0].name;
+                }else if(result.type === 'dept'){
+                  deptDTO = result.data[0];
+                }
+                incidentModel.department = deptDTO;
                 incidentModel.department && incidentModel.department.hospital && (incidentModel.hosId = incidentModel.department.hospital.parent ? incidentModel.department.hospital.parent.id : incidentModel.department.hospital.id);
                 incidentModel.department && incidentModel.department.building && (incidentModel.area = incidentModel.department.building.id);
                 incidentModel.department && incidentModel.department.floor && (incidentModel.place = incidentModel.department.floor.id);

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

@@ -1446,7 +1446,7 @@
             <nz-form-item class="datesControl">
               <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="checkedType">任务类型</nz-form-label>
               <nz-form-control nzErrorTip="请选择任务类型!" class="checkedType">
-                <nz-radio-group class="radioGroup" formControlName="checkedType" (ngModelChange)="changeCheckedType()">
+                <nz-radio-group class="radioGroup w100" formControlName="checkedType" (ngModelChange)="changeCheckedType()">
                   <label class="col6 ellipsis-oneline" [title]="item.taskName" *ngFor="let item of checkTypeLis" nz-radio [nzValue]="item.id">{{ item.taskName }}</label>
                 </nz-radio-group>
               </nz-form-control>
@@ -1522,7 +1522,7 @@
               <div class="txtC">{{ checkedShowMsg.msg }}</div>
             </nz-form-item>
             <!-- 100015 （护士端一键建单展策略）起点科室和终点科室下拉展示 -->
-            <nz-form-item nz-row *ngIf="checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013">
+            <nz-form-item class="top16bottom0" nz-row *ngIf="checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013">
               <nz-form-label [nzSpan]="3" nzRequired nzFor="originOffice">起点科室</nz-form-label>
               <nz-form-control [nzSpan]="21" nzErrorTip="请选择起点科室!">
                 <nz-select formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('start', checkedShowMsg, $event)" nzPlaceHolder="请选择起点科室">
@@ -1537,20 +1537,20 @@
               </nz-form-control>
             </nz-form-item>
             <!-- 其他情况 -->
-            <nz-form-item nz-row *ngIf="checkedShowMsg.start && !(checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015)">
+            <nz-form-item class="top16bottom0" nz-row *ngIf="checkedShowMsg.start && (checkedShowMsg.status == 100014 || checkedShowMsg.status == 100012)">
               <nz-form-label [nzSpan]="3" nzRequired nzFor="originOffice">起点科室</nz-form-label>
               <nz-form-control [nzSpan]="21" nzErrorTip="请选择起点科室!">
                 <span class="readonly">{{deptDisplay == 2 ? checkedShowMsg.start.start.list[0].deptalias : checkedShowMsg.start.start.list[0].dept}}</span>
               </nz-form-control>
             </nz-form-item>
-            <nz-form-item nz-row *ngIf="checkedShowMsg.end && !(checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013)">
+            <nz-form-item class="top16bottom0" nz-row *ngIf="checkedShowMsg.end && (checkedShowMsg.status == 100012 || checkedShowMsg.status == 100013)">
               <nz-form-label [nzSpan]="3" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
               <nz-form-control [nzSpan]="21" nzErrorTip="请选择目标科室!">
                 <span class="readonly">{{deptDisplay == 2 ? checkedShowMsg.end.end.list[0].deptalias : checkedShowMsg.end.end.list[0].dept}}</span>
               </nz-form-control>
             </nz-form-item>
             <!-- 100014 （护士端一键建单展示策略）取终点科室和msg 值展示 -->
-            <nz-form-item nz-row *ngIf="checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015">
+            <nz-form-item class="top16bottom0" nz-row *ngIf="checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015">
               <nz-form-label [nzSpan]="3" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
               <nz-form-control [nzSpan]="21" nzErrorTip="请选择目标科室!">
                 <nz-select formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('target', checkedShowMsg, $event)" nzPlaceHolder="请选择目标科室">
@@ -1564,7 +1564,7 @@
                 </nz-select>
               </nz-form-control>
             </nz-form-item>
-            <div class="display_flex">
+            <div class="display_flex top16bottom0">
               <!-- 自动送回 -->
               <nz-form-item class="isRemand" *ngIf="checkedShowMsg.status != 200 && checkedShowMsg.isRemand == 1">
                 <nz-form-control>
@@ -1574,7 +1574,7 @@
               <!-- 是否加急 -->
               <nz-form-item nz-row *ngIf="current_allowUrgent" class="allowUrgent">
                 <nz-form-label [nzSpan]="3" nzFor="allowUrgent" class="goods">是否加急</nz-form-label>
-                <nz-form-control [nzSpan]="6" style="margin-left: 24px;">
+                <nz-form-control [nzSpan]="6">
                   <nz-radio-group [(ngModel)]="allowUrgent" (ngModelChange)="allowUrgentChange($event)" formControlName="allowUrgent">
                     <label nz-radio nzValue="1">是</label>
                     <label nz-radio nzValue="0">否</label>

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

@@ -2596,6 +2596,10 @@
   line-height: 32px!important;
   flex-shrink: 0;
 }
+.patient .top16bottom0{
+  margin-top: 16px!important;
+  margin-bottom: 0!important;
+}
 .patient{
   .modalBody{
     width: 950px;