Kaynağa Gözat

修复分组选人BUG和增加任务类型开关是否允许数字交接

seimin 2 yıl önce
ebeveyn
işleme
342c5c3b54

+ 1 - 1
src/app/views/group-management/group-management.component.html

@@ -88,7 +88,7 @@
88 88
               nzShowCheckbox
89 89
               [nzDisabled]="!coopBtns.edit || checkedGroup.type == 2"
90 90
               [nzChecked]="mapOfCheckedId[data.id]"
91
-              (nzCheckedChange)="refreshStatus()"
91
+              (nzCheckedChange)="selectedUser(data)"
92 92
             ></td>
93 93
             <td>{{ data.dept.dept }} {{ data.name }}</td>
94 94
           </tr>

+ 7 - 0
src/app/views/task-type-management/task-type-management.component.html

@@ -229,6 +229,13 @@
229 229
             <label nz-radio nzValue='0'></label>
230 230
           </nz-radio-group>
231 231
         </div>
232
+        <div class="mb8 w100" *ngIf="association['id'] == 256 || association['id'] == 380">
233
+          <nz-form-label class="label" nzRequired>是否允许数字交接</nz-form-label>
234
+          <nz-radio-group class="handlerType" [(ngModel)]="isDigitalHandover">
235
+            <label nz-radio nzValue='1'></label>
236
+            <label nz-radio nzValue='0'></label>
237
+          </nz-radio-group>
238
+        </div>
232 239
         <div nz-row *ngIf='carryShow&&(association.id == 260 || association.id == 255)'>
233 240
           <div nz-col nzSpan="5" class="label ml8">携带设备:</div>
234 241
           <div nz-col nzSpan="18">

+ 10 - 0
src/app/views/task-type-management/task-type-management.component.ts

@@ -103,6 +103,7 @@ export class TaskTypeManagementComponent implements OnInit {
103 103
   isRepeatCreateOder = "2"; //限制重复建单
104 104
   isDrugsCreateTime = "0"; //药品自动建单
105 105
   isOneClickSignIn = "0"; //是否允许一键签收
106
+  isDigitalHandover = "0"; //是否允许数字交接
106 107
   // wechatFocusSwitch = "0"; //支助中心端是否能标记重点关注
107 108
   isRemarks: any = "0"; //是否需要备注信息(其他类型)
108 109
   remarks = ""; //备注信息提示用语(其他类型)
@@ -764,6 +765,10 @@ export class TaskTypeManagementComponent implements OnInit {
764 765
       !data.isOneClickSignIn
765 766
         ? "0"
766 767
         : data.isOneClickSignIn + ""; //是否允许一键签收
768
+    this.isDigitalHandover =
769
+      !data.isDigitalHandover
770
+        ? "0"
771
+        : data.isDigitalHandover + ""; //是否允许数字交接
767 772
     // this.wechatFocusSwitch =
768 773
     //   data.wechatFocusSwitch === undefined ? "0" : data.wechatFocusSwitch + ""; //支助中心端是否能标记重点关注
769 774
     this.leadTime =
@@ -1083,6 +1088,11 @@ export class TaskTypeManagementComponent implements OnInit {
1083 1088
     }else{
1084 1089
       this.taskData.taskType.isOneClickSignIn = parseInt(this.isOneClickSignIn); //是否允许一键签收
1085 1090
     }
1091
+    if (!this.isDigitalHandover ||this.isDigitalHandover === '0') {
1092
+      this.taskData.taskType.isDigitalHandover = null;
1093
+    }else{
1094
+      this.taskData.taskType.isDigitalHandover = parseInt(this.isDigitalHandover); //是否允许数字交接
1095
+    }
1086 1096
     // this.taskData.taskType.wechatFocusSwitch =
1087 1097
     //   this.wechatFocusSwitch === "1" ? 1 : 0; //支助中心端重点关注开关
1088 1098
     this.taskData.taskType.remarksSwitch = this.isRemarks === "1" ? 1 : 0; //是否需要备注信息

+ 1 - 1
src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
8 8
   enableProdMode();
9 9
   if (window) {
10 10
     window.console.log = function () { };
11
-    console.info('v2.4.7');
11
+    console.info('v2.4.8');
12 12
   }
13 13
 }
14 14
 platformBrowserDynamic().bootstrapModule(AppModule)