-
已选择{{selectedRows?.length || 0}}条订单，确认批量签收吗？
-
-
- 签收后不可再修改运费，请确保运费等信息准确无误后，再进行签收。
+
已选择{{ selectedRows?.length || 0 }}条订单，确认批量签收吗？
+
签收后不可再修改运费，请确保运费等信息准确无误后，再进行签收。
-
+
-
\ No newline at end of file
+
diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts
index 6dfb8176..c15079ef 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -115,7 +115,7 @@ export class OrderManagementBulkComponent implements OnInit {
totalCount: 0
};
const params: any = Object.assign({}, this.reqParams || {});
- delete params.billStatus
+ delete params.billStatus;
this.service.request(this.service.$api_getBulkStatistical, params).subscribe(res => {
if (res) {
let totalCount = 0;
@@ -463,33 +463,39 @@ export class OrderManagementBulkComponent implements OnInit {
text: '运费变更记录',
click: _record => this.OpenPrice(_record),
iif: item =>
- item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6'
+ item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6',
+ acl: { ability: ['ORDER-BULK-listChangeApply'] },
},
{
text: '查看评价 ',
click: _record => this.viewEvaluate(_record),
- iif: item => item.billStatus == '5'
+ iif: item => item.billStatus == '5',
+ acl: { ability: ['ORDER-BULK-evaluation'] },
},
{
text: '变更运费 ',
click: _record => this.updateFreight(_record),
- iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2'
+ iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2',
+ acl: { ability: ['ORDER-BULK-FreightChangeBulkDetail'] },
},
{
text: '确认签收 ',
click: _record => this.confirmReceipt(_record),
- iif: item => item.billStatus == '4'
+ iif: item => item.billStatus == '4',
+ acl: { ability: ['VEHICLE-LIST-view'] },
},
{
text: '取消订单 ',
click: _record => this.cancellation(_record),
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',
+ acl: { ability: ['ORDER-BULK-signBulkOrder'] },
},
{
text: '修改订单 ',
click: _record => this.changeOrder(_record),
- iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3'
+ iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
+ acl: { ability: ['ORDER-BULK-BulkBillDetail'] },
}
]
}
@@ -624,25 +630,25 @@ export class OrderManagementBulkComponent implements OnInit {
/**
*查看评价
*/
- viewEvaluate(item: any) {
- console.log(item)
- this.isVisibleEvaluate = true
+ viewEvaluate(item: any) {
+ console.log(item);
+ this.isVisibleEvaluate = true;
const params = {
businessCode: item.billCode,
- evaluateUserId: item.shipperAppUserId,
- }
+ evaluateUserId: item.shipperAppUserId
+ };
const params2 = {
businessCode: item.billCode,
- passiveUserId: item.shipperAppUserId,
- }
+ passiveUserId: item.shipperAppUserId
+ };
this.service.request(this.service.$api_getBillEvaluateByShipper, params).subscribe(res => {
- console.log(res)
- console.log(res.evaluateInfos)
- this.shipList = res.evaluateInfos
+ console.log(res);
+ console.log(res.evaluateInfos);
+ this.shipList = res.evaluateInfos;
});
this.service.request(this.service.$api_getBillEvaluateDriverByShipper, params2).subscribe(res => {
- console.log(res)
- this.diverList = res.evaluateInfos
+ console.log(res);
+ this.diverList = res.evaluateInfos;
});
}
/**
@@ -685,9 +691,9 @@ export class OrderManagementBulkComponent implements OnInit {
});
}
userAction() {
- if(this.selectedRows.length <= 0) {
- this.service.msgSrv.error('请选择订单！')
- return
+ if (this.selectedRows.length <= 0) {
+ this.service.msgSrv.error('请选择订单！');
+ return;
}
let params: any[] = [];
this.selectedRows.forEach(item => {
diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
index cc51500b..412ccb1b 100644
--- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
+++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
- * @LastEditTime : 2022-01-24 15:40:10
+ * @LastEditTime : 2022-02-15 15:03:39
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -91,7 +91,7 @@
{{item?.serviceTypeName}}