From 9b4c13f596e2a2701f260471ba0938d651db6647 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 25 Feb 2022 15:57:11 +0800 Subject: [PATCH 1/3] edit --- .../receivable-order-detail.component.html | 6 +- .../enterprise-audit.component.ts | 44 +++-- .../components/freight/list/list.component.ts | 169 ++++++++++++++++-- 3 files changed, 185 insertions(+), 34 deletions(-) diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.html b/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.html index de267190..7ec261f1 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.html +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.html @@ -30,7 +30,7 @@ {{headerInfo?.artoname}} - {{headerInfo?.arto}} + {{headerInfo?.artocode}} {{headerInfo?.armoney | currency}} @@ -38,10 +38,10 @@
- {{headerInfo?.banktype}} + {{headerInfo?.banktypeLabel}} - {{headerInfo?.arvattype==='1'?'费用款项':''}} + {{headerInfo?.brmtypeLabel}} {{headerInfo?.bankreceipt}} diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts index cc8f6464..0294e79f 100644 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts +++ b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts @@ -37,12 +37,16 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value, - createTime: { - start: this.sf.value.createTime?.[0] || '', - end: this.sf.value.createTime?.[1] || '' - } + ...this.sf.value }); + if (this.sf.value.createTime) { + Object.assign(requestOptions.body, { + createTime: { + start: this.sf.value.createTime?.[0] || '', + end: this.sf.value.createTime?.[1] || '' + } + }); + } } Object.assign(requestOptions.body, { flag: this.tabType, listSource: 2 }); return requestOptions; @@ -246,23 +250,34 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { placeholder: '请输入' } }, - contactName: { - title: '联系人', + name: { + title: '管理员', type: 'string', ui: { - placeholder: '请输入', + placeholder: '请输入' + } + }, + approval1Status: { + type: 'string', + title: '企业类型', + enum: [{ label: '全部', value: '' }], + default: '', + ui: { + widget: 'select', visibleIf: { expand: (value: boolean) => this.tabType === 1 } } }, - name: { - title: '管理员', + approval11Status: { type: 'string', + title: '公司所在地', + enum: [{ label: '全部', value: '' }], + default: '', ui: { - placeholder: '请输入', + widget: 'select', visibleIf: { - expand: (value: boolean) => this.tabType !== 1 + expand: (value: boolean) => this.tabType === 1 && value } } }, @@ -271,7 +286,10 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { type: 'string', maxLength: 11, ui: { - placeholder: '请输入' + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => this.tabType === 2 + } } }, approvalStatus: { 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 0e075e82..2ae8a923 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { STChange, STColumn, STColumnBadge, STComponent, STData, STRequestOptions } from '@delon/abc/st'; -import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; +import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { DynamicSettingModalComponent, ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component'; @@ -116,15 +116,49 @@ export class FreightComponentsListComponent implements OnInit { showRequired: false } }, - - networkTransporter: { + sou1rce: { type: 'string', - title: '网络货运人', + title: '企业类型', + enum: [{ label: '全部', value: '' }], + default: '', + ui: { + widget: 'select' + } + }, + sou11rce: { + type: 'string', + title: '公司所在地', + enum: [{ label: '全部', value: '' }], + default: '', ui: { widget: 'select', - placeholder: '请选择', - allowClear: true, - asyncData: () => this.shipperservice.getNetworkFreightForwarder() + visibleIf: { + expand: (value: boolean) => value + } + } + }, + sou3rce: { + type: 'string', + title: '常用服务', + enum: [{ label: '全部', value: '' }], + default: '', + ui: { + widget: 'select', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + sou1r3ce: { + type: 'string', + title: '客户类型', + enum: [{ label: '全部', value: '' }], + default: '', + ui: { + widget: 'select', + visibleIf: { + expand: (value: boolean) => value + } } }, promotersTelephone: { @@ -138,6 +172,79 @@ export class FreightComponentsListComponent implements OnInit { } } }, + promotersTe1le3phone: { + title: '合伙人', + type: 'string', + ui: { + placeholder: '请输入', + showRequired: false, + visibleIf: { + expand: (value: boolean) => value + } + } + }, + promotersTe1lep1hone: { + title: '客服人员', + type: 'string', + ui: { + placeholder: '请输入', + showRequired: false, + visibleIf: { + expand: (value: boolean) => value + } + } + }, + promotersTe1lep12hone: { + title: '审核人', + type: 'string', + ui: { + placeholder: '请输入', + showRequired: false, + visibleIf: { + expand: (value: boolean) => value + } + } + }, + time: { + title: '申请时间', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd HH:mm:ss', + nzShowTime: true, + visibleIf: { + expand: (value: boolean) => value + } + } as SFDateWidgetSchema + }, + tim1e: { + title: '审核时间', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd HH:mm:ss', + nzShowTime: true, + visibleIf: { + expand: (value: boolean) => value + } + } as SFDateWidgetSchema + }, + lockedStatus: { + type: 'string', + title: '企业状态', + enum: [ + { label: '全部', value: '' }, + { label: '正常', value: 0 }, + { label: '冻结', value: 1 } + ], + default: '', + ui: { + widget: 'select', + visibleIf: { + expand: (value: boolean) => value + } + } + }, source: { type: 'string', title: '注册渠道', @@ -155,14 +262,10 @@ export class FreightComponentsListComponent implements OnInit { } } }, - lockedStatus: { + sourc2e: { type: 'string', - title: '企业状态', - enum: [ - { label: '全部', value: '' }, - { label: '正常', value: 0 }, - { label: '冻结', value: 1 } - ], + title: '证件是否过期', + enum: [{ label: '全部', value: '' }], default: '', ui: { widget: 'select', @@ -170,6 +273,19 @@ export class FreightComponentsListComponent implements OnInit { expand: (value: boolean) => value } } + }, + networkTransporter: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + asyncData: () => this.shipperservice.getNetworkFreightForwarder(), + visibleIf: { + expand: (value: boolean) => value + } + } } } }; @@ -180,10 +296,10 @@ export class FreightComponentsListComponent implements OnInit { this.columns = [ // { title: '', type: 'checkbox', className: 'text-center' }, { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 }, - { title: '企业税号', className: 'text-center', index: 'unifiedSocialCreditCode', width: 200 }, + { title: '统一社会信用代码', className: 'text-center', index: 'unifiedSocialCreditCode', width: 200 }, + { title: '公司所在地', className: 'text-center', index: 'unifi1edSocialCreditCode', width: 200 }, + { title: '企业类型', className: 'text-center', index: 'unifiedSoci1alCreditCode', width: 200 }, { title: '管理员', className: 'text-center', render: 'contacter', width: 150 }, - { title: '审核人', className: 'text-center', index: 'approvalUserName', width: 130 }, - { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 }, { title: '常用服务', className: 'text-center', @@ -192,7 +308,10 @@ 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: 'promoter1sTelephone', width: 150 }, + { title: '客服人员', className: 'text-center', render: 'promoter1sTelephone', width: 150 }, + { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 }, { title: '注册渠道', className: 'text-center', @@ -201,6 +320,20 @@ export class FreightComponentsListComponent implements OnInit { enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加' }, width: 130 }, + { title: '申请时间', className: 'text-center', index: 'netTra1nName', width: 180 }, + { title: '审核时间', className: 'text-center', index: 'netTr1anName', width: 180 }, + { title: '审核人', className: 'text-center', index: 'approvalUserName', width: 130 }, + { + title: '保险认证状态', + className: 'text-center', + index: 'lockedSta1tus', + type: 'badge', + badge: { + 0: { text: '正常', color: 'success' }, + 1: { text: '冻结', color: 'error' } + }, + width: 130 + }, { title: '企业状态', className: 'text-center', From f3a30b5e0eae3f74a74815c235ef927528336f24 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 25 Feb 2022 15:58:42 +0800 Subject: [PATCH 2/3] edit --- .../payment-order-detail/payment-order-detail.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html index 87f12639..deda8303 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html +++ b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html @@ -37,7 +37,7 @@ {{headerInfo?.payDate}} - {{headerInfo?.payBankTypeLabel}} + {{headerInfo?.ltdaccountId}} {{headerInfo?.payDate}} From 52440f9f66f6277ed4cfb27dff8603e612aab2bf Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 25 Feb 2022 16:31:45 +0800 Subject: [PATCH 3/3] edit --- proxy.conf.js | 2 +- .../enterprise-audit.component.ts | 24 ++++ .../freight/list/list.component.html | 13 +- .../freight/list/list.component.less | 0 .../components/freight/list/list.component.ts | 131 ++++++++++-------- .../freight/list/new/new.component.ts | 22 ++- 6 files changed, 126 insertions(+), 66 deletions(-) delete mode 100644 src/app/routes/usercenter/components/freight/list/list.component.less diff --git a/proxy.conf.js b/proxy.conf.js index 31995def..822b7622 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -20,7 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts index 0294e79f..96e0125f 100644 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts +++ b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts @@ -281,6 +281,30 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { } } }, + approval11St1atus: { + type: 'string', + title: '常用服务', + enum: [{ label: '全部', value: '' }], + default: '', + ui: { + widget: 'select', + visibleIf: { + expand: (value: boolean) => this.tabType === 1 && value + } + } + }, + approval11St11atus: { + type: 'string', + title: '客户类型', + enum: [{ label: '全部', value: '' }], + default: '', + ui: { + widget: 'select', + visibleIf: { + expand: (value: boolean) => this.tabType === 1 && value + } + } + }, mobile: { title: '手机号', type: 'string', diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index 5eec6145..f2ddabb7 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -17,11 +17,12 @@
-
+
- + @@ -38,6 +39,12 @@ + +
+ + 已过期 + + {{ item.contacter }}
/{{item.mobile}} diff --git a/src/app/routes/usercenter/components/freight/list/list.component.less b/src/app/routes/usercenter/components/freight/list/list.component.less deleted file mode 100644 index e69de29b..00000000 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 2ae8a923..a5f9f08c 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -9,7 +9,7 @@ import { UsermanageService } from '../../../services/usercenter.service'; @Component({ selector: 'app-Freight-components-list', templateUrl: './list.component.html', - styleUrls: ['./list.component.less'] + styleUrls: ['../../../../commom/less/expend-but.less'] }) export class FreightComponentsListComponent implements OnInit { _$expand = false; @@ -116,10 +116,19 @@ export class FreightComponentsListComponent implements OnInit { showRequired: false } }, - sou1rce: { + enterpriseType: { type: 'string', title: '企业类型', - enum: [{ label: '全部', value: '' }], + enum: [ + { label: '全部', value: '' }, + { label: '物流企业', value: 1 }, + { label: '货运代理', value: 2 }, + { label: '生产型企业', value: 3 }, + { label: '贸易类企业', value: 4 }, + { label: '科技型企业', value: 5 }, + { label: '化学化工企业', value: 6 }, + { label: '其他', value: 7 } + ], default: '', ui: { widget: 'select' @@ -137,7 +146,7 @@ export class FreightComponentsListComponent implements OnInit { } } }, - sou3rce: { + oftenUsedServices: { type: 'string', title: '常用服务', enum: [{ label: '全部', value: '' }], @@ -149,18 +158,18 @@ export class FreightComponentsListComponent implements OnInit { } } }, - sou1r3ce: { - type: 'string', - title: '客户类型', - enum: [{ label: '全部', value: '' }], - default: '', - ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } - } - }, + // sou1r3ce: { + // type: 'string', + // title: '客户类型', + // enum: [{ label: '全部', value: '' }], + // default: '', + // ui: { + // widget: 'select', + // visibleIf: { + // expand: (value: boolean) => value + // } + // } + // }, promotersTelephone: { title: '业务员', type: 'string', @@ -172,29 +181,29 @@ export class FreightComponentsListComponent implements OnInit { } } }, - promotersTe1le3phone: { - title: '合伙人', - type: 'string', - ui: { - placeholder: '请输入', - showRequired: false, - visibleIf: { - expand: (value: boolean) => value - } - } - }, - promotersTe1lep1hone: { - title: '客服人员', - type: 'string', - ui: { - placeholder: '请输入', - showRequired: false, - visibleIf: { - expand: (value: boolean) => value - } - } - }, - promotersTe1lep12hone: { + // promotersTe1le3phone: { + // title: '合伙人', + // type: 'string', + // ui: { + // placeholder: '请输入', + // showRequired: false, + // visibleIf: { + // expand: (value: boolean) => value + // } + // } + // }, + // promotersTe1lep1hone: { + // title: '客服人员', + // type: 'string', + // ui: { + // placeholder: '请输入', + // showRequired: false, + // visibleIf: { + // expand: (value: boolean) => value + // } + // } + // }, + approvalUserName: { title: '审核人', type: 'string', ui: { @@ -205,7 +214,7 @@ export class FreightComponentsListComponent implements OnInit { } } }, - time: { + createTime: { title: '申请时间', type: 'string', ui: { @@ -217,7 +226,7 @@ export class FreightComponentsListComponent implements OnInit { } } as SFDateWidgetSchema }, - tim1e: { + approvalTime: { title: '审核时间', type: 'string', ui: { @@ -250,9 +259,8 @@ export class FreightComponentsListComponent implements OnInit { title: '注册渠道', enum: [ { label: '全部', value: '' }, - { label: '用户注册', value: 1 }, - { label: '货主添加', value: 2 }, - { label: '运营添加', value: 3 } + { label: '货主注册', value: 1 }, + { label: '平台添加', value: 2 } ], default: '', ui: { @@ -262,7 +270,7 @@ export class FreightComponentsListComponent implements OnInit { } } }, - sourc2e: { + isExpired: { type: 'string', title: '证件是否过期', enum: [{ label: '全部', value: '' }], @@ -296,9 +304,22 @@ export class FreightComponentsListComponent implements OnInit { this.columns = [ // { title: '', type: 'checkbox', className: 'text-center' }, { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 }, - { title: '统一社会信用代码', className: 'text-center', index: 'unifiedSocialCreditCode', width: 200 }, - { title: '公司所在地', className: 'text-center', index: 'unifi1edSocialCreditCode', width: 200 }, - { title: '企业类型', className: 'text-center', index: 'unifiedSoci1alCreditCode', width: 200 }, + { title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 }, + { + title: '公司所在地', + className: 'text-center', + index: 'province', + width: 200, + format: item => `${item.provinceName}${item.cityName}${item.areaName}` + }, + { + title: '企业类型', + className: 'text-center', + index: 'enterpriseType', + width: 200, + type: 'enum', + enum: { 1: '物流企业', 2: '货运代理', 3: '生产型企业', 4: '贸易类企业', 5: '科技型企业', 6: '化学化工企业', 7: '其他' } + }, { title: '管理员', className: 'text-center', render: 'contacter', width: 150 }, { title: '常用服务', @@ -309,8 +330,8 @@ export class FreightComponentsListComponent implements OnInit { width: 140 }, { title: '业务员', className: 'text-center', render: 'promotersTelephone', width: 150 }, - { title: '合伙人', className: 'text-center', render: 'promoter1sTelephone', width: 150 }, - { title: '客服人员', className: 'text-center', render: 'promoter1sTelephone', width: 150 }, + // { title: '合伙人', className: 'text-center', render: 'promoter1sTelephone', width: 150 }, + // { title: '客服人员', className: 'text-center', render: 'promoter1sTelephone', width: 150 }, { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 }, { title: '注册渠道', @@ -320,17 +341,17 @@ export class FreightComponentsListComponent implements OnInit { enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加' }, width: 130 }, - { title: '申请时间', className: 'text-center', index: 'netTra1nName', width: 180 }, - { title: '审核时间', className: 'text-center', index: 'netTr1anName', width: 180 }, + { title: '申请时间', className: 'text-center', index: 'createTime', width: 180, type: 'date' }, + { title: '审核时间', className: 'text-center', index: 'approvalTime', width: 180, type: 'date' }, { title: '审核人', className: 'text-center', index: 'approvalUserName', width: 130 }, { title: '保险认证状态', className: 'text-center', - index: 'lockedSta1tus', + index: 'insuranceAuthState', type: 'badge', badge: { - 0: { text: '正常', color: 'success' }, - 1: { text: '冻结', color: 'error' } + 10: { text: '成功', color: 'success' }, + 20: { text: '失败', color: 'error' } }, width: 130 }, diff --git a/src/app/routes/usercenter/components/freight/list/new/new.component.ts b/src/app/routes/usercenter/components/freight/list/new/new.component.ts index 904ac081..9b1cbc6e 100644 --- a/src/app/routes/usercenter/components/freight/list/new/new.component.ts +++ b/src/app/routes/usercenter/components/freight/list/new/new.component.ts @@ -206,9 +206,9 @@ export class FreightComponentsListNewComponent implements OnInit { if (res.name) { this.sf1.setValue('/enterpriseName', res.name); } - if (res.type) { - this.sf1.setValue('/enterpriseType', res.type); - } + // if (res.type) { + // this.sf1.setValue('/enterpriseType', res.type); + // } if (res.addressRegionCodes) { this.sf1.setValue('/enterpriseAddressCode', res.addressRegionCodes); } @@ -291,13 +291,21 @@ export class FreightComponentsListNewComponent implements OnInit { enterpriseType: { title: '公司类型', type: 'string', - minLength: 1, - maxLength: 30, + enum: [ + { label: '物流企业', value: 1 }, + { label: '货运代理', value: 2 }, + { label: '生产型企业', value: 3 }, + { label: '贸易类企业', value: 4 }, + { label: '科技型企业', value: 5 }, + { label: '化学化工企业', value: 6 }, + { label: '其他', value: 7 } + ], ui: { grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, - placeholder: '请输入公司类型', + widget: 'select', + placeholder: '请选择公司类型', errors: { - required: '请输入公司类型' + required: '请选择公司类型' } } },