Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-02-24 17:36:11 +08:00
parent 68806a8d60
commit 97fde5d6b9
5 changed files with 167 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/shared/components/insurance-table/insurance-table.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-25 20:18:52
* @LastEditors : Shiming
* @LastEditTime : 2022-02-14 10:14:19
* @LastEditTime : 2022-02-24 17:35:11
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\insurance-table\\insurance-table.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -70,7 +70,7 @@
</div>
</td>
<td nzWidth="60px" nzAlign="center" nzRight>
<a *ngIf="i === groupingTable.data.length-1 && groupingTable.data.length>2"
<a *ngIf="i === groupingTable.data.length-1 && groupingTable.data.length>1"
nz-popconfirm
nzPopconfirmTitle="是否确认删除?" (nzOnConfirm)="deleteRow(i)"
>删除</a>

13
src/app/shared/components/insurance-table/insurance-table.component.ts
View File

@ -64,7 +64,7 @@ export class InsuranceTableComponent implements OnInit {
};
this.ui = {
'*': {
spanLabelFixed: 140,
spanLabelFixed: 160,
grid: { span: 24 }
},
$freightPrice: {
@ -141,12 +141,11 @@ export class InsuranceTableComponent implements OnInit {
deleteRow(index: number) {
console.log(index);
this.data = this.data.filter((d, i) => {
console.log(d);
console.log(i);
index !== i;
});
console.log(this.data);
var newArr = this.data.concat();
newArr.splice(this.data.length-1,1)
// this.data = this.data.pop()
console.log(newArr);
this.data = [...newArr];
}
save() {