seimin 1 year ago
parent
commit
3912576f49

+ 0 - 21
src/app/share/outgoing-record-detail/outgoing-record-detail.component.html

@@ -163,27 +163,6 @@
163 163
     </button>
164 164
   </div>
165 165
 </div>
166
-<!-- 操作成功/失败提示框 -->
167
-<app-prompt-modal
168
-  *ngIf="promptModalShow"
169
-  [content]="promptContent"
170
-  [success]="ifSuccess"
171
-  [show]="promptModalShow"
172
-  [info]="promptInfo"
173
-  (closeModel)="close()"
174
->
175
-  <!-- 2.父组件调用子组件时绑定到这个事件属性,并在事件发生时作出回应。(closeModel)="close()" -->
176
-</app-prompt-modal>
177
-
178
-<!-- 业务数据查看 -->
179
-<app-businessData-detail-modal
180
-  *ngIf="businessDataModalShow"
181
-  [show]="businessDataModalShow"
182
-  [type]="businessDataModalType"
183
-  [orderId]="orderId"
184
-  (closeModelHs)="closeModelBlood($event)"
185
-></app-businessData-detail-modal>
186 166
 
187 167
 <!-- 遮罩 -->
188 168
 <app-mask *ngIf="maskFlag"></app-mask>
189
-<app-image-viewer [imageUrl]="imgs" hidden *ngIf="isPreview" [isPreviewNow]="true"></app-image-viewer>

+ 2 - 147
src/app/share/outgoing-record-detail/outgoing-record-detail.component.ts

@@ -1,10 +1,5 @@
1 1
 import { Component, OnInit, OnDestroy, ViewChild } from "@angular/core";
2 2
 import { ActivatedRoute } from "@angular/router";
3
-import {
4
-  FormBuilder,
5
-  Validators,
6
-  FormGroup,
7
-} from "@angular/forms";
8 3
 import { MainService } from "../../services/main.service";
9 4
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
10 5
 import { NzMessageService } from "ng-zorro-antd";
@@ -27,7 +22,6 @@ export class OutgoingRecordDetailComponent implements OnInit {
27 22
   osComponentRef2: OverlayScrollbarsComponent;
28 23
   constructor(
29 24
     private message: NzMessageService,
30
-    private fb: FormBuilder,
31 25
     private route: ActivatedRoute,
32 26
     private mainService: MainService,
33 27
     private tool: ToolService,
@@ -35,32 +29,12 @@ export class OutgoingRecordDetailComponent implements OnInit {
35 29
   maskFlag: any = false;
36 30
   id: number; //工单id
37 31
   orderInfo: any; //工单详情信息
38
-  endDepts = ""; //工单详情目标科室
39
-  showCoop: boolean = true; //是否展示详情页操作按钮
40
-
41
-  promptContent: string; //操作提示框提示信息
42
-  ifSuccess: boolean; //操作成功/失败
43
-  promptInfo: string; //操作结果提示信息
44
-  promptModalShow: boolean; //是否展示提示框
45
-
46
-  urgentLoading: boolean = false; //确认加急按钮loading状态
47
-  recLoading: boolean = false; //撤回并删除按钮loading状态
48
-  btnLoading: boolean = false; //确认按钮loading状态
49
-  amplificationShow = true;
50
-
51 32
   hosId;
52 33
 
53 34
   ngOnInit() {
54 35
     this.hosId = this.tool.getCurrentHospital().id;
55 36
     this.tabType = this.route.snapshot.params.type || 1;
56 37
     this.getInfo();
57
-    this.initForm();
58
-  }
59
-  ngOnDestroy() {}
60
-
61
-  // 放大
62
-  amplification(){
63
-    this.amplificationShow = !this.amplificationShow;
64 38
   }
65 39
 
66 40
   // 获取工单详情
@@ -79,21 +53,8 @@ export class OutgoingRecordDetailComponent implements OnInit {
79 53
         this.getList();
80 54
       });
81 55
   }
82
-  // 预览图片
83
-  imgs = [];
84
-  isPreview = false;
85
-  previewImageHandler(data) {
86
-    this.isPreview = false;
87
-    this.mainService.getPreviewImage(data.bindType,data.bindId).subscribe((result:any)=>{
88
-      if (result.status == 200) {
89
-        this.imgs = result.data.map((v) => location.origin + '/file' + v.relativeFilePath);
90
-        this.isPreview = true;
91
-      } else {
92
-        this.imgs = [];
93
-      }
94
-    })
95
-  }
96
-  // 获取历史记录
56
+
57
+  // 获取列表
97 58
   pageIndex: number = 1;//表格当前页码
98 59
   pageSize: number = 3;//表格每页展示条数
99 60
   total: number = 0;//表格总数据量
@@ -127,110 +88,4 @@ export class OutgoingRecordDetailComponent implements OnInit {
127 88
     history.go(-1);
128 89
   }
129 90
 
130
-  // 查看业务数据
131
-  businessDataModalShow = false; //业务数据弹窗开关
132
-  businessDataModalType = ''; //业务数据类型
133
-  orderId = ""; //查看业务数据携带
134
-  viewDetail(data, type) {
135
-    this.orderId = data.id;
136
-    this.businessDataModalType = type;
137
-    this.businessDataModalShow = true;
138
-  }
139
-  // 关闭业务数据弹窗
140
-  closeModelBlood(e) {
141
-    this.businessDataModalShow = JSON.parse(e).show;
142
-  }
143
-
144
-  // 获取工单历史记录
145
-  logList = []; //工单历史记录
146
-  getLog() {
147
-    return this.mainService.getWorkOrderLog(this.id);
148
-  }
149
-
150
-  // 初始化新增form表单
151
-  validateForm: FormGroup; //新增/编辑表单
152
-  initForm() {
153
-    this.validateForm = this.fb.group({
154
-      reason: [null, [Validators.required]],
155
-      process: [null, [Validators.required]],
156
-      handleType: [null, [Validators.required]],
157
-      improve: [null, [Validators.required]],
158
-    });
159
-  }
160
-
161
-  // 新增表单提交
162
-  submitForm(): void {
163
-    var that = this;
164
-    for (const i in that.validateForm.controls) {
165
-      that.validateForm.controls[i].markAsDirty();
166
-      that.validateForm.controls[i].updateValueAndValidity();
167
-    }
168
-    if (that.validateForm.invalid) return;
169
-    that.btnLoading = true;
170
-    let postData = {
171
-      badEvaluationHandle: {
172
-        id: that.id,
173
-        reasonAndEventProcess: that.validateForm.value.reason,
174
-        mediationProcess: that.validateForm.value.process,
175
-        handleType: { id: that.validateForm.value.handleType },
176
-        advice: that.validateForm.value.improve,
177
-        handleStatus: { key: "bad_evaluation_handle_status", value: "2" },
178
-      },
179
-    };
180
-
181
-    that.mainService
182
-      .postCustom("adviceCollection", "updData/badEvaluationHandle", postData)
183
-      .subscribe((data) => {
184
-        that.btnLoading = false;
185
-        if (data.status == 200) {
186
-          that.showPromptModal("调解", true, "");
187
-          that.getInfo();
188
-          // that.initForm();
189
-        } else {
190
-          that.showPromptModal("调解", false, data.msg);
191
-        }
192
-      });
193
-  }
194
-
195
-  // 展示信息提示框(con:提示信息,success:操作是否成功,promptInfo:操作结果提示信息)(con:提示信息,success:操作是否成功,promptInfo:操作结果提示信息)
196
-  showPromptModal(con, success, promptInfo?) {
197
-    this.promptModalShow = false;
198
-    this.promptContent = con;
199
-    this.ifSuccess = success;
200
-    this.promptInfo = promptInfo;
201
-    setTimeout(() => {
202
-      this.promptModalShow = true;
203
-    }, 100);
204
-  }
205
-
206
-  // 格式化时分秒
207
-  // (时间小于一分钟则显示秒,时间大于一分钟则显示分钟数,如超出一小时则显示小时和分钟。)time单位:秒
208
-  formatTime(time) {
209
-    let timeStr = "";
210
-    if (time >= 0 && time < 60) {
211
-      // 秒
212
-      timeStr = time + "秒";
213
-    } else if (time >= 60 && time < 3600) {
214
-      // 分钟
215
-      timeStr = Math.floor(time / 60) + "分钟";
216
-    } else if (time >= 3600) {
217
-      // 时 + 分
218
-      let h = "";
219
-      let m = "";
220
-      h = Math.floor(time / 3600) + "小时";
221
-      m = time % 3600 >= 60 ? Math.floor((time % 3600) / 60) + "分钟" : "";
222
-      timeStr = h + m;
223
-    }
224
-    return timeStr;
225
-  }
226
-
227
-  // 计算历史记录耗时
228
-  filterTime(step) {
229
-    // step = [{ difTime: 2 }, { difTime: 6 }]
230
-    let num = 0;
231
-    step.forEach((e) => {
232
-      num += e.difTime;
233
-    });
234
-    return this.formatTime(num / 1000);
235
-  }
236 91
 }

+ 0 - 34
src/app/views/medical-waste-outgoing-record/medical-waste-outgoing-record.component.html

@@ -67,40 +67,6 @@
67 67
     </div>
68 68
   </div>
69 69
 </div>
70
-<!-- 矫正重量模态框 -->
71
-<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal">
72
-  <div class="modalBody">
73
-    <div class="title">矫正重量<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
74
-    </div>
75
-    <overlay-scrollbars #osComponentRef1 class="content">
76
-      <div style="height: 50px;line-height: 50px;">原重量:{{coopData.weight}}kg</div>
77
-      <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
78
-        <nz-form-item>
79
-          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="weight">矫正重量</nz-form-label>
80
-          <nz-form-control nzErrorTip="请填写矫正重量!">
81
-            <nz-input-number nz-input formControlName="weight" nzPlaceHolder="请填写矫正重量" [nzMin]="0" [nzStep]="0.01" [nzPrecision]="2"></nz-input-number>
82
-            <span class="red">(kg)</span>
83
-          </nz-form-control>
84
-        </nz-form-item>
85
-      </form>
86
-    </overlay-scrollbars>
87
-    <div class="display_flex justify-content_flex-center">
88
-      <button nzType="primary" nz-button (click)="submitForm()" [nzLoading]="btnLoading">确认</button>
89
-      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
90
-    </div>
91
-  </div>
92
-</div>
93
-<!-- 删除模态框 -->
94
-<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" (confirmDelEvent)="confirmDel()" [content]="content"></app-dialog-delete>
95
-<!-- 操作成功/失败提示框 -->
96
-<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow" [info]="promptInfo"></app-prompt-modal>
97
-<!-- 查看 -->
98
-<app-medical-waste-log-prompt-modal
99
-  *ngIf="historyPromptModalShow"
100
-  [show]="historyPromptModalShow"
101
-  [id]="id"
102
-  (closeModelHs)="closeModelHistory($event)"
103
-></app-medical-waste-log-prompt-modal>
104 70
 
105 71
 <!-- 查看详情 -->
106 72
 <router-outlet></router-outlet>