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

2022-02-22 15:29:23 +08:00
parent d6ca4586f5 fd55d5a97b
commit b46ad16d1b
6 changed files with 44 additions and 22 deletions
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@ -10,6 +10,7 @@ import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-r
 import { of } from 'rxjs';
 import { ShipperBaseService } from '@shared';
 import { Router } from '@angular/router';
+import { OneCarOrderCancelConfirmComponent } from '../../modal/vehicle/cancel-confirm/cancel-confirm.component';

@Component({
  selector: 'app-supply-management-bulk',
@ -511,6 +512,12 @@ export class OrderManagementBulkComponent implements OnInit {
              item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1',
              acl: { ability: ['ORDER-BULK-signBulkOrder'] },
          },
+          {
+            text: '申请退款　',
+            click: (_record) => this.applyRefund(_record),
+            iif: item => item.isApplyForRefund,
+            acl: { ability: ['ORDER-VEHICLE-modificationOrder'] },
+          },
          {
            text: '修改订单　',
            click: _record => this.changeOrder(_record),
@ -762,5 +769,22 @@ export class OrderManagementBulkComponent implements OnInit {
  // 修改订单
  changeOrder(value: any) {
    this.router.navigate(['order-management/bulk-detailChange', value.id]);
+  }
+      /**
+   *申请退款
+   */
+   applyRefund(item: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '申请退款',
+      nzContent: OneCarOrderCancelConfirmComponent,
+      nzComponentParams: {
+        i: item
+      },
+      nzFooter: null
+    });
+    modalRef.afterClose.subscribe(() => {
+      this.resetSF;
+      this.st.load();
+    });
  }
 }
--- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
+++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
@ -49,7 +49,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
  get reqParams() {
    const a: any = {};
    if (this.resourceStatus) {
-      a.billStatus = this.resourceStatus;
+      a.auditStatus = this.resourceStatus;
    }
    const params: any = Object.assign({}, this.sf?.value || {});
    delete params._$expand;
@ -76,7 +76,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
      totalCount: 0
    };
    const params: any = Object.assign({}, this.reqParams || {});
-    delete params.billStatus
+    delete params.auditStatus
    this.service.request(this.service.$api_get_getAuditStatistical, params).subscribe(res => {
      if (res) {
        let totalCount = 0;
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-10 13:36:07
+ * @LastEditTime : 2022-02-22 15:23:06
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -90,10 +90,7 @@
        <div *ngIf="item.mybidDetailInfo.length > 0">
          <p *ngFor="let data of item.mybidDetailInfo">
            {{ data.expenseName }}：￥{{ data.price | number: '0.2-2' }}
-            <span *ngIf="data.paymentStatus && data.paymentStatus === '1'" style="color: #f59a63">待申请</span>
-            <span *ngIf="data.paymentStatus && data.paymentStatus === '2'" style="color: #f59a63">已拒绝</span>
-            <span *ngIf="data.paymentStatus && data.paymentStatus === '3'" style="color: #f59a63">已支付</span>
-            <span *ngIf="data.paymentStatus && data.paymentStatus === '4'" style="color: #f59a63">申请中</span>
+            <span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
          </p>
        </div>
      </ng-template>
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@ -451,7 +451,7 @@ resourceStatus: any;
          {
            text: '申请退款　',
            click: (_record) => this.applyRefund(_record),
-            iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
+            iif: item => item.isApplyForRefund,
            acl: { ability: ['ORDER-VEHICLE-modificationOrder'] },
          },
          {
@ -843,11 +843,11 @@ resourceStatus: any;
    this.router.navigate(['order-management/vehicle-detailChange', value.id]);
  }
    /**
-   *取消待确认
+   *申请退款
   */
   applyRefund(item: any) {
    const modalRef = this.modal.create({
-      nzTitle: '取消待确认',
+      nzTitle: '申请退款',
      nzContent: OneCarOrderCancelConfirmComponent,
      nzComponentParams: {
        i: item
--- a/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html
+++ b/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-02-22 13:53:29
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-22 14:25:40
+ * @LastEditTime : 2022-02-22 15:11:35
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\cancel-confirm\\cancel-confirm.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -20,7 +20,7 @@
  </sv>
  <sv label="退款金额">
    <p *ngFor="let data of i?.mybidDetailInfo; let index = index">
-      <label *ngIf="data?.paymentStatus == 3">
+      <label *ngIf="data?.paymentStatusLabel == '已支付'">
        <span>{{data?.expenseName}}</span>
        <span>{{ data.price | number: '0.2-2' }}</span>
      </label>
@ -28,7 +28,7 @@
  </sv>
  <sv label=""> 已选择 {{ index }} 项，运费：{{ List }}，附加费：{{ ATTPrice }} </sv>
 </sv-container>
-<sf #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
+<sf style="margin-top: 10px;" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>

 <div class="modal-footer">
  <button nz-button type="button" (click)="close()">取消</button>
--- a/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-02-22 13:53:29
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-22 14:46:06
+ * @LastEditTime : 2022-02-22 15:15:24
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\cancel-confirm\\cancel-confirm.component.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -62,11 +62,11 @@ export class OneCarOrderCancelConfirmComponent implements OnInit {
          } as SFTextareaWidgetSchema
        },
      },
-      require: ['reason']
+      required: ['reason']
    };
    this.ui = {
      '*': {
-        spanLabelFixed: 50,
+        spanLabelFixed: 60,
        grid: { span: 20 }
      }
    };
@ -75,12 +75,15 @@ export class OneCarOrderCancelConfirmComponent implements OnInit {
    let indexId = 0
    let index = 0
    this.i?.mybidDetailInfo.forEach((ele: any) => {
-      if (ele?.paymentStatus == 3) {
+      if (ele?.paymentStatusLabel == '已支付') {
        indexId += 1;
        index += ele?.price;
      }
-      if (ele.expenseCode === '"ATT"'){
-        if(ele?.paymentStatus == 3) {
+      console.log(ele.expenseCode)
+      if (ele.expenseCode == '"ATT"' || ele.expenseCode == 'ATT'){
+        console.log('ele.expenseCode')
+        console.log(ele)
+        if(ele?.paymentStatusLabel == '已支付') {
          this.ATTPrice = ele.price;
        } else {
          this.ATTPrice = 0;
@ -103,9 +106,7 @@ export class OneCarOrderCancelConfirmComponent implements OnInit {
      if (res) {
        this.service.msgSrv.success('操作成功！');
        this.modalRef.close(true);
-      } else {
-        this.service.msgSrv.error(res.msg);
-      }
+      } 
    });
  }