Merge branch 'lmm' into develop

src/app/services/tool.service.ts

@@ -87,6 +87,9 @@ export class ToolService {
         case "generateQRcode":
           coopBtns.generateQRcode = true; //生成二维码
           break;
+        case "deleted":
+          coopBtns.deleted = true; //已删除
+          break;
       }
     });
     console.log(coopBtns);

src/app/share/hs-prompt-modal/hs-prompt-modal.component.html

@@ -1,13 +1,17 @@
 <div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="show">
   <div class="modalBody" *ngIf="changeShow">
-    <div class="title">当前科室<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="title">当前科室<i *ngIf="closeTimeFlag<=0||closeTimeFlag>0&&closeTime===0"
+        class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
     <div class="content">
       <div class="defeat">{{currentDept.dept}}</div>
-      <div class="countDown">关闭倒计时<em>{{closeTime}}s</em></div>
+      <div class="countDown" *ngIf="closeTimeFlag<0||closeTimeFlag>0&&closeTime>0"><span
+          *ngIf="closeTimeFlag<0">关闭</span>倒计时<em>{{closeTime}}s</em></div>
     </div>
     <div class="display_flex justify-content_flex-center">
-      <button class="btn know" nz-button nzType="primary" (click)="hideModal()">知道了</button>
-      <button class="btn know" nz-button nzType="primary" nzGhost (click)="changeModal()">切换科室</button>
+      <button *ngIf="closeTimeFlag<=0||closeTimeFlag>0&&closeTime===0" class="btn know" nz-button nzType="primary"
+        (click)="hideModal()">知道了</button>
+      <button *ngIf="closeTimeFlag<=0||closeTimeFlag>0&&closeTime===0" class="btn know" nz-button nzType="primary"
+        nzGhost (click)="changeModal()">切换科室</button>
     </div>
   </div>
   <div class="modalBody modalBody-search" *ngIf="!changeShow">

src/app/share/hs-prompt-modal/hs-prompt-modal.component.ts

@@ -23,6 +23,7 @@ export class HsPromptModalComponent implements OnInit {
   @Input() show: Boolean;
   @Input() changeShow: Boolean;
   @Input() closeTime: Number;
+  @Input() closeTimeFlag;
 
   @Output() closeModelHs = new EventEmitter<any>(); //1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
   @Output() clearModelHs = new EventEmitter<any>(); //1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件

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

@@ -95,7 +95,8 @@
       <nz-header>
         <div class="app-header borderB display_flex justify-content_space-between align-items_center">
           <div class="nurseTitle display_flex justify-content_space-between align-items_center">
-            护士端
+            <span>护士端</span>
+            <p class="updateTipsForNurses red">{{updateTipsForNurses}}</p>
             <div class="nurseCode" (click)="showNurseCode()">
               <i class="nurseCodeIcon icon_transport transport-erweima"></i>二维码
             </div>
@@ -1268,8 +1269,9 @@
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo" [back]="back" (closeModel)="closeModel($event)"></app-prompt-modal>
 <!-- 护士端科室切换提示框 -->
-<app-hs-prompt-modal [changeShow]="changeShow" [closeTime]="closeTime" [show]="hsPromptModalShow"
-  (closeModelHs)="closeModelHs($event)" (clearModelHs)="clearModelHs($event)"></app-hs-prompt-modal>
+<app-hs-prompt-modal [changeShow]="changeShow" [closeTime]="closeTime" [closeTimeFlag]="closeTimeFlag"
+  [show]="hsPromptModalShow" (closeModelHs)="closeModelHs($event)" (clearModelHs)="clearModelHs($event)">
+</app-hs-prompt-modal>
 <!-- 标本历史记录查看 -->
 <app-history-prompt-modal *ngIf="historyPromptModalShow" [show]="historyPromptModalShow" [scode]="scode"
   (closeModelHs)="closeModelHistory($event)"></app-history-prompt-modal>

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

@@ -14,9 +14,9 @@
       border: 1px solid red !important;
     }
   }
-  .pos{
+  .pos {
     position: relative;
-    .pos-item{
+    .pos-item {
       position: absolute;
       left: 100px;
       top: -10px;
@@ -665,6 +665,12 @@
           font-size: 22px;
           color: #333;
           flex: 1;
+          .updateTipsForNurses {
+            margin: 0;
+            width: 50%;
+            line-height: normal;
+            font-size: 14px;
+          }
           .nurseCode {
             width: 80px;
             font-size: 14px;

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

@@ -122,6 +122,7 @@ export class HushijiandanComponent implements OnInit {
   }
   // 关闭倒计时
   closeTime = 3;
+  closeTimeFlag;
   timerCloseTime = null;
   changeShow = true;
   currentHospital; //当前院区
@@ -130,6 +131,8 @@ export class HushijiandanComponent implements OnInit {
   logTime = 0; //综合日志自动刷新秒数
   logTimeConst = 30; //综合日志自动刷新秒数
   ngOnInit() {
+    this.getUpdateTipsForNurses();
+    this.getCloseTimeFlag();
     this.currentUser = this.tool.getCurrentUserDept();
     console.log(this.currentUser, this.tabSearchCont);
     //防抖
@@ -140,7 +143,7 @@ export class HushijiandanComponent implements OnInit {
       this.getDeptTaskType(v);
     });
     this.currentHospital = this.tool.getCurrentHospital();
-    this.changeKs();
+
     this.initLogin();
     this.getDeptTaskType();
     this.initForm();
@@ -210,6 +213,41 @@ export class HushijiandanComponent implements OnInit {
     this.remarksEle.nativeElement.focus();
     this.workOrderRemark += item;
   }
+  // 获取护士端更新提示
+  updateTipsForNurses = '';
+  getUpdateTipsForNurses(){
+    let postData = {
+      idx: 0,
+      sum: 1,
+      systemConfiguration: { keyconfig: "updateTipsForNurses" },
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "systemConfiguration", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          this.updateTipsForNurses = result.list[0].valueconfig;
+        }
+      });
+  }
+  // 获取护士端弹窗的配置
+  // (1)	当用户设置为正数时，用户必须查看此窗体指定秒数。
+  // (2)	当用户设置为负数时，用户可点击知道了也可倒计时自动关闭。
+  // (3)	如果用户填写0则为无自动关闭和强制查看时间。
+  getCloseTimeFlag() {
+    let postData = {
+      idx: 0,
+      sum: 1,
+      systemConfiguration: { keyconfig: "nurseDeptSwitchTip" },
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "systemConfiguration", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          this.closeTimeFlag = result.list[0].valueconfig - 0;
+          this.changeKs();
+        }
+      });
+  }
   //获取综合日志
   rLoading = false;
   listDeptOrderRecords: any = [];
@@ -349,12 +387,20 @@ export class HushijiandanComponent implements OnInit {
   // 切换科室
   changeKs() {
     this.hsPromptModalShow = true;
-    this.closeTime = 3;
+    // (1)	当用户设置为正数时，用户必须查看此窗体指定秒数。
+    // (2)	当用户设置为负数时，用户可点击知道了也可倒计时自动关闭。
+    // (3)	如果用户填写0则为无自动关闭和强制查看时间。
+    if (this.closeTimeFlag === 0) {
+      return;
+    }
+    this.closeTime = Math.abs(this.closeTimeFlag);
     clearInterval(this.timerCloseTime);
     this.timerCloseTime = setInterval(() => {
-      this.closeTime = Math.max(--this.closeTime, -1);
-      if (this.closeTime === -1) {
-        this.hsPromptModalShow = false;
+      this.closeTime = Math.max(--this.closeTime, 0);
+      if (this.closeTime === 0) {
+        if (this.closeTimeFlag <= 0) {
+          this.hsPromptModalShow = false;
+        }
         clearInterval(this.timerCloseTime);
       }
     }, 1000);

src/app/views/login/login.component.html

@@ -41,8 +41,8 @@
     <div class="bottom">
       <span>@大势科技.[京ICO:143]</span>
       <strong>点击下载谷歌浏览器👉</strong>
-      <a href="http://192.168.220.84/chrome64/ChromeSetup32.exe">win32</a>
-      <a href="http://192.168.220.84/chrome64/ChromeSetup64.exe">win64</a>
+      <a [href]="http.domain+'/chrome64/ChromeSetup32.exe'">win32</a>
+      <a [href]="http.domain+'/chrome64/ChromeSetup64.exe'">win64</a>
     </div>
   </div>
 </div>

src/app/views/login/login.component.ts

@@ -4,6 +4,7 @@ import { FormBuilder, Validators, FormGroup } from "@angular/forms";
 import { NzMessageService } from "ng-zorro-antd/message";
 
 import { MainService } from "../../services/main.service";
+import http from "../../../assets/js/http";
 import { AES, mode, pad, enc } from "crypto-js";
 
 @Component({
@@ -12,6 +13,7 @@ import { AES, mode, pad, enc } from "crypto-js";
   styleUrls: ["./login.component.less"],
 })
 export class LoginComponent implements OnInit {
+  http;
   validateForm: FormGroup;
   loading: boolean = false;
   // 是否单点登录
@@ -23,6 +25,7 @@ export class LoginComponent implements OnInit {
     private msg: NzMessageService
   ) {}
   ngOnInit() {
+    this.http = http;
     let url = location.href;
     this.isSingleSignOn = url.includes("?");
     if (this.isSingleSignOn) {

src/app/views/order-management/order-management.component.html

@@ -71,8 +71,8 @@
         </div>
       </div>
       <div nz-col nzXl='7' class="list-template__btns">
-        <button nz-button class="btn default" *ngIf="coopBtns.del" [disabled]="!checkedDepIds.length"
-          (click)='showDelModals($event)'>批量删除</button>
+        <button nz-button class="btn default" *ngIf="coopBtns.del"
+          [disabled]="!checkedDepIds.length||(checkOptionsOne[3]?.checked)" (click)='showDelModals($event)'>批量删除</button>
         <button nz-button class="btn default ml8" (click)='search()'>搜索</button>
         <button nz-button *ngIf="coopBtns.export" class="btn default ml8" (click)='export()'
           [nzLoading]="loading2">导出</button>
@@ -121,7 +121,7 @@
             <td>
               <div class="coop">
                 <span *ngIf="coopBtns.look" (click)="detail($event,data.id)">查看</span>
-                <span *ngIf="coopBtns.del&&data.gdState.value!=6&&data.gdState.value!=7"
+                <span *ngIf="coopBtns.del&&data.gdState.value!=6&&data.gdState.value!=7&&!(checkOptionsOne[3]?.checked)"
                   (click)="showDelModal($event,data.id)">删除</span>
               </div>
             </td>

src/app/views/order-management/order-management.component.ts

@@ -25,6 +25,14 @@ export class OrderManagementComponent implements OnInit {
     });
     this.initOrderType();
     this.coopBtns = this.tool.initCoopBtns(this.route);
+    if (this.coopBtns.deleted) {
+      //是否显示已删除
+      this.checkOptionsOne.push({
+        label: "已删除",
+        value: "3",
+        checked: false,
+      });
+    }
     this.getAllHos();
     this.getGdStates();
   }
@@ -190,6 +198,13 @@ export class OrderManagementComponent implements OnInit {
         timeOut: that.checkOptionsOne[0].checked ? 1 : 0,
       },
     };
+    if (that.checkOptionsOne[3]) {
+      if (that.checkOptionsOne[3].checked) {
+        data.workOrder.deleteFlag = 1;
+      } else {
+        delete data.workOrder.deleteFlag;
+      }
+    }
     if (that.association) {
       data.workOrder.taskType = {
         associationType: { id: that.association },

src/app/views/sys-config/sys-config.component.html

@@ -62,9 +62,9 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item class="formItem">
-          <nz-form-label [nzSpan]="11" nzFor="deptQRCode" nzRequired class="label">是否开通科室二维码设置
+          <nz-form-label [nzSpan]="10" nzFor="deptQRCode" nzRequired class="label">是否开通科室二维码设置
           </nz-form-label>
-          <nz-form-control [nzSpan]="13" nzErrorTip="是否开通科室二维码设置是必填项!">
+          <nz-form-control [nzSpan]="14" nzErrorTip="是否开通科室二维码设置是必填项!">
             <nz-radio-group formControlName="deptQRCode">
               <label nz-radio nzValue="1">是</label>
               <label nz-radio nzValue="0">否</label>
@@ -92,6 +92,21 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
+        <nz-form-item class="formItem">
+          <nz-form-label [nzSpan]="13" nzFor="nurseDeptSwitchTip" nzRequired class="label">护士科室切换提示自动关闭设置
+          </nz-form-label>
+          <nz-form-control [nzSpan]="11" nzErrorTip="护士科室切换提示自动关闭设置是必填项!">
+            <nz-input-number class="w100" formControlName="nurseDeptSwitchTip" [nzStep]="1"></nz-input-number>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item class="formItem">
+          <nz-form-label [nzSpan]="7" nzFor="updateTipsForNurses" class="label">护士端更新提示
+          </nz-form-label>
+          <nz-form-control [nzSpan]="17" nzErrorTip="护士端更新提示是必填项!">
+            <textarea nz-input placeholder="最多50个字" formControlName="updateTipsForNurses"
+              [nzAutosize]="{ minRows: 3, maxRows: 3 }" maxlength="50"></textarea>
+          </nz-form-control>
+        </nz-form-item>
       </div>
     </form>
   </div>

src/app/views/sys-config/sys-config.component.ts

@@ -37,6 +37,8 @@ export class SysConfigComponent implements OnInit {
       orderClearUserSwitch: [null, [Validators.required]],
       deptQRCode: [null, [Validators.required]],
       workOrderSettings: [5, [Validators.required]],
+      nurseDeptSwitchTip: [0, [Validators.required]],
+      updateTipsForNurses: [""],
       defaultRoleOfNurse: [null, [Validators.required]],
       formUrl: [{ value: null, disabled: true }, [Validators.required]],
       serviceUrl: [{ value: null, disabled: true }, [Validators.required]],
@@ -94,6 +96,8 @@ export class SysConfigComponent implements OnInit {
         item.keyconfig === "orderClearUserSwitch" ||
         item.keyconfig === "deptQRCode" ||
         item.keyconfig === "workOrderSettings" ||
+        item.keyconfig === "nurseDeptSwitchTip" ||
+        item.keyconfig === "updateTipsForNurses" ||
         item.keyconfig === "defaultRoleOfNurse" ||
         item.keyconfig === "busiViewDeptId"
     );
@@ -109,6 +113,10 @@ export class SysConfigComponent implements OnInit {
         item.valueconfig = this.validateForm.controls.deptQRCode.value;
       } else if (item.keyconfig === "workOrderSettings") {
         item.valueconfig = this.validateForm.controls.workOrderSettings.value;
+      } else if (item.keyconfig === "nurseDeptSwitchTip") {
+        item.valueconfig = this.validateForm.controls.nurseDeptSwitchTip.value;
+      } else if (item.keyconfig === "updateTipsForNurses") {
+        item.valueconfig = this.validateForm.controls.updateTipsForNurses.value;
       } else if (item.keyconfig === "defaultRoleOfNurse") {
         item.valueconfig = this.validateForm.controls.defaultRoleOfNurse.value;
       } else if (item.keyconfig === "busiViewDeptId") {
@@ -176,6 +184,12 @@ export class SysConfigComponent implements OnInit {
                 case "workOrderSettings":
                   this.validateForm.controls.workOrderSettings.setValue(c[1]);
                   break;
+                case "nurseDeptSwitchTip":
+                  this.validateForm.controls.nurseDeptSwitchTip.setValue(c[1]);
+                  break;
+                case "updateTipsForNurses":
+                  this.validateForm.controls.updateTipsForNurses.setValue(c[1]);
+                  break;
                 case "defaultRoleOfNurse":
                   this.validateForm.controls.defaultRoleOfNurse.setValue(
                     c[1] - 0

src/assets/js/http.js

@@ -3,6 +3,7 @@ var port = location.port;//端口
 var protocolName = document.location.protocol;//http协议
 var wsName = protocolName === 'http:' ? 'ws' : 'wss';//ws协议
 module.exports = {
+  domain: protocolName + '//' + domainName + ':' + port,//chrome下载
   host: protocolName + '//' + domainName + ':' + port + '/service',//测试接口
   specimenViewHost: protocolName + '//' + domainName + ':' + port + '/specimenView',//业务视图
   bigScreenHost: protocolName + '//' + domainName + ':' + port + '/largeScreen',//大屏地址