diff --git 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 index 8158747b..4bc90518 100644 --- 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 @@ -272,19 +272,23 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { } } as SFSelectWidgetSchema }, - settlementBasis: { - title: '装卸凭证', + loadingDocuments: { type: 'string', + title: '装卸货凭证', + enum:[ + {label: '全部',value: ''}, + {label: '有',value: '1'}, + {label: '无',value: '0'}, + ], ui: { - widget: 'dict-select', - containsAllLabel: true, - params: { dictKey: 'goodresource:settlement:type' }, - containAllLable: true, + widget: 'select', + placeholder: '请选择', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value - } - } as SFSelectWidgetSchema - } + }, + } + }, }, type: 'object' }; diff --git a/src/app/routes/passport/components/order-agreement/order-agreement.component.ts b/src/app/routes/passport/components/order-agreement/order-agreement.component.ts index 713b32cf..1d8b0139 100644 --- a/src/app/routes/passport/components/order-agreement/order-agreement.component.ts +++ b/src/app/routes/passport/components/order-agreement/order-agreement.component.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-03-14 14:17:38 + * @LastEditors : Shiming + * @LastEditTime : 2022-03-24 10:12:00 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\passport\\components\\order-agreement\\order-agreement.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Params } from '@angular/router'; import { PassportService } from '../../services/passport.service'; @@ -16,6 +26,14 @@ export class OrderAgreementComponent implements OnInit { }); } ngOnInit() { + console.log(this.type); + if(this.type == 3) { + this.service.request(this.service.$api_get_getSupplementaryAgreement, { type: this.type }).subscribe(res => { + if (res) { + this.agreementContent = res; + } + }); + } this.service.request(this.service.$api_get_agreement, { type: this.type }).subscribe(res => { if (res) { this.agreementContent = res; diff --git a/src/app/routes/passport/services/passport.service.ts b/src/app/routes/passport/services/passport.service.ts index bcd3f5c1..bb23b727 100644 --- a/src/app/routes/passport/services/passport.service.ts +++ b/src/app/routes/passport/services/passport.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-27 21:08:36 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:24:52 + * @LastEditTime : 2022-03-24 09:59:50 * @FilePath : \\tms-obc-web\\src\\app\\routes\\passport\\services\\passport.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -17,6 +17,8 @@ import { BaseService } from 'src/app/shared/services/core/base.service'; export class PassportService extends BaseService { // 登录协议,服务订购协议 public $api_get_agreement = `/api/mdc/pbc/agreementInfo/getAgreementInfoByType?_allow_anonymous=true`; + // 查看补充协议 + public $api_get_getSupplementaryAgreement = `/api/sdc/billOperate/getSupplementaryAgreement?_allow_anonymous=true`; // 未登录账号发送验证码 public $getAccountSMVerificationCode = `/api/mdc/cuc/userBasicInfo/forgetPassword/getAccountSMVerificationCode?_allow_anonymous=true`; constructor(public injector: Injector) {