From 5dcc2d0b4ba5d8908eda4906674d4d9934860f5e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 9 Dec 2021 00:12:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E8=81=94=E8=B0=83=E8=B4=A7?= =?UTF-8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bulk-detail/bulk-detail.component.html | 19 +- .../bulk-detail/bulk-detail.component.less | 8 + .../bulk-detail/bulk-detail.component.ts | 20 +- .../onecar-publish.component.html | 44 +++-- .../onecar-publish.component.ts | 171 +++++++++++++----- .../vehicle-detail.component.html | 14 +- 6 files changed, 199 insertions(+), 77 deletions(-) diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html index 4dc21be8..aab4f362 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html @@ -73,7 +73,7 @@

承运信息

网络货运人：{{dataList?.carrierInformationVO?.enterpriseInfoName}}

服务类型：{{dataList?.carrierInformationVO?.serviceType === 1 ? '抢单' : '指派'}}

-

当前指派

+

当前指派

@@ -119,4 +119,19 @@
- \ No newline at end of file + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less index 13a4c9d6..a1566606 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less @@ -17,6 +17,14 @@ margin-bottom: .5em; } } + .freight-info-box{ + width: 95%; + } + .freigth-label{ + display: inline-block; + width: 50px; + text-align: right; + } ::ng-deep{ .approval-status{ diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts index e029e3e9..6cebcb71 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 11:10:14 - * @LastEditTime: 2021-12-08 16:20:45 + * @LastEditTime: 2021-12-08 17:04:35 * @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\supply-management\components\bulk-detail\bulk-detail.component.ts @@ -21,7 +21,7 @@ import { SupplyManagementService } from '../../services/supply-management.servic styleUrls: ['./bulk-detail.component.less'] }) export class SupplyManagementBulkDetailComponent implements OnInit { - + isVisibleView = false id = this.route.snapshot.params.id; i: any; logColumns: STColumn[] = [ @@ -29,6 +29,12 @@ export class SupplyManagementBulkDetailComponent implements OnInit { { title: '操作人', index: 'operationUserPhone' }, { title: '操作时间', index: ' createTime' }, ]; + columnsFloatView: STColumn[] = [ + { title: '司机姓名', index: 'theme' }, + { title: '手机号', index: 'operationUserPhone' }, + { title: '车队长', index: ' createTime' }, + { title: '车牌号', index: ' createTime' }, + ]; driverColums: STColumn[] = [ { title: '司机姓名', index: 'theme' }, { title: '手机号', index: 'operationUserPhone' }, @@ -123,4 +129,14 @@ export class SupplyManagementBulkDetailComponent implements OnInit { relativeTo: this.ar }) } + + handleCancel() { + this.isVisibleView = false + } + handleOK() { + + } + NowAssign() { + this.isVisibleView = true + } } 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 aabfef99..df423fdf 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 @@ -7,7 +7,7 @@
货源单设置
- + @@ -21,13 +21,13 @@
- + X
@@ -36,8 +36,8 @@ 联系人
- - + +
@@ -59,7 +59,7 @@
- + 联系人
- - + +
@@ -89,7 +89,7 @@ 装货时间 - +
@@ -97,7 +97,7 @@ 卸货时间 - + @@ -110,14 +110,14 @@
货物信息
- - - + + + - + @@ -140,14 +140,20 @@ 推荐投保，填写货值自动估保费，司机接单后不可退保。详见《投保告知》
- - + +
- 注意事项:....... + 注意事项：
+ + ①请仔细阅读《投保告知》
+ + ②港澳台、西藏不在投保范围内，不予承保
+ + ③保价费最低收费2元，请按真实货值填写，录入的所有信息必须确保真实，不如实录入的内容，不承担对应赔偿责任。
@@ -159,7 +165,7 @@
补充信息
- +
@@ -168,7 +174,7 @@
运费信息
- + ￥0.00 ￥0.00 ￥0.00 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 ed754edf..fc91d884 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 @@ -22,31 +22,26 @@ import { SupplyManagementService } from '../../services/supply-management.servic export class SupplyManagementOnecarPublishComponent implements OnInit { validateForm1: FormGroup; newTempchecked = false; //是否存入新模板 + sf1data: any; // 货源单设置回显 + sf3data: any; // 货源单设置回显 + sf4data: any; // 货源单设置回显 + sf5data: any; // 货源单设置回显 + sf6data: any; // 货源单设置回显 + sf7data: any; // 货源单设置回显 + creatTime: any; // 货源单设置回显 + modifyTime: any; // 货源单设置回显 id = this.route.snapshot.params.id; // // 单位 unit1 = '吨'; unit2 = '方'; unit3 = '保价费金额'; - startInfo: any[] = [ - { - addresss: '深圳', - name: '张三', - phone: '18888888888' - } - ]; - endInfo: any[] = [ - { - addresss: '深圳', - name: '张三', - phone: '18888888888' - } - ]; + startInfo: any = []; + endInfo: any = []; dataList: any; constructor(private http: _HttpClient, fb: FormBuilder, private router: Router, private route: ActivatedRoute, private modalService: NzModalService, public service: SupplyManagementService) { this.validateForm1 = fb.group({ - name1: [null, []], - name2: [null, []], - name3: [null, []] + createTime: [null, []], + modifyTime: [null, []], }); } @@ -127,7 +122,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { ui: { widget: 'text' }, - default: 0 }, externalResourceCode: { type: 'string', @@ -163,7 +157,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { }; this.ui1 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 120, grid: { span: 8 } } }; @@ -192,7 +186,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { initSF3() { this.schema3 = { properties: { - name1: { + goodsNameId: { type: 'string', title: '货物名称', enum: [ @@ -240,7 +234,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { initSF4() { this.schema4 = { properties: { - name3: { + weight: { type: 'string', title: '重量/体积', ui: { @@ -248,7 +242,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { placeholder: '请输入' } }, - name4: { + volume: { type: 'string', title: '', ui: { @@ -256,7 +250,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { placeholder: '请输入' } }, - name5: { + vehicleDemand: { type: 'string', title: '用车需求', enum: [ @@ -305,13 +299,13 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { spanLabelFixed: 90, grid: { span: 24 } }, - $name3: { + $weight: { grid: { span: 12 } }, - $name4: { + $volume: { grid: { span: 12 } }, - $name5: { + $vehicleDemand: { grid: { span: 12 } }, $name6: { @@ -323,7 +317,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { initSF5() { this.schema5 = { properties: { - name1: { + goodsValue: { type: 'string', title: '货物价值', ui: { @@ -344,12 +338,12 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { initSF6() { this.schema6 = { properties: { - name1: { + stateReceipt: { type: 'string', title: '是否回单', enum: [ - { label: '1', value: '1' }, - { label: '2', value: '2' } + { label: '是', value: '1' }, + { label: '否', value: '2' } ], ui: { widget: 'select', @@ -365,7 +359,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { // change: (i) => this.updateCategory(i, '/categoryId2'), } as SFSelectWidgetSchema }, - name2: { + remarks: { type: 'string', title: '备注', ui: { @@ -387,11 +381,11 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { initSF7() { this.schema7 = { properties: { - name1: { type: 'number', title: '预付', default: 0, ui: { prefix: '￥' } as SFNumberWidgetSchema }, - name2: { type: 'number', title: '到付', default: 0, ui: { prefix: '￥' } as SFNumberWidgetSchema }, - name3: { type: 'number', title: '油卡', default: 0, ui: { prefix: '￥' } as SFNumberWidgetSchema }, - name4: { type: 'number', title: '回单付', default: 0, ui: { prefix: '￥' } as SFNumberWidgetSchema }, - name5: { + prePay: { type: 'number', title: '预付', default: 0, ui: { prefix: '￥' } as SFNumberWidgetSchema }, + toPay: { type: 'number', title: '到付', default: 0, ui: { prefix: '￥' } as SFNumberWidgetSchema }, + oilCardPay: { type: 'number', title: '油卡', default: 0, ui: { prefix: '￥' } as SFNumberWidgetSchema }, + receiptPay: { type: 'number', title: '回单付', default: 0, ui: { prefix: '￥' } as SFNumberWidgetSchema }, + oilCardPay2: { type: 'string', title: '小计', ui: { @@ -399,7 +393,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { placeholder: '请输入' } }, - name6: { + appendFee: { type: 'string', title: '附加费', ui: { @@ -407,7 +401,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { placeholder: '请输入' } }, - name7: { + totalFee: { type: 'string', title: '总费用', ui: { @@ -435,9 +429,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { addStartInfo(event: any) { this.startInfo.push({ - addresss: '', - name: '', - phone: '' + detailedAddress: '', + appUserName: '', + contractTelephone: '' }); } subStartInfo(event: any, index: number) { @@ -446,9 +440,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { addEndInfo(event: any) { this.endInfo.push({ - addresss: '', - name: '', - phone: '' + detailedAddress: '', + appUserName: '', + contractTelephone: '' }); } subEndInfo(event: any, index: number) { @@ -469,10 +463,21 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.validateForm1.controls[key].updateValueAndValidity(); }); console.log(this.validateForm1); + var d = new Date(this.validateForm1.value.createTime); + console.log(d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate() + ' ' + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds()) + if (this.validateForm1.invalid) { return; } - + console.log(this.sf1.value) + console.log(this.startInfo) + console.log(this.endInfo) + console.log(this.validateForm1.value) + console.log(this.sf3.value) + console.log(this.sf4.value) + console.log(this.sf5.value) + console.log(this.sf6.value) + console.log(this.sf7.value) // const data = this.form.value; // this.http.post('/register', data).subscribe(() => { // this.router.navigateByUrl('/passport/register-result', { @@ -497,9 +502,81 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { // 初始化信息 initdata() { console.log(this.id) - this.service.request(`${this.service.$api_get_getCompleteVehicleDetail}`, {id:this.id}).subscribe((res) => { + // this.service.request(`${this.service.$api_get_getCompleteVehicleDetail}`, {id:this.id}).subscribe((res) => { + this.service.request(`${this.service.$api_get_getBulkDetail}`, {id:this.id}).subscribe((res) => { console.log(res) - this.dataList = res; + // this.dataList = res; + this.sf1data = { + shipperAppUserNmae: res?.shipperAppUserNmae || '', + enterpriseProjectName: res?.enterpriseProjectName || '', + enterpriseInfoName: res?.enterpriseInfoName || '', + externalResourceCode: res?.externalResourceCode || '', + dispatchId: res?.dispatchId || '', + } + res.unLoadingPlaceList.forEach((element: any) => { + if(element.type === 1) { + this.startInfo.push({ + detailedAddress: element.detailedAddress, + appUserName: element.appUserName, + contractTelephone: element.contractTelephone, + }) + console.log(element) + if(element.createTime) { + this.creatTime = element.createTime + this.creatTime = element.modifyTime + } + } else if(element.type === 2) { + this.endInfo.push({ + detailedAddress: element.detailedAddress, + appUserName: element.appUserName, + contractTelephone: element.contractTelephone, + }) + } + }); + this.sf3data = { + goodsNameId: res?.goodsInfoList.goodsNameId || '', + weight: res?.goodsInfoList.weight || '', + volume: res?.goodsInfoList.volume || '', + externalResourceCode: res?.goodsInfoList.goodsNameId || '', + } + this.sf4data = { + goodsNameId: res?.goodsInfoList.goodsNameId || '', + weight: res?.goodsInfoList.weight || '', + volume: res?.goodsInfoList.volume || '', + externalResourceCode: res?.goodsInfoList.goodsNameId || '', + } + this.sf5data = { + goodsValue: res?.goodsValue || '', + } + this.sf6data = { + stateReceipt: res?.supplementaryInformationVO.stateReceipt || '', + remarks: res?.supplementaryInformationVO.remarks || '', + } + this.sf7data = { + prePay: res?.shippingInformationVO?.prePay || '', + toPay: res?.shippingInformationVO?.toPay || '', + oilCardPay: res?.shippingInformationVO?.oilCardPay || '', + receiptPay: res?.shippingInformationVO?.receiptPay || '', + oilCardPay2: res?.shippingInformationVO?.oilCardPay || '', + appendFee: res?.shippingInformationVO?.appendFee || '', + totalFee: res?.shippingInformationVO?.totalFee || '', + name8: res?.shippingInformationVO?.appendFee || '', + } + //

预付：{{dataList?.shippingInformationVO?.prePay | currency: '￥' }}

+ //

油卡：{{dataList?.shippingInformationVO?.oilCardPay | currency: '￥'}}

+ //

到付：{{dataList?.shippingInformationVO?.toPay | currency: '￥'}}

+ //

回单付：{{dataList?.shippingInformationVO?.receiptPay | currency: '￥'}}

+ //

保险费：{{dataList?.shippingInformationVO?.insuranceFee | currency: '￥'}}

+ //

附加费保险费：{{dataList?.shippingInformationVO?.appendFee | currency: '￥'}}

totalFee + console.log(this.sf1.value) + console.log(this.startInfo) + console.log(this.endInfo) + console.log(this.validateForm1.value) + console.log(this.sf3.value) + console.log(this.sf4.value) + console.log(this.sf5.value) + console.log(this.sf6.value) + }) } } diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html index 7e454431..4e128293 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html @@ -100,18 +100,18 @@

运费信息

-

预付：{{dataList?.expenseList?.prePay | currency: '￥' }}

-

油卡：{{dataList?.expenseList?.oilCardPay | currency: '￥'}}

-

到付：{{dataList?.expenseList?.toPay | currency: '￥'}}

-

回单付：{{dataList?.expenseList?.receiptPay | currency: '￥'}}

-

保险费：{{dataList?.expenseList?.insuranceFee | currency: '￥'}}

-

附加费保险费：{{dataList?.expenseList?.appendFee | currency: '￥'}}

+

预付：{{dataList?.shippingInformationVO?.prePay | currency: '￥' }}

+

油卡：{{dataList?.shippingInformationVO?.oilCardPay | currency: '￥'}}

+

到付：{{dataList?.shippingInformationVO?.toPay | currency: '￥'}}

+

回单付：{{dataList?.shippingInformationVO?.receiptPay | currency: '￥'}}

+

保险费：{{dataList?.shippingInformationVO?.insuranceFee | currency: '￥'}}

+

附加费保险费：{{dataList?.shippingInformationVO?.appendFee | currency: '￥'}}

-

{{dataList?.expenseList?.totalFee | currency: '￥' }}

+

{{dataList?.shippingInformationVO?.totalFee | currency: '￥' }}