解决冲突

src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-23 13:39:58
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-28 13:40:47
+ * @LastEditTime : 2022-03-01 13:41:57
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -78,6 +78,7 @@
                     (click)="openMap('start', idx)"
                     formControlName="loadAddress{{ idx }}"
                     placeholder="请输入装货地"
+                    readonly="true"
                   />
                 </nz-input-group>
                 <!-- <span style="padding: 0 10px"
@@ -130,6 +131,7 @@
                     (click)="openMap('end', idx)"
                     formControlName="unloadAddress{{ idx }}"
                     placeholder="请输入卸货地"
+                    readonly="true"
                   />
                 </nz-input-group>
                 <!-- <span style="padding: 0 10px"

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

@@ -30,6 +30,7 @@
                     (click)="openMap('start', idx)"
                     formControlName="loadAddress{{ idx }}"
                     placeholder="请输入装货地"
+                    readonly="true"
                   />
                 </nz-input-group>
                 <span *ngIf="idx !== 0" style="padding: 0 10px"
@@ -98,6 +99,7 @@
                     formControlName="unloadAddress{{ idx }}"
                     placeholder="请输入卸货地"
                     name="unloadAddress{{ idx }}"
+                    readonly="true"
                   />
                 </nz-input-group>
                 <span *ngIf="idx !== 0" style="padding: 0 10px"

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

@@ -147,7 +147,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
             searchDebounceTime: 300,
             searchLoadingText: '搜索中...',
             onSearch: (q: any) => {
-              if (!!q) {
+              console.log(q)
+              if (q) {
                 return this.service
                   .request(this.service.$api_enterpriceList, { enterpriseName: q })
                   .pipe(map(res => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
@@ -157,8 +158,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
               }
             },
             change: (q: any) => {
+              if (q) { 
                 this.getRegionCode(q);
               }
+            }
           } as SFSelectWidgetSchema
         },
         enterpriseProjectId: {

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

@@ -36,6 +36,7 @@
                     (click)="openMap('start', idx)"
                     formControlName="loadAddress{{ idx }}"
                     placeholder="请输入装货地"
+                    readonly="true"
                   />
                 </nz-input-group>
                 <span *ngIf="idx !== 0" style="padding: 0 10px"
@@ -104,6 +105,7 @@
                     formControlName="unloadAddress{{ idx }}"
                     placeholder="请输入卸货地"
                     name="unloadAddress{{ idx }}"
+                    readonly="true"
                   />
                 </nz-input-group>
                 <span *ngIf="idx !== 0" style="padding: 0 10px"

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

@@ -135,7 +135,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
             searchDebounceTime: 300,
             searchLoadingText: '搜索中...',
             onSearch: (q: any) => {
-              if (!!q) {
+              if (q) {
                 return this.service
                   .request(this.service.$api_enterpriceList, { enterpriseName: q })
                   .pipe(map(res => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
@@ -145,7 +145,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
               }
             },
             change: (q: any) => {
+              if (q) { 
               this.getRegionCode(q);
+              }
             },
           } as SFSelectWidgetSchema
         },

src/app/routes/supply-management/components/vehicle/vehicle.component.ts

@@ -167,7 +167,17 @@ export class SupplyManagementVehicleComponent implements OnInit {
   /**
    * 导入货源
    */
-  importGoodsSource() {}
+  importGoodsSource() {
+    const modalRef = this.modal.create({
+      nzTitle: '修改运费',
+      nzWidth: '40%',
+      nzContent: SupplyManagementUpdateFreightComponent,
+      nzComponentParams: {
+        // i: item
+      },
+      nzFooter: null
+    });
+  }
 
   /**
    * 修改运费