Bläddra i källkod

增加检查紧急显示

seimin 3 år sedan
förälder
incheckning
4d61e7dc9b

+ 1 - 1
proxy.conf.json

@@ -1,6 +1,6 @@
1 1
 {
2 2
   "/service": {
3
-    "target": "http://192.168.3.87",
3
+    "target": "http://192.168.3.108",
4 4
     "logLevel": "debug",
5 5
     "changeOrigin": true,
6 6
     "pathRewrite": {

+ 8 - 3
src/app/views/hushijiandan/hushijiandan.component.html

@@ -782,9 +782,14 @@
782 782
           <nz-form-item *ngIf="checkedShowMsg.status==200">
783 783
             <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck">关联的检查</nz-form-label>
784 784
             <nz-form-control class="datesGroup" *ngIf="linkCheckLis.length">
785
-              <nz-checkbox-group class="linkCheckCheck" formControlName="linkCheck" [(ngModel)]="linkCheckLis"
786
-                (ngModelChange)="linkCheckLisChange()">
787
-              </nz-checkbox-group>
785
+              <nz-checkbox-wrapper class="linkCheckCheck" ngDefaultControl formControlName="linkCheck" (nzOnChange)="linkCheckLisChange($event)" [(ngModel)]="linkCheckLis">
786
+                <div nz-row *ngFor="let item of linkCheckLis">
787
+                  <div nz-col nzSpan="24">
788
+                    <label nz-checkbox [nzValue]="item">{{item.label}}</label>
789
+                    <i class="icon_transport transport-zu1468 priority" *ngIf="item.priority === 1||item.priority==='1'"></i>
790
+                  </div>
791
+                </div>
792
+              </nz-checkbox-wrapper>
788 793
             </nz-form-control>
789 794
             <div *ngIf="!linkCheckLis.length">暂无关联的检查</div>
790 795
           </nz-form-item>

+ 4 - 20
src/app/views/hushijiandan/hushijiandan.component.less

@@ -363,7 +363,7 @@
363 363
             padding-bottom: 8px;
364 364
             display: flex;
365 365
             justify-content: space-between;
366
-            span{
366
+            span {
367 367
               font-weight: normal;
368 368
               font-size: 14px;
369 369
               color: @primary-color;
@@ -1420,6 +1420,9 @@
1420 1420
             .linkCheckCheck {
1421 1421
               text-indent: 7px;
1422 1422
               margin-top: 0;
1423
+              .priority {
1424
+                color: #d81e06;
1425
+              }
1423 1426
             }
1424 1427
           }
1425 1428
 
@@ -1439,25 +1442,6 @@
1439 1442
           }
1440 1443
         }
1441 1444
       }
1442
-
1443
-      .inspectionForm {
1444
-        .ant-form-item {
1445
-          margin-bottom: 0;
1446
-        }
1447
-        .ant-form-item-label {
1448
-          text-align: left;
1449
-        }
1450
-
1451
-        .datesGroup {
1452
-          padding-top: 10px;
1453
-
1454
-          .linkCheckCheck {
1455
-            text-indent: 7px;
1456
-            margin-top: 0;
1457
-          }
1458
-        }
1459
-      }
1460
-
1461 1445
       .shortcutForm {
1462 1446
         padding-top: 20px;
1463 1447
 

+ 10 - 6
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -1290,11 +1290,6 @@ export class HushijiandanComponent implements OnInit {
1290 1290
     // 判断这个任务类型是否允许加急 end
1291 1291
     let that = this;
1292 1292
     this.linkCheckLisTrue = true;
1293
-    console.log(
1294
-      that.patientForm.controls.linkCheck.value,
1295
-      this.linkCheckLis,
1296
-      this.checkedShowMsg
1297
-    );
1298 1293
     let postData = {
1299 1294
       taskTypeId: that.patientForm.controls.checkedType.value,
1300 1295
       patientCode: that.patientMsg.patientCode,
@@ -1327,6 +1322,7 @@ export class HushijiandanComponent implements OnInit {
1327 1322
           data.data.forEach((e) => {
1328 1323
             arr.push({
1329 1324
               yyTime: e.yyTime,
1325
+              priority: e.priority,
1330 1326
               label:
1331 1327
                 (e.yyTime || "") +
1332 1328
                 " " +
@@ -1345,7 +1341,15 @@ export class HushijiandanComponent implements OnInit {
1345 1341
   linkCheckLisTrue = true; //是否有已选择(患者)
1346 1342
   hasTime = false; //是否有已选择,并且是否有预约时间(患者)
1347 1343
   lessTime = false; //预约时间列表中预约时间少于生效时长,则是false
1348
-  linkCheckLisChange() {
1344
+  linkCheckLisChange(e) {
1345
+    console.log(e, this.linkCheckLis);
1346
+    this.linkCheckLis.forEach((item) => {
1347
+      e.forEach((v) => {
1348
+        if (v.value == item.value) {
1349
+          item.checked = true;
1350
+        }
1351
+      });
1352
+    });
1349 1353
     this.clickYYFlag = false;
1350 1354
     let linkCheckLis = this.linkCheckLis.filter(
1351 1355
       (item) => Boolean(item.yyTime) && item.checked

+ 26 - 3
src/assets/iconfont/demo_index.html

@@ -55,6 +55,12 @@
55 55
           <ul class="icon_lists dib-box">
56 56
           
57 57
             <li class="dib">
58
+              <span class="icon icon_transport">&#xe6b6;</span>
59
+                <div class="name">急</div>
60
+                <div class="code-name">&amp;#xe6b6;</div>
61
+              </li>
62
+          
63
+            <li class="dib">
58 64
               <span class="icon icon_transport">&#xe624;</span>
59 65
                 <div class="name">B端数字2</div>
60 66
                 <div class="code-name">&amp;#xe624;</div>
@@ -654,9 +660,9 @@
654 660
 <pre><code class="language-css"
655 661
 >@font-face {
656 662
   font-family: 'icon_transport';
657
-  src: url('iconfont.woff2?t=1619776255105') format('woff2'),
658
-       url('iconfont.woff?t=1619776255105') format('woff'),
659
-       url('iconfont.ttf?t=1619776255105') format('truetype');
663
+  src: url('iconfont.woff2?t=1622526694290') format('woff2'),
664
+       url('iconfont.woff?t=1622526694290') format('woff'),
665
+       url('iconfont.ttf?t=1622526694290') format('truetype');
660 666
 }
661 667
 </code></pre>
662 668
           <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@@ -683,6 +689,15 @@
683 689
         <ul class="icon_lists dib-box">
684 690
           
685 691
           <li class="dib">
692
+            <span class="icon icon_transport transport-zu1468"></span>
693
+            <div class="name">
694
+              急
695
+            </div>
696
+            <div class="code-name">.transport-zu1468
697
+            </div>
698
+          </li>
699
+          
700
+          <li class="dib">
686 701
             <span class="icon icon_transport transport-Bduanshuzi"></span>
687 702
             <div class="name">
688 703
               B端数字2
@@ -1584,6 +1599,14 @@
1584 1599
           
1585 1600
             <li class="dib">
1586 1601
                 <svg class="icon svg-icon" aria-hidden="true">
1602
+                  <use xlink:href="#transport-zu1468"></use>
1603
+                </svg>
1604
+                <div class="name">急</div>
1605
+                <div class="code-name">#transport-zu1468</div>
1606
+            </li>
1607
+          
1608
+            <li class="dib">
1609
+                <svg class="icon svg-icon" aria-hidden="true">
1587 1610
                   <use xlink:href="#transport-Bduanshuzi"></use>
1588 1611
                 </svg>
1589 1612
                 <div class="name">B端数字2</div>

+ 7 - 3
src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
1 1
 @font-face {
2 2
   font-family: "icon_transport"; /* Project id 2522689 */
3
-  src: url('iconfont.woff2?t=1619776255105') format('woff2'),
4
-       url('iconfont.woff?t=1619776255105') format('woff'),
5
-       url('iconfont.ttf?t=1619776255105') format('truetype');
3
+  src: url('iconfont.woff2?t=1622526694290') format('woff2'),
4
+       url('iconfont.woff?t=1622526694290') format('woff'),
5
+       url('iconfont.ttf?t=1622526694290') format('truetype');
6 6
 }
7 7
 
8 8
 .icon_transport {
@@ -13,6 +13,10 @@
13 13
   -moz-osx-font-smoothing: grayscale;
14 14
 }
15 15
 
16
+.transport-zu1468:before {
17
+  content: "\e6b6";
18
+}
19
+
16 20
 .transport-Bduanshuzi:before {
17 21
   content: "\e624";
18 22
 }

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
src/assets/iconfont/iconfont.js


+ 7 - 0
src/assets/iconfont/iconfont.json

@@ -6,6 +6,13 @@
6 6
   "description": "",
7 7
   "glyphs": [
8 8
     {
9
+      "icon_id": "19675369",
10
+      "name": "急",
11
+      "font_class": "zu1468",
12
+      "unicode": "e6b6",
13
+      "unicode_decimal": 59062
14
+    },
15
+    {
9 16
       "icon_id": "5532962",
10 17
       "name": "B端数字2",
11 18
       "font_class": "Bduanshuzi",

BIN
src/assets/iconfont/iconfont.ttf


BIN
src/assets/iconfont/iconfont.woff


BIN
src/assets/iconfont/iconfont.woff2