diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
index ac3a410b..f4a60d20 100644
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-24 16:58:02
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-20 14:46:48
+ * @LastEditTime : 2022-04-27 10:15:09
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
index 62a4719b..1cb1b29a 100644
--- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
+++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
@@ -77,7 +77,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.loadingAddressArr[0]}`,
+ `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
],
position: '2',
@@ -122,7 +122,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.loadingAddressArr[0]}`,
+ `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
],
position: '2',
@@ -175,7 +175,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.unloadingAddressArr[0]}`,
+ `上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
],
position: '2',
@@ -220,7 +220,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.unloadingAddressArr[0]}`,
+ `上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
],
position: '2',
@@ -284,7 +284,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.loadingAddressArr[0]}`,
+ `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
],
position: '2',
@@ -330,7 +330,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.loadingAddressArr[0]}`,
+ `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
],
position: '2',
@@ -392,7 +392,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.unloadingAddressArr[0]}`,
+ `上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
],
position: '2',
@@ -438,7 +438,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.unloadingAddressArr[0]}`,
+ `上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
],
position: '2',
diff --git a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts
index 3b037b45..d9a6d5b6 100644
--- a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts
@@ -70,7 +70,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.loadingPlace[0]}`,
+ `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@@ -115,7 +115,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.loadingPlace[0]}`,
+ `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@@ -168,7 +168,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.dischargePlace[0]}`,
+ `上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@@ -213,7 +213,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.dischargePlace[0]}`,
+ `上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@@ -283,7 +283,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.loadingPlace[0]}`,
+ `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@@ -328,7 +328,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.loadingPlace[0]}`,
+ `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@@ -381,7 +381,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.dischargePlace[0]}`,
+ `上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@@ -426,7 +426,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.dischargePlace[0]}`,
+ `上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
diff --git a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts
index 70bdc1be..d1ab6900 100644
--- a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts
@@ -82,7 +82,7 @@ export class VehicleSureDepartComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.loadingPlace[0]}`,
+ `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@@ -127,7 +127,7 @@ export class VehicleSureDepartComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.loadingPlace[0]}`,
+ `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@@ -205,7 +205,7 @@ export class VehicleSureDepartComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.loadingPlace[0]}`,
+ `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@@ -250,7 +250,7 @@ export class VehicleSureDepartComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
- `上传位置:${this.i?.loadingPlace[0]}`,
+ `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
diff --git a/src/app/routes/partner/rebate-management/components/particulars/particulars.component.html b/src/app/routes/partner/rebate-management/components/particulars/particulars.component.html
index 0ebf82f0..2b4246d2 100644
--- a/src/app/routes/partner/rebate-management/components/particulars/particulars.component.html
+++ b/src/app/routes/partner/rebate-management/components/particulars/particulars.component.html
@@ -4,8 +4,8 @@
* @Author : Shiming
* @Date : 2022-02-24 20:09:49
* @LastEditors : Shiming
- * @LastEditTime : 2022-02-24 20:14:21
- * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\list\\particulars.component.html
+ * @LastEditTime : 2022-04-27 10:17:31
+ * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\particulars\\particulars.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -43,8 +43,16 @@
-
+
+
+
+
+
+
diff --git a/src/app/routes/partner/rebate-management/components/particulars/particulars.component.ts b/src/app/routes/partner/rebate-management/components/particulars/particulars.component.ts
index 55ed5dd9..e7d7ac30 100644
--- a/src/app/routes/partner/rebate-management/components/particulars/particulars.component.ts
+++ b/src/app/routes/partner/rebate-management/components/particulars/particulars.component.ts
@@ -20,7 +20,12 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
sf!: SFComponent;
spuStatus = '1';
_$expand = false;
- data = [{ name1: 1111 }];
+ tabs = {
+ payQuantity: 0,
+ cancelQuantity: 0,
+ };
+ resourceStatus: any;
+ data = this.service.$api_get_searchPageList;
constructor(
public router: Router,
public ar: ActivatedRoute,
@@ -46,8 +51,13 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
*/
get reqParams() {
const params: any = Object.assign({}, this.sf?.value || {});
+ const a: any = {};
+ if (this.resourceStatus) {
+ a.representationsStatus = this.resourceStatus;
+ }
delete params._$expand;
return {
+ ...a,
...params,
deadlineTime: {
start: this.sf?.value?.deadlineTime?.[0] || '',
@@ -120,7 +130,14 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
}
};
}
-
+ selectChange(e: number) {
+ this.resourceStatus = e;
+ this.initST();
+ setTimeout(() => {
+ this.data = this.service.$api_get_searchRefundPageList
+ this.st.load();
+ }, 500);
+ }
initST() {
this.columns = [
{
diff --git a/src/app/routes/partner/rebate-management/services/rebate-management.service.ts b/src/app/routes/partner/rebate-management/services/rebate-management.service.ts
index b67abe19..6d62828e 100644
--- a/src/app/routes/partner/rebate-management/services/rebate-management.service.ts
+++ b/src/app/routes/partner/rebate-management/services/rebate-management.service.ts
@@ -29,6 +29,10 @@ export class RebateManagementService extends BaseService {
public $api_get_getIncomeByBillpage = '/api/bpc/partnerIncomeHead/getIncomeByBillpage';
// 获取返佣模板信息
public $api_get_getPartnerRebateConfigInfo = '/api/mdc/rebateConfig/getPartnerRebateConfigInfo';
+ // 合伙人管理/返佣管理/返佣明细
+ public $api_get_searchPageList= '/api/fcc/billPaymentApplicationOBC/list/searchPageList';
+ // 合伙人管理/返佣管理/退款返佣明细
+ public $api_get_searchRefundPageList= '/api/fcc/billPaymentApplicationOBC/list/searchRefundPageList';
// 查询合伙人信息-分页
public $api_get_partner_page = '/api/mdc/partner/list/page';
constructor(public injector: Injector) {
diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html
index 9cd465f6..55b7ec3d 100644
--- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html
+++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html
@@ -1,3 +1,15 @@
-
+
+
+
\ No newline at end of file