diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts index a942aff9..e235e937 100644 --- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts +++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts @@ -5,7 +5,7 @@ import { OnChanges } from '@angular/core'; * @Author : Shiming * @Date : 2022-01-05 11:01:55 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 10:45:19 + * @LastEditTime : 2022-04-25 10:28:10 * @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -96,8 +96,6 @@ export class ContractManagementTemplateTextComponent implements OnInit { { label: '运单合同', value: '3' }, { label: '运单补充协议', value: '4' }, { label: '委托代收合同', value: '5' }, - { label: '电子提货单', value: '10' }, - { label: '电子卸货单', value: '11' }, ]; this.sf.getProperty('/contractType')!.schema.enum = this.Types; this.sf.getProperty('/contractType')!.widget.reset(this.Types); @@ -178,7 +176,7 @@ export class ContractManagementTemplateTextComponent implements OnInit { } } }, - required: ['templateName', 'templateType'] + required: ['templateName', 'templateType','contractType'] }; this.ui = { '*': { diff --git a/src/app/routes/financial-management/components/platform-account/withdraw-deposit/withdraw-deposit.component.ts b/src/app/routes/financial-management/components/platform-account/withdraw-deposit/withdraw-deposit.component.ts index ca2cb877..f27df88a 100644 --- a/src/app/routes/financial-management/components/platform-account/withdraw-deposit/withdraw-deposit.component.ts +++ b/src/app/routes/financial-management/components/platform-account/withdraw-deposit/withdraw-deposit.component.ts @@ -240,11 +240,21 @@ export class CwcAccountManagementWithdrawDepositComponent implements OnInit { this.sf.setValue('/payPsd', val); if (val || val !== '') { const last = val.substr(val.length - 1); - const password = this.sf.getValue('/payPassword'); + const password = this.sf.getValue('/payPassword') || ''; const start = this.psd?.nativeElement.selectionStart; + const index = val.lastIndexOf('•'); if (last !== '•') { - this.sf.setValue('/payPassword', start !== 1 ? (password + last) : last); + if (password.length !== 0) { + // 新增 或 替换 + const pre = password.substr(0, index + 1); + const detail = val.substr(index + 1, val.length); + this.sf.setValue('/payPassword', pre + detail); + } else { + // 新增 + this.sf.setValue('/payPassword', val); + } } else { + // 删除 this.sf.setValue('/payPassword', password.substr(0, val.length)); } const payPswVal = this.sf.getValue('/payPsd'); diff --git a/src/app/routes/sys-setting/components/close-account/close-account.component.html b/src/app/routes/sys-setting/components/close-account/close-account.component.html index ac4baf2e..0dae990d 100644 --- a/src/app/routes/sys-setting/components/close-account/close-account.component.html +++ b/src/app/routes/sys-setting/components/close-account/close-account.component.html @@ -16,7 +16,7 @@ - + edit
diff --git a/src/app/routes/sys-setting/components/close-account/close-account.component.ts b/src/app/routes/sys-setting/components/close-account/close-account.component.ts index 0826ae0c..1472bf4e 100644 --- a/src/app/routes/sys-setting/components/close-account/close-account.component.ts +++ b/src/app/routes/sys-setting/components/close-account/close-account.component.ts @@ -187,6 +187,10 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; console.log(res) if(res) { this.formData = res; + const List: any = []; + List.push({ label: res.enterpriseName, value: res.id }); + this.sfFre.getProperty('/enterpriseId')!.schema.enum = List; + this.sfFre.getProperty('/enterpriseId')!.widget.reset(List); } }) this.edit = true; diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index cfd71b20..5f8491e0 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -369,7 +369,7 @@ 合伙人信息 - {{partnerInfo.partnerEnterpriseName}} + {{partnerInfo.partnerContactName}} {{ item.contacter }}
/{{item.mobile}} + + {{ item.partnerName }}
/{{item.promotersTelephone}} + {{ item.promotersTelephone || '添加' }} diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index f85f9951..162ddc2b 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -424,7 +424,7 @@ export class FreightComponentsListComponent implements OnInit { enum: { 10: '整车发货', 20: '大宗发货' }, width: 140 }, - { title: '业务员', className: 'text-center', render: 'promotersTelephone', width: 150 }, + { title: '渠道销售', className: 'text-center', render: 'promotersTelephone', width: 150 }, { title: '合伙人', className: 'text-center', render: 'partnerName', width: 150 }, { title: '客服人员', className: 'text-center', index: 'customerServiceIdLabel', width: 150 }, { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },