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

'fixbug'

Browse Source
This commit is contained in:
1107302052
2022-03-18 00:54:13 +08:00
parent 759c829c4d
commit cadf4acd85
9 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/routes/order-management/components/bulk/bulk.component.ts
View File

@ -513,7 +513,7 @@ export class OrderManagementBulkComponent implements OnInit {
title: '操作',
fixed: 'right',
width: '130px',
className: 'text-center',
className: 'text-left block-td',
buttons: [
{
text: '运费变更记录',
@ -523,44 +523,44 @@ export class OrderManagementBulkComponent implements OnInit {
acl: { ability: ['ORDER-BULK-listChangeApply'] },
},
{
text: '查看评价　',
text: '查看评价',
click: _record => this.viewEvaluate(_record),
iif: item => item.billStatus == '5',
acl: { ability: ['ORDER-BULK-evaluation'] },
},
{
text: '查看详情　',
text: '查看详情',
click: (item: any) => {
this.router.navigate(['./bulk-detail', item.id], { relativeTo: this.ar });
},
acl: { ability: ['USERCENTER-FREIGHT-USER-view'] },
},
{
text: '变更运费　',
text: '变更运费',
click: _record => this.updateFreight(_record),
iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2',
acl: { ability: ['ORDER-BULK-FreightChangeBulkDetail'] },
},
{
text: '确认签收　',
text: '确认签收',
click: _record => this.confirmReceipt(_record),
iif: item => item.billStatus == '4',
acl: { ability: ['VEHICLE-LIST-view'] },
},
{
text: '取消订单　',
text: '取消订单',
click: _record => this.cancellation(_record),
iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2',
acl: { ability: ['ORDER-BULK-signBulkOrder'] },
},
{
text: '申请退款　',
text: '申请退款',
click: (_record) => this.applyRefund(_record),
iif: item => item.isApplyForRefund,
acl: { ability: ['ORDER-VEHICLE-modificationOrder'] },
},
{
text: '修改订单　',
text: '修改订单',
click: _record => this.changeOrder(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
acl: { ability: ['ORDER-BULK-BulkBillDetail'] },

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

@ -389,7 +389,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
title: '操作',
fixed: 'right',
width: '140px',
className: 'text-center',
className: 'text-center block-td',
buttons: [
{
text: '查看申诉记录',
@ -403,7 +403,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
acl: { ability: ['ORDER-COMPLIANCE-AUDIT-listChangeApply'] },
},
{
text: '合规抽查　　',
text: '合规抽查',
click: _record => this.audit(_record),
iif: item => item.complianceStatus == '0',
acl: { ability: ['ORDER-COMPLIANCE-AUDIT-updateBillByCompliance'] },

8
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
View File

@ -331,7 +331,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
title: '操作',
fixed: 'right',
width: '136px',
className: 'text-center',
className: 'text-center block-td',
buttons: [
{
text: '生成电子单据',
@ -340,19 +340,19 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
acl: { ability: ['ORDER-RECEIPTS-electronicBillingOne'] },
},
{
text: '通过　　　　',
text: '通过',
click: _record => this.sign(_record),
iif: item => item.auditStatus == '1',
acl: { ability: ['ORDER-RECEIPTS-billAuditPassBatch'] },
},
{
text: '修改　　　　',
text: '修改',
click: _record => this.modification(_record),
iif: item => item.auditStatus == '1' ,
acl: { ability: ['ORDER-RECEIPTS-updateBillExamine'] },
},
{
text: '查看凭证　',
text: '查看凭证',
click: _record => this.generate(_record, 3),
iif: item => item.auditStatus == '2',
acl: { ability: ['ORDER-RECEIPTS-view'] },

4
src/app/routes/order-management/components/risk/risk.component.ts
View File

@ -302,7 +302,7 @@ export class OrderManagementRiskComponent implements OnInit {
title: '操作',
fixed: 'right',
width: '90px',
className: 'text-center',
className: 'text-center block-td',
buttons: [
{
text: '审核',
@ -311,7 +311,7 @@ export class OrderManagementRiskComponent implements OnInit {
acl: { ability: ['ORDER-RISK-audit'] },
},
{
text: '详情　',
text: '详情',
click: _record => this.viewEvaluate(_record),
acl: { ability: ['ORDER-RISK-riskDetail'] },
}

18
src/app/routes/order-management/components/vehicle/vehicle.component.ts
View File

@ -436,7 +436,7 @@ resourceStatus: any;
title: '操作',
fixed: 'right',
width: '130px',
className: 'text-center',
className: 'text-center block-td',
buttons: [
{
@ -446,50 +446,50 @@ resourceStatus: any;
acl: { ability: ['ORDER-VEHICLE-ChangeApplyList'] },
},
{
text: '查看详情　',
text: '查看详情',
click: (item: any) => {
this.router.navigate(['./vehicle-detail', item.id], { relativeTo: this.ar });
},
acl: { ability: ['USERCENTER-FREIGHT-USER-view'] },
},
{
text: '查看评价　',
text: '查看评价',
click: (_record) => this.viewEvaluate(_record),
iif: item => item.billStatus == '5',
acl: { ability: ['ORDER-VEHICLE-evaluation'] },
},
{
text: '变更运费　',
text: '变更运费',
click: (_record) => this.updateFreight(_record),
iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2',
acl: { ability: ['ORDER-VEHICLE-FreightChangeWholeDetail'] },
},
{
text: '确认签收　',
text: '确认签收',
click: (_record) => this.confirmReceipt(_record),
iif: item => item.billStatus == '4',
acl: { ability: ['ORDER-VEHICLE-signWholeOrder'] },
},
{
text: '取消订单　',
text: '取消订单',
click: (_record) => this.cancellation(_record),
iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus !== '2',
acl: { ability: ['ORDER-VEHICLE-cancelAnOrder'] },
},
{
text: '修改订单　',
text: '修改订单',
click: (_record) => this.changeOrder(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
acl: { ability: ['ORDER-VEHICLE-modificationOrder'] },
},
{
text: '申请退款　',
text: '申请退款',
click: (_record) => this.applyRefund(_record),
iif: item => item.isApplyForRefund,
acl: { ability: ['ORDER-VEHICLE-modificationOrder'] },
},
{
text: '查看轨迹　',
text: '查看轨迹',
click: (_record) => this.viewTrack(_record),
iif: item => item.billStatus !== '1' && item.billStatus !== '6',
// acl: { ability: ['VEHICLE-LIST-view'] },

4
src/app/routes/supply-management/components/bulk/bulk.component.ts
View File

@ -323,7 +323,7 @@ export class SupplyManagementBulkComponent implements OnInit {
title: '操作',
fixed: 'right',
width: '110px',
className: 'text-center',
className: 'text-center block-td',
buttons: [
{
text: '货源审核',
@ -332,7 +332,7 @@ export class SupplyManagementBulkComponent implements OnInit {
acl: { ability: ['SUPPLY-INDEX-bulkBatchAudit'] },
},
{
text: '二维码　',
text: '二维码',
click: (_record) => this.assignedQrcode(_record),
iif: item => item.resourceStatus == 1,
},

4
src/app/routes/supply-management/components/vehicle/vehicle.component.ts
View File

@ -596,7 +596,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
title: '操作',
fixed: 'right',
width: '110px',
className: 'text-center',
className: 'text-center block-td',
buttons: [
{
text: '货源审核',
@ -627,7 +627,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
acl: { ability: ['SUPPLY-INDEX-vehiclePlaceOrder'] }
},
{
text: '重新指派　',
text: '重新指派',
click: _record => this.assignedCar(_record),
iif: item => item.resourceStatus === '1' && item.serviceType === '2',
acl: { ability: ['SUPPLY-INDEX-vehicleReassign'] }

5
src/app/routes/usercenter/components/freight/list/list.component.ts
View File

@ -377,12 +377,11 @@ export class FreightComponentsListComponent implements OnInit {
{
title: '操作',
width: '110px',
className: 'text-center',
className: 'text-center block-td',
fixed: 'right',
buttons: [
{ type: 'divider' },
{
text: '查看　　<br>',
text: '查看',
acl: { ability: ['USERCENTER-FREIGHT-LIST-view'] },
click: item => {
this.router.navigate(['./detail', item.id], { relativeTo: this.ar });

15
src/styles.less
View File

@ -48,3 +48,18 @@ input[type="number"] {
word-break: break-all;
word-wrap : break-word;
}
st {
.block-td {
.ant-divider-vertical {
display: none;
margin: 0;
border-left: none;
}
st-td {
span>a {
display: block;
}
}
}
}