Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-04-15 15:19:20 +08:00
parent e1d266e9cc
commit fe7010f227
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
View File

@ -160,14 +160,11 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
allowClear: true, allowClear: true,
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
// enterpriseInfoName: { enterpriseInfoNamer: {
// type: 'string', type: 'string',
// title: '网络货运人', title: '',
// ui: { ui: { hidden: true }
// widget: 'custom' },
// },
// default: '天津市怡亚通XXXX有限公司'
// },
enterpriseInfoId: { enterpriseInfoId: {
type: 'string', type: 'string',
title: '网络货运人', title: '网络货运人',
@ -175,7 +172,10 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
allowClear: true, allowClear: true,
asyncData: () => this.shipperSrv.getNetworkFreightForwarder() asyncData: () => this.shipperSrv.getNetworkFreightForwarder(),
change: (q: any, qs: any) => {
this.sf1.setValue('/enterpriseInfoNamer', qs.label);
}
} }
}, },
deadlineTime: { deadlineTime: {

10
src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html
View File

@ -1,3 +1,13 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-03-23 14:24:05
* @LastEditors : Shiming
* @LastEditTime : 2022-04-15 15:18:33
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-card class="card-height" > <nz-card class="card-height" >
<div [innerHTML]="agreement | safehtml"></div> <div [innerHTML]="agreement | safehtml"></div>
</nz-card> </nz-card>

4
src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-02-24 20:19:51 * @Date : 2022-02-24 20:19:51
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-04-15 15:15:13 * @LastEditTime : 2022-04-15 15:18:29
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -98,7 +98,7 @@ export class TranAgreementComponent {
parametersDTO: { parametersDTO: {
contractCode: '', contractCode: '',
shipperName: this?.shipperName || '', //托运人 shipperName: this?.shipperName || '', //托运人
carrierName: this.object?.enterpriseInfoName || '', //承运人 carrierName: this.object?.enterpriseInfoNamer || this.object?.enterpriseInfoName || '', //承运人
shipperLegalPersonName: this.enterpriseInfo.legalPersonName || '', //托运法定代表人 shipperLegalPersonName: this.enterpriseInfo.legalPersonName || '', //托运法定代表人
carrierLegalPersonName: this.enterpriseInfo.netLegalPersonName || '', //承运法定代表人 carrierLegalPersonName: this.enterpriseInfo.netLegalPersonName || '', //承运法定代表人
consignorInfo: `${this.object.unLoadingPlaceDTOList[0]?.appUserName || ''} ${ consignorInfo: `${this.object.unLoadingPlaceDTOList[0]?.appUserName || ''} ${