药品详情，数量，种类开关

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.html

@@ -88,6 +88,16 @@
 									  <nz-form-label class="label">药单显示患者</nz-form-label>
 									  <nz-checkbox-group [(ngModel)]="item.postData.showPatientInfo"></nz-checkbox-group>
 									</div>
+                  <!-- 是否显示药品数、种类数 -->
+									<div class="display_flex align-items_center mb8">
+									  <nz-form-label class="label">是否显示药品数、种类数</nz-form-label>
+									  <nz-checkbox-group [(ngModel)]="item.postData.showDrugsBagTypeCount"></nz-checkbox-group>
+									</div>
+                  <!-- 是否支持查看药品详情信息 -->
+									<div class="display_flex align-items_center mb8">
+									  <nz-form-label class="label">是否支持查看药品详情信息</nz-form-label>
+									  <nz-checkbox-group [(ngModel)]="item.postData.showDrugsBagDetails"></nz-checkbox-group>
+									</div>
                 </div>
                 <!-- 自动建单配置 -->
                 <div *ngIf="tabModalName=='automaticOrderCreation'">

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.ts

@@ -61,6 +61,8 @@ export class ConfigurationDrugComponent implements OnInit {
 				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+				showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
+				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
       }
     },
     {
@@ -79,6 +81,8 @@ export class ConfigurationDrugComponent implements OnInit {
 				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+        showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
+				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
       }
     },
     {
@@ -97,6 +101,8 @@ export class ConfigurationDrugComponent implements OnInit {
 				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+        showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
+				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
       }
     },
     {
@@ -115,6 +121,8 @@ export class ConfigurationDrugComponent implements OnInit {
 				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+        showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
+				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
       }
     },
     {
@@ -133,6 +141,8 @@ export class ConfigurationDrugComponent implements OnInit {
 				showPatientInfo: [{ label:'是否开启', value: 0 }],//药单显示患者
         drugsEndManual: undefined,//终点科室手动填写
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
+        showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
+				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
       }
     },
   ];
@@ -206,6 +216,8 @@ export class ConfigurationDrugComponent implements OnInit {
       drugsEndManual: this.activeDictionary.postData.drugsEndManual ? { id: this.activeDictionary.postData.drugsEndManual } : undefined,
       drugsEndPhoto: this.activeDictionary.postData.drugsEndPhoto[0].checked ? 1 : 0,
 			showPatientInfo: this.activeDictionary.postData.showPatientInfo[0].checked ? 1 : 0,
+			showDrugsBagTypeCount: this.activeDictionary.postData.showDrugsBagTypeCount[0].checked ? 1 : 0,
+			showDrugsBagDetails: this.activeDictionary.postData.showDrugsBagDetails[0].checked ? 1 : 0,
 		};
     this.btnLoading = true;
     this.mainService
@@ -301,6 +313,8 @@ export class ConfigurationDrugComponent implements OnInit {
           this.activeDictionary.postData.drugsEndManual = this.configs.drugsEndManual ? this.configs.drugsEndManual.id : undefined;
           this.activeDictionary.postData.drugsEndPhoto[0].checked = this.configs.drugsEndPhoto == 1;
 					this.activeDictionary.postData.showPatientInfo[0].checked = this.configs.showPatientInfo == 1;
+					this.activeDictionary.postData.showDrugsBagTypeCount[0].checked = this.configs.showDrugsBagTypeCount == 1;
+					this.activeDictionary.postData.showDrugsBagDetails[0].checked = this.configs.showDrugsBagDetails == 1;
 				}
       });
   }

src/app/share/businessData-detail-info-modal/businessData-detail-info-modal.component.html

@@ -10,7 +10,7 @@
       <div>发药科室：{{drugsBag.launch ? drugsBag.launch.dept : ''}}</div>
     </div>
     <div class="content">
-      <ng-container *ngIf="type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal'">
+      <ng-container *ngIf="configs.showDrugsBagDetails === 1 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')">
         <!-- 新药品 -->
         <nz-table class="hospitalTable" [nzData]="drugsBugSingleList" nzSize="middle" [nzShowPagination]="false"
           [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">

src/app/share/businessData-detail-modal/businessData-detail-modal.component.html

@@ -41,7 +41,7 @@
         </tbody>
       </nz-table>
       <!-- 新药品-一单一码 -->
-      <nz-table *ngIf="configs.drugsModel === 1 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')" class="hospitalTable" [nzData]="drugsBugSingleList" nzSize="middle" [nzShowPagination]="false"
+      <nz-table *ngIf="configs.showDrugsBagDetails === 1 && configs.drugsModel === 1 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')" class="hospitalTable" [nzData]="drugsBugSingleList" nzSize="middle" [nzShowPagination]="false"
         [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
         <thead>
           <tr class="thead">
@@ -71,8 +71,8 @@
             <th nzWidth="5%">序号</th>
             <th nzWidth="11%">单号</th>
 						<th nzWidth="10%" *ngIf="configs.showPatientInfo==1">患者信息</th>
-            <th nzWidth="8%">种类数</th>
-            <th nzWidth="8%">总数</th>
+            <th nzWidth="8%" *ngIf="configs.showDrugsBagTypeCount==1">种类数</th>
+            <th nzWidth="8%" *ngIf="configs.showDrugsBagTypeCount==1">总数</th>
             <th nzWidth="10%">收取人/交接人</th>
             <!-- <th nzWidth="10%">收取交接人</th> -->
             <th nzWidth="14%">收取时间</th>
@@ -82,15 +82,15 @@
           </tr>
         </thead>
         <tbody>
-          <tr *ngFor="let data of drugsBugMultipleList;let i = index;" (click)="viewDetail(type, data.id)">
+          <tr *ngFor="let data of drugsBugMultipleList;let i = index;" (click)="viewDetail(type, data.id)" [ngStyle]="{ 'cursor': configs.showDrugsBagDetails == 1 ? 'pointer' : '' }">
             <td>{{i+1}}</td>
-            <td>{{ data.packid }}</td>
+            <td [ngStyle]="{ 'text-decoration': configs.showDrugsBagDetails == 1 ? 'underline' : '' }">{{ data.packid }}</td>
 						<td *ngIf="configs.showPatientInfo==1">
 							<div>{{ data.patientName }}{{(data.bedNum)}}</div>
 							<div>{{data.residenceNo}}</div>
 						</td>
-            <td>{{ data.drugsTypeCount }}</td>
-            <td>{{ data.drugsCount }}</td>
+            <td *ngIf="configs.showDrugsBagTypeCount==1">{{ data.drugsTypeCount }}</td>
+            <td *ngIf="configs.showDrugsBagTypeCount==1">{{ data.drugsCount }}</td>
             <td>
 							<ng-container *ngIf="data.startLog">
 								<div>{{data.startLog.username}}</div>

src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -433,6 +433,9 @@ export class BusinessDataDetailModalComponent implements OnInit {
   businessDataModalType = ''; //业务数据类型
   infoId = ''; //业务数据id
   viewDetail(type, id) {
+    if(this.configs.showDrugsBagDetails != 1){
+      return;
+    }
     this.infoId = id;
     this.businessDataModalType = type;
     this.businessDataModalShow = true;