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

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-02-28 19:37:40 +08:00
parent f08a45af4f
commit c4ea948c73
6 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,7 +199,7 @@
<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-center" > <div class="align-center" >
<div nz-col nzSpan="16"> <div nz-col nzSpan="12">
<nz-input-number <nz-input-number
[(ngModel)]="i.value" [(ngModel)]="i.value"
(ngModelChange)="i.setValue($event)" (ngModelChange)="i.setValue($event)"
@ -208,7 +208,7 @@
[nzStep]="1" [nzStep]="1"
></nz-input-number> ></nz-input-number>
</div> </div>
<div nz-col nzSpan="8"> <div nz-col nzSpan="12">
<span>&nbsp;天内支付运费</span> <span>&nbsp;天内支付运费</span>
</div> </div>
</div> </div>

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

@ -217,7 +217,7 @@
<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-center" > <div class="align-center" >
<div nz-col nzSpan="16"> <div nz-col nzSpan="12">
<nz-input-number <nz-input-number
[ngModel]="i.value" [ngModel]="i.value"
[nzMin]="1" [nzMin]="1"
@ -227,7 +227,7 @@
nzPlaceHolder="请输入1-30" nzPlaceHolder="请输入1-30"
></nz-input-number> ></nz-input-number>
</div> </div>
<div nz-col nzSpan="8"> <div nz-col nzSpan="12">
<span>&nbsp;天内支付运费</span> <span>&nbsp;天内支付运费</span>
</div> </div>
</div> </div>

4
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
View File

@ -327,7 +327,7 @@
<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-center"> <div class="align-center">
<div nz-col nzSpan="16"> <div nz-col nzSpan="12">
<nz-input-number <nz-input-number
[ngModel]="i.value" [ngModel]="i.value"
[nzMin]="1" [nzMin]="1"
@ -339,7 +339,7 @@
[nzPrecisionMode]="'cut'" [nzPrecisionMode]="'cut'"
></nz-input-number> ></nz-input-number>
</div> </div>
<div nz-col nzSpan="8"> <div nz-col nzSpan="12">
<span>&nbsp;天内支付运费</span> <span>&nbsp;天内支付运费</span>
</div> </div>
</div> </div>

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

@ -340,7 +340,7 @@
<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-center"> <div class="align-center">
<div nz-col nzSpan="16"> <div nz-col nzSpan="12">
<nz-input-number <nz-input-number
[ngModel]="i.value" [ngModel]="i.value"
[nzMin]="1" [nzMin]="1"
@ -352,7 +352,7 @@
[nzPrecisionMode]="'cut'" [nzPrecisionMode]="'cut'"
></nz-input-number> ></nz-input-number>
</div> </div>
<div nz-col nzSpan="8"> <div nz-col nzSpan="12">
<span>&nbsp;天内支付运费</span> <span>&nbsp;天内支付运费</span>
</div> </div>
</div> </div>

4
src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-06 15:01:40 * @Date : 2022-01-06 15:01:40
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-02-24 16:24:32 * @LastEditTime : 2022-02-28 19:34:38
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -25,7 +25,7 @@ export class TranAgreementComponent {
} }
ngOnInit() { ngOnInit() {
this.service.request(this.service.$api_getAgreementInfoByType,{type:'6'}).subscribe((res) => { this.service.request(this.service.$api_getContractContent,{type:'6'}).subscribe((res) => {
if (res) { if (res) {
this.agreement = res; this.agreement = res;
} }

4
src/app/routes/supply-management/services/supply-management.service.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-03 11:10:14 * @Date : 2021-12-03 11:10:14
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-02-28 15:22:19 * @LastEditTime : 2022-02-28 19:34:22
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -115,6 +115,8 @@ export class SupplyManagementService extends BaseService {
$api_getDictValue = `/api/mdc/pbc/dictItems/getDictValue`; $api_getDictValue = `/api/mdc/pbc/dictItems/getDictValue`;
// 获取协议信息 // 获取协议信息
public $api_getAgreementInfoByType = '/api/mdc/pbc/agreementInfo/getAgreementInfoByType'; public $api_getAgreementInfoByType = '/api/mdc/pbc/agreementInfo/getAgreementInfoByType';
// 获取协议信息
public $api_getContractContent = '/api/sdc/contractTemplate/getContractContent';
// 获取运价 // 获取运价
public $api_getFreight = '/api/mdc/cuc/freightConfig/getFreight'; public $api_getFreight = '/api/mdc/cuc/freightConfig/getFreight';
/** /**