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

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-02-21 19:31:05 +08:00
parent cf6d0c5158
commit 9e01d52198
8 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
View File

@ -10,7 +10,6 @@ import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-r
import { of } from 'rxjs';
import { ShipperBaseService } from '@shared';
import { Router } from '@angular/router';
import { orderManagementVoucherViewComponent } from '../../modal/audit/voucher-view/voucher-view.component';
@Component({
selector: 'app-order-management-compliance-audit',

6
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
View File

@ -414,8 +414,12 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
}
// 生成电子单据
generate(item: any, sts?: number) {
let text = '查看凭证';
if(sts == 2) {
text = '生成电子单据';
}
const modalRef = this.modal.create({
nzTitle: '查看凭证',
nzTitle: text,
nzWidth: '50%',
nzContent: orderManagementVoucherViewComponent,
nzComponentParams: {

10
src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
View File

@ -48,7 +48,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
this.initSF();
}
initSF() {
if(this.Status === 1) {
console.log(this.Status)
if(this.Status == 1) {
this.schema = {
properties: {
@ -216,6 +217,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath','unloadingLadingBillFilePath','unloadingPeopleVehiclesGoodsFilePath' ]
};
}else {
console.log('只读')
this.schema = {
properties: {
loadingLadingBillFilePath: {
@ -383,6 +385,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
} as SFUploadWidgetSchema,
}
},
required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath','unloadingLadingBillFilePath','unloadingPeopleVehiclesGoodsFilePath' ]
};
}
this.ui = {
@ -418,10 +421,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
})
}
sure() {
const params = {
id: this.i.id,
}
console.log(params)
const params = [this.i.id];
this.service.request(this.service.$api_get_billAuditPass, params).subscribe((res) => {
if(res) {
this.service.msgSrv.success('审核成功！')

6
src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime : 2022-02-21 16:31:40
* @LastEditTime : 2022-02-21 19:17:56
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.html
@ -136,7 +136,7 @@
</div>
</div>
</nz-card>
<nz-card nzTitle="运费信息" #distannce3>
<nz-card [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'" #distannce3>
<div style="margin-bottom: 18px">
<span style="color: #da001b; font-size: 18px"> {{ i?.goodsInfos?.[0]?.freightPrice | currency }}{{ i?.goodsInfos?.[0]?.freightTypeLabel }} </span>（{{ i?.goodsInfos?.[0]?.settlementBasisLabel }}，{{
i?.goodsInfos?.[0]?.ruleLabel
@ -152,7 +152,7 @@
totalObj?.price - attObj?.price | currency
}}，附加运费{{ attObj?.price | currency}}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
</div>
<div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}</div>
<div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.payeeId }}</div>
</nz-card>
<nz-card nzTitle="附件信息" #distannce4>

8
src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts
View File

@ -1,10 +1,10 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-18 14:32:49
* @LastEditors: Please set LastEditors
* @LastEditTime : 2022-02-21 19:24:05
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.ts
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.ts
*/
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
@ -29,7 +29,7 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
attObj: any;
isVisible = false;
logColumns: STColumn[] = [
{ title: '款项', index: 'expenseName' },
{ title: '款项', index: 'costName' },
{ title: '运输费（元）', index: 'price',render: 'price' },
{ title: '支付时间', index: ' paymentTime' },
{

22
src/app/routes/waybill-management/components/bulk/bulk.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime : 2022-02-21 16:27:35
* @LastEditTime : 2022-02-21 19:29:16
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk\\bulk.component.html
@ -70,29 +70,27 @@
<div> {{ item?.payeeName }}/{{ item?.payeePhone }} </div>
</ng-template>
<ng-template st-row="wayBillCode" let-item let-index="index">
<a [routerLink]="'bulk-detail/' + item.id">{{ item.wayBillCode }}</a>
<a [routerLink]="'bulk-detail/' + item?.id">{{ item?.wayBillCode }}</a>
<div>
<span *ngIf="item?.wayBillStatus == 1">待接单</span>
<span *ngIf="item?.wayBillStatus == 2">待发车</span>
<span *ngIf="item?.wayBillStatus == 3">运输中</span>
<span *ngIf="item?.wayBillStatus == 4">待签收</span>
<span *ngIf="item?.wayBillStatus == 5">已完成</span>
<span *ngIf="item?.wayBillStatus == 6">已取消</span>
<span>{{item?.wayBillStatusLabel}}</span>
</div>
<div>
<span >{{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}}</span>
</div>
</ng-template>
<ng-template st-row="freightPrice" let-item let-index="index">
{{ item.freightPrice | currency }}
{{ item?.freightPrice | currency }}
</ng-template>
<ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
<div *ngIf="item.billExpenseDetailVOList.length > 0">
<p *ngFor="let data of item.billExpenseDetailVOList">
<div *ngIf="item?.billExpenseDetailVOList.length > 0">
<p *ngFor="let data of item?.billExpenseDetailVOList">
{{ data.costCodeLabel }}：{{ data.price | currency }}
<span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</div>
</ng-template>
<ng-template st-row="wayBill" let-item let-index="index">
<a [routerLink]="'/waybill-management/bulk-detail/' + item.id">{{ item.wayBillCode }}</a>
<a [routerLink]="'/waybill-management/bulk-detail/' + item?.id">{{ item?.wayBillCode }}</a>
</ng-template>
<ng-template st-row="goodsInfos" let-item let-index="index">
<div>{{ item?.goodsInfos?.goodsName }}</div>

15
src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime : 2022-02-21 16:31:18
* @LastEditTime : 2022-02-21 19:17:57
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.html
@ -88,15 +88,6 @@
<sv label="计划卸货时间">
{{i?.unloadingTime}}
</sv>
<sv label="接单数量">
{{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件
</sv>
<sv label="装货数量">
{{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件
</sv>
<sv label="卸货数量">
{{i?.settlementWeight}}吨,{{i?.settlementVolume}}方,{{i?.acceptNumber}}件
</sv>
</sv-container>
<div class="mt-md">
<h4 class="text-md">装货卸货信息
@ -136,7 +127,7 @@
</div>
</div>
</nz-card>
<nz-card nzTitle="运费信息" #distannce3>
<nz-card [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'" #distannce3>
<st #st [data]="i?.billExpenseDetailVOList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
<ng-template st-row="price" let-item let-index="index">
{{ item.price | currency}}
@ -145,7 +136,7 @@
<div>
总计：<span style="color: #da001b; font-size: 18px">{{ i?.freight | currency: '￥' }}</span>
</div>
<div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}</div>
<div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.payeeId }}</div>
</nz-card>
<nz-card nzTitle="附件信息" #distannce4>

12
src/app/routes/waybill-management/components/vehicle/vehicle.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime : 2022-02-21 16:26:26
* @LastEditTime : 2022-02-21 19:29:39
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle\\vehicle.component.html
@ -86,12 +86,10 @@
<ng-template st-row="wayBillCode" let-item let-index="index">
<a [routerLink]="'vehicle-detail/' + item.id">{{ item.wayBillCode }}</a>
<div>
<span *ngIf="item?.wayBillStatus == 1">待接单</span>
<span *ngIf="item?.wayBillStatus == 2">待发车</span>
<span *ngIf="item?.wayBillStatus == 3">运输中</span>
<span *ngIf="item?.wayBillStatus == 4">待签收</span>
<span *ngIf="item?.wayBillStatus == 5">已完成</span>
<span *ngIf="item?.wayBillStatus == 6">已取消</span>
<span>{{item?.wayBillStatusLabel}}</span>
</div>
<div>
<span >{{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}}</span>
</div>
</ng-template>
<ng-template st-row="wayBill" let-item let-index="index">