Merge branch 'master' of http://114.55.54.52:3000/zmm/GBRSWN

CZKJ.GBRS2.Web/wwwroot - 副本/3rdpartylicenses.txt

@@ -158,7 +158,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-mobx@4.4.0
+mobx@4.9.2
 MIT
 The MIT License (MIT)
 
@@ -348,7 +348,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-es5-ext@0.10.46
+es5-ext@0.10.47
 ISC
 ISC License
 
@@ -574,30 +574,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-ngx-color-picker@5.3.8
-MIT
-MIT License
-
-Copyright (c) 2017 ZEF Oy
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
 file-saver@1.3.3
 MIT
 The MIT License

CZKJ.GBRS2/Entity/PriceAnnouncementEntity.cs

@@ -16,7 +16,7 @@ namespace CZKJ.GBRS2.Entity
         /// 险种
         /// </summary>
         [Invisible(FormVisible =true,AddVisible =true)]
-        [DropdownSrc(SrcUrl = "/Manage/Type/GetTypeListByParentId?parentId=")]
+        [DropdownSrc(SrcUrl = "/Manage/Type/GetTypeListByParentId?parentId=172")]
         [Display(Name = "险种")]
         public int Typeofinsuance { get; set; }
         /// <summary>

cms/src/app/routes/price/price.component.html

@@ -5,7 +5,14 @@
   <div nz-col [nzXs]="24">
       <nz-card>
           <ng-template #title>
-              <h3 style="display:inline;">利率公告</h3>
+              
+              <div style="white-space:normal;margin-bottom:10px; display: inline-block">               
+                <nz-select style="width:200px;margin-top:4px;margin-right:20px;" nzAllowClear [nzPlaceHolder]="'选择险种'" [(ngModel)]="curType"
+                    (ngModelChange)="typeSearch($event)">
+                    <nz-option *ngFor="let option of typeList" [nzLabel]="option.name" [nzValue]="option.id">
+                    </nz-option>
+                </nz-select>
+            </div>
               <button nz-button [nzType]="'primary'" (click)='addAccount()' style="float:right;margin-top:4px;">
                   <i class="anticon anticon-plus-circle"></i>
                   <span>添加</span>

cms/src/app/routes/price/price.component.ts

@@ -1,6 +1,8 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { AutoTableComponent } from 'app/component/auto-table/auto-table.component';
+import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { AjaxService } from '@ajax';
+import { StrLow, TableDataTurnArr } from '@tools';
 @Component({
   selector: 'price',
   templateUrl: './price.component.html',
@@ -8,12 +10,16 @@ import { AjaxService } from '@ajax';
 })
 export class PriceComponent implements OnInit {
 
+	typeList:any;//所有险种
+	tableSendData: any = { };
+
   @ViewChild("table") table: AutoTableComponent;
 	tableUrl = "/Manage/PriceAnnouncement/GetTableModel";
 
-	constructor(private ajaxService: AjaxService) { }
+	constructor(private ajaxService: AjaxService,private httpClient: HttpClient,) { }
 
 	ngOnInit() {
+		this.getAllType();
 	}
 	addAccount() {
 		let subscription = this.ajaxService.modalEdit("新增利率公告", {
@@ -26,4 +32,23 @@ export class PriceComponent implements OnInit {
 			}
 		})
 	}
+	// 获取所有险种
+	getAllType(){
+		this.httpClient.get(`/Manage/Type/GetTableListByParentId?pageIndex=1&parentId=172`)
+            .subscribe((res:any) => {
+								this.typeList = TableDataTurnArr(res.tableData);;
+								console.log(this.typeList)
+            }, (error) => {
+                console.log(error);
+            })
+	}
+
+	//类型搜索
+	typeSearch(ev) {
+		console.log(typeof ev)
+		this.table.pageIndex = 1;
+		this.tableSendData['typeId'] = ev;
+		// this.tableSendData['testId'] = 100;		
+		this.table.getTableData();
+}
 }