-
-
+
+
diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts
index 961744fe..c8f1b6f1 100644
--- a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts
+++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts
@@ -22,7 +22,6 @@ export class CostManagementComponent implements OnInit {
selectedRows: any[] = [];
- reqParams = {};
_$expand = false;
constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
@@ -31,7 +30,7 @@ export class CostManagementComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
- this.reqParams = { ...this.sf.value };
+ Object.assign(requestOptions.body, { ...this.sf.value });
}
return requestOptions;
};
@@ -258,7 +257,7 @@ export class CostManagementComponent implements OnInit {
},
{
text: '修改',
- click: item => this.router.navigate(['/financial-management/freight-account/detail/1'])
+ click: item => this.router.navigate(['/financial-management/cost-management/expenses-receivable/1'], { queryParams: { id: 1 } })
}
]
}
diff --git a/src/app/routes/financial-management/components/cost-management/expenses-payable/expenses-payable.component.html b/src/app/routes/financial-management/components/cost-management/expenses-payable/expenses-payable.component.html
new file mode 100644
index 00000000..e934f2da
--- /dev/null
+++ b/src/app/routes/financial-management/components/cost-management/expenses-payable/expenses-payable.component.html
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/routes/financial-management/components/cost-management/expenses-payable/expenses-payable.component.less b/src/app/routes/financial-management/components/cost-management/expenses-payable/expenses-payable.component.less
new file mode 100644
index 00000000..23d2c4ba
--- /dev/null
+++ b/src/app/routes/financial-management/components/cost-management/expenses-payable/expenses-payable.component.less
@@ -0,0 +1,13 @@
+:host::ng-deep {
+
+ .content-box {
+ .ant-card-body {
+ padding-top: 14px;
+ }
+ }
+
+ nz-range-picker {
+ width: 100%;
+ }
+
+}
\ No newline at end of file
diff --git a/src/app/routes/financial-management/components/cost-management/expenses-payable/expenses-payable.component.ts b/src/app/routes/financial-management/components/cost-management/expenses-payable/expenses-payable.component.ts
new file mode 100644
index 00000000..343d89d1
--- /dev/null
+++ b/src/app/routes/financial-management/components/cost-management/expenses-payable/expenses-payable.component.ts
@@ -0,0 +1,149 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { STComponent, STColumn } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
+import { FreightAccountService } from '../../../services/freight-account.service';
+
+@Component({
+ selector: 'app-expenses-payable',
+ templateUrl: './expenses-payable.component.html',
+ styleUrls: ['./expenses-payable.component.less']
+})
+export class ExpensesPayableComponent implements OnInit {
+
+ @ViewChild('st', { static: true })
+ st!: STComponent;
+ @ViewChild('sf', { static: false })
+ sf!: SFComponent;
+ schema!: SFSchema;
+ columns: STColumn[] = this.initST();
+
+ id = null;
+ data: any[] = [
+ {
+ id: 1,
+ description1: '',
+ description2: '',
+ description3: '',
+ num: null,
+ description5: ''
+ }
+ ];
+
+ constructor(public service: FreightAccountService, private route: ActivatedRoute) {
+ this.id = route.snapshot.queryParams.id;
+ if (this.id) {
+ this.schema = this.initSF({ page2: '天津怡亚通物流科技有限公司', pag2e21: '茅台集团' });
+ } else {
+ this.schema = this.initSF();
+ }
+ }
+
+ ngOnInit(): void {}
+
+ addRow() {
+ this.data.push({
+ id: this.data.length + 1,
+ description1: '',
+ description2: '',
+ description3: '',
+ num: null,
+ description5: ''
+ });
+ this.st.reload();
+ }
+
+ goBack() {
+ history.go(-1);
+ }
+
+ private initSF(data?: any): SFSchema {
+ return {
+ properties: {
+ page2: {
+ type: 'string',
+ title: '网络货运人',
+ enum: [],
+ ui: {
+ widget: data ? 'text' : 'select',
+ placeholder: '请选择'
+ },
+ default: data?.page2 || ''
+ },
+ pag2e21: {
+ title: '应付对象',
+ type: 'string',
+ enum: [],
+ ui: {
+ widget: data ? 'text' : 'select',
+ placeholder: '请选择'
+ },
+ default: data?.pag2e21 || ''
+ },
+ dee: {
+ title: '',
+ type: 'string',
+ ui: {
+ widget: 'text'
+ },
+ default: ' '
+ },
+ createTi2me: {
+ title: '费用日期',
+ type: 'string',
+ ui: {
+ widget: 'date',
+ mode: 'range',
+ format: 'yyyy-MM-dd'
+ } as SFDateWidgetSchema,
+ default: data?.createTi2me || ''
+ },
+ pa2ge2: {
+ type: 'string',
+ title: '收票方式',
+ enum: [],
+ ui: {
+ widget: 'select',
+ placeholder: '请选择'
+ },
+ default: data?.pa2ge2 || ''
+ },
+ page: {
+ type: 'string',
+ title: '应付备注',
+ ui: {
+ placeholder: '请输入'
+ },
+ default: data?.page || ''
+ }
+ },
+ required: ['page2', 'pag2e21', 'createTi2me', 'pa2ge2']
+ };
+ }
+
+ private initST(): STColumn[] {
+ return [
+ { title: '结算客户', render: 'description1', width: 150 },
+ { title: '费用科目', render: 'description2', width: 120 },
+ { title: '税率', render: 'description3', width: 120 },
+ { title: '应付金额', render: 'num', width: 120 },
+ { title: '备注', render: 'description5', width: 150 },
+ {
+ title: '操作',
+ fixed: 'right',
+ className: 'text-center',
+ width: 90,
+ buttons: [
+ {
+ text: '删除',
+ click: item => {
+ this.st.removeRow(item);
+ this.data = this.data.filter(i => i.id !== item.id);
+ console.log(this.st.data, this.st._data);
+ }
+ }
+ ]
+ }
+ ];
+ }
+}
diff --git a/src/app/routes/financial-management/components/cost-management/expenses-receivable/expenses-receivable.component.html b/src/app/routes/financial-management/components/cost-management/expenses-receivable/expenses-receivable.component.html
new file mode 100644
index 00000000..83649ca4
--- /dev/null
+++ b/src/app/routes/financial-management/components/cost-management/expenses-receivable/expenses-receivable.component.html
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/routes/financial-management/components/cost-management/expenses-receivable/expenses-receivable.component.less b/src/app/routes/financial-management/components/cost-management/expenses-receivable/expenses-receivable.component.less
new file mode 100644
index 00000000..23d2c4ba
--- /dev/null
+++ b/src/app/routes/financial-management/components/cost-management/expenses-receivable/expenses-receivable.component.less
@@ -0,0 +1,13 @@
+:host::ng-deep {
+
+ .content-box {
+ .ant-card-body {
+ padding-top: 14px;
+ }
+ }
+
+ nz-range-picker {
+ width: 100%;
+ }
+
+}
\ No newline at end of file
diff --git a/src/app/routes/financial-management/components/cost-management/expenses-receivable/expenses-receivable.component.ts b/src/app/routes/financial-management/components/cost-management/expenses-receivable/expenses-receivable.component.ts
new file mode 100644
index 00000000..ecb50ca6
--- /dev/null
+++ b/src/app/routes/financial-management/components/cost-management/expenses-receivable/expenses-receivable.component.ts
@@ -0,0 +1,148 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form';
+import { FreightAccountService } from '../../../services/freight-account.service';
+
+@Component({
+ selector: 'app-expenses-receivable',
+ templateUrl: './expenses-receivable.component.html',
+ styleUrls: ['./expenses-receivable.component.less']
+})
+export class ExpensesReceivableComponent implements OnInit {
+ @ViewChild('st', { static: true })
+ st!: STComponent;
+ @ViewChild('sf', { static: false })
+ sf!: SFComponent;
+ schema!: SFSchema;
+ columns: STColumn[] = this.initST();
+
+ id = null;
+ data: any[] = [
+ {
+ id: 1,
+ description1: '',
+ description2: '',
+ description3: '',
+ num: null,
+ description5: ''
+ }
+ ];
+
+ constructor(public service: FreightAccountService, private route: ActivatedRoute) {
+ this.id = route.snapshot.queryParams.id;
+ if (this.id) {
+ this.schema = this.initSF({ page2: '天津怡亚通物流科技有限公司', pag2e21: '茅台集团' });
+ } else {
+ this.schema = this.initSF();
+ }
+ }
+
+ ngOnInit(): void {}
+
+ addRow() {
+ this.data.push({
+ id: this.data.length + 1,
+ description1: '',
+ description2: '',
+ description3: '',
+ num: null,
+ description5: ''
+ });
+ this.st.reload();
+ }
+
+ goBack() {
+ history.go(-1);
+ }
+
+ private initSF(data?: any): SFSchema {
+ return {
+ properties: {
+ page2: {
+ type: 'string',
+ title: '网络货运人',
+ enum: [],
+ ui: {
+ widget: data ? 'text' : 'select',
+ placeholder: '请选择'
+ },
+ default: data?.page2 || ''
+ },
+ pag2e21: {
+ title: '应收对象',
+ type: 'string',
+ enum: [],
+ ui: {
+ widget: data ? 'text' : 'select',
+ placeholder: '请选择'
+ },
+ default: data?.pag2e21 || ''
+ },
+ dee: {
+ title: '',
+ type: 'string',
+ ui: {
+ widget: 'text'
+ },
+ default: ' '
+ },
+ createTi2me: {
+ title: '费用日期',
+ type: 'string',
+ ui: {
+ widget: 'date',
+ mode: 'range',
+ format: 'yyyy-MM-dd'
+ } as SFDateWidgetSchema,
+ default: data?.createTi2me || ''
+ },
+ pa2ge2: {
+ type: 'string',
+ title: '开票方式',
+ enum: [],
+ ui: {
+ widget: 'select',
+ placeholder: '请选择'
+ },
+ default: data?.pa2ge2 || ''
+ },
+ page: {
+ type: 'string',
+ title: '应收备注',
+ ui: {
+ placeholder: '请输入'
+ },
+ default: data?.page || ''
+ }
+ },
+ required: ['page2', 'pag2e21', 'createTi2me', 'pa2ge2']
+ };
+ }
+
+ private initST(): STColumn[] {
+ return [
+ { title: '结算客户', render: 'description1', width: 150 },
+ { title: '费用科目', render: 'description2', width: 120 },
+ { title: '税率', render: 'description3', width: 120 },
+ { title: '应收金额', render: 'num', width: 120 },
+ { title: '备注', render: 'description5', width: 150 },
+ {
+ title: '操作',
+ fixed: 'right',
+ className: 'text-center',
+ width: 90,
+ buttons: [
+ {
+ text: '删除',
+ click: item => {
+ this.st.removeRow(item);
+ this.data = this.data.filter(i => i.id !== item.id);
+ console.log(this.st.data, this.st._data);
+ }
+ }
+ ]
+ }
+ ];
+ }
+}
diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html
index abad6ce0..44214d69 100644
--- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html
+++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html
@@ -51,7 +51,7 @@
diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts
index 72eda0f1..bb7e3ee3 100644
--- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts
+++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts
@@ -19,7 +19,6 @@ export class DriverAccountDetailComponent implements OnInit {
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
- reqParams = {};
_$expand = false;
constructor(public service: FreightAccountService) {}
@@ -27,7 +26,7 @@ export class DriverAccountDetailComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
- this.reqParams = { ...this.sf.value };
+ Object.assign(requestOptions.body, { ...this.sf.value });
}
return requestOptions;
};
diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.html b/src/app/routes/financial-management/components/driver-account/driver-account.component.html
index 76e082a2..8f38e950 100644
--- a/src/app/routes/financial-management/components/driver-account/driver-account.component.html
+++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.html
@@ -23,7 +23,7 @@
diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts
index 93bd2289..e6a19033 100644
--- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts
+++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts
@@ -17,7 +17,6 @@ export class DriverAccountComponent implements OnInit {
searchSchema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
- reqParams = {};
_$expand = false;
constructor(public service: FreightAccountService, private router: Router) {}
@@ -26,7 +25,7 @@ export class DriverAccountComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
- this.reqParams = { ...this.sf.value };
+ Object.assign(requestOptions.body, { ...this.sf.value });
}
return requestOptions;
};
diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html
index dd3f118d..40790f8f 100644
--- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html
+++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html
@@ -50,7 +50,7 @@
diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
index 5a068609..ee41839e 100644
--- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
+++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
@@ -18,7 +18,6 @@ export class FreightAccountDetailComponent implements OnInit {
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
- reqParams = {};
_$expand = false;
constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
@@ -26,7 +25,7 @@ export class FreightAccountDetailComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
- this.reqParams = { ...this.sf.value };
+ Object.assign(requestOptions.body, { ...this.sf.value });
}
return requestOptions;
};
diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.html b/src/app/routes/financial-management/components/freight-account/freight-account.component.html
index 76e082a2..f1dcf5ed 100644
--- a/src/app/routes/financial-management/components/freight-account/freight-account.component.html
+++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.html
@@ -23,7 +23,7 @@
diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts
index a724df8f..ecc2330d 100644
--- a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts
+++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts
@@ -21,7 +21,6 @@ export class FreightAccountComponent implements OnInit {
selectedRows: any[] = [];
- reqParams = {};
_$expand = false;
constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
@@ -30,7 +29,7 @@ export class FreightAccountComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
- this.reqParams = { ...this.sf.value };
+ Object.assign(requestOptions.body, { ...this.sf.value });
}
return requestOptions;
};
diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.html b/src/app/routes/financial-management/components/payment-record/payment-record.component.html
index e3cad067..02521d8c 100644
--- a/src/app/routes/financial-management/components/payment-record/payment-record.component.html
+++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.html
@@ -31,7 +31,7 @@
diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts
index ececa284..68b1d4f8 100644
--- a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts
+++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts
@@ -19,7 +19,6 @@ export class PaymentRecordComponent implements OnInit {
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
- reqParams = {};
_$expand = false;
@@ -29,7 +28,7 @@ export class PaymentRecordComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
- this.reqParams = { ...this.sf.value };
+ Object.assign(requestOptions.body, { ...this.sf.value });
}
return requestOptions;
};
diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html
index bdd18354..7116d041 100644
--- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html
+++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html
@@ -37,7 +37,7 @@
diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
index d519bd79..074aa0c3 100644
--- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
+++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
@@ -16,7 +16,6 @@ export class RechargeRecordComponent implements OnInit {
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
- reqParams = {};
_$expand = false;
constructor(public service: FreightAccountService) {}
@@ -24,7 +23,7 @@ export class RechargeRecordComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
- this.reqParams = { ...this.sf.value };
+ Object.assign(requestOptions.body, { ...this.sf.value });
}
return requestOptions;
};
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 b187ba50..ec0374db 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
@@ -24,7 +24,7 @@
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 528cb1ab..25bdda30 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
@@ -18,8 +18,6 @@ export class TransactionFlowComponent implements OnInit {
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
- reqParams = {};
-
_$expand = false;
constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
@@ -28,7 +26,7 @@ export class TransactionFlowComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
- this.reqParams = { ...this.sf.value };
+ Object.assign(requestOptions.body, { ...this.sf.value });
}
return requestOptions;
};
diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html
index 481e73bf..b4cab97e 100644
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html
@@ -66,7 +66,7 @@
diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
index 9e62f8de..9b33ca97 100644
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
@@ -20,8 +20,6 @@ export class WithdrawalsRecordComponent implements OnInit {
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
- reqParams = {};
-
_$expand = false;
selectedRows: any[] = [];
@@ -32,7 +30,7 @@ export class WithdrawalsRecordComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
- this.reqParams = { ...this.sf.value };
+ Object.assign(requestOptions.body, { ...this.sf.value });
}
return requestOptions;
};
diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts
index d1356f30..46052c12 100644
--- a/src/app/routes/financial-management/financial-managemen-routing.module.ts
+++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts
@@ -12,6 +12,8 @@ import { AbnormalGoldComponent } from './components/abnormal-gold/abnormal-gold.
import { PaymentRecordComponent } from './components/payment-record/payment-record.component';
import { TransactionFlowComponent } from './components/transaction-flow/transaction-flow.component';
import { CostManagementDetailComponent } from './components/cost-management/cost-management-detail/cost-management-detail.component';
+import { ExpensesReceivableComponent } from './components/cost-management/expenses-receivable/expenses-receivable.component';
+import { ExpensesPayableComponent } from './components/cost-management/expenses-payable/expenses-payable.component';
const routes: Routes = [
{ path: 'freight-account', component: FreightAccountComponent },
@@ -25,6 +27,8 @@ const routes: Routes = [
// { path: 'voucher-summary', component: VoucherSummaryComponent },
{ path: 'cost-management', component: CostManagementComponent },
{ path: 'cost-management/detail/:id', component: CostManagementDetailComponent },
+ { path: 'cost-management/expenses-receivable/:id', component: ExpensesReceivableComponent },
+ { path: 'cost-management/expenses-payable/:id', component: ExpensesPayableComponent },
{ path: 'abnormal-gold', component: AbnormalGoldComponent },
{ path: 'payment-record', component: PaymentRecordComponent },
{ path: 'transaction-flow', component: TransactionFlowComponent },
diff --git a/src/app/routes/financial-management/financial-management.module.ts b/src/app/routes/financial-management/financial-management.module.ts
index dbd19f99..86f03925 100644
--- a/src/app/routes/financial-management/financial-management.module.ts
+++ b/src/app/routes/financial-management/financial-management.module.ts
@@ -16,6 +16,8 @@ import { PaymentRecordComponent } from './components/payment-record/payment-reco
import { TransactionFlowComponent } from './components/transaction-flow/transaction-flow.component';
import { ClearingModalComponent } from './components/abnormal-gold/clearing-modal/clearing-modal.component';
import { CostManagementDetailComponent } from './components/cost-management/cost-management-detail/cost-management-detail.component';
+import { ExpensesReceivableComponent } from './components/cost-management/expenses-receivable/expenses-receivable.component';
+import { ExpensesPayableComponent } from './components/cost-management/expenses-payable/expenses-payable.component';
const ROUTESCOMPONENTS = [
FreightAccountComponent,
@@ -27,7 +29,9 @@ const ROUTESCOMPONENTS = [
PaymentRecordComponent,
TransactionFlowComponent,
CostManagementComponent,
- CostManagementDetailComponent
+ CostManagementDetailComponent,
+ ExpensesReceivableComponent,
+ ExpensesPayableComponent
];
const NOTROUTECOMPONENTS = [DriverAccountDetailComponent, FreightAccountDetailComponent, SettingFinancialComponent, ClearingModalComponent];
diff --git a/src/app/routes/sys-setting/components/role-management/role-management.component.html b/src/app/routes/sys-setting/components/role-management/role-management.component.html
index f6339284..0f061259 100644
--- a/src/app/routes/sys-setting/components/role-management/role-management.component.html
+++ b/src/app/routes/sys-setting/components/role-management/role-management.component.html
@@ -18,11 +18,11 @@
-
diff --git a/src/app/routes/sys-setting/components/role-management/role-management.component.ts b/src/app/routes/sys-setting/components/role-management/role-management.component.ts
index 15468bd2..f5c5c125 100644
--- a/src/app/routes/sys-setting/components/role-management/role-management.component.ts
+++ b/src/app/routes/sys-setting/components/role-management/role-management.component.ts
@@ -1,5 +1,5 @@
import { Component, OnInit, ViewChild } from '@angular/core';
-import { STComponent, STColumn, STChange } from '@delon/abc/st';
+import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { SystemService } from '../../services/system.service';
@@ -20,7 +20,7 @@ export class RoleManagementComponent implements OnInit {
searchSchema: SFSchema = {
properties: {
- receiveName: {
+ roleName: {
type: 'string',
title: '角色名称',
ui: { placeholder: '请输入' }
@@ -29,13 +29,14 @@ export class RoleManagementComponent implements OnInit {
};
columns: STColumn[] = [
- { title: '角色名称', index: 'no' },
- { title: '角色描述', index: 'description' },
- { title: '创建人手机号', index: 'description' },
+ { title: '角色名称', index: 'roleName' },
+ { title: '角色描述', index: 'roleDescription' },
+ { title: '创建人手机号', index: 'telephone' },
{
title: '创建时间',
- index: 'updatedAt',
- type: 'date'
+ index: 'createTime',
+ type: 'date',
+ sort: true
},
{
title: '操作',
@@ -54,20 +55,25 @@ export class RoleManagementComponent implements OnInit {
selectedRows: any[] = [];
- reqParams = { pageIndex: 1, pageSize: 10 };
-
constructor(public service: SystemService, private nzModalService: NzModalService) {}
ngOnInit(): void {}
+ beforeReq = (requestOptions: STRequestOptions) => {
+ if (this.sf) {
+ Object.assign(requestOptions.body, { ...this.sf.value });
+ }
+ if (requestOptions.body?.createTime) {
+ Object.assign(requestOptions.body, { sort: 'createTime.' + requestOptions.body.createTime });
+ }
+ return requestOptions;
+ };
+
stChange(e: STChange): void {
switch (e.type) {
- case 'checkbox':
+ case 'sort':
this.selectedRows = e.checkbox!;
break;
- case 'filter':
- this.st.load();
- break;
}
}
diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts
index bdf7f791..81f79e80 100644
--- a/src/app/routes/sys-setting/services/system.service.ts
+++ b/src/app/routes/sys-setting/services/system.service.ts
@@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-20 17:18:43
- * @LastEditTime: 2021-12-27 11:33:56
+ * @LastEditTime: 2021-12-27 14:09:14
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\sys-setting\services\system.service.ts
@@ -13,8 +13,6 @@ import { BaseService } from 'src/app/shared/services';
providedIn: 'root'
})
export class SystemService extends BaseService {
-
-
// 分页查询企业项目员工列表
$api_get_enterprise_staff_page = '/api/mdc/cuc/userApp/getEnterpriseProjectStaffListPage';
// 添加员工
@@ -25,7 +23,10 @@ export class SystemService extends BaseService {
$api_delete_staff = '/api/mdc/cuc/userApp/deleteAppUser';
// 冻结或恢复员工
$api_free_or_resume_staff = '/api/mdc/cuc/userApp/freezeOrResumeStaff';
-
+
+ // 分页获取应用角色列表
+ $api_get_role_page = '/api/mdc/cuc/roleInfo/getAppRoleInfoList';
+
// 查询字典选项列表
$api_get_dict_page = '/api/mdc/pbc/dictItems/list/page';
// 根据id批量删除字典选项
@@ -35,7 +36,6 @@ export class SystemService extends BaseService {
// 更新字典选项
$api_update_dict = '/api/mdc/pbc/dictItems/update';
-
// 获取CRM客户信息表
$api_get_crmCustomer = '/api/mdc/crmCustomer/get';
// 查询CRM客户信息表
diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
index d6b1a88b..348d429f 100644
--- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
@@ -43,7 +43,7 @@
diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
index 03361897..09f2633d 100644
--- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
@@ -22,8 +22,6 @@ export class CancellationInvoiceComponent implements OnInit {
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
- reqParams = {};
-
_$expand = false;
selectedRows: any[] = [];
@@ -34,7 +32,7 @@ export class CancellationInvoiceComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
- this.reqParams = { ...this.sf.value };
+ Object.assign(requestOptions.body, { ...this.sf.value });
}
return requestOptions;
};
diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
index 133b096b..b4e5f878 100644
--- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
+++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
@@ -88,7 +88,7 @@
@@ -109,14 +109,14 @@
diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts
index 77fd00ed..74d55d62 100644
--- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts
@@ -17,7 +17,6 @@ export class InvoiceDetailComponent implements OnInit {
orderSf!: SFComponent;
orderColumns: STColumn[] = this.initOrderST();
orderSchema: SFSchema = this.initOrderSF();
- ordeReqParams = {};
@ViewChild('costST', { static: true })
costST!: STComponent;
@@ -25,12 +24,10 @@ export class InvoiceDetailComponent implements OnInit {
costSf!: SFComponent;
costColumns: STColumn[] = this.initCostST();
costSchema: SFSchema = this.initCostSF();
- orderReqParams = {};
@ViewChild('invoiceST', { static: true })
invoiceST!: STComponent;
invoiceColumns: STColumn[] = this.initInvoiceST();
- invoiceReqParams = {};
isCanEdit = false;
isEdit = false;
@@ -43,10 +40,10 @@ export class InvoiceDetailComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.orderSf) {
- this.orderReqParams = { ...this.orderSf.value };
+ Object.assign(requestOptions.body, { ...this.orderSf.value });
}
if (this.costSf) {
- this.orderReqParams = { ...this.costSf.value };
+ Object.assign(requestOptions.body, { ...this.costSf.value });
}
return requestOptions;
};
@@ -78,7 +75,6 @@ export class InvoiceDetailComponent implements OnInit {
}
}
-
private initOrderSF(): SFSchema {
return {
properties: {
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html
index 3de75692..e5b10253 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html
@@ -100,7 +100,7 @@
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
index 2eaf5339..1c4c9798 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
@@ -20,7 +20,6 @@ export class InvoiceRequestedDetailComponent implements OnInit {
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
- reqParams = {};
detail: any = {};
selectedRows: any[] = [];
@@ -32,7 +31,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
- this.reqParams = { ...this.sf.value };
+ Object.assign(requestOptions.body, { ...this.sf.value });
}
return requestOptions;
};
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
index 93ae349b..230fcf3e 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
@@ -44,7 +44,7 @@
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 2b3697d5..b1273170 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
@@ -22,8 +22,6 @@ export class InvoiceRequestedComponent implements OnInit {
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
- reqParams = {};
-
_$expand = false;
selectedRows: any[] = [];
@@ -34,7 +32,7 @@ export class InvoiceRequestedComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
- this.reqParams = { ...this.sf.value };
+ Object.assign(requestOptions.body, { ...this.sf.value });
}
return requestOptions;
};
diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html
index 74605d6e..68175e6f 100644
--- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html
+++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html
@@ -35,7 +35,7 @@
diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts
index 5f31cd3c..4fe25cc5 100644
--- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts
+++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts
@@ -11,7 +11,6 @@ import { TicketService } from '../../services/ticket.service';
styleUrls: ['./invoiced-list.component.less']
})
export class InvoicedListComponent implements OnInit {
- url = `/rule?_allow_anonymous=true`;
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
@@ -23,8 +22,6 @@ export class InvoicedListComponent implements OnInit {
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
- reqParams = {};
-
_$expand = false;
selectedRows: any[] = [];
@@ -35,7 +32,7 @@ export class InvoicedListComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
- this.reqParams = { ...this.sf.value };
+ Object.assign(requestOptions.body, { ...this.sf.value });
}
return requestOptions;
};
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 0e89d113..2dfab011 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -260,6 +260,16 @@
"hide": true,
"link": "/financial-management/cost-management/detail/:id"
},
+ {
+ "text": "应收费用单",
+ "hide": true,
+ "link": "/financial-management/cost-management/expenses-receivable/:id"
+ },
+ {
+ "text": "应付费用单",
+ "hide": true,
+ "link": "/financial-management/cost-management/expenses-payable/:id"
+ },
{
"text": "货主账户",
"link": "/financial-management/freight-account"