From bb5006f723b00964f7a55326d4e08133e901e1a1 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 12 Jan 2022 10:20:32 +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/bulk/bulk.component.html       | 11 ++++---
 .../freight/user/user.component.html          |  9 ++++--
 .../components/freight/user/user.component.ts | 29 ++++++++++++++++---
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.html b/src/app/routes/supply-management/components/bulk/bulk.component.html
index 696ada23..541ca788 100644
--- a/src/app/routes/supply-management/components/bulk/bulk.component.html
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-05 15:37:53
+ * @LastEditTime: 2022-01-12 10:19:05
  * @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\supply-management\components\bulk\bulk.component.html
@@ -87,15 +87,14 @@
           (<span [ngStyle]="{ color:item?.count>0?'#1890FF':''}">{{item?.count}}</span>)
         </div>
       </ng-template>
+      <ng-template st-row="goodsInfos" let-item let-index="index">
+        <div>{{item?.goodsInfos?.goodsName}}</div>
+        <div>货源：{{item?.goodsInfos?.goodsResource}}</div>
+      </ng-template>
       <ng-template st-row="useCarDemand" let-item let-index="index">
         <div>车型: {{item.carModelLabel}}</div>
         <div class="error">车长: {{item.expand}} 米</div>
       </ng-template>     
-       <ng-template st-row="goodsInfo" let-item let-index="index">
-        <div>{{item.owner}}</div>
-        <div>货源：{{item.progress}} 顿 / {{item.progress}} 方</div>
-        <div class="error">剩余: {{item.progress}} 顿 / {{item.progress}} 方</div>
-      </ng-template>
       <ng-template st-row="demand" let-item let-index="index">
         <div>车型: {{item.progress}}</div>
         <div class="error">车长: {{item.progress}} 米</div>
diff --git a/src/app/routes/usercenter/components/freight/user/user.component.html b/src/app/routes/usercenter/components/freight/user/user.component.html
index 3097fea8..3c615fcd 100644
--- a/src/app/routes/usercenter/components/freight/user/user.component.html
+++ b/src/app/routes/usercenter/components/freight/user/user.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-13 10:47:28
- * @LastEditTime: 2021-12-13 11:24:23
+ * @LastEditTime: 2022-01-12 09:58:12
  * @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\user\user.component.html
@@ -31,7 +31,12 @@
 <nz-card>
   <!-- 数据列表 -->
   <!-- [data]="service.$api_get_supplier_page" -->
-
+  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
+    <nz-tab [nzTitle]="'全部'"></nz-tab>
+    <nz-tab [nzTitle]="'待审核'"></nz-tab>
+    <nz-tab [nzTitle]="'通过'"></nz-tab>
+    <nz-tab [nzTitle]="'驳回'"></nz-tab>
+  </nz-tabset>
   <st #st  [columns]="columns" [data]='service.$api_get_user_list'
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
diff --git a/src/app/routes/usercenter/components/freight/user/user.component.ts b/src/app/routes/usercenter/components/freight/user/user.component.ts
index 0cb8544a..4bfc491e 100644
--- a/src/app/routes/usercenter/components/freight/user/user.component.ts
+++ b/src/app/routes/usercenter/components/freight/user/user.component.ts
@@ -19,6 +19,7 @@ export class FreightComponentsUserComponent implements OnInit {
 
   @ViewChild('promoterModal', { static: false })
   promoterModal!: any;
+  resourceStatus: any;
   promotersTelephone = '';
 
   constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
@@ -27,7 +28,17 @@ export class FreightComponentsUserComponent implements OnInit {
    * 查询参数
    */
   get reqParams() {
+    const a:any = {};
+    console.log(this.resourceStatus)
+    if(this.resourceStatus === 1) {
+      a.certificationStatus = 0
+    } else if(this.resourceStatus === 2) {
+      a.certificationStatus = 1
+    } else if(this.resourceStatus === 3) {
+      a.certificationStatus = 2
+    }
     const params: any = {
+      ...a,
       ...(this.sf && this.sf.value)
     };
     if (this.sf?.value.effectiveDate) {
@@ -54,7 +65,16 @@ export class FreightComponentsUserComponent implements OnInit {
       this.st?.load(1);
     });
   }
-
+  selectChange(e: number) {
+    console.log(e);
+    if(e>=1) {
+    this.resourceStatus = e;
+    }
+    this.initST();
+    setTimeout(() => {
+      this.st.load();
+    }, 500);
+  }
   addPromoter(item?: any) {
     this.promotersTelephone = item?.promotersTelephone;
     const modal = this.modal.create({
@@ -155,13 +175,14 @@ export class FreightComponentsUserComponent implements OnInit {
             placeholder: '请输入'
           }
         },
-        stateLocked: {
+        certificationStatus: {
           type: 'string',
           title: '状态',
           enum: [
             { label: '全部', value: '' },
-            { label: '正常', value: 0 },
-            { label: '冻结', value: 1 }
+            { label: '待审核', value: 0 },
+            { label: '正常', value: 1 },
+            { label: '冻结', value: 2 }
           ],
           default: '',
           ui: {