-
+
-
+
diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts
index e1a34797..3a28c9f8 100644
--- a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts
+++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts
@@ -125,10 +125,12 @@ export class ContractManagementTemplateComponent implements OnInit {
{
text: '编辑',
click: (_record) => this.edit(_record),
+ acl: { ability: ['CONTRACT-TEMPLATE-edit'] },
},
{
text: '删除',
click: (_record) => this.delete(_record),
+ acl: { ability: ['CONTRACT-TEMPLATE-delete'] },
},
],
},
diff --git a/src/app/routes/contract-management/components/policy/policy.component.html b/src/app/routes/contract-management/components/policy/policy.component.html
index 266fd620..d54bd837 100644
--- a/src/app/routes/contract-management/components/policy/policy.component.html
+++ b/src/app/routes/contract-management/components/policy/policy.component.html
@@ -1,3 +1,13 @@
+
@@ -24,7 +34,7 @@
-
+
-
-
+
+
查询
+ (click)="st?.load(1)" acl [acl-ability]="['ORDER-COMPLAINT-search']">查询
导出
重置
diff --git a/src/app/routes/order-management/components/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts
index edf11ab5..7f743dd1 100644
--- a/src/app/routes/order-management/components/complaint/complaint.component.ts
+++ b/src/app/routes/order-management/components/complaint/complaint.component.ts
@@ -187,6 +187,7 @@ export class OrderManagementComplaintComponent implements OnInit {
{
text: '查看',
click: (_record) => this.view(_record),
+ acl: { ability: ['ORDER-COMPLAINT-view'] },
},
],
},
diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html
index d958b017..4430599b 100644
--- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html
+++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html
@@ -4,19 +4,26 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @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
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
-
-
+
-
查询
-
导出
+
查询
+
导出
重置
{{ !_$expand ? '展开' : '收起' }}
@@ -40,84 +55,82 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
- {{ item.freightPrice | currency}}
-
-
- 装 | {{item?.loadingTime}}
- 卸 | {{item?.unloadingTime}}
-
-
-
- {{item?.driverName}}/{{item?.driverPhone}}/{{item?.carNo}}
-
+
+ {{ item.freightPrice | currency }}
+
+
+ 装 | {{ item?.loadingTime }}
+ 卸 | {{ item?.unloadingTime }}
+
+
+ {{ item?.driverName }}/{{ item?.driverPhone }}/{{ item?.carNo }}
-
- {{item?.payeeName}}/{{item?.payeePhone}}
-
+ {{ item?.payeeName }}/{{ item?.payeePhone }}
+
+
+ {{ item.billCode }}
+
+ {{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}
+
+
+ {{ item?.billStatusLabel }}
+
+
+
+ {{ item?.goodsName }}
+
+ {{ item?.weight ? item?.weight + '吨/' : '' }}
+ {{ item?.volume ? item?.volume + '方/' : '' }}
+ {{ item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}
+
+
+
+ 0">
+
+ {{ data.expenseName }}:{{ data.price | currency }}
+ {{ data.paymentStatusLabel }}
+
+
-
- {{item.billCode}}
-
- {{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}}
-
-
- {{item?.billStatusLabel}}
-
-
-
- {{item?.goodsName}}
-
- {{item?.weight ? item?.weight + '吨/' : '' }}
- {{item?.volume ? item?.volume + '方/' : '' }}
- {{item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}
-
-
-
- 0">
-
- {{ data.expenseName }}:{{ data.price | currency }}
- {{ data.paymentStatusLabel }}
-
-
-
-
-批量抽查
-
+ 批量抽查
-
-
+
-
-
+
不合格
@@ -125,23 +138,22 @@
-
+
-
- {{ index + 1 }}
-
-
+ #stFloat
+ multiSort
+ size="small"
+ [bordered]="true"
+ [data]="service.$api_get_listChangeApply"
+ [columns]="columnsFloat"
+ [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeParams }"
+ [res]="{ reName: { list: 'data', total: 'data.total' } }"
+ >
+
+ {{ index + 1 }}
+
+
取消
@@ -149,33 +161,35 @@
-
+
-
- {{ item.amountBeforeChange | currency}}
-
-
- ¥{{ item.amountchangeValue | number: '0.2-2'}}
-
-
- {{ item.amountAfterChange | currency}}
-
-
- 变更原因:{{ViewCause?.changeCause}}
- 拒绝原因:{{ViewCause?.refuseCause}}
- 注:附加费依据调整后的运输费用重新计算
+ #stFloatView
+ size="small"
+ [bordered]="true"
+ [data]="service.$api_getChangeRecordWholeDetail"
+ [columns]="columnsFloatView"
+ [req]="{ method: 'POST', allInBody: true, params: changeViewParams }"
+ [res]="{ reName: { list: 'data.list', total: 'data.total' } }"
+ >
+
+ {{ item.amountBeforeChange | currency }}
+
+ ¥{{ item.amountchangeValue | number: '0.2-2' }}
+
+ {{ item.amountAfterChange | currency }}
+
+
+ 变更原因:{{ ViewCause?.changeCause }}
+ 拒绝原因:{{ ViewCause?.refuseCause }}
+ 注:附加费依据调整后的运输费用重新计算
取消
确定
-
\ No newline at end of file
+
diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
index df351650..d6e0fa51 100644
--- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
+++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
@@ -398,12 +398,14 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
{
text: '运费变更记录',
click: _record => this.OpenPrice(_record),
- // iif: item => item.billStatus == '4'
+ // iif: item => item.billStatus == '4',
+ acl: { ability: ['ORDER-COMPLIANCE-AUDIT-listChangeApply'] },
},
{
text: '合规抽查 ',
click: _record => this.audit(_record),
- iif: item => item.complianceStatus == '0'
+ iif: item => item.complianceStatus == '0',
+ acl: { ability: ['ORDER-COMPLIANCE-AUDIT-updateBillByCompliance'] },
},
]
}
diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html
index 37dc0262..425e1621 100644
--- a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html
+++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-14 14:03:07
* @LastEditors : Shiming
- * @LastEditTime : 2022-02-21 14:44:38
+ * @LastEditTime : 2022-02-23 14:20:32
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts
index 281184cf..8c89214c 100644
--- a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts
+++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-14 14:03:07
* @LastEditors : Shiming
- * @LastEditTime : 2022-02-22 15:44:05
+ * @LastEditTime : 2022-02-23 14:23:26
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts
index 3b8c81a2..87a1a092 100644
--- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-29 14:51:07
* @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
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -42,6 +42,8 @@ export class VehicleModifyRateComponent implements OnInit {
additionalRate: {
type: 'number',
title: '附加费率',
+ maximum: 100,
+ minimum: 0,
ui: {
unit: '%',
widgetWidth: 200,
diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts
index cbb65a33..82cd03ef 100644
--- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
- * @LastEditTime : 2022-02-22 15:40:01
+ * @LastEditTime : 2022-02-23 14:25:45
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -152,6 +152,7 @@ export class VehicleUpdateFreightComponent implements OnInit {
this.calculateSub = this.service.request(this.service.$api_getWholeSurchargeDetail, this.getParams()).subscribe((res: any) => {
if (res) {
Object.assign(this.data, {
+ totalAmount: res.totalAmount,
totalFreight: res.totalFreight,
freight: res.freight,
surcharge: res.surcharge
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
index c08bf3d2..55b78712 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
@@ -350,7 +350,7 @@ export class InvoiceRequestedComponent implements OnInit {
{
title: '申请金额',
index: 'applyAmount',
- width: 100,
+ width: 140,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.applyAmount }) }
@@ -358,7 +358,7 @@ export class InvoiceRequestedComponent implements OnInit {
{
title: '运输费',
index: 'fjfmoney2',
- width: 90,
+ width: 140,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fjfmoney2 }) }
@@ -366,7 +366,7 @@ export class InvoiceRequestedComponent implements OnInit {
{
title: '附加费',
index: 'fjfmoney',
- width: 90,
+ width: 140,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fjfmoney }) }
@@ -374,7 +374,7 @@ export class InvoiceRequestedComponent implements OnInit {
{
title: '已开票金额',
index: 'invoicedMoney',
- width: 120,
+ width: 140,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoicedMoney }) }
diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
index 67067671..11e4542c 100644
--- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
+++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
@@ -33,7 +33,7 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
ngOnInit() {}
settingAction(item?: any) {
- this.modal.create({
+ const modal = this.modal.create({
nzTitle: '配置',
nzContent: DynamicSettingModalComponent,
nzWidth: 900,
@@ -44,6 +44,12 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
},
nzFooter: null
});
+
+ modal.afterClose.subscribe(res => {
+ if (res) {
+ this.st.load(1);
+ }
+ });
}
/**
diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
index 7ffd3e84..44df5acc 100644
--- a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
+++ b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
@@ -153,7 +153,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
{ title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 },
{ title: '联系人', className: 'text-center', index: 'contacter', width: 150 },
{ title: '手机号', className: 'text-center', index: 'mobile', width: 150 },
- { title: '申请时间', className: 'text-center', index: 'createTime', width: 150 },
+ { title: '申请时间', className: 'text-center', index: 'createTime', width: 160 },
{
title: '审核状态',
className: 'text-center',
@@ -189,11 +189,11 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
initAdminST(): STColumn[] {
return [
{ title: '企业名称', className: 'text-center', index: 'enterpriseName' },
- { title: '当前管理员', className: 'text-center', index: 'oldAdminName' },
- { title: '当前管理员手机号', className: 'text-center', index: 'oldAdminMobile' },
- { title: '转授对象', className: 'text-center', index: 'newAdminName' },
- { title: '转授对象手机号', className: 'text-center', index: 'newAdminMobile' },
- { title: '申请时间', className: 'text-center', index: 'createTime' },
+ { title: '当前管理员', className: 'text-center', index: 'oldAdminName', width: 140 },
+ { title: '当前管理员手机号', className: 'text-center', index: 'oldAdminMobile', width: 150 },
+ { title: '转授对象', className: 'text-center', index: 'newAdminName', width: 140 },
+ { title: '转授对象手机号', className: 'text-center', index: 'newAdminMobile', width: 150 },
+ { title: '申请时间', className: 'text-center', index: 'createTime', width: 160 },
{
title: '状态',
className: 'text-center',
@@ -203,7 +203,8 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
10: { text: '待审核', color: 'processing' },
20: { text: '已成功', color: 'success' },
30: { text: '已驳回', color: 'warning' }
- }
+ },
+ width: 130
},
{
title: '操作',
diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
index cd0c528e..31f5486b 100644
--- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
+++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
@@ -35,7 +35,7 @@ export class FreightConfigComponent implements OnInit {
};
settingAction(item?: any) {
- this.modal.create({
+ const modal = this.modal.create({
nzTitle: '配置',
nzContent: DynamicSettingModalComponent,
nzWidth: 900,
@@ -66,6 +66,11 @@ export class FreightConfigComponent implements OnInit {
},
nzFooter: null
});
+ modal.afterClose.subscribe(res => {
+ if (res) {
+ this.st.load(1);
+ }
+ });
}
exportList() {
diff --git a/src/app/routes/vehicle/components/list/list.component.html b/src/app/routes/vehicle/components/list/list.component.html
index 7e3b450d..be3fb947 100644
--- a/src/app/routes/vehicle/components/list/list.component.html
+++ b/src/app/routes/vehicle/components/list/list.component.html
@@ -24,7 +24,7 @@
[nzLoading]="service.http.loading"
(click)="st?.load(1)"
>查询
- 导出
重置
diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
index 2bb0d079..b17e0699 100644
--- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
+++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
@@ -1,7 +1,7 @@