万能交接工单详情修改

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://weixintest16.ngser.dashitech.com",
+    "target": "http://192.168.4.241",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {
@@ -8,7 +8,7 @@
     }
   },
   "/file": {
-    "target": "http://weixintest16.ngser.dashitech.com",
+    "target": "http://192.168.3.108",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/share/detail-blood/detail-blood.component.ts

@@ -7,11 +7,11 @@ import { ToolService } from "src/app/services/tool.service";
 import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
 
 @Component({
-  selector: "app-detail-blood",
-  templateUrl: "./detail-blood.component.html",
-  styleUrls: ["./detail-blood.component.less"],
+  selector: "app-detail-ordinary",
+  templateUrl: "./detail-ordinary.component.html",
+  styleUrls: ["./detail-ordinary.component.less"],
 })
-export class DetailBloodComponent implements OnInit {
+export class DetailOrdinaryComponent implements OnInit {
   @ViewChild("osComponentRef1", {
     read: OverlayScrollbarsComponent,
     static: false,

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

@@ -830,12 +830,12 @@
         </div>
       </div>
     </overlay-scrollbars>
-    <!-- 万能交接服务-血制品工单信息 -->
+    <!-- 万能交接服务 -->
     <overlay-scrollbars
     #osComponentRef9
     style="height: 90%; flex: 1"
     *ngIf="
-      tabType == 1 && orderInfo.taskType.associationType.value == 'ordinary' && orderInfo.taskType.ordinaryField.value == 'blood'
+      tabType == 1 && orderInfo.taskType.associationType.value == 'ordinary'
     "
   >
     <div class="content orders">

src/app/share/share.module.ts

@@ -39,13 +39,13 @@ import { SpePromptModalComponent } from './spe-prompt-modal/spe-prompt-modal.com
 import { OrderPromptModalComponent } from './order-prompt-modal/order-prompt-modal.component';
 import { BusinessDataDetailModalComponent } from './businessData-detail-modal/businessData-detail-modal.component';
 import { RelationTransDetailModalComponent } from './relationTrans-detail-modal/relationTrans-detail-modal.component';
-import { DetailBloodComponent } from './detail-blood/detail-blood.component';
+import { DetailOrdinaryComponent } from './detail-ordinary/detail-ordinary.component';
 import { BloodHistoryPromptModalComponent } from './blood-history-prompt-modal/blood-history-prompt-modal.component';
 
 @NgModule({
   declarations: [
     DetailSampleComponent,
-    DetailBloodComponent,
+    DetailOrdinaryComponent,
     DetailPatientsComponent,
     DetailDrugComponent,
     DetailOthersComponent,
@@ -80,7 +80,7 @@ import { BloodHistoryPromptModalComponent } from './blood-history-prompt-modal/b
     OrderPromptModalComponent,
     BusinessDataDetailModalComponent,
     RelationTransDetailModalComponent,
-    DetailBloodComponent,
+    DetailOrdinaryComponent,
     BloodHistoryPromptModalComponent,
   ],
   imports: [
@@ -95,7 +95,7 @@ import { BloodHistoryPromptModalComponent } from './blood-history-prompt-modal/b
   ],
   exports: [
     DetailSampleComponent,
-    DetailBloodComponent,
+    DetailOrdinaryComponent,
     DetailPatientsComponent,
     DetailDrugComponent,
     DetailOthersComponent,

src/app/views/fuwutai/fuwutai-routing.module.ts

@@ -6,7 +6,7 @@ import { DetailDrugComponent } from '../../share/detail-drug/detail-drug.compone
 import { DetailOthersComponent } from '../../share/detail-others/detail-others.component';
 import { AllocationWorkerComponent } from '../../share/allocation-worker/allocation-worker.component';
 import { FuwutaiComponent } from './fuwutai.component';
-import { DetailBloodComponent } from 'src/app/share/detail-blood/detail-blood.component';
+import { DetailOrdinaryComponent } from 'src/app/share/detail-ordinary/detail-ordinary.component';
 
 
 const routes: Routes = [
@@ -20,9 +20,9 @@ const routes: Routes = [
         component: DetailSampleComponent
       },
       {
-        // 工单详情-万能交接服务-血制品
-        path: 'detailBlood/:id',
-        component: DetailBloodComponent
+        // 工单详情-万能交接服务
+        path: 'detailOrdinary/:id',
+        component: DetailOrdinaryComponent
       },
       {
         // 工单详情-送患者

src/app/views/fuwutai/fuwutai.component.ts

@@ -1107,9 +1107,9 @@ export class FuwutaiComponent implements OnInit {
     } else if (data.taskType.associationType.value == 'drugsBag' || data.taskType.associationType.value == 'jPBag') {
       // 药品配送/静配
       this.router.navigateByUrl("dispatchingDesk/detailDrug/" + data.id);
-    } else if (data.taskType.associationType.value == 'ordinary' && data.taskType.ordinaryField.value == 'blood') {
-      // 万能交接服务&&血制品
-      this.router.navigateByUrl("dispatchingDesk/detailBlood/" + data.id);
+    } else if (data.taskType.associationType.value == 'ordinary') {
+      // 万能交接服务
+      this.router.navigateByUrl("dispatchingDesk/detailOrdinary/" + data.id);
     } else {
       // 其他
       this.router.navigateByUrl("dispatchingDesk/detailOthers/" + data.id);

src/app/views/hushijiandan/hushijiandan-routing.module.ts

@@ -7,7 +7,7 @@ import { DetailDrugComponent } from '../../share/detail-drug/detail-drug.compone
 import { DetailOthersComponent } from '../../share/detail-others/detail-others.component';
 import { AllocationWorkerComponent } from '../../share/allocation-worker/allocation-worker.component';
 import { DetailBxComponent } from 'src/app/share/detail-bx/detail-bx.component';
-import { DetailBloodComponent } from 'src/app/share/detail-blood/detail-blood.component';
+import { DetailOrdinaryComponent } from 'src/app/share/detail-ordinary/detail-ordinary.component';
 
 
 const routes: Routes = [
@@ -21,9 +21,9 @@ const routes: Routes = [
         component: DetailSampleComponent
       },
       {
-        // 工单详情-万能交接服务-血制品
-        path: 'detailBlood/:id',
-        component: DetailBloodComponent
+        // 工单详情-万能交接服务
+        path: 'detailOrdinary/:id',
+        component: DetailOrdinaryComponent
       },
       {
         // 工单详情-送患者

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

@@ -4004,9 +4004,9 @@ export class HushijiandanComponent implements OnInit {
     } else if (data.taskType.associationType.value == 'drugsBag' || data.taskType.associationType.value == 'jPBag') {
       // 药品配送/静配
       this.router.navigateByUrl("nurse/detailDrug/" + data.id);
-    } else if (data.taskType.associationType.value == 'ordinary' && data.taskType.ordinaryField.value == 'blood') {
-      // 万能交接服务&&血制品
-      this.router.navigateByUrl("nurse/detailBlood/" + data.id);
+    } else if (data.taskType.associationType.value == 'ordinary') {
+      // 万能交接服务
+      this.router.navigateByUrl("nurse/detailOrdinary/" + data.id);
     } else {
       // 其他
       this.router.navigateByUrl("nurse/detailOthers/" + data.id);