diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts
index 2b1ea743..59a25b13 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -399,10 +399,11 @@ tabs = {
*/
initST() {
this.columns = [
- { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
+ { title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
{
title: '订单号',
width: '180px',
+ fixed: 'left',
className: 'text-left',
render: 'billCode'
},
@@ -426,7 +427,7 @@ tabs = {
{
title: '货物信息',
className: 'text-left',
- width: '180px',
+ width: '250px',
render: 'goodsName'
}, {
title: '运费单价',
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
index 874e345c..c5821a87 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -351,10 +351,11 @@ resourceStatus: any;
*/
initST() {
this.columns = [
- { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
+ { title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
{
title: '订单号',
width: '200px',
+ fixed: 'left',
className: 'text-left',
render: 'billCode'
},
diff --git a/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.html b/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.html
deleted file mode 100644
index d7d289c7..00000000
--- a/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.less b/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.less
deleted file mode 100644
index 30444d6b..00000000
--- a/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.less
+++ /dev/null
@@ -1,7 +0,0 @@
- .left_btn {
- width: 50px;
- height: 32px;
- padding-left: 8px;
- line-height:32px;
- background-color: #d7d7d7;
- }
\ No newline at end of file
diff --git a/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.ts b/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.ts
deleted file mode 100644
index c6c55a98..00000000
--- a/src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-import { preloaderFinished } from '@delon/theme';
-/*
- * @Author: your name
- * @Date: 2021-12-14 14:03:07
- * @LastEditTime: 2021-12-20 16:13:16
- * @LastEditors: Please set LastEditors
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\bulk\update-freight\update-freight.component.ts
- */
-import { Component, OnInit, ViewChild } from '@angular/core';
-import {
- SFComponent,
- SFCustomWidgetSchema,
- SFDateWidgetSchema,
- SFNumberWidgetSchema,
- SFRadioWidgetSchema,
- SFSchema,
- SFSelectWidgetSchema,
- SFTextareaWidgetSchema,
- SFUISchema,
- SFUploadWidgetSchema
-} from '@delon/form';
-import { _HttpClient } from '@delon/theme';
-import { NzMessageService } from 'ng-zorro-antd/message';
-import { NzModalRef } from 'ng-zorro-antd/modal';
-import { SupplyManagementService } from 'src/app/routes/supply-management/services/supply-management.service';
-import { Observable, Observer } from 'rxjs';
-
-@Component({
- selector: 'app-order-management-sure-depart',
- templateUrl: './sure-depart.component.html',
- styleUrls: ['./sure-depart.component.less']
-})
-export class SureDepartComponent implements OnInit {
- record: any = {};
- i: any;
- Status: any;
-
- data: any ={
- place1: '',
- place2: ''
- };
- @ViewChild('sf', { static: false }) sf!: SFComponent;
- schema: SFSchema = {};
- ui: SFUISchema = {};
- constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: SupplyManagementService ) {}
-
- ngOnInit(): void {
- this.initSF();
- }
- initSF() {
- this.schema = {
- properties: {
- datetime: {
- type: 'string',
- title: '装货时间',
- format: 'date-time',
- },
- no2: {
- type: 'string',
- title: '装货重量',
- ui: {
- widget: 'custom',
- }
- },
- no3: {
- type: 'string',
- title: '装货体积',
- ui: {
- widget: 'custom',
- }
- },
- no4: {
- type: 'string',
- title: '',
- ui: {
- widget: 'text',
- },
- default: '单张大小不超过5M,支持.jpg、.jpeg和 .png格式',
- },
- avatar: {
- type: 'string',
- title: '装货凭证',
- ui: {
- action: `/scm/cms/cms/upload/multipartFile/fileModel`,
- fileType: 'image/png,image/jpeg,image/jpg',
- limit: 1,
- limitFileCount: 1,
- resReName: 'url',
- urlReName: 'url',
- widget: 'upload',
- descriptionI18n: ' 提单号',
- data: {
- // appId: environment.appId,
- },
- name: 'multipartFile',
- multiple: true,
- listType: 'picture-card',
- change: (args: any) => {
- if (args.type === 'success') {
- const avatar = [
- {
- uid: -1,
- name: 'LOGO',
- status: 'done',
- url: args.fileList[0].response.url,
- response: {
- url: args.fileList[0].response.url
- }
- }
- ];
- this.sf?.setValue('/avatar', avatar);
- }
- },
- beforeUpload: (file: any, _fileList: any) => {
- return new Observable((observer: Observer) => {
- const isLt2M = file.size / 1024 / 1024 < 5;
- if (!isLt2M) {
- this.service.msgSrv.warning('图片大小超过5M!');
- observer.complete();
- return;
- }
- observer.next(isLt2M);
- observer.complete();
- });
- }
- } as SFUploadWidgetSchema
- },
- avatar2: {
- type: 'string',
- title: '',
- ui: {
- action: `/scm/cms/cms/upload/multipartFile/fileModel`,
- fileType: 'image/png,image/jpeg,image/jpg',
- limit: 1,
- limitFileCount: 1,
- resReName: 'url',
- urlReName: 'url',
- widget: 'upload',
- descriptionI18n: '人车货照片',
- data: {
- // appId: environment.appId,
- },
- name: 'multipartFile',
- multiple: true,
- listType: 'picture-card',
- change: (args: any) => {
- if (args.type === 'success') {
- const avatar = [
- {
- uid: -1,
- name: 'LOGO',
- status: 'done',
- url: args.fileList[0].response.url,
- response: {
- url: args.fileList[0].response.url
- }
- }
- ];
- this.sf?.setValue('/avatar', avatar);
- }
- },
- beforeUpload: (file: any, _fileList: any) => {
- return new Observable((observer: Observer) => {
- const isLt2M = file.size / 1024 / 1024 < 5;
- if (!isLt2M) {
- this.service.msgSrv.warning('图片大小超过5M!');
- observer.complete();
- return;
- }
- observer.next(isLt2M);
- observer.complete();
- });
- }
- } as SFUploadWidgetSchema
- }
- },
- required: ['reason']
- };
- this.ui = {
- '*': {
- spanLabelFixed: 100,
- grid: { span: 20 }
- },
- $avatar: { grid: { span: 12} },
- $avatar2: { grid: { span: 12} },
- };
- }
- save(value: any): void {
- console.log(value)
- // this.http.post(`/user/${this.record.id}`, value).subscribe(res => {
- // this.msgSrv.success('保存成功');
- // this.modal.close(true);
- // });
- }
-
- close(): void {
- this.modal.destroy(true);
- }
-
-}
diff --git a/src/app/routes/order-management/order-management.module.ts b/src/app/routes/order-management/order-management.module.ts
index 4cdb23c6..13a0f831 100644
--- a/src/app/routes/order-management/order-management.module.ts
+++ b/src/app/routes/order-management/order-management.module.ts
@@ -20,7 +20,6 @@ import { OrderManagementVehicleDetailComponent } from './components/vehicle-deta
import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component';
import { ConfirReceiptComponent } from './modal/bulk/confir-receipt/confir-receipt.component';
-import { SureDepartComponent } from './modal/bulk/sure-depart/sure-depart.component';
import { UpdateFreightComponent } from './modal/bulk/update-freight/update-freight.component';
import { OneCarOrderCancelComponent } from './modal/vehicle/cancel/cancel.component';
import { VehicleConfirReceiptComponent } from './modal/vehicle/confir-receipt/confir-receipt.component';
@@ -41,7 +40,6 @@ const COMPONENTS: Type[] = [
OrderManagementComplaintComponent,
UpdateFreightComponent,
ConfirReceiptComponent,
- SureDepartComponent,
VehicleUpdateFreightComponent,
VehicleConfirReceiptComponent,
VehicleSureDepartComponent,
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 99b00b53..677576ae 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
@@ -217,7 +217,7 @@
-
+
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 f95432e8..5c1b8cab 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
@@ -15,8 +15,16 @@
align-items: center;
justify-content: center;
}
-
+.align-center2 {
+ display: flex;
+ align-items: center;
+}
#container {
width: 300px;
height: 180px;
}
+:host {
+ ::ng-deep {
+ nz-input-number{width: 100%;}
+ }
+}
\ No newline at end of file
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 6b7df2d5..cb996e6d 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
@@ -165,13 +165,13 @@
-
+
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 f95432e8..3349938f 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
@@ -15,8 +15,17 @@
align-items: center;
justify-content: center;
}
+.align-center2 {
+ display: flex;
+ align-items: center;
+}
#container {
width: 300px;
height: 180px;
}
+:host {
+ ::ng-deep {
+ nz-input-number{width: 100%;}
+ }
+}
\ No newline at end of file
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.html b/src/app/routes/supply-management/components/bulk/bulk.component.html
index e5f7bc10..679c890e 100644
--- a/src/app/routes/supply-management/components/bulk/bulk.component.html
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.html
@@ -1,7 +1,7 @@
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts
index 8706fa15..58ae6e06 100644
--- a/src/app/routes/supply-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts
@@ -190,10 +190,11 @@ export class SupplyManagementBulkComponent implements OnInit {
*/
initST() {
this.columns = [
- { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
+ { title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
{
title: '货源编号',
width: '200px',
+ fixed: 'left',
className: 'text-left',
render: 'resourceCode'
},
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 2200caf8..e5c11f1f 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
@@ -205,22 +205,24 @@
推荐投保,填写货值自动估保费,司机接单后不可退保。详见《投保告知》
-
+
-
-
- 注意事项:
-
- ①请仔细阅读《投保告知》
-
- ②港澳台、西藏不在投保范围内,不予承保
-
- ③保价费最低收费2元,请按真实货值填写,录入的所有信息必须确保真实,不如实录入的内容,不承担对应赔偿责任。
+
+
+
+
+
+
+
+
+ 注意事项:
+ ①请仔细阅读《投保告知》
+ ②港澳台、西藏不在投保范围内,不予承保
+ ③保价费最低收费2元,请按真实货值填写,录入的所有信息必须确保真实,不如实录入的内容,不承担对应赔偿责任。
+
@@ -228,6 +230,7 @@
+
补充信息
@@ -263,13 +266,12 @@
[nzMin]="1"
[nzMax]="30"
[nzStep]="1"
- style="width: 150px"
(ngModelChange)="i.setValue($event)"
nzPlaceHolder="请输入1-30"
>
-
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 f95432e8..92e2ff57 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
@@ -20,3 +20,10 @@
width: 300px;
height: 180px;
}
+
+
+:host {
+ ::ng-deep {
+ nz-input-number{width: 100%;}
+ }
+}
\ No newline at end of file
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 50bb1a77..1c55029f 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
@@ -358,8 +358,14 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
type: 'string',
title: '货物价值',
ui: {
- widget: 'custom',
- placeholder: '请输入'
+ widget: 'custom'
+ }
+ },
+ insureInfo: {
+ type: 'string',
+ title: '',
+ ui: {
+ widget: 'custom'
}
}
},
@@ -368,7 +374,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
this.ui5 = {
'*': {
spanLabelFixed: 90,
- grid: { span: 24 }
+ 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 a6d2bf86..9262cdc9 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
@@ -233,21 +233,19 @@
推荐投保,填写货值自动估保费,司机接单后不可退保。详见《投保告知》
-
+
-
-
+
+
+
+
+
+
+
注意事项:
①请仔细阅读《投保告知》
@@ -260,7 +258,6 @@
-
补充信息
@@ -290,7 +287,7 @@
¥{{ 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 db94a528..755d6bf3 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
@@ -376,13 +376,21 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
ui: {
widget: 'custom'
}
+ },
+ insureInfo: {
+ type: 'string',
+ title: '',
+ ui: {
+ widget: 'custom'
+ }
}
- }
+ },
+ required: ['goodsValue']
};
this.ui5 = {
'*': {
spanLabelFixed: 90,
- grid: { span: 24 }
+ grid: { span: 12 }
}
};
}
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.html b/src/app/routes/supply-management/components/vehicle/vehicle.component.html
index 33da8925..44a969c5 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
-
+
-
+
-
+ [loading]="service.http.loading"
+ [scroll]="{ x: '1200px', y: '500px' }"
+ >
- {{item.resourceCode}}
- {{item.resourceTypeLabel}}{{item.serviceTypeLabel}}
+ {{ item.resourceCode }}
+ {{ item.resourceTypeLabel }}{{ item.serviceTypeLabel }}
- {{item.totalAmount | currency}}
-
+ {{ item.totalAmount | currency }}
- {{item.surcharge | currency}}
-
+ {{ item.surcharge | currency }}
- 车型: {{item.carModelLabel}}
- 车长: {{item.expand}} 米
+ 车型: {{ item.carModelLabel }}
+ 车长: {{ item.expand }} 米
@@ -83,24 +88,27 @@
-
+
-
+
-
-
+
-
-
+
-
\ No newline at end of file
+
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
index 49b5cd04..362afc5f 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@@ -354,10 +354,11 @@ export class SupplyManagementVehicleComponent implements OnInit {
*/
private initST(): STColumn[] {
return [
- { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
+ { title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
{
title: '货源编号',
width: '180px',
+ fixed: 'left',
className: 'text-left',
render: 'resourceCode'
},
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
index 16bec8e7..2ff33d14 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@@ -1,7 +1,7 @@