解决冲突

src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts

@@ -86,19 +86,6 @@ export class ContractManagementTemplateTextComponent implements OnInit {
             }
           } as SFSelectWidgetSchema
         },
-        // contractType: {
-        //   title: '单据类型',
-        //   type: 'string',
-        //   default: '',
-        //   ui: {
-        //     widget: 'dict-select',
-        //     params: { dictKey: 'contract:document:type' },
-        //     containAllLable: true,
-        //     visibleIf: {
-        //       templateType: value => value === 'MX'
-        //     }
-        //   } as SFSelectWidgetSchema
-        // },
          signingObject: {
           type: 'string',
           title: '承包商对象',

src/app/routes/insurance-management/components/list/list.component.ts

@@ -480,6 +480,7 @@ export class insuranceManagementListComponent implements OnInit {
           {
             text: '查看保单',
             click: _record => this.showImg(_record),
+            iif: item => item.insureStatus == '2' 
             // acl: { ability: ['VEHICLE-LIST-view'] },
             // iif: item =>
             //   item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1'
@@ -487,6 +488,7 @@ export class insuranceManagementListComponent implements OnInit {
           {
             text: '退保费',
             click: _record => this.retreatPrice(_record),
+            iif: item => item.insureStatus == '2' 
             // acl: { ability: ['VEHICLE-LIST-view'] },
           }
         ]
@@ -531,7 +533,7 @@ export class insuranceManagementListComponent implements OnInit {
       nzContent: '退还后不可撤销，请谨慎操作！',
       nzCancelText: '取消',
       nzOnOk: () => {
-        this.service.request(this.service.$api_del_many, [value.id]).subscribe(res => {
+        this.service.request(this.service.$api_get_addINPBillRefundApplication, {id: value.id}).subscribe(res => {
           if (res) {
             this.service.msgSrv.success('删除菜单成功');
           }

src/app/routes/insurance-management/services/insurance-management.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-03 15:31:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-10 10:40:56
+ * @LastEditTime : 2022-02-28 17:11:54
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\insurance-management\\services\\insurance-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -27,6 +27,8 @@ export class InsuranceManagementService extends ShipperBaseService {
  
   //  保险费公司认证
   $api_get_submitAuthInfo = `/api/sdc/premiumInfo/submitAuthInfo`;
+  //  退保费
+  $api_get_addINPBillRefundApplication = `/billRefundApplication/addINPBillRefundApplication`;
 
   constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
     super(injector, eaCacheSrv);

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

@@ -14,10 +14,11 @@
   <div class="card-title"
     >装卸货信息<span class="tip-font">预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时</span></div
   >
+
   <form nz-form [formGroup]="validateForm1" role="form">
     <div nz-row [nzGutter]="24">
       <div nz-col [nzSpan]="10">
-        <div *ngFor="let data of startInfo; let idx = index">
+        <div *ngFor="let data1 of startInfo; let idx = index">
           <nz-form-item>
             <nz-form-label [nzSpan]="3" nzRequired>装货地</nz-form-label>
             <nz-form-control [nzErrorTip]="'请输入装货地'">
@@ -25,78 +26,15 @@
                 <nz-input-group [nzSuffix]="endInconTemp1">
                   <input
                     nz-input
-                    [(ngModel)]="data.detailedAddress"
+                    [(ngModel)]="data1.detailedAddress"
                     (click)="openMap('start', idx)"
                     formControlName="loadAddress{{ idx }}"
                     placeholder="请输入装货地"
                   />
                 </nz-input-group>
-              
+                <span *ngIf="idx !== 0" style="padding: 0 10px"
-                <span *ngIf="idx !== 0" [ngClass]="idx == 0 ? 'hides' : ''" style="padding: 0 10px"
                   ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i
                 ></span>
-                <span *ngIf="idx == 0" style="visibility:hidden;padding: 0 10px"
-                  ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i
-                ></span>
-              </div>
-            </nz-form-control>
-          </nz-form-item>
-          <nz-form-item>
-            <nz-form-label [nzSpan]="3" nzRequired>联系人</nz-form-label>
-            <div style="display: flex; width: 80.7%">
-              <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
-                <input
-                  nz-input
-                  [(ngModel)]="data.appUserName"
-                  formControlName="loadName{{ idx }}"
-                  name="loadName{{ idx }}"
-                  maxlength="30"
-                  placeholder="请输入联系人姓名"
-                />
-              </nz-form-control>
-              <nz-form-control [nzErrorTip]="'请输入联系人电话'">
-                <input
-                  style="margin-left: 12px"
-                  nz-input
-                  [(ngModel)]="data.contractTelephone"
-                  maxlength="11"
-                  formControlName="loadPhone{{ idx }}"
-                  name="loadPhone{{ idx }}"
-                  placeholder="请输入联系人电话"
-                />
-              </nz-form-control>
-            </div>
-          </nz-form-item>
-        </div>
-        <div style="display: flex; justify-content: center">
-          <button nz-button nzType="primary" (click)="addStartInfo()">
-            <i nz-icon nzType="plus"></i>
-            添加装货地
-          </button>
-        </div>
-      </div>
-      <div nz-col [nzSpan]="4">
-        <div style="display: flex; justify-content: center">
-          <span class="swap-icon" (click)="swapAddress()"><i nz-icon nzType="swap"
-              nzTheme="outline"></i></span>
-        </div>
-      </div>
-      <div nz-col [nzSpan]="10">
-        <div *ngFor="let data of endInfo; let idx = index">
-          <nz-form-item>
-            <nz-form-label [nzSpan]="3" nzRequired>卸货地</nz-form-label>
-            <nz-form-control [nzErrorTip]="'请输入卸货地'">
-              <div class="align-center">
-                <nz-input-group [nzSuffix]="endInconTemp1">
-                  <input
-                    nz-input
-                    [(ngModel)]="data.detailedAddress"
-                    (click)="openMap('end', idx)"
-                    formControlName="unloadAddress{{ idx }}"
-                    placeholder="请输入卸货地"
-                  />
-                </nz-input-group>
-                <span *ngIf="idx !== 0" style="padding: 0 10px"><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i></span>
                 <span *ngIf="idx == 0" style="visibility:hidden;padding: 0 10px"
                 ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i
               ></span>
@@ -109,7 +47,75 @@
               <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
                 <input
                   nz-input
-                  [(ngModel)]="data.appUserName"
+                  [(ngModel)]="data1.appUserName"
+                  formControlName="loadName{{ idx }}"
+                  name="loadName{{ idx }}"
+                  maxlength="30"
+                  placeholder="请输入联系人姓名"
+                />
+              </nz-form-control>
+              <nz-form-control [nzErrorTip]="'请输入联系人电话'">
+                <input
+                  style="margin-left: 12px"
+                  nz-input
+                  [(ngModel)]="data1.contractTelephone"
+                  maxlength="11"
+                  formControlName="loadPhone{{ idx }}"
+                  name="loadPhone{{ idx }}"
+                  placeholder="请输入联系人电话"
+                />
+              </nz-form-control>
+            </div>
+          </nz-form-item>
+        </div>
+        <div nz-row>
+          <div nz-col [nzSpan]="4"></div>
+          <div style="display: flex; justify-content: center">
+            <button nz-button nzType="primary" (click)="addStartInfo()">
+              <i nz-icon nzType="plus"></i>
+              添加装货地
+            </button>
+          </div>
+        </div>
+      </div>
+      <div nz-col [nzSpan]="4">
+        <div style="display: flex; justify-content: center">
+          <span class="swap-icon" (click)="swapAddress()"><i nz-icon nzType="swap"
+              nzTheme="outline"></i></span>
+        </div>
+      </div>
+      <div nz-col [nzSpan]="10">
+        <div *ngFor="let data2 of endInfo; let idx = index">
+          <nz-form-item>
+            <nz-form-label [nzSpan]="4" nzRequired>卸货地</nz-form-label>
+            <nz-form-control [nzErrorTip]="'请输入卸货地'">
+              <div class="align-center">
+                <nz-input-group [nzSuffix]="endInconTemp1">
+                  <input
+                    nz-input
+                    [(ngModel)]="data2.detailedAddress"
+                    (click)="openMap('end', idx)"
+                    formControlName="unloadAddress{{ idx }}"
+                    placeholder="请输入卸货地"
+                    name="unloadAddress{{ idx }}"
+                  />
+                </nz-input-group>
+                <span *ngIf="idx !== 0" style="padding: 0 10px"
+                  ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i
+                ></span>
+                <span *ngIf="idx == 0" style="visibility:hidden;padding: 0 10px"
+                ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i
+              ></span>
+              </div>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="3" nzRequired>联系人</nz-form-label>
+            <div style="display: flex; width: 80.7%">
+              <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
+                <input
+                  nz-input
+                  [(ngModel)]="data2.appUserName"
                   maxlength="30"
                   formControlName="unloadName{{ idx }}"
                   name="unloadAddress{{ idx }}"
@@ -120,7 +126,7 @@
                 <input
                   style="margin-left: 12px"
                   nz-input
-                  [(ngModel)]="data.contractTelephone"
+                  [(ngModel)]="data2.contractTelephone"
                   formControlName="unloadPhone{{ idx }}"
                   name="unloadAddress{{ idx }}"
                   maxlength="11"
@@ -130,18 +136,21 @@
             </div>
           </nz-form-item>
         </div>
-        <div style="display: flex; justify-content: center">
+        <div nz-row>
-          <button nz-button nzType="primary" (click)="addEndInfo()">
+          <div nz-col [nzSpan]="4"></div>
-            <i nz-icon nzType="plus"></i>
+          <div style="display: flex; justify-content: center">
-            添加卸货地
+            <button nz-button nzType="primary" (click)="addEndInfo()">
-          </button>
+              <i nz-icon nzType="plus"></i>
+              添加卸货地
+            </button>
+          </div>
         </div>
       </div>
     </div>
     <div nz-row [nzGutter]="24" style="margin-top: 24px">
       <div nz-col [nzSpan]="10">
         <nz-form-item>
-          <nz-form-label [nzSpan]="5" nzRequired>装货时间</nz-form-label>
+          <nz-form-label [nzSpan]="3" nzRequired>装货时间</nz-form-label>
           <nz-form-control [nzErrorTip]="'请输入装货时间'">
             <nz-date-picker
             nzShowTime
@@ -155,14 +164,14 @@
       <div nz-col [nzSpan]="4"></div>
       <div nz-col [nzSpan]="10">
         <nz-form-item>
-          <nz-form-label [nzSpan]="5" nzRequired>卸货时间</nz-form-label>
+          <nz-form-label [nzSpan]="3" nzRequired>卸货时间</nz-form-label>
           <nz-form-control [nzErrorTip]="'请输入卸货时间'">
             <nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" formControlName="unloadingTime"></nz-date-picker>
           </nz-form-control>
         </nz-form-item>
       </div>
     </div>
-    <ng-template #endInconTemp1><i nz-icon nzType="global"></i></ng-template>
+    <ng-template #endInconTemp1><i nz-icon nzType="environment" nzTheme="outline"></i></ng-template>
   </form>
 </nz-card>
 <nz-card>

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

@@ -50,7 +50,3 @@ input[type='number']::-webkit-outer-spin-button {
   margin: 0;
   -webkit-appearance: none;
 }
-.hides {
-  margin-left: 10px;
-  color: aqua;
-}

src/app/routes/supply-management/components/update-price/update-price.component.ts

@@ -79,6 +79,10 @@ export class SupplyManagementUpdatePriceComponent implements OnInit {
         spanLabelFixed: 100,
         grid: { span: 16 },
       },
+      '$rule': {
+        spanLabelFixed: 120,
+        grid: { span: 16 },
+      },
     };
   }
 

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

@@ -616,13 +616,14 @@ export class SupplyManagementVehicleComponent implements OnInit {
             click: _record => this.nextOrder(_record),
             acl: { ability: ['SUPPLY-INDEX-vehiclePlaceOrder'] }
           },
-          {type: 'divider'},
           {
             text: '重新指派　',
             click: _record => this.assignedCar(_record),
             iif: item => item.resourceStatus === '1' && item.serviceType === '2',
             acl: { ability: ['SUPPLY-INDEX-vehicleReassign'] }
-          }
+          },
+          {type: 'divider'},
+
         ]
       }
     ];