diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index 9e589e88..5537afc3 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -1,7 +1,7 @@ + + + + + 100元/吨 + 100元/方 + 100元/车 + + +
+
以发货为准 / 以收货为准
+
保留小数/抹除小数/抹除个数
+
+
+ +
+ + +
xx吨
+
+ +
xx吨
+
+
+ + +
xx吨
+
+ +
xx吨
+
+
+ + +
1000元
+
+ +
张三 / 18888888888 / 粤GJ401
+
+ +
李四 / 1888888888
+
+ + + +
+ diff --git a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.less b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.less new file mode 100644 index 00000000..30444d6b --- /dev/null +++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.less @@ -0,0 +1,7 @@ + .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/confir-receipt/confir-receipt.component.ts b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.ts new file mode 100644 index 00000000..381b694e --- /dev/null +++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.ts @@ -0,0 +1,53 @@ +import { preloaderFinished } from '@delon/theme'; +/* + * @Author: your name + * @Date: 2021-12-14 14:03:07 + * @LastEditTime: 2021-12-14 15:43:12 + * @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, + SFNumberWidgetSchema, + SFRadioWidgetSchema, + SFSchema, + SFSelectWidgetSchema, + SFTextareaWidgetSchema, + SFUISchema +} from '@delon/form'; +import { _HttpClient } from '@delon/theme'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalRef } from 'ng-zorro-antd/modal'; + +@Component({ + selector: 'app-order-management-confir-receipt', + templateUrl: './confir-receipt.component.html', + styleUrls: ['./confir-receipt.component.less'] +}) +export class ConfirReceiptComponent implements OnInit { + record: any = {}; + i:any; + data: any = {}; + constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient) {} + + ngOnInit(): void { + } + + save(): void { + // this.http.post(`/user/${this.record.id}`, value).subscribe(res => { + // this.msgSrv.success('保存成功'); + // this.modal.close(true); + // }); + } + + close(): void { + this.modal.destroy(); + } + userAction() { + + } + +} diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html new file mode 100644 index 00000000..b52bb931 --- /dev/null +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html @@ -0,0 +1,53 @@ + + + + +
+ +
元/吨
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+

总运费:¥900.00

+

运输费:¥800.00,附加费:¥100.00

+
+ + diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.less b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.less new file mode 100644 index 00000000..30444d6b --- /dev/null +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.less @@ -0,0 +1,7 @@ + .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/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts new file mode 100644 index 00000000..afad8c66 --- /dev/null +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts @@ -0,0 +1,143 @@ +import { preloaderFinished } from '@delon/theme'; +/* + * @Author: your name + * @Date: 2021-12-14 14:03:07 + * @LastEditTime: 2021-12-14 15:16:27 + * @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, + SFNumberWidgetSchema, + SFRadioWidgetSchema, + SFSchema, + SFSelectWidgetSchema, + SFTextareaWidgetSchema, + SFUISchema +} from '@delon/form'; +import { _HttpClient } from '@delon/theme'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalRef } from 'ng-zorro-antd/modal'; + +@Component({ + selector: 'app-order-management-update-freight', + templateUrl: './update-freight.component.html', + styleUrls: ['./update-freight.component.less'] +}) +export class UpdateFreightComponent implements OnInit { + record: any = {}; + i: any; + @ViewChild('sf', { static: false }) sf!: SFComponent; + schema: SFSchema = {}; + ui: SFUISchema = {}; + data: any = {}; + constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient) {} + + ngOnInit(): void { + this.initSF(); + + if (this.record.id > 0) this.http.get(`/user/${this.record.id}`).subscribe(res => (this.i = res)); + } + initSF() { + this.schema= { + properties: { + no: { + type: 'string', + title: '运费单价', + ui: { + widget: 'custom', + } + }, + sex: { + title: '', + type: 'string', + enum: [ + { label: '保留小数', value: 0 }, + { label: '男', value: 1 }, + { label: '女', value: 2 }, + { label: '保密', value: 3 }, + ], + ui: { + widget: 'select', + } as SFSelectWidgetSchema, + }, + appId: { + type: 'string', + title: '结算依据', + ui: { + width: 300, + grid: { span: 24 }, + widget: 'select', + placeholder: '请选择', + allowClear: true, + // asyncData: () => this.getCatalogueMember(), + }, + }, + no2: { + type: 'string', + title: '装货重量', + ui: { + widget: 'custom', + } + }, + no3: { + type: 'string', + title: '装货体积', + ui: { + widget: 'custom', + } + }, + no4: { + type: 'string', + title: '卸货重量', + ui: { + widget: 'custom', + } + }, + no5: { + type: 'string', + title: '卸货体积', + ui: { + widget: 'custom', + } + }, + name3: { + type: 'string', + title: '变更原因', + maxLength: 100, + ui: { + width: 300, + placeholder:"选填,最多不超过100字", + widget: 'textarea', + autosize: { minRows: 3, maxRows: 6 } + } as SFTextareaWidgetSchema + }, + }, + required: ['no', 'appId'], + type: 'object', + }; + this.ui = { '*': { spanLabelFixed: 100, grid: { span: 12, gutter: 4 } } + }; + } + save(value: any): void { + console.log(value) + console.log(this.data) + this.http.post(`/user/${this.record.id}`, value).subscribe(res => { + this.msgSrv.success('保存成功'); + this.modal.close(true); + }); + } + + close(): void { + this.modal.destroy(); + } + /** + * 更新数字框 + * @param value + * @param type + */ + changeNumVal(value: any, type: number) {} +} diff --git a/src/app/routes/order-management/order-management.module.ts b/src/app/routes/order-management/order-management.module.ts index c4f4d812..7aba50cc 100644 --- a/src/app/routes/order-management/order-management.module.ts +++ b/src/app/routes/order-management/order-management.module.ts @@ -1,8 +1,8 @@ /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-07 14:11:17 - * @LastEditors: your name + * @LastEditTime: 2021-12-14 15:11:13 + * @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\order-management.module.ts */ @@ -19,6 +19,8 @@ import { OrderManagementRiskComponent } from './components/risk/risk.component'; import { OrderManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component'; import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component'; +import { ConfirReceiptComponent } from './modal/bulk/confir-receipt/confir-receipt.component'; +import { UpdateFreightComponent } from './modal/bulk/update-freight/update-freight.component'; import { OrderManagementRoutingModule } from './order-management-routing.module'; const COMPONENTS: Type[] = [ @@ -31,7 +33,9 @@ const COMPONENTS: Type[] = [ OrderManagementAdditionalcComponent, OrderManagementAdditionalcDetailComponent, OrderManagementRiskComponent, - OrderManagementComplaintComponent + OrderManagementComplaintComponent, + UpdateFreightComponent, + ConfirReceiptComponent ]; @NgModule({ 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 b12bcfdb..ff3c31c0 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -428,4 +428,7 @@ handleOK() { } }) } + userAction() { + + } }