seimin 2 月之前
父节点
当前提交
ea2a7849be

+ 9 - 1
src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.html

@@ -53,7 +53,7 @@
53 53
             </thead>
54 54
             <tbody>
55 55
               <tr *ngFor="let data of dataList;let i = index">
56
-                <td>{{data.orders}}</td>
56
+                <td><span class="circleWrap"><span class="circle" [ngClass]="{ red: data.extra8 != 1 }" title="未初始化"></span>{{data.orders}}</span></td>
57 57
                 <td>{{data.extra6}}</td>
58 58
                 <td>{{data.name}}</td>
59 59
                 <td>{{data.extra5DTO?.name}}</td>
@@ -103,6 +103,14 @@
103 103
             </nz-input-group>
104 104
           </nz-form-control>
105 105
         </nz-form-item>
106
+        <nz-form-item>
107
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="extra6">项目标识</nz-form-label>
108
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入项目标识!">
109
+            <nz-input-group>
110
+              <input formControlName="extra6" nz-input placeholder="请输入项目标识">
111
+            </nz-input-group>
112
+          </nz-form-control>
113
+        </nz-form-item>
106 114
         <nz-form-item>
107 115
           <nz-form-label [nzSpan]="6" nzRequired nzFor="extra4">默认检查科室</nz-form-label>
108 116
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择默认检查科室!">

+ 15 - 0
src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.less

@@ -16,6 +16,21 @@
16 16
     height: 100%!important;
17 17
     padding: 0!important;
18 18
   }
19
+  .circleWrap{
20
+    position: relative;
21
+    .circle{
22
+      width: 8px;
23
+      height: 8px;
24
+      border-radius: 50%;
25
+      position: absolute;
26
+      top: 50%;
27
+      left: -8px;
28
+      transform: translate(-50%,-50%);
29
+      &.red{
30
+        background-color: red;
31
+      }
32
+    }
33
+  }
19 34
   .content{
20 35
     flex: 1;
21 36
     min-height: 0;

+ 4 - 0
src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.ts

@@ -61,6 +61,7 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
61 61
     this.coopData = data;
62 62
     this.validateForm.controls.orders.setValue(data.orders);
63 63
     this.validateForm.controls.name.setValue(data.name);
64
+    this.validateForm.controls.extra6.setValue(data.extra6);
64 65
     this.validateForm.controls.extra4.setValue(data.extra4DTO ? data.extra4DTO.id : null);
65 66
     this.validateForm.controls.extra5.setValue(data.extra5DTO ? data.extra5DTO.id : null);
66 67
     this.validateForm.controls.extra7.setValue(data.deptList ? data.deptList.map(v => v.id) : []);
@@ -114,6 +115,7 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
114 115
           desc: "检查项目",
115 116
           orders: this.validateForm.value.orders,
116 117
           name: this.validateForm.value.name,
118
+          extra6: this.validateForm.value.extra6,
117 119
           extra4: this.validateForm.value.extra4,
118 120
           extra5: this.validateForm.value.extra5,
119 121
           extra7: this.validateForm.value.extra7.toString(),
@@ -128,6 +130,7 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
128 130
           ...{
129 131
             orders: this.validateForm.value.orders,
130 132
             name: this.validateForm.value.name,
133
+            extra6: this.validateForm.value.extra6,
131 134
             extra4: this.validateForm.value.extra4,
132 135
             extra5: this.validateForm.value.extra5,
133 136
             extra7: this.validateForm.value.extra7.toString(),
@@ -160,6 +163,7 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
160 163
     this.validateForm = this.fb.group({
161 164
       orders: [null, [Validators.required]],
162 165
       name: [null, [Validators.required]],
166
+      extra6: [null, [Validators.required]],
163 167
       extra4: [null, [Validators.required]],
164 168
       extra5: [null, [Validators.required]],
165 169
       extra7: [[]],