diff --git a/src/app/routes/commom/less/commom-table.less b/src/app/routes/commom/less/commom-table.less new file mode 100644 index 00000000..1eb73d94 --- /dev/null +++ b/src/app/routes/commom/less/commom-table.less @@ -0,0 +1,70 @@ +:host { + ::ng-deep { + nz-card { + margin: -24px -24px 0; + + .ant-tabs-nav { + margin: 0; + } + } + + .ant-tabs-tab { + margin: 0 0 0 16px; + padding: 12px 0; + } + + .ant-table-body { + border-bottom: 1px solid #f0f0f0; + } + + .table-box { + .ant-card-body { + padding: 0; + } + } + + .ant-table-pagination.ant-pagination { + margin: 8px; + } + + .ant-table-thead > tr > th, + .ant-table-tbody > tr > td, + .ant-table tfoot > tr > th, + .ant-table tfoot > tr > td { + padding: 8px; + } + + .ant-table.ant-table-bordered > .ant-table-container { + border-top: 0; + } + + .ant-pagination-item { + min-width: 24px; + height: 24px; + line-height: 21px; + } + + .ant-pagination-total-text { + height: 24px; + line-height: 24px; + } + + .ant-pagination-prev, + .ant-pagination-next, + .ant-pagination-jump-prev, + .ant-pagination-jump-next { + min-width: 24px; + height: 24px; + line-height: 21px; + } + + .ant-select-single:not(.ant-select-customize-input) .ant-select-selector { + height: 24px; + } + + .ant-select-single .ant-select-selector .ant-select-selection-item, + .ant-select-single .ant-select-selector .ant-select-selection-placeholder { + line-height: 21px; + } + } +} 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 2e32718b..a41bc6e4 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 @@ -82,7 +82,7 @@ export class PaymentRecordComponent implements OnInit { hidden: true } }, - orderSn: { + orderPaymentCode: { type: 'string', title: '支付编号', ui: { 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 a2bbd47c..46af35d3 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 @@ -151,7 +151,7 @@ export class TransactionFlowComponent { }, default: '' }, - orderS2n2221: { + enterpriseName: { type: 'string', title: '账户名称', ui: { @@ -213,7 +213,7 @@ export class TransactionFlowComponent { private initST(): STColumn[] { return [ { title: '交易时间', index: 'createTime', width: 180 }, - { title: '流水号', index: 'transactionNumber', width: 170 }, + { title: '流水号', index: 'transactionNumber', width: 180 }, { title: '交易类型', index: 'tradeTypeLabel', width: 120 }, { title: '关联单号', index: 'businessNumber', width: 150 }, { title: '账户类型', index: 'accountTypeLabel', width: 130 }, diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html index 4a204913..e65eb5c0 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html @@ -348,7 +348,7 @@
货物名称:{{ i?.goodsName }}
重量/体积:{{ i?.weight }}吨/{{ i?.volume }}方
-车型/车长:{{ i?.carModel }}/ {{ i?.carLength }}
+车型/车长:{{ i?.carModelLabel }}/ {{ i?.carLengthLabel }}
${location.title}`);
- this.infoWindow.open(this.aMap, location.position);
- this.infoWindow.setPosition(location.position);
- this.aMap.setCenter(location.position);
- }
-
- /**
- * 增加标记点
- *
- * @param poi
- */
- setPOI(poi: POI) {
- AMapUI.loadUI(['overlay/SimpleMarker'], (SimpleMarker: any) => {
- //启动页面
- new SimpleMarker({
- //普通文本
- iconLabel: {
- //普通文本
- innerHTML: poi.markerLabel,
- //设置样式
- style: {
- color: '#fff',
- fontSize: '110%',
- marginTop: '2px'
- }
- },
- iconStyle: poi.color,
- map: this.aMap,
- position: poi.position
- });
- });
+ selectedPOI(infoItem: InfoItem) {
+ this.infoWindow.setContent(infoItem.content || `地址: ${infoItem.title}`);
+ this.infoWindow.open(this.aMap, infoItem.position);
+ this.infoWindow.setPosition(infoItem.position);
+ // 地图定位居中
+ this.aMap.setCenter(infoItem.position);
}
}
-
-export interface POI {
- markerLabel: string;
- color: string;
- position: string[];
-}
diff --git a/src/app/shared/components/amap/amap.service.ts b/src/app/shared/components/amap/amap.service.ts
index ce1a801e..472d0164 100644
--- a/src/app/shared/components/amap/amap.service.ts
+++ b/src/app/shared/components/amap/amap.service.ts
@@ -12,7 +12,10 @@ import { Injectable } from '@angular/core';
import { Observable, Subject, throwError } from 'rxjs';
import AMapLoader from '@amap/amap-jsapi-loader';
import { amapConf } from '@conf/amap.config';
+import { formatDate } from '@angular/common';
+import { DateTimePickerUtil } from '@delon/util';
declare var AMap: any;
+declare var AMapUI: any;
const CONFIG = amapConf;
@Injectable({
@@ -82,4 +85,59 @@ export class AmapService {
return this.currentSub;
}
+
+ /**
+ * 增加标记点
+ *
+ * @param poi
+ */
+ setPOI(poi: POI, aMap: any) {
+ AMapUI.loadUI(['overlay/SimpleMarker'], (SimpleMarker: any) => {
+ //启动页面
+ new SimpleMarker({
+ //普通文本
+ iconLabel: {
+ //普通文本
+ innerHTML: poi.markerLabel,
+ //设置样式
+ style: {
+ color: '#fff',
+ fontSize: '110%',
+ marginTop: '2px'
+ }
+ },
+ iconStyle: poi.color,
+ map: aMap,
+ position: poi.position
+ });
+ });
+ }
+
+ formatTime(time: string): string {
+ return `${time.slice(0, 4)}-${time.slice(4, 6)}-${time.slice(6, 8)} ${time.slice(9, 11)}:${time.slice(11, 13)}:${time.slice(13, 15)}`;
+ }
+}
+
+export interface POI {
+ markerLabel?: string;
+ title: string;
+ color: string;
+ position: string[];
+}
+
+export interface InfoItem {
+ title?: string;
+ content?: string;
+ position: string[];
+}
+
+export interface MapList {
+ name: string;
+ time: string;
+ lnglat: string[];
+}
+
+export interface PathList {
+ name: string;
+ points: MapList[];
}
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts
index 426e0ddb..0de00c17 100644
--- a/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts
+++ b/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-10 16:06:17
* @LastEditors : Shiming
- * @LastEditTime : 2022-02-17 13:28:39
+ * @LastEditTime : 2022-03-22 10:05:15
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-modal\\dynamic-setting-modal.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -34,6 +34,8 @@ export class DynamicSettingModalComponent implements OnInit {
@Input()
extendType!: string;
@Input()
+ spareBusinessId!: string;
+ @Input()
businessId!: string;
@Input()
configvalue!: string;
@@ -54,7 +56,8 @@ export class DynamicSettingModalComponent implements OnInit {
.request('/api/mdc/pbc/sysConfigItemExtend/getSysConfigExtend', {
configFullKey: this.configFullKey,
extendType: this.extendType,
- businessId: this.businessId
+ businessId: this.businessId,
+ spareBusinessId: this.spareBusinessId,
})
.pipe(
map((res: Array