PC端工单详情增加备注信息显示

src/app/share/detail-patients/detail-patients.component.html

@@ -30,12 +30,14 @@
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
           <div nz-col nzSpan="8" *ngIf="orderInfo.taskType.associationType.value==='inspect'">
             是否半程陪检：{{orderInfo.isHalfInspect===1?'是':'否'}}</div>
-          <div nz-col nzSpan="8" *ngIf="(orderInfo.taskType.associationType.value==='inspect' || orderInfo.taskType.associationType.value==='patientTransport') && orderInfo.inspectScore">
+          <div nz-col nzSpan="8" *ngIf="orderInfo.inspectScore">
             陪检方式：{{orderInfo.inspectScore.inspectMode}}</div>
-          <div nz-col nzSpan="8" *ngIf="(orderInfo.taskType.associationType.value==='inspect' || orderInfo.taskType.associationType.value==='patientTransport') && orderInfo.inspectUsers">
+          <div nz-col nzSpan="8" *ngIf="orderInfo.inspectUsers">
             陪检人员：{{orderInfo.inspectUsers}}</div>
-          <div nz-col nzSpan="8" *ngIf="(orderInfo.taskType.associationType.value==='inspect' || orderInfo.taskType.associationType.value==='patientTransport') && orderInfo.inspectUsersNum">
+          <div nz-col nzSpan="8" *ngIf="orderInfo.inspectUsersNum">
             陪检人数：{{orderInfo.inspectUsersNum}}</div>
+          <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">
+            备注信息：{{orderInfo.workOrderRemark}}</div>
           <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
             特殊情况关闭原因：{{orderInfo.specialCloseReason}}
           </div>

src/app/share/order-detail/order-detail.component.html

@@ -770,25 +770,34 @@
             <div
               nz-col
               nzSpan="6"
-              *ngIf="(orderInfo.taskType.associationType.value == 'inspect' || orderInfo.taskType.associationType.value == 'patientTransport') && orderInfo.inspectScore"
+              *ngIf="orderInfo.inspectScore"
             >
               陪检方式：{{ orderInfo.inspectScore.inspectMode }}
             </div>
             <div
               nz-col
               nzSpan="6"
-              *ngIf="(orderInfo.taskType.associationType.value == 'inspect' || orderInfo.taskType.associationType.value == 'patientTransport') && orderInfo.inspectUsers"
+              *ngIf="orderInfo.inspectUsers"
             >
               陪检人员：{{ orderInfo.inspectUsers }}
             </div>
             <div
               nz-col
               nzSpan="6"
-              *ngIf="(orderInfo.taskType.associationType.value == 'inspect' || orderInfo.taskType.associationType.value == 'patientTransport') && orderInfo.inspectUsersNum"
+              *ngIf="orderInfo.inspectUsersNum"
             >
               陪检人数：{{ orderInfo.inspectUsersNum }}
             </div>
           </div>
+          <div
+            class="info"
+            nz-row
+            *ngIf="orderInfo.workOrderRemark !== undefined"
+          >
+            <div nz-col nzSpan="24">
+              备注信息：{{ orderInfo.workOrderRemark || "-" }}
+            </div>
+          </div>
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
             <div nz-col nzSpan="24" class="jiaji">
               加急原因：{{ orderInfo.urgentDetails.urgentReason }}

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

@@ -226,26 +226,23 @@
                     openDetails(data)
                   "
                 >
-                  <span
-                    class="left"
-                    *ngIf="data.taskType.associationType.value == 'inspect'"
-                  >
+                  <span class="left" *ngIf="data.taskType.associationType.value == 'inspect'">
                     {{ data.startDept ? data.startDept.dept : "" }}
                     <span *ngFor="let item of data.middleDept">
                       ->{{ item.dept }}
                     </span>
                   </span>
-                  <span
-                    class="left"
-                    *ngIf="data.taskType.associationType.id != 260"
-                  >
-                    {{ data.startDept ? data.startDept.dept : ""
-                    }}{{ data.endDepts ? "->" + data.endDepts[0].dept : "" }}
+                  <span class="left" *ngIf="data.taskType.associationType.id != 260">
+                    {{ data.startDept ? data.startDept.dept : ""}}{{ data.endDepts ? "->" + data.endDepts[0].dept : "" }}
                   </span>
                   <span class="right" *ngIf="data.goods">
                     <i class="icon_transport transport-icon3"></i>
                     <span>{{ data.goods }}</span>
                   </span>
+                  <span class="right" *ngIf="data.workOrderRemark" [title]="data.workOrderRemark">
+                    <i class="icon_transport transport-icon3"></i>
+                    <span>{{ data.workOrderRemark }}</span>
+                  </span>
                 </div>
                 <!-- 时间 -->
                 <div
@@ -663,6 +660,10 @@
                     ></i>
                     <span>{{ data.goods }}</span>
                   </span>
+                  <span class="right" *ngIf="data.workOrderRemark" [title]="data.workOrderRemark">
+                    <i class="icon_transport transport-icon3"></i>
+                    <span>{{ data.workOrderRemark }}</span>
+                  </span>
                 </div>
                 <!-- 时间 -->
                 <div
@@ -1049,6 +1050,10 @@
                     <i class="icon_transport transport-icon3"></i>
                     <span>{{ data.goods }}</span>
                   </span>
+                  <span class="right" *ngIf="data.workOrderRemark" [title]="data.workOrderRemark">
+                    <i class="icon_transport transport-icon3"></i>
+                    <span>{{ data.workOrderRemark }}</span>
+                  </span>
                 </div>
                 <!-- 时间 -->
                 <div class="shijian">
@@ -2669,6 +2674,10 @@
                         <i class="icon_transport transport-icon3"></i>
                         <span>{{ data.goods }}</span>
                       </span>
+                      <span class="right" *ngIf="data.workOrderRemark" [title]="data.workOrderRemark">
+                        <i class="icon_transport transport-icon3"></i>
+                        <span>{{ data.workOrderRemark }}</span>
+                      </span>
                     </div>
                     <!-- 时间 -->
                     <div class="shijian">

src/app/views/fuwutai/fuwutai.component.less

@@ -636,16 +636,26 @@
     height: 24px;
     line-height: 24px;
     margin-top: 8px;
+    display: flex;
   }
 
   .weifenpai .didian .left {
     float: left;
     color: #666666;
     font-size: 14px;
+    flex: 1;
+    white-space: nowrap;
+    overflow: hidden;//文本超出隐藏
+    text-overflow: ellipsis;//文本超出省略号替代
   }
 
   .weifenpai .didian .right {
     float: right;
+    flex: 1;
+    white-space: nowrap;
+    overflow: hidden;//文本超出隐藏
+    text-overflow: ellipsis;//文本超出省略号替代
+    text-align: right;
   }
 
   .weifenpai .didian .right i {

src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
   enableProdMode();
   if (window) {
     window.console.log = function () { };
-    console.info('v2.4.26');
+    console.info('v2.4.27');
   }
 }
 platformBrowserDynamic().bootstrapModule(AppModule)