From 928a6236602a2b5440e253c8de39ccf132536c41 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 11 Jan 2022 13:59:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/audit/audit.component.ts       | 12 +----
 .../components/list/list.component.html       |  7 ++-
 .../vehicle/components/list/list.component.ts | 26 +++++++++-
 .../abnormal-appear.component.html            | 49 ++++++++++++-------
 .../abnormal-appear.component.ts              | 23 ++++-----
 5 files changed, 73 insertions(+), 44 deletions(-)

diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts
index e5a0c8e1..5b3a9f35 100644
--- a/src/app/routes/vehicle/components/audit/audit.component.ts
+++ b/src/app/routes/vehicle/components/audit/audit.component.ts
@@ -109,8 +109,8 @@ export class VehicleComponentsAuditComponent implements OnInit {
           type: 'string',
           title: '是否挂靠',
           enum: [
-            { label: '是', value: true },
-            { label: '否', value: false },
+            { label: '是', value: 1 },
+            { label: '否', value: 0 },
           ],
           ui: {
             widget: 'select',
@@ -119,15 +119,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
         saveUser: {
           type: 'string',
           title: '录入人员',
-          enum: [
-            { label: '全部', value: '' },
-            { label: '正常', value: 0 },
-            { label: '冻结', value: 1 },
-            { label: '废弃', value: 2 },
-          ],
-          default: '',
           ui: {
-            widget: 'select',
             visibleIf: {
               expand: (value: boolean) => value,
             },
diff --git a/src/app/routes/vehicle/components/list/list.component.html b/src/app/routes/vehicle/components/list/list.component.html
index dbbd6c87..31bbdd7c 100644
--- a/src/app/routes/vehicle/components/list/list.component.html
+++ b/src/app/routes/vehicle/components/list/list.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-12-17 17:29:51
+ * @LastEditTime: 2022-01-11 13:36:02
  * @LastEditors: Please set LastEditors
  * @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
@@ -67,6 +67,11 @@
           {{ item?.isSelf ? '是' : '否' }}
       </div>
     </ng-template>
+    <ng-template st-row="putOnRecord" let-item let-index="index">
+        <div>
+          {{ item?.putOnRecord ? '是' : '否' }}
+      </div>
+    </ng-template>
     <ng-template st-row="approvalAuditStatus" let-item let-index="index">
       <div>
         <span *ngIf="item?.auditStatusEnum === -1 || item?.auditStatusEnum === '-1' && item?.isSelf">未上传</span>
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts
index 1d465cf2..19d1c30b 100644
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@@ -156,8 +156,8 @@ export class VehicleComponentsListComponent implements OnInit {
           type: 'string',
           title: '是否挂靠',
           enum: [
-            { label: '是', value: true },
-            { label: '否', value: false },
+            { label: '是', value: 1 },
+            { label: '否', value: 0 },
           ],
           ui: {
             widget: 'select',
@@ -197,6 +197,20 @@ export class VehicleComponentsListComponent implements OnInit {
             },
           },
         },
+        // putOnRecord: {
+        //   type: 'string',
+        //   title: '是否已备案',
+        //   enum: [
+        //     { label: '是', value: 1 },
+        //     { label: '否', value: 0 },
+        //   ],
+        //   ui: {
+        //     widget: 'select',
+        //     visibleIf: {
+        //       expand: (value: boolean) => value,
+        //     },
+        //   },
+        // },
       },
     };
     this.ui = { '*': { spanLabelFixed: 130, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
@@ -240,6 +254,7 @@ export class VehicleComponentsListComponent implements OnInit {
       { title: '所有人', className: 'text-center', index: 'carOwner' },
       { title: '是否挂靠', className: 'text-center', render: 'isSelf', },
       { title: '挂靠协议', className: 'text-center', render: 'approvalAuditStatus' },
+      // { title: '是否已备案', className: 'text-center', render: 'putOnRecord', },
 
       {
         title: '操作',
@@ -253,6 +268,13 @@ export class VehicleComponentsListComponent implements OnInit {
               // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
             },
           },
+          // {
+          //   text: '申请备案',
+          //   click: (item) => {
+              
+           
+          //   },
+          // },
         ],
       },
     ];
diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
index f2586444..460b7533 100644
--- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
+++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-24 15:38:08
- * @LastEditTime: 2022-01-05 21:02:17
+ * @LastEditTime: 2022-01-10 21:03:37
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\sys-setting\components\crm-management\crm-management.component.html
@@ -39,21 +39,34 @@
 
 <nz-card class="content-box">
 
-    <div class="d-flex justify-content-end mb-sm">
-        <div>
-            <button nz-button nzType="primary" (click)="roleAction('',1)" >新增CRM客户</button>
-        </div>
-    </div>
-    <st #st [data]="service.$api_get_crmCustomer_page" [columns]="columns"
-        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-        [loading]="service.http.loading" [scroll]="{ y: '370px' }" (change)="stChange($event)">
-        <ng-template st-row="customerType" let-item let-index="index">
-            <div>
-              <span *ngIf="item?.customerType == 1">客户</span>
-              <span *ngIf="item?.customerType == 2">供应商</span>
-            </div>
-          </ng-template>
-    </st>
+  <nz-tabset>
+    <nz-tab nzTitle="费用明细">
+      <st #st [data]="service.$api_get_crmCustomer_page" [columns]="columns"
+      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+      [loading]="service.http.loading" [scroll]="{ y: '370px' }" (change)="stChange($event)">
+      <ng-template st-row="customerType" let-item let-index="index">
+          <div>
+            <span *ngIf="item?.customerType == 1">客户</span>
+            <span *ngIf="item?.customerType == 2">供应商</span>
+          </div>
+        </ng-template>
+  </st>
+    </nz-tab>
+    <nz-tab nzTitle="开票信息">
+      <st #st [data]="service.$api_get_crmCustomer_page" [columns]="columns"
+      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+      [loading]="service.http.loading" [scroll]="{ y: '370px' }" (change)="stChange($event)">
+      <ng-template st-row="customerType" let-item let-index="index">
+          <div>
+            <span *ngIf="item?.customerType == 1">客户</span>
+            <span *ngIf="item?.customerType == 2">供应商</span>
+          </div>
+        </ng-template>
+  </st>
+    </nz-tab>
+  </nz-tabset>
 </nz-card>
diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
index 679faf2f..0c5002fa 100644
--- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
+++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
@@ -26,19 +26,16 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
   editId = false;
 
   columns: STColumn[] = [
-    { title: '运单编号', index: 'customerName' },
-    { title: '司机', index: 'customerShortName' },
-    { title: '异常类型', index: 'customerCode' },
-    { title: '异常内容', index: 'customerCode' },
-    {
-      title: '操作',
-      buttons: [
-        {
-          text: '编辑',
-          click: item => this.roleAction(item, 2)
-        },
-      ]
-    }
+    { title: '异常编号', index: 'customerName' },
+    { title: '关联运单号', index: 'customerName' },
+    { title: '网络货运人', index: 'customerName' },
+    { title: '货主', index: 'customerName' },
+    { title: '装货地', index: 'customerName' },
+    { title: '卸货地', index: 'customerName' },
+    { title: '承运司机', index: 'customerName' },
+    { title: '异常信息', index: 'customerName' },
+    { title: '异常图片', index: 'customerName' },
+    { title: '上报时间', index: 'customerName' },
   ];
 
   selectedRows: any[] = [];