diff --git a/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts b/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts index eb45f57a..8fa79108 100644 --- a/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts +++ b/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts @@ -131,7 +131,7 @@ export class ContractManagementTemplateFrameComponent implements OnInit { title: '签约对象', width: '100px', className: 'text-center', - render: 'signingObjectLabel' + index: 'signingObjectLabel' }, { title: '合同类型', @@ -145,15 +145,17 @@ export class ContractManagementTemplateFrameComponent implements OnInit { className: 'text-center', index: 'resourceTypeLabel' }, - { title: '创建人', index: 'createUserId', width: '120px', className: 'text-center' }, + { title: '创建人', index: 'createUserIdLabel', width: '120px', className: 'text-center' }, { title: '创建时间', className: 'text-center', - index: 'createTime' + index: 'createTime', + width: '200px' }, { title: '操作', fixed: 'right', + width: '110px', className: 'text-center', buttons: [ { diff --git a/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts b/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts index ca4d349d..71ca4229 100644 --- a/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts +++ b/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts @@ -145,15 +145,17 @@ export class ContractManagementTemplatePartnerComponent implements OnInit { className: 'text-center', index: 'resourceTypeLabel' }, - { title: '创建人', index: 'createUserId', width: '120px', className: 'text-center' }, + { title: '创建人', index: 'createUserIdLabel', width: '120px', className: 'text-center' }, { title: '创建时间', className: 'text-center', - index: 'createTime' + index: 'createTime', + width: '200px' }, { title: '操作', fixed: 'right', + width: '110px', className: 'text-center', buttons: [ { diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts index ae85bfd6..e295eb52 100644 --- a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts +++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts @@ -145,15 +145,17 @@ export class ContractManagementTemplateDetailComponent implements OnInit { className: 'text-center', index: 'resourceTypeLabel' }, - { title: '创建人', index: 'createUserId', width: '120px', className: 'text-center' }, + { title: '创建人', index: 'createUserIdLabel', width: '120px', className: 'text-center' }, { title: '创建时间', className: 'text-center', - index: 'createTime' + index: 'createTime', + width: '200px' }, { title: '操作', fixed: 'right', + width: '110px', className: 'text-center', buttons: [ { diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index bbbf4889..1f79b14e 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -22,6 +22,7 @@ export class OrderManagementRiskComponent implements OnInit { schemaView: SFSchema = {}; auditMany = false; auditId: any; + auditIdR: any; isVisibleRE = false; resourceStatus: any; _$expand = false; @@ -336,6 +337,14 @@ export class OrderManagementRiskComponent implements OnInit { widget: 'text' } }, + id: { + title: '', + type: 'string', + default: this.auditIdR, + ui: { + hidden: true + } + }, representationsCause: { title: '备注', type: 'string', @@ -428,12 +437,13 @@ export class OrderManagementRiskComponent implements OnInit { idList.push(item.id); }); } else { - idList.push(this.sfView.value.billCode) + idList.push(this.sfView.value.id) } const parms = { ids: idList, auditRemark: this.sfView.value.representationsCause, representationsStatus: 3, + auditStatus: 2, }; this.service.request(this.service.$api_get_listRisk_audit, parms).subscribe(res => { if (res) { @@ -454,7 +464,7 @@ export class OrderManagementRiskComponent implements OnInit { idList.push(item.id); }); } else { - idList.push(this.sfView.value.billCode) + idList.push(this.sfView.value.id) } if (!this.sfView.value.representationsCause) { this.service.msgSrv.error('拒绝原因为空!'); @@ -464,6 +474,7 @@ export class OrderManagementRiskComponent implements OnInit { ids: idList, auditRemark: this.sfView.value.representationsCause, representationsStatus: 4, + auditStatus: 3, }; this.service.request(this.service.$api_get_listRisk_audit, parms).subscribe(res => { if (res) { @@ -480,6 +491,7 @@ export class OrderManagementRiskComponent implements OnInit { audit(item?: any) { if (item) { this.auditId = item.billCode; + this.auditIdR = item.id; this.initSTAudit(1); this.isVisibleRE = true; } else { diff --git a/src/app/routes/usercenter/components/driver/captain/add/add.component.ts b/src/app/routes/usercenter/components/driver/captain/add/add.component.ts index 1937104a..45f387a7 100644 --- a/src/app/routes/usercenter/components/driver/captain/add/add.component.ts +++ b/src/app/routes/usercenter/components/driver/captain/add/add.component.ts @@ -90,6 +90,7 @@ export class CtcCaptatinAddComponent implements OnInit { widget: this.i.id ? 'text' : '', placeholder: '请输入手机号', blur: () => { + if(this.sf?.value?.mobile) { this.service.request(this.service.$api_getByMobile, { mobile: this.sf.value.mobile }).subscribe(res => { if (res.certificateNumber) { this.readFlag = true @@ -128,7 +129,8 @@ export class CtcCaptatinAddComponent implements OnInit { this.detailData = {} } }) - } + } + } }, default: this.detailData.mobile }, @@ -145,6 +147,7 @@ export class CtcCaptatinAddComponent implements OnInit { bankCardNo: { title: '银行卡号', type: 'string', + maxLength: 20, ui: { widget: this.i.id ? 'text' : '', placeholder: '请输入银行卡号', @@ -161,6 +164,7 @@ export class CtcCaptatinAddComponent implements OnInit { bankName: { title: '开户行', type: 'string', + maxLength: 35, ui: { widget: this.i.id ? 'text' : '', placeholder: '请输入开户行',