diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html index 8e7b3d7c..7bd237d5 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html @@ -106,7 +106,7 @@ + (ngModelChange)="i.setValue($event)" [nzPrecision]="2" style="width: 100%;border-radius: 4px 0 0 4px;"> @@ -135,19 +135,19 @@ + style="width: 100%;border-radius: 4px 0 0 4px;"> + style="width: 100%;border-radius: 4px 0 0 4px;"> + style="width: 100%;border-radius: 4px 0 0 4px;"> 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 20624310..a9b8a94f 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 @@ -5,233 +5,182 @@ - -
货源单设置
- - {{ i.value }} - -
+
+ +
货源单设置
+ + {{ i.value }} + +
- -
装卸货信息预计公里数:{{ totalDistance }}km,预计行程耗时:{{ totalTime }}小时
- -
-
-
-
- - 装货地 - -
- - - -
-
-
- - 联系人 -
- - - - - - -
-
-
-
-
-
- -
-
-
-
- - 卸货地 - -
- - - -
-
-
- - 联系人 -
- - - - - - -
-
-
-
+ +
装卸货信息预计公里数:{{ totalDistance }}km,预计行程耗时:{{ totalTime }}小时
- - -
- -
货物信息
-
-
- - - - - - - - - - - - - -
- - - - - - - -

例如 付司机运费 = 重量*单价 = 999.99

-

保留小数,即 999.99

-

抹除小数,即 999.00

-

抹除个位,即 990.00

+
+
+
+
+ + 装货地 + +
+ + + +
+
+
+ + 联系人 +
+
+ + + + + + +
+
+
+ +
+
+
+
+ +
+
+
+
+ + 卸货地 + +
+ + + +
+
+
+ + 联系人 +
+
+ + + + + + +
+
+
+
+
+
+ +
+ + + +
货物信息
+
+
+ + + + + + + + + + + -
- - - - - - - - - - - - - - - - - + + +
+ + + + + + + +

例如 付司机运费 = 重量*单价 = 999.99

+

保留小数,即 999.99

+

抹除小数,即 999.00

+

抹除个位,即 990.00

+
+
+
+ + + + + + + + + + + + + + + + +
-
- + - -
补充信息
-
-
- - -
-
-
- -
-
-  天内支付运费 + +
补充信息
+
+
+ + +
+
+
+ +
+
+  天内支付运费 +
-
- - + + +
-
- + - -
- - - - -
-
+ +
+ + + + +
+
+
\ No newline at end of file diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less index 6abb9df7..01ea397a 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less @@ -46,3 +46,100 @@ input[type='number']::-webkit-outer-spin-button { margin: 0; -webkit-appearance: none; } + +.custom-style { + ::ng-deep { + .ant-card { + margin-bottom: 0; + } + + .ant-card-body { + padding-bottom: 0; + } + + .ant-card-bordered { + border: 0 none; + } + + .card-title { + display: flex; + align-items: center; + + >span { + margin-left: 8px; + font-size: 14px; + + em { + font-style: normal; + color: #E60012; + } + } + + &::before { + content: ''; + display: inline-block; + width: 2px; + height: 16px; + margin-right: 10px; + background: #E60012; + } + } + + .ant-btn-dangerous { + border-radius: 4px; + color: #CF3834; + border-color: rgba(207, 56, 52, 0.5); + } + + .icon-wrap { + display: flex; + justify-content: center; + height: 100%; + } + + .swap-icon { + background: url('/assets/images/frame.png') no-repeat 50% 50%; + cursor: pointer; + } + + .ant-input-affix-wrapper, + .ant-input, + .ant-picker, + .ant-select-selector, + .ant-input-number-input, + .ant-input-number { + border-radius: 4px ; + } + .ant-input-group-addon { + border-radius: 0 4px 4px 0; + } + .align-center { + .ant-btn { + height: 40px; + padding: 0 23px; + font-size: 16px; + border-radius: 3px; + } + } + .ant-select-arrow { + transform: scaleX(1.5) translateY(2px); + color: rgb(153,153,153); + font-size: 8px; + } + .ant-picker-suffix { + color: #333; + } + .btn-wrap { + margin-top: 20px; + padding-bottom: 20px; + } + .ant-alert { + padding: 6px 16px; + border-radius: 2px; + font-size: 14px; + } + .fc { + color: #f5222d; + } + } +} 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 789f2339..655daf5a 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 @@ -223,11 +223,8 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { }; this.ui1 = { '*': { - spanLabelFixed: 110, - grid: { span: 12 } - }, - $enterpriseInfoName: { - grid: { span: 24 } + spanLabelFixed: 115, + grid: { span: 8 } } }; } @@ -303,8 +300,14 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { }; this.ui3 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 115, grid: { span: 12 } + }, + $goodsNameId: { + spanLabelFixed: 10 + }, + $goodsTips: { + grid: { span: 24 } } }; } @@ -411,33 +414,37 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { }; this.ui4 = { '*': { - spanLabelFixed: 90, - grid: { span: 24 } + spanLabelFixed: 115, + grid: { span: 12 } }, $freightPrice: { grid: { span: 8 } }, $rule: { + spanLabelFixed: 10, grid: { span: 8 } }, $settlementBasis: { + spanLabelFixed: 10, grid: { span: 8 } }, $weight: { - grid: { lg: 8, md: 12, sm: 12, xs: 24 } + grid: { span: 4 } }, $volume: { - grid: { lg: 8, md: 12, sm: 12, xs: 24 } + spanLabelFixed: 10, + grid: { span: 4 } }, $number: { - grid: { lg: 8, md: 12, sm: 12, xs: 24 } + spanLabelFixed: 10, + grid: { span: 4 } }, $carModel: { - spanLabelFixed: 120, - grid: { span: 8 } + grid: { span: 6 } }, $carLength: { - grid: { span: 8 } + spanLabelFixed: 10, + grid: { span: 6 } } }; } @@ -527,7 +534,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { ui: { widget: 'textarea', placeholder: '请输入', - autosize: { minRows: 3, maxRows: 3 } + autosize: { minRows: 1, maxRows: 1 } } as SFTextareaWidgetSchema } }, @@ -535,7 +542,10 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { }; this.ui6 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 115, + grid: { span: 8 } + }, + $remarks: { grid: { span: 24 } } };