Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2022-03-02 16:15:43 +08:00
parent 6908a84e25 1db6ff1c4e
commit 8994bf293b
5 changed files with 98 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-18 09:51:21 * @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-03-02 14:52:07 * @LastEditTime : 2022-03-02 15:55:18
* @FilePath : \\tms-obc-web\\proxy.conf.js * @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -20,7 +20,7 @@ module.exports = {
// } // }
'//api': { '//api': {
target: { target: {
host: 'tms-api-dev.eascs.com', host: 'tms-api-test.eascs.com',
protocol: 'https:', protocol: 'https:',
port: 443 port: 443
}, },

8
src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-02-22 13:53:29 * @Date : 2022-02-22 13:53:29
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-02-28 14:37:42 * @LastEditTime : 2022-03-02 15:58:57
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\view-track\\view-track.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\view-track\\view-track.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -33,7 +33,7 @@ import { OrderManagementService } from '../../../services/order-management.servi
}) })
export class OneCarOrderViewtrackComponent implements OnInit { export class OneCarOrderViewtrackComponent implements OnInit {
i: any; // 单行数据 i: any; // 单行数据
MapList: any; // 地图数据 MapList:any[] = []; //地图点位数据组
trajectory = 'car'; trajectory = 'car';
addressItems: any[] = []; //打点地址数据组 addressItems: any[] = []; //打点地址数据组
logColumns: STColumn[] = [ logColumns: STColumn[] = [
@ -73,12 +73,14 @@ export class OneCarOrderViewtrackComponent implements OnInit {
this.service.request(this.service.$api_get_getTrajectory, { id: this.i.id }).subscribe(res => { this.service.request(this.service.$api_get_getTrajectory, { id: this.i.id }).subscribe(res => {
if (res) { if (res) {
const points = res.trackArray; const points = res.trackArray;
let list :any[] = [];
points?.forEach((item: any) => { points?.forEach((item: any) => {
this.MapList.push({ list.push({
name: item.hgt, name: item.hgt,
lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
}); });
}); });
this.MapList = list;
this.addressItems = res.parkArray; this.addressItems = res.parkArray;
if (this.addressItems && this.addressItems.length > 0) { if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => { this.addressItems.forEach(item => {

62
src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
View File

@ -13,16 +13,25 @@
<div nz-row> <div nz-row>
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.shipperAppUserName }}</div> <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.shipperAppUserName }}</div>
<div nz-col nzSpan="10"> <div nz-col nzSpan="10">
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl [acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button> <<<<<<< HEAD <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
<button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl [acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button> [acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl [acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button> <button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button>
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
=======
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
<button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button>
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
>>>>>>> 82c3801cc6ea10d8f6b895d85fe5553850672cea
</div> </div>
</div> </div>
<div class="mt-sm mb-sm" nz-row> <div class="mt-sm mb-sm" nz-row>
<div> <div>
<b <b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b>
>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b
>
</div> </div>
</div> </div>
<nz-divider></nz-divider> <nz-divider></nz-divider>
@ -39,19 +48,14 @@
<div class="approval-status"> <div class="approval-status">
<div style="width: 60%; margin: 0 auto"> <div style="width: 60%; margin: 0 auto">
<nz-steps style="width: 70%; margin: 0 auto" [nzLabelPlacement]="'vertical'"> <nz-steps style="width: 70%; margin: 0 auto" [nzLabelPlacement]="'vertical'">
<nz-step <nz-step [nzStatus]="i?.resourceStatus !== '1' ? 'finish' : 'process'" nzIcon="solution"
[nzStatus]="i?.resourceStatus !== '1' ? 'finish' : 'process'" [nzDescription]="i?.createAt" nzTitle="下单" [nzSubtitle]="i?.createTime"></nz-step>
nzIcon="solution" <nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2'"
[nzDescription]="i?.createAt" [nzStatus]="i?.resourceStatus === '1' ? 'wait' : 'finish'" nzIcon="file-done"
nzTitle="下单" [nzTitle]="i?.resourceStatus === '2' ? '已完结' : '完结'" [nzSubtitle]="i?.endTime"></nz-step>
></nz-step>
<nz-step <nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"
*ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2'" [nzSubtitle]="i?.endTime"></nz-step>
[nzStatus]="i?.resourceStatus === '1' ? 'wait' : 'finish'"
nzIcon="file-done"
[nzTitle]="i?.resourceStatus === '2' ? '已完结' : '完结'"
></nz-step>
<nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step>
</nz-steps> </nz-steps>
</div> </div>
</div> </div>
@ -77,10 +81,8 @@
</ng-container> </ng-container>
</sv-container> </sv-container>
<div class="mt-md"> <div class="mt-md">
<h4 class="text-md" <h4 class="text-md">装货卸货信息
>装货卸货信息 <span class="ml-sm text-sm">(
<span class="ml-sm text-sm"
>(
<label>{{ i?.loadingCount || '一' }}装</label> <label>{{ i?.loadingCount || '一' }}装</label>
<label>{{ i?.unloadingCount || '一' }}卸</label> <label>{{ i?.unloadingCount || '一' }}卸</label>
) )
@ -130,7 +132,8 @@
<nz-divider class="mb-xs mt-xs"></nz-divider> <nz-divider class="mb-xs mt-xs"></nz-divider>
<div class="text-right"> <div class="text-right">
<label>单价：</label> <label>单价：</label>
<span class="text-error-dark text-xxl">{{ item?.freightPrice | currency: '￥' }} {{ freightType[item?.freightType] }}</span> <span class="text-error-dark text-xxl">{{ item?.freightPrice | currency: '￥' }} {{
freightType[item?.freightType] }}</span>
</div> </div>
</div> </div>
</div> </div>
@ -139,8 +142,7 @@
<nz-card nzTitle="关联运单"> <nz-card nzTitle="关联运单">
<sv-container col="5"> <sv-container col="5">
<sv [label]="item?.wayBillStatusLabel" *ngFor="let item of i?.wayBillClassifiedStatisticsVOList"> <sv [label]="item?.wayBillStatusLabel" *ngFor="let item of i?.wayBillClassifiedStatisticsVOList">
(<span [ngClass]="{ 'text-primary': item?.count > 0 }">{{ item?.count }}</span (<span [ngClass]="{ 'text-primary': item?.count > 0 }">{{ item?.count }}</span>)
>)
</sv> </sv>
<!-- <sv label="运输中"> <!-- <sv label="运输中">
(<span [ngClass]="{ 'text-primary': i?.id > 0 }">{{ i?.id }}</span>) (<span [ngClass]="{ 'text-primary': i?.id > 0 }">{{ i?.id }}</span>)
@ -176,14 +178,10 @@
</sv-container> </sv-container>
</nz-card> </nz-card>
<nz-card nzTitle="操作日志"> <nz-card nzTitle="操作日志">
<st <st #st [data]="service.$api_getOperationLogRecordsList" [columns]="logColumns"
#st
[data]="service.$api_getOperationLogRecordsList"
[columns]="logColumns"
[page]="{ show: false, showSize: false }" [page]="{ show: false, showSize: false }"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }">
>
</st> </st>
</nz-card> </nz-card>
</div> </div>

109
src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -7,31 +7,44 @@
</ng-template> </ng-template>
<ng-template #headerContent> <ng-template #headerContent>
<div class="mb-xs" nz-row> <div class="mb-xs" nz-row>
<button nz-button nzType="primary" nzSize="small" nzDanger>{{i?.resourceStatusLabel}}</button> <button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
<h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4> <h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
</div> </div>
<div nz-row> <div nz-row>
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{i?.enterpriseInfoName}}</div> <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.enterpriseInfoName }}</div>
<div nz-col nzSpan="10"> <div nz-col nzSpan="10">
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl [acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']">取消货源</button> <<<<<<< HEAD <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
<button nz-button (click)="assignedCar(i)" [acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']">取消货源</button>
*ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'" acl [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']">重新指派</button> <button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'" acl
<button nz-button (click)="updateGoodsSource(i)" *ngIf="i?.resourceStatus === '1'" acl [acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']">修改货源</button> [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']">重新指派</button>
<button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']">再下一单</button> <button nz-button (click)="updateGoodsSource(i)" *ngIf="i?.resourceStatus === '1'" acl
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']">修改货源</button>
<button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']">再下一单</button>
=======
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']">取消货源</button>
<button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'" acl
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']">重新指派</button>
<button nz-button (click)="updateGoodsSource(i)" *ngIf="i?.resourceStatus === '1'" acl
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']">修改货源</button>
<button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']">再下一单</button>
>>>>>>> 82c3801cc6ea10d8f6b895d85fe5553850672cea
</div> </div>
</div> </div>
<div class="mt-sm mb-sm" nz-row> <div class="mt-sm mb-sm" nz-row>
<div> <div>
<b>总费用：<span class="text-red-light text-md">{{i?.totalAmount | currency: '￥'}}</span></b> <b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '￥' }}</span></b>
</div> </div>
</div> </div>
<nz-divider></nz-divider> <nz-divider></nz-divider>
<div sv-container *ngIf="i"> <div sv-container *ngIf="i">
<sv label="外部货源号">{{ i?.externalResourceCode }} </sv> <sv label="外部货源号">{{ i?.externalResourceCode }} </sv>
<sv label="项目">{{i?.enterpriseProjectName}}</sv> <sv label="项目">{{ i?.enterpriseProjectName }}</sv>
<sv label="录单员">{{i?.createUserName}}/{{i?.createUserPhone}}</sv> <sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
<sv label="调度员">{{i?.dispatchName}}/{{i?.dispatchPhone}} </sv> <sv label="调度员">{{ i?.dispatchName }}/{{ i?.dispatchPhone }} </sv>
<sv label="服务类型">{{i?.serviceTypeLabel}} </sv> <sv label="服务类型">{{ i?.serviceTypeLabel }} </sv>
</div> </div>
</ng-template> </ng-template>
</page-header-wrapper> </page-header-wrapper>
@ -39,46 +52,45 @@
<div class="approval-status"> <div class="approval-status">
<div style="width: 60%; margin: 0 auto"> <div style="width: 60%; margin: 0 auto">
<nz-steps [nzLabelPlacement]="'vertical'"> <nz-steps [nzLabelPlacement]="'vertical'">
<nz-step [nzStatus]="i?.resourceStatus !== '1'?'finish':'process'" nzIcon="solution" <nz-step [nzStatus]="i?.resourceStatus !== '1' ? 'finish' : 'process'" nzIcon="solution"
[nzDescription]="i?.createAt" nzTitle="下单"></nz-step> [nzDescription]="i?.createAt" nzTitle="下单" [nzSubtitle]="i?.createTime"></nz-step>
<nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2' " <nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2'"
[nzStatus]="i?.resourceStatus=== '1'? 'wait':'finish'" nzIcon="file-done" [nzTitle]="'接单'"></nz-step> [nzStatus]="i?.resourceStatus === '1' ? 'wait' : 'finish'" nzIcon="file-done" [nzTitle]="'接单'"
<nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step> [nzSubtitle]="i?.orderReceivingTime"></nz-step>
<nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"
[nzSubtitle]="i?.endTime"></nz-step>
</nz-steps> </nz-steps>
</div> </div>
</div> </div>
</nz-card> </nz-card>
<nz-card nzTitle="基本信息"> <nz-card nzTitle="基本信息">
<sv-container col="2"> <sv-container col="2">
<sv-title>货物信息</sv-title> <sv-title>货物信息</sv-title>
<ng-container *ngFor="let item of i?.goodsInfoVOList"> <ng-container *ngFor="let item of i?.goodsInfoVOList">
<sv label="货物名称"> <sv label="货物名称">
{{item.goodsName}} {{ item.goodsName }}
</sv>
<sv label="货物数量">
{{item.weight}}吨,{{item.volume}}方,{{item.number}}件
</sv> </sv>
<sv label="货物数量"> {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 </sv>
</ng-container> </ng-container>
</sv-container> </sv-container>
<sv-container class="mt-md"> <sv-container class="mt-md">
<sv-title>承运信息</sv-title> <sv-title>承运信息</sv-title>
<sv label="司机姓名"> <sv label="司机姓名">
{{i?.carrierInformationVO?.driverName}} {{ i?.carrierInformationVO?.driverName }}
</sv> </sv>
<sv label="手机号"> <sv label="手机号">
{{i?.carrierInformationVO?.driverTelephone}} {{ i?.carrierInformationVO?.driverTelephone }}
</sv> </sv>
<sv label="车牌号"> <sv label="车牌号">
{{i?.carrierInformationVO?.driverLicensePlate}} {{ i?.carrierInformationVO?.driverLicensePlate }}
</sv> </sv>
</sv-container> </sv-container>
<div class="mt-md"> <div class="mt-md">
<h4 class="text-md">装货卸货信息 <h4 class="text-md">装货卸货信息
<span class="ml-sm text-sm">( <span class="ml-sm text-sm">(
<label>{{i?.loadingCount}}装</label> <label>{{ i?.loadingCount }}装</label>
<label>{{i?.unloadingCount}}卸</label> <label>{{ i?.unloadingCount }}卸</label>
) )
</span> </span>
</h4> </h4>
@ -89,12 +101,12 @@
<div *ngIf="item?.type === '1'" class="loading-row"> <div *ngIf="item?.type === '1'" class="loading-row">
<div class="handling-info-icon loading-bg">装</div> <div class="handling-info-icon loading-bg">装</div>
<div class="info"> <div class="info">
<h4>装货地：{{item?.province}}{{item?.city}}{{item?.area}}{{item?.detailedAddress}}</h4> <h4>装货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}</h4>
<p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p> <p>联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}</p>
</div> </div>
</div> </div>
</div> </div>
<p class="time-info">装货时间：{{i?.loadingTime}}</p> <p class="time-info">装货时间：{{ i?.loadingTime }}</p>
</div> </div>
</div> </div>
<div nz-col [nzSpan]="12"> <div nz-col [nzSpan]="12">
@ -103,12 +115,12 @@
<div *ngIf="item?.type === '2'" class="loading-row"> <div *ngIf="item?.type === '2'" class="loading-row">
<div class="handling-info-icon unloaing-bg">卸</div> <div class="handling-info-icon unloaing-bg">卸</div>
<div class="info"> <div class="info">
<h4>卸货地：{{item?.province}}{{item?.city}}{{item?.area}}{{item?.detailedAddress}}</h4> <h4>卸货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}</h4>
<p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p> <p>联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}</p>
</div> </div>
</div> </div>
</div> </div>
<p class="time-info">卸货时间：{{i?.unloadingTime}}</p> <p class="time-info">卸货时间：{{ i?.unloadingTime }}</p>
</div> </div>
</div> </div>
</div> </div>
@ -118,27 +130,25 @@
<nz-card nzTitle="服务信息"> <nz-card nzTitle="服务信息">
<sv-container> <sv-container>
<sv label="增值服务套餐"> <sv label="增值服务套餐">
{{i?.insuranceTypeLabel}} {{ i?.insuranceTypeLabel }}
</sv> </sv>
<sv label="货物价值"> <sv label="货物价值">
{{i?.goodsValue |currency}} {{ i?.goodsValue | currency }}
</sv>
<sv label="保价费金额">
{{i?.insurancePremium |currency}} 元
</sv> </sv>
<sv label="保价费金额"> {{ i?.insurancePremium | currency }} 元 </sv>
</sv-container> </sv-container>
</nz-card> </nz-card>
<nz-card [nzTitle]="'运费信息（到货后'+i?.paymentDays+'天内支付运费）'"> <nz-card [nzTitle]="'运费信息（到货后' + i?.paymentDays + '天内支付运费）'">
<st [data]="i?.expenseVOList" [columns]="expenseColumns" [page]="{show:false}"> <st [data]="i?.expenseVOList" [columns]="expenseColumns" [page]="{ show: false }">
<ng-template st-row="total" let-item> <ng-template st-row="total" let-item>
<div> <div>
{{item?.totalAmount | currency}} {{ item?.totalAmount | currency }}
<span>(含附加费）</span> <span>(含附加费）</span>
</div> </div>
</ng-template> </ng-template>
<ng-template st-row="price" let-item> <ng-template st-row="price" let-item>
<div> <div>
{{item?.price | currency}} {{ item?.price | currency }}
</div> </div>
</ng-template> </ng-template>
</st> </st>
@ -147,9 +157,9 @@
<h3> <h3>
<label>总计 :</label> <label>总计 :</label>
<span class="text-error-dark text-xl"> <span class="text-error-dark text-xl">
{{(i?.totalAmount) | currency}} {{ i?.totalAmount | currency }}
</span> </span>
<span>（运费{{i?.totalFreight | currency}}含附加运费 {{i?.totalSurcharge| currency}}）</span> <span>（运费{{ i?.totalFreight | currency }}含附加运费 {{ i?.totalSurcharge | currency }}）</span>
</h3> </h3>
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}</div> <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}</div>
</div> </div>
@ -158,24 +168,23 @@
<nz-card nzTitle="补充信息"> <nz-card nzTitle="补充信息">
<sv-container> <sv-container>
<sv label="是否回单"> <sv label="是否回单">
{{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
</sv> </sv>
<sv label="回单类型"> <sv label="回单类型">
{{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
</sv> </sv>
<sv label="所在地区"> <sv label="所在地区">
{{i?.supplementaryInformationVO?.area}} {{ i?.supplementaryInformationVO?.area }}
</sv> </sv>
<sv label="详细地址"> <sv label="详细地址">
{{i?.supplementaryInformationVO?.address}} {{ i?.supplementaryInformationVO?.address }}
</sv> </sv>
<sv label="备注"> <sv label="备注">
{{i?.supplementaryInformationVO?.remarks}} {{ i?.supplementaryInformationVO?.remarks }}
</sv> </sv>
</sv-container> </sv-container>
</nz-card> </nz-card>
<nz-card nzTitle="操作日志"> <nz-card nzTitle="操作日志">
<st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"> <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"> </st>
</st>
</nz-card> </nz-card>
</div> </div>

2
src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts
View File

@ -49,6 +49,8 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
} }
ngOnInit(): void { ngOnInit(): void {
this.mapInit(); this.mapInit();
console.log(this.MapList);
// this.DataInit(); // this.DataInit();
} }
ngOnDestroy(): void { ngOnDestroy(): void {