Merge branch 'master' of https://gitlab.eascs.com/tms-ui/tms-obc-web

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-27 17:26:44
+ * @LastEditTime : 2022-04-28 13:43:18
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -30,7 +30,7 @@ module.exports = {
   // },
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html

@@ -1,5 +1,5 @@
 <div *ngIf="i">
-  <page-header-wrapper [title]="'大宗货源详情'" [logo]="logo" [content]="headerContent">
+  <page-header-wrapper [title]="'大宗货源详情'" [logo]="logo">
     <ng-template #logo>
       <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
         <i nz-icon nzType="left" nzTheme="outline"></i>
@@ -27,7 +27,7 @@
         </div>
       </div>
       <nz-divider></nz-divider>
-      <div sv-container *ngIf="i">
+      <div sv-container>
         <sv label="项目">{{ i?.enterpriseProjectName }}</sv>
         <sv label="截止时间">{{ i?.deadlineTime }}</sv>
         <sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
@@ -36,7 +36,35 @@
       </div>
     </ng-template>
   </page-header-wrapper>
-  <nz-card nzTitle="货源进度">
+  <nz-card [nzBorderless]="true" class="mb0">
+    <div class="mb-xs" nz-row>
+      <button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
+      <h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
+    </div>
+    <div nz-row>
+      <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.shipperAppUserName }}</div>
+      <div nz-col nzSpan="10">
+        <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
+          [acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
+        <button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl
+          [acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button>
+        <button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl
+          [acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
+      </div>
+    </div>
+    <div class="mt-sm mb-sm" nz-row>
+      <div>
+        <b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b>
+      </div>
+    </div>
+    <nz-divider></nz-divider>
+    <div sv-container>
+      <sv label="项目">{{ i?.enterpriseProjectName }}</sv>
+      <sv label="截止时间">{{ i?.deadlineTime }}</sv>
+      <sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
+      <sv label="调度员">{{ i?.dispatchName }}/{{ i?.dispatchPhone }} </sv>
+      <sv label="服务类型">{{ i?.serviceTypeLabel }} </sv>
+    </div>
     <div class="approval-status">
       <div style="width: 60%; margin: 0 auto">
         <nz-steps style="width: 70%; margin: 0 auto" [nzLabelPlacement]="'vertical'">
@@ -51,33 +79,6 @@
         </nz-steps>
       </div>
     </div>
-  </nz-card>
-
-  <nz-card nzTitle="基本信息">
-    <sv-container col="3">
-      <sv-title>货物信息</sv-title>
-      <ng-container *ngFor="let item of i?.goodsInfoVOList">
-        <sv label="货物名称">
-          {{item.goodsTypeName}} > {{item.goodsName}}
-        </sv>
-        <sv label="货物数量">
-          {{item.weight}}吨 / {{item.volume>=0?item.volume:'-'}}方
-        </sv>
-        <sv label="剩余">
-          {{i?.surplusWeight!==null?i?.surplusWeight:'--'}}吨 / {{i?.surplusVolume!==null?i?.surplusVolume:'-'}}方
-        </sv>
-        <sv label="用车需求">
-          {{item.carModelLabel || '--'}} / {{item.carLengthLabel || '--'}}<span *ngIf="item.carLength !=='999'">米</span>
-        </sv>
-        <!-- <sv label="承运信息">
-          {{i?.carrierInformationVO?.driverName}} / {{i?.carrierInformationVO?.driverTelephone}} /
-          {{i?.carrierInformationVO?.driverLicensePlate}}
-        </sv> -->
-        <!-- <sv label="当前指派">
-          <a (click)="viewCurrentAssign(i)">查看</a>
-        </sv> -->
-      </ng-container>
-    </sv-container>
     <div class="mt-md">
       <h4 class="text-md">装货卸货信息
         <span class="ml-sm text-sm">(
@@ -119,7 +120,39 @@
     </div>
   </nz-card>
 
-  <nz-card nzTitle="运费信息">
+  <nz-card [nzBorderless]="true" class="mb0">
+    <div class="font-weight-blod text-md detail-title">
+      <a class="sign mr-xs"></a>
+      <span>基本信息</span>
+    </div>
+    <sv-container col="3">
+      <!-- <sv-title>货物信息</sv-title> -->
+      <ng-container *ngFor="let item of i?.goodsInfoVOList">
+        <sv label="货物名称">
+          {{item.goodsTypeName}} > {{item.goodsName}}
+        </sv>
+        <sv label="货物数量">
+          {{item.weight}}吨 / {{item.volume>=0?item.volume:'-'}}方
+        </sv>
+        <sv label="剩余">
+          {{i?.surplusWeight!==null?i?.surplusWeight:'--'}}吨 / {{i?.surplusVolume!==null?i?.surplusVolume:'-'}}方
+        </sv>
+        <sv label="用车需求">
+          {{item.carModelLabel || '--'}} / {{item.carLengthLabel || '--'}}<span *ngIf="item.carLength !=='999'">米</span>
+        </sv>
+        <!-- <sv label="承运信息">
+          {{i?.carrierInformationVO?.driverName}} / {{i?.carrierInformationVO?.driverTelephone}} /
+          {{i?.carrierInformationVO?.driverLicensePlate}}
+        </sv> -->
+        <!-- <sv label="当前指派">
+          <a (click)="viewCurrentAssign(i)">查看</a>
+        </sv> -->
+      </ng-container>
+    </sv-container>
+
+  </nz-card>
+
+  <nz-card [nzBorderless]="true" class="mb0" nzTitle="运费信息">
     <div>
       <div nz-row>
         <div *ngFor="let item of i?.goodsInfoVOList" nz-col nzSpan="24">
@@ -138,7 +171,7 @@
       </div>
     </div>
   </nz-card>
-  <nz-card nzTitle="关联订单">
+  <nz-card [nzBorderless]="true" class="mb0" nzTitle="关联订单">
     <sv-container col="5">
       <sv [label]="item?.wayBillStatusLabel" *ngFor="let item of i?.wayBillClassifiedStatisticsVOList">
         (<span [ngClass]="{ 'text-primary': item?.count > 0 }">{{ item?.count }}</span>)
@@ -157,7 +190,7 @@
       </sv> -->
     </sv-container>
   </nz-card>
-  <nz-card nzTitle="补充信息">
+  <nz-card [nzBorderless]="true" class="mb0" nzTitle="补充信息">
     <sv-container>
       <sv label="是否回单">
         {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
@@ -166,7 +199,8 @@
         {{ i?.supplementaryInformationVO?.receiptTypeLabel }}
       </sv>
       <sv label="联系人" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
-        {{ i?.supplementaryInformationVO?.receiptUserName ? i?.supplementaryInformationVO?.receiptUserName + '/' : '' }}  {{ i?.supplementaryInformationVO?.phon }}
+        {{ i?.supplementaryInformationVO?.receiptUserName ? i?.supplementaryInformationVO?.receiptUserName + '/' : '' }}
+        {{ i?.supplementaryInformationVO?.phon }}
       </sv>
       <sv label="所在地区" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
         {{ i?.supplementaryInformationVO?.area }}
@@ -179,9 +213,8 @@
       </sv>
     </sv-container>
   </nz-card>
-  <nz-card nzTitle="操作日志">
+  <nz-card [nzBorderless]="true" class="mb0" nzTitle="操作日志">
-    <st #st [data]="service.$api_getOperationLogRecordsList" [columns]="logColumns"
+    <st #st [data]="service.$api_getOperationLogRecordsList" [columns]="logColumns" [page]="{}"
-    [page]="{}"
       [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
       [res]="{ reName: { list: 'data.records', total: 'data.total' } }">
     </st>

src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less

@@ -3,7 +3,7 @@
     min-height: 210px;
 
     p {
-      margin-bottom: .5em;
+      margin-bottom: 0;
     }
   }
 

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

@@ -1,5 +1,6 @@
+<nz-spin [nzSpinning]="service.http.loading">
   <div *ngIf="i">
-  <page-header-wrapper [title]="'整车货源详情'" [logo]="logo" [content]="headerContent">
+    <page-header-wrapper [title]="'整车货源详情'" [logo]="logo">
       <ng-template #logo>
         <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
           <i nz-icon nzType="left" nzTheme="outline"></i>
@@ -13,40 +14,20 @@
         <div nz-row>
           <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.enterpriseInfoName }}</div>
           <div nz-col nzSpan="10">
-          <button
+            <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
-            nz-button
+              [acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']">取消货源</button>
-            (click)="cancleGoodsSource()"
+            <button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'" acl
-            *ngIf="i?.resourceStatus === '1'"
+              [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']">重新指派</button>
-            acl
+            <button nz-button (click)="updateGoodsSource(i)"
-            [acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']"
+              *ngIf="i?.resourceStatus === '1' && i.insurancePayment !== 'Y'" acl
-            >取消货源</button
+              [acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']">修改货源</button>
-          >
+            <button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl
-          <button
+              [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']">再下一单</button>
-            nz-button
-            (click)="assignedCar(i)"
-            *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'"
-            acl
-            [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']"
-            >重新指派</button
-          >
-          <button
-            nz-button
-            (click)="updateGoodsSource(i)"
-            *ngIf="i?.resourceStatus === '1' && i.insurancePayment !== 'Y'"
-            acl
-            [acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']"
-            >修改货源</button
-          >
-          <button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']"
-            >再下一单</button
-          >
           </div>
         </div>
         <div class="mt-sm mb-sm" nz-row>
           <div>
-          <b
+            <b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency }}</span></b>
-            >总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '￥' }}</span></b
-          >
           </div>
         </div>
         <nz-divider></nz-divider>
@@ -59,39 +40,60 @@
         </div>
       </ng-template>
     </page-header-wrapper>
-  <nz-card title="货源进度">
+    <nz-card [nzBorderless]="true" class="mb0">
+      <div class="mb-xs" nz-row>
+        <button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
+        <h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
+      </div>
+      <div nz-row>
+        <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.enterpriseInfoName }}</div>
+        <div nz-col nzSpan="10">
+          <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
+            [acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']">取消货源</button>
+          <button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'" acl
+            [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']">重新指派</button>
+          <button nz-button (click)="updateGoodsSource(i)"
+            *ngIf="i?.resourceStatus === '1' && i.insurancePayment !== 'Y'" acl
+            [acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']">修改货源</button>
+          <button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl
+            [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']">再下一单</button>
+        </div>
+      </div>
+      <!-- <div class="mt0 mb0" nz-row>
+        <div>
+          <b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency }}</span></b>
+        </div>
+      </div> -->
+      <nz-divider class="divider-margin"></nz-divider>
+      <div class="mb-lg" sv-container *ngIf="i">
+        <sv label="外部货源号">{{ i?.externalResourceCode }} </sv>
+        <sv label="项目">{{ i?.enterpriseProjectName }}</sv>
+        <sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
+        <sv label="调度员">{{ i?.dispatchName }}/{{ i?.dispatchPhone }} </sv>
+        <sv label="服务类型">{{ i?.serviceTypeLabel }} </sv>
+      </div>
       <div class="approval-status">
-      <div style="width: 60%; margin: 0 auto">
+        <div lass="step-row">
           <nz-steps [nzLabelPlacement]="'vertical'">
-          <nz-step
+            <nz-step [nzStatus]="i?.resourceStatus !== '1' ? 'finish' : 'process'" nzIcon="solution"
-            [nzStatus]="i?.resourceStatus !== '1' ? 'finish' : 'process'"
+              [nzDescription]="i?.createAt" nzTitle="下单" [nzSubtitle]="i?.createTime"></nz-step>
-            nzIcon="solution"
+            <nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2'"
-            [nzDescription]="i?.createAt"
+              [nzStatus]="i?.resourceStatus === '1' ? 'wait' : 'finish'" nzIcon="file-done" [nzTitle]="'接单'"
-            nzTitle="下单"
+              [nzSubtitle]="i?.orderReceivingTime"></nz-step>
-            [nzSubtitle]="i?.createTime"
+            <nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"
-          ></nz-step>
+              [nzSubtitle]="i?.endTime"></nz-step>
-          <nz-step
-            *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2'"
-            [nzStatus]="i?.resourceStatus === '1' ? 'wait' : 'finish'"
-            nzIcon="file-done"
-            [nzTitle]="'接单'"
-            [nzSubtitle]="i?.orderReceivingTime"
-          ></nz-step>
-          <nz-step
-            nzStatus="finish"
-            nzIcon="close-circle"
-            nzTitle="取消货源"
-            *ngIf="i?.resourceStatus === '3'"
-            [nzSubtitle]="i?.endTime"
-          ></nz-step>
           </nz-steps>
         </div>
       </div>
     </nz-card>
 
-  <nz-card nzTitle="基本信息">
+    <nz-card [nzBorderless]="true" class="mb0">
+      <div class="font-weight-blod text-md detail-title">
+        <a class="sign mr-xs"></a>
+        <span>基本信息</span>
+      </div>
       <sv-container col="2">
-      <sv-title>货物信息</sv-title>
+        <!-- <sv-title>货物信息</sv-title> -->
         <ng-container *ngFor="let item of i?.goodsInfoVOList">
           <sv label="货物名称">
             {{ item.goodsTypeName }} - {{ item.goodsName }}
@@ -100,7 +102,7 @@
         </ng-container>
       </sv-container>
       <sv-container class="mt-md">
-      <sv-title>承运信息</sv-title>
+        <!-- <sv-title>承运信息</sv-title> -->
         <sv label="司机姓名">
           {{ i?.carrierInformationVO?.driverName }}
         </sv>
@@ -111,11 +113,17 @@
           {{ i?.carrierInformationVO?.driverLicensePlate }}
         </sv>
       </sv-container>
+      <sv label="承运司机" *ngIf="i?.carrierInformationVO.driverTelephone !== i?.payeePhone">
+        {{i?.carrierInformationVO.driverName || '--'}} / {{i?.carrierInformationVO.driverTelephone || '--'}} /
+        {{i?.carrierInformationVO.driverLicensePlate || '--'}}
+      </sv>
+      <sv label="车型车长载重">
+        {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight ||
+        '--')+'吨'}}
+      </sv>
       <div class="mt-md">
-      <h4 class="text-md"
+        <h4 class="text-md">装货卸货信息
-        >装货卸货信息
+          <span class="ml-sm text-sm">(
-        <span class="ml-sm text-sm"
-          >(
             <label>{{ i?.loadingCount }}装</label>
             <label>{{ i?.unloadingCount }}卸</label>
             )
@@ -124,8 +132,9 @@
         <div nz-row [nzGutter]="24">
           <div nz-col [nzSpan]="12">
             <div class="handling-info p-md">
-            <div class="flex" *ngFor="let item of i?.unLoadingPlaceVOList">
+              <ng-container *ngFor="let item of i?.unLoadingPlaceVOList">
-              <div *ngIf="item?.type === '1'" class="loading-row">
+                <div class="flex" *ngIf="item?.type === '1'">
+                  <div class="loading-row">
                     <div class="handling-info-icon loading-bg">装</div>
                     <div class="info">
                       <h4>装货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}</h4>
@@ -133,13 +142,15 @@
                     </div>
                   </div>
                 </div>
+              </ng-container>
               <p class="time-info">装货时间：{{ i?.loadingTime }}</p>
             </div>
           </div>
           <div nz-col [nzSpan]="12">
             <div class="handling-info p-md">
-            <div class="flex" *ngFor="let item of i?.unLoadingPlaceVOList">
+              <ng-container *ngFor="let item of i?.unLoadingPlaceVOList">
-              <div *ngIf="item?.type === '2'" class="loading-row">
+                <div class="flex" *ngIf="item?.type === '2'">
+                  <div class="loading-row">
                     <div class="handling-info-icon unloaing-bg">卸</div>
                     <div class="info">
                       <h4>卸货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}</h4>
@@ -147,6 +158,7 @@
                     </div>
                   </div>
                 </div>
+              </ng-container>
               <p class="time-info">卸货时间：{{ i?.unloadingTime }}</p>
             </div>
           </div>
@@ -154,7 +166,11 @@
       </div>
     </nz-card>
 
-  <nz-card nzTitle="服务信息">
+    <nz-card [nzBorderless]="true" class="mb0">
+      <div class="font-weight-blod text-md detail-title">
+        <a class="sign"></a>
+        <span>服务信息</span>
+      </div>
       <sv-container>
         <sv label="服务包">
           {{ i?.insuranceTypeLabel}}
@@ -167,7 +183,12 @@
         </sv>
       </sv-container>
     </nz-card>
-  <nz-card [nzTitle]="'运费信息（到货后' + i?.paymentDays + '天内支付运费）'">
+    <nz-card [nzBorderless]="true" class="mb0">
+      <div class="font-weight-blod text-md detail-title">
+        <a class="sign"></a>
+        <span>运费信息</span>
+        <span class="pl-sm text-warning">(到货后{{i?.paymentDays}}天内支付运费)</span>
+      </div>
       <st [data]="i?.expenseVOList" [columns]="expenseColumns" [page]="{ show: false }">
         <ng-template st-row="total" let-item>
           <div>
@@ -190,11 +211,16 @@
             </span>
             <span>（运费{{ i?.totalFreight | currency }}含附加运费 {{ i?.totalSurcharge | currency }}）</span>
           </h3>
-        <div *ngIf='i?.resourceStatus !== "1" && i?.carrierInformationVO?.driverName !== i?.payeeName' >车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}</div>
+          <div *ngIf='i?.resourceStatus !== "1" && i?.carrierInformationVO?.driverName !== i?.payeeName'>车队长：{{
+            i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}</div>
         </div>
       </div>
     </nz-card>
-  <nz-card nzTitle="补充信息">
+    <nz-card [nzBorderless]="true" class="mb0">
+      <div class="font-weight-blod text-md detail-title">
+        <a class="sign"></a>
+        <span>补充信息</span>
+      </div>
       <sv-container>
         <sv label="是否回单">
           {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
@@ -202,7 +228,8 @@
         <sv label="回单类型" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
           {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
         </sv>
-      <sv label="联系人" *ngIf="i?.supplementaryInformationVO?.stateReceipt"> {{ i?.supplementaryInformationVO?.receiptUserName || '-' }} / {{ i?.supplementaryInformationVO?.phon || '-' }} 
+        <sv label="联系人" *ngIf="i?.supplementaryInformationVO?.stateReceipt"> {{
+          i?.supplementaryInformationVO?.receiptUserName || '-' }} / {{ i?.supplementaryInformationVO?.phon || '-' }}
         </sv>
         <sv label="所在地区" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
           {{ i?.supplementaryInformationVO?.area }}
@@ -215,9 +242,12 @@
         </sv>
       </sv-container>
     </nz-card>
-  <nz-card nzTitle="操作日志">
+    <nz-card [nzBorderless]="true" class="mb0">
-    <st #st [data]="service.$api_getOperationLogRecordsList" [columns]="logColumns"
+      <div class="font-weight-blod text-md detail-title">
-    [page]="{}"
+        <a class="sign"></a>
+        <span>操作日志</span>
+      </div>
+      <st #st [data]="service.$api_getOperationLogRecordsList" [columns]="logColumns" [page]="{}"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
         [res]="{ reName: { list: 'data.records', total: 'data.total' } }">
         <ng-template st-row="operator" let-item>
@@ -228,3 +258,4 @@
       </st>
     </nz-card>
   </div>
+</nz-spin>

src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less

@@ -3,7 +3,7 @@
     min-height: 210px;
 
     p {
-      margin-bottom: .5em;
+      margin-bottom: 5px;
     }
   }
 

src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html

@@ -8,14 +8,9 @@
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\basic-setting\\basic-setting.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
-<app-dynamic-setting-h5
+<app-dynamic-setting-h5 [tabs]="tabs" [configList]="configList" [selectedTab]="selectedTab"
-  [tabs]="tabs"
+  (selectedEvent)="getConfigList($event)" (saveEvent)="saveAction($event)" [labelWidth]="labelWidth"
-  [configList]="configList"
+  [isCanSave]="isCanSave">
-  [selectedTab]="selectedTab"
-  (selectedEvent)="getConfigList($event)"
-  (saveEvent)="saveAction($event)"
-  [labelWidth]="labelWidth"
->
   <custom-element>
     <app-parterl-config [configList]="configList"></app-parterl-config>
   </custom-element>

src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts

@@ -9,8 +9,8 @@
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
 import { Component, OnInit, ViewChild } from '@angular/core';
+import { ACLService } from '@delon/acl';
 import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
-import { dateTimePickerUtil } from '@delon/util';
 import { SystemService } from '../../services/system.service';
 const NOJSONTYPE = new Set([8, 12, 13]);
 @Component({
@@ -23,7 +23,10 @@ export class BasicSettingComponent implements OnInit {
   selectedTab: any = null;
   labelWidth = 250;
   configList: any = [];
-  constructor(public service: SystemService) {}
+  isCanSave = false;
+  constructor(public service: SystemService, private acl: ACLService) {
+    this.isCanSave = !!acl.data.abilities?.find(a => a === 'SYSTEM-BASIC_SETTING-save');
+  }
 
   ngOnInit() {
     this.getTypeList();

src/app/routes/sys-setting/components/config/config.component.html

@@ -7,7 +7,7 @@
             <se label="个人提现手续费" style="margin:15px 0 0 0">
               <div>
                 按照提现金额收取
-                <nz-input-number [(ngModel)]="personValue" [nzMin]="0" [nzMax]="100" [nzPrecision]="2" [nzStep]="0.01"></nz-input-number>
+                <nz-input-number [(ngModel)]="personServe" [nzMin]="0" [nzMax]="100" [nzPrecision]="2" [nzStep]="0.01"></nz-input-number>
                 <span> %手续费 </span>
               </div>
             </se>
@@ -15,7 +15,7 @@
               <div>
                 按照提现金额收取
                 <nz-input-number
-                  [(ngModel)]="enterpriseValue"
+                  [(ngModel)]="enterpriseServe"
                   [nzMin]="0"
                   [nzMax]="100"
                   [nzPrecision]="2"
@@ -52,12 +52,12 @@
         <div nz-row nzGutter="8">
             <div nz-col nzSpan="24">
                 <span>客户</span>
-                <nz-input-number style="margin: 0 10px; "  [(ngModel)]="personValue" [nzMin]="0" [nzMax]="3000" [nzPrecision]="2" [nzStep]="0.1"></nz-input-number>
+                <nz-input-number style="margin: 0 10px; "  [(ngModel)]="silenceClient" [nzMin]="0" [nzMax]="3000" [nzPrecision]="2" [nzStep]="0.1"></nz-input-number>
                 <span>天内没有交易订单的视为“沉默客户”</span>
             </div>
             <div nz-col nzSpan="24" style="margin-top: 10px;">
                 <span>客户</span>
-                <nz-input-number  style="margin: 0 10px; "   [(ngModel)]="personValue" [nzMin]="0" [nzMax]="3000" [nzPrecision]="2" [nzStep]="0.1"></nz-input-number>
+                <nz-input-number  style="margin: 0 10px; "   [(ngModel)]="loseClient" [nzMin]="0" [nzMax]="3000" [nzPrecision]="2" [nzStep]="0.1"></nz-input-number>
                 <span>天内没有交易订单的视为“流失客户”</span>
             </div>
             <div nz-col nzSpan="24">
@@ -66,15 +66,13 @@
         </div>
       </nz-card>
       <div class="mb-md save-btn">
-        <button class="ml-lg" nz-button nzSize="large" nzType="primary">保存</button>
+        <button class="ml-lg" nz-button nzSize="large" nzType="primary" (click)="save()">保存</button>
-        <button class="ml-lg" nz-button nzSize="large">取消</button>
       </div>
     </div>
   </div>
 
 <ng-template #auditTimes let-data="data" let-title="title">
   <div *ngIf="auditTimeStatus" >
-    <div style="display: flex">
       <nz-radio-group [(ngModel)]="everyDay" (ngModelChange)="everyDayChange(everyDay)" style="display: block">
         <label nz-radio [nzValue]="1" class="mt-sm"
           >每天<span *ngIf="TimeStatus" style="margin-left: 30px; color: #0200ff; cursor: pointer" (click)="addEvery()">添加时间段</span></label
@@ -92,7 +90,6 @@
         </div>
         </div>
       </div>
-    </div>
     <div >
       <nz-radio-group [(ngModel)]="MonthDay" (ngModelChange)="MonthDayChange(MonthDay)"  style="display: block">
         <label nz-radio [nzValue]="2" class="mt-sm"

src/app/routes/sys-setting/components/config/config.component.ts

@@ -4,6 +4,8 @@ import { NzUploadFile } from 'ng-zorro-antd/upload';
 import { Observable, Observer, of } from 'rxjs';
 import { apiConf } from '@conf/api.conf';
 import { SystemService } from '../../services/system.service';
+const NOJSONTYPE = new Set([8, 12, 13]);
+
 const IMAGECONFIG = {
   previewFile: (file: NzUploadFile) => of(file.url),
   action: apiConf.waterFileUpload,
@@ -35,12 +37,16 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges {
     isEveryDay: false,
     isEveryWeek: false
   };
-  personValue!: number;
+  labelWidth = 250;
-  enterpriseValue!: number;
+
-  auditValue!: number;
+  personServe!: number; // 个人提现手续费
-  auditTime!: any;
+  enterpriseServe!: number; // 企业提现手续费
-  auditTimeStatus: boolean = false;
+  auditValue!: boolean; // 提现审核
+  auditTime!: any; // 审核时间
+  silenceClient!: number; // 沉默客户
+  loseClient!: number; // 流失客户
   everyDay: boolean = false;
+  auditTimeStatus: boolean = false;
   MonthDay: boolean = false;
   time: Date | null = null;
   defaultOpenValue = new Date(0, 0, 0, 0, 0, 0);
@@ -105,9 +111,29 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges {
   // };
 
   constructor(private service: SystemService) {}
-  ngOnChanges(changes: SimpleChanges): void {
+  ngOnChanges(changes: any): void {
     if (changes.configList) {
-      console.log(changes.configList.currentValue);
+      console.log(changes.configList.currentValue[0]?.remark);
+      this.personServe = changes.configList.currentValue[0]?.remark.personServe, // 个人提现手续费
+      this.enterpriseServe= changes.configList.currentValue[0]?.remark.enterpriseServe, // 企业提现手续费
+      this.auditValue=  changes.configList.currentValue[0]?.remark.auditValue, // 提现审核
+      this.auditTime= changes.configList.currentValue[0]?.remark.auditTime, // 审核时间
+      this.silenceClient= changes.configList.currentValue[0]?.remark.silenceClient, // 沉默客户
+      this.loseClient= changes.configList.currentValue[0]?.remark.loseClient // 流失客户
+      this.everyDayData= changes.configList.currentValue[0]?.remark.everyDayData // 流失客户
+      this.MonthDayData= changes.configList.currentValue[0]?.remark.MonthDayData // 流失客户
+      if (this.auditTime == '2') {
+        this.auditTimeStatus = true;
+          // 每天
+          if(this.everyDayData){
+            this.everyDayData = this.everyDayData
+          } else if(this.MonthDay) {
+          // 每周
+          this.MonthDayData = this.MonthDayData
+          }
+      } else {
+        this.auditTimeStatus = false;
+      }
     }
   }
 
@@ -165,14 +191,12 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges {
     console.log(this.MonthDayData);
   }
   everyDayChange(type: any): void {
-    console.log(type);
     if (type) {
       this.MonthDay = false;
       this.TimeStatus = true;
     }
   }
   MonthDayChange(type: any): void {
-    console.log(type);
     if (type) {
       this.everyDay = false;
       this.TimeStatus = false;
@@ -315,13 +339,60 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges {
     });
   };
   changeAuto(value: any) {
-    console.log(value);
     if (value == '2') {
       this.auditTimeStatus = true;
     } else {
       this.auditTimeStatus = false;
     }
   }
+  save() {
+    let params : any = {
+      personServe: this.personServe, // 个人提现手续费
+      enterpriseServe: this.enterpriseServe, // 企业提现手续费
+      auditValue: this.auditValue, // 提现审核
+      auditTime: this.auditTime, // 审核时间
+      silenceClient: this.silenceClient, // 沉默客户
+      loseClient: this.loseClient // 流失客户
+    };
+    if(this.auditTime == '2') {
+      // 每天
+      if(this.everyDay){
+        params.everyDayData = this.everyDayData
+      } else if(this.MonthDay) {
+      // 每周
+      params.MonthDayData = this.MonthDayData
+      }
+    }
+    const pra = Object.assign({}, ...this.configList)
+    pra.remark =  JSON.stringify(params)
+    this.service.request(this.service.$api_update_config_batch, [pra]).subscribe(res => {
+      if (res) {
+        this.service.msgSrv.success('修改配置成功');
+        setTimeout(() => {
+          this.getConfigList(this.selectedTab);
+        }, 100);
+      }
+    });
+    
+  }
+  getConfigList(selectedTab: any) {
+    this.selectedTab = selectedTab;
+    this.service.request(this.service.$api_get_config_by_parent_id, { id: selectedTab?.id }).subscribe((res: Array<any>) => {
+      if (res?.length > 0) {
+        res = res.map(item => ({
+          ...item,
+          remark: item.remark ? JSON.parse(item.remark) : null,
+          itemValue: item?.itemValue ? (NOJSONTYPE.has(item?.itemType) ? item?.itemValue : JSON.parse(item?.itemValue)) : item?.itemValue,
+          itemData: item.itemData ? JSON.parse(item.itemData) : item.itemData
+        }));
+        const hiddenType = res.find(item => item.itemType === 7 || item.itemType === 999);
+        this.labelWidth = hiddenType ? 0 : 250;
+        this.configList = res;
+      } else {
+        this.configList = [];
+      }
+    });
+  }
   private getImageModel(args: any, key: any) {
     return [
       {

src/app/routes/sys-setting/sys-setting.module.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:23:05
- * @LastEditTime : 2022-04-27 15:52:30
+ * @LastEditTime : 2022-04-27 20:54:10
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting.module.ts
@@ -38,6 +38,7 @@ import { OrganizationManagementComponent } from './components/organization-manag
 import { OrganizationModalComponent } from './components/organization-management/organization-modal/organization-modal.component';
 import { ApiAuthModalComponent } from './components/organization-management/api-auth-modal/api-auth-modal.component';
 import { MenuTreeComponent } from './components/organization-management/menu-tree/menu-tree.component';
+import { PartnerSystemConfigComponent } from './components/config/config.component';
 
 const COMPONENTS = [
   StaffManagementComponent,
@@ -58,6 +59,7 @@ const COMPONENTS = [
   NoTeManagementComponent,
   SmsTemplateComponent,
   OrganizationManagementComponent,
+  PartnerSystemConfigComponent
 ];
 const NOTROUTECOMPONENTS = [
   BuyerTranspowerComponent,

src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts

@@ -179,8 +179,10 @@ export class InvoiceRequestedDetailComponent implements OnInit {
   routeToOrder(item: any) {
     if (item.billType === '1') {
       this.router.navigate(['/order-management/vehicle/vehicle-detail/' + item.billHId]);
-    } else {
+    } else if (item.billType === '2'){
       this.router.navigate(['/order-management/bulk/bulk-detail/' + item.billHId]);
+    } else if (item.billType === '3'){
+      this.router.navigate(['/order-management/vehicle/vehicle-detail/' + item.billHId]);
     }
   }
 

src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html

@@ -156,7 +156,7 @@
 
             <div class="mb-md save-btn">
                 <button class="ml-lg" nz-button nzSize="large" nzType="primary" (click)="saveAction()"
-                    *ngIf="selectedTab?.configKey!=='freight' && labelWidth!==0">保存</button>
+                    *ngIf="selectedTab?.configKey!=='freight' && labelWidth!==0 && isCanSave">保存</button>
             </div>
         </div>
     </div>

src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts

@@ -28,6 +28,8 @@ export class DynamicSettingH5Component implements OnInit {
 
   @Input()
   configList: any = [];
+  @Input()
+  isCanSave = true;
   @Output()
   selectedEvent = new EventEmitter<any>();
   @Output()

src/styles.less

@@ -2,6 +2,7 @@
 @import '~@delon/abc/index';
 @import '~@delon/chart/index';
 @import 'app/layout/pro/styles/index.less';
+@import './styles/common/global.less';
 
 @import './styles/index';
 @import './styles/theme';

src/styles/common/global.less

@@ -0,0 +1,60 @@
+.detail-title {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+
+
+  .sign {
+    width: 2px;
+    height: 16px;
+    background: #E60012;
+    display: inline-block;
+    margin-right: 10px;
+  }
+}
+
+.divider-margin {
+  margin-top: 12px;
+  margin-bottom: 12px;
+}
+
+.step-row {
+  width: 80%;
+  margin: 0 auto;
+
+  .ant-steps-item-description {
+    font-size: 12px;
+  }
+}
+
+.new-sv-container {
+  &.sv__horizontal {
+    .sv__label-width {
+      justify-content: left;
+    }
+  }
+}
+
+.new-sf-container {
+  &.sf__horizontal .ant-form-item-label>label {
+    justify-content: left;
+  }
+}
+
+.common-order-header {
+  display: flex;
+  justify-content: space-between;
+}
+
+.common-grey {
+  color: #8A8E99;
+}
+
+.nameBox {
+  display: flex;
+  align-items: baseline;
+
+  .name {
+    margin: 0 10px 10px 0;
+  }
+}

src/styles/index.less

@@ -1,6 +1,8 @@
 /* You can add global styles to this file, and also import other style files */
 
 @import './fix/index';
+
+
 .error-color {
   color: #ff4d4f;
 }

src/styles/theme.less

@@ -5,6 +5,7 @@
 @import '../app/layout/pro/styles/theme-default.less';
 @import './fix/theme-default.less';
 
+
 // ==========Custom brand visual color==========
 
 // ==========Custom brand visual color==========