diff --git a/src/app/routes/contract-management/components/contract-list/contract-list.component.ts b/src/app/routes/contract-management/components/contract-list/contract-list.component.ts index 8e0fb1f9..9d949020 100644 --- a/src/app/routes/contract-management/components/contract-list/contract-list.component.ts +++ b/src/app/routes/contract-management/components/contract-list/contract-list.component.ts @@ -72,7 +72,7 @@ export class ContractManagementContractListComponent implements OnInit { title: '签约对象', width: '100px', className: 'text-center', - index: 'documentType' + index: 'signingObjectLabel' }, { title: '合同类型', diff --git a/src/app/routes/contract-management/components/contract-partner/contract-partner.component.ts b/src/app/routes/contract-management/components/contract-partner/contract-partner.component.ts index fd4d1f8d..5517e3f9 100644 --- a/src/app/routes/contract-management/components/contract-partner/contract-partner.component.ts +++ b/src/app/routes/contract-management/components/contract-partner/contract-partner.component.ts @@ -78,7 +78,7 @@ export class ContractManagementPartnerComponent implements OnInit { title: '签约对象', width: '100px', className: 'text-center', - index: 'signingObject' + index: 'signingObjectLabel' }, { title: '合同类型', 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..97339153 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; @@ -312,7 +313,7 @@ export class OrderManagementRiskComponent implements OnInit { { text: '审核', click: _record => this.audit(_record), - iif: item => item.representationsStatus == '1' || item.representationsStatus == '2', + iif: item => item.auditStatus == '1' , acl: { ability: ['ORDER-RISK-audit'] }, }, { @@ -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/order-management/modal/audit/voucher-view/voucher-view.component.ts b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts index 5352885d..54b91f69 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts @@ -424,7 +424,7 @@ export class orderManagementVoucherViewComponent implements OnInit { const params = [this.i.id]; this.service.request(this.service.$api_get_billAuditPass, params).subscribe((res) => { if(res) { - this.service.msgSrv.success('审核成功!') + this.service.msgSrv.success('生成电子单据成功!') this.modal.destroy(true); } }) diff --git a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts index 463061e3..6bf8d513 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts +++ b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts @@ -425,7 +425,7 @@ export class VehicleSureArriveComponent implements OnInit { save(value: any): void { console.log(this.Status); console.log(value?.imgUrl3?.data?.fullFilePath); - console.log(value?.imgUrl3.url); + console.log(value?.imgUrl3?.url); if (this.Status === 1) { if (!value.time) { @@ -436,8 +436,8 @@ export class VehicleSureArriveComponent implements OnInit { id: this.i.id, imgUrl1: value?.imgUrl1?.data?.fullFilePath, imgUrl2: value?.imgUrl2?.data?.fullFilePath, - setLading: value?.imgUrl3?.data?.fullFilePath || value?.imgUrl3.url, - setPeoCarGoods: value?.imgUrl4?.data?.fullFilePath || value?.imgUrl4.url, + setLading: value?.imgUrl3?.data?.fullFilePath || value?.imgUrl3?.url, + setPeoCarGoods: value?.imgUrl4?.data?.fullFilePath || value?.imgUrl4?.url, time: value?.time }; params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss '); @@ -466,8 +466,8 @@ export class VehicleSureArriveComponent implements OnInit { id: this.i?.id, imgUrl1: value?.imgUrl1?.data?.fullFilePath, imgUrl2: value?.imgUrl2?.data?.fullFilePath, - setLading: value?.imgUrl3?.data?.fullFilePath || value?.imgUrl3.url, - setPeoCarGoods: value?.imgUrl4?.data?.fullFilePath || value?.imgUrl4.url, + setLading: value?.imgUrl3?.data?.fullFilePath || value?.imgUrl3?.url, + setPeoCarGoods: value?.imgUrl4?.data?.fullFilePath || value?.imgUrl4?.url, time: value?.time, volume: this.data?.volume, weight: this.data?.weight 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: '请输入开户行',