From 12802191fa61f5142be9e64f5cd07ce448b3b2c6 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 18 Feb 2022 15:53:24 +0800 Subject: [PATCH 1/5] fix bug --- src/assets/mocks/menu-data.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index 93580208..3ef4f890 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -123,6 +123,16 @@ "link": "/supply-management/vehicle-amend/:id", "hide": true }, + { + "text": "整车代发货源", + "link": "/supply-management/vehicle-release", + "hide": true + }, + { + "text": "大宗代发货源", + "link": "/supply-management/bulk-release", + "hide": true + }, { "text": "货源详情", "link": "/supply-management/vehicle-detail/:id", From d7062ad688f32b35712445195b82b2f71260c565 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 18 Feb 2022 16:13:43 +0800 Subject: [PATCH 2/5] fix bug --- .../components/bulk-publish/bulk-publish.component.ts | 6 +++--- .../bulk-release-publish/bulk-release-publish.component.ts | 6 +++--- .../components/onecar-publish/onecar-publish.component.ts | 6 +++--- .../components/release-publish/release-publish.component.ts | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index 05b7f7bd..229c4d3e 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts @@ -406,13 +406,13 @@ export class SupplyManagementBulkPublishComponent implements OnInit { grid: { span: 8 } }, $weight: { - grid: { lg: 6, md: 12, sm: 12, xs: 24 } + grid: { lg: 8, md: 12, sm: 12, xs: 24 } }, $volume: { - grid: { lg: 6, md: 12, sm: 12, xs: 24 } + grid: { lg: 8, md: 12, sm: 12, xs: 24 } }, $number: { - grid: { lg: 6, md: 12, sm: 12, xs: 24 } + grid: { lg: 8, md: 12, sm: 12, xs: 24 } }, $carModel: { grid: { span: 8 } diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts index 1a312cb3..85cc2b7f 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts @@ -426,13 +426,13 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { grid: { span: 8 } }, $weight: { - grid: { lg: 6, md: 12, sm: 12, xs: 24 } + grid: { lg: 8, md: 12, sm: 12, xs: 24 } }, $volume: { - grid: { lg: 6, md: 12, sm: 12, xs: 24 } + grid: { lg: 8, md: 12, sm: 12, xs: 24 } }, $number: { - grid: { lg: 6, md: 12, sm: 12, xs: 24 } + grid: { lg: 8, md: 12, sm: 12, xs: 24 } }, $carModel: { grid: { span: 8 } diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index 45580a99..07a5b5d2 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -370,13 +370,13 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { grid: { span: 24 } }, $weight: { - grid: { lg: 6, md: 12, sm: 12, xs: 24 } + grid: { lg: 8, md: 12, sm: 12, xs: 24 } }, $volume: { - grid: { lg: 6, md: 12, sm: 12, xs: 24 } + grid: { lg: 8, md: 12, sm: 12, xs: 24 } }, $number: { - grid: { lg: 6, md: 12, sm: 12, xs: 24 } + grid: { lg: 8, md: 12, sm: 12, xs: 24 } }, $carModel: { grid: { span: 8 } diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index f6500783..3c3ac21b 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -386,13 +386,13 @@ export class SupplyManagementReleasePublishComponent implements OnInit { grid: { span: 24 } }, $weight: { - grid: { lg: 6, md: 12, sm: 12, xs: 24 } + grid: { lg: 8, md: 12, sm: 12, xs: 24 } }, $volume: { - grid: { lg: 6, md: 12, sm: 12, xs: 24 } + grid: { lg: 8, md: 12, sm: 12, xs: 24 } }, $number: { - grid: { lg: 6, md: 12, sm: 12, xs: 24 } + grid: { lg: 8, md: 12, sm: 12, xs: 24 } }, $carModel: { grid: { span: 8 } From 70caafa45e25db655fec00c44d14b744e3326ffb Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 18 Feb 2022 16:31:27 +0800 Subject: [PATCH 3/5] fix bug --- .../driver-config.component.html | 6 +-- .../driver-config/driver-config.component.ts | 47 ++----------------- 2 files changed, 7 insertions(+), 46 deletions(-) diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html index 6efa65e1..6846b9e7 100644 --- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html +++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html @@ -1,7 +1,7 @@ diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts index 525c9ff9..de88a29d 100644 --- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts +++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts @@ -133,56 +133,17 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit { placeholder: '请输入' } }, - identityNo: { - title: '身份证号', + isCaptain: { type: 'string', - ui: { - placeholder: '请输入' - } - }, - promotersTelephone: { - title: '业务员手机号', - type: 'string', - maxLength: 11, - ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } - } - }, - identityStatus: { - type: 'string', - title: '实名认证状态', + title: '类型', enum: [ { label: '全部', value: '' }, - { label: '待审核', value: 0 }, - { label: '审核通过', value: 1 }, - { label: '驳回', value: 2 } + { label: '车队长', value: 1 }, + { label: '司机', value: 0 }, ], default: '', ui: { widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } - } - }, - source: { - type: 'string', - title: '注册渠道', - enum: [ - { label: '全部', value: '' }, - { label: '用户注册', value: 1 }, - { label: '货主添加', value: 2 }, - { label: '运营添加', value: 3 }, - ], - default: '', - ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } } } } From c8e1bc6dd403358290b0b4a36e4314f5640cd301 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 18 Feb 2022 17:47:22 +0800 Subject: [PATCH 4/5] fix bug --- .../onecar-publish/onecar-publish.component.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index 07a5b5d2..3a2e0708 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -1128,16 +1128,28 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { receiptAddress: res?.receiptAddress || '', remarks: res?.supplementaryInformationVO?.remarks || '' }; + // this.sf7data = { + // prePay: res?.shippingInformationVO?.prePay, + // toPay: res?.shippingInformationVO?.toPay, + // oilCardPay: 0, + // receiptPay: res?.shippingInformationVO?.receiptPay, + // subtotal: res?.shippingInformationVO?.totalFee, + // total: res?.shippingInformationVO?.totalFee, + // appendFee: res?.shippingInformationVO?.appendFee, + // paymentDays: res?.paymentDays + // }; this.sf7data = { prePay: res?.shippingInformationVO?.prePay, toPay: res?.shippingInformationVO?.toPay, oilCardPay: 0, receiptPay: res?.shippingInformationVO?.receiptPay, - subtotal: res?.shippingInformationVO?.totalFee, total: res?.shippingInformationVO?.totalFee, appendFee: res?.shippingInformationVO?.appendFee, paymentDays: res?.paymentDays }; + this.sf7.setValue('/prePay', this.sf7data.prePay); + this.sf7.setValue('/toPay', this.sf7data.toPay); + this.sf7.setValue('/receiptPay', this.sf7data.receiptPay); this.payChange(); } From 29b50850f95d93591395e0ae731e15e2fde839d1 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 18 Feb 2022 17:48:20 +0800 Subject: [PATCH 5/5] fix bug --- .../onecar-publish/onecar-publish.component.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index 3a2e0708..1353058b 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -1128,16 +1128,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { receiptAddress: res?.receiptAddress || '', remarks: res?.supplementaryInformationVO?.remarks || '' }; - // this.sf7data = { - // prePay: res?.shippingInformationVO?.prePay, - // toPay: res?.shippingInformationVO?.toPay, - // oilCardPay: 0, - // receiptPay: res?.shippingInformationVO?.receiptPay, - // subtotal: res?.shippingInformationVO?.totalFee, - // total: res?.shippingInformationVO?.totalFee, - // appendFee: res?.shippingInformationVO?.appendFee, - // paymentDays: res?.paymentDays - // }; this.sf7data = { prePay: res?.shippingInformationVO?.prePay, toPay: res?.shippingInformationVO?.toPay,