diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html index 9ba4f0c3..e9aa98e1 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html @@ -1,31 +1,41 @@ - - + -
-
- -
-
- - - - -
+
+
+
+
+ + + + +
+
+ + - - \ No newline at end of file + + + diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts index 5285cd21..ba186628 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts @@ -4,11 +4,13 @@ import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; import { FreightAccountService } from '../../services/freight-account.service'; +import { CurrencyPipe } from '@angular/common'; @Component({ selector: 'app-transaction-flow', templateUrl: './transaction-flow.component.html', - styleUrls: ['./transaction-flow.component.less'] + styleUrls: ['./transaction-flow.component.less'], + providers: [CurrencyPipe] }) export class TransactionFlowComponent implements OnInit { @ViewChild('st', { static: true }) @@ -20,7 +22,12 @@ export class TransactionFlowComponent implements OnInit { _$expand = false; - constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {} + constructor( + public service: FreightAccountService, + private nzModalService: NzModalService, + private router: Router, + private currencyPipe: CurrencyPipe + ) {} ngOnInit(): void {} @@ -214,8 +221,17 @@ export class TransactionFlowComponent implements OnInit { { title: '账户名称', index: 'roleName', width: 100 }, { title: '所属项目', index: 'projectName', width: 100 }, { title: '收支类型', index: 'incomeTypeLabel', width: 100 }, - { title: '交易金额', index: 'amount', width: 100 }, - { title: '账户余额', index: 'accountBalance', width: 100 }, + { title: '交易金额', + index: 'amount', + width: 100, + type: 'currency', + format: item => `${this.currencyPipe.transform(item.amount)}` + }, + { title: '账户余额', + type: 'currency', + width: 150, + format: item => `${this.currencyPipe.transform(item.accountBalance)}` + }, { title: '网络货运人', index: 'ltdName', width: 120 }, { title: '银行类型', index: 'bankTypeLabel', width: 100 }, { title: '银行流水号', index: 'channelPaySn', width: 120 }, diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html index 7c99a5aa..89a3fbf5 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html @@ -1,3 +1,11 @@ +
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index b851b053..aa8b87a3 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -173,7 +173,7 @@ - {{ i?.supplementaryInformationVO?.stateReceipt === 1 ? '是' : '否' }} + {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index f31cd393..399a2165 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -156,7 +156,15 @@ [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, 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}}
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 0df8b3e4..42169214 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -168,7 +168,24 @@ tabs = { }, shipperAppUserId: { type: 'string', - title: '货主' + title: '货主', + ui: { + widget: 'select', + serverSearch: true, + searchDebounceTime: 300, + searchLoadingText: '搜索中...', + onSearch: (q: any) => { + console.log(q) + if (!!q) { + return this.service + .request(this.service.$api_enterpriceList, { enterpriseName: q}) + .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) + .toPromise(); + } else { + return of([]); + } + }, + } as SFSelectWidgetSchema, }, loadingPlace: { type: 'string', @@ -200,7 +217,7 @@ tabs = { if (!!q) { return this.service .request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 }) - .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum)))) + .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.appUserId } as SFSchemaEnum)))) .toPromise(); } else { return of([]); @@ -301,7 +318,7 @@ tabs = { }, }, }, - enterpriseInfoName: { + enterpriseInfoId: { type: 'string', title: '网络货运人', ui: { @@ -327,7 +344,7 @@ tabs = { // asyncData: () => this.getCatalogueMember(), // }, // }, - goodsTypeId: { + goodsNameId: { type: 'string', title: '货物名称', ui: { @@ -571,10 +588,20 @@ tabs = { title: '变更前', width: '100px', className: 'text-center', - index: 'amountAfterChange' + index: 'amountAfterChange', + render: 'amountAfterChange' }, - { title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center' }, - { title: '变更后', index: 'amountBeforeChange', width: '120px', className: 'text-center' } + { title: '变更值', + index: 'amountchangeValue', + width: '120px', + className: 'text-center', + render: 'amountchangeValue' + }, + { title: '变更后', + index: 'amountBeforeChange', + render: 'amountBeforeChange', + width: '120px', + className: 'text-center' } ]; } /** diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html index 6968b94d..5f5aa088 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html @@ -1,7 +1,7 @@ @@ -11,7 +11,7 @@

- 总运费：￥{{ data.totalFreight }} + 总运费：{{ data.totalFreight | currency }}

-

运输费：￥{{ data.freight }}，附加费：￥{{ data.surcharge }}

+

运输费：{{ data.freight | currency}}，附加费：{{ data.surcharge | currency }}

\ No newline at end of file diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html index 5aeb71b4..4194a0fe 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html +++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html @@ -1,8 +1,8 @@ @@ -11,9 +11,9 @@

总运费：￥{{ data.totalFreight }}总运费：{{ data.totalFreight | currency }} - （运输费：￥{{ data.freight }}，附加费：￥{{ data.surcharge }}） + （运输费：{{ data.freight | currency }}，附加费：{{ data.surcharge | currency}}）

diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.html b/src/app/routes/supply-management/components/bulk/bulk.component.html index a75fd18e..d69addd7 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.html +++ b/src/app/routes/supply-management/components/bulk/bulk.component.html @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts index 78367202..f37c3c6f 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -23,6 +23,7 @@ export class SupplyManagementBulkComponent implements OnInit { schema: SFSchema = {}; auditMany = false; isVisible = false; + auditID: any; _$expand = false; columns: STColumn[] = []; freightSchema: SFSchema = {}; @@ -131,7 +132,7 @@ export class SupplyManagementBulkComponent implements OnInit { }, } as SFDateWidgetSchema, }, - enterpriseInfoName: { + enterpriseInfoId: { type: 'string', title: '网络货运人', ui: { @@ -411,13 +412,25 @@ export class SupplyManagementBulkComponent implements OnInit { } /** * 审核 + * status ： 1 单个 2：批量 + * value ： 单个单条数据 */ audit(value: any, status?: any) { console.log(value) console.log(status) if(status === 2) { + if(this.selectedRows.length <= 0) { + this.service.msgSrv.error('未选择货源单！'); + return + } + let list: any[] = []; + this.selectedRows.forEach(item => { + list.push(item.id); + }); + this.auditID = list; this.auditMany = true; } else { + this.auditID = value.id this.auditMany = false; } this.isVisible = true; @@ -437,8 +450,46 @@ export class SupplyManagementBulkComponent implements OnInit { /** * 审核通过按钮 */ - handleOK() { - + handleOK(value: any) { + if(this.selectedRows.length <= 0) { + const params: any = { + id: this.auditID, + remarks: this.sfFre.value.remarks, + } + if(value == 1) { + params.auditStatus = 2 + } else { + params.auditStatus = 3 + } + console.log(params) + this.service.request(this.service.$api_goodsResourceAudit, params).subscribe(res => { + if (res === true) { + this.service.msgSrv.success('审核成功！'); + this.isVisible = false; + this.st?.reload(); + this.getGoodsSourceStatistical(); + } + }) + } else { + const params: any = { + ids: this.auditID, + remarks: this.sfFre.value.remarks, + } + if(value == 1) { + params.auditStatus = 2 + } else { + params.auditStatus = 3 + } + console.log(params) + this.service.request(this.service.$api_batchGoodsResourceAudit, params).subscribe(res => { + if (res === true) { + this.service.msgSrv.success('审核成功！'); + this.isVisible = false; + this.st?.reload(); + this.getGoodsSourceStatistical(); + } + }) + } } // 修改单价 modification(item: any) { diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.html b/src/app/routes/supply-management/components/vehicle/vehicle.component.html index 811ab758..8f9f0b46 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html @@ -1,7 +1,7 @@