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

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

Browse Source
This commit is contained in:
Taric Xin
2022-02-28 20:44:02 +08:00
parent 4af2374189 88f4d1f195
commit bc5e72bc77
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts
View File

@ -131,19 +131,19 @@ export class ContractManagementTemplateFrameComponent implements OnInit {
title: '签约对象', title: '签约对象',
width: '100px', width: '100px',
className: 'text-center', className: 'text-center',
render: 'signingObject' render: 'signingObjectLabel'
}, },
{ {
title: '合同类型', title: '合同类型',
width: '100px', width: '100px',
className: 'text-center', className: 'text-center',
index: 'contractType' index: 'contractTypeLabel'
}, },
{ {
title: '货源类型', title: '货源类型',
width: '100px', width: '100px',
className: 'text-center', className: 'text-center',
index: 'resourceType' index: 'resourceTypeLabel'
}, },
{ title: '创建人', index: 'createUserId', width: '120px', className: 'text-center' }, { title: '创建人', index: 'createUserId', width: '120px', className: 'text-center' },
{ {

6
src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts
View File

@ -131,19 +131,19 @@ export class ContractManagementTemplatePartnerComponent implements OnInit {
title: '签约对象', title: '签约对象',
width: '100px', width: '100px',
className: 'text-center', className: 'text-center',
index: 'signingObject' index: 'signingObjectLabel'
}, },
{ {
title: '合同类型', title: '合同类型',
width: '100px', width: '100px',
className: 'text-center', className: 'text-center',
index: 'contractType' index: 'contractTypeLabel'
}, },
{ {
title: '货源类型', title: '货源类型',
width: '100px', width: '100px',
className: 'text-center', className: 'text-center',
index: 'resourceType' index: 'resourceTypeLabel'
}, },
{ title: '创建人', index: 'createUserId', width: '120px', className: 'text-center' }, { title: '创建人', index: 'createUserId', width: '120px', className: 'text-center' },
{ {

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

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-06 15:01:40 * @Date : 2022-01-06 15:01:40
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-02-28 20:33:56 * @LastEditTime : 2022-02-28 20:40:35
* @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.
*/ */
@ -28,19 +28,22 @@ export class TranAgreementComponent {
console.log(Object) console.log(Object)
const params = { const params = {
contractType:'1', contractType:'1',
enterpriseInfoId: '',
parametersDTO: { parametersDTO: {
// 回单付 // 回单付
back: '', back: 'dsfgffdsg',
// 发货地址 // 发货地址
consignorAddress: '', consignorAddress: 'gfdgdfdg',
// 发货时间 // 发货时间
consignorDate: '', consignorDate: 'dsggdsgsfgds',
// 发货时间 // 发货时间
// consignorDate: '', // consignorDate: '',
}
},
resourceType: '1',
signingObject: '1',
templateType: 'MX',
} }
console.log(params)
this.service.request(this.service.$api_getContractContent,params).subscribe((res) => { this.service.request(this.service.$api_getContractContent,params).subscribe((res) => {
if (res) { if (res) {