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 3ea3d747..f4477ef8 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
@@ -375,13 +375,13 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
title: '审核人',
width: '180px',
className: 'text-left',
- index: 'loadingLadingBillFilePath'
+ index: 'complianceName'
},
{
title: '审核时间',
width: '180px',
className: 'text-left',
- index: 'loadingLadingBillFilePath'
+ index: 'complianceTime'
},
{
title: '状态',
diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
index 47e81e17..b232905e 100644
--- a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
+++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
@@ -11,13 +11,13 @@
{{headerTotalInfo?.ltdName}}
- {{headerTotalInfo?.allAmount |currency}}
+ {{headerTotalInfo?.allAmount |currency}}
- {{headerTotalInfo?.incomeAmount |currency}}
+ {{headerTotalInfo?.incomeAmount |currency}}
- {{headerTotalInfo?.payAmount |currency}}
+ {{headerTotalInfo?.payAmount |currency}}
diff --git a/src/app/routes/partner/account-management/components/list/list.component.ts b/src/app/routes/partner/account-management/components/list/list.component.ts
index 1a12dd8c..3d98844e 100644
--- a/src/app/routes/partner/account-management/components/list/list.component.ts
+++ b/src/app/routes/partner/account-management/components/list/list.component.ts
@@ -59,7 +59,7 @@ export class PartnerAccountManagementListComponent implements OnInit {
*/
initST() {
this.columns = [
- { title: '合伙人名称', index: 'userName', className: 'text-center', width: 250 },
+ { title: '合伙人名称', index: 'name', className: 'text-center', width: 250 },
{ title: '手机号', index: 'phone', className: 'text-center', width: 200 },
{
title: '账户总额(元)', index: 'allBalance', className: 'text-right', sort: true, width: 150, type: 'currency',
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
index 0dc738c1..218de752 100644
--- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
@@ -8,23 +8,27 @@
- {{summaryObj?.company}}
+ {{summaryObj?.taxno}}
- {{summaryObj?.totalRebate |currency}}
+ {{(summaryObj?.totalRebate?summaryObj?.totalRebate: 0 )|currency :'
+ '}}
- {{summaryObj?.totalRebate |currency}}
+ {{(summaryObj?.recordedAmount?summaryObj?.recordedAmount:0
+ )|currency:' '}}
- {{summaryObj?.taxPersonalSum |currency}}
+ {{(summaryObj?.taxPersonalSum?summaryObj?.taxPersonalSum:0
+ )|currency:' '}}
- {{summaryObj?.waitRecordedAmount |currency}}
+ {{(summaryObj?.waitRecordedAmount?summaryObj?.waitRecordedAmount:0)
+ |currency:' '}}
- {{summaryObj?.name}}
+ {{summaryObj?.ltdName}}
@@ -43,11 +47,11 @@
@@ -55,8 +59,8 @@
- {{detailRecord?.ltdName}}
- {{detailRecord?.totalRebate |currency: ' '}}
+ {{detailRecord?.ltdName}}
+ {{detailRecord?.totalRebate |currency: ' '}}
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
index e86373e0..cf4e33ec 100644
--- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
@@ -19,6 +19,12 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
taxno: ''
};
+ footerSummary = {
+ total: 0,
+ income: 0,
+ spending: 0
+ }
+
detailRecord: any = {};
url = `/user`;
@@ -156,6 +162,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
this.billDetailColumns = [];
this.showBillDetail = true;
this.initBillDetailST();
+ this.detailRecord = record;
this.getBillDetail(record?.ltdId);
}
@@ -169,6 +176,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
handleCancel() {
this.showBillDetail = false;
+ this.detailRecord = {};
}
goBack() {
diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts
index 1ff042b0..5456947b 100644
--- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts
+++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts
@@ -466,8 +466,26 @@ export class NetworkFreightComponent implements OnInit {
}
});
}
+ if(this.NCStatus) {
+ this.getNcSetData()
+ }
this.isVisibleTicket = true;
}
+ getNcSetData() {
+ const List: any = [];
+ console.log(99999);
+ this.service.request(this.service.$api_get_crmCustomer, { id: this.ticketItem.crmCustomerId }).subscribe((res: any) => {
+ console.log(res);
+ if (res) {
+ List.push({ label: res.customerName, value: res.id });
+ console.log(List);
+
+ this.sfNC.getProperty('/crmCustomerId')!.schema.enum = List;
+ this.sfNC.getProperty('/crmCustomerId')!.widget.reset(List);
+ this.sfNC.setValue('/crmCustomerId', res?.id);
+ }
+ });
+ }
getProvinceData(value: any) {
this.service.http.post(this.service.$api_getRegionDetailByCode, { regionCode: value }).subscribe(res => {
let enterpriseAddressCode: any = [];
@@ -661,10 +679,10 @@ export class NetworkFreightComponent implements OnInit {
this.NCStatus = false;
this.taxStatus = false;
} else if (value.name === 'NC设置'){
+ this.getNcSetData()
this.NCStatus = true;
this.TicketStatus = false;
this.taxStatus = false;
-
}
}
// 新增
diff --git a/src/app/routes/usercenter/components/driver/captain/add/add.component.less b/src/app/routes/usercenter/components/driver/captain/add/add.component.less
index bfa10586..fd19d3c9 100644
--- a/src/app/routes/usercenter/components/driver/captain/add/add.component.less
+++ b/src/app/routes/usercenter/components/driver/captain/add/add.component.less
@@ -1,36 +1,41 @@
.pr {
- position: relative;
+ position: relative;
+}
+
+.pa {
+ position: absolute;
+ top: 35px;
+ left: 150px;
+ img{border: solid 1px #ebf0fb;}
+}
+
+.tips {
+ display: flex;
+ margin-bottom: 0;
+ color: #333;
+
+ dt {
+ width: 150px;
}
-
- .pa {
- position: absolute;
- top: 35px;
- left: 150px;
- img{border: solid 1px #ebf0fb;}
- }
-
- .tips {
- display: flex;
+
+ dd {
+ width: 190px;
margin-bottom: 0;
- color: #333;
-
- dt {
- width: 150px;
- }
-
- dd {
- width: 190px;
- margin-bottom: 0;
- text-align: center;
- }
+ text-align: center;
}
- :host{
- ::ng-deep {
- .ant-input-borderless{
- padding: 0;
- padding-top: 4px;
- color: black;
- resize:none;
+}
+:host{
+ ::ng-deep {
+ .ant-input-borderless{
+ padding: 0;
+ padding-top: 4px;
+ color: black;
+ resize:none;
+ }
+ .hideBtn .ant-upload-list-item-actions button{
+ &:last-child{
+ display: none;
}
}
- }
\ No newline at end of file
+ }
+}
\ No newline at end of file