From a4e402fea6a7ea05c76cdcb174fad0fa7563fa57 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 25 Jan 2022 13:10:45 +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

---
 .../receipt-order/receipt-order.component.ts           |  2 +-
 .../receivable-order/receivable-order.component.ts     |  2 +-
 .../freight-people/freight-people.component.html       |  4 ++--
 .../vehicle/freight-people/freight-people.component.ts | 10 +++++++---
 4 files changed, 11 insertions(+), 7 deletions(-)

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 8fcbb0fe..d468ea7b 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
@@ -256,7 +256,7 @@ export class ReceiptOrderComponent implements OnInit {
       { title: '付款人', index: 'artoname', width: 200, className: 'text-left' },
       { title: '银行水单', index: 'bankreceipt', width: 200, className: 'text-left' },
       { title: '创建时间', index: 'createTime', type: 'date', width: 200, className: 'text-left' },
-      { title: '创建人', index: 'createUserId', width: 150, className: 'text-left' },
+      { title: '创建人', index: 'createUserName', width: 150, className: 'text-left' },
       { title: '收款状态', index: 'stsLabel', width: 200, className: 'text-left' },
       { title: '收款备注', index: 'remarks', width: 200, className: 'text-left' },
       {
diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
index 876fcce9..e1e49644 100644
--- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
+++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
@@ -238,7 +238,7 @@ export class ReceivableOrderComponent implements OnInit {
     return [
       { title: '', index: 'key', type: 'checkbox' },
       { title: '核销单号', index: 'ahxcode', type: 'link', width: 140 },
-      { title: '网络货运人', index: 'ltdId', width: 140 },
+      { title: '网络货运人', index: 'ltdName', width: 140 },
       { title: '核销日期', index: 'ahxdate', type: 'date', width: 160 },
       { title: '付款账户', index: 'shipperaccount', width: 120 },
       { title: '收款账户', index: 'ltdaccount', width: 120 },
diff --git a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.html b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.html
index 3facc950..9e2db533 100644
--- a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.html
+++ b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-29 16:48:16
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:22:24
+ * @LastEditTime : 2022-01-24 20:18:38
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\freight-people\\freight-people.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -12,5 +12,5 @@
 <sf style="margin-top: 15px" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
 <div class="modal-footer">
   <button nz-button type="button" (click)="close()">关闭</button>
-  <button nz-button type="submit" nzType="primary" (click)="save(sf?.value)" [disabled]="sf?.valid">确定</button>
+  <button nz-button type="submit" nzType="primary" (click)="save(sf?.value)" >确定</button>
 </div>
diff --git a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts
index e943dd48..186d9e9d 100644
--- a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-29 16:48:16
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:22:37
+ * @LastEditTime : 2022-01-24 20:19:31
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\freight-people\\freight-people.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -57,7 +57,7 @@ export class VehicleFreightPeopleComponent implements OnInit {
           }
         }
       },
-      required: ['enterpriseInfoName']
+      required: ['enterpriseInfoId']
     };
     this.ui = {
       '*': {
@@ -69,9 +69,13 @@ export class VehicleFreightPeopleComponent implements OnInit {
 
   save(value: any): void {
     console.log(this.sf.value);
+    if(!this.sf.valid) {
+      this.service.msgSrv.error("请选择网络货运人！")
+      return;
+    }
     const params = {
       billIds: this.data?.ids,
-      enterpriseInfoId: this.sf.value?.enterpriseInfoName
+      enterpriseInfoId: this.sf.value?.enterpriseInfoId
     };
     console.log(params);
     this.service.request(this.service.$api_set_updateEnterpriseInfoBatch, params).subscribe((res: any) => {