From a0d9718eaa14026d7b81e9207a39de6e577a374d Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 13 May 2022 14:48:04 +0800
Subject: [PATCH 1/4] fix bug

---
 proxy.conf.js                                                 | 4 ++--
 .../receivable-order-detail.component.ts                      | 2 +-
 .../partner/recorded/components/detail/detail.component.html  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/proxy.conf.js b/proxy.conf.js
index b9ef4924..e671177b 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-05-13 13:38:02
+ * @LastEditTime : 2022-05-13 14:44:24
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -30,7 +30,7 @@ module.exports = {
   // },
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },
diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts
index 807bf227..05e30c19 100644
--- a/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts
+++ b/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts
@@ -142,7 +142,7 @@ export class ReceivableOrderDetailComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '序号', render: 'no', width: 80 },
-      { title: '费用号', index: 'feeLId', width: 100 },
+      { title: '费用号', index: 'feeHCode', width: 100 },
       { title: '费用日期', index: 'feedate', type: 'date', width: 150 },
       { title: '订单号', index: 'billHCode', width: 100 },
       // { title: '订单日期', index: 'billTime', width: 150 },
diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.html b/src/app/routes/partner/recorded/components/detail/detail.component.html
index a3421887..5bcfb26c 100644
--- a/src/app/routes/partner/recorded/components/detail/detail.component.html
+++ b/src/app/routes/partner/recorded/components/detail/detail.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-05 20:15:41
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-11 15:06:17
+ * @LastEditTime : 2022-05-13 14:21:37
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\recorded\\components\\detail\\detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->

From 5fb03736c1d707d70ec251f0a814aab3366b513e Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 13 May 2022 14:50:07 +0800
Subject: [PATCH 2/4] fix bug

---
 .../partner/channel-sales/components/edit/edit.component.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
index 379832fb..adddf086 100644
--- a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
+++ b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
@@ -222,7 +222,7 @@ export class ParterChannelSalesEditComponent implements OnInit {
     delete params.telephone;
     this.service.request(this.service.$api_save, { ...params, employeeVO: this.currentOAItem }).subscribe(res => {
       if (res) {
-        this.service.msgSrv.success(res.msg);
+        this.service.msgSrv.success('新增成功！');
         this.modalRef.destroy(true);
       }
     });

From f6759047b9a90d52828f092f705fd964e9bc6efb Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 13 May 2022 14:56:04 +0800
Subject: [PATCH 3/4] fix bug

---
 .../vehicle/components/list/detail/detail.component.html  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 a449da5a..9ec011b5 100644
--- a/src/app/routes/vehicle/components/list/detail/detail.component.html
+++ b/src/app/routes/vehicle/components/list/detail/detail.component.html
@@ -48,12 +48,12 @@
           </nz-select>
         </sv>
         <sv label="车辆类型">
-          <!-- <input nz-input type="text" [(ngModel)]="detailData.carModel" [readonly]="!isEdit" [nzBorderless]="!isEdit"
-            [placeholder]="isEdit?'':'-'"> -->
-          <nz-select [(ngModel)]="detailData.carModel ? detailData.carModel : detailData.carModelLabel"
+          <input nz-input type="text" [(ngModel)]="detailData.carModel ? detailData.carModel : detailData.carModelLabel" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+          [placeholder]="isEdit ? '' : '-'" />
+          <!-- <nz-select *ngIf="detailData.carModel ? detailData.carModel : detailData.carModelLabel" [(ngModel)]="detailData.carModel ? detailData.carModel : detailData.carModelLabel"
             [nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit" [nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
             <nz-option *ngFor="let i of contencarModel" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
-          </nz-select>
+          </nz-select> -->
         </sv>
         <sv label="车长(米)">
           <!-- <input nz-input type="text" [(ngModel)]="detailData.carLength" [readonly]="!isEdit" [nzBorderless]="!isEdit"

From f5b57e40c048db4c74c334c54e9451ecbcd67749 Mon Sep 17 00:00:00 2001
From: weiyu <weiyu.wei@eascs.com>
Date: Fri, 13 May 2022 14:58:48 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/billing-order/billing-order.component.ts     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
index beaf5437..4b8f42ba 100644
--- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
+++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
@@ -1,7 +1,7 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
-import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
-import { SFComponent, SFSchema, SFDateWidgetSchema, SFSelectWidgetSchema } from '@delon/form';
+import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st';
+import { SFSchema, SFDateWidgetSchema } from '@delon/form';
 import { SearchDrawerService } from '@shared';
 import { BasicTableComponent } from 'src/app/routes/commom';
 import { TicketService } from '../../services/ticket.service';