修改派单页面

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.4.240",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/share/allocation-worker/allocation-worker.component.html

@@ -24,8 +24,8 @@
             <tr class="thead">
               <th nzWidth="30px" style="text-align: center"></th>
               <th style="text-align: center">姓名</th>
-              <!-- <th nzWidth="140px" style="text-align: center">工作情况</th> -->
-              <!-- <th nzWidth="200px" style="text-align: center">最后地址以及目标地址</th> -->
+              <th nzWidth="303px" style="text-align: center" *ngIf="workerDispatchUserList === 'dynamic'">工单数</th>
+              <th nzWidth="303px" style="text-align: center" *ngIf="workerDispatchUserList === 'dynamic'">空闲时间</th>
             </tr>
           </thead>
           <tbody>
@@ -33,8 +33,8 @@
               <td nzShowCheckbox [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="checkAllotWorker(data.id)">
               </td>
               <td nzAlign="center">{{ data.name }}</td>
-              <!-- <td nzAlign="center">{{ data.freetime }}</td> -->
-              <!-- <td nzAlign="center">{{ data.palce||'-' }}</td> -->
+              <td nzAlign="center" *ngIf="workerDispatchUserList === 'dynamic'">{{ data.totalCount }}</td>
+              <td nzAlign="center" *ngIf="workerDispatchUserList === 'dynamic'">{{ data.freetime }}</td>
             </tr>
           </tbody>
         </nz-table>

src/app/share/allocation-worker/allocation-worker.component.ts

@@ -43,6 +43,7 @@ export class AllocationWorkerComponent implements OnInit {
   loading1 = false;
   nameMask = false; //是否禁用
   groupMask = false; //是否禁用
+  workerDispatchUserList = '';
   getWorkerList(pageIndex?) {
     this.id = this.route.snapshot.paramMap.get("id");
     this.stateId = this.route.snapshot.paramMap.get("stateId");
@@ -81,6 +82,7 @@ export class AllocationWorkerComponent implements OnInit {
           this.loading1 = false;
         }
         console.log(data);
+        this.workerDispatchUserList = data.type;
         this.workerList = data.data;
         this.listLength = data.totalNum;
       });

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

@@ -905,6 +905,7 @@ export class FuwutaiComponent implements OnInit {
       groups: [typeId],
       idx: 0,
       sum: 100,
+      hosId: this.checkedHos,
     };
     if (typeId == -1) {
       let groups = [];

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

@@ -474,6 +474,20 @@
                 </nz-radio-group>
               </nz-form-control>
             </ng-container>
+            <ng-container *ngSwitchCase="'dispatchUserList'">
+              <nz-form-label [nzSpan]="24" [nzFor]="config.key" nzRequired class="label">{{ config.desc }}</nz-form-label>
+              <nz-form-control [nzSpan]="24" [nzErrorTip]="'请选择' + config.desc + '!'">
+                <nz-select [formControlName]="config.key" [nzPlaceHolder]="'请选择' + config.desc" nzShowSearch>
+                  <ng-container *ngFor="let o of dispatchUserList">
+                    <nz-option *ngIf="true" nzValue="{{o.id}}" nzLabel="{{o.name}}"></nz-option>
+                  </ng-container>
+                  <nz-option *ngIf="false" nzDisabled nzCustomContent>
+                    <i nz-icon nzType="loading" class="loading-icon"></i>
+                    正在加载中...
+                  </nz-option>
+                </nz-select>
+              </nz-form-control>
+            </ng-container>
             <ng-container *ngSwitchDefault>
               <nz-form-label
                 [nzSpan]="24"

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

@@ -27,6 +27,7 @@ export class HospitalConfigComponent implements OnInit {
   searchLoading: boolean = false;
   hospitalConfigList = []; //院区系统配置列表
   roleList = []; //角色列表
+  dispatchUserList = []; //派单列表
   taskTypeList = []; //任务类型列表
   allTaskTypeList = []; //任务类型列表
   deptList = []; //科室列表
@@ -162,6 +163,7 @@ export class HospitalConfigComponent implements OnInit {
   //初始化请求数据
   getInit() {
     this.isLoading = true;
+    this.getDispatchUserList();
     Promise.all([
       this.getRoleList(),
       this.getDeptList(this.hosId),
@@ -202,6 +204,7 @@ export class HospitalConfigComponent implements OnInit {
         if (result[7].status == 200) {
           this.isHosItsmIncident = result[7].list.find(v => v.keyconfig == 'itsmIncident').valueconfig == 1;
         }
+
         this.getHospitalConfigList(this.hosId).subscribe((res) => {
           if (res.status == 200) {
             this.hospitalConfigList = res.list;
@@ -362,6 +365,12 @@ export class HospitalConfigComponent implements OnInit {
       .getFetchDataList("user/data", "role", postData)
       .toPromise();
   }
+  // 获取派单列表
+  getDispatchUserList() {
+    this.mainService.getDictionary("list", "dispatchUserList").subscribe(result => {
+      this.dispatchUserList = result || [];
+    })
+  }
   // 获取任务类型列表(患者其他服务)
   getTaskTypeList(associationTypeIds?,keyword?) {
     let postData: any = {

src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
   enableProdMode();
   if (window) {
     window.console.log = function () { };
-    console.info('v2.4.43');
+    console.info('v2.4.44');
   }
 }
 platformBrowserDynamic().bootstrapModule(AppModule)