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

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-02-23 16:20:39 +08:00
parent 8ef9e67941
commit 5832cc4fba
25 changed files with 253 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/routes/contract-management/components/contract-frame/contract-frame.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-07 13:29:57 * @Date : 2022-01-07 13:29:57
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:16:04 * @LastEditTime : 2022-02-23 16:04:18
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-frame\\contract-frame.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-frame\\contract-frame.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -36,7 +36,16 @@
</sf> </sf>
</div> </div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button> <button
nz-button
nzType="primary"
[disabled]="!sf.valid"
[nzLoading]="service.http.loading"
(click)="st?.load(1)"
acl
[acl-ability]="['CONTRACT-INDEX-listFrame']"
>查询</button
>
<button nz-button (click)="resetSF()">重置</button> <button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
@ -69,10 +78,10 @@
[scroll]="{ x: '1200px', y: '370px' }" [scroll]="{ x: '1200px', y: '370px' }"
(change)="stChange($event)" (change)="stChange($event)"
> >
<ng-template st-row="contractCode" let-item let-index="index"> <ng-template st-row="contractCode" let-item let-index="index">
<a [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a> <a [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a>
</ng-template> </ng-template>
</st> </st>
</nz-card> </nz-card>
<ng-template #auditModal> <ng-template #auditModal>

2
src/app/routes/contract-management/components/contract-list/contract-list.component.html
View File

@ -30,7 +30,7 @@
</div> </div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
(click)="st?.load(1)">查询</button> (click)="st?.load(1)" acl [acl-ability]="['CONTRACT-INDEX-searchDetail']">查询</button>
<button nz-button (click)="resetSF()">重置</button> <button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}

19
src/app/routes/contract-management/components/contract-list/contract-list.component.ts
View File

@ -153,18 +153,6 @@ export class ContractManagementContractListComponent implements OnInit {
}, },
} as SFSelectWidgetSchema, } as SFSelectWidgetSchema,
}, },
// signTime: {
// title: '签署日期',
// type: 'string',
// ui: {
// widget: 'date',
// mode: 'range',
// format: 'yyyy-MM-dd',
// visibleIf: {
// _$expand: (value: boolean) => value,
// },
// } as SFDateWidgetSchema,
// },
signTime: { signTime: {
title: '签署日期', title: '签署日期',
type: 'string', type: 'string',
@ -196,11 +184,6 @@ export class ContractManagementContractListComponent implements OnInit {
break; break;
} }
} }
approval(): void {}
add(): void {}
routeTo(item: any) { routeTo(item: any) {
this.router.navigate(['/ticket/invoice-requested-detail/1']); this.router.navigate(['/ticket/invoice-requested-detail/1']);
} }
@ -246,7 +229,6 @@ export class ContractManagementContractListComponent implements OnInit {
] ]
}); });
} }
/** /**
* 重置表单 * 重置表单
*/ */
@ -254,7 +236,6 @@ export class ContractManagementContractListComponent implements OnInit {
this.sf.reset(); this.sf.reset();
this._$expand = false; this._$expand = false;
} }
/** /**
* 伸缩查询条件 * 伸缩查询条件
*/ */

4
src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts
View File

@ -140,10 +140,6 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
} }
save() { save() {
console.log(this.sf.value)
console.log(this.sf2.value)
console.log(this.detailList.templateName)
console.log(this.title)
if (!this.sf.value.templateName || !this.sf.value.templateType || !this.sf2.value.templateContent || !this.title) { if (!this.sf.value.templateName || !this.sf.value.templateType || !this.sf2.value.templateContent || !this.title) {
this.service.msgSrv.error('必填参数为空，请检查再重新保存！'); this.service.msgSrv.error('必填参数为空，请检查再重新保存！');
return; return;

60
src/app/routes/contract-management/components/contract-template/contract-template.component.html
View File

@ -10,14 +10,21 @@
--> -->
<!-- 搜索表单 --> <!-- 搜索表单 -->
<page-header-wrapper [title]="'合同模板'"> <page-header-wrapper [title]="'合同模板'"> </page-header-wrapper>
</page-header-wrapper>
<nz-card> <nz-card>
<div nz-row nzGutter="8"> <div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 --> <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4"> <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading" <sf
(formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf> #sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
[loading]="service.http.loading"
(formSubmit)="st?.load(1)"
(formReset)="resetSF()"
></sf>
</div> </div>
<!-- 查询字段大于3个时，根据展开状态调整布局 --> <!-- 查询字段大于3个时，根据展开状态调整布局 -->
@ -26,10 +33,17 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div> </div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" <button
(click)="st?.load(1)">查询</button> nz-button
<button nz-button nzType="primary" nzType="primary"
>导出</button> [disabled]="!sf.valid"
[nzLoading]="service.http.loading"
(click)="st?.load(1)"
acl
[acl-ability]="['CONTRACT-TEMPLATE-search']"
>查询</button
>
<button nz-button nzType="primary" acl [acl-ability]="['CONTRACT-TEMPLATE-export']">导出</button>
<button nz-button (click)="resetSF()">重置</button> <button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
@ -40,26 +54,24 @@
</div> </div>
</nz-card> </nz-card>
<nz-card > <nz-card>
<div class="NewBtn"> <div class="NewBtn">
<button nz-button nzType="primary"(click)="creatTemplate()"> <button nz-button nzType="primary" (click)="creatTemplate()" acl [acl-ability]="['CONTRACT-TEMPLATE-new']"> 新建 </button>
新建
</button>
</div> </div>
<div style="margin-top: 15px;"> <div style="margin-top: 15px">
<st <st
#st #st
[bordered]="true" [bordered]="true"
[data]="service.$api_get_contractTemplate_page" [data]="service.$api_get_contractTemplate_page"
[columns]="columns" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading" [loading]="service.http.loading"
> >
<ng-template st-row="templateName" let-item let-index="index"> <ng-template st-row="templateName" let-item let-index="index">
<a (click)="view(item)">{{item.templateName}}</a> <a (click)="view(item)">{{ item.templateName }}</a>
</ng-template> </ng-template>
</st> </st>
</div> </div>
</nz-card> </nz-card>

2
src/app/routes/contract-management/components/contract-template/contract-template.component.ts
View File

@ -125,10 +125,12 @@ export class ContractManagementTemplateComponent implements OnInit {
{ {
text: '编辑', text: '编辑',
click: (_record) => this.edit(_record), click: (_record) => this.edit(_record),
acl: { ability: ['CONTRACT-TEMPLATE-edit'] },
}, },
{ {
text: '删除', text: '删除',
click: (_record) => this.delete(_record), click: (_record) => this.delete(_record),
acl: { ability: ['CONTRACT-TEMPLATE-delete'] },
}, },
], ],
}, },

12
src/app/routes/contract-management/components/policy/policy.component.html
View File

@ -1,3 +1,13 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-02-23 15:57:26
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\policy\\policy.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header [action]="phActionTpl"> <page-header [action]="phActionTpl">
<ng-template #phActionTpl> </ng-template> <ng-template #phActionTpl> </ng-template>
</page-header> </page-header>
@ -24,7 +34,7 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div> </div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button> <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['CONTRACT-POLICY-search']">查询</button>
<button nz-button (click)="resetSF()">重置</button> <button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}

10
src/app/routes/contract-management/components/policy/policy.component.ts
View File

@ -123,7 +123,8 @@ export class ContractManagementPolicyComponent implements OnInit {
text: '查看传入值', text: '查看传入值',
click: item => { click: item => {
this.openDetail(item) this.openDetail(item)
} },
acl: { ability: ['CONTRACT-POLICY-view'] },
} }
] ]
} }
@ -148,7 +149,12 @@ export class ContractManagementPolicyComponent implements OnInit {
}, },
policyNo: { policyNo: {
type: 'string', type: 'string',
title: '保单号' title: '保单号',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
},
}
}, },
processResult: { processResult: {
type: 'string', type: 'string',

33
src/app/routes/contract-management/services/contract-management.service.ts
View File

@ -15,25 +15,24 @@ import { BaseService } from 'src/app/shared/services';
providedIn: 'root' providedIn: 'root'
}) })
export class ContractManagementService extends BaseService { export class ContractManagementService extends BaseService {
$api_get_getPremiumInformationPage = `/api/sdc/billOperate/listPremiumInformationPage`; $api_get_getPremiumInformationPage = `/api/sdc/billOperate/listPremiumInformationPage`;
// 查询投诉列表 // 查询投诉列表
$api_get_operate_listPage = `/api/sdc/complaint/operate/listPage`; $api_get_operate_listPage = `/api/sdc/complaint/operate/listPage`;
// 新增/更新信息 // 新增/更新信息
$api_save_contractTemplate = `/api/sdc/contractTemplate/save`; $api_save_contractTemplate = `/api/sdc/contractTemplate/save`;
// 查询合同模板表 // 查询合同模板表
$api_get_contractTemplate_page = `/api/sdc/contractTemplate/list/page`; $api_get_contractTemplate_page = `/api/sdc/contractTemplate/list/page`;
// 查询合同模板表详情 // 查询合同模板表详情
$api_get_contractTemplate = `/api/sdc/contractTemplate/get`; $api_get_contractTemplate = `/api/sdc/contractTemplate/get`;
// 删除合同模板 // 删除合同模板
$api_deletebatch_contractTemplate = `/api/sdc/contractTemplate/deletebatch`; $api_deletebatch_contractTemplate = `/api/sdc/contractTemplate/deletebatch`;
// 查询明细合同 // 查询明细合同
$api_listDetailed_page = `/api/sdc/contract/listDetailed/page`; $api_listDetailed_page = `/api/sdc/contract/listDetailed/page`;
// 查询框架合同 // 查询框架合同
$api_listFrame_page = `/api/sdc/contract/listFrame/page`; $api_listFrame_page = `/api/sdc/contract/listFrame/page`;
// 获取订单合同表 // 获取订单合同表
$api_contract_get = `/api/sdc/contract/get`; $api_contract_get = `/api/sdc/contract/get`;
constructor(public injector: Injector) { constructor(public injector: Injector) {
super(injector); super(injector);
} }

8
src/app/routes/insurance-management/components/list/list.component.html
View File

@ -32,8 +32,8 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div> </div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()">查询</button> <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['INSURANCE-LIST-search']">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading">导出</button> <button nz-button nzType="primary" [disabled]="service.http.loading" acl [acl-ability]="['INSURANCE-LIST-export']">导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button> <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
@ -77,7 +77,7 @@
{{ item.premium | currency }} {{ item.premium | currency }}
</ng-template> </ng-template>
<ng-template st-row="processMessage" let-item let-index="index"> <ng-template st-row="processMessage" let-item let-index="index">
{{ item.processResult == '2' ? item.processMessage : '' }} {{ item.processResult == '2' ? item.processMessage : '' }}
</ng-template> </ng-template>
<ng-template st-row="driverName" let-item let-index="index"> <ng-template st-row="driverName" let-item let-index="index">
<div> {{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.carNo }} </div> <div> {{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.carNo }} </div>
@ -123,6 +123,6 @@
<ng-template #extraTemplate> <ng-template #extraTemplate>
<div> <div>
<button nz-button nzType="primary" (click)="changeOrder()"> 保险配置 </button> <button nz-button nzType="primary" (click)="changeOrder()" acl [acl-ability]="['INSURANCE-LIST-insuranceConfig']"> 保险配置 </button>
</div> </div>
</ng-template> </ng-template>

9
src/app/routes/insurance-management/components/list/list.component.ts
View File

@ -460,19 +460,22 @@ export class insuranceManagementListComponent implements OnInit {
buttons: [ buttons: [
{ {
text: '再次投保', text: '再次投保',
click: _record => this.retreatNext(_record) click: _record => this.retreatNext(_record),
// acl: { ability: ['VEHICLE-LIST-view'] },
// iif: item => // iif: item =>
// item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1' // item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1'
}, },
{ {
text: '查看保单', text: '查看保单',
click: _record => this.showImg(_record) click: _record => this.showImg(_record),
// acl: { ability: ['VEHICLE-LIST-view'] },
// iif: item => // iif: item =>
// item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1' // item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1'
}, },
{ {
text: '退保费', text: '退保费',
click: _record => this.retreatPrice(_record) click: _record => this.retreatPrice(_record),
// acl: { ability: ['VEHICLE-LIST-view'] },
} }
] ]
} }

4
src/app/routes/order-management/components/complaint/complaint.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-12 10:52:50 * @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:42 * @LastEditTime : 2022-02-23 15:27:52
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -27,7 +27,7 @@
</div> </div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
(click)="st?.load(1)">查询</button> (click)="st?.load(1)" acl [acl-ability]="['ORDER-COMPLAINT-search']">查询</button>
<button nz-button nzType="primary" <button nz-button nzType="primary"
>导出</button> >导出</button>
<button nz-button (click)="resetSF()">重置</button> <button nz-button (click)="resetSF()">重置</button>

1
src/app/routes/order-management/components/complaint/complaint.component.ts
View File

@ -187,6 +187,7 @@ export class OrderManagementComplaintComponent implements OnInit {
{ {
text: '查看', text: '查看',
click: (_record) => this.view(_record), click: (_record) => this.view(_record),
acl: { ability: ['ORDER-COMPLAINT-view'] },
}, },
], ],
}, },

232
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html
View File

@ -4,19 +4,26 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-12 10:52:50 * @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-01-25 14:02:24 * @LastEditTime : 2022-02-23 15:36:48
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\compliance-audit\\compliance-audit.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\compliance-audit\\compliance-audit.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
<!-- 搜索表单 --> <!-- 搜索表单 -->
<page-header-wrapper [title]="''"> <page-header-wrapper [title]="''"> </page-header-wrapper>
</page-header-wrapper>
<nz-card> <nz-card>
<div nz-row nzGutter="8"> <div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 --> <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4"> <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading" <sf
(formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf> #sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
[loading]="service.http.loading"
(formSubmit)="st?.load(1)"
(formReset)="resetSF()"
></sf>
</div> </div>
<!-- 查询字段大于3个时，根据展开状态调整布局 --> <!-- 查询字段大于3个时，根据展开状态调整布局 -->
@ -25,10 +32,18 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div> </div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" <button
(click)="search()">查询</button> nz-button
<button nz-button nzType="primary" [disabled]="service.http.loading" nzType="primary"
>导出</button> [nzLoading]="service.http.loading"
(click)="search()"
acl
[acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']"
>查询</button
>
<button nz-button nzType="primary" [disabled]="service.http.loading" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']"
>导出</button
>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button> <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
@ -40,84 +55,82 @@
</nz-card> </nz-card>
<nz-card> <nz-card>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
[nzTabBarExtraContent]="extraTemplate"> <nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab>
<nz-tab [nzTitle]="'全部('+tabs?.totalCount+')'"></nz-tab> <nz-tab [nzTitle]="'待抽查(' + tabs?.spotQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'待抽查('+tabs?.spotQuantity+')'"></nz-tab> <nz-tab [nzTitle]="'合格(' + tabs?.qualifiedtity + ')'"></nz-tab>
<nz-tab [nzTitle]="'合格('+tabs?.qualifiedtity+')'"></nz-tab> <nz-tab [nzTitle]="'不合格(' + tabs?.unstayQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'不合格('+tabs?.unstayQuantity+')'"></nz-tab> </nz-tabset>
</nz-tabset> <div style="margin-top: 15px">
<div style="margin-top: 15px;">
<st <st
#st #st
[bordered]="true" [bordered]="true"
[scroll]="{ x: '2000px' }" [scroll]="{ x: '2000px' }"
[data]="service.$api_get_listCompliancePage" [data]="service.$api_get_listCompliancePage"
[columns]="columns" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading" [loading]="service.http.loading"
> >
<ng-template st-row="freightPrice" let-item let-index="index"> <ng-template st-row="freightPrice" let-item let-index="index">
{{ item.freightPrice | currency}} {{ item.freightPrice | currency }}
</ng-template> </ng-template>
<ng-template st-row="loadingTime" let-item let-index="index"> <ng-template st-row="loadingTime" let-item let-index="index">
<div *ngIf="item?.loadingTime">装 | {{item?.loadingTime}}</div> <div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div>
<div *ngIf="item?.unloadingTime">卸 | {{item?.unloadingTime}}</div> <div *ngIf="item?.unloadingTime">卸 | {{ item?.unloadingTime }}</div>
</ng-template> </ng-template>
<ng-template st-row="driverName" let-item let-index="index"> <ng-template st-row="driverName" let-item let-index="index">
<div> <div> {{ item?.driverName }}/{{ item?.driverPhone }}/{{ item?.carNo }} </div>
{{item?.driverName}}/{{item?.driverPhone}}/{{item?.carNo}}
</div>
</ng-template> </ng-template>
<ng-template st-row="payeeName" let-item let-index="index"> <ng-template st-row="payeeName" let-item let-index="index">
<div> <div> {{ item?.payeeName }}/{{ item?.payeePhone }} </div>
{{item?.payeeName}}/{{item?.payeePhone}} </ng-template>
</div> <ng-template st-row="billCode" let-item let-index="index">
<a [routerLink]="'/order-management/bulk-detail/' + item.id">{{ item.billCode }}</a>
<div>
<span>{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}</span>
</div>
<div>
<span>{{ item?.billStatusLabel }}</span>
</div>
</ng-template>
<ng-template st-row="goodsName" let-item let-index="index">
<div>{{ item?.goodsName }}</div>
<div>
<span>{{ item?.weight ? item?.weight + '吨/' : '' }}</span>
<span>{{ item?.volume ? item?.volume + '方/' : '' }}</span>
<span>{{ item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span>
</div>
</ng-template>
<ng-template st-row="mybidDetailInfo" let-item let-index="index">
<div *ngIf="item.mybidDetailInfo.length > 0">
<p *ngFor="let data of item.mybidDetailInfo">
{{ data.expenseName }}：{{ data.price | currency }}
<span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</div>
</ng-template> </ng-template>
<ng-template st-row="billCode" let-item let-index="index">
<a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.billCode}}</a>
<div>
<span>{{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}}</span>
</div>
<div>
<span>{{item?.billStatusLabel}}</span>
</div>
</ng-template>
<ng-template st-row="goodsName" let-item let-index="index">
<div>{{item?.goodsName}}</div>
<div>
<span>{{item?.weight ? item?.weight + '吨/' : '' }}</span>
<span>{{item?.volume ? item?.volume + '方/' : '' }}</span>
<span>{{item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span>
</div>
</ng-template>
<ng-template st-row="mybidDetailInfo" let-item let-index="index">
<div *ngIf="item.mybidDetailInfo.length > 0">
<p *ngFor="let data of item.mybidDetailInfo">
{{ data.expenseName }}：{{ data.price | currency }}
<span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</div>
</ng-template>
</st> </st>
</div> </div>
</nz-card> </nz-card>
<ng-template #extraTemplate> <ng-template #extraTemplate>
<div> <div>
<button nz-button nzType="primary" (click)="audit()"> <button nz-button nzType="primary" (click)="audit()" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-updateBillByComplianceBatch']"> 批量抽查 </button>
批量抽查
</button>
</div> </div>
</ng-template> </ng-template>
<nz-modal
<nz-modal [(nzVisible)]="isVisibleRE" [nzWidth]="600" [nzFooter]="nzModalFooterview2" (nzOnOk)="handleOK()" nzTitle="抽查" (nzOnCancel)="handleCancel('1')"> [(nzVisible)]="isVisibleRE"
[nzWidth]="600"
[nzFooter]="nzModalFooterview2"
(nzOnOk)="handleOK()"
nzTitle="抽查"
(nzOnCancel)="handleCancel('1')"
>
<ng-container *nzModalContent> <ng-container *nzModalContent>
<sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'"> <sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'"> </sf>
</sf>
</ng-container> </ng-container>
<ng-template #nzModalFooterview2> <ng-template #nzModalFooterview2>
<button nz-button nzType="default" (click)="reject()">不合格</button> <button nz-button nzType="default" (click)="reject()">不合格</button>
@ -125,23 +138,22 @@
</ng-template> </ng-template>
</nz-modal> </nz-modal>
<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="运费变更记录" (nzOnCancel)="handleCancel('0')"> <nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="运费变更记录" (nzOnCancel)="handleCancel('0')">
<ng-container *nzModalContent> <ng-container *nzModalContent>
<st <st
#stFloat #stFloat
multiSort multiSort
size="small" size="small"
[bordered]="true" [bordered]="true"
[data]="service.$api_get_listChangeApply" [data]="service.$api_get_listChangeApply"
[columns]="columnsFloat" [columns]="columnsFloat"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeParams }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeParams }"
[res]="{ reName: { list: 'data', total: 'data.total' } }" [res]="{ reName: { list: 'data', total: 'data.total' } }"
>
> <ng-template st-row="order" let-item let-index="index">
<ng-template st-row="order" let-item let-index="index"> {{ index + 1 }}
{{ index + 1 }} </ng-template>
</ng-template> </st>
</st>
</ng-container> </ng-container>
<ng-template #nzModalFooter> <ng-template #nzModalFooter>
<button nz-button nzType="primary" (click)="handleCancel('0')">取消</button> <button nz-button nzType="primary" (click)="handleCancel('0')">取消</button>
@ -149,30 +161,32 @@
</ng-template> </ng-template>
</nz-modal> </nz-modal>
<nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnCancel)="handleCancel('2')"> <nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnCancel)="handleCancel('2')">
<ng-container *nzModalContent> <ng-container *nzModalContent>
<st <st
#stFloatView #stFloatView
size="small" size="small"
[bordered]="true" [bordered]="true"
[data]="service.$api_getChangeRecordWholeDetail" [data]="service.$api_getChangeRecordWholeDetail"
[columns]="columnsFloatView" [columns]="columnsFloatView"
[req]="{ method: 'POST', allInBody: true, params: changeViewParams }" [req]="{ method: 'POST', allInBody: true, params: changeViewParams }"
[res]="{ reName: { list: 'data.list', total: 'data.total' } }" [res]="{ reName: { list: 'data.list', total: 'data.total' } }"
> >
<ng-template st-row="amountBeforeChange" let-item let-index="index"> <ng-template st-row="amountBeforeChange" let-item let-index="index">
{{ item.amountBeforeChange | currency}} {{ item.amountBeforeChange | currency }}
</ng-template> </ng-template>
<ng-template st-row="amountchangeValue" let-item let-index="index"> <ng-template st-row="amountchangeValue" let-item let-index="index"> ￥{{ item.amountchangeValue | number: '0.2-2' }} </ng-template>
￥{{ item.amountchangeValue | number: '0.2-2'}} <ng-template st-row="amountAfterChange" let-item let-index="index">
</ng-template> {{ item.amountAfterChange | currency }}
<ng-template st-row="amountAfterChange" let-item let-index="index"> </ng-template>
{{ item.amountAfterChange | currency}} </st>
</ng-template> <div
</st> ><span>变更原因：{{ ViewCause?.changeCause }}</span></div
<div><span>变更原因：{{ViewCause?.changeCause}}</span></div> >
<div><span>拒绝原因：{{ViewCause?.refuseCause}}</span></div> <div
<div><span>注：附加费依据调整后的运输费用重新计算</span></div> ><span>拒绝原因：{{ ViewCause?.refuseCause }}</span></div
>
<div><span>注：附加费依据调整后的运输费用重新计算</span></div>
</ng-container> </ng-container>
<ng-template #nzModalFooterview> <ng-template #nzModalFooterview>
<button nz-button nzType="default" (click)="handleCancel('2')">取消</button> <button nz-button nzType="default" (click)="handleCancel('2')">取消</button>

6
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
View File

@ -398,12 +398,14 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
{ {
text: '运费变更记录', text: '运费变更记录',
click: _record => this.OpenPrice(_record), click: _record => this.OpenPrice(_record),
// iif: item => item.billStatus == '4' // iif: item => item.billStatus == '4',
acl: { ability: ['ORDER-COMPLIANCE-AUDIT-listChangeApply'] },
}, },
{ {
text: '合规抽查　　', text: '合规抽查　　',
click: _record => this.audit(_record), click: _record => this.audit(_record),
iif: item => item.complianceStatus == '0' iif: item => item.complianceStatus == '0',
acl: { ability: ['ORDER-COMPLIANCE-AUDIT-updateBillByCompliance'] },
}, },
] ]
} }

4
src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-29 14:51:07 * @Date : 2021-12-29 14:51:07
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:23:46 * @LastEditTime : 2022-02-23 16:19:27
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -42,6 +42,8 @@ export class VehicleModifyRateComponent implements OnInit {
additionalRate: { additionalRate: {
type: 'number', type: 'number',
title: '附加费率', title: '附加费率',
maximum: 100,
minimum: 0,
ui: { ui: {
unit: '%', unit: '%',
widgetWidth: 200, widgetWidth: 200,

2
src/app/routes/vehicle/components/list/list.component.html
View File

@ -24,7 +24,7 @@
[nzLoading]="service.http.loading" [nzLoading]="service.http.loading"
(click)="st?.load(1)" (click)="st?.load(1)"
>查询</button> >查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportFire()" acl [acl-ability]="'VEHICLE-LIST-view'" <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportFire()" acl [acl-ability]="'VEHICLE-LIST-export'"
>导出</button >导出</button
> >
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button> <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>

4
src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-24 15:38:08 * @Date: 2021-12-24 15:38:08
* @LastEditTime : 2022-02-22 09:50:27 * @LastEditTime : 2022-02-23 15:43:24
* @LastEditors : Shiming * @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\abnormal-appear\\abnormal-appear.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\abnormal-appear\\abnormal-appear.component.html
@ -30,7 +30,7 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div> </div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="search()">查询</button> <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['WAYBILL-ABNORMAL-search']">查询</button>
<button nz-button (click)="resetSF()">重置</button> <button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}

4
src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
View File

@ -19,8 +19,8 @@
</div> </div>
<div nz-row style="display: flex; justify-content: end;"> <div nz-row style="display: flex; justify-content: end;">
<div nz-col nzSpan="10"> <div nz-col nzSpan="10">
<button nz-button *ngIf="i.wayBillStatus == '2'" (click)="sureDepart(i)">确认发车</button> <button nz-button *ngIf="i.wayBillStatus == '2'" (click)="sureDepart(i)" acl [acl-ability]="['WAYBILL-BULK-DETAIL-insertBulkStartCarInfo']">确认发车</button>
<button nz-button nzType="primary" *ngIf="i.wayBillStatus == '3'" (click)="sureArrive(i)" nzGhost >确认到车</button> <button nz-button nzType="primary" *ngIf="i.wayBillStatus == '3'" (click)="sureArrive(i)" nzGhost acl [acl-ability]="['WAYBILL-BULK-DETAIL-insertBulkUnloadCarInfo']" >确认到车</button>
</div> </div>
</div> </div>
<nz-divider></nz-divider> <nz-divider></nz-divider>

6
src/app/routes/waybill-management/components/bulk/bulk.component.html
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 11:10:14 * @Date: 2021-12-03 11:10:14
* @LastEditTime : 2022-02-21 19:42:59 * @LastEditTime : 2022-02-23 15:41:43
* @LastEditors : Shiming * @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk\\bulk.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk\\bulk.component.html
@ -30,8 +30,8 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div> </div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right"> <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()">查询</button> <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['WAYBILL-BULK-search']">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading">导出</button> <button nz-button nzType="primary" [disabled]="service.http.loading" acl [acl-ability]="['WAYBILL-BULK-export']">导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button> <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}

2
src/app/routes/waybill-management/components/bulk/bulk.component.ts
View File

@ -316,11 +316,13 @@ tabs = {
text: '确认发车', text: '确认发车',
click: (_record) => this.sureDepart(_record), click: (_record) => this.sureDepart(_record),
iif: item => item.wayBillStatus == '2' , iif: item => item.wayBillStatus == '2' ,
acl: { ability: ['WAYBILL-BULK-insertBulkStartCarInfo'] },
}, },
{ {
text: '确认到车', text: '确认到车',
click: (_record) => this.sureArrive(_record), click: (_record) => this.sureArrive(_record),
iif: item => item.wayBillStatus == '3' , iif: item => item.wayBillStatus == '3' ,
acl: { ability: ['WAYBILL-BULK-insertBulkUnloadCarInfo'] },
}, },
], ],
}, },

4
src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -19,8 +19,8 @@
</div> </div>
<div nz-row style="display: flex; justify-content: end;"> <div nz-row style="display: flex; justify-content: end;">
<div nz-col nzSpan="10"> <div nz-col nzSpan="10">
<button nz-button (click)="sureDepart(i)" *ngIf="i?.wayBillStatus == '2'" >确认发车</button> <button nz-button (click)="sureDepart(i)" *ngIf="i?.wayBillStatus == '2'" acl [acl-ability]="['WAYBILL-VEHICLE-DETAIL-wholeStartCarInfo']">确认发车</button>
<button nz-button nzType="primary" (click)="sureArrive(i)" *ngIf="i?.wayBillStatus == '3'" nzGhost >确认到车</button> <button nz-button nzType="primary" (click)="sureArrive(i)" *ngIf="i?.wayBillStatus == '3'" nzGhost acl [acl-ability]="['WAYBILL-VEHICLE-DETAIL-wholeUnloadCarInfo']">确认到车</button>
</div> </div>
</div> </div>
<nz-divider></nz-divider> <nz-divider></nz-divider>

6
src/app/routes/waybill-management/components/vehicle/vehicle.component.html
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 11:10:14 * @Date: 2021-12-03 11:10:14
* @LastEditTime : 2022-02-21 19:34:48 * @LastEditTime : 2022-02-23 15:39:15
* @LastEditors : Shiming * @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle\\vehicle.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle\\vehicle.component.html
@ -30,8 +30,8 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div> </div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.expend-options]="_$expand" class="text-right"> <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.expend-options]="_$expand" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()">查询</button> <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['WAYBILL-VEHICLE-search']">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading">导出</button> <button nz-button nzType="primary" [disabled]="service.http.loading" acl [acl-ability]="['WAYBILL-VEHICLE-export']">导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button> <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}

6
src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
View File

@ -340,12 +340,14 @@ export class WaybillManagementVehicleComponent implements OnInit {
{ {
text: '确认发车', text: '确认发车',
click: _record => this.sureDepart(_record), click: _record => this.sureDepart(_record),
iif: item => item.wayBillStatus == '2' iif: item => item.wayBillStatus == '2',
acl: { ability: ['WAYBILL-VEHICLE-wholeStartCarInfo'] },
}, },
{ {
text: '确认到车', text: '确认到车',
click: _record => this.sureArrive(_record), click: _record => this.sureArrive(_record),
iif: item => item.wayBillStatus == '3' iif: item => item.wayBillStatus == '3',
acl: { ability: ['WAYBILL-VEHICLE-wholeUnloadCarInfo'] },
} }
] ]
} }

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

@ -150,9 +150,6 @@ export class InsuranceTableComponent implements OnInit {
} }
save() { save() {
console.log(this.data);
console.log(this.minInsurancePrice);
console.log(this.sf.value);
if(!this.minInsurancePrice) { if(!this.minInsurancePrice) {
this.service.msgSrv.error('必填项为空！') this.service.msgSrv.error('必填项为空！')
return return