解决冲突

src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-15 13:17:42
  * @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
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -121,9 +121,7 @@ export class VehicleConfirReceiptComponent implements OnInit {
           cost.RECE = element.price;
         } else if (element.expenseName === '回单付' || element.expenseCode === 'BACK') {
           cost.BACK = element.price;
-        } else if (element.expenseName === '油卡' || element.expenseCode === 'OIL') {
-          cost.OIL = element.price;
-        } else if (element.expenseName === '总费用') {
+        }  else if (element.expenseName === '总费用') {
           cost.traiPrice = element.price;
         }
       });

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

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

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

@@ -812,12 +812,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
     const expenseList = [
       { 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: 'OIL',
-        expenseName: '油卡',
-        price: 0,
-        id: ''
-      },
       {
         expenseCode: 'BACK',
         expenseName: '回单付',