Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html

@@ -1,15 +1,17 @@
-<page-header-wrapper [title]="'交易流水'">
+<page-header-wrapper [title]="'交易流水'"> </page-header-wrapper>
-</page-header-wrapper>
 
 <nz-card class="search-box" nzBordered>
   <div nz-row nzGutter="8">
     <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-            <sf #sf [schema]="searchSchema"
+      <sf
-                [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24,gutter:15 } }}"
+        #sf
-                [compact]="true" [button]="'none'"></sf>
+        [schema]="searchSchema"
+        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 15 } } }"
+        [compact]="true"
+        [button]="'none'"
+      ></sf>
     </div>
-        <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
+    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
-            class="text-right">
       <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
       <button nz-button> 导出</button>
@@ -22,10 +24,18 @@
 </nz-card>
 
 <nz-card class="content-box pt-xl" nzBordered>
-
+  <st
-    <st #st [data]="service.$api_get_account_blance" [columns]="columns"
+    #st
+    [data]="service.$api_get_account_blance"
+    [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
     [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]="{ x:'1200px',y: '450px' }"></st>
+    [loading]="service.http.loading"
+    [scroll]="{ x: '1200px', y: '450px' }"
+  >
+  <ng-template st-row="amount">
+
+  </ng-template>
+</st>
 </nz-card>

src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts

@@ -4,11 +4,13 @@ import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { FreightAccountService } from '../../services/freight-account.service';
+import { CurrencyPipe } from '@angular/common';
 
 @Component({
   selector: 'app-transaction-flow',
   templateUrl: './transaction-flow.component.html',
-  styleUrls: ['./transaction-flow.component.less']
+  styleUrls: ['./transaction-flow.component.less'],
+  providers: [CurrencyPipe]
 })
 export class TransactionFlowComponent implements OnInit {
   @ViewChild('st', { static: true })
@@ -20,7 +22,12 @@ export class TransactionFlowComponent implements OnInit {
 
   _$expand = false;
 
-  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
+  constructor(
+    public service: FreightAccountService,
+    private nzModalService: NzModalService,
+    private router: Router,
+    private currencyPipe: CurrencyPipe
+      ) {}
 
   ngOnInit(): void {}
 
@@ -214,8 +221,17 @@ export class TransactionFlowComponent implements OnInit {
       { title: '账户名称', index: 'roleName', width: 100 },
       { title: '所属项目', index: 'projectName', width: 100 },
       { title: '收支类型', index: 'incomeTypeLabel', width: 100 },
-      { title: '交易金额', index: 'amount', width: 100 },
+      { title: '交易金额',
-      { title: '账户余额', index: 'accountBalance', width: 100 },
+        index: 'amount',
+        width: 100,
+        type: 'currency',
+        format: item => `${this.currencyPipe.transform(item.amount)}`
+       },
+      { title: '账户余额',
+        type: 'currency',
+        width: 150,
+        format: item => `${this.currencyPipe.transform(item.accountBalance)}`
+       },
       { title: '网络货运人', index: 'ltdName', width: 120 },
       { title: '银行类型', index: 'bankTypeLabel', width: 100 },
       { title: '银行流水号', index: 'channelPaySn', width: 120 },

src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html

@@ -1,3 +1,11 @@
+<!--
+ * @Author: your name
+ * @Date: 2022-01-05 20:15:41
+ * @LastEditTime: 2022-01-17 14:41:17
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\financial-management\components\withdrawals-record\withdrawals-detail\withdrawals-detail.component.html
+-->
 <page-header-wrapper [title]="'提现详情'" [logo]="logo">
     <ng-template #logo>
         <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
@@ -39,7 +47,7 @@
         <se label="提现至银行卡">
             {{formData?.bankId}}
         </se>
-        <se label="银行回" col="1">
+        <se label="银行回单" col="1">
             <img [src]="formData?.bankCardNumber" alt="" style="width: 200px;height: 160px;">
         </se>
     </div>

src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html

@@ -173,7 +173,7 @@
 <nz-card nzTitle="补充信息">
   <sv-container>
     <sv label="是否回单">
-      {{ i?.supplementaryInformationVO?.stateReceipt === 1 ? '是' : '否' }}
+      {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
     </sv>
     <sv label="回单类型">
       {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}

src/app/routes/order-management/components/bulk/bulk.component.html

@@ -156,7 +156,15 @@
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeViewParams }"
     [res]="{ reName: { list: 'data.list', total: 'data.total' } }"
   >
-  
+  <ng-template st-row="amountBeforeChange" let-item let-index="index">
+    {{ item.amountBeforeChange | currency}}
+  </ng-template>
+  <ng-template st-row="amountchangeValue" let-item let-index="index">
+    ￥{{ item.amountchangeValue | number: '0.2-2'}}
+  </ng-template>
+  <ng-template st-row="amountAfterChange" let-item let-index="index">
+    {{ item.amountAfterChange | currency}}
+  </ng-template>
   </st>
   <div><span>变更原因：{{ViewCause?.changeCause}}</span></div>
   <div><span>拒绝原因：{{ViewCause?.refuseCause}}</span></div>

src/app/routes/order-management/components/bulk/bulk.component.ts

@@ -168,7 +168,24 @@ tabs = {
         },
         shipperAppUserId: {
           type: 'string',
-          title: '货主'
+          title: '货主',
+          ui: {
+            widget: 'select',
+            serverSearch: true,
+            searchDebounceTime: 300,
+            searchLoadingText: '搜索中...',
+            onSearch: (q: any) => {
+              console.log(q)
+              if (!!q) {
+                return this.service
+                  .request(this.service.$api_enterpriceList, { enterpriseName: q})
+                  .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
+                  .toPromise();
+              } else {
+                return of([]);
+              }
+            },
+          } as SFSelectWidgetSchema,
         },
         loadingPlace: {
           type: 'string',
@@ -200,7 +217,7 @@ tabs = {
               if (!!q) {
                 return this.service
                   .request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 })
-                  .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum))))
+                  .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.appUserId } as SFSchemaEnum))))
                   .toPromise();
               } else {
                 return of([]);
@@ -301,7 +318,7 @@ tabs = {
             },
           },
         },
-        enterpriseInfoName: {
+        enterpriseInfoId: {
           type: 'string',
           title: '网络货运人',
           ui: {
@@ -327,7 +344,7 @@ tabs = {
         //     asyncData: () => this.getCatalogueMember(),
         //   },
         // },
-        goodsTypeId: {
+        goodsNameId: {
           type: 'string',
           title: '货物名称',
           ui: {
@@ -571,10 +588,20 @@ tabs = {
         title: '变更前',
         width: '100px',
         className: 'text-center',
-        index: 'amountAfterChange'
+        index: 'amountAfterChange',
+        render: 'amountAfterChange'
       },
-      { title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center' },
+      { title: '变更值',
-      { title: '变更后', index: 'amountBeforeChange', width: '120px', className: 'text-center' }
+        index: 'amountchangeValue',
+        width: '120px', 
+        className: 'text-center',
+        render: 'amountchangeValue'
+       },
+      { title: '变更后',
+        index: 'amountBeforeChange',
+        render: 'amountBeforeChange',
+        width: '120px',
+        className: 'text-center' }
     ];
   }
   /**

src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2022-01-13 19:13:46
+ * @LastEditTime: 2022-01-17 15:01:35
  * @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\order-management\components\vehicle-detail\vehicle-detail.component.html

src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html

@@ -163,7 +163,7 @@
 <nz-card nzTitle="补充信息">
   <sv-container>
     <sv label="是否回单">
-      {{ i?.supplementaryInformationVO?.stateReceipt === 1 ? '是' : '否' }}
+      {{ i?.supplementaryInformationVO?.stateReceipt  ? '是' : '否' }}
     </sv>
     <sv label="回单类型">
       {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}

src/app/routes/order-management/components/vehicle/vehicle.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-14 14:11:40
+ * @LastEditTime: 2022-01-17 14:57:44
  * @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\vehicle\vehicle.component.html
@@ -159,6 +159,15 @@
     [req]="{ method: 'POST', allInBody: true, params: changeViewParams }"
     [res]="{ reName: { list: 'data.list', total: 'data.total' } }"
   >
+  <ng-template st-row="amountBeforeChange" let-item let-index="index">
+    {{ item.amountBeforeChange | currency}}
+  </ng-template>
+  <ng-template st-row="amountchangeValue" let-item let-index="index">
+    ￥{{ item.amountchangeValue | number: '0.2-2'}}
+  </ng-template>
+  <ng-template st-row="amountAfterChange" let-item let-index="index">
+    {{ item.amountAfterChange | currency}}
+  </ng-template>
   </st>
   <div><span>变更原因：{{ViewCause?.changeCause}}</span></div>
   <div><span>拒绝原因：{{ViewCause?.refuseCause}}</span></div>

src/app/routes/order-management/components/vehicle/vehicle.component.ts

@@ -213,7 +213,7 @@ resourceStatus: any;
               if (!!q) {
                 return this.service
                   .request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 })
-                  .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum))))
+                  .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.appUserId } as SFSchemaEnum))))
                   .toPromise();
               } else {
                 return of([]);
@@ -225,7 +225,7 @@ resourceStatus: any;
           } as SFSelectWidgetSchema
         },
 
-        carNo: {
+        plateNumber: {
           title: '车牌号',
           type: 'string',
           ui: {
@@ -274,12 +274,12 @@ resourceStatus: any;
             },
           } as SFSelectWidgetSchema,
         }, 
-        paymentstatus: {
+        paymentStatus: {
           title: '支付状态',
           type: 'string',
           ui: {
             widget: 'dict-select',
-            params: { dictKey: 'payment:status' },
+            params: { dictKey: 'bill:payexpense:status' },
             containAllLable:true,
             visibleIf: {
               _$expand: (value: boolean) => value,
@@ -327,15 +327,25 @@ resourceStatus: any;
             asyncData: () => this.service2.getNetworkFreightForwarder(),
           },
         },
-        goodsName: {
+        goodsNameId: {
           type: 'string',
           title: '货物名称',
           ui: {
+            widget: 'select',
             placeholder: '请选择',
+            errors: { required: '请选择货物类型' },
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
-          },
+            asyncData: () =>
+              this.service2.loadConfigByKey('goods.name.config.type').pipe(
+                map((data: any) => {
+                  return data[0].children?.map((m: any) => {
+                    return { label: m.name, value: m.id };
+                  });
+                })
+              ),
+          } as SFSelectWidgetSchema
         },
         serviceType: {
           title: '服务类型',
@@ -515,10 +525,19 @@ resourceStatus: any;
         title: '变更前',
         width: '100px',
         className: 'text-center',
-        index: 'amountAfterChange'
+        index: 'amountAfterChange',
+        render: 'amountAfterChange'
       },
-      { title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center' },
+      { title: '变更值',
-      { title: '变更后', index: 'amountBeforeChange', width: '120px', className: 'text-center' }
+        index: 'amountchangeValue',
+        render: 'amountchangeValue',
+        width: '120px',
+        className: 'text-center' },
+      { title: '变更后',
+        index: 'amountBeforeChange',
+        render: 'amountBeforeChange',
+        width: '120px',
+        className: 'text-center' }
     ];
   }
   /**

src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html

@@ -1,8 +1,8 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-14 14:03:07
- * @LastEditTime: 2021-12-22 20:04:15
+ * @LastEditTime: 2022-01-17 14:53:10
- * @LastEditors: your name
+ * @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\order-management\modal\bulk\update-freight\update-freight.component.html
 -->
@@ -11,7 +11,7 @@
 <nz-divider style="margin-top: 0;"></nz-divider>
 <div>
     <p style="font-size: 16px;">
-        <span style="font-weight: bolder">总运费：<span style="color: #dc112a">￥{{ data.totalFreight }}</span></span>
+        <span style="font-weight: bolder">总运费：<span style="color: #dc112a">{{ data.totalFreight | currency }}</span></span>
     </p>
-    <p style="margin-bottom: 0;"> 运输费：￥{{ data.freight }}，附加费：￥{{ data.surcharge }}</p>
+    <p style="margin-bottom: 0;"> 运输费：{{ data.freight | currency}}，附加费：{{ data.surcharge | currency }}</p>
 </div>

src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html

@@ -1,8 +1,8 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-15 13:17:42
- * @LastEditTime: 2022-01-13 13:35:08
+ * @LastEditTime: 2022-01-17 14:52:34
- * @LastEditors: your name
+ * @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\order-management\modal\vehicle\update-freight\update-freight.component.html
 -->
@@ -11,9 +11,9 @@
 <div>
   <p>
     <span style="font-weight: bolder"
-      >总运费：<span style="color: #dc112a">￥{{ data.totalFreight }}</span></span
+      >总运费：<span style="color: #dc112a">{{ data.totalFreight | currency }}</span></span
     >
-    （运输费：￥{{ data.freight }}，附加费：￥{{ data.surcharge }}）
+    （运输费：{{ data.freight | currency }}，附加费：{{ data.surcharge | currency}}）
   </p>
   <p>
     <label nz-checkbox [(ngModel)]="aggreechecked">确认已阅读并知晓<a>《变更协议》</a></label>

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-13 16:37:16
+ * @LastEditTime: 2022-01-17 14:29:40
  * @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
@@ -102,12 +102,12 @@
     </st>
   </div>
 </nz-card>
-<nz-modal [(nzVisible)]="isVisible"   [nzFooter]="nzModalFooter" nzTitle="货源审核" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('suppliersType')">
+<nz-modal [(nzVisible)]="isVisible"   [nzFooter]="nzModalFooter" nzTitle="货源审核" (nzOnCancel)="handleCancel('suppliersType')">
   <ng-container *nzModalContent>
     <div style="position: relative" *ngIf="auditMany">
       <nz-alert
         nzType="info"
-        [nzMessage]="'已选择' +  6 + '项'"
+        [nzMessage]="'已选择' +  selectedRows?.length + '项'"
         nzShowIcon
         [ngStyle]="{ margin: '0 0 1rem 0' }"
       >
@@ -117,14 +117,13 @@
     </sf>
   </ng-container>
   <ng-template #nzModalFooter>
-    <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">通过</button>
+    <button nz-button nzType="primary" (click)="handleOK(1)">通过</button>
-    <button nz-button nzType="default" (click)="handleCancel('suppliersType')">不通过</button>
+    <button nz-button nzType="default" (click)="handleOK(2)">不通过</button>
   </ng-template>
 </nz-modal>
-<ng-template #extraTemplate>
+<!-- <ng-template #extraTemplate>
   <div>
     <button (click)="audit('',2)" nz-button nzType="primary">批量审核</button>
     <button (click)="audit('')" nz-button nzType="primary">发布货源</button>
- 
   </div>
-</ng-template>
+</ng-template> -->

src/app/routes/supply-management/components/bulk/bulk.component.ts

@@ -23,6 +23,7 @@ export class SupplyManagementBulkComponent implements OnInit {
   schema: SFSchema = {};
   auditMany = false;
   isVisible = false;
+  auditID: any;
   _$expand = false;
   columns: STColumn[] = [];
   freightSchema: SFSchema = {};
@@ -131,7 +132,7 @@ export class SupplyManagementBulkComponent implements OnInit {
             },
           } as SFDateWidgetSchema,
         },
-        enterpriseInfoName: {
+        enterpriseInfoId: {
           type: 'string',
           title: '网络货运人',
           ui: {
@@ -411,13 +412,25 @@ export class SupplyManagementBulkComponent implements OnInit {
   }
    /**
   * 审核
+  * status ： 1 单个  2：批量
+  * value ： 单个单条数据
   */
     audit(value: any, status?: any) {
       console.log(value)
       console.log(status)
       if(status === 2) {
+        if(this.selectedRows.length <= 0) {
+          this.service.msgSrv.error('未选择货源单！');
+          return
+        }
+        let list: any[] = [];
+        this.selectedRows.forEach(item => {
+          list.push(item.id);
+        });
+        this.auditID = list;
         this.auditMany = true;
       } else {
+        this.auditID = value.id
         this.auditMany = false;
       }
       this.isVisible = true;
@@ -437,8 +450,46 @@ export class SupplyManagementBulkComponent implements OnInit {
   /**
   * 审核通过按钮
   */
-  handleOK() {
+  handleOK(value: any) {
-  
+    if(this.selectedRows.length <= 0) { 
+    const params: any = {
+      id: this.auditID,
+      remarks: this.sfFre.value.remarks,
+    }
+    if(value == 1) {
+      params.auditStatus = 2
+    } else {
+      params.auditStatus = 3
+    }
+    console.log(params)
+    this.service.request(this.service.$api_goodsResourceAudit, params).subscribe(res => {
+      if (res === true) {
+        this.service.msgSrv.success('审核成功！');
+        this.isVisible = false;
+        this.st?.reload();
+        this.getGoodsSourceStatistical();
+      }
+    })
+  } else {
+    const params: any = {
+      ids: this.auditID,
+      remarks: this.sfFre.value.remarks,
+    }
+    if(value == 1) {
+      params.auditStatus = 2
+    } else {
+      params.auditStatus = 3
+    }
+    console.log(params)
+    this.service.request(this.service.$api_batchGoodsResourceAudit, params).subscribe(res => {
+      if (res === true) {
+        this.service.msgSrv.success('审核成功！');
+        this.isVisible = false;
+        this.st?.reload();
+        this.getGoodsSourceStatistical();
+      }
+    })
+  }
   }
   // 修改单价
   modification(item: any) {

src/app/routes/supply-management/components/vehicle/vehicle.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-22 11:28:28
- * @LastEditTime: 2022-01-13 16:26:00
+ * @LastEditTime: 2022-01-17 14:14:00
  * @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\vehicle\vehicle.component.html
@@ -98,17 +98,16 @@
   [(nzVisible)]="isVisible"
   [nzFooter]="nzModalFooter"
   nzTitle="货源审核"
-  (nzOnOk)="handleOK()"
   (nzOnCancel)="handleCancel('suppliersType')"
 >
   <ng-container *nzModalContent>
     <div style="position: relative" *ngIf="auditMany">
-      <nz-alert nzType="info" [nzMessage]="'已选择' + 6 + '项'" nzShowIcon [ngStyle]="{ margin: '0 0 1rem 0' }"> </nz-alert>
+      <nz-alert nzType="info" [nzMessage]="'已选择' + selectedRows?.length+ '项'" nzShowIcon [ngStyle]="{ margin: '0 0 1rem 0' }"> </nz-alert>
     </div>
     <sf #sfFre [schema]="freightSchema" [ui]="ui2" [compact]="false" [button]="'none'"> </sf>
   </ng-container>
   <ng-template #nzModalFooter>
-    <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">通过</button>
+    <button nz-button nzType="primary" (click)="handleOK(1)" [disabled]="">通过</button>
-    <button nz-button nzType="default" (click)="handleCancel('suppliersType')">不通过</button>
+    <button nz-button nzType="default" (click)="handleOK(2)">不通过</button>
   </ng-template>
 </nz-modal>

src/app/routes/supply-management/components/vehicle/vehicle.component.ts

@@ -36,6 +36,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
     stayQuantity: 0
   };
   resourceStatus: any;
+  auditID: any;
   constructor(
     public service: SupplyManagementService,
     private modal: NzModalService,
@@ -67,7 +68,6 @@ export class SupplyManagementVehicleComponent implements OnInit {
     this.initSFFre();
     this.getGoodsSourceStatistical();
   }
-
   /**
    * 初始化查询表单
    */
@@ -75,7 +75,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
   initSFFre() {
     this.freightSchema = {
       properties: {
-        roleDescription: {
+        remarks: {
           title: '备注',
           type: 'string',
           maxLength: 50,
@@ -84,7 +84,8 @@ export class SupplyManagementVehicleComponent implements OnInit {
             widget: 'textarea'
           }
         }
-      }
+      },
+      require: ['remarks']
     };
     this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
   }
@@ -191,8 +192,18 @@ export class SupplyManagementVehicleComponent implements OnInit {
     console.log(value);
     console.log(status);
     if (status === 2) {
+      if(this.selectedRows.length <= 0) {
+        this.service.msgSrv.error('未选择货源单！');
+        return
+      }
+      let list: any[] = [];
+      this.selectedRows.forEach(item => {
+        list.push(item.id);
+      });
+      this.auditID = list;
       this.auditMany = true;
     } else {
+      this.auditID = value.id
       this.auditMany = false;
     }
     this.isVisible = true;
@@ -206,7 +217,50 @@ export class SupplyManagementVehicleComponent implements OnInit {
   /**
    * 审核通过按钮
    */
-  handleOK() {}
+  handleOK(value: any) {
+    console.log(this.sfFre.valid)
+    console.log(this.sfFre.value)
+    if(this.selectedRows.length <= 0) { 
+      const params: any = {
+        id: this.auditID,
+        remarks: this.sfFre.value.remarks,
+      }
+      if(value == 1) {
+        params.auditStatus = 2
+      } else {
+        params.auditStatus = 3
+      }
+      console.log(params)
+      this.service.request(this.service.$api_goodsResourceAudit, params).subscribe(res => {
+        if (res === true) {
+          this.service.msgSrv.success('审核成功！');
+          this.isVisible = false;
+          this.st?.reload();
+          this.getGoodsSourceStatistical();
+        }
+      })
+    } else {
+      const params: any = {
+        ids: this.auditID,
+        remarks: this.sfFre.value.remarks,
+      }
+      if(value == 1) {
+        params.auditStatus = 2
+      } else {
+        params.auditStatus = 3
+      }
+      console.log(params)
+      this.service.request(this.service.$api_batchGoodsResourceAudit, params).subscribe(res => {
+        if (res === true) {
+          this.service.msgSrv.success('审核成功！');
+          this.isVisible = false;
+          this.st?.reload();
+          this.getGoodsSourceStatistical();
+        }
+      })
+    }
+  
+  }
   /**
    * 跳转修改货源
    */

src/app/routes/supply-management/services/supply-management.service.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-10 13:20:04
+ * @LastEditTime: 2022-01-17 14:19: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\supply-management\services\supply-management.service.ts
@@ -98,6 +98,11 @@ export class SupplyManagementService extends BaseService {
      // 查询系统配置项
   public $api_get_config_item_page = '/api/mdc/pbc/sysConfigItem/list/page';
 
+     // 货源审核
+  public $api_goodsResourceAudit = '/api/sdc/goodsResourceOperate/goodsResourceAudit';
+     // 货源审核【批量】
+  public $api_batchGoodsResourceAudit = '/api/sdc/goodsResourceOperate/batchGoodsResourceAudit';
+
   constructor(public injector: Injector) {
     super(injector)
   }