|
@@ -50,6 +50,7 @@ function range(start: number, end: number): number[] {
|
50
|
50
|
export class HushijiandanComponent implements OnInit {
|
51
|
51
|
@ViewChild("remarksEle", { static: false }) remarksEle: ElementRef;
|
52
|
52
|
@ViewChild("remarksEle1", { static: false }) remarksEle1: ElementRef;
|
|
53
|
+ @ViewChild("remarksEle2", { static: false }) remarksEle2: ElementRef;
|
53
|
54
|
@ViewChild("osComponentRef1", {
|
54
|
55
|
read: OverlayScrollbarsComponent,
|
55
|
56
|
static: false,
|
|
@@ -324,10 +325,13 @@ export class HushijiandanComponent implements OnInit {
|
324
|
325
|
btnLoading: boolean = false; //确认按钮loading状态
|
325
|
326
|
workOrderRemark = ""; //备注
|
326
|
327
|
workOrderRemark1 = ""; //备注
|
|
328
|
+ workOrderRemark2 = ""; //备注
|
327
|
329
|
workOrderRemarkTips = ""; //备注提示
|
328
|
330
|
workOrderRemarkTips1 = ""; //备注提示
|
|
331
|
+ workOrderRemarkTips2 = ""; //备注提示
|
329
|
332
|
customRemarks = []; //备注快速输入
|
330
|
333
|
customRemarks1 = []; //备注快速输入
|
|
334
|
+ customRemarks2 = []; //备注快速输入
|
331
|
335
|
// 添加备注
|
332
|
336
|
addRemarks(item) {
|
333
|
337
|
this.remarksEle.nativeElement.focus();
|
|
@@ -338,6 +342,11 @@ export class HushijiandanComponent implements OnInit {
|
338
|
342
|
this.remarksEle1.nativeElement.focus();
|
339
|
343
|
this.workOrderRemark1 += item;
|
340
|
344
|
}
|
|
345
|
+ // 添加备注
|
|
346
|
+ addRemarks2(item) {
|
|
347
|
+ this.remarksEle2.nativeElement.focus();
|
|
348
|
+ this.workOrderRemark2 += item;
|
|
349
|
+ }
|
341
|
350
|
// 立即执行
|
342
|
351
|
coopItem: any = {};
|
343
|
352
|
execModal: boolean = false;
|
|
@@ -1300,6 +1309,7 @@ export class HushijiandanComponent implements OnInit {
|
1300
|
1309
|
// 患者信息一键建单关联检查
|
1301
|
1310
|
linkCheckLis: any = [];
|
1302
|
1311
|
goodsLis: any = []; //携带设备
|
|
1312
|
+ isRemarks: boolean = false; //是否开启备注信息
|
1303
|
1313
|
allowUrgent: any = "0"; //加急
|
1304
|
1314
|
urgentReason: any = ""; //加急原因
|
1305
|
1315
|
|
|
@@ -1309,6 +1319,7 @@ export class HushijiandanComponent implements OnInit {
|
1309
|
1319
|
this.patientForm = this.fb.group({
|
1310
|
1320
|
checkedType: [null, [Validators.required]],
|
1311
|
1321
|
goods: [null],
|
|
1322
|
+ workOrderRemark2: [null],
|
1312
|
1323
|
linkCheck: [null, []],
|
1313
|
1324
|
targetOffice: [null, [this.targetOfficeValidator]],
|
1314
|
1325
|
originOffice: [null, [this.originOfficeValidator]],
|
|
@@ -1579,6 +1590,8 @@ export class HushijiandanComponent implements OnInit {
|
1579
|
1590
|
goods = goods.slice(0, goods.length - 1);
|
1580
|
1591
|
}
|
1581
|
1592
|
postData.workOrder["goods"] = goods;
|
|
1593
|
+ // 工单备注
|
|
1594
|
+ postData.workOrder["workOrderRemark"] = that.workOrderRemark2 || '';
|
1582
|
1595
|
if (!yuyue && that.current_allowUrgent && this.allowUrgent == 1) {
|
1583
|
1596
|
postData.workOrder["urgentDetails"] = {
|
1584
|
1597
|
checkStatus: { id: 329 },
|
|
@@ -1843,7 +1856,11 @@ export class HushijiandanComponent implements OnInit {
|
1843
|
1856
|
current_allowUrgent = false; //当前任务类型是否允许加急
|
1844
|
1857
|
currentTasktype; //当前选中的任务类型对象
|
1845
|
1858
|
cLoading = false;
|
|
1859
|
+ historyCustomRemarks2 = [];
|
1846
|
1860
|
changeCheckedType() {
|
|
1861
|
+ this.workOrderRemark2 = "";
|
|
1862
|
+ this.customRemarks2 = [];
|
|
1863
|
+ this.historyCustomRemarks2 = [];
|
1847
|
1864
|
this.isYyInspect = false;
|
1848
|
1865
|
this.linkCheckLisTrue = false;
|
1849
|
1866
|
this.clickYYFlag = false;
|
|
@@ -1915,6 +1932,29 @@ export class HushijiandanComponent implements OnInit {
|
1915
|
1932
|
});
|
1916
|
1933
|
});
|
1917
|
1934
|
}
|
|
1935
|
+ // 工单备注配置 start
|
|
1936
|
+ that.isRemarks = data.remarksSwitch == 1;
|
|
1937
|
+ if (data.remarksSwitch == 1) {
|
|
1938
|
+ if (data.customRemarks === null || data.customRemarks === "") {
|
|
1939
|
+ that.customRemarks2 = [];
|
|
1940
|
+ } else {
|
|
1941
|
+ that.customRemarks2 = data.customRemarks.split("$");
|
|
1942
|
+ }
|
|
1943
|
+ that.workOrderRemarkTips2 =
|
|
1944
|
+ data.remarksPrompts || "请填写工单备注,不超过100个字符";
|
|
1945
|
+ let user = JSON.parse(localStorage.getItem("user"));
|
|
1946
|
+ that.mainService
|
|
1947
|
+ .postCustom("nurse", "workOrder/recentRemarks", {
|
|
1948
|
+ deptId: user.user.dept.id,
|
|
1949
|
+ taskTypeId: that.patientForm.controls.checkedType.value,
|
|
1950
|
+ })
|
|
1951
|
+ .subscribe((result) => {
|
|
1952
|
+ if (result.state == 200) {
|
|
1953
|
+ that.historyCustomRemarks2 = result.data;
|
|
1954
|
+ }
|
|
1955
|
+ });
|
|
1956
|
+ }
|
|
1957
|
+ // 工单备注配置 end
|
1918
|
1958
|
that.linkCheckLis = [];
|
1919
|
1959
|
if (data.status == 200 && data.data && data.data.length) {
|
1920
|
1960
|
let arr = [];
|