Browse Source

生成数据提交

maotao 1 week ago
parent
commit
a7be9277b9

+ 4 - 4
src/app/components/configurationCenter/configuration-closedData/configuration-closedData.component.html

@@ -125,9 +125,9 @@
125
 									<div>查询范围</div>
125
 									<div>查询范围</div>
126
 								</div>
126
 								</div>
127
 								
127
 								
128
-								<!-- 发血开始时间 -->
128
+								<!-- 同步开始时间 -->
129
 								<div class="display_flex align-items_center mb8">
129
 								<div class="display_flex align-items_center mb8">
130
-								  <nz-form-label class="label" nzRequired>发血开始时间</nz-form-label>
130
+								  <nz-form-label class="label" nzRequired>同步开始时间</nz-form-label>
131
 								  <nz-range-picker nzShowTime (nzOnCalendarChange)="onCalendarChangeDate($event)" [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
131
 								  <nz-range-picker nzShowTime (nzOnCalendarChange)="onCalendarChangeDate($event)" [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
132
 								</div>
132
 								</div>
133
 								
133
 								
@@ -243,9 +243,9 @@
243
 									<div>查询范围</div>
243
 									<div>查询范围</div>
244
 								</div>
244
 								</div>
245
 								
245
 								
246
-								<!-- 同步开始时间 -->
246
+								<!-- 发血开始时间 -->
247
 								<div class="display_flex align-items_center mb8">
247
 								<div class="display_flex align-items_center mb8">
248
-								  <nz-form-label class="label" nzRequired>同步开始时间</nz-form-label>
248
+								  <nz-form-label class="label" nzRequired>发血开始时间</nz-form-label>
249
 								  <nz-range-picker nzShowTime (nzOnCalendarChange)="onCalendarChangeDate($event)" [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
249
 								  <nz-range-picker nzShowTime (nzOnCalendarChange)="onCalendarChangeDate($event)" [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
250
 								</div>
250
 								</div>
251
 								
251
 								

+ 5 - 4
src/app/components/configurationCenter/configuration-closedData/configuration-closedData.component.ts

@@ -102,6 +102,7 @@ export class ConfigurationClosedDataComponent implements OnInit {
102
 	    this.startDate = this.endDate = "";
102
 	    this.startDate = this.endDate = "";
103
 	    return;
103
 	    return;
104
 	  }
104
 	  }
105
+		console.log(1111,result)
105
 	  this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
106
 	  this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
106
 	  this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
107
 	  this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
107
 	}
108
 	}
@@ -127,7 +128,7 @@ export class ConfigurationClosedDataComponent implements OnInit {
127
 			
128
 			
128
 		}else if (this.activeDictionaryKey == 'drugsBag'){
129
 		}else if (this.activeDictionaryKey == 'drugsBag'){
129
 			if(!this.startDate || !this.endDate){
130
 			if(!this.startDate || !this.endDate){
130
-				this.msg.error("发血开始时间不能为空");
131
+				this.msg.error("同步开始时间不能为空");
131
 				return
132
 				return
132
 			}
133
 			}
133
 			if(!this.transState){
134
 			if(!this.transState){
@@ -136,7 +137,7 @@ export class ConfigurationClosedDataComponent implements OnInit {
136
 			}
137
 			}
137
 		}else if (this.activeDictionaryKey == 'blood'){
138
 		}else if (this.activeDictionaryKey == 'blood'){
138
 			if(!this.startDate || !this.endDate){
139
 			if(!this.startDate || !this.endDate){
139
-				this.msg.error("同步开始时间不能为空");
140
+				this.msg.error("发血开始时间不能为空");
140
 				return
141
 				return
141
 			}
142
 			}
142
 			if(!this.transState){
143
 			if(!this.transState){
@@ -230,7 +231,7 @@ export class ConfigurationClosedDataComponent implements OnInit {
230
 			
231
 			
231
 		}else if (this.activeDictionaryKey == 'drugsBag'){
232
 		}else if (this.activeDictionaryKey == 'drugsBag'){
232
 			if(!this.startDate || !this.endDate){
233
 			if(!this.startDate || !this.endDate){
233
-				this.msg.error("发血开始时间不能为空");
234
+				this.msg.error("同步开始时间不能为空");
234
 				return
235
 				return
235
 			}
236
 			}
236
 			if(!this.transState){
237
 			if(!this.transState){
@@ -239,7 +240,7 @@ export class ConfigurationClosedDataComponent implements OnInit {
239
 			}
240
 			}
240
 		}else if (this.activeDictionaryKey == 'blood'){
241
 		}else if (this.activeDictionaryKey == 'blood'){
241
 			if(!this.startDate || !this.endDate){
242
 			if(!this.startDate || !this.endDate){
242
-				this.msg.error("同步开始时间不能为空");
243
+				this.msg.error("发血开始时间不能为空");
243
 				return
244
 				return
244
 			}
245
 			}
245
 			if(!this.transState){
246
 			if(!this.transState){