生成数据添加接收人

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

@@ -21,17 +21,17 @@
 									<div>查询范围</div>
 								</div>
 								
-								<!-- 同步开始时间 -->
+								<!-- 采集开始时间 -->
 								<div class="display_flex align-items_center mb8">
-								  <nz-form-label class="label" nzRequired>同步开始时间</nz-form-label>
+								  <nz-form-label class="label" nzRequired>采集开始时间</nz-form-label>
 								  <nz-range-picker nzShowTime (nzOnCalendarChange)="onCalendarChangeDate($event)" [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
 								</div>
 								
                 <!-- 标本状态 -->
                 <div class="display_flex align-items_center mb8">
-                  <nz-form-label class="label">标本状态</nz-form-label>
+                  <nz-form-label class="label" nzRequired>标本状态</nz-form-label>
                   <nz-select class="w320px" [nzDropdownMatchSelectWidth]="false" nzAllowClear
-										nzPlaceHolder="请选择标本状态" [(ngModel)]="transState" (nzOpenChange)="openDrugList($event)">
+										nzPlaceHolder="请选择标本状态" [(ngModel)]="transState">
                     <ng-container *ngFor="let option of drugStatusList">
                       <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
                     </ng-container>
@@ -48,7 +48,7 @@
 								
 								<div class="display_flex align-items_center mb8">
 									<nz-form-label class="label">编码</nz-form-label>
-									<input nz-input [(ngModel)]="code" class="w320px"/>
+									<input nz-input [(ngModel)]="code" class="w350px"/>
 								</div>
 							<div class="interval"></div>
 							<div class="top-style">
@@ -86,7 +86,7 @@
 									nzPlaceHolder="请选择配送人员" [(ngModel)]="userIds" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
 								  (nzOnSearch)="changeUser($event)" nzAllowClear>
 								  <ng-container *ngFor="let option of distributionList">
-								    <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+								    <nz-option *ngIf="!isLoading" [nzLabel]="option.name +' ('+ option.account +')'" [nzValue]="option.id"></nz-option>
 								  </ng-container>
 								  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
 								    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -99,7 +99,7 @@
 								<button class="login-form-button" nzType="default" [nzLoading]="btnLoading3" nz-button (click)="resetForm()">重置</button>
               </div>
 							<div class="tip" *ngIf="showNum">共查询数据 <span class="weight">{{queryNum}}</span> 条</div>
-							<div class="tip" *ngIf="showGenerate">共修改数据 <span class="weight">{{generateObj.count}}</span> 条，生成日志 <span class="weight">{{generateObj.logCount}}</span> 条</div>
+							<div class="tip" *ngIf="showGenerate">共修改数据 <span class="weight">{{generateObj.count}}</span> 条，生成日志 <span class="weight">{{generateObj.logCount || 0}}</span> 条</div>
 						</div>
             <div class="list" *ngIf="loading">
               <div class="loadingFull display_flex justify-content_flex-center align-items_center">
@@ -125,17 +125,17 @@
 									<div>查询范围</div>
 								</div>
 								
-								<!-- 同步开始时间 -->
+								<!-- 发血开始时间 -->
 								<div class="display_flex align-items_center mb8">
-								  <nz-form-label class="label" nzRequired>同步开始时间</nz-form-label>
+								  <nz-form-label class="label" nzRequired>发血开始时间</nz-form-label>
 								  <nz-range-picker nzShowTime (nzOnCalendarChange)="onCalendarChangeDate($event)" [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
 								</div>
 								
 					      <!-- 药品状态 -->
 					      <div class="display_flex align-items_center mb8">
-					        <nz-form-label class="label">药品状态</nz-form-label>
+					        <nz-form-label class="label" nzRequired>药品状态</nz-form-label>
 					        <nz-select class="w320px" [nzDropdownMatchSelectWidth]="false" nzAllowClear
-										nzPlaceHolder="请选择药品状态" [(ngModel)]="transState" (nzOpenChange)="openDrugList($event)">
+										nzPlaceHolder="请选择药品状态" [(ngModel)]="transState">
 					          <ng-container *ngFor="let option of drugStatusList">
 					            <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 					          </ng-container>
@@ -152,7 +152,7 @@
 								
 								<div class="display_flex align-items_center mb8">
 									<nz-form-label class="label">编码</nz-form-label>
-									<input nz-input [(ngModel)]="code" class="w320px"/>
+									<input nz-input [(ngModel)]="code" class="w350px"/>
 								</div>
 							<div class="interval"></div>
 							<div class="top-style">
@@ -190,7 +190,21 @@
 									nzPlaceHolder="请选择配送人员" [(ngModel)]="userIds" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
 								  (nzOnSearch)="changeUser($event)" nzAllowClear>
 								  <ng-container *ngFor="let option of distributionList">
-								    <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+								    <nz-option *ngIf="!isLoading" [nzLabel]="option.name +' ('+ option.account +')'" [nzValue]="option.id"></nz-option>
+								  </ng-container>
+								  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+								    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+								  </nz-option>
+								</nz-select>
+							</div>
+							<!-- 接收人员 -->
+							<div class="display_flex align-items_center mb8">
+							  <nz-form-label class="label max" nzRequired>接收人员</nz-form-label>
+								<nz-select nzMode="multiple" class="w320px" [nzDropdownMatchSelectWidth]="false" nzAllowClear
+									nzPlaceHolder="请选择接收人员" [(ngModel)]="receiverUserIds" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								  (nzOnSearch)="changeReceptionUser($event)" nzAllowClear>
+								  <ng-container *ngFor="let option of receptionList">
+								    <nz-option *ngIf="!isLoading" [nzLabel]="option.name +' ('+ option.account +')'" [nzValue]="option.id"></nz-option>
 								  </ng-container>
 								  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
 								    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -203,7 +217,7 @@
 								<button class="login-form-button" nzType="default" [nzLoading]="btnLoading3" nz-button (click)="resetForm()">重置</button>
 					    </div>
 							<div class="tip" *ngIf="showNum">共查询数据 <span class="weight">{{queryNum}}</span> 条</div>
-							<div class="tip" *ngIf="showGenerate">共修改数据 <span class="weight">{{generateObj.count}}</span> 条，生成日志 <span class="weight">{{generateObj.logCount}}</span> 条</div>
+							<div class="tip" *ngIf="showGenerate">共修改数据 <span class="weight">{{generateObj.count}}</span> 条，生成日志 <span class="weight">{{generateObj.logCount || 0}}</span> 条</div>
 					  </div>
 					  <div class="list" *ngIf="loading">
 					    <div class="loadingFull display_flex justify-content_flex-center align-items_center">
@@ -237,9 +251,9 @@
 								
 					      <!-- 血制品状态 -->
 					      <div class="display_flex align-items_center mb8">
-					        <nz-form-label class="label">血制品状态</nz-form-label>
+					        <nz-form-label class="label" nzRequired>血制品状态</nz-form-label>
 					        <nz-select class="w320px" [nzDropdownMatchSelectWidth]="false" nzAllowClear
-										nzPlaceHolder="请选择血制品状态" [(ngModel)]="transState" (nzOpenChange)="openDrugList($event)">
+										nzPlaceHolder="请选择血制品状态" [(ngModel)]="transState">
 					          <ng-container *ngFor="let option of drugStatusList">
 					            <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 					          </ng-container>
@@ -256,7 +270,7 @@
 								
 								<div class="display_flex align-items_center mb8">
 									<nz-form-label class="label">编码</nz-form-label>
-									<input nz-input [(ngModel)]="code" class="w320px"/>
+									<input nz-input [(ngModel)]="code" class="w350px"/>
 								</div>
 							<div class="interval"></div>
 							<div class="top-style">
@@ -294,7 +308,21 @@
 									nzPlaceHolder="请选择配送人员" [(ngModel)]="userIds" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
 								  (nzOnSearch)="changeUser($event)" nzAllowClear>
 								  <ng-container *ngFor="let option of distributionList">
-								    <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+								    <nz-option *ngIf="!isLoading" [nzLabel]="option.name +' ('+ option.account +')'" [nzValue]="option.id"></nz-option>
+								  </ng-container>
+								  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+								    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+								  </nz-option>
+								</nz-select>
+							</div>
+							<!-- 接收人员 -->
+							<div class="display_flex align-items_center mb8">
+							  <nz-form-label class="label max" nzRequired>接收人员</nz-form-label>
+								<nz-select nzMode="multiple" class="w320px" [nzDropdownMatchSelectWidth]="false" nzAllowClear
+									nzPlaceHolder="请选择接收人员" [(ngModel)]="receiverUserIds" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+								  (nzOnSearch)="changeReceptionUser($event)" nzAllowClear>
+								  <ng-container *ngFor="let option of receptionList">
+								    <nz-option *ngIf="!isLoading" [nzLabel]="option.name +' ('+ option.account +')'" [nzValue]="option.id"></nz-option>
 								  </ng-container>
 								  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
 								    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -307,7 +335,7 @@
 								<button class="login-form-button" nzType="default" [nzLoading]="btnLoading3" nz-button (click)="resetForm()">重置</button>
 					    </div>
 							<div class="tip" *ngIf="showNum">共查询数据 <span class="weight">{{queryNum}}</span> 条</div>
-							<div class="tip" *ngIf="showGenerate">共修改数据 <span class="weight">{{generateObj.count}}</span> 条，生成日志 <span class="weight">{{generateObj.logCount}}</span> 条</div>
+							<div class="tip" *ngIf="showGenerate">共修改数据 <span class="weight">{{generateObj.count}}</span> 条，生成日志 <span class="weight">{{generateObj.logCount || 0}}</span> 条</div>
 					  </div>
 					  <div class="list" *ngIf="loading">
 					    <div class="loadingFull display_flex justify-content_flex-center align-items_center">

src/app/components/configurationCenter/configuration-closedData/configuration-closedData.component.less

@@ -353,6 +353,10 @@
 					text-align: left;
         }
 				
+				.w350px{
+					width: 350px;
+				}
+				
 				.span{
 					margin: 0 5px;
 				}

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

@@ -72,6 +72,7 @@ export class ConfigurationClosedDataComponent implements OnInit {
     });
     this.getSpeDic();
 		this.getUsers();
+		this.getReceptionUsers();
   }
 	
 	// 点击数据字典key
@@ -114,10 +115,36 @@ export class ConfigurationClosedDataComponent implements OnInit {
 	queryNum:any;
 	generateModal:boolean = false;
 	generateForm(){
-		if(!this.startDate || !this.endDate){
-			this.msg.error("同步开始时间不能为空");
-			return
+		if(this.activeDictionaryKey == 'specimen'){
+			if(!this.startDate || !this.endDate){
+				this.msg.error("采集开始时间不能为空");
+				return
+			}
+			if(!this.transState){
+				this.msg.error("标本状态不能为空");
+				return
+			}
+			
+		}else if (this.activeDictionaryKey == 'drugsBag'){
+			if(!this.startDate || !this.endDate){
+				this.msg.error("发血开始时间不能为空");
+				return
+			}
+			if(!this.transState){
+				this.msg.error("药品状态不能为空");
+				return
+			}
+		}else if (this.activeDictionaryKey == 'blood'){
+			if(!this.startDate || !this.endDate){
+				this.msg.error("同步开始时间不能为空");
+				return
+			}
+			if(!this.transState){
+				this.msg.error("血制品状态不能为空");
+				return
+			}
 		}
+
 		if(!this.arriveStartMinute || !this.arriveEndMinute){
 			this.msg.error("收取时间间隔区间不能为空");
 			return
@@ -130,6 +157,12 @@ export class ConfigurationClosedDataComponent implements OnInit {
 			this.msg.error("配送人员不能为空");
 			return
 		}
+		if (this.activeDictionaryKey != 'specimen'){
+			if(this.receiverUserIds.length==0){
+				this.msg.error("接收人员不能为空");
+				return
+			}
+		}
 		this.generateModal = true
 	}
 	
@@ -159,8 +192,9 @@ export class ConfigurationClosedDataComponent implements OnInit {
 	  		arriveEndMinute: this.arriveEndMinute || undefined,
 	  		sendStartMinute: this.sendStartMinute || undefined,
 	  		sendEndMinute: this.sendEndMinute || undefined,
-	  		userIds: this.userIds.length>0 ? this.userIds.join(',') : undefined
-	  	}
+	  		userIds: this.userIds.length>0 ? this.userIds.join(',') : undefined,
+				receiverUserIds: this.receiverUserIds.length>0 ? this.receiverUserIds.join(',') : undefined
+			}
 	  };
 	  this.btnLoading1 = true;
 	  this.mainService
@@ -174,16 +208,44 @@ export class ConfigurationClosedDataComponent implements OnInit {
 					setTimeout(_=>{
 						this.scrollContainer.nativeElement.scrollTop = this.scrollContainer.nativeElement.scrollHeight;
 					},100)
-	      }
+	      }else{
+					this.hideGenerateModal()
+					this.msg.error(result.msg);
+				}
 	    });
 	}
 	
   // 查询
 	showNum:boolean = false;
   submitForm() {
-		if(!this.startDate || !this.endDate){
-			this.msg.error("同步开始时间不能为空");
-			return
+		if(this.activeDictionaryKey == 'specimen'){
+			if(!this.startDate || !this.endDate){
+				this.msg.error("采集开始时间不能为空");
+				return
+			}
+			if(!this.transState){
+				this.msg.error("标本状态不能为空");
+				return
+			}
+			
+		}else if (this.activeDictionaryKey == 'drugsBag'){
+			if(!this.startDate || !this.endDate){
+				this.msg.error("发血开始时间不能为空");
+				return
+			}
+			if(!this.transState){
+				this.msg.error("药品状态不能为空");
+				return
+			}
+		}else if (this.activeDictionaryKey == 'blood'){
+			if(!this.startDate || !this.endDate){
+				this.msg.error("同步开始时间不能为空");
+				return
+			}
+			if(!this.transState){
+				this.msg.error("血制品状态不能为空");
+				return
+			}
 		}
 		if(!this.arriveStartMinute || !this.arriveEndMinute){
 			this.msg.error("收取时间间隔区间不能为空");
@@ -197,6 +259,12 @@ export class ConfigurationClosedDataComponent implements OnInit {
 			this.msg.error("配送人员不能为空");
 			return
 		}
+		if (this.activeDictionaryKey != 'specimen'){
+			if(this.receiverUserIds.length==0){
+				this.msg.error("接收人员不能为空");
+				return
+			}
+		}
     let list = this.drugStatusList.find(i=> i.id == this.transState)
     let postData:any = {
     	patchDataConfig:{
@@ -214,8 +282,9 @@ export class ConfigurationClosedDataComponent implements OnInit {
     		arriveEndMinute: this.arriveEndMinute || undefined,
     		sendStartMinute: this.sendStartMinute || undefined,
     		sendEndMinute: this.sendEndMinute || undefined,
-    		userIds: this.userIds.length>0 ? this.userIds.join(',') : undefined
-    	}
+    		userIds: this.userIds.length>0 ? this.userIds.join(',') : undefined,
+				receiverUserIds: this.receiverUserIds.length>0 ? this.receiverUserIds.join(',') : undefined
+			}
     };
     this.btnLoading2 = true;
     this.mainService
@@ -228,7 +297,9 @@ export class ConfigurationClosedDataComponent implements OnInit {
 					setTimeout(_=>{
 						this.scrollContainer.nativeElement.scrollTop = this.scrollContainer.nativeElement.scrollHeight;
 					},100)
-        }
+        }else{
+					this.msg.error(result.msg);
+				}
       });
   }
 	
@@ -248,6 +319,7 @@ export class ConfigurationClosedDataComponent implements OnInit {
 		this.sendStartMinute = undefined;
 		this.sendEndMinute = undefined;
 		this.userIds = [];
+		this.receiverUserIds = [];
 	}
 	
 	// 获取字典
@@ -271,6 +343,10 @@ export class ConfigurationClosedDataComponent implements OnInit {
 	  this.searchTimer(this.getUsers, e);
 	}
 	
+	changeReceptionUser(e){
+		this.searchTimer(this.getReceptionUsers, e);
+	}
+	
 	// 边输入边搜索节流阀
 	searchTimer(fun, e) {
 	  this.isLoading = true;
@@ -286,7 +362,6 @@ export class ConfigurationClosedDataComponent implements OnInit {
 	    user: {
 	      name: e,
 	      hospital: { id: this.hosId },
-	      simpleQuery: true,
 	    },
 	    idx: 0,
 	    sum: 20,
@@ -299,4 +374,25 @@ export class ConfigurationClosedDataComponent implements OnInit {
 	      this.distributionList = data.list;
 	    });
 	}
+	
+	// 接收人员
+	receiverUserIds:any = [];
+	receptionList:any;
+	getReceptionUsers(e?) {
+	  let postData = {
+	    user: {
+	      name: e,
+	      hospital: { id: this.hosId },
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+	  this.isLoading = true;
+	  this.mainService
+	    .getFetchDataList("data", "user", postData)
+	    .subscribe((data) => {
+	      this.isLoading = false;
+	      this.receptionList = data.list;
+	    });
+	}
 }

src/assets/iconfont/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon icon_transport">&#xe6e1;</span>
+                <div class="name">数据生成规则</div>
+                <div class="code-name">&amp;#xe6e1;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon icon_transport">&#xe67a;</span>
                 <div class="name">返回</div>
                 <div class="code-name">&amp;#xe67a;</div>
@@ -1062,9 +1068,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'icon_transport';
-  src: url('iconfont.woff2?t=1741080510824') format('woff2'),
-       url('iconfont.woff?t=1741080510824') format('woff'),
-       url('iconfont.ttf?t=1741080510824') format('truetype');
+  src: url('iconfont.woff2?t=1743147201353') format('woff2'),
+       url('iconfont.woff?t=1743147201353') format('woff'),
+       url('iconfont.ttf?t=1743147201353') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -1091,6 +1097,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon icon_transport transport-shujushengchengguize"></span>
+            <div class="name">
+              数据生成规则
+            </div>
+            <div class="code-name">.transport-shujushengchengguize
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon icon_transport transport-fanhui"></span>
             <div class="name">
               返回
@@ -2604,6 +2619,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-shujushengchengguize"></use>
+                </svg>
+                <div class="name">数据生成规则</div>
+                <div class="code-name">#transport-shujushengchengguize</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-fanhui"></use>
                 </svg>
                 <div class="name">返回</div>

src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon_transport"; /* Project id 4543613 */
-  src: url('iconfont.woff2?t=1741080510824') format('woff2'),
-       url('iconfont.woff?t=1741080510824') format('woff'),
-       url('iconfont.ttf?t=1741080510824') format('truetype');
+  src: url('iconfont.woff2?t=1743147201353') format('woff2'),
+       url('iconfont.woff?t=1743147201353') format('woff'),
+       url('iconfont.ttf?t=1743147201353') format('truetype');
 }
 
 .icon_transport {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.transport-shujushengchengguize:before {
+  content: "\e6e1";
+}
+
 .transport-fanhui:before {
   content: "\e67a";
 }

src/assets/iconfont/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "18532319",
+      "name": "数据生成规则",
+      "font_class": "shujushengchengguize",
+      "unicode": "e6e1",
+      "unicode_decimal": 59105
+    },
+    {
       "icon_id": "2569862",
       "name": "返回",
       "font_class": "fanhui",