diff --git a/proxy.conf.js b/proxy.conf.js
index 3f46d181..0c568287 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming
- * @LastEditTime : 2022-01-20 16:35:47
+ * @LastEditTime : 2022-01-20 16:57:38
* @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
diff --git a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html
index 06cd3368..726d7da1 100644
--- a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html
+++ b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-19 16:54:07
* @LastEditors : Shiming
- * @LastEditTime : 2022-01-20 16:40:08
+ * @LastEditTime : 2022-01-20 16:57:24
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\payment-order\\payment-order-detail\\payment-order-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -23,13 +23,13 @@
{{headerInfo?.ltdName}}
- {{headerInfo?.hrToName}}
+ {{headerInfo?.payBankTypeLabel}}
{{headerInfo?.ltdAccountId}}
- {{headerInfo?.invdate}}
+ {{headerInfo?.payMoney}}
diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html b/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html
index 8d8fe5dc..552fa829 100644
--- a/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html
+++ b/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html
@@ -12,7 +12,7 @@
- {{info?.vcltdcode}}
+ {{info?.ltdId}}
{{info?.vctype}}
diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
index 393c4f87..a6871f49 100644
--- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
+++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 15:57:44
* @LastEditors : Shiming
- * @LastEditTime : 2022-01-20 15:23:12
+ * @LastEditTime : 2022-01-20 16:58:27
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-management\\voucher-management.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -296,7 +296,7 @@ export class VoucherManagementComponent implements OnInit {
{ title: '凭证号', index: 'id', type: 'link', width: 150 },
{ title: '帐套', index: 'vcltdid', width: 150 },
{ title: '凭证时间', index: 'vctime', type: 'date', width: 150 },
- { title: '凭证类型', index: 'vctypeLabel', width: 150 },
+ { title: '凭证类型', index: 'vctype', width: 150 },
{ title: '序号', index: 'invmoney', width: 150, format: _ => '1' },
{ title: '摘要', index: 'remarks', width: 300 },
{ title: '币种', index: 'currency', width: 100 },
diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts b/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts
index fc9137f1..eff9fc1d 100644
--- a/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts
+++ b/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts
@@ -186,7 +186,7 @@ export class VoucherListComponent implements OnInit {
{ title: '凭证号', index: 'id', type: 'link', width: 150 },
{ title: '帐套', index: 'vcltdid', width: 150 },
{ title: '凭证时间', index: 'vctime', type: 'date', width: 150 },
- { title: '凭证类型', index: 'vctypeLabel', width: 150 },
+ { title: '凭证类型', index: 'vctype', width: 150 },
{ title: '序号', index: 'invmoney', width: 150, format: _ => '1' },
{ title: '摘要', index: 'remarks', width: 300 },
{ title: '币种', index: 'currency', width: 100 },
diff --git a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts
index cc74c101..720d11d1 100644
--- a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts
+++ b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts
@@ -1,12 +1,11 @@
import { Component, OnInit, ViewChild, Type } from '@angular/core';
import { STComponent, STColumn, STChange } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFRadioWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
-import { ShipperBaseService } from '@shared';
+import { EAEnvironmentService, ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';
import { SystemService } from '../../services/system.service';
-import { environment } from '@env/environment';
@Component({
selector: 'app-sys-setting-components-announcement-message',
@@ -65,6 +64,7 @@ export class AnnouncementMessageComponent implements OnInit {
public service: SystemService,
private nzModalService: NzModalService,
public shipperservice: ShipperBaseService,
+ private envSrv: EAEnvironmentService,
) {}
ngOnInit(): void {
@@ -126,9 +126,9 @@ export class AnnouncementMessageComponent implements OnInit {
type: 'string',
title: '发布平台',
enum: [
- { label: '运营后台', value: environment.appId },
- { label: '货主后台', value: 2 },
- { label: '司机端', value: 3 }
+ { label: '运营后台', value: this.envSrv.env.appId },
+ // { label: '货主后台', value: this.envSrv.env.HzappId },
+ // { label: '司机端', value: this.envSrv.env.sjappId }
],
ui: {
widget: 'select',
diff --git a/src/environments/environment.service.ts b/src/environments/environment.service.ts
index a0cafad7..49800234 100644
--- a/src/environments/environment.service.ts
+++ b/src/environments/environment.service.ts
@@ -1,8 +1,8 @@
/*
* @Author: Maple
* @Date: 2021-03-22 09:50:07
- * @LastEditors: Do not edit
- * @LastEditTime: 2021-05-27 11:37:17
+ * @LastEditors : Shiming
+ * @LastEditTime : 2022-01-20 16:54:57
* @Description:全局环境服务
*/
import { Injectable } from '@angular/core';
@@ -11,8 +11,12 @@ import { Injectable } from '@angular/core';
providedIn: 'root',
})
export class EnvironmentService {
- // 应用ID
+ // 运多星运营管理后台应用ID
private appId = `5800BF51DC9A494489700F09E3B81520`;
+ // 运多星货主后台应用ID
+ private HzappId = `A48F72F0A304427F921794BAD86B3522`;
+ // 运多星司机应用ID
+ private sjappId = `AB5EDFE8A46D46EBA69F2CBB6C94D226`;
// 租户ID
private tenantId = `1352892699355607041`;
private env: { appId: string; tenantId: string } = { appId: this.appId, tenantId: this.tenantId };