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

Merge branch 'develop'

Browse Source
This commit is contained in:
wangshiming
2022-04-27 10:37:19 +08:00
parent 1a2340e83b 958bdabf25
commit 621920b712
8 changed files with 71 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-24 16:58:02 * @Date : 2021-12-24 16:58:02
* @LastEditors : Shiming * @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 * @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. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */

16
src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
View File

@ -77,7 +77,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`, `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}` `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
], ],
position: '2', position: '2',
@ -122,7 +122,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`, `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}` `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
], ],
position: '2', position: '2',
@ -175,7 +175,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`, `上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}` `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
], ],
position: '2', position: '2',
@ -220,7 +220,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`, `上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}` `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
], ],
position: '2', position: '2',
@ -284,7 +284,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`, `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}` `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
], ],
position: '2', position: '2',
@ -330,7 +330,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`, `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}` `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
], ],
position: '2', position: '2',
@ -392,7 +392,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`, `上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}` `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
], ],
position: '2', position: '2',
@ -438,7 +438,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`, `上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}` `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
], ],
position: '2', position: '2',

16
src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts
View File

@ -70,7 +70,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingPlace[0]}`, `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -115,7 +115,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingPlace[0]}`, `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -168,7 +168,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.dischargePlace[0]}`, `上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -213,7 +213,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.dischargePlace[0]}`, `上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -283,7 +283,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingPlace[0]}`, `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -328,7 +328,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingPlace[0]}`, `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -381,7 +381,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.dischargePlace[0]}`, `上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -426,7 +426,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.dischargePlace[0]}`, `上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',

8
src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts
View File

@ -82,7 +82,7 @@ export class VehicleSureDepartComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingPlace[0]}`, `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -127,7 +127,7 @@ export class VehicleSureDepartComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingPlace[0]}`, `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -205,7 +205,7 @@ export class VehicleSureDepartComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingPlace[0]}`, `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -250,7 +250,7 @@ export class VehicleSureDepartComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingPlace[0]}`, `上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',

16
src/app/routes/partner/rebate-management/components/particulars/particulars.component.html
View File

@ -4,8 +4,8 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-02-24 20:09:49 * @Date : 2022-02-24 20:09:49
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-02-24 20:14:21 * @LastEditTime : 2022-04-27 10:17:31
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\list\\particulars.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\particulars\\particulars.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
<page-header-wrapper [title]="''"> </page-header-wrapper> <page-header-wrapper [title]="''"> </page-header-wrapper>
@ -43,8 +43,16 @@
</div> </div>
</nz-card> </nz-card>
<nz-card> <nz-card class="table-box">
<div class="tab_header">
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
<nz-tab [nzTitle]="'付款单'"></nz-tab>
<nz-tab [nzTitle]="'退款单'"></nz-tab>
</nz-tabset>
</div>
<!-- 数据列表 --> <!-- 数据列表 -->
<div>
<st <st
#st #st
[bordered]="true" [bordered]="true"
@ -57,4 +65,6 @@
[loading]="service.http.loading" [loading]="service.http.loading"
> >
</st> </st>
</div>
</nz-card> </nz-card>

21
src/app/routes/partner/rebate-management/components/particulars/particulars.component.ts
View File

@ -20,7 +20,12 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
sf!: SFComponent; sf!: SFComponent;
spuStatus = '1'; spuStatus = '1';
_$expand = false; _$expand = false;
data = [{ name1: 1111 }]; tabs = {
payQuantity: 0,
cancelQuantity: 0,
};
resourceStatus: any;
data = this.service.$api_get_searchPageList;
constructor( constructor(
public router: Router, public router: Router,
public ar: ActivatedRoute, public ar: ActivatedRoute,
@ -46,8 +51,13 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
*/ */
get reqParams() { get reqParams() {
const params: any = Object.assign({}, this.sf?.value || {}); const params: any = Object.assign({}, this.sf?.value || {});
const a: any = {};
if (this.resourceStatus) {
a.representationsStatus = this.resourceStatus;
}
delete params._$expand; delete params._$expand;
return { return {
...a,
...params, ...params,
deadlineTime: { deadlineTime: {
start: this.sf?.value?.deadlineTime?.[0] || '', 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() { initST() {
this.columns = [ this.columns = [
{ {

4
src/app/routes/partner/rebate-management/services/rebate-management.service.ts
View File

@ -29,6 +29,10 @@ export class RebateManagementService extends BaseService {
public $api_get_getIncomeByBillpage = '/api/bpc/partnerIncomeHead/getIncomeByBillpage'; public $api_get_getIncomeByBillpage = '/api/bpc/partnerIncomeHead/getIncomeByBillpage';
// 获取返佣模板信息 // 获取返佣模板信息
public $api_get_getPartnerRebateConfigInfo = '/api/mdc/rebateConfig/getPartnerRebateConfigInfo'; 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'; public $api_get_partner_page = '/api/mdc/partner/list/page';
constructor(public injector: Injector) { constructor(public injector: Injector) {

16
src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html
View File

@ -1,3 +1,15 @@
<app-dynamic-setting-h5 [tabs]="tabs" [configList]="configList" [selectedTab]="selectedTab" <!--
(selectedEvent)="getConfigList($event)" (saveEvent)="saveAction($event)" [labelWidth]="labelWidth"> * @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-21 13:49:22
* @LastEditors : Shiming
* @LastEditTime : 2022-04-27 10:36:59
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\basic-setting\\basic-setting.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<app-dynamic-setting-h5 [tabs]="tabs" [configList]="configList" [selectedTab]="selectedTab" (selectedEvent)="getConfigList($event)" (saveEvent)="saveAction($event)" [labelWidth]="labelWidth">
<!-- <custom-element>
</custom-element> -->
</app-dynamic-setting-h5> </app-dynamic-setting-h5>