增加检查紧急显示

proxy.conf.json

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

src/app/views/hushijiandan/hushijiandan.component.html

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

src/app/views/hushijiandan/hushijiandan.component.less

@@ -363,7 +363,7 @@
             padding-bottom: 8px;
             display: flex;
             justify-content: space-between;
-            span{
+            span {
               font-weight: normal;
               font-size: 14px;
               color: @primary-color;
@@ -1420,6 +1420,9 @@
             .linkCheckCheck {
               text-indent: 7px;
               margin-top: 0;
+              .priority {
+                color: #d81e06;
+              }
             }
           }
 
@@ -1439,25 +1442,6 @@
           }
         }
       }
-
-      .inspectionForm {
-        .ant-form-item {
-          margin-bottom: 0;
-        }
-        .ant-form-item-label {
-          text-align: left;
-        }
-
-        .datesGroup {
-          padding-top: 10px;
-
-          .linkCheckCheck {
-            text-indent: 7px;
-            margin-top: 0;
-          }
-        }
-      }
-
       .shortcutForm {
         padding-top: 20px;
 

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -1290,11 +1290,6 @@ export class HushijiandanComponent implements OnInit {
     // 判断这个任务类型是否允许加急 end
     let that = this;
     this.linkCheckLisTrue = true;
-    console.log(
-      that.patientForm.controls.linkCheck.value,
-      this.linkCheckLis,
-      this.checkedShowMsg
-    );
     let postData = {
       taskTypeId: that.patientForm.controls.checkedType.value,
       patientCode: that.patientMsg.patientCode,
@@ -1327,6 +1322,7 @@ export class HushijiandanComponent implements OnInit {
           data.data.forEach((e) => {
             arr.push({
               yyTime: e.yyTime,
+              priority: e.priority,
               label:
                 (e.yyTime || "") +
                 " " +
@@ -1345,7 +1341,15 @@ export class HushijiandanComponent implements OnInit {
   linkCheckLisTrue = true; //是否有已选择(患者)
   hasTime = false; //是否有已选择,并且是否有预约时间(患者)
   lessTime = false; //预约时间列表中预约时间少于生效时长，则是false
-  linkCheckLisChange() {
+  linkCheckLisChange(e) {
+    console.log(e, this.linkCheckLis);
+    this.linkCheckLis.forEach((item) => {
+      e.forEach((v) => {
+        if (v.value == item.value) {
+          item.checked = true;
+        }
+      });
+    });
     this.clickYYFlag = false;
     let linkCheckLis = this.linkCheckLis.filter(
       (item) => Boolean(item.yyTime) && item.checked

src/assets/iconfont/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon icon_transport">&#xe6b6;</span>
+                <div class="name">急</div>
+                <div class="code-name">&amp;#xe6b6;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon icon_transport">&#xe624;</span>
                 <div class="name">B端数字2</div>
                 <div class="code-name">&amp;#xe624;</div>
@@ -654,9 +660,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'icon_transport';
-  src: url('iconfont.woff2?t=1619776255105') format('woff2'),
-       url('iconfont.woff?t=1619776255105') format('woff'),
-       url('iconfont.ttf?t=1619776255105') format('truetype');
+  src: url('iconfont.woff2?t=1622526694290') format('woff2'),
+       url('iconfont.woff?t=1622526694290') format('woff'),
+       url('iconfont.ttf?t=1622526694290') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -683,6 +689,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon icon_transport transport-zu1468"></span>
+            <div class="name">
+              急
+            </div>
+            <div class="code-name">.transport-zu1468
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon icon_transport transport-Bduanshuzi"></span>
             <div class="name">
               B端数字2
@@ -1584,6 +1599,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-zu1468"></use>
+                </svg>
+                <div class="name">急</div>
+                <div class="code-name">#transport-zu1468</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-Bduanshuzi"></use>
                 </svg>
                 <div class="name">B端数字2</div>

src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon_transport"; /* Project id 2522689 */
-  src: url('iconfont.woff2?t=1619776255105') format('woff2'),
-       url('iconfont.woff?t=1619776255105') format('woff'),
-       url('iconfont.ttf?t=1619776255105') format('truetype');
+  src: url('iconfont.woff2?t=1622526694290') format('woff2'),
+       url('iconfont.woff?t=1622526694290') format('woff'),
+       url('iconfont.ttf?t=1622526694290') format('truetype');
 }
 
 .icon_transport {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.transport-zu1468:before {
+  content: "\e6b6";
+}
+
 .transport-Bduanshuzi:before {
   content: "\e624";
 }

src/assets/iconfont/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "19675369",
+      "name": "急",
+      "font_class": "zu1468",
+      "unicode": "e6b6",
+      "unicode_decimal": 59062
+    },
+    {
       "icon_id": "5532962",
       "name": "B端数字2",
       "font_class": "Bduanshuzi",