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..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 @@ -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 } @@ -1133,11 +1133,13 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { 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(); } 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 } 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 - } } } } 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",