From e8d0bb8d35834db4ebdd17dd1eedd5ae6d076f05 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 26 Jan 2022 15:34:27 +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 +-
 .../payment-order/payment-order.component.ts  |  2 +-
 .../components/list/list.component.html       | 53 ++++++++++++-------
 3 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/proxy.conf.js b/proxy.conf.js
index 9fc3f420..d4fb1d75 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-26 09:41:06
+ * @LastEditTime : 2022-01-26 15:15:37
  * @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/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
index 1a03eb4e..9c73b74a 100644
--- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
+++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
@@ -239,7 +239,7 @@ export class PaymentOrderComponent implements OnInit {
       },
       { title: '付款类型', index: 'payType', width: 130 },
       { title: '付款方式', index: 'payModeLabel', width: 130 },
-      { title: '结算客户', index: 'shipperId', width: 160 },
+      { title: '结算客户', index: 'cnoName', width: 160 },
       { title: '收款人', index: 'hrToLabel', width: 150 },
       { title: '应付已核销', index: 'ishrhxLabel', width: 150 },
       { title: '确认日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
diff --git a/src/app/routes/vehicle/components/list/list.component.html b/src/app/routes/vehicle/components/list/list.component.html
index 651c90cf..618b5ffd 100644
--- a/src/app/routes/vehicle/components/list/list.component.html
+++ b/src/app/routes/vehicle/components/list/list.component.html
@@ -1,10 +1,10 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2022-01-13 15:35:25
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2022-01-26 15:31:03
+ * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\list.component.html
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\vehicle\\components\\list\\list.component.html
 -->
 <!-- 页头 -->
 <page-header-wrapper></page-header-wrapper>
@@ -16,9 +16,17 @@
       <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
     </div>
     <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
-      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
-      <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportFire()" acl
-        [acl-ability]="'VEHICLE-LIST-view'">导出</button>
+      <button
+        nz-button
+        nzType="primary"
+        acl
+        [acl-ability]="['VEHICLE-LIST-search']"
+        [nzLoading]="service.http.loading"
+        (click)="st?.load(1)"
+        >查询</button>
+      <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportFire()" acl [acl-ability]="'VEHICLE-LIST-view'"
+        >导出</button
+      >
       <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
       <button nz-button nzType="link" (click)="expandToggle()">
         {{ !_$expand ? '展开' : '收起' }}
@@ -31,14 +39,23 @@
   <!-- 数据列表 -->
   <!-- [data]="service.$api_get_supplier_page" -->
 
-  <st #st [bordered]="true" [scroll]="{ x: '1200px' }" [columns]="columns" [data]='service.$api_get_operate_list'
+  <st
+    #st
+    [bordered]="true"
+    [scroll]="{ x: '1200px' }"
+    [columns]="columns"
+    [data]="service.$api_get_operate_list"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }"
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-    [loading]="service.http.loading">
+    [loading]="service.http.loading"
+  >
     <ng-template st-row="carLength" let-item let-index="index">
-      <div>{{item?.carModelLabel }}-{{item?.carLengthLabel? item?.carLengthLabel + '米' : ''}}-{{ item?.carLoad?
-        item?.carLoad + '吨' : ''}}</div>
+      <div
+        >{{ item?.carModelLabel }}-{{ item?.carLengthLabel ? item?.carLengthLabel + '米' : '' }}-{{
+          item?.carLoad ? item?.carLoad + '吨' : ''
+        }}</div
+      >
     </ng-template>
     <ng-template st-row="isSelf" let-item let-index="index">
       <div>
@@ -52,13 +69,13 @@
     </ng-template>
     <ng-template st-row="approvalAuditStatus" let-item let-index="index">
       <div>
-        <span *ngIf="item?.approvalAuditStatus === -1 || item?.approvalAuditStatus === '-1' && item?.isSelf">未上传</span>
-        <span *ngIf="item?.approvalAuditStatus === 0 || item?.approvalAuditStatus === '0' && item?.isSelf">草稿</span>
-        <span *ngIf="item?.approvalAuditStatus === 10 || item?.approvalAuditStatus === '10' && item?.isSelf">待审核</span>
-        <span *ngIf="item?.approvalAuditStatus === 15 || item?.approvalAuditStatus === '15' && item?.isSelf">已撤销</span>
-        <span *ngIf="item?.approvalAuditStatus === 20 || item?.approvalAuditStatus === '20' && item?.isSelf">已审核</span>
-        <span *ngIf="item?.approvalAuditStatus === 30 || item?.approvalAuditStatus === '30' && item?.isSelf">已驳回</span>
-        <span *ngIf="item?.approvalAuditStatus === 40 || item?.approvalAuditStatus === '40' && item?.isSelf">证件过期</span>
+        <span *ngIf="item?.approvalAuditStatus === -1 || (item?.approvalAuditStatus === '-1' && item?.isSelf)">未上传</span>
+        <span *ngIf="item?.approvalAuditStatus === 0 || (item?.approvalAuditStatus === '0' && item?.isSelf)">草稿</span>
+        <span *ngIf="item?.approvalAuditStatus === 10 || (item?.approvalAuditStatus === '10' && item?.isSelf)">待审核</span>
+        <span *ngIf="item?.approvalAuditStatus === 15 || (item?.approvalAuditStatus === '15' && item?.isSelf)">已撤销</span>
+        <span *ngIf="item?.approvalAuditStatus === 20 || (item?.approvalAuditStatus === '20' && item?.isSelf)">已审核</span>
+        <span *ngIf="item?.approvalAuditStatus === 30 || (item?.approvalAuditStatus === '30' && item?.isSelf)">已驳回</span>
+        <span *ngIf="item?.approvalAuditStatus === 40 || (item?.approvalAuditStatus === '40' && item?.isSelf)">证件过期</span>
         <span *ngIf="!item?.isSelf">-</span>
       </div>
     </ng-template>
@@ -67,4 +84,4 @@
       <nz-tag *elseBlock nzColor="success">正常</nz-tag>
     </ng-template>
   </st>
-</nz-card>
\ No newline at end of file
+</nz-card>