自动生成提交

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

@@ -42,8 +42,8 @@
                     </nz-input-group>
                   </nz-form-control>
                 </nz-form-item>
-                <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)" *ngIf="!(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree') && activeDictionaryKey.key != 'alarm_urgency'"></i>
-                <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system && !(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree') && activeDictionaryKey.key != 'alarm_urgency'" (click)="removeField(data, i)"></i>
+                <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)" *ngIf="!(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree' || this.activeDictionaryKey.key === 'abo_type' || this.activeDictionaryKey.key === 'rh_type' || this.activeDictionaryKey.key === 'blood_unit' || this.activeDictionaryKey.key === 'blood_trans_type') && activeDictionaryKey.key != 'alarm_urgency'"></i>
+                <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system && !(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree' || this.activeDictionaryKey.key === 'abo_type' || this.activeDictionaryKey.key === 'rh_type' || this.activeDictionaryKey.key === 'blood_unit' || this.activeDictionaryKey.key === 'blood_trans_type') && activeDictionaryKey.key != 'alarm_urgency'" (click)="removeField(data, i)"></i>
               </div>
 							<div class="value_2" *ngIf="activeDictionaryKey.key == 'alarm_urgency'">
 							  <nz-form-item>
@@ -53,8 +53,8 @@
 							      </nz-input-group>
 							    </nz-form-control>
 							  </nz-form-item>
-							  <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)" *ngIf="!(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree') && activeDictionaryKey.key == 'alarm_urgency'"></i>
-							  <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system && !(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree') && activeDictionaryKey.key == 'alarm_urgency'" (click)="removeField(data, i)"></i>
+							  <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)" *ngIf="!(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree' || this.activeDictionaryKey.key === 'abo_type' || this.activeDictionaryKey.key === 'rh_type' || this.activeDictionaryKey.key === 'blood_unit' || this.activeDictionaryKey.key === 'blood_trans_type') && activeDictionaryKey.key == 'alarm_urgency'"></i>
+							  <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system && !(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree' || this.activeDictionaryKey.key === 'abo_type' || this.activeDictionaryKey.key === 'rh_type' || this.activeDictionaryKey.key === 'blood_unit' || this.activeDictionaryKey.key === 'blood_trans_type') && activeDictionaryKey.key == 'alarm_urgency'" (click)="removeField(data, i)"></i>
 							</div>
             </div>
           </form>

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

@@ -209,7 +209,7 @@ export class ConfigurationDictionaryComponent implements OnInit {
       this.dictionaryList.forEach((obj, i) => {
         for (const key in obj) {
           if(key !== 'id' && key !== 'system'){
-            if(this.activeDictionaryKey.key === 'incident_status' || this.activeDictionaryKey.key === 'incident_degree'){
+            if(this.activeDictionaryKey.key === 'incident_status' || this.activeDictionaryKey.key === 'incident_degree' || this.activeDictionaryKey.key === 'abo_type' || this.activeDictionaryKey.key === 'rh_type' || this.activeDictionaryKey.key === 'blood_unit' || this.activeDictionaryKey.key === 'blood_trans_type'){
               this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl({value: obj[key], disabled: true}, [Validators.required]))
             }else if(this.activeDictionaryKey.key === 'alarm_urgency'){
               this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl({value: obj[key], disabled: key === 'value' ? obj.system : false}, []))

src/app/components/configurationCenter/configuration-specimen/configuration-checkout-project/configuration-checkout-project.component.ts

@@ -87,7 +87,16 @@ export class ConfigurationCheckoutProjectComponent implements OnInit {
         }
       });
   }
+	
+	// 隐藏删除框
+	hideDelModal() {
+	  this.delModal = false;
+	}
+	// 确认删除
+	confirmDel() {
 
+	}
+	
   // 初始化新增form表单
   validateForm: FormGroup; //新增/编辑表单
   initWechatForm() {

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

@@ -12,7 +12,7 @@
     <div class="content">
       <!-- 血制品 -->
       <nz-table *ngIf="type === 'blood'" class="hospitalTable" [nzData]="bloodList" nzSize="middle" [nzShowPagination]="false"
-        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+        [nzLoading]="hsLoading" >
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
@@ -42,7 +42,7 @@
       </nz-table>
       <!-- 新药品-一单一码 -->
       <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' }">
+        [nzLoading]="hsLoading" >
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
@@ -64,7 +64,7 @@
       </nz-table>
       <!-- 新药品-一单多码 -->
       <nz-table *ngIf="configs.drugsModel === 2 && (type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal')" class="hospitalTable" [nzData]="drugsBugMultipleList" nzSize="middle" [nzShowPagination]="false"
-        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+        [nzLoading]="hsLoading" >
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
@@ -179,7 +179,7 @@
       </nz-table>
       <!-- 科室检查率统计 -->
       <nz-table *ngIf="type === 'deptInspectionRateStatistics' || type === 'deptInspectionStatistics'" class="hospitalTable" [nzData]="inspectionRateStatisticsList" nzSize="middle" [nzShowPagination]="false"
-        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+        [nzLoading]="hsLoading" >
         <thead>
           <tr class="thead">
             <th nzWidth="4%">序号</th>
@@ -210,7 +210,7 @@
 
       <!-- 被服洗涤批次管理-查看视图-查看异常 -->
       <nz-table *ngIf="type === 'washingException'" class="hospitalTable" [nzData]="washingExceptionList" nzSize="middle" [nzShowPagination]="false"
-        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+        [nzLoading]="hsLoading" >
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>

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

@@ -31,7 +31,7 @@
   }
   .hospitalTable {
     width: 100%;
-		height: calc(100vh - 360px);
+		height: calc(100vh - 280px);
 		overflow-y: auto;
     td {
       text-align: center !important;

src/app/views/blood-search/blood-search.component.html

@@ -128,12 +128,12 @@
 							<div>{{ data.productCode }}</div>
 						</td>
 						<td>
-							<div>{{ data.type ? data.type.name : "无" }}、{{data.volume ? (ttconfig_sign_type4 ? data.volume + data.unit : data.volume + 'ML') : '无'}}</div>
+							<div>{{ data.type ? data.type.name : "无" }}、{{data.volume}}{{data.unit}}</div>
 							<div>{{ data.aboType }}、{{ data.rhType }}</div>
 						</td>
 						<td>
 							<div>{{ data.patientName }}<span *ngIf="data.bedNum">({{ data.bedNum }})</span></div>
-							<div>{{ data.patientCode }}</div>
+							<div>{{ data.patientNo }}</div>
 						</td>
 						<td>{{ data.dataCode || '无'}}</td>
 						<td>

src/app/views/blood-search/blood-search.component.ts

@@ -272,7 +272,7 @@ export class BloodSearchComponent implements OnInit {
 		let data = {
 			blood:{
 				applyDept: this.validateAutoForm.value.applyDept,
-				sendDept: this.validateAutoForm.value.applyDept,
+				sendDept: this.validateAutoForm.value.sendDept,
 				patientId: this.validateAutoForm.value.patientId || undefined,
 				arriver: this.validateAutoForm.value.arriver || undefined,
 				sendMsgType: this.validateAutoForm.value.sendMsgType || undefined
@@ -614,15 +614,17 @@ export class BloodSearchComponent implements OnInit {
 	// 全选
 	isAllDisplayDataChecked = false; //当前页是否全选
 	checkAll(value: boolean): void {
-		let isConformTo = this.listOfData.some(
-		  (item) => item.state.value==1 || item.state.value==4 || item.state.value=='cx'
-		)
-		if(isConformTo){
-			this.msg.error('只有“发血、病房接收”状态才能被选择')
-			return
-		}
+		// let isConformTo = this.listOfData.some(
+		//   (item) => item.state.value==1 || item.state.value==4 || item.state.value=='cx'
+		// )
+		// if(isConformTo){
+		// 	this.msg.error('只有“发血、病房接收”状态才能被选择')
+		// 	return
+		// }
 	  this.listOfData.forEach((item) => {
-			this.mapOfCheckedId[item.id] = value
+			if(item.state.value!=1 && item.state.value!=4 && item.state.value!='cx'){
+				this.mapOfCheckedId[item.id] = value
+			}
 		});
 	  this.refreshStatus();
 	}

src/app/views/page-config/page-config.component.ts

@@ -21,7 +21,7 @@ export class PageConfigComponent implements OnInit, AfterViewInit {
     { id: 1, name: '检查类型', key: "inspect_check_item"},
 		{ id: 2, name: 'ABO血型', key: "abo_type"},
 		{ id: 3, name: 'RH血型', key: "rh_type"},
-		{ id: 4, name: '单位', key: "blood_volume"},
+		{ id: 4, name: '单位', key: "blood_unit"},
 		{ id: 5, name: '血液类型', key: "blood_trans_type"},
   ]
 

src/app/views/specimen-search/specimen-search.component.ts

@@ -306,7 +306,7 @@ export class SpecimenSearchComponent implements OnInit {
 			patientId: [null, []],
 			examinationItemsId: [null, []],
 			amount: [1, [Validators.required]],
-			urgent: ['0', []],
+			urgent: [null, []],
 			sendMsg: ['0', []],
 		});
 	}