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

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-02-25 15:35:01 +08:00
parent 4520daabe9
commit d734ec5f72
3 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.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:22:10 * @LastEditTime : 2022-02-25 15:34:07
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -121,9 +121,7 @@ export class VehicleConfirReceiptComponent implements OnInit {
cost.RECE = element.price; cost.RECE = element.price;
} else if (element.expenseName === '回单付' || element.expenseCode === 'BACK') { } else if (element.expenseName === '回单付' || element.expenseCode === 'BACK') {
cost.BACK = element.price; cost.BACK = element.price;
} else if (element.expenseName === '油卡' || element.expenseCode === 'OIL') { } else if (element.expenseName === '总费用') {
cost.OIL = element.price;
} else if (element.expenseName === '总费用') {
cost.traiPrice = element.price; cost.traiPrice = element.price;
} }
}); });

22
src/app/routes/supply-goods/components/carload/carload.component.ts
View File

@ -2,8 +2,8 @@
* @Description: * @Description:
* @Author: wsm * @Author: wsm
* @Date: 2021-07-15 09:42:57 * @Date: 2021-07-15 09:42:57
* @LastEditTime: 2022-01-13 15:26:51 * @LastEditTime : 2022-02-25 15:34:50
* @LastEditors: Please set LastEditors * @LastEditors : Shiming
* @Reference: * @Reference:
*/ */
import { AfterViewInit, Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; import { AfterViewInit, Component, OnInit, TemplateRef, ViewChild } from '@angular/core';
@ -128,15 +128,15 @@ export class SupplyGoodsComponentListCarloadComponent implements OnInit, AfterVi
showRequired: false, showRequired: false,
}, },
}, },
unifiedSocialCreditCode2: { // unifiedSocialCreditCode2: {
title: '油卡', // title: '油卡',
type: 'string', // type: 'string',
minimum:0, // minimum:0,
maximum:99999, // maximum:99999,
ui: { // ui: {
showRequired: false, // showRequired: false,
}, // },
}, // },
unifiedSocialCreditCode3: { unifiedSocialCreditCode3: {
title: '回单付', title: '回单付',
type: 'string', type: 'string',

6
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -812,12 +812,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
const expenseList = [ const expenseList = [
{ expenseCode: 'PRE', expenseName: '预付', price: this.sf7.value.prePay, id: this.sf7data?.prePayId ? this.sf7data?.prePayId : '' }, { expenseCode: 'PRE', expenseName: '预付', price: this.sf7.value.prePay, id: this.sf7data?.prePayId ? this.sf7data?.prePayId : '' },
{ expenseCode: 'RECE', expenseName: '到付', price: this.sf7.value.toPay, id: this.sf7data?.toPayId ? this.sf7data?.toPayId : '' }, { expenseCode: 'RECE', expenseName: '到付', price: this.sf7.value.toPay, id: this.sf7data?.toPayId ? this.sf7data?.toPayId : '' },
{
expenseCode: 'OIL',
expenseName: '油卡',
price: 0,
id: ''
},
{ {
expenseCode: 'BACK', expenseCode: 'BACK',
expenseName: '回单付', expenseName: '回单付',