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-02-11 14:03:23 +08:00
parent 1c2218927d bbd47bd2b7
commit f0ec72ef5f
5 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/routes/financial-management/components/cost-management/expenses-receivable/expenses-receivable.component.html
View File

@ -1,3 +1,13 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-27 14:08:49
* @LastEditors : Shiming
* @LastEditTime : 2022-02-11 13:46:53
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\expenses-receivable\\expenses-receivable.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper title="应收费用单" [logo]="logo"> <page-header-wrapper title="应收费用单" [logo]="logo">
<ng-template #logo> <ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()"> <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">

6
src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-15 13:17:42 * @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:24:08 * @LastEditTime : 2022-02-11 11:08:42
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -14,9 +14,9 @@
<div> <div>
<p> <p>
<span style="font-weight: bolder" <span style="font-weight: bolder"
>总运费：<span style="color: #dc112a">{{ data.totalFreight | currency }}</span></span >总运费：<span style="color: #dc112a">{{ data?.totalAmount | currency }}</span></span
> >
（运输费：{{ data.freight | currency }}，附加费：{{ data.surcharge | currency }}） （运输费：{{ data?.totalFreight | currency }}，附加费：{{ data?.totalSurcharge | currency }}，附加费率：{{ data?.totalRate * 100 + '%' }}）
</p> </p>
<p> <p>
<label nz-checkbox [(ngModel)]="aggreechecked">确认已阅读并知晓<a>《变更协议》</a></label> <label nz-checkbox [(ngModel)]="aggreechecked">确认已阅读并知晓<a>《变更协议》</a></label>

3
src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-15 13:17:42 * @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:24:18 * @LastEditTime : 2022-02-11 11:06:40
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -35,6 +35,7 @@ export class VehicleUpdateFreightComponent implements OnInit {
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService) {} constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService) {}
ngOnInit(): void { ngOnInit(): void {
console.log(this.data)
this.initSF(this.data); this.initSF(this.data);
} }
initSF(data: any) { initSF(data: any) {

57
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html
View File

@ -40,7 +40,7 @@
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label> <nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label>
<div style="display: flex;"> <div style="display: flex">
<nz-form-control [nzErrorTip]="'请输入联系人姓名'"> <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
<input <input
nz-input nz-input
@ -92,7 +92,7 @@
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label> <nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label>
<div style="display: flex;"> <div style="display: flex">
<nz-form-control [nzErrorTip]="'请输入联系人姓名'"> <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
<input <input
nz-input nz-input
@ -129,7 +129,8 @@
<sf #sf4 [schema]="schema4" [formData]="sf4data" [button]="'none'" [ui]="ui4"> <sf #sf4 [schema]="schema4" [formData]="sf4data" [button]="'none'" [ui]="ui4">
<ng-template sf-template="freightPrice" let-i let-ui="ui"> <ng-template sf-template="freightPrice" let-i let-ui="ui">
<nz-input-group [nzAddOnAfter]="addOnAfterTemplate"> <nz-input-group [nzAddOnAfter]="addOnAfterTemplate">
<input nz-input [ngModel]="i.value" (ngModelChange)="i.setValue($event)" placeholder="请输入" /> <!-- <input nz-input [ngModel]="i.value" (ngModelChange)="i.setValue($event)" placeholder="请输入" /> -->
<nz-input-number [ngModel]="i.value" (ngModelChange)="i.setValue($event)" [nzMin]="1" style="width: 100%"></nz-input-number>
</nz-input-group> </nz-input-group>
<ng-template #addOnAfterTemplate> <ng-template #addOnAfterTemplate>
<nz-select [ngModel]="sf4.value.freightType" (ngModelChange)="sf4.setValue('/freightType', $event)"> <nz-select [ngModel]="sf4.value.freightType" (ngModelChange)="sf4.setValue('/freightType', $event)">
@ -159,41 +160,35 @@
</ng-template> </ng-template>
<ng-template sf-template="weight" let-i let-ui="ui"> <ng-template sf-template="weight" let-i let-ui="ui">
<nz-input-group [nzAddOnAfter]="'吨'"> <nz-input-group [nzAddOnAfter]="'吨'">
<input <nz-input-number
nz-input
type="number"
[ngModel]="i.value"
min="0"
step="0.01"
(ngModelChange)="i.setValue($event)"
placeholder="总重量，必填" placeholder="总重量，必填"
/> [ngModel]="i.value"
(ngModelChange)="i.setValue($event)"
[nzMin]="1"
style="width: 100%"
></nz-input-number>
</nz-input-group> </nz-input-group>
</ng-template> </ng-template>
<ng-template sf-template="volume" let-i let-ui="ui"> <ng-template sf-template="volume" let-i let-ui="ui">
<nz-input-group [nzAddOnAfter]="'方'"> <nz-input-group [nzAddOnAfter]="'方'">
<input <nz-input-number
nz-input
type="number"
[ngModel]="i.value"
min="0"
step="0.01"
(ngModelChange)="i.setValue($event)"
placeholder="总体积" placeholder="总体积"
/> [ngModel]="i.value"
(ngModelChange)="i.setValue($event)"
[nzMin]="1"
style="width: 100%"
></nz-input-number>
</nz-input-group> </nz-input-group>
</ng-template> </ng-template>
<ng-template sf-template="number" let-i let-ui="ui"> <ng-template sf-template="number" let-i let-ui="ui">
<nz-input-group [nzAddOnAfter]="'车'"> <nz-input-group [nzAddOnAfter]="'车'">
<input <nz-input-number
nz-input
type="number"
[ngModel]="i.value"
min="0"
step="0.01"
(ngModelChange)="i.setValue($event)"
placeholder="总车次" placeholder="总车次"
/> [ngModel]="i.value"
(ngModelChange)="i.setValue($event)"
[nzMin]="1"
style="width: 100%"
></nz-input-number>
</nz-input-group> </nz-input-group>
</ng-template> </ng-template>
</sf> </sf>
@ -217,7 +212,7 @@
</ng-template> --> </ng-template> -->
<ng-template sf-template="paymentDays" let-i let-ui="ui"> <ng-template sf-template="paymentDays" let-i let-ui="ui">
<div nz-row> <div nz-row>
<div class="align-center2" style="width: 350px;"> <div class="align-center2" style="width: 350px">
<div nz-col nzSpan="12"> <div nz-col nzSpan="12">
<nz-input-number <nz-input-number
[(ngModel)]="i.value" [(ngModel)]="i.value"
@ -227,7 +222,7 @@
[nzStep]="1" [nzStep]="1"
></nz-input-number> ></nz-input-number>
</div> </div>
<div > <div>
<span>&nbsp;&nbsp; 天内支付运费</span> <span>&nbsp;&nbsp; 天内支付运费</span>
</div> </div>
</div> </div>
@ -240,8 +235,8 @@
<nz-card> <nz-card>
<div class="align-center"> <div class="align-center">
<!-- <button nz-button nzType="primary" (click)="chooseFamifiar()">生成二维码</button> --> <!-- <button nz-button nzType="primary" (click)="chooseFamifiar()">生成二维码</button> -->
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('assign')">指派熟车</button> <button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('assign')">指派熟车</button>
<!-- <button nz-button nzType="primary" (click)="choose()">取消</button> --> <!-- <button nz-button nzType="primary" (click)="choose()">取消</button> -->
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')">司机抢单</button> <button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')">司机抢单</button>
</div> </div>
</nz-card> </nz-card>

44
src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html
View File

@ -149,7 +149,7 @@
[ngModel]="i.value" [ngModel]="i.value"
(ngModelChange)="i.setValue($event)" (ngModelChange)="i.setValue($event)"
placeholder="请输入" placeholder="请输入"
oninput="if(value>99999)value=99999;if(value<0)value=0" oninput="if(value>99999)value=99999;if(value<1)value=1"
/> />
</nz-input-group> </nz-input-group>
<ng-template #addOnAfterTemplate> <ng-template #addOnAfterTemplate>
@ -178,41 +178,35 @@
</ng-template> </ng-template>
<ng-template sf-template="weight" let-i let-ui="ui"> <ng-template sf-template="weight" let-i let-ui="ui">
<nz-input-group [nzAddOnAfter]="'吨'"> <nz-input-group [nzAddOnAfter]="'吨'">
<input <nz-input-number
nz-input
type="number"
[ngModel]="i.value"
min="0"
step="0.01"
(ngModelChange)="i.setValue($event)"
placeholder="总重量，必填" placeholder="总重量，必填"
/> [ngModel]="i.value"
(ngModelChange)="i.setValue($event)"
[nzMin]="1"
style="width: 100%"
></nz-input-number>
</nz-input-group> </nz-input-group>
</ng-template> </ng-template>
<ng-template sf-template="volume" let-i let-ui="ui"> <ng-template sf-template="volume" let-i let-ui="ui">
<nz-input-group [nzAddOnAfter]="'方'"> <nz-input-group [nzAddOnAfter]="'方'">
<input <nz-input-number
nz-input
type="number"
[ngModel]="i.value"
min="0"
step="0.01"
(ngModelChange)="i.setValue($event)"
placeholder="总体积" placeholder="总体积"
/> [ngModel]="i.value"
(ngModelChange)="i.setValue($event)"
[nzMin]="1"
style="width: 100%"
></nz-input-number>
</nz-input-group> </nz-input-group>
</ng-template> </ng-template>
<ng-template sf-template="number" let-i let-ui="ui"> <ng-template sf-template="number" let-i let-ui="ui">
<nz-input-group [nzAddOnAfter]="'车'"> <nz-input-group [nzAddOnAfter]="'车'">
<input <nz-input-number
nz-input
type="number"
[ngModel]="i.value"
min="0"
step="0.01"
(ngModelChange)="i.setValue($event)"
placeholder="总车次" placeholder="总车次"
/> [ngModel]="i.value"
(ngModelChange)="i.setValue($event)"
[nzMin]="1"
style="width: 100%"
></nz-input-number>
</nz-input-group> </nz-input-group>
</ng-template> </ng-template>
</sf> </sf>