-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ i.value | currency }}
- {{ i.value | currency }}（费率：{{ currentRate | number:
- '0.2-4' }}%）
- {{ i.value | currency }}
-
-
-
-
+
+ 运费信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i.value | currency }}
+ {{ i.value | currency }}（费率：{{ currentRate | number:
+ '0.2-4' }}%）
+ {{ i.value | currency }}
+
+
-
- 天内支付运费
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.less b/src/app/routes/supply-management/components/release-publish/release-publish.component.less
index b34cbcc9..acb1655a 100644
--- a/src/app/routes/supply-management/components/release-publish/release-publish.component.less
+++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.less
@@ -5,16 +5,16 @@
}
nz-date-picker {
- width: 94.3%;
+ width: 100%;
}
.sf3 {
.goods_Tips_item {
.goods_tips {
- width: calc(50% - 45px);
+ width: calc(50% - 57px);
.ant-alert {
- padding: 0 0 0 2px;
+ margin-bottom: 5px;
}
}
@@ -78,3 +78,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;
+ }
+ }
+}
\ No newline at end of file
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 b17688c4..a457bfcd 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
@@ -227,19 +227,19 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
this.ui1 = {
'*': {
spanLabelFixed: 115,
- grid: { span: 12 }
+ grid: { span: 8 }
},
$enterpriseInfoName: {
- grid: { span: 12 }
+ grid: { span: 8 }
},
$shipperAppUserId: {
- grid: { span: 12 }
+ grid: { span: 8 }
},
$enterpriseProjectId: {
- grid: { span: 12 }
+ grid: { span: 8 }
},
$dispatchId: {
- grid: { span: 12 }
+ grid: { span: 8 }
}
};
}
@@ -259,11 +259,11 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
},
goodsTypeId: {
type: 'string',
- title: '货物名称',
+ title: '货物类型',
ui: {
widget: 'select',
placeholder: '请选择',
- errors: { required: '请选择货物名称' },
+ errors: { required: '请选择货物类型' },
asyncData: () =>
this.shipperSrv.loadConfigByKey('goods.name.config.type').pipe(
map((data: any) => {
@@ -291,7 +291,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
ui: {
widget: 'select',
placeholder: '请选择',
- errors: { required: '请填写货物名称' },
+ errors: { required: '请填写货物类型' },
change: (value: any, data: any) => {
this.sf3.setValue('/goodsName', data.label);
},
@@ -315,7 +315,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
title: '',
maxLength: 20,
ui: {
- errors: { required: '请填写货物名称' },
+ errors: { required: '请填写货物类型' },
visibleIf: {
goodsTypeName: (value: any) => value && value === '其它'
},
@@ -332,6 +332,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
spanLabelFixed: 115,
grid: { span: 12 }
},
+ $goodsNameId: {
+ spanLabelFixed: 10
+ },
$goodsTips: {
grid: { span: 24 }
}
@@ -400,14 +403,14 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
}
}
},
- hidenField: {
- type: 'string',
- title: '',
- default: ' ',
- ui: {
- widget: 'text'
- }
- },
+ // hidenField: {
+ // type: 'string',
+ // title: '',
+ // default: ' ',
+ // ui: {
+ // widget: 'text'
+ // }
+ // },
insurancePackagedGoods: {
type: 'string',
title: '货物包装',
@@ -444,7 +447,25 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
this.ui4 = {
'*': {
spanLabelFixed: 115,
- grid: { span: 8 }
+ grid: { span: 12 }
+ },
+ $weight: {
+ grid: { span: 4 }
+ },
+ $volume: {
+ spanLabelFixed: 10,
+ grid: { span: 4 }
+ },
+ $number: {
+ spanLabelFixed: 10,
+ grid: { span: 4 }
+ },
+ $carModel: {
+ grid: { span: 6 }
+ },
+ $carLength: {
+ spanLabelFixed: 10,
+ grid: { span: 6 }
}
};
}
@@ -528,16 +549,16 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
this.ui5 = {
'*': {
spanLabelFixed: 115,
- grid: { span: 12 }
+ grid: { span: 8 }
},
$type1: {
- grid: { span: 24 }
+ grid: { span: 8 }
},
$type2: {
- grid: { span: 24 }
+ grid: { span: 8 }
},
$freeInsurance1: {
- grid: { span: 24 }
+ grid: { span: 24}
},
$freeInsurance2: {
grid: { span: 24 }
@@ -626,7 +647,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
ui: {
widget: 'textarea',
placeholder: '请输入',
- autosize: { minRows: 3, maxRows: 3 }
+ autosize: { minRows: 1, maxRows: 1 }
} as SFTextareaWidgetSchema
}
},
@@ -634,7 +655,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
};
this.ui6 = {
'*': {
- spanLabelFixed: 90,
+ spanLabelFixed: 125,
+ grid: { span: 8 }
+ },
+ $remarks: {
grid: { span: 24 }
}
};
@@ -675,6 +699,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
this.ui7 = {
'*': {
spanLabelFixed: 115,
+ grid: { span: 8 }
+ },
+ $paymentDays: {
grid: { span: 24 }
}
};
@@ -1267,7 +1294,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => {
if (res === false) {
const modalRef = this.modalService.error({
- nzTitle: '货物名称含有违禁词，请重新输入！',
+ nzTitle: '货物类型含有违禁词，请重新输入！',
});
modalRef.afterClose.subscribe(result => {
// this.sf3.setValue('/goodsName1', null);
diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html
index dbe91bcd..f23247bb 100644
--- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html
+++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html
@@ -31,15 +31,7 @@