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 d31f8e88..d6916a63 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 @@ -213,16 +213,13 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } as SFSelectWidgetSchema } }, - required: ['shipperAppUserId', 'enterpriseProjectId', 'enterpriseInfoId', 'deadlineTime'] + required: ['shipperAppUserId', 'enterpriseProjectId', 'enterpriseInfoName', 'deadlineTime'] }; this.ui1 = { '*': { spanLabelFixed: 115, grid: { span: 12 } }, - $enterpriseInfoName: { - grid: { span: 24 } - } }; } initSF3() { diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html index 29a70721..c77af698 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html @@ -7,13 +7,9 @@
货源单设置
-
-
{{ i.value }} -
-
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less index f6d4bb4f..a33ce26d 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less @@ -1,52 +1,88 @@ +@import '~@delon/theme/index'; :host { + ::ng-deep { - nz-input-number { - width: 100%; + h3 { + margin-bottom: 20px; + font-size: 16px; } - nz-date-picker { - width: 94.3%; + .submit { + width: 50%; + } + .login { + float: right; + line-height: @btn-height-lg; } } - i { - cursor: pointer; +} +::ng-deep { + .register-password-cdk { + .success, + .warning, + .error { + transition: color 0.3s; + } + .success { + color: @success-color; + } + .warning { + color: @warning-color; + } + .error { + color: @error-color; + } + .progress-pass > .progress { + .ant-progress-bg { + background-color: @warning-color; + } + } } } -.tip-font { - margin-left: 16px; - font-weight: 500; - font-size: 12px; +.form-box{ + display: block; + width: 368px; + margin: 0 auto; } -.card-title { - margin-bottom: 24px; - font-weight: bold; - font-size: 16px; +.content { + background-color: #f0f3f7; +} +.main { + max-width: 1200px; + margin: 0 auto; +} +.header { + background: #fff; +} +.layout { + min-height: 100vh; } -.align-center { +.logo { display: flex; - align-items: center; - justify-content: center; + margin: 16px 0; + line-height: 32px; + dt { + width: 95px; + height: 32px; + img { + vertical-align: top; + } + } + dd { + flex: 1; + margin-bottom: 0; + padding: 0 10px; + color: #1890ff; + font-weight: 500; + font-size: 24px; + } +} +.footer { + text-align: center; + background-color: #f0f3f7; } -.swap-icon { - padding: 24px; - color: #7d7d7d; - font-size: 30px; - :hover{color: #52acff;} -} -#container { - width: 300px; - height: 180px; -} -input[type='number'] { - -moz-appearance: textfield; -} -input[type='number']::-webkit-inner-spin-button, -input[type='number']::-webkit-outer-spin-button { - margin: 0; - -webkit-appearance: none; -} 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 798ab331..1fa22d08 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 @@ -188,6 +188,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { widget: 'text' } }, + externalResourceCode: { type: 'string', title: '外部货源号', @@ -231,7 +232,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { }, asyncData: () => this.shipperSrv.getStaffList2() } as SFSelectWidgetSchema - } + }, }, required: ['shipperAppUserId', 'enterpriseProjectId'] }; @@ -241,7 +242,16 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { grid: { span: 12 } }, $enterpriseInfoName: { - grid: { span: 24 } + grid: { span: 12 } + }, + $shipperAppUserId: { + grid: { span: 12 } + }, + $enterpriseProjectId: { + grid: { span: 12 } + }, + $dispatchId: { + grid: { span: 12 } } }; } diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html index e8897d62..5b61cda9 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html @@ -7,13 +7,9 @@
货源单设置
-
-
{{ i.value }} -
-
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 baeb9766..cfcd982c 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 @@ -176,14 +176,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit { allowClear: true } as SFSelectWidgetSchema }, - // enterpriseInfoName: { - // type: 'string', - // title: '网络货运人', - // ui: { - // widget: 'custom' - // }, - // default: '天津市怡亚通XXXX有限公司' - // }, enterpriseInfoName: { type: 'string', title: '网络货运人', @@ -238,17 +230,26 @@ export class SupplyManagementReleasePublishComponent implements OnInit { optionalHelp: '选择调度员,司机直接联系调度员 ; 不选择,司机直接联系您', asyncData: () => this.shipperSrv.getStaffList2() } as SFSelectWidgetSchema - } + }, }, required: ['shipperAppUserId', 'enterpriseProjectId', 'enterpriseInfoName'] }; this.ui1 = { '*': { - spanLabelFixed: 110, + spanLabelFixed: 115, grid: { span: 12 } }, $enterpriseInfoName: { - grid: { span: 24 } + grid: { span: 12 } + }, + $shipperAppUserId: { + grid: { span: 12 } + }, + $enterpriseProjectId: { + grid: { span: 12 } + }, + $dispatchId: { + grid: { span: 12 } } }; }