bug

src/app/components/configurationCenter/configuration-category/configuration-category.component.ts

@@ -169,7 +169,7 @@ export class ConfigurationCategoryComponent implements OnInit {
       group2: {
         groupName: keyword,
         hospitals: this.validateConfigForm.value.dutyId,
-        type: 1,
+        type: 3,
       },
       idx: 0,
       sum: 10,

src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component.html

@@ -41,8 +41,8 @@
                     </nz-input-group>
                   </nz-form-control>
                 </nz-form-item>
-                <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)"></i>
-                <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system" (click)="removeField(data, i)"></i>
+                <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)" *ngIf="!(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree')"></i>
+                <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system && !(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree')" (click)="removeField(data, i)"></i>
               </div>
             </div>
           </form>

src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component.ts

@@ -165,7 +165,11 @@ export class ConfigurationDictionaryComponent implements OnInit {
       this.dictionaryList.forEach((obj, i) => {
         for (const key in obj) {
           if(key !== 'id' && key !== 'system'){
-            this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl({value: obj[key], disabled: key === 'value' ? obj.system : false}, [Validators.required]))
+            if(this.activeDictionaryKey.key === 'incident_status' || this.activeDictionaryKey.key === 'incident_degree'){
+              this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl({value: obj[key], disabled: true}, [Validators.required]))
+            }else{
+              this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl({value: obj[key], disabled: key === 'value' ? obj.system : false}, [Validators.required]))
+            }
           }
         }
       })

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

@@ -2176,9 +2176,14 @@
                     <!-- 时间 -->
                     <div class="shijian">
                       <span class="left"></span>
-                      <span class="right">
-                        {{ data.acceptDate | date: "MM-dd HH:mm" }}
+                      <span class="right" *ngIf="data.state.value === 'accept' || data.state.value === 'cancel' || data.state.value === 'reject';else notReq">
+                        {{ data.startDate | date: "MM-dd HH:mm" }}
                       </span>
+                      <ng-template #notReq>
+                        <span class="right" *ngIf="data.state.value !== 'accept'">
+                          {{ data.acceptDate | date: "MM-dd HH:mm" }}
+                        </span>
+                      </ng-template>
                     </div>
                   </div>
                 </div>