From d75f859b501beeb0d878f8ab72c7f9b692d25ad6 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 15:10:35 +0800 Subject: [PATCH 1/3] fix bug --- .../datatable/components/datascreen/map/map.component.html | 4 ++-- .../datatable/components/datascreen/map/map.component.ts | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/routes/datatable/components/datascreen/map/map.component.html b/src/app/routes/datatable/components/datascreen/map/map.component.html index f82fc220..80ed7c86 100644 --- a/src/app/routes/datatable/components/datascreen/map/map.component.html +++ b/src/app/routes/datatable/components/datascreen/map/map.component.html @@ -4,8 +4,8 @@ * @Author : Shiming * @Date : 2022-04-06 17:57:07 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 10:17:44 + * @LastEditTime : 2022-04-13 14:30:10 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\map\\map.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/routes/datatable/components/datascreen/map/map.component.ts b/src/app/routes/datatable/components/datascreen/map/map.component.ts index a8e5354e..23d25d80 100644 --- a/src/app/routes/datatable/components/datascreen/map/map.component.ts +++ b/src/app/routes/datatable/components/datascreen/map/map.component.ts @@ -10,6 +10,8 @@ import { DataService } from 'src/app/routes/datatable/services/data.service'; export class DatatableCustomindexMapComponent implements OnInit, OnChanges, AfterViewInit { el: any; @Input() chartData: any; + @ViewChild('auditModal', { static: false }) auditModal!: any; + @ViewChild('map',{static: false}) map!: any; chart: any; mapData: any; ds!: DataSet ; @@ -19,8 +21,8 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges, Afte userData: any = []; constructor(private service: DataService, private ngZone: NgZone) {} ngAfterViewInit(): void { - throw new Error('Method not implemented.'); - + this.map.el.nativeElement.style.height = this.map.el.nativeElement.clientWidth + 'px' + this.chart.render(); } ngOnChanges(changes: SimpleChanges): void { From 0c0db501daa8169fbb8360c2ef0696b394919720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Wed, 13 Apr 2022 15:21:06 +0800 Subject: [PATCH 2/3] - --- .../order-reporting.component.ts | 10 +- .../bulk-publish/bulk-publish.component.html | 2 +- .../bulk-publish/bulk-publish.component.less | 4 +- .../onecar-publish.component.html | 2 +- .../onecar-publish.component.less | 4 +- .../release-publish.component.html | 184 +++++++----------- .../release-publish.component.less | 30 ++- .../release-publish.component.ts | 19 +- 8 files changed, 131 insertions(+), 124 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index 07a03859..c50cb454 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -23,10 +23,10 @@ export class DatatableOrderReportingComponent implements OnInit { @ViewChild('sf', { static: false }) sf!: SFComponent; tabType!: string; tabs: any[] = [ - { name: '待上传', value: '1' }, - { name: '上传中', value: '2' }, - { name: '已上传', value: '3' }, - { name: '异常', value: '4' }, + { name: '待上传', value: '0' }, + { name: '上传中', value: '3' }, + { name: '已上传', value: '1' }, + { name: '异常', value: '2' }, { name: '全部', value: '' } ]; selectedIndex = '1'; @@ -53,7 +53,7 @@ export class DatatableOrderReportingComponent implements OnInit { */ get reqParams() { const params = Object.assign({}, this.sf?.value || {}, { - putStatus: this.selectedIndex, + billPutStatus: this.selectedIndex, }); delete params._$expand; return { ...params }; diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html index 3adadeab..fc4ad284 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html @@ -90,7 +90,7 @@ - 国家法规及行政命令禁限运货物不能托运 + 国家法规及行政命令禁限运货物不能托运 《禁运物品说明》 diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less index 6afafe32..a2ab5fbc 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less @@ -11,10 +11,10 @@ .sf3 { .goods_Tips_item { .goods_tips { - width: calc(50% - 60px); + width: calc(50% - 45px); .ant-alert { - padding: 4px; + padding: 0 0 0 2px; } } diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html index f2dc8e3b..3c489ffb 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html @@ -139,7 +139,7 @@ - 国家法规及行政命令禁限运货物不能托运 + 国家法规及行政命令禁限运货物不能托运 《禁运物品说明》 diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less index a29c4d5b..a445eacf 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less @@ -11,10 +11,10 @@ .sf3 { .goods_Tips_item { .goods_tips { - width: calc(50% - 60px); + width: calc(50% - 45px); .ant-alert { - padding: 4px; + padding: 0 0 0 2px; } } diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html index b3be726e..efdb686f 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html @@ -7,15 +7,13 @@
货源单设置
- - {{ i.value }} - + + {{ i.value }} + -
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
+
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
@@ -26,47 +24,26 @@
- + - - + +
- 联系人 + 联系人
- + - +
@@ -83,59 +60,38 @@
- +
- 卸货地 + 卸货地
- + - - + +
- 联系人 + 联系人
- + - +
@@ -156,22 +112,18 @@ 装货时间 - +
- 卸货时间 + 卸货时间 - +
@@ -184,31 +136,40 @@
货物信息
- + + + + + + 国家法规及行政命令禁限运货物不能托运 + 《禁运物品说明》 + + +
- + - + - +
-
@@ -235,8 +196,8 @@ - ①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见《保险告知函》 + ①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见《保险告知函》
@@ -257,18 +218,21 @@
- + - + - + {{ i.value | currency }} @@ -277,14 +241,14 @@ {{ i.value | currency }}
-
- -
-
-  天内支付运费 -
+
+ +
+
+  天内支付运费 +
@@ -293,7 +257,9 @@
- - + +
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.less b/src/app/routes/supply-management/components/release-publish/release-publish.component.less index f6d4bb4f..b34cbcc9 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.less +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.less @@ -3,10 +3,34 @@ nz-input-number { width: 100%; } + nz-date-picker { width: 94.3%; } + + .sf3 { + .goods_Tips_item { + .goods_tips { + width: calc(50% - 45px); + + .ant-alert { + padding: 0 0 0 2px; + } + + } + + nz-form-item { + margin-bottom: 8px; + } + + // .ant-form-item-control-input-content { + // display: flex; + // justify-content: end; + // } + } + } } + i { cursor: pointer; } @@ -34,7 +58,10 @@ padding: 24px; color: #7d7d7d; font-size: 30px; - :hover{color: #52acff;} + + :hover { + color: #52acff; + } } #container { @@ -45,6 +72,7 @@ input[type='number'] { -moz-appearance: textfield; } + input[type='number']::-webkit-inner-spin-button, input[type='number']::-webkit-outer-spin-button { margin: 0; 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 5a261ff0..5eb7ad4a 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 @@ -237,6 +237,17 @@ export class SupplyManagementReleasePublishComponent implements OnInit { initSF3() { this.schema3 = { properties: { + goodsTips: { + type: 'string', + title: '', + ui: { + widget: 'custom', + class: 'goods_Tips_item', + // visibleIf: { + // goodsTypeName: (value: any) => value && value === '其它' + // } + } + }, goodsTypeId: { type: 'string', title: '货物名称', @@ -308,6 +319,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit { '*': { spanLabelFixed: 115, grid: { span: 12 } + }, + $goodsTips: { + grid: { span: 24 } } }; } @@ -745,9 +759,8 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.service .request( this.service.$api_getAdditionalRate + - `?shipperId=${this?.sf1.value?.shipperAppUserId || ''}&enterpriseInfoId=${ - this?.sf1.value?.enterpriseInfoName || '' - }&resourcetype='1'` + `?shipperId=${this?.sf1.value?.shipperAppUserId || ''}&enterpriseInfoId=${this?.sf1.value?.enterpriseInfoName || '' + }&resourcetype='1'` ) .subscribe(res => { if (res) { From 5a980b216e11093a18e26babdf7f995aca42381b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 15:21:30 +0800 Subject: [PATCH 3/3] fix bug --- .../components/datascreen/datascreen.component.html | 8 ++++---- .../components/datascreen/map/map.component.html | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index 1813a271..e614479a 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.html +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 10:33:08 + * @LastEditTime : 2022-04-13 15:20:32 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -23,7 +23,7 @@
-
+
@@ -72,7 +72,7 @@
-
+
@@ -93,7 +93,7 @@
-
+
diff --git a/src/app/routes/datatable/components/datascreen/map/map.component.html b/src/app/routes/datatable/components/datascreen/map/map.component.html index 80ed7c86..1ff87c79 100644 --- a/src/app/routes/datatable/components/datascreen/map/map.component.html +++ b/src/app/routes/datatable/components/datascreen/map/map.component.html @@ -4,8 +4,9 @@ * @Author : Shiming * @Date : 2022-04-06 17:57:07 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 14:30:10 + * @LastEditTime : 2022-04-13 15:20:33 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\map\\map.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - \ No newline at end of file + + \ No newline at end of file