From 88c4f567ef5b13b446076dfb4474f6dc1fb94fc0 Mon Sep 17 00:00:00 2001 From: weiyu Date: Thu, 28 Apr 2022 20:34:51 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B4=E8=BD=A6?= =?UTF-8?q?=E5=BE=85=E5=8F=91=E8=B4=A7=E6=BA=90=E8=A1=A8=E5=8D=95=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/release-publish/release-publish.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index 57b97963..b17688c4 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -71,8 +71,8 @@ export class SupplyManagementReleasePublishComponent implements OnInit { unloadAddress0: [null, [Validators.required]], unloadName0: [null, [Validators.required]], unloadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]], - loadingTime: [null, []], - unloadingTime: [null, []] + loadingTime: [null, [Validators.required]], + unloadingTime: [null, [Validators.required]] }); } From 075c61add9647fdf3bcff3b535b8834114008a9b Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 20:39:34 +0800 Subject: [PATCH 02/14] edit --- .../search-drawer.component.html | 15 +++++++----- .../search-drawer/search-drawer.component.ts | 2 +- src/style-icons-auto.ts | 2 ++ src/styles/theme.less | 24 +++++++++++++++++++ 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/app/shared/components/search-drawer/search-drawer.component.html b/src/app/shared/components/search-drawer/search-drawer.component.html index da6a8c17..2822fe11 100644 --- a/src/app/shared/components/search-drawer/search-drawer.component.html +++ b/src/app/shared/components/search-drawer/search-drawer.component.html @@ -1,14 +1,17 @@ -
- +
-
- - - +
+ +
+ + +
\ No newline at end of file diff --git a/src/app/shared/components/search-drawer/search-drawer.component.ts b/src/app/shared/components/search-drawer/search-drawer.component.ts index 3e8b30fd..27760bc7 100644 --- a/src/app/shared/components/search-drawer/search-drawer.component.ts +++ b/src/app/shared/components/search-drawer/search-drawer.component.ts @@ -10,7 +10,7 @@ import { SearchDrawerService } from './search-drawer.service'; }) export class SearchDrawerComponent implements OnInit, AfterViewInit { @ViewChild('sf', { static: false }) sf!: SFComponent; - ui: SFUISchema = { '*': { spanLabelFixed: 95, grid: { span: 24, gutter: 4 } } }; + ui: SFUISchema = { '*': { spanLabelFixed: 95, grid: { span: 12, gutter: 24 } } }; schema!: SFSchema; loading = true; diff --git a/src/style-icons-auto.ts b/src/style-icons-auto.ts index eaf98e2d..e564082f 100644 --- a/src/style-icons-auto.ts +++ b/src/style-icons-auto.ts @@ -62,6 +62,7 @@ import { MinusCircleOutline, FileTwoTone, CloudDownloadOutline, + RedoOutline } from '@ant-design/icons-angular/icons'; export const ICONS_AUTO = [ @@ -123,4 +124,5 @@ export const ICONS_AUTO = [ MinusCircleOutline, FileTwoTone, CloudDownloadOutline, + RedoOutline ]; diff --git a/src/styles/theme.less b/src/styles/theme.less index 82b97923..e3baa6d9 100644 --- a/src/styles/theme.less +++ b/src/styles/theme.less @@ -28,3 +28,27 @@ .ant-card-body { padding: 16px; } + +.ant-drawer-content { + .ant-drawer-header { + padding: 16px; + + .ant-drawer-title { + font-size : 20px; + font-weight: 500; + color : #1D2129; + + + } + + } + + .ant-drawer-body { + padding: 16px; + + .ant-form-item-label>label { + color : #575D6C; + font-size: 14px; + } + } +} \ No newline at end of file From bbc309585204a949540e9e0fa4c0910ea88dd787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Thu, 28 Apr 2022 20:42:47 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E8=BF=90=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicle-detail.component.html | 4 +- .../bulk-detail/bulk-detail.component.html | 77 ++++----- .../bulk-detail/bulk-detail.component.less | 102 ++++------- .../vehicle-detail.component.html | 159 ++++++++++++------ .../vehicle-detail.component.less | 48 +----- src/styles/common/global.less | 41 +++++ 6 files changed, 217 insertions(+), 214 deletions(-) diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 43781ffc..f97c7974 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -128,7 +128,7 @@
-

计划装货时间：{{ i?.goodsResource?.loadingTime }}

+

计划装货时间：{{ i?.goodsResource?.loadingTime }}

@@ -144,7 +144,7 @@
-

计划卸货时间：{{ i?.goodsResource?.unloadingTime }}

+

计划卸货时间：{{ i?.goodsResource?.unloadingTime }}

diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index cb2524be..aaa5cea3 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -13,29 +13,7 @@ -
- -

运单号: {{ i?.wayBillCode }}

-
-
-
- - -
-
-
- {{ i?.enterpriseInfoName }} - {{ i?.shippername }} - {{i?.enterpriseProjectName}} - {{i?.serviceTypeLabel}} - {{i?.dispatchName}} /{{i?.dispatchPhone}} - {{ i?.externalBillCode }} - {{ i?.resourceCode }} - {{ i?.paymentDays }} -
@@ -51,20 +29,21 @@
- -
+ +
运单号: {{ i?.wayBillCode }}
+
+ + +
-
- - -
-
+ +
{{ i?.enterpriseInfoName }} {{ i?.shippername }} @@ -85,7 +64,7 @@
- +
装货卸货信息 @@ -96,27 +75,27 @@
-
+
装

装货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

-

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+

联系人：{{item.appUserName}}/{{item.contractTelephone}}

-
+
卸

卸货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

-

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+

联系人：{{item.appUserName}}/{{item.contractTelephone}}

@@ -194,14 +173,16 @@ 结算依据为1时，卸货时间不为空，显示运费信息，否则隐藏 结算依据为2时，装货时间不为空，显示运费信息，否则隐藏 --> - +
+ + 运费信息 + 到货后{{i?.goodsResource?.paymentDays}}天内支付运费 +
+ - - 运费信息到货后{{i?.goodsResource.paymentDays}}天内支付运费 -
{{ i?.freightPrice }}{{ i?.freightTypeLabel }} （{{ i?.settlementBasisLabel }}，{{ @@ -223,7 +204,11 @@
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}
 - + +
+ + 附件信息 +
查看附件      @@ -241,7 +226,11 @@ - + +
+ + 补充信息 +
{{i?.receiptType == 1 ?'是':'否'}} @@ -270,7 +259,7 @@ - +

| 轨迹信息

diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.less b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.less index b8327013..7086580d 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.less +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.less @@ -1,70 +1,36 @@ -:host{ - .btn-size{ - font-size: 14px; - } - .bdr{ - border-right: 1px solid #ccc; - } - .bdl{ - border-left: 1px solid #ccc; - } - .source-info{ - p{ - margin-bottom: .5em; - } - } - .freight-info-box{ - width: 95%; - } - .freigth-label{ - display: inline-block; - width: 50px; - text-align: right; - } +:host { + .btn-size { + font-size: 14px; + } - ::ng-deep{ - .approval-status{ - .ant-steps{ - width: 70%; - margin: 0 auto; - } - } + .bdr { + border-right: 1px solid #ccc; + } + + .bdl { + border-left: 1px solid #ccc; + } + + .source-info { + p { + margin-bottom: .5em; } - .leftPadding { - padding-right: 100px; - } - .handling-info { - min-height: 100px; - border: 1px solid #ccc; - - .loading-row { - display: flex; - } - - .handling-info-icon { - width: 32px; - height: 32px; - margin-right: 24px; - color: #fff; - line-height: 32px; - text-align: center; - border-radius: 50%; - - &.loading-bg { - background-color: #50D4AB; - } - - &.unloaing-bg { - background: #F66F6A; - } - } - - .info { - flex: 1; - } - - .time-info { - margin-left: 56px; - } - } -} \ No newline at end of file + } + + .freight-info-box { + width: 95%; + } + + .freigth-label { + display: inline-block; + width: 50px; + text-align: right; + } + + + .leftPadding { + padding-right: 100px; + } + + +} diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html index a59aa3f7..e048bdc3 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html @@ -6,7 +6,7 @@ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.html --> - +
- + +
+
+ + 运单号: {{ i?.wayBillCode }} +
+
+ + +
+
+ +
+
+ {{ i?.enterpriseInfoName }} + {{ i?.shippername }} + {{i?.enterpriseProjectName}} + {{i?.serviceTypeLabel}} + {{i?.dispatchName}}{{ i?.dispatchPhone ? '/' + i?.dispatchPhone : '' }} + {{ i?.resourceCode }} + {{ i?.paymentDays }} +
+
-
+
  -   +      
- - + +
+ + 装货卸货信息 + ( + + + ) + +
+
+
+
+
+
+
装
+
+

装货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

+

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+
+
+
+
+
+
+
+
+
+
卸
+
+

卸货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

+

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+
+
+
+
+
+
+ + +
+ + 基本信息 +
{{i?.goodsInfos?.[0]?.goodsName}} @@ -90,45 +156,13 @@ {{i?.unloadingTime}} -
-

装货卸货信息 - ( - - - ) - -

-
-
-
-
-
-
装
-
-

装货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

-

联系人：{{item.appUserName}}/{{item.contractTelephone}}

-
-
-
-
-
-
-
-
-
-
卸
-
-

卸货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

-

联系人：{{item.appUserName}}/{{item.contractTelephone}}

-
-
-
-
-
-
-
+ - + +
+ + 服务信息 +
{{i?.insuranceTypeLabel}} @@ -141,7 +175,12 @@ - + +
+ + 运费信息 + （到货后{{i?.paymentDays}}天内支付运费） +
{{ item.price | currency }} @@ -162,7 +201,11 @@ }}/{{ i?.payee?.idNo }}
 - + +
+ + 附件信息 +
查看附件      @@ -180,7 +223,11 @@ - + +
+ + 补充信息 +
{{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} @@ -196,18 +243,20 @@ {{ i?.supplementaryInformationVO?.address }} - - - - - {{ i?.supplementaryInformationVO?.remarks }} + + + + + + + - +

| 轨迹信息

@@ -234,4 +283,4 @@ - \ No newline at end of file + diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.less b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.less index 50b12799..f8ff2a38 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.less +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.less @@ -22,58 +22,16 @@ } .freigth-label { - display : inline-block; - width : 50px; + display: inline-block; + width: 50px; text-align: right; } - ::ng-deep { - .approval-status { - .ant-steps { - width : 70%; - margin: 0 auto; - } - } - } .leftPadding { padding-right: 100px; } - .handling-info { - min-height: 100px; - border : 1px solid #ccc; - - .loading-row { - display: flex; - } - - .handling-info-icon { - width : 32px; - height : 32px; - margin-right : 24px; - color : #fff; - line-height : 32px; - text-align : center; - border-radius: 50%; - - &.loading-bg { - background-color: #50D4AB; - } - - &.unloaing-bg { - background: #F66F6A; - } - } - - .info { - flex: 1; - } - - .time-info { - margin-left: 56px; - } - } } ::ng-deep { @@ -100,4 +58,4 @@ // left: 106px; // } // } -} \ No newline at end of file +} diff --git a/src/styles/common/global.less b/src/styles/common/global.less index 1c9488df..d837061d 100644 --- a/src/styles/common/global.less +++ b/src/styles/common/global.less @@ -58,3 +58,44 @@ margin: 0 10px 10px 0; } } + + +.handling-col { + min-height: 90px; + + .handling-info { + min-height: 100%; + border: 1px solid #ccc; + + .loading-row { + display: flex; + } + + .handling-info-icon { + width: 32px; + height: 32px; + margin-right: 24px; + color: #fff; + line-height: 32px; + text-align: center; + border-radius: 50%; + + &.loading-bg { + background-color: #50D4AB; + } + + &.unloaing-bg { + background: #F66F6A; + } + } + + .info { + flex: 1; + } + + .time-info { + margin-left: 56px; + margin-bottom: 0; + } + } +} From 6c65fccc9e3e0a7019e856d0f8149d8f6359e44c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 21:16:33 +0800 Subject: [PATCH 04/14] fix bug --- .../datatable/datatable-routing.module.ts | 56 ++++++++++++------- .../order-reporting.component.html | 12 +++- .../order-management-routing.module.ts | 2 +- 3 files changed, 47 insertions(+), 23 deletions(-) diff --git a/src/app/routes/datatable/datatable-routing.module.ts b/src/app/routes/datatable/datatable-routing.module.ts index 8298fdf5..86809094 100644 --- a/src/app/routes/datatable/datatable-routing.module.ts +++ b/src/app/routes/datatable/datatable-routing.module.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-04-28 20:27:07 + * @LastEditors : Shiming + * @LastEditTime : 2022-04-28 21:10:06 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\datatable-routing.module.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { DatatableCustomindexComponent } from './components/customtable/customindex/customindex.component'; @@ -20,29 +30,33 @@ import { DatatableReportingFundInfoComponent } from './reporting/components/fund import { DatatableDatascreenComponent } from './components/datascreen/datascreen.component'; const routes: Routes = [ - { path: 'dataindex', component: DatatableDataindexComponent }, - { path: 'customtable/customindex', component: DatatableCustomindexComponent }, - { path: 'customtable/owner', component: DatatableOwnerComponent }, - { path: 'customtable/driver', component: DatatableDriverComponent }, - { path: 'customtable/mancustomtable', component: DatatableMancustomtableComponent }, - { path: 'customtable/partnertable', component: DatatablePartnertableComponent }, - { path: 'operationtable', component: DatatableOperationtableComponent }, - { path: 'reporting/order', component: DatatableOrderReportingComponent }, - { path: 'compliancetabel/index', component: DatatableComplianceIndexComponent }, - { path: 'compliancetabel/salesman', component: DatatableComplianceSalesmanComponent }, - { path: 'compliancetabel/customer', component: DatatableComplianceCustomerComponent }, - { path: 'financetable', component: DatatableFinancetableComponent }, - { path: 'invoicetable', component: DatatableInvoicetableComponent }, - { path: 'reporting/fund', component: DatatableFundReportingComponent }, - { path: 'busitable/busiindex', component: DatatableBusiindexComponent }, - { path: 'busitable/mantable', component: DatatableMantableComponent }, - { path: 'reporting/fund', component: DatatableFundReportingComponent }, - { path: 'fund-info', component: DatatableReportingFundInfoComponent }, - { path: 'datascreen', component: DatatableDatascreenComponent }]; - + { path: 'dataindex', component: DatatableDataindexComponent, data: { guard: { ability: ['dataindex-search'] } } }, + { path: 'customtable/customindex', component: DatatableCustomindexComponent, data: { guard: { ability: ['customindex-client'] } } }, + { path: 'customtable/owner', component: DatatableOwnerComponent, data: { guard: { ability: ['owner-search'] } } }, + { path: 'customtable/driver', component: DatatableDriverComponent, data: { guard: { ability: ['driver-search'] } } }, + { + path: 'customtable/mancustomtable', + component: DatatableMancustomtableComponent, + data: { guard: { ability: ['mancustomtable-search'] } } + }, + { path: 'customtable/partnertable', component: DatatablePartnertableComponent, + data: { guard: { ability: ['partnertable-search'] } } }, + { path: 'operationtable', component: DatatableOperationtableComponent, data: { guard: { ability: ['operationtable-search'] } } }, + { path: 'reporting/order', component: DatatableOrderReportingComponent, data: { guard: { ability: ['ORDER-REPORTING-search'] } } }, + { path: 'compliancetabel/index', component: DatatableComplianceIndexComponent , data: { guard: { ability: ['index-lRateQualified'] } }}, + { path: 'compliancetabel/salesman', component: DatatableComplianceSalesmanComponent, data: { guard: { ability: ['salesman-ComplianceReportPage'] } } }, + { path: 'compliancetabel/customer', component: DatatableComplianceCustomerComponent, data: { guard: { ability: ['customer-search'] } } }, + { path: 'financetable', component: DatatableFinancetableComponent , data: { guard: { ability: ['financetable-search'] } }}, + { path: 'invoicetable', component: DatatableInvoicetableComponent , data: { guard: { ability: ['invoicetable-search'] } }}, + { path: 'reporting/fund', component: DatatableFundReportingComponent , data: { guard: { ability: ['FUND-REPORTING-search'] } }}, + { path: 'busitable/busiindex', component: DatatableBusiindexComponent , data: { guard: { ability: ['busiindex-search'] } }}, + { path: 'busitable/mantable', component: DatatableMantableComponent, data: { guard: { ability: ['customer-search'] } } }, + { path: 'fund-info', component: DatatableReportingFundInfoComponent , data: { guard: { ability: ['customer-search'] } }}, + { path: 'datascreen', component: DatatableDatascreenComponent, data: { guard: { ability: ['datascreen-search'] } } } +]; @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class DatatableRoutingModule { } +export class DatatableRoutingModule {} diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html index ef60a6e7..1884a0ef 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html @@ -1,3 +1,13 @@ + @@ -85,6 +95,6 @@ + [acl-ability]="['ORDER-REPORTING-search-updata']">上传设置
diff --git a/src/app/routes/order-management/order-management-routing.module.ts b/src/app/routes/order-management/order-management-routing.module.ts index 7be4f4e5..ed12435c 100644 --- a/src/app/routes/order-management/order-management-routing.module.ts +++ b/src/app/routes/order-management/order-management-routing.module.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-06 09:24:00 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 09:43:47 + * @LastEditTime : 2022-04-28 20:50:36 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\order-management-routing.module.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ From 50ebb152dd315208aa8fc76cbf9ba4693e07cc50 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 21:30:15 +0800 Subject: [PATCH 05/14] fix bug --- .../invoice-reporting/invoice-reporting.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html index 6784c8fd..0a8ae0a5 100644 --- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html @@ -53,7 +53,7 @@ 已选择 {{ selectedRows.length }} 条数据
- +
From 295fd58ee6be1a9be33290ce639d600d04160946 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 21:31:05 +0800 Subject: [PATCH 06/14] edit --- .../basic-table/basic-table.component.ts | 15 +++- src/app/routes/commom/less/commom-table.less | 4 +- .../routes/commom/less/common-table-bar.less | 17 ++++ .../payable-order.component.html | 36 ++++----- .../payable-order/payable-order.component.ts | 72 ++++------------- .../platform-account.component.html | 26 +++++-- .../platform-account.component.ts | 24 +++--- .../receivable-order.component.html | 62 +++++++-------- .../receivable-order.component.ts | 78 +++++-------------- 9 files changed, 149 insertions(+), 185 deletions(-) create mode 100644 src/app/routes/commom/less/common-table-bar.less diff --git a/src/app/routes/commom/components/basic-table/basic-table.component.ts b/src/app/routes/commom/components/basic-table/basic-table.component.ts index dfe8a25d..f3645ebf 100644 --- a/src/app/routes/commom/components/basic-table/basic-table.component.ts +++ b/src/app/routes/commom/components/basic-table/basic-table.component.ts @@ -73,22 +73,29 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy { for (let index = 0; index < tabset.length; index++) { tabsetHeight += tabset[index].clientHeight; } - console.log('tabsetHeight', tabsetHeight); if (tabset) { scrollY -= tabsetHeight; } // 剔除高度容器 - // 计算所有tabs高度 const headerBox = document.getElementsByClassName('header_box'); let headerBoxHeight = 0; for (let index = 0; index < headerBox.length; index++) { headerBoxHeight += headerBox[index].clientHeight; } - console.log('headerBoxHeight', headerBoxHeight); - if (headerBox) { scrollY -= headerBoxHeight; } + + // 剔除高度容器 + const heightBox = document.getElementsByClassName('height_box'); + let heightBoxHeight = 0; + for (let index = 0; index < heightBox.length; index++) { + heightBoxHeight += heightBox[index].clientHeight; + } + if (heightBox) { + scrollY -= heightBoxHeight; + } + if (typeof this.deviationHeight === 'number') { scrollY -= this.deviationHeight; } diff --git a/src/app/routes/commom/less/commom-table.less b/src/app/routes/commom/less/commom-table.less index c1256d36..152d7534 100644 --- a/src/app/routes/commom/less/commom-table.less +++ b/src/app/routes/commom/less/commom-table.less @@ -136,4 +136,6 @@ margin-right: 6px; } } -} \ No newline at end of file +} + +.height_box{} \ No newline at end of file diff --git a/src/app/routes/commom/less/common-table-bar.less b/src/app/routes/commom/less/common-table-bar.less new file mode 100644 index 00000000..22e166de --- /dev/null +++ b/src/app/routes/commom/less/common-table-bar.less @@ -0,0 +1,17 @@ +:host::ng-deep { + nz-card { + margin: -8px -8px 0 !important + } + + .height_box { + margin-bottom: 18px !important; + } +} + +.total-footer { + position : absolute; + bottom : 0px; + height : 32px; + margin : 4px 8px; + line-height: 32px; +} \ No newline at end of file diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.html b/src/app/routes/financial-management/components/payable-order/payable-order.component.html index e7fc0bc8..cbe647cb 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.html +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.html @@ -1,17 +1,10 @@ - - - + - + +
+ +
- + + +
- - - + --> + +
+
+
+ +
+
diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts index 33b73f97..447dfa8f 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts @@ -3,24 +3,21 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; +import { SearchDrawerService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { BasicTableComponent } from 'src/app/routes/commom'; import { FreightAccountService } from '../../services/freight-account.service'; @Component({ selector: 'app-payable-order', templateUrl: './payable-order.component.html', - styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'], - providers: [CurrencyPipe] + styleUrls: ['../../../commom/less/commom-table.less', '../../../commom/less/common-table-bar.less'] }) -export class PayableOrderComponent implements OnInit { +export class PayableOrderComponent extends BasicTableComponent implements OnInit { @ViewChild('st', { static: true }) st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; columns: STColumn[] = this.initST(); - searchSchema: SFSchema = this.initSF(); - - _$expand = false; + schema: SFSchema = this.initSF(); selectedRows: any[] = []; info: any = {}; @@ -28,10 +25,15 @@ export class PayableOrderComponent implements OnInit { public service: FreightAccountService, private nzModalService: NzModalService, private router: Router, - private currencyPipe: CurrencyPipe - ) {} + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } - ngOnInit(): void { + ngOnInit(): void {} + + search() { + this.st?.load(1); } loadInfo() { @@ -76,21 +78,6 @@ export class PayableOrderComponent implements OnInit { } } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } private initSF(): SFSchema { return { @@ -133,9 +120,6 @@ export class PayableOrderComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } } }, cno: { @@ -146,9 +130,6 @@ export class PayableOrderComponent implements OnInit { placeholder: '请选择', allowClear: true, asyncData: () => this.service.getCloseAccount(), - visibleIf: { - expand: (value: boolean) => value - } } }, driver2IdName: { @@ -157,9 +138,6 @@ export class PayableOrderComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } } }, sts: { @@ -172,9 +150,6 @@ export class PayableOrderComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } } }, phxdate: { @@ -183,9 +158,6 @@ export class PayableOrderComponent implements OnInit { ui: { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } } as SFDateWidgetSchema }, createTime: { @@ -194,9 +166,6 @@ export class PayableOrderComponent implements OnInit { ui: { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } } as SFDateWidgetSchema }, billHCode: { @@ -204,9 +173,6 @@ export class PayableOrderComponent implements OnInit { title: '订单号', ui: { placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } } }, feeHCode: { @@ -214,9 +180,6 @@ export class PayableOrderComponent implements OnInit { title: '费用号', ui: { placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } } }, remarks: { @@ -225,9 +188,6 @@ export class PayableOrderComponent implements OnInit { ui: { autocomplete: 'off', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } } } } @@ -246,15 +206,17 @@ export class PayableOrderComponent implements OnInit { title: '核销金额', index: 'phxmoney', width: 140, + type: 'widget', className: 'text-right', - format: item => `${this.currencyPipe.transform(item.phxmoney || 0)}` + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.phxmoney }) } }, { title: '应付金额', index: 'prmoney', width: 140, + type: 'widget', className: 'text-right', - format: item => `${this.currencyPipe.transform(item.prmoney || 0)}` + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.prmoney }) } }, { title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 }, { title: '付款类型', index: 'brmtype', type: 'enum', enum: { '1': '费用款项' }, width: 120 }, diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.html b/src/app/routes/financial-management/components/platform-account/platform-account.component.html index ccbbcf20..613120d9 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account.component.html +++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.html @@ -1,7 +1,10 @@ - - + - + +
+ +
- + - + +
+
+
+ + +
+
@@ -60,4 +70,4 @@
- + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts index e939b50a..3c7c0268 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts +++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts @@ -2,7 +2,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; +import { SearchDrawerService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { BasicTableComponent } from 'src/app/routes/commom'; import { FreightAccountService } from '../../services/freight-account.service'; import { CwcBankCardManagementBindComponent } from '../bank-card-management/bind/bind.component'; import { CwcAccountManagementWithdrawDepositComponent } from './withdraw-deposit/withdraw-deposit.component'; @@ -10,14 +12,12 @@ import { CwcAccountManagementWithdrawDepositComponent } from './withdraw-deposit @Component({ selector: 'app-platform-account', templateUrl: './platform-account.component.html', - styleUrls: ['../../../commom/less/box.less'] + styleUrls: ['../../../commom/less/commom-table.less', '../../../commom/less/common-table-bar.less'] }) -export class PlatformAccountComponent implements OnInit { +export class PlatformAccountComponent extends BasicTableComponent implements OnInit { @ViewChild('st', { static: true }) st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; - searchSchema: SFSchema = this.initSF(); + schema: SFSchema = this.initSF(); columns: STColumn[] = this.initST(); info: any = {}; @@ -27,11 +27,16 @@ export class PlatformAccountComponent implements OnInit { public service: FreightAccountService, private router: Router, private nzModalService: NzModalService, - public modal: NzModalService - ) {} + public modal: NzModalService, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } - ngOnInit(): void { - this.loadInfo(); + ngOnInit(): void {} + + search() { + this.st?.load(1); } beforeReq = (requestOptions: STRequestOptions) => { @@ -39,6 +44,7 @@ export class PlatformAccountComponent implements OnInit { Object.assign(requestOptions.body, { ...this.sf?.value }); } this.loadStatistics(requestOptions.body); + this.loadInfo(); return requestOptions; }; diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html index 0755a3f3..ceb5e6f5 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html @@ -1,16 +1,29 @@ - - + - + + + +
+ +
- -
-
- -
-
- - - - + +
+
+
+
- - + [loading]="false" [scroll]="{ x: '1200px',y:scrollY }" (change)="stChange($event)"> \ No newline at end of file diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts index 19007ae6..c27928e7 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts @@ -3,25 +3,22 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; +import { SearchDrawerService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { BasicTableComponent } from 'src/app/routes/commom'; import { TicketService } from 'src/app/routes/ticket-management/services/ticket.service'; import { FreightAccountService } from '../../services/freight-account.service'; @Component({ selector: 'app-receivable-order', templateUrl: './receivable-order.component.html', - styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'], - providers: [CurrencyPipe] + styleUrls: ['../../../commom/less/commom-table.less','../../../commom/less/common-table-bar.less'] }) -export class ReceivableOrderComponent implements OnInit { +export class ReceivableOrderComponent extends BasicTableComponent implements OnInit { @ViewChild('st', { static: true }) st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; columns: STColumn[] = this.initST(); - searchSchema: SFSchema = this.initSF(); - - _$expand = false; + schema: SFSchema = this.initSF(); selectedRows: any[] = []; @@ -30,10 +27,15 @@ export class ReceivableOrderComponent implements OnInit { public service: FreightAccountService, private nzModalService: NzModalService, private router: Router, - private currencyPipe: CurrencyPipe - ) {} + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } - ngOnInit(): void { + ngOnInit(): void {} + + search() { + this.st?.load(1); } loadInfo() { @@ -78,21 +80,6 @@ export class ReceivableOrderComponent implements OnInit { } } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } private initSF(): SFSchema { return { @@ -135,9 +122,6 @@ export class ReceivableOrderComponent implements OnInit { widget: 'dict-select', params: { dictKey: 'driverrecord:receive:type' }, placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } } }, arvattype: { @@ -147,9 +131,6 @@ export class ReceivableOrderComponent implements OnInit { widget: 'dict-select', params: { dictKey: 'pay:type' }, placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } } }, cno: { @@ -160,9 +141,6 @@ export class ReceivableOrderComponent implements OnInit { placeholder: '请选择', allowClear: true, asyncData: () => this.service.getCloseAccount(), - visibleIf: { - expand: (value: boolean) => value - } } }, arto: { @@ -175,9 +153,6 @@ export class ReceivableOrderComponent implements OnInit { searchLoadingText: '搜索中...', allowClear: true, onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }), - visibleIf: { - expand: (value: boolean) => value - } } }, sts: { @@ -190,9 +165,7 @@ export class ReceivableOrderComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + } }, banktype: { @@ -206,9 +179,7 @@ export class ReceivableOrderComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + }, default: '' }, @@ -218,9 +189,7 @@ export class ReceivableOrderComponent implements OnInit { ui: { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } + } as SFDateWidgetSchema }, createTime: { @@ -229,9 +198,6 @@ export class ReceivableOrderComponent implements OnInit { ui: { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } } as SFDateWidgetSchema }, billHCode: { @@ -239,9 +205,6 @@ export class ReceivableOrderComponent implements OnInit { title: '订单号', ui: { placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } } }, // orderS3: { @@ -260,9 +223,6 @@ export class ReceivableOrderComponent implements OnInit { ui: { autocomplete: 'off', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } } } } @@ -282,15 +242,17 @@ export class ReceivableOrderComponent implements OnInit { title: '核销金额', index: 'ahxmoney', width: 140, + type: 'widget', className: 'text-right', - format: item => `${this.currencyPipe.transform(item.ahxmoney)}` + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ahxmoney }) } }, { title: '应收金额', index: 'armoney', width: 140, + type: 'widget', className: 'text-right', - format: item => `${this.currencyPipe.transform(item.armoney)}` + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.armoney }) } }, { title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 }, { title: '收款类型', index: 'arvattype', type: 'enum', enum: { '1': '费用款项' }, width: 120 }, From 72eb70bf75e86c228f976eaac935975dee953ab6 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 21:41:10 +0800 Subject: [PATCH 07/14] fix bug --- .../close-account.component.html | 6 +-- .../close-account/close-account.component.ts | 6 ++- .../sys-setting/sys-setting-routing.module.ts | 6 +-- .../invoice-reporting.component.html | 39 +++++++++++++------ 4 files changed, 37 insertions(+), 20 deletions(-) diff --git a/src/app/routes/sys-setting/components/close-account/close-account.component.html b/src/app/routes/sys-setting/components/close-account/close-account.component.html index b29143f4..2bf35804 100644 --- a/src/app/routes/sys-setting/components/close-account/close-account.component.html +++ b/src/app/routes/sys-setting/components/close-account/close-account.component.html @@ -22,8 +22,8 @@
- - + + +
this.roleAction(item, 2) + click: item => this.roleAction(item, 2), + acl: { ability: ['SYSTEM-CLOSE-ACCOUNT-edit'] }, }, { text: '删除', - click: item => this.deleteAction(item) + click: item => this.deleteAction(item), + acl: { ability: ['SYSTEM-CLOSE-ACCOUNT-delete'] }, }, ] } diff --git a/src/app/routes/sys-setting/sys-setting-routing.module.ts b/src/app/routes/sys-setting/sys-setting-routing.module.ts index fb77019d..c307b78d 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:23:05 - * @LastEditTime : 2022-02-23 17:17:53 + * @LastEditTime : 2022-04-28 21:40:03 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting-routing.module.ts @@ -34,7 +34,7 @@ const routes: Routes = [ { path: 'role-management/freight/:type', component: RoleManagementComponent }, { path: 'organization-management', component: OrganizationManagementComponent, data: { guard: { ability: ['SYSTEM-ROLE-list'] } } }, { path: 'basic-setting', component: BasicSettingComponent, data: { guard: { ability: ['SYSTEM-BASIC_SETTING-list'] } } }, - { path: 'note-management', component: NoTeManagementComponent }, + { path: 'note-management', component: NoTeManagementComponent, data: { guard: { ability: ['NOTE-MANAGEMENT-search'] } } }, { path: 'basic-config', component: BasicConfigComponent }, { path: 'audit-reason-config', component: AuditReasonConfigComponent }, { @@ -52,7 +52,7 @@ const routes: Routes = [ { path: 'crm-management', component: CrmManagementComponent, data: { guard: { ability: ['SYSTEM-CRM-list'] } } }, { path: 'network-freight', component: NetworkFreightComponent, data: { guard: { ability: ['SYSTEM-NETWORK-FREIGHT-list'] } } }, { path: 'network-freight/new/:id', component: NetworkFreightNewComponent }, - { path: 'close-account', component: CloseAccountComponent }, + { path: 'close-account', component: CloseAccountComponent, data: { guard: { ability: ['SYSTEM-CLOSE-ACCOUNT-list'] } } }, // { path: 'btn-management', component: BtnManagementComponent }, { path: 'announcement-message', component: AnnouncementMessageComponent, data: { guard: { ability: ['SYSTEM-ANNOUNCEMENT-list'] } } }, { path: 'insurance-set', component: InsuranceSetComponent }, diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html index 0a8ae0a5..2f59f9a9 100644 --- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html @@ -7,7 +7,7 @@
- +
- - - + + - + [page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }" + [loading]="service.http.loading" + > 待上传 已上传 上传中 - 上传异常 + 上传异常 增值税专用发票 - 有效 - 作废 + 有效 + 作废 -
{{item?.orderAmount | currency }}
+
{{ item?.orderAmount | currency }}
 @@ -53,7 +58,17 @@ 已选择 {{ selectedRows.length }} 条数据
- - + +
From 4fa3096bae0a117374dbb698c70433c28da88085 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 21:59:39 +0800 Subject: [PATCH 08/14] fix bug --- .../freight-account-detail.component.ts | 4 +++- .../modify-rate/modify-rate.component.html | 4 ++-- .../vehicle/modify-rate/modify-rate.component.ts | 16 ++++++++++++---- 3 files changed, 17 insertions(+), 7 deletions(-) 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 3b1bb143..60e99082 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 @@ -46,7 +46,7 @@ export class FreightAccountDetailComponent implements OnInit { } }); } - // this.loadStatistics(requestOptions.body); + this.loadStatistics(requestOptions.body); return requestOptions; }; @@ -75,6 +75,8 @@ export class FreightAccountDetailComponent implements OnInit { loadStatistics(params: any) { this.service.request(this.service.$api_get_shipper_account_balance_detail, params).subscribe(res => { if (res) { + console.log(res); + this.static = res; } }); diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html index ad382091..fb79a754 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html +++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html @@ -4,14 +4,14 @@ * @Author : Shiming * @Date : 2021-12-29 14:51:07 * @LastEditors : Shiming - * @LastEditTime : 2022-03-08 13:21:35 + * @LastEditTime : 2022-04-28 21:58:14 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - { + console.log(item); + this.modiUrl = this.service.$api_searchAdditionalRateBatch; + this.st.reload(1) + + } } as SFNumberWidgetSchema } }, From 914fdd5535ce32792b34fa47736d484984666ba5 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 22:03:22 +0800 Subject: [PATCH 09/14] fix bug --- .../modal/vehicle/modify-rate/modify-rate.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts index ffb0eb1c..a7be8521 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts +++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts @@ -5,7 +5,7 @@ import { STComponent } from '@delon/abc/st'; * @Author : Shiming * @Date : 2021-12-29 14:51:07 * @LastEditors : Shiming - * @LastEditTime : 2022-04-28 21:56:55 + * @LastEditTime : 2022-04-28 22:03:03 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -69,7 +69,7 @@ export class VehicleModifyRateComponent implements OnInit { change:(item: any) => { console.log(item); this.modiUrl = this.service.$api_searchAdditionalRateBatch; - this.st.reload(1) + this.st.reload() } } as SFNumberWidgetSchema From a37f26ef6c40667f955809496c27f2567042d3ca Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 22:12:48 +0800 Subject: [PATCH 10/14] fix bug --- .../modify-rate/modify-rate.component.html | 4 ++-- .../modify-rate/modify-rate.component.ts | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html index fb79a754..8f453052 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html +++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html @@ -4,14 +4,14 @@ * @Author : Shiming * @Date : 2021-12-29 14:51:07 * @LastEditors : Shiming - * @LastEditTime : 2022-04-28 21:58:14 + * @LastEditTime : 2022-04-28 22:11:32 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - { + console.log(res); + this.dataList = res + }) + } initSF() { this.schema = { properties: { @@ -68,9 +77,9 @@ export class VehicleModifyRateComponent implements OnInit { precision: 2, change:(item: any) => { console.log(item); - this.modiUrl = this.service.$api_searchAdditionalRateBatch; - this.st.reload() - + setTimeout(() => { + this.initData() + }); } } as SFNumberWidgetSchema } From 3d7e576cc0aa62cc5b5c93ba043a8e96b321cea1 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 29 Apr 2022 09:39:03 +0800 Subject: [PATCH 11/14] edit --- .../financial-managemen-routing.module.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 7cdee930..07e9f0d6 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -64,8 +64,12 @@ const routes: Routes = [ { path: 'voucher-summary/detail/:id', component: SummaryDetailComponent }, { path: 'voucher-summary/list/:id', component: VoucherListComponent }, { path: 'voucher-summary/list/detail/:id', component: VoucherDetailComponent }, - { path: 'cost-management', component: CostManagementComponent }, - { path: 'cost-management/detail/:id', component: CostManagementDetailComponent }, + { path: 'cost-management', component: CostManagementComponent, data: { guard: { ability: ['FINANCIAL-COST-list'] } } }, + { + path: 'cost-management/detail/:id', + component: CostManagementDetailComponent, + data: { guard: { ability: ['FINANCIAL-COST-DETAIL-view'] } } + }, { path: 'cost-management/expenses-receivable/:id', component: ExpensesReceivableComponent }, { path: 'cost-management/expenses-payable/:id', component: ExpensesPayableComponent }, { path: 'abnormal-gold', component: AbnormalGoldComponent }, From 8a16513dca5f93fdadf44f255ded21db2add50b8 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 29 Apr 2022 09:53:12 +0800 Subject: [PATCH 12/14] edit --- .../shared/components/search-drawer/search-drawer.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/shared/components/search-drawer/search-drawer.component.ts b/src/app/shared/components/search-drawer/search-drawer.component.ts index 20748575..52a15e2f 100644 --- a/src/app/shared/components/search-drawer/search-drawer.component.ts +++ b/src/app/shared/components/search-drawer/search-drawer.component.ts @@ -21,6 +21,7 @@ export class SearchDrawerComponent implements OnInit, AfterViewInit { ngAfterViewInit(): void {} ngOnInit(): void { + this.defaultValue = {}; this.service.createEvent.subscribe(({ defaultValue, newSchema, newUI }) => { if (defaultValue) { this.defaultValue = defaultValue; From 86a10c17577a4078d55d6d6969039e67cb8ef2cd Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 29 Apr 2022 10:00:15 +0800 Subject: [PATCH 13/14] fix bug --- .../partner-detail.component.html | 2 +- .../freight/list/detail/detail.component.html | 2 +- .../audit/detail/detail.component.html | 23 ++++++++++++++++++- .../audit/detail/detail.component.ts | 4 ++++ 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html index 83110997..32115fda 100644 --- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html +++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html @@ -162,7 +162,7 @@ nzTheme="fill" class="mr-xs">通过

diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index 490143b2..9da6addd 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -139,7 +139,7 @@ nzTheme="fill" class="mr-xs">通过

diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.html b/src/app/routes/vehicle/components/audit/detail/detail.component.html index 608a8bb0..7b9536d8 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.html +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.html @@ -85,6 +85,17 @@ + + + + + - + + + + Date: Fri, 29 Apr 2022 10:02:43 +0800 Subject: [PATCH 14/14] fix bug --- .../list/detail/detail.component.html | 24 ++++++++++++++++++- .../list/detail/detail.component.ts | 5 ++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.html b/src/app/routes/vehicle/components/list/detail/detail.component.html index f868a506..513c7e00 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.html +++ b/src/app/routes/vehicle/components/list/detail/detail.component.html @@ -72,6 +72,17 @@ + + + + + - + + + + + diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.ts b/src/app/routes/vehicle/components/list/detail/detail.component.ts index 50a20048..418b62b2 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts @@ -41,6 +41,7 @@ export class VehicleComponentsListDetailComponent implements OnInit { contenCarNoColor: any; contencarModel: any; contenCarLength: any; + contenCarEnergy: any; constructor( private http: _HttpClient, @@ -158,6 +159,8 @@ export class VehicleComponentsListDetailComponent implements OnInit { this.Serveice('car:color'); this.Serveice('car:model'); this.Serveice('car:length'); + this.Serveice('car:energy:type'); + } Serveice(param: any) { let value: any; @@ -172,6 +175,8 @@ export class VehicleComponentsListDetailComponent implements OnInit { this.contencarModel = res; } else if (param === 'car:length') { this.contenCarLength = res; + } else if (param === 'car:energy:type') { + this.contenCarEnergy = res; } }); return value;