From ba4d1e9217ba3335028cd46732c2605bee5fb1b0 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 20 Jan 2022 17:45:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 proxy.conf.js                                              | 4 ++--
 .../components/receipt-order/receipt-order.component.ts    | 2 +-
 .../announcement-message/announcement-message.component.ts | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/proxy.conf.js b/proxy.conf.js
index e6c40845..5b6c3bf8 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 17:01:32
+ * @LastEditTime : 2022-01-20 17:31:54
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -20,7 +20,7 @@ module.exports = {
   // }
   '//api': {
     target: {
-      host: 'tms-api-test.eascs.com',
+      host: 'tms-api-dev.eascs.com',
       protocol: 'https:',
       port: 443
     },
diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts
index 7a226bdc..4311cee7 100644
--- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts
+++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts
@@ -223,7 +223,7 @@ export class ReceiptOrderComponent implements OnInit {
     return [
       { title: '', index: 'key', type: 'checkbox', width: 60, fixed: 'left', className: 'text-center' },
       { title: '收款单号', index: 'brmcode', type: 'link', width: 180, className: 'text-left' },
-      { title: '网络货运人', index: 'ltdId', width: 200, className: 'text-left' },
+      { title: '网络货运人', index: 'ltdName', width: 200, className: 'text-left' },
       { title: '到账日期', index: 'brmdate', type: 'date', width: 200, className: 'text-left' },
       { title: '收款账户', index: 'ltdaccountId', width: 200, className: 'text-left' },
       {
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 720d11d1..9d311fd3 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
@@ -30,7 +30,6 @@ export class AnnouncementMessageComponent implements OnInit {
 
   columns: STColumn[] = [
     { title: '公告标题', index: 'announcementTitle' },
-    { title: '发布平台', index: 'appName' },
     { title: '创建时间', index: 'createTime' },
     { title: '发送时间', index: 'sendTime' },
     { title: '公告内容', index: 'announcementContent' },
@@ -166,7 +165,7 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
       this.editText = '新增';
       this.formData = {};
     } else {
-      this.service.request(this.service.$api_getButtonInfo_one, {id: value.id}).subscribe((res: any) => {
+      this.service.request(this.service.$api_getAnnouncementInfoById_detail, {id: value.id}).subscribe((res: any) => {
         console.log(res)
         if(res) {
           this.formData = res;
@@ -230,7 +229,7 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
     if(this.editId) {
       params.id = this.editId
       console.log(params)
-      this.service.request(this.service.$api_addAnnouncementInfo, params).subscribe((res:any) => {
+      this.service.request(this.service.$api_modifyAnnouncementInfo, params).subscribe((res:any) => {
         if(res) {
          this.service.msgSrv.success('保存成功！')
          this.isVisible = false
@@ -238,7 +237,7 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
         }
       })
     } else {
-      this.service.request(this.service.$api_modifyAnnouncementInfo, params).subscribe((res:any) => {
+      this.service.request(this.service.$api_addAnnouncementInfo, params).subscribe((res:any) => {
         if(res) {
          this.service.msgSrv.success('保存成功！')
          this.isVisible = false