From 66655f298d7e73e19cae8671822d18516aa6141b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 13 Jan 2022 16:31:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/bulk/bulk.component.ts | 3 +- .../components/vehicle/vehicle.component.ts | 3 +- .../components/bulk/bulk.component.html | 4 +- .../components/bulk/bulk.component.ts | 3 +- .../components/vehicle/vehicle.component.html | 84 ++++++++++--------- .../components/vehicle/vehicle.component.ts | 3 +- .../components/bulk/bulk.component.ts | 3 +- .../components/vehicle/vehicle.component.ts | 3 +- 8 files changed, 59 insertions(+), 47 deletions(-) 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..3de5d4eb 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' }, 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/supply-management/components/bulk/bulk.component.html b/src/app/routes/supply-management/components/bulk/bulk.component.html index e5f7bc10..d0bb674c 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 @@ - - - - + + + + -
+
- +
- + [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/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts index 176ea7f9..e5e59d4d 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts @@ -348,10 +348,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: 'wayBillCode' }, diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts index a6d2b8b2..b5c2eedf 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts @@ -300,10 +300,11 @@ export class WaybillManagementVehicleComponent 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: '180px', + fixed: 'left', className: 'text-left', render: 'wayBillCode' }, From 07c936a089a64a37269d1d1e0089d42fc2932a4a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 13 Jan 2022 16:38:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../routes/order-management/components/bulk/bulk.component.ts | 2 +- .../supply-management/components/bulk/bulk.component.html | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 3de5d4eb..59a25b13 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -427,7 +427,7 @@ tabs = { { title: '货物信息', className: 'text-left', - width: '180px', + width: '250px', render: 'goodsName' }, { title: '运费单价', 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 d0bb674c..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 @@ From db8208f63fa1664b4f479188bc5be13054addbc2 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 13 Jan 2022 16:55:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sure-depart/sure-depart.component.html | 29 --- .../sure-depart/sure-depart.component.less | 7 - .../bulk/sure-depart/sure-depart.component.ts | 201 ------------------ .../order-management.module.ts | 2 - .../bulk-detail/bulk-detail.component.html | 6 +- .../bulk-detail/bulk-detail.component.ts | 36 ++++ .../components/bulk/bulk.component.ts | 9 +- .../vehicle-detail.component.html | 6 +- .../vehicle-detail.component.ts | 50 ++++- .../components/vehicle/vehicle.component.ts | 5 +- 10 files changed, 91 insertions(+), 260 deletions(-) delete mode 100644 src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.html delete mode 100644 src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.less delete mode 100644 src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.ts 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/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 @@