任务类型

angular.json

@@ -50,7 +50,7 @@
               ],
               "optimization": true,
               "outputHashing": "all",
-              "sourceMap": true,
+              "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
               "aot": true,

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "https://zzzx.m-tjh.com.cn",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

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

@@ -23,9 +23,9 @@
           <thead>
             <tr class="thead">
               <th nzWidth="30px" style="text-align: center"></th>
-              <th nzWidth="60px" style="text-align: center">姓名</th>
-              <th nzWidth="140px" style="text-align: center">工作情况</th>
-              <th nzWidth="200px" 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> -->
             </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">{{ data.freetime }}</td> -->
+              <!-- <td nzAlign="center">{{ data.palce||'-' }}</td> -->
             </tr>
           </tbody>
         </nz-table>

src/app/views/fuwutai/fuwutai.component.html

@@ -727,7 +727,7 @@
           </div>
           <div nz-row>
             <div nz-col nzSpan="6">
-              文本标签：
+              工单信息：
             </div>
             <div nz-col nzSpan="18">
               <div nz-row>

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

@@ -554,7 +554,7 @@ export class FuwutaiComponent implements OnInit {
   // 展示形式
   patientCareCol: number = 6; //顶部工单列数(4列-8人，7列-14人，6列-单排 ）
   hurseInfoHiding; //护工信息隐藏
-  txtLabelCol: number = 1; //文本标签列数
+  txtLabelCol: number = 1; //工单信息列数
   workerInfoTime: number = 30; //支助人员刷新时间
   orderInfoTime: number = 30; //工单刷新时间
   audioNotDispatched: boolean = true; //是否开启定时播报未派出工单提示音

src/app/views/task-type-management/task-type-management.component.html

@@ -622,9 +622,9 @@
           <input nz-input class="mb8 w100" [(ngModel)]="carryingCourses[indexs].name" placeholder="请选择科室名称" nzSize="" />
           <nz-form-label class="label" nzRequired>默认科室</nz-form-label>
           <nz-select class="mb8 w100" nzShowSearch nzAllowClear nzPlaceHolder="请选择默认科室"
-            [(ngModel)]="departmentStrategy.id" (ngModelChange)="depa($event,'clear')"
+            [ngModel]="departmentStrategy.idv" (ngModelChange)="depa(departmentStrategy,$event,'clear')"
             [nzLoading]="yLoading">
-            <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of departmentData"></nz-option>
+            <nz-option nzLabel="{{data.name}}" nzValue="{{data.id+'__'+data.value}}" *ngFor="let data of departmentData"></nz-option>
           </nz-select>
           <div *ngIf="depaShow1">
             <nz-form-label class="label" nzRequired>固定科室范围</nz-form-label>

src/app/views/task-type-management/task-type-management.component.ts

@@ -208,6 +208,8 @@ export class TaskTypeManagementComponent implements OnInit {
   departmentTypeIds; //固定科室选择字段
   departmentStrategy: any = {
     id: null,
+    idv: null,
+    value: null,
   }; //默认科室字段
   checkoutMethod = {
     //检验方式字段
@@ -784,7 +786,12 @@ export class TaskTypeManagementComponent implements OnInit {
       }
       this.carryingCourses = data.carryingCourses;
       this.ysgcData(this.carryingCourses[this.indexs]);
-      this.depa(this.carryingCourses[this.indexs].departmentStrategy.id);
+      this.depa(
+        this.carryingCourses[this.indexs].departmentStrategy,
+        this.carryingCourses[this.indexs].departmentStrategy.id +
+          "__" +
+          this.carryingCourses[this.indexs].departmentStrategy.value
+      );
     }
   }
   // 获取科室类型
@@ -976,8 +983,9 @@ export class TaskTypeManagementComponent implements OnInit {
     }
     this.taskData.taskType["specialCloseButton"] = this.specialCloseButton;
     if (this.departmentStrategy.id) {
-      this.taskData.taskType.carryingCourses[this.indexs].departmentStrategy =
-        this.departmentStrategy;
+      this.taskData.taskType.carryingCourses[this.indexs].departmentStrategy = {
+        id: this.departmentStrategy.id,
+      };
     }
     if (!this.departments || !this.departments.length) {
       if (this.departmentIds) {
@@ -1692,16 +1700,22 @@ export class TaskTypeManagementComponent implements OnInit {
     this.getDepartment();
     this.getcheckout();
     this.ysgcData(this.carryingCourses[this.indexs]);
-    this.depa(this.carryingCourses[this.indexs].departmentStrategy.id);
+    this.depa(
+      this.carryingCourses[this.indexs].departmentStrategy,
+      this.carryingCourses[this.indexs].departmentStrategy.id +
+        "__" +
+        this.carryingCourses[this.indexs].departmentStrategy.value
+    );
   }
   //处理运送过程字段
   ysgcData(data) {
     console.log(data, "---运送过程自动建单字段(包含各个班次的信息)-----");
     console.log(this.indexs, "----索引(起点科室，终点科室对应数组的索引)----");
     if (data.departmentStrategy) {
-      this.departmentStrategy.id = data.departmentStrategy.id + "";
+      this.departmentStrategy.idv =
+        data.departmentStrategy.id + "__" + data.departmentStrategy.value;
     } else {
-      this.departmentStrategy.id = null;
+      this.departmentStrategy.idv = null;
     }
     if (data.checkoutMethod) {
       this.checkoutMethod.id = data.checkoutMethod.id + "";
@@ -1905,14 +1919,17 @@ export class TaskTypeManagementComponent implements OnInit {
     this.dept_types = true;
   }
   //默认科室选择
-  depa(data, doing?): void {
-    var obj = null;
-    if (this.departmentData) {
-      obj = this.departmentData.filter((v) => v.id == data)[0];
-    }
-    console.log(obj, "-----------------------1111");
-    if (obj) {
-      if (obj.value == "2") {
+  depa(data, e, doing?): void {
+    console.log(e, "-----------------------1111");
+    let arr = e.split("__");
+    if (doing === "clear") {
+      data.idv = e;
+      data.id = arr[0] - 0;
+      data.value = arr[1] - 0;
+    }
+    let value = arr[1];
+    if (value) {
+      if (value == "2") {
         this.depaShow = true;
         if (doing === "clear") {
           //固定科室
@@ -1925,7 +1942,7 @@ export class TaskTypeManagementComponent implements OnInit {
         }
         this.depaShow1 = false;
         this.depaShow4 = false;
-      } else if (obj.value == "5") {
+      } else if (value == "5") {
         //固定科室类型
         this.depaShow4 = true;
         if (doing === "clear") {
@@ -1939,7 +1956,7 @@ export class TaskTypeManagementComponent implements OnInit {
         }
         this.depaShow = false;
         this.depaShow1 = false;
-      } else if (obj.value == "3") {
+      } else if (value == "3") {
         this.depaShow1 = true;
         if (doing === "clear") {
           //固定科室范围