diff --git a/src/app/routes/passport/components/retrieve-password/retrieve-password.component.html b/src/app/routes/passport/components/retrieve-password/retrieve-password.component.html index 46b10562..cd15accc 100644 --- a/src/app/routes/passport/components/retrieve-password/retrieve-password.component.html +++ b/src/app/routes/passport/components/retrieve-password/retrieve-password.component.html @@ -20,7 +20,7 @@ 验证码 - + @@ -45,7 +45,7 @@
设置新密码 - + @@ -53,10 +53,6 @@ -
@@ -71,7 +67,7 @@ 重复新密码 - + diff --git a/src/app/routes/passport/components/retrieve-password/retrieve-password.component.ts b/src/app/routes/passport/components/retrieve-password/retrieve-password.component.ts index 7d5318e8..df0184b0 100644 --- a/src/app/routes/passport/components/retrieve-password/retrieve-password.component.ts +++ b/src/app/routes/passport/components/retrieve-password/retrieve-password.component.ts @@ -163,6 +163,8 @@ export class UserRetrievePasswordComponent implements OnInit, AfterViewInit { } else { this.service.msgSrv.error('获取验证码失败!'); } + } else { + this.service.msgSrv.error(res.msg); } }); } 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 b8dc4087..336ce00a 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 @@ -20,7 +20,7 @@
- 装货地 + 装货地
@@ -32,15 +32,12 @@ placeholder="请输入装货地" /> -
- 联系人 -
+ 联系人 +
- +
- 卸货地 + 卸货地
@@ -84,15 +82,12 @@ placeholder="请输入卸货地" /> -
- 联系人 -
+ 联系人 +
-
-
-
+
+
-
-    天内支付运费 +
+  天内支付运费
diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less index 5c1b8cab..193ba9aa 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less @@ -1,3 +1,17 @@ +:host { + ::ng-deep { + nz-input-number { + width: 100%; + } + nz-date-picker { + width: 100%; + } + } + i { + cursor: pointer; + } +} + .tip-font { margin-left: 16px; font-weight: 500; @@ -15,16 +29,24 @@ align-items: center; justify-content: center; } -.align-center2 { - display: flex; - align-items: center; + +.swap-icon { + padding: 24px; + color: #7d7d7d; + font-size: 30px; + :hover{color: #52acff;} } + #container { width: 300px; height: 180px; } -:host { - ::ng-deep { - nz-input-number{width: 100%;} - } -} \ No newline at end of file + +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/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index 8261f185..eb2969b1 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 @@ -361,6 +361,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { params: { dictKey: 'car:model' }, mode: 'multiple', placeholder: '请选择车型', + maxMultipleCount:3, errors: { required: '请选择车型' } } }, @@ -372,6 +373,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { params: { dictKey: 'car:length' }, mode: 'multiple', placeholder: '请选择车长', + maxMultipleCount:3, errors: { required: '请选择车长' } } } @@ -991,4 +993,25 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } }); } + // 装卸货地址互换 + swapAddress(){ + let item = this.startInfo; + this.startInfo = this.endInfo; + this.endInfo = item; + + this.startInfo.forEach((element: any) => { + element.type = '1'; + }); + this.endInfo.forEach((element: any) => { + element.type = '2'; + }); + + // 计算里程，时间 + if (this.startInfo[0]?.area && this.endInfo[0]?.area) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } + } } 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 478744cc..1e587b03 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 @@ -26,7 +26,7 @@
- 装货地 + 装货地
@@ -39,15 +39,12 @@ required /> -
- 联系人 -
+ 联系人 +
- +
- 卸货地 + 卸货地
@@ -94,15 +92,12 @@ required /> -
- 联系人 -
+ 联系人 +
-
-
+
+
-
-    天内支付运费 +
+  天内支付运费
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 3349938f..193ba9aa 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 @@ -1,3 +1,17 @@ +:host { + ::ng-deep { + nz-input-number { + width: 100%; + } + nz-date-picker { + width: 100%; + } + } + i { + cursor: pointer; + } +} + .tip-font { margin-left: 16px; font-weight: 500; @@ -15,17 +29,24 @@ align-items: center; justify-content: center; } -.align-center2 { - display: flex; - align-items: center; + +.swap-icon { + padding: 24px; + color: #7d7d7d; + font-size: 30px; + :hover{color: #52acff;} } #container { width: 300px; height: 180px; } -:host { - ::ng-deep { - nz-input-number{width: 100%;} - } -} \ No newline at end of file + +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/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts index 7aa86c4a..e512795b 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 @@ -382,6 +382,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { params: { dictKey: 'car:model' }, mode: 'multiple', placeholder: '请选择车型', + maxMultipleCount:3, errors: { required: '请选择车型' } } }, @@ -394,6 +395,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { params: { dictKey: 'car:length' }, mode: 'multiple', placeholder: '请选择车长', + maxMultipleCount:3, errors: { required: '请选择车长' } } } @@ -755,4 +757,25 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { } }); } + // 装卸货地址互换 + swapAddress(){ + let item = this.startInfo; + this.startInfo = this.endInfo; + this.endInfo = item; + + this.startInfo.forEach((element: any) => { + element.type = '1'; + }); + this.endInfo.forEach((element: any) => { + element.type = '2'; + }); + + // 计算里程，时间 + if (this.startInfo[0]?.area && this.endInfo[0]?.area) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } + } } diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html index bf9845d0..c83e90dd 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html @@ -16,10 +16,10 @@ >
-
+
- 装货地 + 装货地
@@ -31,18 +31,16 @@ placeholder="请输入装货地" /> - -
- 联系人 -
+ 联系人 +
-
+
- +
-
+
- 卸货地 + 卸货地
@@ -94,16 +93,13 @@ placeholder="请输入卸货地" /> - - +
- 联系人 -
+ 联系人 +
-
+
- 装货时间 + 装货时间
-
+
+
- 卸货时间 + 卸货时间 @@ -271,7 +270,7 @@
补充信息
-
+
@@ -279,7 +278,7 @@
运费信息
-
+
￥{{ i.value | number: '0.2-2' }} { + this.validateForm1.removeControl(`loadAddress${index}`); + this.validateForm1.removeControl(`loadName${index}`); + this.validateForm1.removeControl(`loadPhone${index}`); + }); + this.endInfo.forEach((element:any, index:any) => { + this.validateForm1.removeControl(`unloadAddress${index}`); + this.validateForm1.removeControl(`unloadName${index}`); + this.validateForm1.removeControl(`unloadPhone${index}`); + }); + + let item = this.startInfo; + this.startInfo = this.endInfo; + this.endInfo = item; + + this.startInfo.forEach((element:any,index:any) => { + element.type = '1'; + this.validateForm1.addControl(`loadAddress${index}`, new FormControl(null, Validators.required)); + this.validateForm1.addControl(`loadName${index}`, new FormControl(null, Validators.required)); + this.validateForm1.addControl(`loadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')])); + }); + this.endInfo.forEach((element:any,index:any) => { + element.type = '2'; + this.validateForm1.addControl(`unloadAddress${index}`, new FormControl(null, Validators.required)); + this.validateForm1.addControl(`unloadName${index}`, new FormControl(null, Validators.required)); + this.validateForm1.addControl(`unloadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')])); + }); + + // 计算里程，时间 + if (this.startInfo[0]?.area && this.endInfo[0]?.area) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } + } } 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 188c5756..28ba80fa 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 @@ -26,7 +26,7 @@
- 装货地 + 装货地
@@ -38,18 +38,15 @@ placeholder="请输入装货地" /> - -
- 联系人 -
+ 联系人 +
-
- -
+
+ +
- +
@@ -105,18 +103,15 @@ name="unloadAddress{{ idx }}" /> - -
- 联系人 -
+ 联系人 +
-
- -
+
+ +
- 装货时间 + 装货时间 @@ -164,7 +159,7 @@
- 卸货时间 + 卸货时间 @@ -246,15 +241,22 @@
- +
- +

注意事项:

①请仔细阅读《投保告知》

@@ -292,7 +294,9 @@
￥{{ i.value | number: '0.2-2' }} - ￥{{ i.value| number: '0.2-2' }}（费率：{{ currentRate | number: '0.2-4' }}%） + ￥{{ i.value | number: '0.2-2' }}（费率：{{ currentRate | number: '0.2-4' }}%） ￥{{ i.value | number: '0.2-2' }}
@@ -307,7 +311,7 @@ nzPlaceHolder="请输入1-30" >
-
+
   天内支付运费
@@ -319,7 +323,7 @@
- +
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 2af010e4..f6d4bb4f 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 @@ -1,6 +1,14 @@ :host { ::ng-deep { - nz-input-number{width: 100%;} + nz-input-number { + width: 100%; + } + nz-date-picker { + width: 94.3%; + } + } + i { + cursor: pointer; } } @@ -22,9 +30,23 @@ justify-content: center; } +.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/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index c43bf611..bd2a9238 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 @@ -341,6 +341,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { params: { dictKey: 'car:model' }, mode: 'multiple', placeholder: '请选择车型', + maxMultipleCount:3, errors: { required: '请选择车型' } } }, @@ -352,6 +353,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { params: { dictKey: 'car:length' }, mode: 'multiple', placeholder: '请选择车长', + maxMultipleCount:3, errors: { required: '请选择车长' } } } @@ -972,4 +974,42 @@ export class SupplyManagementReleasePublishComponent implements OnInit { goBack() { window.history.go(-1); } + // 装卸货地址互换 + swapAddress(){ + this.startInfo.forEach((element:any, index:any) => { + this.validateForm1.removeControl(`loadAddress${index}`); + this.validateForm1.removeControl(`loadName${index}`); + this.validateForm1.removeControl(`loadPhone${index}`); + }); + this.endInfo.forEach((element:any, index:any) => { + this.validateForm1.removeControl(`unloadAddress${index}`); + this.validateForm1.removeControl(`unloadName${index}`); + this.validateForm1.removeControl(`unloadPhone${index}`); + }); + + let item = this.startInfo; + this.startInfo = this.endInfo; + this.endInfo = item; + + this.startInfo.forEach((element:any,index:any) => { + element.type = '1'; + this.validateForm1.addControl(`loadAddress${index}`, new FormControl(null, Validators.required)); + this.validateForm1.addControl(`loadName${index}`, new FormControl(null, Validators.required)); + this.validateForm1.addControl(`loadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')])); + }); + this.endInfo.forEach((element:any,index:any) => { + element.type = '2'; + this.validateForm1.addControl(`unloadAddress${index}`, new FormControl(null, Validators.required)); + this.validateForm1.addControl(`unloadName${index}`, new FormControl(null, Validators.required)); + this.validateForm1.addControl(`unloadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')])); + }); + + // 计算里程，时间 + if (this.startInfo[0]?.area && this.endInfo[0]?.area) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } + } }