瀏覽代碼

移除护士端快捷报修

seimin 5 月之前
父節點
當前提交
c9f0799bef

+ 0 - 191
src/app/views/hushijiandan/hushijiandan.component.html

@@ -883,9 +883,6 @@
883 883
                         <div *ngIf="coopBtns.historicalMedicineListInquiry && currentDept.typeValue != 'outpatientService'" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'historyDrugsbag'}" (click)="checkTable('historyDrugsbag')">
884 884
                           <div class="text">历史药单查询</div>
885 885
                         </div>
886
-                        <div *ngIf="coopBtns.quickReportForRepair && isShowBx" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'kjbx'}" (click)="checkTable('kjbx')">
887
-                          <div class="text">快捷报修</div>
888
-                        </div>
889 886
                         <div *ngIf="coopBtns.repairList && isShowBx" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'bxlb'}" (click)="checkTable('bxlb')">
890 887
                           <div class="text">
891 888
                             报修列表<strong class="red">&nbsp;({{processing}})</strong>
@@ -1962,194 +1959,6 @@
1962 1959
                   </div>
1963 1960
                 </div>
1964 1961
               </div>
1965
-              <!-- 快捷报修 -->
1966
-              <div
1967
-                *ngIf="checkedTableType == 'kjbx' && isShowBx && coopBtns.quickReportForRepair"
1968
-                style="flex: 1; height: 100%; display: flex"
1969
-              >
1970
-                <div class="otherBox">
1971
-                  <div class="otherBoxInner">
1972
-                    <!-- 故障现象查询 -->
1973
-                    <div class="otherBox-nav" style="width: 30%">
1974
-                      <div class="otherBox-nav__head">
1975
-                        <input
1976
-                          nz-input
1977
-                          placeholder="请输入关键字"
1978
-                          [(ngModel)]="incidentSearch"
1979
-                          (ngModelChange)="incidentSearchChange()"
1980
-                        />
1981
-                      </div>
1982
-                      <overlay-scrollbars
1983
-                        #osComponentRef10
1984
-                        class="otherBox-nav__main"
1985
-                        [ngStyle]="{ height: '100%' }"
1986
-                      >
1987
-                        <div
1988
-                          class="otherBox-nav__mainInner"
1989
-                          *ngIf="!iLoading && incidentList.length > 0"
1990
-                        >
1991
-                          <div class="w100">
1992
-                            <div
1993
-                              class="otherBox-nav__mainItem"
1994
-                              *ngFor="let item of incidentList"
1995
-                              (click)="incidentClick(item)"
1996
-                              [ngClass]="{
1997
-                                active: selectIncidentId == item.id
1998
-                              }"
1999
-                              [title]="item.mutiCategory"
2000
-                            >
2001
-                              {{ item.mutiCategory }}
2002
-                            </div>
2003
-                          </div>
2004
-                        </div>
2005
-                        <div
2006
-                          class="otherBox-nav__mainInner noData"
2007
-                          *ngIf="!iLoading && incidentList.length == 0"
2008
-                        >
2009
-                          暂无数据
2010
-                        </div>
2011
-                        <div
2012
-                          class="otherBox-nav__mainInner oLoading"
2013
-                          *ngIf="iLoading"
2014
-                        >
2015
-                          <img
2016
-                            src="../../../assets/images/loading.gif"
2017
-                            alt=""
2018
-                          />
2019
-                          <div>加载中...</div>
2020
-                        </div>
2021
-                      </overlay-scrollbars>
2022
-                    </div>
2023
-                    <form
2024
-                      nz-form
2025
-                      [formGroup]="bxForm"
2026
-                      (ngSubmit)="submitBxForm()"
2027
-                      class="bxForm bxFlex"
2028
-                    >
2029
-                      <!-- <nz-form-item>
2030
-                        <nz-form-label [nzSpan]="8" nzRequired nzFor="name"
2031
-                          >联系人</nz-form-label
2032
-                        >
2033
-                        <nz-form-control [nzSpan]="12" nzErrorTip="请填写联系人">
2034
-                          <input
2035
-                            type="text"
2036
-                            nz-input
2037
-                            formControlName="name"
2038
-                            placeholder="请填写联系人"
2039
-                          />
2040
-                        </nz-form-control>
2041
-                      </nz-form-item>
2042
-                      <nz-form-item>
2043
-                        <nz-form-label [nzSpan]="8" nzRequired nzFor="phone"
2044
-                          >联系人电话</nz-form-label
2045
-                        >
2046
-                        <nz-form-control
2047
-                          [nzSpan]="12"
2048
-                          nzErrorTip="请填写联系人电话"
2049
-                        >
2050
-                          <input
2051
-                            type="text"
2052
-                            nz-input
2053
-                            formControlName="phone"
2054
-                            placeholder="请填写联系人电话"
2055
-                          />
2056
-                        </nz-form-control>
2057
-                      </nz-form-item>
2058
-                      <nz-form-item>
2059
-                        <nz-form-label [nzSpan]="8" nzFor="hospital" nzRequired
2060
-                          >所属院区</nz-form-label
2061
-                        >
2062
-                        <nz-form-control [nzSpan]="12" nzErrorTip="请选择所属院区!">
2063
-                          <nz-select
2064
-                            formControlName="hospital"
2065
-                            nzPlaceHolder="请选择所属院区"
2066
-                            (ngModelChange)="getPlace($event)"
2067
-                          >
2068
-                            <nz-option
2069
-                              [nzValue]="area.id"
2070
-                              [nzLabel]="area.area"
2071
-                              *ngFor="let area of areas"
2072
-                            ></nz-option>
2073
-                          </nz-select>
2074
-                        </nz-form-control>
2075
-                      </nz-form-item>
2076
-                      <nz-form-item>
2077
-                        <nz-form-label [nzSpan]="8" nzFor="building" nzRequired
2078
-                          >楼栋</nz-form-label
2079
-                        >
2080
-                        <nz-form-control [nzSpan]="12" nzErrorTip="请选择楼栋!">
2081
-                          <nz-select
2082
-                            formControlName="building"
2083
-                            nzPlaceHolder="请选择楼栋"
2084
-                          >
2085
-                            <nz-option
2086
-                              [nzValue]="place.id"
2087
-                              [nzLabel]="place.place"
2088
-                              *ngFor="let place of places"
2089
-                            >
2090
-                            </nz-option>
2091
-                          </nz-select>
2092
-                        </nz-form-control>
2093
-                      </nz-form-item>
2094
-                      <nz-form-item>
2095
-                        <nz-form-label [nzSpan]="8" nzRequired
2096
-                          >详细地址</nz-form-label
2097
-                        >
2098
-                        <nz-form-control [nzSpan]="12" nzErrorTip="请填写详细地址">
2099
-                          <textarea
2100
-                            formControlName="address"
2101
-                            nz-input
2102
-                            rows="2"
2103
-                            placeholder="请填写详细地址"
2104
-                          ></textarea>
2105
-                        </nz-form-control>
2106
-                      </nz-form-item> -->
2107
-                      <nz-form-item>
2108
-                        <nz-form-label [nzSpan]="8" nzRequired
2109
-                          >报修内容</nz-form-label
2110
-                        >
2111
-                        <nz-form-control
2112
-                          [nzSpan]="12"
2113
-                          nzErrorTip="请填写报修内容"
2114
-                        >
2115
-                          <textarea
2116
-                            formControlName="content"
2117
-                            nz-input
2118
-                            rows="2"
2119
-                            placeholder="请填写报修内容"
2120
-                          ></textarea>
2121
-                        </nz-form-control>
2122
-                      </nz-form-item>
2123
-                      <nz-form-item>
2124
-                        <nz-form-label
2125
-                          [nzSpan]="8"
2126
-                          style="visibility: hidden"
2127
-                        ></nz-form-label>
2128
-                        <nz-form-control [nzSpan]="12">
2129
-                          <button
2130
-                            nz-button
2131
-                            nzType="primary"
2132
-                            [nzLoading]="bxLoading"
2133
-                          >
2134
-                            提交
2135
-                          </button>
2136
-                        </nz-form-control>
2137
-                      </nz-form-item>
2138
-                    </form>
2139
-                  </div>
2140
-                </div>
2141
-                <!-- <nz-table class="bxFlex bxTable" [nzData]="quickBxlbList" nzSize="small" [nzShowPagination]="false"
2142
-                  [nzLoading]="quickBxlbLoading">
2143
-                  <tbody>
2144
-                    <tr (click)="showBxModal(data,'您的报修为“'+data.content+'” 是否确认报修?')" *ngFor="
2145
-                            let data of quickBxlbList;
2146
-                            let i = index
2147
-                          ">
2148
-                      <td>{{ data.content||'无' }}</td>
2149
-                    </tr>
2150
-                  </tbody>
2151
-                </nz-table> -->
2152
-              </div>
2153 1962
               <!-- 报修列表 -->
2154 1963
               <div
2155 1964
                 *ngIf="checkedTableType == 'bxlb' && isShowBx && coopBtns.repairList"

+ 1 - 53
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -115,7 +115,6 @@ export class HushijiandanComponent implements OnInit {
115 115
   searchAccountSubject = new Subject(); //查工号防抖
116 116
   searchTabInpSubject = new Subject(); //左侧查患者信息和检查信息防抖
117 117
   otherSearchChangeSubject = new Subject(); //其他建单搜索防抖
118
-  incidentSearchChangeSubject = new Subject(); //故障现象搜索防抖
119 118
   isYyInspect = false; //需要预约检查
120 119
   inspectAndPatientTransportConfig:any = {timeMod: 30};
121 120
   constructor(
@@ -199,11 +198,6 @@ export class HushijiandanComponent implements OnInit {
199 198
     this.otherSearchChangeSubject.pipe(debounceTime(500)).subscribe((v) => {
200 199
       this.getDeptTaskType(v);
201 200
     });
202
-    this.incidentSearchChangeSubject
203
-      .pipe(debounceTime(500))
204
-      .subscribe((v: string) => {
205
-        this.getIncidentcategory(v);
206
-      });
207 201
 
208 202
     this.getTodayNum();
209 203
     this.initLogin();
@@ -297,9 +291,6 @@ export class HushijiandanComponent implements OnInit {
297 291
         case "historicalMedicineListInquiry":
298 292
           coopBtns.historicalMedicineListInquiry = true; //历史药单查询
299 293
           break;
300
-        case "quickReportForRepair":
301
-          coopBtns.quickReportForRepair = true; //快捷报修
302
-          break;
303 294
         case "repairList":
304 295
           coopBtns.repairList = true; //报修列表
305 296
           break;
@@ -501,7 +492,7 @@ export class HushijiandanComponent implements OnInit {
501 492
         if (result.status == 200) {
502 493
           this.isShowBx = result.list.find(v => v.key == 'hos_itsmIncident').value == 1;
503 494
           this.isAssign = result.list.find(v => v.key == 'nurseSendOrder').value == 1;
504
-          if (this.isShowBx && (this.coopBtns.repairList || this.coopBtns.quickReportForRepair) && !this.checkedTableType) {
495
+          if (this.isShowBx && this.coopBtns.repairList && !this.checkedTableType) {
505 496
             // 初始化默认显示第一个
506 497
             if(this.tabPermission.length){
507 498
               this.checkedTableType = (this.tabPermission[0] && this.tabPermission[0].system) ? 'other' : this.tabPermission[0].id;
@@ -520,9 +511,6 @@ export class HushijiandanComponent implements OnInit {
520 511
             }else if(this.coopBtns.historicalMedicineListInquiry){
521 512
               this.checkedTableType = 'historyDrugsbag';
522 513
               this.checkTable(this.checkedTableType);
523
-            }else if(this.coopBtns.quickReportForRepair && this.isShowBx){
524
-              this.checkedTableType = 'kjbx';
525
-              this.checkTable(this.checkedTableType);
526 514
             }else if(this.coopBtns.repairList && this.isShowBx){
527 515
               this.checkedTableType = 'bxlb';
528 516
               this.checkTable(this.checkedTableType);
@@ -864,12 +852,6 @@ export class HushijiandanComponent implements OnInit {
864 852
   otherSearchChange() {
865 853
     this.otherSearchChangeSubject.next(this.otherSearch);
866 854
   }
867
-  //搜索
868
-  incidentSearch = ""; //搜索的关键词
869
-  incidentNum = 0;
870
-  incidentSearchChange() {
871
-    this.incidentSearchChangeSubject.next(this.incidentSearch);
872
-  }
873 855
   // 切换科室
874 856
   changeKs() {
875 857
     this.hsPromptModalShow = true;
@@ -1385,29 +1367,7 @@ export class HushijiandanComponent implements OnInit {
1385 1367
       }
1386 1368
     });
1387 1369
   }
1388
-  // 获取故障现象(三级)
1389
-  incidentList = [];
1390 1370
   iLoading = false;
1391
-  getIncidentcategory(key = "") {
1392
-    let postData = {
1393
-      idx: 0,
1394
-      sum: 9999,
1395
-      incidentcategory: {
1396
-        category: key,
1397
-        selectType: "pinyin_qs",
1398
-        hierarchyQuery: "three",
1399
-      },
1400
-    };
1401
-    this.iLoading = true;
1402
-    this.mainService
1403
-      .fetchListBx("incidentcategory", postData)
1404
-      .subscribe((data: any) => {
1405
-        this.iLoading = false;
1406
-        if (data.status == 200) {
1407
-          this.incidentList = data.list || [];
1408
-        }
1409
-      });
1410
-  }
1411 1371
   // 获取当前登录人科室任务类型信息
1412 1372
   othersList: any = []; // 其他一键建单列表
1413 1373
   bbMsg: any = {}; //标本一键建单
@@ -1525,9 +1485,6 @@ export class HushijiandanComponent implements OnInit {
1525 1485
           }else if(this.coopBtns.historicalMedicineListInquiry){
1526 1486
             this.checkedTableType = 'historyDrugsbag';
1527 1487
             this.checkTable(this.checkedTableType);
1528
-          }else if(this.coopBtns.quickReportForRepair && this.isShowBx){
1529
-            this.checkedTableType = 'kjbx';
1530
-            this.checkTable(this.checkedTableType);
1531 1488
           }else if(this.coopBtns.repairList && this.isShowBx){
1532 1489
             this.checkedTableType = 'bxlb';
1533 1490
             this.checkTable(this.checkedTableType);
@@ -3648,15 +3605,6 @@ export class HushijiandanComponent implements OnInit {
3648 3605
       this.getBxlb(this.bxlbPageIndex);
3649 3606
       // this.getIncidentState();
3650 3607
       this.getDegrees();
3651
-    } else if (type === "kjbx" && this.isShowBx && this.coopBtns.quickReportForRepair) {
3652
-      // this.getQuickBxlb();
3653
-      this.getIncidentcategory();
3654
-      // 获取报修的区域(所属院区)
3655
-      // this.getArea();
3656
-      // this.bxForm.controls.name.setValue(this.loginUser.name);
3657
-      // this.bxForm.controls.phone.setValue(this.loginUser.phone);
3658
-      // this.bxForm.controls.address.setValue(null);
3659
-      this.bxForm.controls.content.setValue(null);
3660 3608
     }
3661 3609
   }
3662 3610
   //提交报修