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

src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts

@@ -375,13 +375,13 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
         title: '审核人',
         width: '180px',
         className: 'text-left',
-        index: 'loadingLadingBillFilePath'
+        index: 'complianceName'
       },
       {
         title: '审核时间',
         width: '180px',
         className: 'text-left',
-        index: 'loadingLadingBillFilePath'
+        index: 'complianceTime'
       },
       {
         title: '状态',

src/app/routes/partner/account-management/components/account-detail/account-detail.component.html

@@ -11,13 +11,13 @@
       <b class="text-md ">{{headerTotalInfo?.ltdName}}</b>
     </sv>
     <sv label="可用余额">
-      {{headerTotalInfo?.allAmount |currency}}
+      <span class="text-error-dark font-weight-bold">{{headerTotalInfo?.allAmount |currency}}</span>
     </sv>
     <sv label="收入金额">
-      {{headerTotalInfo?.incomeAmount |currency}}
+      <span class="text-error-dark font-weight-bold"> {{headerTotalInfo?.incomeAmount |currency}}</span>
     </sv>
     <sv label="支出金额">
-      {{headerTotalInfo?.payAmount |currency}}
+      <span class="text-error-dark font-weight-bold">{{headerTotalInfo?.payAmount |currency}}</span>
     </sv>
   </sv-container>
   <ng-template #labelTpl>

src/app/routes/partner/account-management/components/list/list.component.ts

@@ -59,7 +59,7 @@ export class PartnerAccountManagementListComponent implements OnInit {
  */
   initST() {
     this.columns = [
-      { title: '合伙人名称', index: 'userName', className: 'text-center', width: 250 },
+      { title: '合伙人名称', index: 'name', className: 'text-center', width: 250 },
       { title: '手机号', index: 'phone', className: 'text-center', width: 200 },
       {
         title: '账户总额（元）', index: 'allBalance', className: 'text-right', sort: true, width: 150, type: 'currency',

src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html

@@ -8,23 +8,27 @@
 <nz-card>
   <sv-container layout="vertical" [noColon]="true" col="5">
     <sv [label]="labelTpl">
-      <b class="text-md ">{{summaryObj?.company}}</b>
+      <b class="text-md ">{{summaryObj?.taxno}}</b>
     </sv>
     <sv label="返佣总额">
-      {{summaryObj?.totalRebate |currency}}
+      <span class="text-error-dark font-weight-bold">{{(summaryObj?.totalRebate?summaryObj?.totalRebate: 0 )|currency :'
+        '}}</span>
     </sv>
     <sv label="已入账金额">
-      {{summaryObj?.totalRebate |currency}}
+      <span class="text-error-dark font-weight-bold">{{(summaryObj?.recordedAmount?summaryObj?.recordedAmount:0
+        )|currency:' '}}</span>
     </sv>
     <sv label="代缴个税">
-      {{summaryObj?.taxPersonalSum |currency}}
+      <span class="text-error-dark font-weight-bold">{{(summaryObj?.taxPersonalSum?summaryObj?.taxPersonalSum:0
+        )|currency:' '}}</span>
     </sv>
     <sv label="待入账金额">
-      {{summaryObj?.waitRecordedAmount |currency}}
+      <span class="text-error-dark font-weight-bold">{{(summaryObj?.waitRecordedAmount?summaryObj?.waitRecordedAmount:0)
+        |currency:' '}}</span>
     </sv>
   </sv-container>
   <ng-template #labelTpl>
-    <b class="text-md" style="color: black;">{{summaryObj?.name}}</b>
+    <b class="text-md" style="color: black;">{{summaryObj?.ltdName}}</b>
   </ng-template>
 </nz-card>
 <nz-card>
@@ -43,11 +47,11 @@
       </ng-template>
     </st>
     <div class="total-footer text-md" *ngIf="st?.list?.length !== 0 ">
-      合计 <label class="text-red-dark">{{ summaryObj?.total }}</label> 项，收入 <label
+      合计 <label class="text-red-dark">{{ footerSummary?.total }}</label> 项，收入 <label
         class="text-red-dark font-weight-bold">{{
-        summaryObj?.income | currency
+        footerSummary?.income | currency
         }}</label>，支出 <label class="text-red-dark font-weight-bold">{{
-        summaryObj?.spending | currency }}</label>
+        footerSummary?.spending | currency }}</label>
     </div>
   </div>
 </nz-card>
@@ -55,8 +59,8 @@
 <nz-modal [(nzVisible)]="showBillDetail" nzTitle="账户明细" [nzFooter]="null" (nzOnCancel)="handleCancel()" nzWidth="700px">
   <div *nzModalContent>
     <div class="mb-sm">
-      <span class="mr-xxl text-md font-weight-bold"><label>网络货运人：</label>{{detailRecord?.ltdName}}</span>
-      <span class="text-md font-weight-bold"><label>返佣总额（元）：</label>{{detailRecord?.totalRebate |currency: ' '}}</span>
+      <span class="mr-xxl text-sm font-weight-bold"><label>网络货运人：</label>{{detailRecord?.ltdName}}</span>
+      <span class="text-sm font-weight-bold"><label>返佣总额（元）：</label>{{detailRecord?.totalRebate |currency: ' '}}</span>
     </div>
     <st #st [data]="billDetailList " [columns]="billDetailColumns" [res]="{ reName: { list: 'data' } }"
       [req]="{ method: 'POST', allInBody: true, params:billDetailReqParams}" [page]="{show:false}">

src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts

@@ -19,6 +19,12 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
     taxno: ''
   };
 
+  footerSummary = {
+    total: 0,
+    income: 0,
+    spending: 0
+  }
+
   detailRecord: any = {};
 
   url = `/user`;
@@ -156,6 +162,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
     this.billDetailColumns = [];
     this.showBillDetail = true;
     this.initBillDetailST();
+    this.detailRecord = record;
     this.getBillDetail(record?.ltdId);
   }
 
@@ -169,6 +176,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
 
   handleCancel() {
     this.showBillDetail = false;
+    this.detailRecord = {};
 
   }
   goBack() {

src/app/routes/sys-setting/components/network-freight/network-freight.component.ts

@@ -466,8 +466,26 @@ export class NetworkFreightComponent implements OnInit {
         }
       });
     }
+    if(this.NCStatus) {
+      this.getNcSetData()
+    }
     this.isVisibleTicket = true;
   }
+  getNcSetData() {
+    const List: any = [];
+    console.log(99999);
+    this.service.request(this.service.$api_get_crmCustomer, { id: this.ticketItem.crmCustomerId }).subscribe((res: any) => {
+      console.log(res);
+      if (res) {
+          List.push({ label: res.customerName, value: res.id });
+          console.log(List);
+          
+          this.sfNC.getProperty('/crmCustomerId')!.schema.enum = List;
+          this.sfNC.getProperty('/crmCustomerId')!.widget.reset(List);
+          this.sfNC.setValue('/crmCustomerId', res?.id);
+      }
+    });
+  }
   getProvinceData(value: any) {
     this.service.http.post(this.service.$api_getRegionDetailByCode, { regionCode: value }).subscribe(res => {
       let enterpriseAddressCode: any = [];
@@ -661,10 +679,10 @@ export class NetworkFreightComponent implements OnInit {
       this.NCStatus = false;
       this.taxStatus = false;
     } else if (value.name === 'NC设置'){
+      this.getNcSetData()
       this.NCStatus = true;
       this.TicketStatus = false;
       this.taxStatus = false;
-
     }
   }
   // 新增

src/app/routes/usercenter/components/driver/captain/add/add.component.less

@@ -32,5 +32,10 @@
       color: black;
       resize:none;
     }
+    .hideBtn .ant-upload-list-item-actions button{
+      &:last-child{
+        display: none;
+      }
+    }
   }
 }